报警记录字段调整，设备列表优化，视频联动接口联调

public/index.html

@@ -18,6 +18,9 @@
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.10.10/index.css">
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
+  <!-- 海康视频流插件 -->
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.3.0/video-js.min.css" rel="stylesheet">
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.3.0/video.min.js"></script>
   <!-- webrtc 调度终端 -->
   <!-- <script src="<%= BASE_URL %>cdn/thirdlib/Ice.min.js" charset="utf-8"></script> -->
   <link rel="icon" href="<%= BASE_URL %>favicon.png">

src/views/wirelessintrusion/deployment/list.vue

@@ -34,7 +34,7 @@
             </el-form-item>
             <el-form-item label="任务时间：" prop="executeTime">
               <el-time-picker v-model="addForm.executeTime" placeholder="请选择任务时间" :disabled="isDetail ? true : false"
-                value-format="HH:mm:ss" style="width:100%;">
+                value-format="HH:mm" style="width:100%;">
               </el-time-picker>
             </el-form-item>
           </el-col>

src/views/wirelessintrusion/device/list.vue

@@ -42,7 +42,7 @@ export default {
         column: [
           {
             label: "设备名称",
-            prop: "name",
+            prop: "name1",
             span: 12,
             search: true,
             formatter: (val, value, label) => {
@@ -85,9 +85,29 @@ export default {
             labelWidth: 120,
             viewDisplay: false
           },
+          {
+            label: "位置",
+            prop: "position",
+            labelWidth: 120,
+          },
+          {
+            label: "经纬度",
+            prop: "xy",
+            labelWidth: 120,
+            hide: true
+          },
           {
             label: "节点类型",
-            prop: "nodeLabel",
+            prop: "nodeLabel1",
+            labelWidth: 120,
+            formatter: (data) => {
+              return data.nodeLabel
+            }
+          },
+          {
+            label: "节点类型",
+            prop: "statusLabel",
+            span: 12,
             labelWidth: 120,
             hide: true,
           },
@@ -113,13 +133,6 @@ export default {
             labelWidth: 120,
             viewDisplay: false,
           }, 
-          {
-            label: "节点类型",
-            prop: "statusLabel",
-            span: 12,
-            labelWidth: 120,
-            hide: true,
-          },
           {
             label: "创建时间",
             prop: "createTime",
@@ -180,49 +193,6 @@ export default {
       let idx = column.dicData.findIndex(item => item.dictValue == node);
       return idx > -1 ? column.dicData[idx].dictLabel : '';
     },
-    // rowSave(row, done, loading) {
-    //   add(row).then(() => {
-    //     this.onLoad(this.page);
-    //     this.$message({
-    //       type: "success",
-    //       message: "操作成功!"
-    //     });
-    //     done();
-    //   }, error => {
-    //     window.console.log(error);
-    //     loading();
-    //   });
-    // },
-    // rowUpdate(row, index, done, loading) {
-    //   update(row).then(() => {
-    //     this.onLoad(this.page);
-    //     this.$message({
-    //       type: "success",
-    //       message: "操作成功!"
-    //     });
-    //     done();
-    //   }, error => {
-    //     window.console.log(error);
-    //     loading();
-    //   });
-    // },
-    // rowDel(row) {
-    //   this.$confirm("确定将选择数据删除?", {
-    //     confirmButtonText: "确定",
-    //     cancelButtonText: "取消",
-    //     type: "warning"
-    //   })
-    //     .then(() => {
-    //       return remove(row.id);
-    //     })
-    //     .then(() => {
-    //       this.onLoad(this.page);
-    //       this.$message({
-    //         type: "success",
-    //         message: "操作成功!"
-    //       });
-    //     });
-    // },
     searchReset() {
       this.query = {};
       this.onLoad(this.page);
@@ -302,9 +272,19 @@ export default {
               item.nodeLabel = this.renderLabel(item.node,'node');
               item.statusLabel = this.renderLabel(item.status,'status')
               item.productName = item.bizProduct.name;
+              if(item.tags) { 
+                let tags = JSON.parse(item.tags);
+                item.buildingNo = tags.buildingNo;
+                item.floorNo = tags.floorNo;
+                item.xy = tags.lng + ',' + tags.lat;
+                item.position = item.buildingNo + '号楼' + item.floorNo + '层';
+              }
             })
-            this.data = data.records;
+            this.data = data.rows;
             this.loading = false;
+          }, () => {
+            this.loading = false;
+            this.selectionClear();
           });
         })
       } else {
@@ -315,7 +295,7 @@ export default {
           if(res2.data.code == 401){
             console.log(res2.data.code)
             window.sessionStorage.removeItem('bizToken');
-            this.onLoad();
+            this.onLoad(page);
           }
           else if(res2.data.code == 200){
             const data = res2.data;
@@ -325,10 +305,17 @@ export default {
               item.nodeLabel = this.renderLabel(item.node,'node');
               item.statusLabel = this.renderLabel(item.status,'status')
               item.productName = item.bizProduct.name;
+              if(item.tags) { 
+                let tags = JSON.parse(item.tags);
+                item.buildingNo = tags.buildingNo;
+                item.floorNo = tags.floorNo;
+                item.xy = tags.lng + ',' + tags.lat;
+                item.position = item.buildingNo + '号楼' + item.floorNo + '层';
+              }
             })
             this.data = data.rows;
           }
-        }, err => {
+        }, () => {
           this.loading = false;
           this.selectionClear();
         });

