From 760f0a620ae0c09305c3f684d7b618aaf5261dd2 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 13 Mar 2021 09:17:19 +0800
Subject: [PATCH] 警情分发修改

---
 src/views/realTimePolice/real.vue        |   46 ++++++++++++----------
 src/views/realTimePolice/realHistory.vue |   24 ++++++------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 4515be7..e9ad6d2 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -62,7 +62,7 @@
       </template>
       <template slot-scope="{ row }" slot="cid">
         <el-tag>{{
-            row.cid == "1" ? "事件发生" : row.cid == "3" ? "是" : "事件恢复"
+          row.cid == "1" ? "事件发生" : row.cid == "3" ? "是" : "事件恢复"
           }}
         </el-tag>
       </template>
@@ -401,23 +401,10 @@
             {
               label: "报警人",
               prop: "galarmPeople"
-            },
-            {
+            }, {
               label: "联系电话",
               prop: "phoneNumber",
               width: 130
-            },
-            {
-              label: "接警人",
-              prop: "alarmPeople"
-            },
-            {
-              label: "接警时间",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm:ss",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-              width: 130,
-              prop: "jjTime"
             },
             {
               label: "事发地址",
@@ -509,6 +496,7 @@
               searchSpan: 3,
               prop: "cid",
               slot: true,
+              hide: true,
               width: 100,
               type: "select",
               dicData: [
@@ -521,6 +509,18 @@
                   value: '3'
                 }
               ],
+            },
+            {
+              label: "接警人",
+              prop: "alarmPeople"
+            },
+            {
+              label: "接警时间",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              width: 130,
+              prop: "jjTime"
             },
           ]
         },
@@ -823,7 +823,7 @@
         });
         this.$store.state.tags.tagList = arr;
         this.$router.push({
-          path: `/real/video/`,query:row
+          path: `/real/video/`, query: row
         });
       },
       handleHistory(row) {
@@ -840,7 +840,7 @@
         this.showMap = true;
         this.$nextTick(() => {
           this.$refs.mapDiv.onload = () => {
-            window.frames[0].init("ClientManagement",{x: row.jd, y: row.wd});
+            window.frames[0].init("ClientManagement", {x: row.jd, y: row.wd});
           };
         });
       },
@@ -865,7 +865,7 @@
               galarmPeople: row.galarmPeople,
               phoneNumber: row.phoneNumber,
               place: row.place,
-              alarmPeople:row.alarmPeople,
+              alarmPeople: row.alarmPeople,
               content: row.content,
               galarmTime: row.alarmTime,
               waringType: row.waringType,
@@ -902,7 +902,7 @@
               });
               that.$store.state.tags.tagList = arr;
               row.type = 0;
-              that.$router.push({ path: "/distribution/index", query: row });
+              that.$router.push({path: "/distribution/index", query: row});
 
             })
             .catch(function (error) {
@@ -1151,11 +1151,11 @@
 
 <style>
 
-  .el-card__body .jtypeClass{
+  .el-card__body .jtypeClass {
     width: 10%;
   }
 
-  .el-card__body .waringTypeClass{
+  .el-card__body .waringTypeClass {
     width: 12%;
   }
 
@@ -1164,11 +1164,13 @@
     width: 155px;
     padding-right: 0px !important;
   }
+
   .el-card__body .cityClass2 {
     width: 100px;
     padding-left: 0px !important;
     padding-right: 0px !important;
   }
+
   .el-card__body .cityClass3 {
     width: 100px;
     padding-left: 0px !important;
@@ -1180,11 +1182,13 @@
     width: 220px;
     padding-right: 0px !important;
   }
+
   .el-dialog .cityClass2 {
     width: 110px;
     padding-left: 5px !important;
     padding-right: 5px !important;
   }
+
   .el-dialog .cityClass3 {
     width: 110px;
     padding-left: 0px !important;
diff --git a/src/views/realTimePolice/realHistory.vue b/src/views/realTimePolice/realHistory.vue
index af7d070..532b164 100644
--- a/src/views/realTimePolice/realHistory.vue
+++ b/src/views/realTimePolice/realHistory.vue
@@ -145,16 +145,6 @@
               prop: "phoneNumber",
               width:130,
             }, {
-              label: "接警人",
-              prop: "alarmPeople",
-            }, {
-              label: "接警时间",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm:ss",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-              width:130,
-              prop: "jjTime",
-            }, {
               label: "事发地址",
               width:200,
               prop: "place",
@@ -233,6 +223,7 @@
               searchSpan: 3,
               prop: "cid",
               width: 100,
+              hide: true,
               slot: true,
               type: "select",
               dicData: [
@@ -245,8 +236,17 @@
                   value: '3'
                 }
               ],
-            },
-
+            }, {
+              label: "接警人",
+              prop: "alarmPeople",
+            }, {
+              label: "接警时间",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              width:130,
+              prop: "jjTime",
+            }
           ]
         },
         data: []

--
Gitblit v1.9.3