需求优化

src/views/archivesManage/archivesList/mixins/archives.js

@@ -320,13 +320,16 @@ export const archivesCrud = {
     // 选择删除
     toDelete(data) {
       // 已装盒的档案不可删除
-      const indexCaseBool = data.findIndex(item => item.case_no !== '')
-      if (indexCaseBool !== -1) {
-        this.$message.error('已装盒的档案不可删除!')
-      } else {
-        this.$refs.deltArchives.deleteVisible = true
-        this.getTotalSumAll()
-      }
+      // const indexCaseBool = data.findIndex(item => item.case_no !== '')
+      // if (indexCaseBool !== -1) {
+      //   this.$message.error('已装盒的档案不可删除!')
+      // } else {
+      //   this.$refs.deltArchives.deleteVisible = true
+      //   this.getTotalSumAll()
+      // }
+
+      this.$refs.deltArchives.deleteVisible = true
+      this.getTotalSumAll()
     },
     getTotalSumAll(data) {
       this.totalSumAll = 0

src/views/components/AccessDoor.vue

@@ -13,12 +13,12 @@
           <div>{{ scope.row.time | parseTime }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" :show-overflow-tooltip="true" min-width="60">
+      <el-table-column label="姓名" align="center" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
           <div>{{ scope.row.name }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="minorName" label="说明" align="center" :show-overflow-tooltip="true" min-width="80" />
+      <el-table-column prop="minorName" label="说明" align="center" :show-overflow-tooltip="true" width="148" />
     </el-table>
   </div>
 </template>
@@ -56,13 +56,18 @@ export default {
   },
   watch: {
     // 如果 `tableData` 发生改变，这个函数就会运行
-    tableData: function(newData, oldData) {
-      this.tableRefScroll()
-    }
+    // tableData: function(newData, oldData) {
+    //   this.tableRefScroll()
+    // }
   },
   created() {
     this.getAccessdoor()
   },
+  mounted() {
+    this.scrollTimer = setInterval(() => {
+      this.getAccessdoor()
+    }, 15000)
+  },
   destroyed() {
     clearInterval(this.scrollTimer)
     this.scrollTimer = null
@@ -131,8 +136,12 @@ export default {
     },
     getAccessdoor() {
       FetchInitHikDoorLog({ page: 0, size: this.size }).then((data) => {
+        this.tableData = []
         if (data.content && data.content.length > 0) {
-          this.tableData.splice(0, data.content.length, ...data.content)
+          // this.tableData.splice(0, data.content.length, ...data.content)
+          this.tableData = data.content
+        } else {
+          this.tableData = []
         }
       })
     }

src/views/components/WarehouseWarning.vue

@@ -12,10 +12,11 @@
       <el-table-column prop="TS" label="时间" align="center" width="160">
         <template slot-scope="scope">
           <span v-if="scope.row.TS">{{ scope.row.TS | formatTs }}</span>
+          <!-- <span v-if="scope.row.TS">{{ scope.row.TS | parseTime }}</span> -->
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="设备" align="center" :show-overflow-tooltip="true" width="80" />
-      <el-table-column prop="value" label="警情" align="center" :show-overflow-tooltip="true" min-width="60" />
+      <el-table-column prop="name" label="设备" align="center" :show-overflow-tooltip="true" width="100" />
+      <el-table-column prop="value" label="警情" align="center" :show-overflow-tooltip="true" width="148" />
     </el-table>
   </div>
 </template>
@@ -51,13 +52,18 @@ export default {
   },
   watch: {
     // 如果 `tableData` 发生改变，这个函数就会运行
-    tableData: function(newData, oldData) {
-      this.tableRefScroll()
-    }
+    // tableData: function(newData, oldData) {
+    //   this.tableRefScroll()
+    // }
   },
   created() {
     this.getAlarmInfo()
   },
+  mounted() {
+    this.scrollTimer = setInterval(() => {
+      this.getAlarmInfo()
+    }, 15000)
+  },
   destroyed() {
     clearInterval(this.scrollTimer)
     this.scrollTimer = null
@@ -140,8 +146,72 @@ export default {
     },
     getAlarmInfo() {
       alarmApi.info({ storeroomId: this.storeroomId }).then((data) => {
+        // this.tableData = [
+        //   {
+        //     'id': 'eb6b8653',
+        //     'lscid': 0,
+        //     'wyid': '',
+        //     'itemLevels': 1,
+        //     'siteName': '.环境监控',
+        //     'TS': 1765944141000,
+        //     'isAd': true,
+        //     'type': 0,
+        //     'ip': '192.168.99.101:6003',
+        //     'name': '开关量',
+        //     'value': '设备断线',
+        //     'dw': '',
+        //     'itemClass': 1
+        //   },
+        //   {
+        //     'id': 'eeeeeeee',
+        //     'lscid': 0,
+        //     'wyid': null,
+        //     'itemLevels': 1,
+        //     'siteName': '红外外线',
+        //     'TS': 1765867832000,
+        //     'isAd': true,
+        //     'type': 0,
+        //     'ip': '192.168.99.100',
+        //     'name': '红外外线',
+        //     'value': '红外线报警',
+        //     'dw': null,
+        //     'itemClass': 1
+        //   },
+        //   {
+        //     'id': 'eb6b8653',
+        //     'lscid': 0,
+        //     'wyid': '',
+        //     'itemLevels': 1,
+        //     'siteName': '.环境监控',
+        //     'TS': 1765944141000,
+        //     'isAd': true,
+        //     'type': 0,
+        //     'ip': '192.168.99.101:6003',
+        //     'name': '开关量',
+        //     'value': '设备断线',
+        //     'dw': '',
+        //     'itemClass': 1
+        //   },
+        //   {
+        //     'id': 'eeeeeeee',
+        //     'lscid': 0,
+        //     'wyid': null,
+        //     'itemLevels': 1,
+        //     'siteName': '红外外线',
+        //     'TS': 1765867832000,
+        //     'isAd': true,
+        //     'type': 0,
+        //     'ip': '192.168.99.100',
+        //     'name': '红外外线',
+        //     'value': '红外线报警',
+        //     'dw': null,
+        //     'itemClass': 1
+        //   }
+        // ]
+        this.tableData = []
         if (data && data.length > 0) {
-          this.tableData.splice(0, data.length, ...data)
+          // this.tableData.splice(0, data.length, ...data)
+          this.tableData = data
         } else {
           this.tableData = []
         }

src/views/environmentalScreen/index.vue

@@ -89,21 +89,21 @@
               <svg-icon icon-class="voc" class-name="msg-list-svg" />
               <div class="msg-txt">
                 <span class="msg-list-num">{{ avgData.tvoc }}</span>
-                <p class="msg-list-unit">TVOC <br>{{ avgData.tvocUnit }}</p>
+                <p class="msg-list-unit">TVOC {{ avgData.tvocUnit }}</p>
               </div>
             </li>
             <li>
               <svg-icon icon-class="co2" class-name="msg-list-svg" />
               <div class="msg-txt">
                 <span class="msg-list-num">{{ avgData.co2 }}</span>
-                <p class="msg-list-unit">二氧化碳 <br>{{ avgData.co2Unit }}</p>
+                <p class="msg-list-unit">二氧化碳 {{ avgData.co2Unit }}</p>
               </div>
             </li>
             <li>
               <svg-icon icon-class="jiaquan" class-name="msg-list-svg" style="font-size: 68px;" />
               <div class="msg-txt">
                 <span class="msg-list-num">{{ avgData.formaldehyde }}</span>
-                <p class="msg-list-unit">甲醛 <br>{{ avgData.formaldehydeUnit }}</p>
+                <p class="msg-list-unit">甲醛 {{ avgData.formaldehydeUnit }}</p>
               </div>
             </li>
           </ul>
@@ -253,7 +253,7 @@
         <!-- 环控实时报警 -->
         <warehouse-warning :height="'calc(100% - 38px)'" />
         <!-- 门禁出入记录 -->
-        <AccessDoor :height="'calc(100% - 40px)'" size="5" />
+        <AccessDoor :height="'calc(100% - 40px)'" size="4" />
         <!-- 当日告警统计 -->
         <div class="env-item container-wrap">
           <span class="right-top-line" />