Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

portal-manager-ui/admin/src/views/dataActuary/business/analysiscontent/index.vue

@@ -118,8 +118,9 @@ import {getBusInfoById} from '@/api/dataActuary.js'
 			}
 		},
 		methods: {
-			async getAnalysisData() {
-				const res = await getBusInfoById({busid: this.checkId, siteid: localStorage.getItem('siteId') })
+			async getAnalysisData(selected) {
+				let pramse = (selected || selected===0 ||selected==='0')?{busid: this.checkId, siteid: localStorage.getItem('siteId'),selected:selected }:{busid: this.checkId, siteid: localStorage.getItem('siteId') }
+				const res = await getBusInfoById(pramse)
 				if(res.code == 1){
 					if (res.data.phone) this.testWay.push('手机号')
 					if (res.data.idcardtake) this.testWay.push('身份证')
@@ -136,8 +137,8 @@ import {getBusInfoById} from '@/api/dataActuary.js'
 					}
 				}
 			},
-			handleChange(){
-				this.getAnalysisData()
+			handleChange(e){
+				this.getAnalysisData(e)
 			}
 		},
 	}

portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/reportForm.vue

@@ -12,28 +12,20 @@
           v-model="checkboxVALUE"
           @change="checkboxonChange"
         />
-        <a-input
-          allowClear
-          v-model="Query.workman_name"
-          placeholder="请输入工作人员姓名查询 "
-        >
+        <a-input allowClear v-model="Query.workman_name" placeholder="请输入工作人员姓名查询 ">
           <a-icon slot="prefix" type="search" />
         </a-input>
         <a-select v-model="Query.window_id" placeholder="请选择窗口">
-          <a-select-option value=""> 全部 </a-select-option>
+          <a-select-option value>全部</a-select-option>
           <a-select-option
             v-for="(item, index) of windowData"
             :key="index"
             :value="item.id"
-          >
-            {{ item.englishName }} - {{ item.fromnum }}
-          </a-select-option>
+          >{{ item.englishName }} - {{ item.fromnum }}</a-select-option>
         </a-select>
         <a-select v-model="Query.warn_alert" placeholder="请选择类型">
-          <a-select-option value=""> 全部 </a-select-option>
-          <a-select-option v-for="(item, i) in warn_alert" :key="i" :value="i">
-            {{ item }}
-          </a-select-option>
+          <a-select-option value>全部</a-select-option>
+          <a-select-option v-for="(item, i) in warn_alert" :key="i" :value="i">{{ item }}</a-select-option>
         </a-select>
 
         <a-range-picker
@@ -41,12 +33,9 @@
           valueFormat="yyyy-MM-DD"
           class="range_picker_style"
           v-model="Query.time"
-        >
-        </a-range-picker>
+        ></a-range-picker>
 
-        <a-button type="primary" class="addclass" @click="onGetKqalert"
-          >搜索</a-button
-        >
+        <a-button type="primary" class="addclass" @click="onGetKqalert">搜索</a-button>
       </span>
     </div>
     <div class="main">
@@ -66,9 +55,7 @@
         :dataSource="tableSourceData"
       >
         <template slot="operation" slot-scope="text, record">
-          <a-button type="link" @click="openDetails"
-            >查看详情{{ record.id }}</a-button
-          >
+          <a-button type="link" @click="openDetails">查看详情{{ record.id }}</a-button>
         </template>
       </a-table>
     </div>
