From 14e02654e0545ee69456d64aef2f35c7c219d708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 11:26:49 +0800
Subject: [PATCH] 地图模式设备状态修改

---
 src/views/policeTracking/policeTracking.vue |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 2648e13..09de97b 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -334,7 +334,7 @@
 
           <el-card>
             <el-form
-              :model="security"
+              :model="form"
               label-position="right"
               size="mini"
               label-width="100px"
@@ -352,7 +352,7 @@
                   <el-form-item label="人员编号">
                     <el-input
                       disabled="true"
-                      v-model="security.snumber"
+                      v-model="form.baname"
                       autocomplete="off"
                     ></el-input>
                   </el-form-item>
@@ -361,7 +361,7 @@
                   <el-form-item label="人员名称">
                     <el-input
                       disabled="true"
-                      v-model="security.sname"
+                      v-model="form.baid"
                       autocomplete="off"
                     ></el-input>
                   </el-form-item>
@@ -372,7 +372,7 @@
                   <el-form-item label="联系电话">
                     <el-input
                       disabled="true"
-                      v-model="security.phone"
+                      v-model="form.baphone"
                       autocomplete="off"
                     ></el-input>
                   </el-form-item>
@@ -461,7 +461,7 @@
           <el-card>
             <video
               :src="feedbackVideo"
-              style="width: 100%; height: 100%; object-fit: fill"
+              style="width: 200px; height: 200px; object-fit: fill"
               controls
               v-show="feedbackVideo != ''"
             ></video>
@@ -730,6 +730,7 @@
         bz: this.form.bz,
         snumber: this.form.alarmId,
         sname: this.form.alarmPeople,
+        deviceNumber:this.form.deviceNumber,
         zc: zc,
         zctime: this.getDate().current,
       };
@@ -761,9 +762,10 @@
 
     getList() {
       var that = this;
+      var deptid = that.form.deptId.slice(0,19);//报错deptId格式不对liu.2021.5.7
       axios
         .get(
-          `/api/blade-user/pages?current=1&size=9999&work_status=&deptId=${that.form.deptId}`
+          `/api/blade-user/pages?current=1&size=9999&work_status=&deptId=${deptid}`
         )
         .then(function (res) {
           that.tableData = [];
@@ -786,6 +788,7 @@
 
             res.data.data.records.forEach((item) => {
               if (
+                item.roleName == "处警员" &&
                 that.form.securityArr.indexOf(item.id) != -1 &&
                 item.id != that.form.securityId
               ) {
@@ -798,14 +801,28 @@
                   status: "已通知",
                   tenantName: item.tenantName,
                 });
+              } else if (
+                item.roleName == "处警员" &&
+                that.form.securityArr.indexOf(item.id) == -1 &&
+                item.id != that.form.securityId
+              ) {
+                that.tableData.push({
+                  id: item.id,
+                  ind: (i += 1),
+                  name: item.name,
+                  phone: item.phone,
+                  online_status: item.online_status == 1 ? "在线" : "掉线",
+                  status: "未通知",
+                  tenantName: item.tenantName,
+                });
               }
             });
 
-             that.tableData.forEach(item => {
-               if (item.id == that.form.oneId) {
-                 item.status+='(负责人)'
-               }
-             })
+            that.tableData.forEach((item) => {
+              if (item.id == that.form.oneId) {
+                item.status += "(负责人)";
+              }
+            });
           } else {
             res.data.data.records.forEach((item) => {
               if (item.id == that.form.oneId) {
@@ -920,7 +937,7 @@
         },
       }).then(function (res) {
         that.form = res.data.data.records[0];
-        that.getList();
+        that.getList();//报错deptId格式不对liu.2021.5.7
       });
     },
   },

--
Gitblit v1.9.3