2021-12-06

src/components/bioSafety/QueryConditions.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-09-18 10:40:12
- * @LastEditTime: 2021-11-28 15:36:27
+ * @LastEditTime: 2021-12-06 13:25:48
  * @LastEditors: Please set LastEditors
  * @Description: 查询条件组件
  * @FilePath: \hyyfClient\src\components\bioSafety\QueryConditions.vue

src/utils/chenApi.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-18 13:40:39
- * @LastEditTime: 2021-12-05 18:17:50
+ * @LastEditTime: 2021-12-06 08:36:46
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \hyyfClient\src\utils\chenApi.js
@@ -12,7 +12,7 @@ import axios from './http';
 /* 获取门禁所有 - 人脸门禁 +  */
 export function getFaceGuardTotal(data) {
   return axios({
-    url: 'http://192.168.1.171:10253/produce/person/get_person_record_totalpage',
+    url: '/produce/person/get_person_record_totalpage',
     method: 'post',
     data: data
   })
@@ -21,7 +21,7 @@ export function getFaceGuardTotal(data) {
 /* 车辆管理 - 车辆通行 */
 export function getCarPassage(data) {
   return axios({
-    url: 'http://192.168.1.171:10253/produce/car/get_car_record',
+    url: '/produce/car/get_car_record',
     method: 'get',
     params: data
   })
@@ -30,7 +30,7 @@ export function getCarPassage(data) {
 /* 车辆管理 - 车辆洗消 */
 export function getCarWash(params) {
   return axios({
-    url: 'http://192.168.1.171:10253/produce/accident/accident_record_xixiao',
+    url: '/produce/accident/accident_record_xixiao',
     method: 'post',
     data: params
   })
@@ -39,7 +39,7 @@ export function getCarWash(params) {
 /* 车辆管理 - 车辆洗消 - 总数 */
 export function getCarWashTotal(params) {
   return axios({
-    url: 'http://192.168.1.171:10253/produce/accident/accident_record_xixiao_totalpage',
+    url: '/produce/accident/accident_record_xixiao_totalpage',
     method: 'post',
     data: params
   })
@@ -48,7 +48,7 @@ export function getCarWashTotal(params) {
 /* 车辆洗消 - 视频回放 */
 export function getCarWashVideo(params) {
   return axios({
-    url: 'http://192.168.1.171:10253/produce/video/getVideoRecord',
+    url: '/produce/video/getVideoRecord',
     method: 'post',
     data: params
   })
@@ -65,7 +65,7 @@ export function getCarWashVideo(params) {
 // 数据查询
 export function getCarDrying(params) {
   return axios({
-    url: 'http://192.168.1.171:8089/telecom/listevent',
+    url: '/produce/telecom/listevent',
     method: 'get',
     params: params
   })
@@ -73,7 +73,7 @@ export function getCarDrying(params) {
 // 温度变化
 export function getCarDryingTemp(params) {
   return axios({
-    url: 'http://192.168.1.171:8089/telecom/listeventdetail',
+    url: '/produce/telecom/listeventdetail',
     method: 'get',
     params: params
   })
@@ -83,7 +83,7 @@ export function getCarDryingTemp(params) {
 // 档案管理
 export function getPersonFiles(params) {
   return axios({
-    url: 'http://192.168.1.171:10253/produce/person/ge_person_list',
+    url: '/produce/person/ge_person_list',
     method: 'post',
     data: params
   })

src/views/BioSafety/CarAdmin.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-09-13 17:52:31
- * @LastEditTime: 2021-12-05 17:03:35
+ * @LastEditTime: 2021-12-06 13:46:38
  * @LastEditors: Please set LastEditors
  * @Description: 生物安全 - 车辆管理
  * @FilePath: \hyyfClient\src\views\BioSafety\CarAdmin.vue
@@ -32,7 +32,7 @@
       :shows="tableShows"
       :height="475"
     >
-      <template v-slot:right>
+      <!-- <template v-slot:right>
         <template v-if="btnSelected === 1">
           <div>
             <el-button size="mini">黑名单</el-button>
@@ -40,7 +40,7 @@
         </template>
         <template v-else-if="btnSelected === 2">
           <div>
-            <!-- <el-button size="mini">黑名单</el-button> -->
+            <el-button size="mini">黑名单</el-button>
           </div>
         </template>
         <template v-else>
@@ -48,7 +48,7 @@
             <el-button size="mini">黑名单</el-button>
           </div>
         </template>
-      </template>
+      </template> -->
       <template v-slot:carNum="slotProps">
         {{ slotProps.row.carNum ? slotProps.row.carNum : "未识别" }}
       </template>
@@ -120,7 +120,7 @@
         <chart-car-drying :tempList="tempChartData"></chart-car-drying>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="videoVisible = false">取 消</el-button>
+        <el-button @click="tempVisible = false">取 消</el-button>
         <el-button type="primary" @click="tempVisible = false">
           确 定
         </el-button>
@@ -148,6 +148,7 @@ import {
   getCarDryingTemp,
 } from "../../utils/chenApi";
 import { getFaceToken } from "../../utils/api";
+import { timeDate } from "../../utils/index";
 
 export default {
   name: "CarAdmin",
@@ -211,10 +212,13 @@ export default {
       this.tableItems = tableItems[id - 1];
       this.pageNum = 1;
       this.listData = [];
+      this.params = {};
+      console.log("1111");
       if (this.btnSelected === 1) {
         this.carPassage();
       } else if (this.btnSelected === 2) {
         this.carWash();
+        this.carWashTotal();
       } else {
         this.carDrying();
       }
@@ -258,15 +262,6 @@ export default {
         this.carDrying();
       }
     },
-    init() {
-      let params = {
-        pageNum: this.pageNum,
-        pageSize: this.size,
-        searchStr: this.keyword,
-      };
-      console.log(params);
-      // 获取后端数据
-    },
     // 车辆通行 查询
     carPassage() {
       let queryParams = {
@@ -292,11 +287,17 @@ export default {
     },
     // 车辆洗消
     carWash() {
+      if (!this.params.time) {
+        this.params.time = [
+          timeDate(new Date().getTime() - 1000 * 60 * 60 * 24),
+          timeDate(new Date().getTime()),
+        ];
+      }
       let queryParams = {
         pageNum: this.pageNum,
         pageSize: this.size,
         alarmStartDateString: this.params.time[0] + " 00:00:00",
-        alarmEndDateString: this.params.time[1] + " 23:59:59",
+        alarmEndDateString: this.params.time[1],
         nodeCodeList: ["1002871$1$0$0", "1002872$1$0$0", "1002873$1$0$0"],
         deviceCategory: 1,
         alarmType: 303,
@@ -326,12 +327,18 @@ export default {
     },
     // 车辆洗消 - 总条数
     carWashTotal() {
+      if (!this.params.time) {
+        this.params.time = [
+          timeDate(new Date().getTime() - 1000 * 60 * 60 * 24),
+          timeDate(new Date().getTime()),
+        ];
+      }
       let queryParams = {
         orgCodeList: [],
         nodeCodeList: ["1002871$1$0$0", "1002872$1$0$0", "1002873$1$0$0"],
         deviceCategory: 1,
-        alarmStartDateString: this.params.time[0] + "00:00:00",
-        alarmEndDateString: this.params.time[1] + "23:59:59",
+        alarmStartDateString: this.params.time[0] + " 00:00:00",
+        alarmEndDateString: this.params.time[1] + " 23:59:59",
         alarmType: 303,
         dbType: 0,
       };
@@ -341,9 +348,15 @@ export default {
     },
     // 车辆烘干
     carDrying() {
+      if (!this.params.time) {
+        this.params.time = [
+          timeDate(new Date().getTime() - 1000 * 60 * 60 * 24),
+          timeDate(new Date().getTime()),
+        ];
+      }
       getCarDrying({
-        startTimeString: this.params.time[0] + "00:00:00",
-        endTimeString: this.params.time[1] + "23:59:59",
+        startTimeString: this.params.time[0] + " 00:00:00",
+        endTimeString: this.params.time[1] + " 23:59:59",
         current: this.pageNum,
         size: this.size,
       }).then((res) => {

src/views/BioSafety/PersonAdmin.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-09-16 11:27:35
- * @LastEditTime: 2021-12-03 13:38:19
+ * @LastEditTime: 2021-12-06 13:17:13
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \hyyfClient\src\views\BioSafety\PersonAdmin.vue
@@ -54,7 +54,12 @@
 
       <!-- 人员门禁 -->
       <template v-slot:recordImage="slotProps">
-        <img :src="slotProps.row.recordImage" alt="人员门禁" width="100" />
+        <img
+          :src="slotProps.row.recordImage"
+          alt="人员门禁"
+          width="100"
+          @click="clickImg(slotProps.row.recordImage)"
+        />
       </template>
       <template v-slot:personName="slotProps">
         {{ slotProps.row.personName ? slotProps.row.personName : "未知 " }}
@@ -66,6 +71,7 @@
           :src="slotProps.row.personBiosignatures[0].path"
           alt="人员门禁"
           width="100"
+          @click="clickImg(slotProps.row.personBiosignatures[0].path)"
         />
       </template>
       <template #sex="slotProps">
@@ -82,6 +88,15 @@
       @pageChange="pageChange"
     >
     </table-footer>
+    <el-dialog title="人脸图片" :visible.sync="dialogVisible" width="40%">
+      <img :src="imgUrl" alt="人脸图片" width="100%" />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">
+          确 定
+        </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -128,6 +143,8 @@ export default {
       params: {},
       personStatus: ["已删除", "正常", "冻结"], // 档案管理 - 人员状态
       personSex: ["未知", "男", "女"], // 档案管理 - 性别
+      dialogVisible: false, // 图片放大，也不知道得多老眼昏花，这么大的图片还要再大
+      imgUrl: "", // 点击图片后放大的图片路径
     };
   },
   mounted() {
@@ -151,13 +168,16 @@ export default {
     // 按钮选中情况 --> 对应的 api
     chooseApi(flag = true) {
       if (this.btnSelected === 1) {
+        if (flag) {
+          this.pageNum = 1;
+        }
         this.initPersonFiles();
       } else {
-        console.log("******************");
-        this.faceGuard();
         if (flag) {
+          this.pageNum = 1;
           this.faceGuardTotal();
         }
+        this.faceGuard();
       }
     },
     // 获取查询条件
@@ -253,6 +273,11 @@ export default {
         }
       });
     },
+    // 点击图片放大
+    clickImg(url) {
+      this.dialogVisible = true;
+      this.imgUrl = url;
+    },
   },
 };
 </script>

src/views/BioSafety/carAdmin/queryCondition.config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-18 15:19:29
- * @LastEditTime: 2021-12-05 15:51:20
+ * @LastEditTime: 2021-12-06 13:35:36
  * @LastEditors: Please set LastEditors
  * @Description: 筛选条件的 formItems 和 propFormData
  * @FilePath: \hyyfClient\src\views\BioSafety\personAdmin\queryCondition.config.js

src/views/BioSafety/carAdmin/table.config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-18 16:06:51
- * @LastEditTime: 2021-12-05 16:16:45
+ * @LastEditTime: 2021-12-06 13:46:48
  * @LastEditors: Please set LastEditors
  * @Description: 表格的配置
  * @FilePath: \hyyfClient\src\views\BioSafety\personAdmin\table.config.js
@@ -109,5 +109,5 @@ const tableItems3 = [
 export const tableItems = [tableItems1, tableItems2, tableItems3]
 
 export const tableShows = {
-  showIndex: false, showSelect: true
+  showIndex: false, showSelect: false
 }

src/views/BioSafety/deadPig/table.config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-18 16:06:51
- * @LastEditTime: 2021-11-19 15:00:45
+ * @LastEditTime: 2021-12-06 13:47:24
  * @LastEditors: Please set LastEditors
  * @Description: 表格的配置
  * @FilePath: \hyyfClient\src\views\BioSafety\personAdmin\table.config.js
@@ -30,5 +30,5 @@ export const tableItems = [
 ]
 
 export const tableShows = {
-  showIndex: false, showSelect: true
+  showIndex: false, showSelect: false
 }

src/views/BioSafety/personAdmin/table.config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-18 16:06:51
- * @LastEditTime: 2021-12-03 13:37:14
+ * @LastEditTime: 2021-12-06 13:47:10
  * @LastEditors: Please set LastEditors
  * @Description: 表格的配置
  * @FilePath: \hyyfClient\src\views\BioSafety\personAdmin\table.config.js
@@ -109,5 +109,5 @@ const tableItems3 = [
 export const tableItems = [tableItems1, tableItems2, tableItems3]
 
 export const tableShows = {
-  showIndex: false, showSelect: true
+  showIndex: false, showSelect: false
 }

src/views/PdcData/Analysis.vue

@@ -103,6 +103,7 @@
 
       <!-- 销售情况 -->
       <div class="sales">
+        <div class="sales-title">销售</div>
         <div class="sales-condition">
           <el-date-picker
             v-model="getSalesDates"
@@ -804,6 +805,11 @@ export default {
   padding: 20px;
   padding-bottom: 0;
 }
+.sales-title {
+  padding-left: 20px;
+  font-size: 18px;
+  font-weight: bolder;
+}
 .sales-condition {
   margin-left: 250px;
 }

src/views/PdcData/analysis/safetyTable.config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-11 16:19:57
- * @LastEditTime: 2021-11-25 14:33:43
+ * @LastEditTime: 2021-12-06 13:48:45
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \hyyfClient\src\views\PdcData\analysis\safetyTable.config.js
@@ -40,5 +40,5 @@ export const safetyTableItems = [
 ]
 
 export const safetyTableShows = {
-  showIndex: false, showSelect: true
+  showIndex: false, showSelect: false
 }

src/views/PdcData/analysis/table.config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-28 13:54:21
- * @LastEditTime: 2021-11-25 13:41:02
+ * @LastEditTime: 2021-12-06 13:48:26
  * @LastEditors: Please set LastEditors
  * @Description: 生产数据 - ERP数据分析 - 工作看板 的表格
  * @FilePath: \hyyfClient\src\views\PdcData\analysis\table.config.js
@@ -34,5 +34,5 @@ export const tableItems = [
 ]
 
 export const tableShows = {
-  showIndex: false, showSelect: true
+  showIndex: false, showSelect: false
 }