From 0067d31b32a9f57a494799e9edfc1c042078812a Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Sun, 25 Jan 2026 19:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  2 +-
 .../DeploymentDisposal/mpvPeo/index.vue       | 23 +++------
 .../marksControl/components/addForm.vue       | 14 ++----
 .../IntelligentControl/marksControl/index.vue |  4 +-
 .../JudgmentHome/dataReduction/addForm.vue    |  2 +-
 .../warningControl/combinedWarning/index.vue  |  2 +-
 .../warningControl/scoreRanking/index.vue     | 49 ++++---------------
 .../warningControl/sevenWarningFail/index.vue | 10 ++--
 8 files changed, 32 insertions(+), 74 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 9b60351..346b8ff 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -588,7 +588,7 @@ export const publicRoutes = [
             name: "gzPeo",
             component: () => import("@/views/backOfficeSystem/DeploymentDisposal/gzPeo/index"),
             meta: {
-              title: "关注库",
+              title: "关注人员库",
               icon: "article-create"
             }
           },
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
index c1ff802..3610b4c 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
@@ -176,22 +176,15 @@ const pageData = reactive({
   },
   controlsWidth: 250,
   tableColumn: [
-    { label: "姓名", prop: "ryXm", width: 150 },
-    { label: "性别", prop: "ryXb", showSolt: true, width: 100 },
-    { label: "籍贯", prop: "ryJg", showSolt: true, width: 100 },
-    { label: "身份证", prop: "rySfzh", width: 200 },
-    { label: "民族", prop: "ryMz", showSolt: true, width: 100 },
-    { label: "户籍地区划", prop: "hjdQh", showSolt: true, width: 150 },
-    { label: "户籍派出所", prop: "hjdPcsmc", width: 200 },
-    { label: "户籍地详址", prop: "hjdXz", width: 200 },
-    { label: "标签", prop: "bqList", showSolt: true, width: 400, showOverflowTooltip: true },
-    { label: "管辖单位", prop: "gxSsbmmc", width: 200 },
-    { label: "人员级别", prop: "zdrRyjb", showSolt: true, width: 130 },
-    { label: "管控原因", prop: "zdrLkyy", width: 200, showOverflowTooltip: true },
-    { label: "管控状态", prop: "zdrBkZt", width: 200, showOverflowTooltip: true },
-    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
+    { label: "姓名", prop: "ryXm" },
+    { label: "性别", prop: "ryXb", showSolt: true, width: 80 },
+    { label: "身份证", prop: "rySfzh", width: 180 },
+    { label: "民族", prop: "ryMz", showSolt: true, width: 80 },
+    { label: "户籍派出所", prop: "hjdPcsmc" },
+    { label: "标签", prop: "bqList", showSolt: true, showOverflowTooltip: true },
+    { label: "管辖单位", prop: "gxSsbmmc" },
+    { label: "管控状态", prop: "zdrBkZt", showOverflowTooltip: true,showSolt: true },
     { label: "审核状态", prop: "zdrZt", showSolt: true },
-    { label: "状态", prop: "xtSjzt", showSolt: true },
   ]
 });
 
diff --git a/src/views/backOfficeSystem/IntelligentControl/marksControl/components/addForm.vue b/src/views/backOfficeSystem/IntelligentControl/marksControl/components/addForm.vue
index 85945ba..1c555b9 100644
--- a/src/views/backOfficeSystem/IntelligentControl/marksControl/components/addForm.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/marksControl/components/addForm.vue
@@ -70,15 +70,12 @@ const disabled = ref(false);
 
 // 初始化数据
 const init = (type, row) => {
+  title.value = type == 'edit' ? '编辑' : '新增'
   dialogForm.value = true;
+  if(type == 'edit'){
+  }
 };
-// 根据id查询详情
-const getDataById = (id) => {
-  // qcckGet({id}, "/mosty-gsxt/tbGsxtZdcl/selectByid").then((res) => {
-  //   listQuery.value = res;
-  //   listQuery.value.fjdz = listQuery.value.fjdz?.split(",");
-  // });
-};
+
 
 // 提交
 const submit = () => {
@@ -90,9 +87,6 @@ const submit = () => {
       return { bqdl: listQuery.value.dlid, bqdm: item.bqDm, bqmc: item.bqMc, bqsm: item.bqSm, bqys: item.bqYs }
     })
     const promes = [...a, ...b]
