Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

package-lock.json

@@ -38,7 +38,7 @@
         "moment": "^2.30.1",
         "ol": "^6.14.1",
         "pinia": "^3.0.1",
-        "pizzip": "^3.1.5",
+        "pizzip": "^3.2.0",
         "siriwave": "2.3.0",
         "tesseract.js": "^6.0.1",
         "vue": "^3.2.8",
@@ -13996,9 +13996,9 @@
       }
     },
     "node_modules/pizzip": {
-      "version": "3.1.5",
+      "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/pizzip/-/pizzip-3.1.5.tgz",
+      "resolved": "https://registry.npmmirror.com/pizzip/-/pizzip-3.2.0.tgz",
-      "integrity": "sha512-uQXb7woLr9baq43Z9EY4wD5cpzrXQd6QUEwehreC1HyRuE4Q1UaGVG9/aCL4CqM4SMz47iE1UyrGtyzmleWHhQ==",
+      "integrity": "sha512-X4NPNICxCfIK8VYhF6wbksn81vTiziyLbvKuORVAmolvnUzl1A1xmz9DAWKxPRq9lZg84pJOOAMq3OE61bD8IQ==",
       "dependencies": {
         "pako": "^2.1.0"
       }
@@ -31902,9 +31902,9 @@
       }
     },
     "pizzip": {
-      "version": "3.1.5",
+      "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/pizzip/-/pizzip-3.1.5.tgz",
+      "resolved": "https://registry.npmmirror.com/pizzip/-/pizzip-3.2.0.tgz",
-      "integrity": "sha512-uQXb7woLr9baq43Z9EY4wD5cpzrXQd6QUEwehreC1HyRuE4Q1UaGVG9/aCL4CqM4SMz47iE1UyrGtyzmleWHhQ==",
+      "integrity": "sha512-X4NPNICxCfIK8VYhF6wbksn81vTiziyLbvKuORVAmolvnUzl1A1xmz9DAWKxPRq9lZg84pJOOAMq3OE61bD8IQ==",
       "requires": {
         "pako": "^2.1.0"
       }

package.json

@@ -39,7 +39,7 @@
     "moment": "^2.30.1",
     "ol": "^6.14.1",
     "pinia": "^3.0.1",
-    "pizzip": "^3.1.5",
+    "pizzip": "^3.2.0",
     "siriwave": "2.3.0",
     "tesseract.js": "^6.0.1",
     "vue": "^3.2.8",

src/components/aboutTable/MyTable.vue

@@ -26,7 +26,7 @@
 
       <el-table-column v-for="(item, index) in tableColumn" :align="getConfiger?.align" :prop="item.prop" :key="index"
         :label="item.label" :width="item.width" style="width: 100%; font-size: 14px"
-        :show-overflow-tooltip="item.showOverflowTooltip || false" :sortable="item.sortable || false">
+        :show-overflow-tooltip="item.showOverflowTooltip || true" :sortable="item.sortable || false">
         <!-- 使用自定义 -->
         <template v-if="item.showSolt" #default="scope">
           <slot :name="item.prop" v-bind="scope"></slot>

src/views/backOfficeSystem/fourColorManage/YjData/index.vue

@@ -29,15 +29,8 @@ import ControlWarning from "@/views/backOfficeSystem/fourColorManage/warningCont
 import RegionalControl from "@/views/backOfficeSystem/fourColorManage/warningControl/regionalControl/index.vue"
 import { ref } from "vue";
 const butList=ref(["预警整合","七类重点","身份预警","行为预警","组合预警","人像预警","车辆预警","布控预警","区域预警"])
-
-
 const qh = ref(1)
 const add = (flag) => {
   qh.value = flag
 }
-
-
-
-
-
 </script>

src/views/backOfficeSystem/fourColorManage/warningControl/fouColorWarning/index.vue

@@ -11,15 +11,15 @@
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
         <template #yjtp="{ row }">
           <div v-if="!row.yjtp || row.yjtp.includes('baidu')">
-            <img src="@/assets/images/car.png" width="65" height="70" v-if="row.yjlb == 2" />
+            <img src="@/assets/images/car.png" width="30" height="40" v-if="row.yjlb == 2" />
-            <img src="@/assets/images/default_male.png" width="65" height="70" v-else />
+            <img src="@/assets/images/default_male.png" width="30" height="40" v-else />
           </div>
-          <el-image preview-teleported v-else @click.stop style="width: 65px; height: 70px" :src="row.yjtp"
+          <el-image preview-teleported v-else @click.stop style="width: 30px; height: 40px" :src="row.yjtp"
             :preview-src-list="[row.yjtp]" show-progress>
             <template #error>
               <div class="image-slot error">
-                <img src="@/assets/images/car.png" width="65" height="70" v-if="row.yjlb == 2" />
+                <img src="@/assets/images/car.png" width="30" height="40" v-if="row.yjlb == 2" />
-                <img src="@/assets/images/default_male.png" width="65" height="70" v-else />
+                <img src="@/assets/images/default_male.png" width="30" height="40" v-else />
               </div>
             </template>
           </el-image>
@@ -28,8 +28,8 @@
         <template #yjjb="{ row }">
           <DictTag :value="row.yjjb" :tag="false" :color="bqYs(row.yjjb)" :options="D_BZ_YJJB" />
         </template>
-        <template #yjlx="{ row }">
+        <template #yjLylx="{ row }">
-          <DictTag :value="row.yjlx" :tag="false" :options="D_GS_ZDQT_YJLB" />
+          <DictTag :value="row.yjLylx" :tag="false" :options="D_BZ_YJLY" />
         </template>
         <template #yjlb="{ row }">
           <DictTag :value="row.yjlb" :options="D_BZ_YJLX" />
@@ -64,13 +64,15 @@ import { qcckGet, qcckPost } from "@/api/qcckApi.js";
 import HolographicArchive from '@/views/home/components/holographicArchive.vue'
 import { reactive, ref, onMounted, getCurrentInstance, computed, watch } from "vue";
 const { proxy } = getCurrentInstance();
-const { D_BZ_YJJB, D_GS_ZDQT_YJLB, D_BZ_YJLX } = proxy.$dict("D_BZ_YJJB", "D_GS_ZDQT_YJLB", "D_BZ_YJLX"); //获取字典数据
+const { D_BZ_YJJB, D_BZ_YJLX,D_BZ_YJLY } = proxy.$dict("D_BZ_YJJB","D_BZ_YJLX",'D_BZ_YJLY'); //获取字典数据
 const searchBox = ref(); //搜索框
 import { holographicProfileJump } from "@/utils/tools.js"
 const searchConfiger = ref(
   [
     { label: "预警级别", prop: 'yjjbList', placeholder: "请输入姓名", showType: "select", options: D_BZ_YJJB },
-    { label: "预警类型", prop: 'yjlxList', placeholder: "请输入身份证号码", showType: "select", options: D_GS_ZDQT_YJLB },
+    { label: "来源类型", prop: 'yjlxList', placeholder: "请输入身份证号码", showType: "select", options: D_BZ_YJLY },
+    { label: "部门", prop: 'ssdmdm',  showType: "department"},
+    { label: "时间", prop: 'timeRange',  showType: "datetimerange"},
   ]);
 
 const queryFrom = ref({});
@@ -90,14 +92,14 @@ const pageData = reactive({
   }, //分页
   controlsWidth: 160, //操作栏宽度
   tableColumn: [
-    { label: "预警图片", prop: "yjtp", showSolt: true },
+    { label: "预警图片", prop: "yjtp", showSolt: true, width: 120 },
     { label: "姓名", prop: "ryxm" },
-    { label: "身份证号", prop: "rysfzh", width: 200 },
+    { label: "身份证号", prop: "rysfzh", width: 170 },
-    { label: "预警标签", prop: "yjbq", width: 150 },
+    { label: "预警标签", prop: "yjbq", width: 120 },
     { label: "预警地址", prop: "yjdz" },
-    { label: "预警级别", prop: "yjjb", showSolt: true },
+    { label: "预警级别", prop: "yjjb", showSolt: true, width: 85 },
     { label: "预警类别", prop: "yjlb", showSolt: true },
-    { label: "预警类型", prop: "yjlx", showSolt: true },
+    { label: "来源类型", prop: "yjLylx", showSolt: true },
     { label: "预警时间", prop: "yjsj", width: 200 },
     { label: "所属部门", prop: "ssbm" },
     { label: "车牌号", prop: "cph" },
@@ -113,6 +115,8 @@ onMounted(() => {
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val }
+  queryFrom.value.startTime = val.timeRange ? val.timeRange[0] : ''
+  queryFrom.value.endTime = val.timeRange ? val.timeRange[1] : ''
   pageData.pageConfiger.pageCurrent = 1;
   getList()
 }
@@ -133,6 +137,7 @@ const getList = () => {
     pageCurrent: pageData.pageConfiger.pageCurrent,
     pageSize: pageData.pageConfiger.pageSize
   }
+  delete promes.timeRange;
   qcckPost(promes, '/mosty-gsxt/tbYjxx/getPageAllList').then((res) => {
     console.log(res);
     pageData.total = res.total || 0;

src/views/home/layout/head.vue

@@ -186,7 +186,7 @@ const handleBtns = (val) => {
   btnsActive.value = val;
   switch (val) {
     case "数据整合":
-      router.push("/resourceMonitoring");
+      router.push("/dataReduction");
       break;
     case "实站支撑":
       router.push("/InfoCollection");
@@ -195,10 +195,10 @@ const handleBtns = (val) => {
       router.push("/ResearchHome");
       break;
     case "后台":
-      router.push("/fouColorWarning");//editPassword
+      router.push("/YjData");
       break;
     case "安全监控":
-      router.push("/BaseLibrary");
+      router.push("/resourceMonitoring");
       break;
     case "退出登录":
       store.dispatch("user/logout");