From 753f425599d3fd1aba4217cfbf440093db8f2865 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 08 Jun 2021 18:54:54 +0800
Subject: [PATCH] 样式修改

---
 src/views/realTimePolice/real.vue |   32 +++++++++++++++++++++++---------
 src/router/views/index.js         |    2 +-
 src/page/index/top/index.vue      |   12 ++++++------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 79cb3d9..aeeb04e 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -204,12 +204,12 @@
         cancelButtonText: this.$t("cancelText"),
         type: "warning",
       }).then(() => {
-        //关闭webSocket
-        window.socket.close();
-        //关闭报警循环
-        window.clearTimeout(window.realTimeQuery);
-        //关闭心跳循环
-        window.clearTimeout(window.websockPing);
+        // //关闭webSocket
+        // window.socket.close();
+        // //关闭报警循环
+        // window.clearTimeout(window.realTimeQuery);
+        // //关闭心跳循环
+        // window.clearTimeout(window.websockPing);
 
         this.$store.dispatch("LogOut").then(() => {
           resetRouter();
diff --git a/src/router/views/index.js b/src/router/views/index.js
index f5d9229..00fca56 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -194,7 +194,7 @@
     redirect: '/realTimePolice/index',
     children: [{
         path: 'index',
-        name: '实时报警',
+        name: '警情派发',
         meta: {
             i18n: 'real'
         },
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 9f4a4dc..eda422b 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -86,7 +86,9 @@
       <template slot-scope="{ row }" slot="jtype">
         <el-tag
         >{{
-          row.jtype == "0" || row.jtype == "" ? "未处理" : row.jtype == "1" ? "处理中" : "已处理"
+          row.jtype == "0" || row.jtype == "" ? "未派发" : row.jtype == "1" && (row.securityId == null || row.securityId
+          == "")
+          ? "未接收" : row.jtype == "1" && (row.securityId != null || row.securityId != "") ? "已接收" : "已处理"
           }}
         </el-tag>
       </template>
@@ -189,6 +191,11 @@
               format: "yyyy-MM-dd HH:mm:ss",
               valueFormat: "yyyy-MM-dd HH:mm:ss",
               prop: "alarmTime",
+              rules: [{
+                required: true,
+                message: "请选择报警时间",
+                trigger: "blur"
+              }],
             },
             {
               label: "报警时间",
@@ -220,6 +227,11 @@
               label: "地址",
               prop: "place",
               span: 10,
+              rules: [{
+                required: true,
+                message: "请选择地址",
+                trigger: "blur"
+              }],
             },
             {
               label: null,
@@ -317,17 +329,18 @@
               viewDisplay: true,
             },
             {
-              label: "警情状态",
+              label: "状态",
               searchSpan: 3,
               width: 96,
               search: true,
               slot: true,
+              addDisplay: false,
               searchPlaceholder: "请选择",
               prop: "jtype",
               type: "select",
               dicData: [
                 {
-                  label: "未处理",
+                  label: "未派发",
                   value: "0",
                 },
                 {
@@ -362,11 +375,6 @@
               addDisplay: true,
               editDisplay: true,
               viewDisplay: true,
-              rules: [{
-                required: true,
-                message: "请选择处警员",
-                trigger: "blur"
-              }],
             }
           ],
         },
@@ -464,7 +472,13 @@
         var userId = JSON.parse(
           window.localStorage.getItem("群防群控后台管理系统-userInfo")
         ).content.real_name;
-        row.alarmPeople = userId;
+
+        if (row.securityArr == "" || row.securityArr == null) {
+          row.jtype = "0";
+        }else {
+          row.jtype = "1";
+        }
+
         add(row).then(
           () => {
             this.onLoad(this.page);

--
Gitblit v1.9.3