@@ -86,7 +73,7 @@ const warn_alert = {
   2: "离开",
   4: "玩手机",
   5: "扶头",
-  6: "趴桌",
+  6: "趴桌"
 };
 const tHeader = [
   "序号",
@@ -110,7 +97,7 @@ const filterVal = [
   "out_time",
   "duration",
   "isaccuracy",
-  "have_process_name",
+  "have_process_name"
 ];
 export default {
   mixins: [table],
@@ -124,15 +111,15 @@ export default {
         warn_alert: "", //1离岗，2离开 4:玩手机 5:扶头 6:趴桌
         window_id: "", //窗口ID
         workman_name: "", //工作人员姓名
-        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
+        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")] // 时间区间
       }, //查询条件
       checkboxVALUE: [],
       BegindAndEndTime: [],
       checkboxOptions: [
         {
           label: "只看未处理",
-          value: "0",
-        },
+          value: "0"
+        }
       ],
       tableHeaders: [
         {
@@ -141,54 +128,54 @@ export default {
           width: "60px",
           key: "index",
           align: "center",
-          customRender: (text, record, index) => `${index + 1}`,
+          customRender: (text, record, index) => `${index + 1}`
         },
         {
           title: "报警类型",
           dataIndex: "warn_alert",
-          customRender: (text, record) => warn_alert[text],
+          customRender: (text, record) => warn_alert[text]
         },
         {
           title: "发生窗口",
           dataIndex: "window_name",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "工作人员",
           dataIndex: "workman_name",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "所属部门",
           dataIndex: "section_name",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "手机号",
           dataIndex: "workman_phone",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "发生时间",
           dataIndex: "out_time",
           customRender: (text, record) =>
-            text ? this.timestampToTime(text) : "--",
+            text ? this.timestampToTime(text) : "--"
         },
         {
           title: "时长",
           dataIndex: "duration",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "是否准确",
           dataIndex: "isaccuracy",
-          customRender: (text, record) => (text == 1 ? "准确" : "--"),
+          customRender: (text, record) => (text == 1 ? "准确" : "--")
         },
         {
           title: "是否处理",
           dataIndex: "have_process_name",
-          customRender: (text, record) => (text ? text : "--"),
-        },
+          customRender: (text, record) => (text ? text : "--")
+        }
         // {
         // 	title: "操作",
         // 	align: "center",
@@ -199,7 +186,7 @@ export default {
         // 	},
         // },
       ],
-      searchName: undefined,
+      searchName: undefined
     };
   },
   components: {},
@@ -211,7 +198,7 @@ export default {
   methods: {
     // 时间戳转换为日期
     timestampToTime(timestamp) {
-      var date = new Date(timestamp*1000);
+      var date = new Date(timestamp * 1000);
       var Y = date.getFullYear() + "-";
       var M =
         (date.getMonth() + 1 < 10
@@ -235,10 +222,11 @@ export default {
           await getKqalert({
             ...this.Query,
             page: 1,
-            size: -1,
+            size: -1
           })
         );
         data = datas.data.data;
+      }
       data.forEach((text, i) => {
         text.index = i + 1;
         text.isaccuracy = text.isaccuracy == 1 ? "准确" : "--";
@@ -246,6 +234,10 @@ export default {
           ? this.timestampToTime(text.out_time)
           : "--";
       });
+      
+      // debugger
+        
+        console.log(data,11111);
       if (!data.length) return;
 
       export2Excel(
@@ -254,15 +246,14 @@ export default {
         data,
         "AI效能监察异常行为数据报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
-      }
     },
     // 报表接口
     onGetKqalert() {
       getKqalert({
         ...this.Query,
         page: this.tablePagination.current,
-        size: this.tablePagination.pageSize,
-      }).then((res) => {
+        size: this.tablePagination.pageSize
+      }).then(res => {
         const { code, data } = res;
         if (code == 1) {
           this.tableSourceData = data.data;
@@ -275,8 +266,8 @@ export default {
       windowList({
         page: 1,
         size: -1,
-        siteId: JSON.parse(localStorage.getItem("siteId")),
-      }).then((res) => {
+        siteId: JSON.parse(localStorage.getItem("siteId"))
+      }).then(res => {
         const { code, data } = res;
         if (code == 1) {
           this.windowData = data.data;
@@ -308,8 +299,8 @@ export default {
         default:
           return "type0";
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue

@@ -173,7 +173,7 @@ export default {
         {
           title: "评价设备",
           align: "center",
-          dataIndex: "pj_name",
+          dataIndex: "devicenum",
           customRender: (text) => {
             return text ? text : "--";
           },
@@ -336,7 +336,7 @@ export default {
         option_id,
         pjxt,
         time: this.BegindAndEndTime,
-        info: "%"+this.searchName+"%",
+        info: this.searchName,
         hallid:this.hallid,
         sectionid:this.sectionid,
         ...search,

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue

@@ -342,7 +342,7 @@ export default {
         option_id,
         pjxt,
         time: this.BegindAndEndTime,
-        info: "%"+this.searchName+"%",
+        info: this.searchName,
         hallid: this.hallid,
         sectionid: this.sectionid,
         ...search,