From 61167e460b5273b05a23854742e3e450e656cd08 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 18 七月 2022 16:08:14 +0800
Subject: [PATCH] 修复国标摄像机配置相关的bug

---
 src/pages/syslog/views/pollingLog.vue |  101 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 91 insertions(+), 10 deletions(-)

diff --git a/src/pages/syslog/views/pollingLog.vue b/src/pages/syslog/views/pollingLog.vue
index 895c3cf..2897bf9 100644
--- a/src/pages/syslog/views/pollingLog.vue
+++ b/src/pages/syslog/views/pollingLog.vue
@@ -16,21 +16,31 @@
         <div class="search">
           <el-input
             placeholder="鎼滅储"
-            v-model="procName"
+            v-model="fuzzySearch"
             size="small"
             class="input-with-select"
+            @keyup.enter.native="getScheduleLog(1)"
           >
             <span
-              class="icon iconfont"
-              @click="getOperationLog(1)"
+              class="icon iconfont icon_clear"
+              @click="clearSearch"
+              slot="append"
+              v-if="fuzzySearch"
+            >
+              &#xe785;
+            </span>
+            <span
+              class="icon iconfont icon_search"
+              @click="getScheduleLog(1)"
               slot="append"
             >
               &#xe714;
             </span>
+
             <!-- <el-button
               slot="append"
               icon="el-icon-search"
-              @click="getScheduleLog"
+              @click="getOperationLog(1)"
             ></el-button> -->
           </el-input>
         </div>
@@ -47,6 +57,7 @@
           @change="dateChange"
           end-placeholder="缁撴潫鏃ユ湡"
           :picker-options="pickerOptions"
+          popper-class="pollingLog_timePicker"
         >
         </el-date-picker>
       </div>
@@ -84,7 +95,7 @@
         <el-table-column
           :align="'center'"
           sortable
-          prop="procName"
+          prop="info"
           label="鎽勫儚鏈�"
         ></el-table-column>
         <el-table-column
@@ -120,6 +131,7 @@
         show-checkbox
         check-on-click-node
         default-expand-all
+        :default-checked-keys="selectedIDs"
       ></el-tree>
 
       <span slot="footer" class="dialog-footer">
@@ -142,7 +154,7 @@
 export default {
   data() {
     return {
-      png: "",
+      png: require("../../../../public/images/syslog/娌℃暟鎹�.png"),
       loading: false,
       loadingText: "",
       tableData: [],
@@ -167,6 +179,7 @@
       procID: "",
       procName: "",
       pickNum: 0,
+      selectedIDs: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -208,11 +221,11 @@
   methods: {
     handleSizeChange(val) {
       this.pageSize = val;
-      this.getOperationLog();
+      this.getScheduleLog();
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.getOperationLog();
+      this.getScheduleLog();
     },
     cancelShow() {
       this.dialogVisible = false;
@@ -226,6 +239,8 @@
     },
     confirmCamera() {
       const selectedIDs = this.$refs.cameraTree.getCheckedKeys();
+      this.selectedIDs = selectedIDs;
+      console.log(selectedIDs);
       this.pickNum = selectedIDs.length;
       this.procID = selectedIDs.join(",");
       this.getScheduleLog();
@@ -254,19 +269,23 @@
         this.moduleOptions = res.data;
       });
     },
-    getScheduleLog() {
+    getScheduleLog(typ) {
+      if (typ == 1) {
+        this.page = 1;
+      }
+
       const data = {
         timeStart: this.timeStart,
         timeEnd: this.timeEnd,
         page: this.page,
         pageSize: this.pageSize,
+        fuzzySearch: this.fuzzySearch,
         procID: this.procID,
         procName: this.procName,
       };
       queryScheduleLog(data).then((res) => {
         this.tableData = res.data.logs;
         this.total = res.data.total;
-        this.png = require("../../../../public/images/syslog/娌℃暟鎹�.png");
       });
     },
     dateChange(val) {
@@ -290,6 +309,10 @@
     },
     handleSelectionChange() {},
     handleClose() {},
+    clearSearch() {
+      this.fuzzySearch = "";
+      this.getScheduleLog(1);
+    },
   },
 };
 </script>
@@ -458,6 +481,13 @@
       }
 
       tr {
+        td:first-child {
+          border-radius: 4px 0 0 4px;
+        }
+        td:last-child {
+          border-radius: 0 4px 4px 0;
+        }
+
         &.current-row td {
           background-color: #4e94ff !important;
           color: #fff;
@@ -492,4 +522,55 @@
     background-color: white;
   }
 }
+
+.pollingLog_timePicker {
+  width: 520px !important;
+  * {
+    font-size: 12px !important;
+    min-width: 0px !important;
+  }
+
+  .el-date-range-picker__time-header {
+    border: none;
+  }
+
+  .el-date-range-picker__content {
+    padding: 2px 9px;
+  }
+
+  .el-date-table th {
+    pad: 0 5px;
+  }
+
+  .el-picker-panel__shortcut {
+    padding-left: 20px;
+    padding-bottom: 10px;
+  }
+
+  .el-picker-panel__footer {
+    padding: 0 20px 10px 0;
+    background-color: none;
+    display: flex;
+    justify-content: end;
+    border: none;
+    button {
+      display: block;
+      width: 54px;
+      height: 24px;
+      border: 1px solid #e0e0e0;
+      border-radius: 25px;
+      line-height: 9px;
+
+      &:first-child {
+        color: #4f4f4f !important;
+      }
+
+      &:last-child {
+        color: #fff !important;
+        background-color: #4e94ff !important;
+        border-color: #4e94ff !important;
+      }
+    }
+  }
+}
 </style>

--
Gitblit v1.8.0