Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/api/dataAdmin.js

 import http from "../request/http";
 let baseURL = process.env.VUE_APP_API_BASE_URL;
 let BASEURL = process.env.VUE_APP_API_PHP_URL;
+let BAS_EURL = process.env.VUE_APP_API_IMG_URL
 // 1.15.1. 获取站点下的数据管理列表
 export function censusListInterface(params) {
   return http.post(`${baseURL}/zwfw/site/model/census/list`, params);
 }
 
 /* 排号机部分 */
+// 大厅列表数据
+export function getDatingList(params) {
+  return http.post(`${BAS_EURL}base/site/hall/list`, params);
+}
+// 部门列表数据
+export function getBumenList(params) {
+  return http.post(`${BAS_EURL}base/dept/list`, params);
+}
 //排号机列表数据
 export function getTaskList(params) {
   return http.get(`${BASEURL}/admin/take/takelist`, params);

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue

@@ -10,6 +10,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="searchForm.hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="searchForm.sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="searchForm.id">
             <a-select-option value=""> 全部设备 </a-select-option>
             <a-select-option v-for="item in deviceData" :key="item.id" :value="item.id">
@@ -116,6 +128,8 @@ import BusinessInfo from "./components/businessInfo.vue";
 import WorkpeopleInfo from "./components/workpeopleInfo.vue";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getTaskList,
   getQueueData,
   getQueueInfo,
@@ -264,6 +278,8 @@ export default {
         style: "", // 状态
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
         flownum: "", // 排号编码
+        hallid:"",
+        sectionid:""
       },
       //状态
       style: [
@@ -289,6 +305,10 @@ export default {
       },
       tableSelectedKeys: [],
       tableSelectedRows: [],
+      // 大厅列表
+      datingList:[],
+      // 部门列表
+      bumenList:[],
     };
   },
   components: {
@@ -298,11 +318,25 @@ export default {
     HandlingDetails,
   },
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.getTaskListArr();
     this.getQueueDataArr();
   },
   mounted() { },
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     //重置按钮
     resetBtn() {
       this.tablePagination.current = 1;