src/views/wirelessintrusion/warn/record.vue

@@ -5,13 +5,15 @@
       @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
       @refresh-change="refreshChange" @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>消警
+        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>布防
         </el-button>
         <el-button type="danger" size="small" icon="el-icon-turn-off" plain>撤防
         </el-button>
-        <el-button type="danger" size="small" icon="el-icon-turn-off" plain>旁路恢复
+        <el-button type="warning" size="small" icon="el-icon-turn-off" plain>旁路
         </el-button>
-        <el-button @click="handleExport" type="warning" size="small" icon="el-icon-download" plain>导出
+        <el-button type="warning" size="small" icon="el-icon-turn-off" plain>旁路恢复
+        </el-button>
+        <el-button @click="handleExport" type="primary" size="small" icon="el-icon-download" plain>导出
         </el-button>
       </template>
       <template slot-scope="{ row, index }" slot="menu">
@@ -47,10 +49,11 @@
 
 <script>
 import { getList } from "@/api/alarm/alarm";
-import {exportBlob} from "@/api/common";
+import { bizLogin, bizDeviceList } from "@/api/wirelessintrusion/wirelessintrusion";
+import { exportBlob } from "@/api/common";
 import { downloadXls } from "@/util/util";
-import {dateNow} from "@/util/date";
+import { dateNow } from "@/util/date";
-import {getToken} from "@/util/auth";
+import { getToken } from "@/util/auth";
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import func from "@/util/func";
@@ -85,7 +88,7 @@ export default {
         column: [
           {
             label: "设备名称",
-            prop: "title",
+            prop: "deviceName",
           },
           {
             label: "设备编号",
@@ -94,39 +97,36 @@ export default {
           },
           {
             label: "设备类型",
-            type: 'select',
+            prop: "productName",
-            prop: "deviceType",
+          },
+          {
+            label: "报警类型",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=alarm_message_condition",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
             dataType: "number",
-            dictData: [],
+            slot: true,
-            search: true
+            prop: "type",
+            search: true,
           },
-          // {
-          //   label: "报警类型",
-          //   type: "select",
-          //   dicUrl: "/api/blade-system/dict/dictionary?code=notice",
-          //   props: {
-          //     label: "dictValue",
-          //     value: "dictKey"
-          //   },
-          //   dataType: "number",
-          //   slot: true,
-          //   prop: "category",
-          //   search: true,
-          // },
           {
             label: "楼号",
             prop: "buildId",
+            width: 80
           },
           {
             label: "楼层",
             prop: "floorNo",
+            width: 80
           },
           {
             label: "经纬度",
-            prop: "longidute",
+            prop: "xy",
-            formatter: (data) => {
+            span: 24,
-              return (data.longidute ? data.longidute + ',' : '') + data.latidute;
+            hide: true
-            }
           },
           {
             label: "报警信息",
@@ -139,16 +139,6 @@ export default {
             prop: "reportTime",
             width: '150'
           },
-          {
-            label: '上报日期',
-            prop: 'releaseTimeRange',
-            type: 'datetime',
-            valueFormat: 'yyyy-MM-dd HH:mm:ss',
-            searchRange: true,
-            search: true,
-            hide: true,
-            viewDisplay: false,
-          },
         ]
       },
       data: [],
@@ -234,24 +224,39 @@ export default {
       getList(page.currentPage, page.pageSize, values).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
+        data.records.map(item => {
+          item.xy = item.longidute + ',' + item.latidute;
+        })
         this.data = data.records;
         this.loading = false;
         this.selectionClear();
       });
     },
     // 视频联动按钮
-    linkVideo() {
+    linkVideo(row) {
+      let token = window.sessionStorage.getItem('bizToken');
+      if (token == 'undefined' || !token) {
+        bizLogin({ appKey: 'Arf7bd4f26', appSecret: 'kb207044c8' }).then(res => {
+          window.sessionStorage.setItem('bizToken', res.data.data.token);
+          bizDeviceList(res.data.data.token, { 'params[pmac]': row.deviceId }).then(res2 => {
+            const data = res2.data;
+            this.videoData = data.rows;
             this.dialogVisible = true;
-      this.videoData = [
+          });
-        { id: '001', url: 'cdcdcdcd', name: '视频一' },
+        })
-        { id: '002', url: 'cdcdcdcd', name: '视频一' },
+      } else {
-        { id: '003', url: 'cdcdcdcd', name: '视频一' },
+        bizDeviceList(token, { 'params[pmac]': row.deviceId }).then(res2 => {
-        { id: '004', url: 'cdcdcdcd', name: '视频一' },
+          if (res2.data.code == 401) {
-        { id: '005', url: 'cdcdcdcd', name: '视频一' },
+            window.sessionStorage.removeItem('bizToken');
-        { id: '006', url: 'cdcdcdcd', name: '视频一' },
+            this.linkVideo(row);
-        { id: '007', url: 'cdcdcdcd', name: '视频一' },
+          }
-        { id: '008', url: 'cdcdcdcd', name: '视频一' },
+          else if (res2.data.code == 200) {
-      ]
+            const data = res2.data;
+            this.videoData = data.rows;
+            this.dialogVisible = true;
+          }
+        });
+      }
     },
     // 导出
     handleExport() {