Merge remote-tracking branch 'origin/master'

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

@@ -20,6 +20,9 @@ export function getBumenList(params) {
 export function getTaskList(params) {
   return http.get(`${BASEURL}/admin/take/takelist`, params);
 }
+export function getTakeableList(params) {
+  return http.get(`${BASEURL}/admin/take/takeablelist`, params);
+}
 //排队办理记录报表接口
 export function getQueueData(params) {
   return http.post(`${BASEURL}/inter/reportform/quelist`, params);

portal-manager-ui/admin/src/components/reportformsForm/QueueSearch.vue

@@ -90,7 +90,7 @@ import YSelect from "@/components/YSelect.vue";
 import YRangePicker from "@/components/YRangePicker.vue";
 import storage from "@/utils/js/Storage";
 import { mapMutations } from "vuex";
-import { getDatingList, getBumenList, getTaskList } from "@/api/dataAdmin";
+import { getDatingList, getBumenList, getTaskList ,getTakeableList} from "@/api/dataAdmin";
 import { debounce } from "lodash";
 const style = [
   {
@@ -123,6 +123,7 @@ export default {
       searchForm: {
         id: "", // 排队机id
         style: "", // 状态
+        device_type:"",//设备类型
         time: [
           this.$moment().format("YYYY-MM-DD"),
           this.$moment().format("YYYY-MM-DD"),
@@ -136,7 +137,7 @@ export default {
   created() {
     this.getDatingListArr();
     this.getBumenListArr();
-    this.getTaskList();
+    this.getTakeableList();
   },
   methods: {
     ...mapMutations("search", ["set_searForm", "set_isExport", "reset"]),
@@ -163,23 +164,42 @@ export default {
       if (res.code == 1) {
         let { data } = res.data;
         this.deptList = data;
+       
       }
     },
 
     //获取排号机设备列表
-    async getTaskList() {
-      let res = await getTaskList({
+    async getTakeableList() {
+      let res = await getTakeableList({
         page: 1,
         size: -1,
       });
       if (res.code == 1) {
-        let { data } = res.data;
+        let { data } = res;
         this.deviceData = data;
+        // console.log(this.deviceData)
       }
     },
+    // async getTaskList() {
+    //   let res = await getTaskList({
+    //     page: 1,
+    //     size: -1,
+    //   });
+    //   if (res.code == 1) {
+    //     let { data } = res.data;
+    //     this.deviceData = data;
+    //     console.log(this.deviceData)
+    //   }
+    // },
 
     // 搜索
     handleSearch() {
+      if(this.searchForm.id){
+        let device = this.deviceData.filter((i)=>{
+        return this.searchForm.id == i.id
+        })
+        this.searchForm.device_type = device[0].device_type
+      }
       this.set_searForm(this.searchForm);
     },
 

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/components/FormDetails.vue

@@ -81,7 +81,7 @@
               <img
                 v-for="(item, index) in fromData.url"
                 :key="index"
-                :src="process.env.VUE_APP_API_BASE_URL + item"
+                :src="baseUrl + item"
               />
             </div>
             <div v-else>--</div>
@@ -273,6 +273,7 @@ export default {
   data() {
     return {
       fromData: {},
+      baseUrl: process.env.VUE_APP_API_BASE_URL,
     };
   },
   computed: {

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

@@ -39,7 +39,7 @@
         </div>
       </div>
       <div slot="footer" class="btn-box">
-        <a-button type="primary" @click="checkAnalyse">查看业务分析</a-button>
+        <!-- <a-button type="primary" @click="checkAnalyse">查看业务分析</a-button> -->
       </div>
     </a-modal>
   </div>

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

@@ -30,14 +30,14 @@
         </div>
       </div>
       <div slot="footer" class="btn-box">
-        <a-space>
+        <!-- <a-space>
           <a-button type="primary" @click="checkPortrayal"
             >查看TA的数据画像</a-button
           >
           <a-button type="primary" @click="checkBlockchain"
             >区块链信息</a-button
           >
-        </a-space>
+        </a-space> -->
       </div>
     </a-modal>
   </div>

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

@@ -66,14 +66,14 @@
         </div>
       </div>
       <div slot="footer" class="btn-box">
-        <a-space>
+        <!-- <a-space>
           <a-button type="primary" @click="checkPortrayal"
             >查看TA的数据画像</a-button
           >
           <a-button type="primary" @click="checkBlockchain"
             >区块链信息</a-button
           >
-        </a-space>
+        </a-space> -->
       </div>
     </a-modal>
   </div>