lcw

package-lock.json

@@ -2181,51 +2181,6 @@
           "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
         "ssri": {
           "version": "8.0.1",
           "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -2234,28 +2189,6 @@
           "requires": {
             "minipass": "^3.1.1"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
         }
       }
     },
@@ -15205,6 +15138,68 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.3",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-router": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",
@@ -15287,7 +15282,7 @@
           "integrity": "sha512-OzIuTaIfC8QXEPmJvB4Y4kw34rSXdCJzxcD1kFStBvr8bK6X1zQAYDo0CNMjojnfTqRQCJ0I7prlErcoRiET2A=="
         },
         "@popperjs/core": {
-          "version": "npm:@sxzz/popperjs-es@2.11.7",
+          "version": "npm:@popperjs/core@npm:@sxzz/popperjs-es@2.11.7",
           "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
           "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
         },
@@ -15334,6 +15329,13 @@
             "lodash-unified": "^1.0.3",
             "memoize-one": "^6.0.0",
             "normalize-wheel-es": "^1.2.0"
+          },
+          "dependencies": {
+            "@popperjs/core": {
+              "version": "npm:@sxzz/popperjs-es@2.11.7",
+              "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+              "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+            }
           }
         },
         "lodash-unified": {

src/router/index.js

@@ -329,15 +329,7 @@ export const publicRoutes = [
               icon: "article"
             }
           },