-
-
-    // data.fjdz = data.fjdz?.join(",");
     let url = title.value == "新增" ? "/mosty-gsxt/gsxt/bqbk/saveList" : "/mosty-gsxt/tbGsxtZdcl/update";
 
     loading.value = true;
diff --git a/src/views/backOfficeSystem/IntelligentControl/marksControl/index.vue b/src/views/backOfficeSystem/IntelligentControl/marksControl/index.vue
index 48af258..e8cadf3 100644
--- a/src/views/backOfficeSystem/IntelligentControl/marksControl/index.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/marksControl/index.vue
@@ -139,8 +139,8 @@ const getList = () => {
     pageData.tableConfiger.loading = false;
   });
 };
-const AddFrom = () => {
-  addForm.value.init()
+const AddFrom = (type,row) => {
+  addForm.value.init(type,row)
 }
 const handleItem = (type,row) => {
   proxy.$confirm('确认撤控吗？', '提示', {
diff --git a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
index b64ac47..48821e8 100644
--- a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
@@ -52,7 +52,7 @@
     <!-- 底部按钮 -->
     <div class="bottom-actions" v-if="title !== '新增' && listQuery.id && listQuery.ssbmdm == userInfo.deptCode">
       <el-button type="primary" size="small" @click="sendNotice" :loading="noticeLoading">下发通知</el-button>
-      <el-button type="success" size="small" @click="confirmJudgment" :loading="confirmLoading">确认研判</el-button>
+      <!-- <el-button type="success" size="small" @click="confirmJudgment" :loading="confirmLoading">确认研判</el-button> -->
     </div>
   </div>
 
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue
index 95805c8..97a6a07 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/combinedWarning/index.vue
@@ -119,7 +119,7 @@ const searchConfiger = ref([
   { label: "部门", prop: 'ssbmdm', placeholder: "请选择部门", showType: "department" },
   { label: "级别", prop: 'bqys', placeholder: "请选择级别", showType: "select", options: D_BZ_YJJB },
   { label: "积分段", prop: 'jfd', placeholder: "请选择积分段", showType: "Slot" },
-   { label: "预警时间", prop: 'times', showType: "datetimerange" },
+  { label: "预警时间", prop: 'times', showType: "datetimerange" },
 ]);
 
 const queryFrom = ref({});
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/scoreRanking/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/scoreRanking/index.vue
index 741c72d..072d75d 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/scoreRanking/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/scoreRanking/index.vue
@@ -10,7 +10,7 @@
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
         <template #sfcs="{ row }">
-          <span style="color: #0072ff;" @click="handleClick(row)">{{ row.sfcs }}</span>
+          <span style="color: #0072ff;">{{ row.sfcs }}</span>
         </template>
         <template #yjjb="{ row }">
           <DictTag :value="row.yjjb" :tag="false" :color="bqYs(row.yjjb)" :options="D_BZ_YJJB" />
@@ -24,10 +24,6 @@
         <template #sffz="{ row }">
           <span :style="row.sffz > 100 ? 'color: #ff0000;' : 'color: #0072ff;'">{{ row.sffz }}</span>
         </template>
-
-        <!-- <template #yjjb="{ row }">
-          <DictTag :value="row.yjjb" :tag="false" :color="bqYs(row.yjjb)" :options="D_BZ_YJJB" />
-        </template> -->
         <template #yjtp="{ row }">
           <template v-if="!row.yjtp || row.yjtp.includes('baidu')">
             <img src="@/assets/images/car.png" width="30" height="30" />
@@ -91,14 +87,13 @@ const searchConfiger = ref([
   { label: "预警类型", prop: 'yjlxList', placeholder: "请选择预警类型", showType: "select", options: [],multiple:true },
   { label: "预警级别", prop: 'yjjbList', placeholder: "请选择预警级别", showType: "select", options: [],multiple:true },
   { label: "预警类别", prop: 'yjlbList', placeholder: "请选择预警级别", showType: "select", options: [],multiple:true },
+  { label: "时间", prop: 'times', showType: "datetimerange" },
+  { label: "部门", prop: 'ssbmdm', placeholder: "请选择部门", showType: "department" },
   // { label: "号牌类型", prop: 'hplx', placeholder: "请选择号牌类型", showType: "select", options: [] },
 ]);
 
 const queryFrom = ref({});
-const bqLbData = ref({});
-const listQuery = reactive({
-  yjlx: []
-})
+
 const pageData = reactive({
   tableData: [], //表格数据
   keyCount: 0,
@@ -118,7 +113,7 @@ const pageData = reactive({
   tableColumn: [
     { label: "身份分值", prop: "sffz", showSolt: true },
     // { label: "预警图片", prop: "yjtp", showSlot: true, width: 100 },
-    // { label: "预警时间", prop: "yjsj", showOverflowTooltip: true, width: 150 },
+    { label: "预警时间", prop: "yjsj",},
     { label: "姓名", prop: "ryxm", showOverflowTooltip: true },
     // { label: "车牌号", prop: "cph", showOverflowTooltip: true },
     // { label: "号牌类型", prop: "hplx", showOverflowTooltip: true },
@@ -159,25 +154,16 @@ const pushAssess = (val) => {
   return holographicProfileJump(val.yjlx,val) // 全息档案跳转
 }
 
-// 获取标签大类数据
-const gettbGsxtBqglSelectList = (val) => {
-  tbGsxtBqglSelectList({ sflx: val }).then(res => {
-    bqLbData.value.bqXl = res
-  })
-}
 
 // 获取数据
-const getList = (val) => {
+const getList = () => {
   pageData.tableConfiger.loading = true;
   const promes = {
-    ...val,
     ...queryFrom.value,
     pageCurrent: pageData.pageConfiger.pageCurrent,
     pageSize: pageData.pageConfiger.pageSize
   }
-  if(listQuery.yjlxList?.length) promes.yjlxList = listQuery.yjlxList;
-  if(listQuery.yjjbList?.length) promes.yjjbList = listQuery.yjjbList;
-  if(listQuery.yjlbList?.length) promes.yjlbList = listQuery.yjlbList;
+  delete promes.times;
   qcckPost(promes, '/mosty-gsxt/tbYjxx/selectYjxxFzPage').then((res) => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
@@ -217,21 +203,6 @@ const openAddFrom = (row) => {
   emitter.emit('openAddFrom', row)
 }
 
-const handleClick = (row) => {
-
-}
-
-// 根据身份分值设置行样式
-const getRowClassName = (row) => {
-  if (!row.row.sffz) return '';
-  const score = Number(row.row.sffz);
-  if (score >= 90) return 'score-level-high';
-  if (score >= 70) return 'score-level-medium';
-  if (score >= 50) return 'score-level-low';
-  return '';
-};
-
-
 // 表格高度计算
 const tabHeightFn = () => {
     pageData.tableHeight = window.innerHeight - (searchBox.value?.offsetHeight || 0) - 200;
@@ -242,9 +213,9 @@ const tabHeightFn = () => {
 
 // 搜索
 const onSearch = (obj) => {
-  listQuery.yjlxList = obj.yjlxList || null
-  listQuery.yjjbList = obj.yjjbList || null
-  listQuery.yjlbList = obj.yjlbList || null
+  queryFrom.value = {...obj }
+  queryFrom.value.startTime = obj.times ? obj.times[0] : ''
+  queryFrom.value.endTime = obj.times ? obj.times[1] : ''
   getList()
 }
 
diff --git a/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarningFail/index.vue b/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarningFail/index.vue
index b74e7b7..a186b54 100644
--- a/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarningFail/index.vue
+++ b/src/views/backOfficeSystem/fourColorManage/warningControl/sevenWarningFail/index.vue
@@ -90,14 +90,14 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   }, //分页
-  controlsWidth: 160, //操作栏宽度
+  controlsWidth: 100, //操作栏宽度
   tableColumn: [
     { label: "状态", prop: "czzt", showSolt: true },
-    { label: "预警时间", prop: "yjSj" },
+    { label: "预警时间", prop: "yjSj",width:180 },
     { label: "人员姓名", prop: "yjRyxm", },
-    { label: "身份证号", prop: "yjRysfzh", },
-    { label: "性别", prop: "sex" ,showSolt: true },
-    { label: "年龄", prop: "age", showSolt: true },
+    { label: "身份证号", prop: "yjRysfzh",width:180 },
+    { label: "性别", prop: "sex" ,showSolt: true,width:80 },
+    { label: "年龄", prop: "age", showSolt: true,width:80 },
     { label: "预警级别", prop: "yjJb", showSolt: true },
     { label: "人员类别", prop: "bqdl", showSolt: true },
     { label: "细类", prop: "yjbqmc" },