-          {
+
-            path: "/policeReport",
-            name: "policeReport",
-            component: () => import("@/views/backOfficeSystem/policeReport/index.vue"),
-            meta: {
-              title: "警情管理",
-              icon: "article"
-            }
-          },
           {
             path: "/transferConsultationList",
             name: "transferConsultationList",
@@ -476,7 +468,15 @@ export const publicRoutes = [
           title: "会商研判",
           icon: "article"
         },
-        children: [
+        children: [{
+          path: "/policeReport",
+          name: "policeReport",
+          component: () => import("@/views/backOfficeSystem/policeReport/index.vue"),
+          meta: {
+            title: "警情管理",
+            icon: "article"
+          }
+        },
         {
           path: "/ResearchHome",
           name: "ResearchHome",

src/views/backOfficeSystem/policeReport/index.vue

@@ -22,8 +22,13 @@
         <template #jqlbdm="{ row }">
           <DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
         </template>
+        <template #jqdjdm="{ row }">
+          <DictTag :tag="false" :value="row.jqdjdm" :options="D_BZ_JQDJ" />
+        </template>
         <!-- 操作 -->
         <template #controls="{ row }">
+          <el-link type="warning" @click="addEdit('edit', row)">研判</el-link>
+          <el-link type="danger" @click="addEdit('edit', row)">深度研判</el-link>
           <el-link type="primary" @click="addEdit('edit', row)">详情</el-link>
         </template>
       </MyTable>
@@ -33,8 +38,8 @@
       }"></Pages>
     </div>
     <!-- 编辑详情 -->
-    <EditAddForm  v-if="show" ref="detailDiloag" :dic="{ JQLB,JQLX,JQXL,JQZL,D_BZ_JQLY,D_BZ_JQFL,JQLB_DP,D_BZ_JQBQ,D_GS_SSYJ }"
+    <EditAddForm v-if="show" ref="detailDiloag"
-      @updateDate="getList" />
+      :dic="{ JQLB, JQLX, JQXL, JQZL, D_BZ_JQLY, D_BZ_JQFL, JQLB_DP, D_BZ_JQBQ, D_GS_SSYJ }" @updateDate="getList" />
   </div>
 </template>
 
@@ -47,7 +52,7 @@ import EditAddForm from "./components/editAddForm.vue";
 import { lzJcjPjdbSelectPage } from '@/api/semanticAnalysis.js'
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const { JQLB,JQLX,JQXL,JQZL,D_BZ_JQLY,D_BZ_JQFL,JQLB_DP,D_BZ_JQBQ,D_GS_SSYJ } = proxy.$dict("JQLB",'JQLX','JQXL','JQZL','D_BZ_JQLY','D_BZ_JQFL','JQLB_DP','D_BZ_JQBQ','D_GS_SSYJ'); //获取字典数据
+const { JQLB, JQLX, JQXL, JQZL, D_BZ_JQLY, D_BZ_JQFL, JQLB_DP, D_BZ_JQBQ, D_GS_SSYJ, D_BZ_JQDJ } = proxy.$dict("JQLB", 'JQLX', 'JQXL', 'JQZL', 'D_BZ_JQLY', 'D_BZ_JQFL', 'JQLB_DP', 'D_BZ_JQBQ', 'D_GS_SSYJ', 'D_BZ_JQDJ'); //获取字典数据
 
 const detailDiloag = ref();
 const show = ref(false)
@@ -70,6 +75,13 @@ const searchConfiger = ref([
     placeholder: "请输入接警单编号",
     showType: "input"
   },
+  {
+    label: "警情等级",
+    prop: "jqdjdm",
+    placeholder: "请输入警情等级",
+    showType: "select",
+    options: D_BZ_JQDJ
+  },
 ]);
 const searchBox = ref(); //搜索框
 const pageData = reactive({
@@ -85,17 +97,19 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   }, //分页
-  controlsWidth: 160, //操作栏宽度
+  controlsWidth: 240, //操作栏宽度
   tableColumn: [
     { label: "接警单编号", prop: "jjdbh" },
     { label: "报警电话", prop: "bjdh" },
     { label: "报警时间", prop: "bjsj" },
     { label: "报警内容", prop: "bjnr", showOverflowTooltip: true },
     { label: "接警员姓名", prop: "jjyxm" },
-    // { label: "警情标签", prop: "jjlx", showSolt: true },
     { label: "警情类型", prop: "jqlbdm", showSolt: true },
+    { label: "警情级别", prop: "jqdjdm", showSolt: true },
     { label: "警情地址", prop: "jqdz" },
     { label: "补充接警内容", prop: "bcjjnr", showOverflowTooltip: true },
+
+
   ]
 });
 onMounted(() => {

src/views/home/components/deployControlItem.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="warning-card" :style="{ 'border': `1px solid ${changeBG(item.yjjb)}` }">
     <div class="warning-image flex">
-      <!-- -->
       <template v-if="!item.yjtp || item.yjtp.includes('baidu')">
         <img src="@/assets/images/car.png" width="65" height="70" v-if="item.yjlb == 2 || item.yjLx == 2" />
         <img src="@/assets/images/default_male.png" width="65" height="70" v-else />

src/views/home/index.vue

@@ -311,7 +311,7 @@ onMounted(() => {
   getTbYjxxGetList()
   // 初始化音频播放器
   initAudioPlayer()
-  webSoket.connect()
+  // webSoket.connect()
   // 监听音频播放事件，获取WebSocket消息数据
   emitter.on("openYp", (newsDate) => {
     // 使用工具类播放音频，自动处理静音切换

src/views/home/layout/head.vue

@@ -148,7 +148,7 @@ const store = useStore();
 const router = useRouter();
 const route = useRoute();
 const btns = reactive({
-  rightBtn: ["实站支撑", "安全监控"],
+  rightBtn: ["实战支撑", "安全监控"],
   leftBtn: ["数据整合", '分析研判'],
   moreBtn: [
     { name: '后台', img: require('@/assets/images/Group427322486.png') },

src/views/home/model/deployControl.vue

@@ -207,10 +207,10 @@ const content = ref({
 const chooseItem = (item) => {
     console.log(item.yjlx);
   switch (item.yjlx) {
-
-
     case '01':
       tbYjxxGetInfo(item.id).then(res => {
+        console.log(res);
+
         content.value = {
           id: item.id,
           ryxm: res.yjRyxm || '',
@@ -221,11 +221,13 @@ const chooseItem = (item) => {
           yjnr: res.yjNr || '',
           yjbq: res.yjbqmc || '',
           yjlx: item.yjlx || '',
+          yjLx: res.yjLx || '',
           jd: res.jd || 0,
           wd: res.wd || 0,
           yjjb: item.yjjb || '',
           czzt: res.czzt || '',
           yjbt: res.yjBt || '',
+          cph: res.yjClcph || '',
         }
         emitter.emit('showHomeYJ', [content.value]);
       })