lcw

src/api/huiShangyp/strategicApi.js

@@ -60,3 +60,36 @@ export const strategicPut = (data, url) => {
     data
   })
 }
+//提交研判申请
+export const ypbgSjzlTjspId = (id) => {
+  return request({
+    url: api + `/ypbg/sjzl/tjsp/${id}`,
+    method: "get"
+  })
+}
+//ypbg/sjzl/queryShList 查询研判内部审核人员列表
+export const ypbgSjzlQueryShList = (params) => {
+  return request({
+    url: api + `/ypbg/sjzl/queryShList`,
+    method: "get",
+    params
+  })
+}
+
+export const ypbgSjzlYpsp = (data) => {
+  return request({
+    url: api + `/ypbg/sjzl/ypsp`,
+    method: "post",
+    data
+  })
+}
+// 提交研判申请
+//   / mosty - api / mosty - gsxt / ypbg / sjzl / tjsp / id
+// 研判内部审核人员查询列表（市情指领导才有权限）
+// /mosty-api/mosty - gsxt / ypbg / sjzl / queryShList
+// 内部研判审批
+//   / mosty - api / mosty - gsxt / ypbg / sjzl / ypsp
+// 提交上级部门审批
+//   / mosty - api / mosty - gsxt / ypbg / sjzl / sendFqzl
+// 工作流审批回掉
+//   / mosty - api / mosty - gsxt / ypbg / sjzl / updateBkgzl

src/api/sysDict.js

@@ -1,5 +1,6 @@
 import request from "@/utils/request";
 const api = "/mosty-api/mosty-base";
+const fzapi = "/mosty-api/mosty-gsxt";
 /*
  * 登录
  *  return promise 实例对象
@@ -154,3 +155,11 @@ export const deleteSysDictItem = (data) => {
     data
   });
 };
+// 方正字典
+export const fzdict = (params) => {
+  return request({
+    url: fzapi + "/xsaj/dict/selectList",
+    method: "GET",
+    params
+  });
+}

src/api/xxcj.js

@@ -186,3 +186,20 @@ export const xxcjXxzhs = (data) => {
     data
   })
 }
+// 线索研判盯办统计
+// 线索总数
+export const xxcjQbcjSelectPage = (params) => {
+  return request({
+    url: api + `/qbcj/selectPage`,
+    method: "get",
+    params
+  })
+}
+// 下发总数列表
+export const xxcjXfxsSelectPage = (params) => {
+  return request({
+    url: api + `/zlxx/selectPage`,
+    method: "get",
+    params
+  })
+}

src/api/yj.js

@@ -217,4 +217,17 @@ export const sjzlQryp = (id) => {
     method: "get",
   })
 }
-
+export const xsajSelectPage = (params) => {
+  return request({
+    url: api + `/asj/xsaj/selectPage`,
+    method: "get",
+    params
+  })
+}
+export const xsajDictSelectList = (params) => {
+  return request({
+    url: api + ``,
+    method: "get",
+    params
+  })
+}

src/components/flowPath/SelectingPeople.vue

@@ -8,22 +8,22 @@
               :key="index">{{ item.nodeName }}</el-checkbox>
           </el-checkbox-group>
         </div>
-        <div> <el-button type="success" :icon="Plus" @click="newAdditions"  v-if="optional"/></div>
+        <div> <el-button type="success" :icon="Plus" @click="newAdditions" v-if="optional" /></div>
       </div>
-      <div v-if="optional"  class="container-box">
+      <div v-if="optional" class="container-box">
         <!-- <div v-if="flwsNode.flwsUserNode?.role.length == 0"> -->
-            <div class="row" v-for="(item, index) in nodeData" :key="index">
+        <div class="row" v-for="(item, index) in nodeData" :key="index">
-              <MOSTY.Department filterable v-model="item.deptId" width="100%"
+          <MOSTY.Department filterable v-model="item.deptId" width="100%"
-                @getDepValue="(obj) => changePostList(index, obj)" clearable placeholder="请选择所属部门" />
+            @getDepValue="(obj) => changePostList(index, obj)" clearable placeholder="请选择所属部门" />
-              <el-select class="select-user" v-model="item.userId" filterable placeholder="选择审批人"
+          <el-select class="select-user" v-model="item.userId" filterable placeholder="选择审批人"
-                @change="changeUser(index)">
+            @change="changeUser(index)">
-                <el-option v-for="item in item.listData" :key="item.id" :label="item.userName" :value="item.id" />
+            <el-option v-for="item in item.listData" :key="item.id" :label="item.userName" :value="item.id" />
-              </el-select>
+          </el-select>
-              <div>
+          <div>
-                <el-button type="danger" @click="newDelitions(index)">删除</el-button>
+            <el-button type="danger" @click="newDelitions(index)">删除</el-button>
-              </div>
+          </div>
-            </div>
+        </div>
-          <!-- </div> -->
+        <!-- </div> -->
       </div>
       <div class="container-box" v-else>
         <div v-for="(item, index) in userList" :key="item.id">
@@ -59,7 +59,7 @@
     <div v-if="showNode && showModel">
 
 
-        </div>
+    </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="close">取消</el-button>
@@ -246,7 +246,7 @@ const qcckPostList = async () => {
         const item = checkListData.value[i].userList[j]
         if (item.checkList && item.checkList.length > 0) {
           data[checkListData.value[i].nodeId] = {
-          users: transformData(checkListData.value[i])
+            users: transformData(checkListData.value[i])
           }
         } else {
           listError.push(checkListData.value[i].nodeName)
@@ -341,7 +341,7 @@ const queryModel = async () => {
     )
     const orgId = getItem('deptId')[0].fzOrgId
     if (!orgId) {
-        proxy.$message({ type: "error", message: "查询模型失败，请重试" })
+      proxy.$message({ type: "error", message: "查询模型失败，请重试" })
       return
     }
     if (eventNode) {
@@ -358,7 +358,7 @@ const queryModel = async () => {
     loading.value = false
   }
 }
-const optional=ref(false)
+const optional = ref(false)
 // 处理事件节点
 const handleEventNode = async (eventNode, orgId) => {
   const nodeExtension = JSON.parse(eventNode.nodeExtension)
@@ -376,13 +376,13 @@ const handleEventNode = async (eventNode, orgId) => {
 
     orgData = await queryListByEntity({ id: orgId })
   } else if (nodeExtension.flwsUserNode.orgType == 'parent') {
-      console.log(2);
+    console.log(2);
     orgData = await querysingleByEntity({ id: orgId })
   } else if (nodeExtension.flwsUserNode.orgType == 'parents') {
-      console.log(3);
+    console.log(3);
     orgData = await queryUporgsByEntity({ id: orgId })
   } else if (nodeExtension.flwsUserNode.orgType == 'appoint') {
-     console.log(4);
+    console.log(4);
     // orgData = await queryUporgsByEntity({ orgcode: orgId })
     console.log(orgData);
 
@@ -405,7 +405,7 @@ const handleEventNode = async (eventNode, orgId) => {
       userList: userRes.rows[0]
     }]
   } else if (nodeExtension.flwsUserNode.orgType == 'optional') {
-    optional.value=true
+    optional.value = true
   } else {
 
     const parentids = orgData.rows.map(item => item.parentid)
@@ -514,37 +514,37 @@ const handleNormalNodes = async (resData, sequenceNode, orgId) => {
   })
 }
 function filterUsersWithOrgInfo(orgsData, checkList) {
-    const result = [];
+  const result = [];
-
-    // 如果没有数据或检查列表为空，返回空数组
-    if (!orgsData || !Array.isArray(orgsData) || !checkList || checkList.length === 0) {
-        return result;
-    }
-
-    // 将checkList转换为Set以提高查找效率
-    const checkSet = new Set(checkList);
-
-    // 遍历所有组织
-    for (const org of orgsData) {
-        // 检查组织是否有用户数据
-        if (org.users && Array.isArray(org.users)) {
-            // 筛选匹配的用户
-            for (const user of org.users) {
-                if (checkSet.has(user.userid)) {
-                    // 创建带组织信息的用户对象
-                    const userWithOrgInfo = {
-                        ...user, // 保留所有原始用户属性
-                        orgCode: org.code, // 添加组织code
-                        orgName: org.name, // 添加组织name
-                        orgId: org.id      // 添加组织id
-                    };
-                    result.push(userWithOrgInfo);
-                }
-            }
-        }
-    }
 
+  // 如果没有数据或检查列表为空，返回空数组
+  if (!orgsData || !Array.isArray(orgsData) || !checkList || checkList.length === 0) {
     return result;
+  }
+
+  // 将checkList转换为Set以提高查找效率
+  const checkSet = new Set(checkList);
+
+  // 遍历所有组织
+  for (const org of orgsData) {
+    // 检查组织是否有用户数据
+    if (org.users && Array.isArray(org.users)) {
+      // 筛选匹配的用户
+      for (const user of org.users) {
+        if (checkSet.has(user.userid)) {
+          // 创建带组织信息的用户对象
+          const userWithOrgInfo = {
+            ...user, // 保留所有原始用户属性
+            orgCode: org.code, // 添加组织code
+            orgName: org.name, // 添加组织name
+            orgId: org.id      // 添加组织id
+          };
+          result.push(userWithOrgInfo);
+        }
+      }
+    }
+  }
+
+  return result;
 }
 //发消息
 const sendMessage = (gzlid) => {
@@ -552,11 +552,11 @@ const sendMessage = (gzlid) => {
   let userList = []
   for (let i = 0; i < checkListData.value.length; i++) {
     letDataCheck = [...letDataCheck, ...checkListData.value[i].checkList]
-  userList.push(checkListData.value[i].userList)
+    userList.push(checkListData.value[i].userList)
   }
 
   const bkshrSfzh = filterUsersWithOrgInfo(userList, letDataCheck).map(item => {
-        return {
+    return {
       bkshrXm: item.username,
       bkshrSfzh: item.userid,
       bkshrSsbmmc: item.orgName,
@@ -586,6 +586,11 @@ const sendMessage = (gzlid) => {
         console.log(res);
       })
       break;
+    case 'YPSH':
+      qcckPost(promes, '/mosty-gsxt/ypbg/sjzl/updateBkgzl').then(res => {
+        console.log(res);
+      })
+      break;
   }
 }
 
@@ -603,7 +608,7 @@ const close = () => {
       orgData: {},
     }
   ]
-  optional.value=false
+  optional.value = false
   emit('update:modelValue', false)
 }
 </script>

src/components/flowPath/submissionProcess.vue

@@ -91,7 +91,6 @@ const qcckGetCount = () => {
       } else {
         setCookie('JSRSSIONID', res.substring(10, res.length))
       }
-
       qcckGetList()
     })
   } else { qcckGetList() }

src/main.js

@@ -52,13 +52,14 @@ import installFilter from "@/filters";
 import mitt from "mitt";
 
 import { resetForm } from "@/utils/validate";
-import { getDict, setCascader } from '@/utils/dict';
+import { getDict, setCascader, getFzDict } from '@/utils/dict';
 import axios from "axios";
 // import fzui from 'fzui-fengqun-vue'
 
 //挂载全局方法
 app.config.globalProperties.resetForm = resetForm;
 app.config.globalProperties.$dict = getDict; //字典公共函数
+app.config.globalProperties.$fzdict = getFzDict; //字典公共函数
 app.config.globalProperties.$message = ELMessage; //element提示组件
 app.config.globalProperties.$set = setCascader; //设置级联选择器回显
 app.config.globalProperties.mittBus = new mitt(); //配置事件总线

src/plugins/utils/dict.js

@@ -117,3 +117,4 @@ export function IdCard(IdCard, type) {
   }
   return user
 }
+

src/router/index.js

@@ -54,6 +54,12 @@ export const publicRoutes = [
     name: "deploymentApproval",
     component: () => import("@/views/backOfficeSystem/ApprovalInformation/deploycontrol/deploymentApproval.vue"),
   },
+  // 布控审核信息
+  {
+    path: "/information",
+    name: "information",
+    component: () => import("@/views/backOfficeSystem/JudgmentHome/internalAuditor/information.vue"),
+  },
   // 线索
   {
     path: "/clueVerification",
@@ -320,15 +326,15 @@ export const publicRoutes = [
             component: () => import("@/views/backOfficeSystem/HumanIntelligence/ConversionSynthesis/index"),
             meta: { title: "转合成列表", icon: "article" },
           },
-          {
+          // {
-            path: "/CollectPoints",
+          //   path: "/CollectPoints",
-            name: "CollectPoints",
+          //   name: "CollectPoints",
-            component: () => import("@/views/backOfficeSystem/HumanIntelligence/CollectPoints/index"),
+          //   component: () => import("@/views/backOfficeSystem/HumanIntelligence/CollectPoints/index"),
-            meta: {
+          //   meta: {
-              title: "采集积分",
+          //     title: "采集积分",
-              icon: "article"
+          //     icon: "article"
-            }
+          //   }
-          },
+          // },
           {
             path: "/transferConsultationList",
             name: "transferConsultationList",
@@ -400,6 +406,14 @@ export const publicRoutes = [
               title: "线索管理",
               icon: "article"
             }
+          }, {
+            path: "/InstructionInformation",
+            name: "InstructionInformation",
+            component: () => import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index"),
+            meta: {
+              title: "线索下发管理",
+              icon: "article"
+            }
           },
           // {
           //   path: "/InformationFlows",
@@ -532,7 +546,15 @@ export const publicRoutes = [
               icon: "article"
             }
           },
-
+          {
+            path: "/internalAuditor",
+            name: "internalAuditor",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/internalAuditor/index.vue"),
+            meta: {
+              title: "内部审核人员",
+              icon: "article"
+            }
+          },
           // {
           //   path: "/analysisReport",
           //   name: "AnalysisReport",
@@ -680,43 +702,7 @@ export const publicRoutes = [
               icon: "article"
             }
           },
-          {
-            path: "/RlStatisticalAnalysis",
-            name: "RlStatisticalAnalysis",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/HumanIntelligence/RlStatisticalAnalysis/index"
-              ),
-            meta: {
-              title: "上报统计分析",
-              icon: "article"
-            }
-          },
 
-          {
-            path: "/TaskScheduling",
-            name: "TaskScheduling",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index"
-              ),
-            meta: {
-              title: "上报任务调度",
-              icon: "article"
-            }
-          },
-          {
-            path: "/ConstructionManagement",
-            name: "ConstructionManagement",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index"
-              ),
-            meta: {
-              title: "力量建设管理",
-              icon: "article"
-            }
-          },
           {
             path: "/JobAppraisal",
             name: "JobAppraisal",
@@ -761,14 +747,6 @@ export const publicRoutes = [
               title: "情报统计分析",
               icon: "article"
             }
-          }, {
-            path: "/InstructionInformation",
-            name: "InstructionInformation",
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index"),
-            meta: {
-              title: "情报指令",
-              icon: "article"
-            }
           }, {
             path: "/RecordsOperations",
             name: "RecordsOperations",
@@ -979,6 +957,42 @@ export const publicRoutes = [
             name: "CollectCrculate",
             component: () => import("@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"),
             meta: { title: "情报采集", icon: "article" },
+          }, {
+            path: "/RlStatisticalAnalysis",
+            name: "RlStatisticalAnalysis",
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/HumanIntelligence/RlStatisticalAnalysis/index"
+              ),
+            meta: {
+              title: "上报统计分析",
+              icon: "article"
+            }
+          },
+
+          {
+            path: "/TaskScheduling",
+            name: "TaskScheduling",
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index"
+              ),
+            meta: {
+              title: "上报任务调度",
+              icon: "article"
+            }
+          },
+          {
+            path: "/ConstructionManagement",
+            name: "ConstructionManagement",
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index"
+              ),
+            meta: {
+              title: "力量建设管理",
+              icon: "article"
+            }
           },
 
           // {

src/utils/dict.js

@@ -1,5 +1,5 @@
 import { ref, toRefs, isRef } from 'vue';
-import { getSysDictByCode } from '@/api/sysDict' //引入封装数字字典接口
+import { getSysDictByCode, fzdict } from '@/api/sysDict' //引入封装数字字典接口
 
 import { getLocalDic } from "@/utils/localDic/index.js"
 /**
@@ -24,11 +24,11 @@ export function getDict(...args) {
   return (() => {
     args.forEach((d, index) => {
       res.value[d] = [];
-
       // 本地字典拦截，如果本地字典存在，则使用本地字典，否则使用远程字典
       if (isLocalDict(d) && getLocalDic(d)) {
         res.value[d] = getLocalDic(d)
       } else {
+
         getSysDictByCode({
           dictCode: d
         }).then(result => {
@@ -53,7 +53,42 @@ export function getDict(...args) {
     return toRefs(res.value);
   })()
 }
+export function getFzDict(...args) {
+  const res = ref({});
+  return (() => {
+    args.forEach((d, index) => {
+      res.value[d] = [];
+      // 本地字典拦截，如果本地字典存在，则使用本地字典，否则使用远程字典
+      if (isLocalDict(d) && getLocalDic(d)) {
+        res.value[d] = getLocalDic(d);
+      } else {
+        fzdict({
+          dictLabel: d
+        }).then(result => {
+          result = result || {};
+          // result.itemList = Array.isArray(result.itemList) ? result.itemList : [];
+          // result.itemList.forEach(p => {
+          //   p.label = p.itemName;
+          //   p.value = p.itemValue;
+          //   p.id = p.itemValue;
+          //   p.elTagType = p.dictType;
+          //   if (p?.itemList && p.itemList?.length > 0) {
+          //     getChildren(p);
+          //   }
+          //   p.children = p.itemList;
+          // });
+          // console.log(res.value);
 
+          res.value[d] = result
+        });
+      }
+    });
+
+    // 使用toRefs确保返回的是响应式对象
+    return toRefs(res.value);
+  })()
+
+}
 export function getChildren(item) {
   item.label = item.zdmc
   item.value = item.dm
@@ -177,3 +212,4 @@ export function getMultiDictVal(values, dict) {
   }).join(',');
 }
 
+

src/utils/route.js

@@ -5,19 +5,21 @@ import { getItem } from '@/utils/storage'
  */
 const getChildrenRoutes = (routes) => {
   const result = [];
-  // const { deptBizType, deptLevel } = getItem('deptId')[0]
+  const { deptBizType, deptLevel } = getItem('deptId')[0]
+  const roleList = getItem('roleList') ? getItem('roleList').filter(item => item.roleCode == 'JS_666666').length > 0 : false
   routes.forEach((route) => {
     if (route.children && route.children.length > 0) {
-      // if (deptBizType == '23') {
+      if (deptBizType == '23' && roleList) {
-      result.push(...route.children);
+        result.push(...route.children);
-      // } else {
+      } else {
-      //   if (route.path == '/HumanIntelligence') {
+        // console.log(route.path);
-      //     route.children.splice(0, 1);
+        if (route.path == '/JudgmentHome') {
-      //     result.push(...route.children);
+          route.children.splice(6, 1);
-      //   } else {
+          result.push(...route.children);
-      //     result.push(...route.children);
+        } else {
-      //   }
+          result.push(...route.children);
-      // }
+        }
+      }
     }
   });
   return result;

src/views/backOfficeSystem/HumanIntelligence/infoCollection/index.vue

@@ -72,7 +72,6 @@
           <DictTag :tag="false" :value="row.czzt" :options="D_BZ_QBCZZT" />
         </template>
         <template #lczt="{ row }">
-
           <DictTag :tag="false" :value="row.lczt" :options="D_BZ_LCZT" />
         </template>
         <!-- 操作 -->
@@ -190,8 +189,7 @@ const isShowTransferMerchantTc = ref(false)
 
 const isShow = ref(false)
 const searchConfiger = ref([
-  { label: "开始时间", prop: "startTime", placeholder: "请选择开始时间", showType: "date" },
+  { label: "时间", prop: "startTime", placeholder: "请选择时间", showType: "daterange" },
-  { label: "结束时间", prop: "endTime", placeholder: "请选择结束时间", showType: "date" },
   { label: "所属单位", prop: "ssbmdm", placeholder: "请选择所属单位", showType: "department" },
   { label: "情报标题", prop: 'qbmc', placeholder: "请输入情报标题", showType: "input" },
   { label: "标签级别", prop: 'qbjb', placeholder: "请选择标签级别", showType: "select", options: D_BZ_BQJB },
@@ -394,14 +392,12 @@ const handleSumbit = () => {
 
 // 搜索
 const onSearch = (val) => {
-  const { lrkssj, zxkssj } = val
+
   const promes = {
     ...pageData.pageConfiger,
     ...val,
-    lrkssj: lrkssj ? lrkssj[0] : '',
+     startTime: val.startTime ? val.startTime[0] : '',
-    lrjssj: lrkssj ? lrkssj[1] : '',
+    endTime: val.endTime ? val.endTime[1] : '',
-    zxkssj: zxkssj ? zxkssj[0] : '',
-    zxjssj: zxkssj ? zxkssj[1] : '',
   }
 
   queryFrom.value = { ...promes }

src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue

@@ -104,11 +104,12 @@ import LineEcharts from "@/views/home/echarts/moreLineEcharts.vue";
 import MyTable from "@/components/aboutTable/DarkTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import { useRoute, useRouter } from 'vue-router';
-import {tbJqGetPageList } from '@/api/yj.js'
+import {tbJqGetPageList,xsajSelectPage } from '@/api/yj.js'
 const router = useRouter();
 import { nextTick, onMounted, reactive, getCurrentInstance, ref, watch } from 'vue';
 const { proxy } = getCurrentInstance();
 const { JQLB } = proxy.$dict("JQLB"); //获取字典数据
+const {GA_D_XSAJXALBDM} = proxy.$fzdict("GA_D_XSAJXALBDM"); //获取字典数据
 const readonly_lx = ref(false)
 const readonly_ry = ref(false)
 const readonly_dd = ref(false)
@@ -195,10 +196,11 @@ const list = reactive([
       pageSize: 6,
     },
     tableColumn: [
-      { label: "案件编号", prop: "ajbh", showOverflowTooltip: true },
+      { label: "案件编号", prop: "asjbh", showOverflowTooltip: true },
-      { label: "案件内容", prop: "ajnr", showOverflowTooltip: true },
+      { label: "案件标题", prop: "ajmc", showOverflowTooltip: true },
-      { label: "案件类型", prop: "ajlx", showOverflowTooltip: true },
+       { label: "简要案情", prop: "jyaq", showOverflowTooltip: true },
-      { label: "案件时间", prop: "ajsj", showOverflowTooltip: true },
+      { label: "案件类型", prop: "ajxlbDmbcms", showOverflowTooltip: true },
+      { label: "案件时间", prop: "asjfssjAsjfskssj", showOverflowTooltip: true },
     ],
   },
   {
@@ -243,11 +245,20 @@ watch(() => JQLB.value, (val) => {
     deep: true, immediate: true
   })
 onMounted(() => {
+
+
   // getCount(); //获取统计数据
   tabHeightFn()
   getJqList() //警情列表
+  getAjList()//案件列表
 });
+// 获取字典
+const getxsajDictSelectList = () => {
+  xsajDictSelectList().then(res => {
+    console.log(res);
 
+  })
+}
 const getCount = () => {
   // 获取处置状态统计
   qcckPost({}, '/mosty-gsxt/qbcj/getXscjTjByXslx').then(res => {
@@ -275,12 +286,13 @@ const changeNo = (e, type) => {
       break;
     case '案件':
       list[2].pageConfiger.page = e;
+       getAjList()
       break;
     case '风险隐患':
       list[3].pageConfiger.page = e;
       break;
   }
-  getJqList()
+  // getJqList()
 }
 const changeSize = (e, type) => {
   switch (type) {
@@ -293,6 +305,7 @@ const changeSize = (e, type) => {
       break;
     case '案件':
       list[2].pageConfiger.pageSize = e;
+      getAjList()
       break;
     case '风险隐患':
       list[3].pageConfiger.pageSize = e;
@@ -316,6 +329,26 @@ const getJqList = () => {
     obj.data_hstj.list = [{ label: '总数', val: [0, res.total, 0, 0] }];
   })
 }
+const getAjList = () => {
+  let params = {
+    pageCurrent: list[2].pageConfiger.page,
+    pageSize: list[2].pageConfiger.pageSize,
+  }
+  console.log("执行");
+
+  xsajSelectPage(params).then(res => {
+    list[2].tableList = res.records || [];
+    list[2].pageConfiger.total = res.total;
+
+    // //模拟的统计警情接口
+    // obj.data_lxtj.list = [{ label: '总数', val: [0, res.total, 0, 0] }];
+    // obj.data_hstj.list = [{ label: '总数', val: [0, res.total, 0, 0] }];
+  })
+}
+    // xsajSelectPage(promes).then(res => {
+    //   list[2].tableList = res.records || [];
+    //   list[2].pageConfiger.total = res.total;
+    // })
 
 
 
@@ -420,7 +453,6 @@ const onSearch = () => {
     })
 
 
-
   } else {
     ElMessage.warning('请选择查询条件')
   }
@@ -602,7 +634,7 @@ const tabHeightFn = () => {
 
 ::v-deep .el-table .el-table__cell {
   padding: 0;
-  
+
 }
 
 ::v-deep .el-table th.el-table__cell>.cell {

src/views/backOfficeSystem/JudgmentHome/internalAuditor/index.vue

@@ -0,0 +1,206 @@
+<template>
+  <div>
+    <div class="titleBox">
+      <PageTitle title="内部审核" />
+    </div>
+    <!-- 搜索 -->
+    <div ref="searchBox">
+      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
+    </div>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #bglx="{ row }">
+          <DictTag :tag="false" :value="row.bglx" :options="D_BZ_YPLX" />
+        </template>
+        <template #ypfs="{ row }">
+          <DictTag :tag="false" :value="row.ypfs" :options="D_BZ_YPFS" />
+        </template>
+        <template #shzt="{ row }">
+          <span v-if="row.shzt == '01'">审批中</span>
+          <span v-if="row.shzt == '02'">已审批</span>
+          <span v-if="row.shzt == '03'">已驳回</span>
+        </template>
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link size="small" type="danger" @click="internalAudit(row.id)">内部审批</el-link>
+          <el-link size="small" type="primary" @click="createProcess(row)">提交上级</el-link>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+  </div>
+  <SubmissionProcess v-model="showSp" :data="rowData" :userData="{ ajmc: '研判审核', flowType: 'YPSH', modelName: '研判' }"
+    :path="fixedValue" @getList="getList" />
+  <Ypdolog v-model="showYpdolog" :dataList="dataList" @getList="getList" />
+</template>
+
+<script setup>
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import { useRoute, useRouter } from 'vue-router'
+import { reactive, ref, onMounted, getCurrentInstance, watch, computed, nextTick } from "vue";
+import { ypbgSjzlQueryShList } from "@/api/huiShangyp/strategicApi.js";
+import SubmissionProcess from '@/components/flowPath/submissionProcess.vue'
+import Ypdolog from './ypdolog.vue'
+const { proxy } = getCurrentInstance();
+const { D_BZ_YPFS, D_BZ_YPLX, D_GS_BQ_LX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX", "D_GS_BQ_LX")
+
+const searchBox = ref(); //搜索框
+const router = useRouter();
+const route = useRoute();
+
+onMounted(() => {
+  tabHeightFn()
+  if (route.query.id) {
+    nextTick(() => {
+      addForm.value && addForm.value.init('edit', {
+        id: route.query.id
+      });
+      router.replace({ path: '/tacticalResearch' })// 移除id 避免刷新一直带参数
+    })
+  }
+  getList()
+});
+const searchConfiger = ref([
+  { label: "研判议题", prop: 'ypyt', placeholder: "请输入研判议题", showType: "input" },
+]);
+
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 240,
+  tableColumn: [
+    { label: "研判议题", prop: "ypyt" },
+    { label: "报告类型", prop: "bglx", showSolt: true },
+    { label: "审核状态", prop: "shzt", showSolt: true },
+    { label: "研判时间", prop: "ypsj" },
+    { label: "研判要求", prop: "ypyq" },
+    { label: "发起部门", prop: "ssbm" },
+    { label: "研判方式", prop: "ypfs", showSolt: true },
+  ]
+});
+
+const queryFrom = ref({});
+// 搜索
+const onSearch = (val) => {
+  const promes = {
+    ...val,
+    ...pageData.pageConfiger,
+  }
+  queryFrom.value = { ...promes }
+  pageData.pageConfiger.pageCurrent = 1;
+  getList()
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getList()
+}
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList()
+}
+
+// 获取列表
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  ypbgSjzlQueryShList(data).then(res => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => { pageData.tableConfiger.loading = false; })
+}
+// 工作流
+const showSp = ref(false);
+const rowData = ref()
+// 固定值
+const fixedValue = {
+  clueVerification: 'information',
+  byMeansOf: 'ypbg/sjzl/sendFqzl',
+  nobyMeansOf: 'ypbg/sjzl/sendFqzl',
+  recycle: 'ypbg/sjzl/sendFqzl',
+}
+const createProcess = (row) => {
+
+  if (row.shzt == '02') {
+    showSp.value = true;
+    rowData.value = row
+  } else {
+    proxy.$message({
+      message: '请先内部审批',
+      type: 'warning'
+    })
+  }
+
+}
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+// 内部审核
+const showYpdolog = ref(false)
+const dataList = ref({})
+const internalAudit = (row) => {
+  dataList.value = row
+  showYpdolog.value = true
+};
+
+
+</script>
+
+<style lang="scss" scoped>
+.label-pop {
+  position: relative;
+
+  &::before {
+    position: absolute;
+    content: '*';
+    top: 0;
+    left: -7px;
+    color: red;
+  }
+}
+</style>
+
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+
+:v-deep .el-dialog {
+  width: 90% !important;
+}
+
+.zdy-model-dialogs {
+  /* background-color: rgb(50, 148, 214); */
+  background: url("~@/assets/images/bg46.png") no-repeat center center;
+  background-size: 100% 100%;
+  padding: 8px 10px;
+  box-sizing: border-box;
+  pointer-events: auto !important;
+  height: calc(100% - 50px);
+  overflow: auto;
+}
+</style>

src/views/backOfficeSystem/JudgmentHome/internalAuditor/information.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="information-container">
+    <h2 class="page-title">研判详情</h2>
+    <div class="info-section">
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">研判议题：</span>
+          <span class="value">{{ detail.ypyt || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">研判方式：</span>
+          <span class="value">
+            <DictTag v-if="detail.ypfs && D_BZ_YPFS" :tag="false" :value="detail.ypfs" :options="D_BZ_YPFS" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">报告类型：</span>
+          <span class="value">
+            <DictTag v-if="detail.bglx && D_BZ_YPLX" :tag="false" :value="detail.bglx" :options="D_BZ_YPLX" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">研判时间：</span>
+          <span class="value">{{ detail.ypsj || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">研判要求：</span>
+          <span class="value">{{ detail.ypyq || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">发起部门：</span>
+          <span class="value">{{ detail.ssbm || '暂无' }}</span>
+        </div>
+      </div>
+    </div>
+
+    <!-- 新增数据展示模块 -->
+    <div class="data-section">
+      <h3 class="section-title">研判部门详情</h3>
+      <el-table :data="detail.cyypList" stripe style="width: 100%" border>
+        <el-table-column prop="ypbmmc" label="研判部门" min-width="150" />
+        <el-table-column prop="scyq" label="上传要求" min-width="200" />
+        <el-table-column prop="fj" label="附件" min-width="150" show-overflow-tooltip>
+          <template #default="scope">
+            <span v-if="scope.row.fj">
+              <span v-for="(file, index) in JSON.parse(scope.row.fj)" :key="index">
+                {{ file.name }}<span v-if="index < JSON.parse(scope.row.fj).length - 1">、</span>
+              </span>
+            </span>
+            <span v-else>暂无</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="wcqk" label="完成情况" min-width="120">
+          <template #default="scope">
+              {{ scope.row.wcqk == '01' ? '准备中' : '已完成' }}
+
+          </template>
+        </el-table-column>
+        <el-table-column prop="wcsj" label="完成时间" min-width="180" />
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import DictTag from '@/components/DictTag/index.vue';
+import { onMounted ,ref,getCurrentInstance} from 'vue';
+import { useRoute } from 'vue-router'
+import {sjzlGetInfo} from '@/api/yj'
+const props = defineProps({
+
+  /** 字典数据 */
+  dict: {
+    type: Object,
+    default: () => ({})
+  }
+});
+const route = useRoute();
+const { proxy } = getCurrentInstance();
+const {D_BZ_YPFS, D_BZ_YPLX}=proxy.$dict("D_BZ_YPFS","D_BZ_YPLX");
+const detail=ref({});
+// 新增：存储用户提供的研判部门详情数据
+const departmentData=ref([
+   {
+     "id": "ae9c8db058fc4bc6b18bc98ab6ef0abd",
+     "sjzlid": "1d538226c8c94577ab3e97f67e7e90bf",
+     "ypbmdm": "540421000000",
+     "ypbmmc": "工布江达县",
+     "scyq": "测试",
+     "fj": "[{\"id\":null,\"name\":\"app登录接口.txt\"}]",
+     "wcqk": "02",
+     "wcsj": "2025-12-26 15:12:29"
+   },
+   {
+     "id": "eef7b85a85784ea4b5211e4330162720",
+     "sjzlid": "1d538226c8c94577ab3e97f67e7e90bf",
+     "ypbmdm": "540402000000",
+     "ypbmmc": "巴宜区",
+     "scyq": "测试",
+     "fj": "[{\"id\":null,\"name\":\"Mosty888.csr\"}]",
+     "wcqk": "02",
+     "wcsj": "2025-12-26 15:12:29"
+   }
+ ]);
+onMounted(() => {
+  console.log(route.query.id);
+  sjzlGetInfo(route.query.id).then(res => {
+  detail.value=res;
+console.log(res);
+ })
+});
+// /ypbg/sjzl/{id}
+</script>
+
+<style lang="scss" scoped>
+.information-container {
+  width: 100%;
+  padding: 20px;
+  background-color: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+}
+
+.page-title {
+  color: #303133;
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 20px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #e8e8e8;
+}
+
+.info-section {
+  width: 100%;
+}
+
+.info-row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 15px;
+}
+
+.info-item {
+  flex: 1;
+  min-width: 300px;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: flex-start;
+}
+
+.label {
+  font-weight: bold;
+  color: #606266;
+  margin-right: 12px;
+  width: 100px;
+  text-align: right;
+  line-height: 32px;
+}
+
+.value {
+  color: #303133;
+  flex: 1;
+  line-height: 32px;
+  word-break: break-word;
+}
+
+/* 新增：数据展示模块样式 */
+.data-section {
+  margin-top: 30px;
+  padding-top: 20px;
+  border-top: 1px solid #e8e8e8;
+}
+
+.section-title {
+  color: #303133;
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 15px;
+}
+</style>

src/views/backOfficeSystem/JudgmentHome/internalAuditor/ypdolog.vue

@@ -0,0 +1,92 @@
+<template>
+  <el-dialog v-model="modelValue" title="内部审核" width="35%" @close="closeDialog" destroy-on-close append-to-body>
+    <div style="height: 15vh; overflow: auto;">
+      <el-form ref="ruleFormRef" :rules="rules" :model="form" label-width="auto" style="max-width: 600px">
+        <el-form-item label="审核状态" prop="shzt">
+          <el-radio-group v-model="form.shzt">
+            <el-radio label="02">通过</el-radio>
+            <el-radio label="03">拒绝</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="shyj">
+          <el-input v-model="form.shyj" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+
+      </el-form>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog(ruleFormRef)">取消</el-button>
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+
+import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import { ref, reactive, getCurrentInstance, watch } from "vue";
+import { ypbgSjzlYpsp } from '@/api/huiShangyp/strategicApi.js'
+const { proxy } = getCurrentInstance()
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dataList: {
+    type: Object,
+    default: () => ({})
+  }
+})
+const emit = defineEmits(['update:modelValue','getList'])
+const closeDialog = (formEl) => {
+  if (!formEl) return
+  formEl.resetFields()
+  emit('update:modelValue', false)
+}
+const rules = reactive({
+  shzt: [
+    { required: true, message: '请选择审核状态', trigger: 'blur' }
+  ],
+  shyj: [
+    { required: true, message: '请输入审核意见', trigger: 'blur' }
+  ]
+})
+const ruleFormRef = ref(null)
+const form = reactive({
+  shzt: '',
+  shyj: ''
+})
+
+const submitForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const promise = {
+        ...form,
+        ypid: props.dataList
+      }
+
+      ypbgSjzlYpsp(promise).then(res => {
+        proxy.$message({
+          message: '操作成功',
+          type: 'success'
+        })
+        emit('getList')
+          formEl.resetFields()
+       emit('update:modelValue', false)
+      })
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+
+
+
+
+
+</script>
+
+<style scoped></style>

src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue

@@ -28,6 +28,7 @@
         <!-- 操作 -->
         <template #controls="{ row }">
           <!-- <el-link size="small" type="primary" @click="getDataById('edit', row)">修改</el-link> -->
+                       <el-link size="small" type="danger" @click="getypbgSjzlTjspId(row.id)" >提交申请</el-link>
           <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
           <el-link size="small" type="primary" @click="createReport(row)">{{ row.ypbg?.id ? '编辑' : '创建' }}报告</el-link>
           <el-link size="small" type="success" @click="createMeeting(row)">创建会议</el-link>
@@ -56,6 +57,7 @@ import Search from "@/components/aboutTable/Search.vue";
 import { useRoute, useRouter } from 'vue-router'
 import { tacticalGet, strategicDelete } from "@/api/huiShangyp/tacticalApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, watch, computed, nextTick } from "vue";
+import {ypbgSjzlTjspId} from "@/api/huiShangyp/strategicApi.js"
 import addReport from "./addReport.vue";
 import AddForm from "./addForm.vue";
 import addMeeting from "./addMeeting.vue";
@@ -202,7 +204,22 @@ const createMeeting = (row) => {
   // currRow.value = { ...row }
   // isShowReport.value = true
 }
+// 提交研判
+const getypbgSjzlTjspId = (id) => {
+  proxy.$confirm('确定提交研判申请吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    ypbgSjzlTjspId(id).then((res) => {
+      proxy.$message.success('提交成功');
+      getList();
+    })
+  }).catch(() => {
+    proxy.$message.info('已取消提交');
+  });
 
+}
 </script>
 
 <style lang="scss" scoped>

src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue

@@ -27,6 +27,7 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
+             <el-link size="small" type="danger" @click="getypbgSjzlTjspId(row.id)" >提交申请</el-link>
           <!-- <el-link size="small" type="primary" @click="getDataById('edit', row)">修改</el-link> -->
           <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
           <el-link size="small" type="primary" @click="createReport(row)">{{ row.ypbg?.id ? '编辑' : '创建' }}报告</el-link>
@@ -54,7 +55,8 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import { useRoute, useRouter } from 'vue-router'
-import { tacticalGet, strategicDelete } from "@/api/huiShangyp/tacticalApi.js";
+import { tacticalGet, strategicDelete, } from "@/api/huiShangyp/tacticalApi.js";
+import {ypbgSjzlTjspId} from "@/api/huiShangyp/strategicApi.js"
 import { reactive, ref, onMounted, getCurrentInstance, watch, computed, nextTick } from "vue";
 import addReport from "./addReport.vue";
 import AddForm from "./addForm.vue";
@@ -202,7 +204,22 @@ const createMeeting = (row) => {
   // currRow.value = { ...row }
   // isShowReport.value = true
 }
+// 提交研判
+const getypbgSjzlTjspId = (id) => {
+  proxy.$confirm('确定提交研判申请吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    ypbgSjzlTjspId(id).then((res) => {
+      proxy.$message.success('提交成功');
+      getList();
+    })
+  }).catch(() => {
+    proxy.$message.info('已取消提交');
+  });
 
+}
 </script>
 
 <style lang="scss" scoped>

src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue

@@ -76,22 +76,21 @@ const props = defineProps({
 const { proxy } = getCurrentInstance();
 const dialogForm = ref(false); //弹窗
 const rules = reactive({
-  xsMc: [{ required: true, message: "请输入线索名称", trigger: "blur" }],
+  qbmc: [{ required: true, message: "请输入线索名称", trigger: "blur" }],
-  xlLx: [{ required: true, message: "请选择线索类型", trigger: "change" }],
+  qblx: [{ required: true, message: "请选择线索类型", trigger: "change" }],
-  qbLy: [{ required: true, message: "请选择情报来源", trigger: "change" }],
 });
 const formData = ref([
   { prop: "gapdive", type: "slot", width: '100%' },
-  { label: "线索名称", prop: "xsMc", type: "input" },
+  { label: "线索名称", prop: "qbmc", type: "input" },
-  { label: "线索类型", prop: "xlLx", type: "select", options: props.dic.D_GS_XS_LX },
+  { label: "线索类型", prop: "qblx", type: "select", options: props.dic.D_GS_XS_LX },
-  { label: "情报来源", prop: "qbLy", type: "select", options: props.dic.D_GS_XS_LY },
+  // { label: "情报来源", prop: "qbly", type: "select", options: props.dic.D_GS_XS_LY },
-  { label: "指向开始时间", prop: "zxkssj", type: "datetime" },
+  // { label: "指向开始时间", prop: "zxkssj", type: "datetime" },
-  { label: "指向结束时间", prop: "zxjssj", type: "datetime" },
+  // { label: "指向结束时间", prop: "zxjssj", type: "datetime" },
-  { label: "指向地点", prop: "zxdz", type: "input" },
+  { label: "线索地点", prop: "zxdz", type: "input" },
   { label: "所属专题", prop: "sszt", type: "select", options: props.dic.D_BZ_SSZT },
   { prop: "gapline", type: "slot", width: '100%' },
   { prop: "scfj", type: "slot", width: '100%' },
-  { label: "线索内容", prop: "xsNr", type: "textarea", width: '100%' },
+  { label: "线索内容", prop: "qbnr", type: "textarea", width: '100%' },
 ]);
 const fjdz = ref()
 const listQuery = ref({}); //表单

src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/xsxf.vue

@@ -0,0 +1,112 @@
+<template>
+  <el-dialog v-model="modelValue" title="线索下发" width="50%" @close="closeDialog" destroy-on-close append-to-body>
+    <div style="height: 50vh; overflow: auto;">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" />
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="submitForm">确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import { ref, reactive, getCurrentInstance, watch } from "vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+const { proxy } = getCurrentInstance()
+const { D_GS_XS_ZLLX, D_GS_ZDQT_FXDJ } = proxy.$dict('D_GS_XS_ZLLX', 'D_GS_ZDQT_FXDJ')
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dataList: {
+    type: Object,
+    default: () => ({})
+  }
+})
+const emit = defineEmits(['update:modelValue', 'getList'])
+const elform = ref(null)
+const closeDialog = (formEl) => {
+  emit('update:modelValue', false)
+}
+
+const rules = reactive({
+  glxs: [{ required: true, message: '请输入线索名称', trigger: 'blur' }],
+  zlbt: [{ required: true, message: '请输入指令标题', trigger: 'blur' }],
+  zllx: [{ required: true, message: '请选择指令类型', trigger: 'change' }],
+  zldj: [{ required: true, message: '请选择指令等级', trigger: 'change' }],
+  xfbmList: [{ required: true, message: '请选择下发部门集合', trigger: 'change' }],
+  zsdw: [{ required: true, message: '请选择主送单位', trigger: 'change' }],
+  csdw: [{ required: true, message: '请选择抄送单位', trigger: 'change' }],
+  zlnr: [{ required: true, message: '请输入指令内容', trigger: 'blur' }],
+})
+const listQuery = ref({})
+const formData = ref(
+  [
+    { label: "线索名称", prop: "glxs", type: "input" },
+    { label: "指令标题", prop: "zlbt", type: "input" },
+    { label: "指令类型", prop: "zllx", type: "select", options: D_GS_XS_ZLLX },
+    { label: "指令等级", prop: "zldj", type: "select", options: D_GS_ZDQT_FXDJ },
+    { label: "指令联系人", prop: "zllxr", type: "input" },
+    { label: "指令联系电话", prop: "zllxdh", type: "input" },
+    { label: "指令结束时间", prop: "jssj", type: "datetime" },
+    { label: "下发部门集合", depMc: 'xfbmListMc', prop: "xfbmList", type: "department", width: "90%", multiple: true },
+    { label: "主送单位", prop: "zsdw", type: "department" },
+    { label: "抄送单位", prop: "csdw", type: "department" },
+    { label: "指令内容", prop: "zlnr", type: "textarea", width: "90%" },
+    { label: "附件地址", prop: "fjzd", type: "upload", width: "90%" },
+  ]
+)
+watch(() => props.modelValue, (newVal, oldVal) => {
+  if (newVal) {
+    listQuery.value.xsid = props.dataList.id
+    listQuery.value.glxsid = props.dataList.id
+    listQuery.value.glxs = props.dataList.qbmc
+  }
+}, { deep: true })
+
+
+const submitForm = (formEl) => {
+  console.log(listQuery.value);
+  elform.value.submit((valid) => {
+    if (valid) {
+      const params = {
+        ...listQuery.value,
+        fjzd:listQuery.value.fjzd? listQuery.value.fjzd.join(',') : '',
+        xfbmList: listQuery.value.xfbmList.map((item, index) => {
+          return {
+            ssbm: listQuery.value.xfbmListMc[index],
+            ssbmdm: item,
+          }
+        }),
+      }
+      qcckPost(params, '/mosty-gsxt/qbcj/xfxs').then((res) => {
+        proxy.$message({ type: "success", message: "下发成功" });
+  emit('update:modelValue', false)
+        // closeDialog(formEl);
+      }).catch(() => {
+        proxy.$message({ type: "error", message: "新增失败" });
+      });
+      console.log(params);
+      // emit('getList', listQuery)
+      // closeDialog(formEl)
+    } else {
+      console.log('校验失败');
+    }
+  })
+  // formEl.validate((valid) => {
+  //   if (valid) {
+  //     emit('getList', listQuery)
+  //     closeDialog(formEl)
+  //   } else {
+  //     console.log('校验失败');
+  //   }
+  // })
+}
+</script>
+
+<style scoped></style>

src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue

@@ -3,105 +3,68 @@
     <div class="titleBox">
       <PageTitle title="线索数据采集">
         <el-button type="primary" @click="addEdit('add', null)">
-          <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
+          <el-icon style="vertical-align: middle">
+            <CirclePlus />
+          </el-icon>
           <span style="vertical-align: middle">新增</span>
         </el-button>
-        <el-button type="danger">
+        <el-button type="danger" @click="plDelDictItem">
-          <el-icon style="vertical-align: middle"><Dete /></el-icon>
+          <el-icon style="vertical-align: middle">
+            <Dete />
+          </el-icon>
           <span style="vertical-align: middle">批量删除</span>
         </el-button>
       </PageTitle>
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"/>
+      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
     </div>
     <!-- 表格 -->
     <div class="tabBox">
-      <MyTable
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :tableData="pageData.tableData"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        :tableColumn="pageData.tableColumn"
+        @chooseData="chooseData">
-        :tableHeight="pageData.tableHeight"
+        <template #qblx="{ row }">
-        :key="pageData.keyCount"
+          <DictTag :tag="false" :value="row.qblx" :options="D_GS_XS_LX" />
-        :tableConfiger="pageData.tableConfiger"
-        :controlsWidth="pageData.controlsWidth">
-        <template #xlLx="{row}">
-          <DictTag :tag="false" :value="row.xlLx" :options="D_GS_XS_LX" />
         </template>
-        <template #qbLy="{row}">
+        <template #cjLx="{ row }">
-          <DictTag :tag="false" :value="row.qbLy" :options="D_GS_XS_LY" />
+          <DictTag :tag="false" :value="row.cjLx" :options="D_GS_XS_LY" />
         </template>
-        <template #czzt="{row}">
+        <template #czzt="{ row }">
-          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
+          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_XSCZZT" />
         </template>
-        <template #zxkssj="{row}">
+
-          <span>{{ row.zxkssj }}</span> 至
+        <template #shzt="{ row }">
-          <span>{{ row.zxjssj }}</span>
-        </template>
-        <template #shzt="{row}">
           <!-- 采纳（将这条信息推送到情报管理）,退回！ -->
           <DictTag :tag="false" :value="row.shzt" :options="D_BZ_XSSHZT" @clickTag="clickTag(row.shzt)" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <template v-if="row.shzt === '0'">
+          <el-link size="small" type="primary" @click="addEdit('info', row)">详情</el-link>
+          <template v-if="!row.gzlid">
+            <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
+            <el-link size="small" type="primary" @click.stop="createProcess(row)">审核</el-link>
+            <el-link size="small" type="danger" @click="delDictItem(row.id)">删除</el-link>
           </template>
-
+          <el-link size="small" type="warning" @click="openXsxf( row)">线索下发</el-link>
-          <!-- <el-popover placement="left" :visible="row.visible" :width="400" trigger="click">
-            <template #reference>
-              <el-link size="small" type="primary" @click.stop="handleSh(row)">审核</el-link>
-            </template>
-
-            <div class="flex mb10 align-center">
-              <div class="w70 label-pop">审核状态 :</div>
-              <div style="flex:1">
-                <el-radio-group v-model="chooseRow.shzt" @change="rules.bhyy = false">
-                  <el-radio v-for="obj in D_BZ_XSSHZT" :key="obj.value" :label="obj.value" >{{ obj.zdmc }}</el-radio>
-                </el-radio-group>
-              </div>
-            </div>
-            <div class="flex" v-if=" chooseRow.shzt == '01'">
-              <div class="w70 label-pop">驳回原因 :</div>
-              <div style="flex:1">
-                <MOSTY.Other filterable style="width: 100%;" v-model="chooseRow.bhyy" type="textarea" rows="3" clearable placeholder="请输入审核原因"/>
-                <div class="f12" style="color: red;" v-if="rules.bhyy">请输入驳回原因</div>
-              </div>
-            </div>
-
-            <div class="mt10 flex just-center">
-              <el-button size="small" @click.stop="cancel(row)">取消</el-button>
-              <el-button size="small" type="primary" @click.stop="handleSumbit(row)">确定</el-button>
-            </div>
-          </el-popover> -->
-         <template  v-if="!row.gzlid">
-          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
-          <el-link size="small" type="primary" @click.stop="createProcess(row)">审核</el-link>
-          <el-link size="small" type="danger" @click="delDictItem(row.id)">删除</el-link>
-         </template>
-         <el-link size="small" type="danger" @click="addEdit('info', row)">详情</el-link>
-          <!-- 续报 == 编辑 -->
-          <el-link size="small" type="warning" @click="addEdit('edit', row)">续报</el-link>
         </template>
       </MyTable>
-      <Pages
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
-        @changeNo="changeNo"
+        ...pageData.pageConfiger,
-        @changeSize="changeSize"
+        total: pageData.total
-        :tableHeight="pageData.tableHeight"
+      }"></Pages>
-        :pageConfiger="{
-          ...pageData.pageConfiger,
-          total: pageData.total
-        }"
-      ></Pages>
     </div>
     <!-- 新增 -->
-    <AddForm ref="detailDiloag" @change="getList" v-if="isShow" :dic="{D_BZ_SF,D_BZ_XB,D_GS_XS_LY,D_BZ_SSZT,D_GS_XS_LX ,D_GS_XS_QTLX}" />
+    <AddForm ref="detailDiloag" @change="getList" v-if="isShow"
+      :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }" />
   </div>
-  <SubmissionProcess v-model="showSp" :data="rowData" :userData="{ ajmc: '线索数据采集审批', flowType: 'XSSJCJSP',modelName:'线索' }"
+  <SubmissionProcess v-model="showSp" :data="rowData"
-  :path="fixedValue" @getList="getList" />
+    :userData="{ ajmc: '线索数据采集审批', flowType: 'XSSJCJSP', modelName: '线索' }" :path="fixedValue" @getList="getList" />
+<Xsxf v-model="xsxfShow" :dataList="rowData"/>
 </template>
 
 <script setup>
-import * as MOSTY from "@/components/MyComponents/index";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -111,27 +74,20 @@ import SubmissionProcess from '@/components/flowPath/submissionProcess.vue'
 import { qcckGet, qcckPost } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 import { useRouter } from "vue-router";
-
+import Xsxf from "./components/xsxf.vue";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const {D_GS_XS_CZZT,D_GS_XS_LY, D_BZ_SSZT,D_BZ_SF,D_GS_XS_LX ,D_GS_XS_QTLX,D_BZ_XB,D_BZ_XSSHZT} = proxy.$dict("D_GS_XS_CZZT","D_GS_XS_LY","D_BZ_SSZT","D_BZ_SF","D_GS_XS_LX","D_GS_XS_QTLX","D_BZ_XB","D_BZ_XSSHZT"); //获取字典数据
+const { D_GS_XS_XSCZZT, D_GS_XS_LY, D_BZ_SSZT, D_BZ_SF, D_GS_XS_LX, D_GS_XS_QTLX, D_BZ_XB, D_BZ_XSSHZT } = proxy.$dict("D_GS_XS_XSCZZT", "D_GS_XS_LY", "D_BZ_SSZT", "D_BZ_SF", "D_GS_XS_LX", "D_GS_XS_QTLX", "D_BZ_XB", "D_BZ_XSSHZT"); //获取字典数据
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 const isShow = ref(false)
 const searchConfiger = ref([
-  { label: "线索名称", prop: 'xsMc', placeholder: "请输入线索名称", showType: "input" },
+  { label: "线索名称", prop: 'qbmc', placeholder: "请输入线索名称", showType: "input" },
-  { label: "内容关键字", prop: 'xsNr', placeholder: "请输入语义关键字", showType: "input" },
+  { label: "内容关键字", prop: 'qbnr', placeholder: "请输入语义关键字", showType: "input" },
-  { label: "线索类型", prop: 'xlLx', placeholder: "请选择线索类型", showType: "select",options:D_GS_XS_LX },
+  { label: "线索类型", prop: 'qblx', placeholder: "请选择线索类型", showType: "select", options: D_GS_XS_LX },
-  { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
+  { label: "线索来源", prop: 'cjLx', placeholder: "请选择线索来源", showType: "select", options: D_GS_XS_LY },
-  { label: "开始时间", prop: 'kssj', placeholder: "请选择开始时间", showType: "datetime" },
-  { label: "结束时间", prop: 'jssj', placeholder: "请选择结束时间", showType: "datetime" },
-  { label: "指向地点", prop: 'zxdz', placeholder: "请输入指向地点", showType: "input" },
 ]);
-const chooseRow = ref({})
+
-const rules = reactive({
-  bhyy:false,
-  shzt: false,
-})
 const pageData = reactive({
   tableData: [],
   keyCount: 0,
@@ -145,18 +101,16 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 220,
+  controlsWidth: 250,
   tableColumn: [
     { label: "线索编号", prop: "xsBh" },
-    { label: "线索名称", prop: "xsMc" },
+    { label: "线索名称", prop: "qbmc" },
-    { label: "线索类型", prop: "xlLx",showSolt:true },
+    { label: "线索类型", prop: "qblx", showSolt: true },
-    { label: "线索来源", prop: "qbLy",showSolt:true },
+    { label: "线索来源", prop: "cjLx", showSolt: true },
-    { label: "指向时间", prop: "zxkssj",showSolt:true,showOverflowTooltip:true },
+    { label: "上报时间", prop: "sxsbsj", showOverflowTooltip: true },
-    { label: "上报时间", prop: "sxsbsj",showOverflowTooltip:true },
+    { label: "线索地点", prop: "zxdz" },
-    { label: "指向地点", prop: "zxdz" },
+    { label: "线索内容", prop: "qbnr" },
-    { label: "线索内容", prop: "xsNr"},
+    { label: "处置状态", prop: "czzt", showSolt: true },
-    { label: "处置状态", prop: "czzt",showSolt: true},
-    { label: "附件", prop: "fjdz", showSolt: true },
     { label: "审核状态", prop: "shzt", showSolt: true },
   ]
 });
@@ -168,74 +122,67 @@ onMounted(() => {
   tabHeightFn();
 });
 
-const handleSh = (val) =>{
+
-  chooseRow.value = {id:val.id,shzt:'01'}
-  val.visible = !val.visible;
-}
-const cancel = (row) =>{
-  row.visible = false;
-  rules.bhyy = false;
-  chooseRow.value = {}
-}
-const handleSumbit = (row) =>{
-  rules.bhyy = !chooseRow.value.bhyy ? true :false;
-  if(chooseRow.value.shzt == '01' && rules.bhyy) return false;
-  let data = { ...chooseRow.value }
-  qcckPost(data,'/mosty-gsxt/qbcj/updateByXssh').then(res=>{
-    row.visible = false;
-    proxy.$message({ type: "success",  message: "审核成功" });
-    getList();
-  })
-}
 
 
 // 搜索
-const onSearch = (val) =>{
+const onSearch = (val) => {
-  queryFrom.value = {...val}
+  queryFrom.value = { ...val }
   pageData.pageConfiger.pageCurrent = 1;
   getList()
 }
 
-const changeNo = (val) =>{
+const changeNo = (val) => {
   pageData.pageConfiger.pageCurrent = val;
   getList()
 }
-const changeSize = (val) =>{
+const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
   getList()
 }
 
 // 获取列表
-const getList = () =>{
+const getList = () => {
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...queryFrom.value,cjLx:'0' };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value, cjLx: '0' };
-  qcckGet(data,'/mosty-gsxt/qbcj/selectPage').then(res=>{
+  qcckGet(data, '/mosty-gsxt/qbcj/selectPage').then(res => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
     pageData.tableConfiger.loading = false;
-  }).catch(()=>{ pageData.tableConfiger.loading = false; })
+  }).catch(() => { pageData.tableConfiger.loading = false; })
 }
 
 // 删除
-const delDictItem = (id) =>{
+const delDictItem = (id) => {
-  proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
+  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
-    qcckPost({id},'/mosty-gsxt/qbcj/delete').then(()=>{
+    qcckPost({ id }, '/mosty-gsxt/qbcj/delete').then(() => {
-      proxy.$message({ type: "success",  message: "删除成功" });
+      proxy.$message({ type: "success", message: "删除成功" });
       getList();
     })
-  }).catch(() => {});
+  }).catch(() => { });
+}
+const ids = ref()
+const chooseData = (val) => {
+  ids.value = val.map(item => item.id)
+}
+const plDelDictItem = () => {
+  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
+    qcckPost({ ids: ids.value }, '/mosty-gsxt/qbcj/deletes').then(() => {
+      proxy.$message({ type: "success", message: "删除成功" });
+      getList();
+    })
+  }).catch(() => { });
 }
-
 // 详情
 const addEdit = (type, row) => {
   isShow.value = true;
-  setTimeout(()=>{
+  setTimeout(() => {
     detailDiloag.value.init(type, row);
-  },500)
+  }, 500)
 };
 
-const clickTag = (val) =>{
+const clickTag = (val) => {
-  if(val == '02')  router.push('/IntelligenceManagement');
+  if (val == '02') router.push('/IntelligenceManagement');
 }
 
 // 表格高度计算
@@ -251,21 +198,32 @@ const showSp = ref(false);
 const rowData = ref()
 // 固定值
 const fixedValue = {
-  clueVerification:'clueVerification',
+  clueVerification: 'clueVerification',
   byMeansOf: 'qbcj/callback',
   nobyMeansOf: 'qbcj/callback',
-  recycle:'qbcj/callback',
+  recycle: 'qbcj/callback',
 }
 const createProcess = (row) => {
   showSp.value = true;
   rowData.value = row
 }
+
+
+
+// 线索下发
+const xsxfShow = ref(false)
+const openXsxf = (row) => {
+  xsxfShow.value = true
+  rowData.value = {...row}
+}
+
 </script>
 
 <style lang="scss" scoped>
-.label-pop{
+.label-pop {
   position: relative;
-  &::before{
+
+  &::before {
     position: absolute;
     content: '*';
     top: 0;
@@ -279,4 +237,3 @@ const createProcess = (row) => {
   background: rgba(0, 0, 0, 0.5) !important;
 }
 </style>
-

src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue

@@ -3,19 +3,43 @@
     <div class="head_box">
       <span class="title">指令{{ title }} </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" v-if="title != '详情'">保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="form_cnt">
+    <div class="form_cnt flex-between">
-      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+      <div class="main-content" :class="{ 'content-with-timeline': title == '详情' }">
-        <template #glxsid>
+        <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" :disabled="title == '详情'">
-          <div class="box pointer ellipsis" @click="chooseVisible = true">
+          <template #glxsid>
-            <span v-if="listQuery.glxs">{{ listQuery.glxs }}</span>
+            <div class="box pointer ellipsis" @click="chooseVisible = true">
-            <span v-else style="color: #b8b8b8;">请选择关联线索</span>
+              <span v-if="listQuery.glxs">{{ listQuery.glxs }}</span>
-          </div>
+              <span v-else class="placeholder-text">请选择关联线索</span>
-        </template>
+            </div>
-      </FormMessage>
+          </template>
+        </FormMessage>
+      </div>
+      <div v-if="title == '详情'" class="timeline-container">
+        <el-timeline class="timeline-wrapper" v-if="listQuery.czlcList.length > 0">
+          <el-timeline-item placement="top" v-for="(activity, index) in listQuery.czlcList" :key="index"
+            :timestamp="activity.czsj" :color="activity.czlx == '01' ? '#409eff' : '#67c23a'" size="large">
+            <div class="timeline-content" :class="activity.czlx == '01' ? 'sign-type' : 'feedback-type'">
+              <div class="content-item">
+                <span class="label">处置部门：</span>
+                <span class="value">{{ activity.ssbm }}</span>
+              </div>
+              <div class="content-item">
+                <span class="label">处置状态：</span>
+                <span class="value status">{{ activity.czlx == '01' ? '签收' : '反馈' }}</span>
+              </div>
+              <div class="content-item">
+                <span class="label">处置内容：</span>
+                <span class="value content">{{ activity.fknr }}</span>
+              </div>
+            </div>
+          </el-timeline-item>
+        </el-timeline>
+        <el-empty description="暂无处置记录" v-else />
+      </div>
     </div>
     <!-- 选择线索 -->
     <Xslist v-model="chooseVisible" @choosed="choosed" :roleIds="roleIds"></Xslist>
@@ -26,7 +50,6 @@
 import Xslist from '@/components/ChooseList/ChooseXs/index.vue'
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import * as rule from "@/utils/rules.js";
 import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
@@ -38,16 +61,16 @@ const { proxy } = getCurrentInstance();
 const dialogForm = ref(false); //弹窗
 const formData = ref([
   { label: "指令标题", prop: "zlbt", type: "input", },
-  { label: "指令类型", prop: "zllx",  type: "select", options: props.dic.D_GS_XS_ZLLX  },
+  { label: "指令类型", prop: "zllx", type: "select", options: props.dic.D_GS_XS_ZLLX },
-  { label: "指令等级", prop: "zldj",  type: "select", options: props.dic.D_GS_ZDQT_FXDJ },
+  { label: "指令等级", prop: "zldj", type: "select", options: props.dic.D_GS_ZDQT_FXDJ },
-  { label: "反馈结束时间", prop: "jssj",  type: "datetime"  },
+  { label: "反馈结束时间", prop: "jssj", type: "datetime" },
-  { label: "联系人", prop: "zllxr",  type: "input"  },
+  { label: "联系人", prop: "zllxr", type: "input" },
-  { label: "联系电话", prop: "zllxdh",  type: "input"  },
+  { label: "联系电话", prop: "zllxdh", type: "input" },
-  { label: "关联线索", prop: "glxsid",  type: "slot"  },
+  { label: "关联线索", prop: "glxsid", type: "slot" },
-  { label: "主送单位", prop: "zsdw",  type: "department"  },
+  { label: "主送单位", prop: "zsdw", type: "department" },
-  { label: "抄送单位", prop: "csdw",  type: "department"  },
+  { label: "抄送单位", prop: "csdw", type: "department" },
-  { label: "指令内容", prop: "zlnr",  type: "textarea",width: '100%' },
+  { label: "指令内容", prop: "zlnr", type: "textarea", width: '100%' },
-  { label: "附件", prop: "fjzd",  type: "upload",width: '100%' },
+  { label: "附件", prop: "fjzd", type: "upload", width: '100%' },
 ]);
 const listQuery = ref({}); //表单
 const loading = ref(false);
@@ -69,14 +92,18 @@ const rules = reactive({
 const init = (type, row,) => {
   listQuery.value.fjzd = null
   dialogForm.value = true;
-  title.value = type == 'add' ? "新增" : "编辑";
+  title.value = type == 'add' ? '新增' : type == 'info' ? '详情' : '编辑';
+
   if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  qcckGet({id}, '/mosty-gsxt/zlxx/selectByid').then((res) => {
+  qcckGet({ id }, '/mosty-gsxt/zlxx/selectByid').then((res) => {
-    res.fjzd = res.fjzd ? res.fjzd.split(','):[];
+    res.fjzd = res.fjzd ? res.fjzd.split(',') : [];
-    listQuery.value = res;
+    listQuery.value = {
+      ...res,
+      czlcList: res.czlcList ? res.czlcList.reverse() : []
+    };
   });
 };
 
@@ -84,22 +111,22 @@ const getDataById = (id) => {
 const choosed = (val) => {
   listQuery.value.glxs = val[0].xsMc;
   listQuery.value.glxsid = val[0].id;
-  roleIds.value = val.map(v=>v.id)
+  roleIds.value = val.map(v => v.id)
 }
 
 // 提交
 const submit = () => {
-  elform.value.submit((data)=>{
+  elform.value.submit((data) => {
-    let url =  title.value == "新增" ? '/mosty-gsxt/zlxx/add':'/mosty-gsxt/zlxx/update';
+    let url = title.value == "新增" ? '/mosty-gsxt/zlxx/add' : '/mosty-gsxt/zlxx/update';
     let params = { ...data }
     loading.value = true;
-    params.fjzd = params.fjzd ? params.fjzd.join(','):''
+    params.fjzd = params.fjzd ? params.fjzd.join(',') : ''
     qcckPost(params, url).then((res) => {
       loading.value = false;
       proxy.$message({ type: "success", message: title.value + "成功" });
       emit("updateDate");
       close();
-    }).catch(() => {loading.value = false;});
+    }).catch(() => { loading.value = false; });
   });
 };
 
@@ -115,11 +142,115 @@ defineExpose({ init });
 <style lang="scss" scoped>
 @import "~@/assets/css/layout.scss";
 @import "~@/assets/css/element-plus.scss";
-.box{
+
+.box {
   width: 100%;
   height: 32px;
   border-radius: 4px;
   border: 1px solid #e9e9e9;
   padding-left: 10px;
 }
+
+// 新增类样式
+.flex-between {
+  display: flex;
+  justify-content: space-between;
+}
+
+.main-content {
+  margin-right: 10px;
+  width: 100%;
+}
+
+.content-with-timeline {
+  width: 80%;
+}
+
+.placeholder-text {
+  color: #b8b8b8;
+}
+
+.timeline-container {
+  width: 18%;
+}
+
+.timeline-wrapper {
+  max-width: 100%;
+  padding: 10px;
+  background-color: #f5f7fa;
+  border-radius: 8px;
+}
+
+// 时间线样式优化
+.el-timeline {
+  .el-timeline-item {
+    &::before {
+      height: calc(100% - 20px); // 调整时间线高度
+    }
+
+    .el-timeline-item__content {
+      min-height: 80px; // 确保内容区域有足够空间
+    }
+
+    .el-timeline-item__timestamp {
+      font-size: 12px;
+      color: #909399;
+      margin-bottom: 8px;
+    }
+  }
+}
+
+.timeline-content {
+  padding: 12px;
+  background-color: white;
+  border-radius: 6px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
+  border-left: 3px solid transparent;
+
+  &.sign-type {
+    border-left-color: #409eff;
+
+    .status {
+      color: #409eff;
+    }
+  }
+
+  &.feedback-type {
+    border-left-color: #67c23a;
+
+    .status {
+      color: #67c23a;
+    }
+  }
+}
+
+.content-item {
+  margin-bottom: 6px;
+  line-height: 1.5;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.label {
+  font-weight: 500;
+  color: #303133;
+  margin-right: 5px;
+}
+
+.value {
+  color: #606266;
+
+  &.status {
+    font-weight: 500;
+  }
+
+  &.content {
+    // display: block;
+    // margin-top: 5px;
+    // word-break: break-all;
+    // white-space: pre-wrap;
+  }
+}
 </style>

src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/fk.vue

@@ -0,0 +1,78 @@
+<template>
+  <el-dialog v-model="modelValue" title="线索反馈" width="50%" @close="closeDialog" destroy-on-close append-to-body>
+    <div style="height: 15vh; overflow: auto;">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" />
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="submitForm">确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import { ref, reactive, getCurrentInstance, watch } from "vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+const { proxy } = getCurrentInstance()
+const { D_GS_XS_ZLLX, D_GS_ZDQT_FXDJ } = proxy.$dict('D_GS_XS_ZLLX', 'D_GS_ZDQT_FXDJ')
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dataList: {
+    type: Object,
+    default: () => ({})
+  }
+})
+const emit = defineEmits(['update:modelValue', 'getList'])
+const elform = ref(null)
+const closeDialog = (formEl) => {
+  elform.value.reset()
+  emit('update:modelValue', false)
+}
+
+const rules = reactive({
+  fknr: [{ required: true, message: '请输入反馈内容', trigger: 'blur' }],
+})
+const listQuery = ref({})
+const formData = ref(
+  [
+    { label: "反馈内容", prop: "fknr", type: "textarea" ,width:'90%'},
+  ]
+)
+watch(() => props.modelValue, (newVal, oldVal) => {
+  if (newVal) {
+    listQuery.value.zlxxid = props.dataList.id
+  }
+}, { deep: true })
+
+
+const submitForm = (formEl) => {
+  console.log(listQuery.value);
+  elform.value.submit((valid) => {
+    if (valid) {
+      const params = {
+        ...listQuery.value,
+      }
+      qcckPost(params, '/mosty-gsxt/zlxx/fk').then((res) => {
+        proxy.$message({ type: "success", message: "反馈成功" });
+        emit('getList')
+        closeDialog()
+      }).catch(() => {
+        proxy.$message({ type: "error", message: "反馈失败" });
+      });
+      console.log(params);
+
+    } else {
+      console.log('校验失败');
+    }
+  })
+
+}
+</script>
+
+<style scoped></style>

src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index.vue

@@ -31,9 +31,18 @@
         </template>
         <template #czzt="{row}">
           <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
+        </template>
+              <template #sffk="{row}">
+                {{ row.sffk == '1' ? '已反馈' : '未反馈' }}
+        </template>
+              <template #sfqs="{row}">
+                {{ row.sfqs == '0' ? '未签收' : '已签收' }}
         </template>
         <template #controls="{ row }">
+                    <el-link size="small" type="primary" v-if="row.sfqs == '0'" @click="signRow(row)">签收</el-link>
+          <el-link size="small" type="warning" @click="fkRow(row)">反馈</el-link>
           <el-link size="small" type="primary" @click="addEdit('edit', row)">编辑</el-link>
+                 <el-link size="small" type="primary" @click="addEdit('info', row)">详情</el-link>
           <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
         </template>
       </MyTable>
@@ -50,6 +59,7 @@
     <!-- 详情 -->
     <DetailForm ref="detailDiloag" v-if="isShow" @updateDate="getList" :dic="{D_GS_XS_ZLLX,D_GS_ZDQT_FXDJ}" />
   </div>
+  <Fk  v-model="isShowFk"  :dataList="dataList" @getList="getList"/>
 </template>
 
 <script setup>
@@ -58,6 +68,7 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/detailForm.vue";
+import Fk from "./components/fk.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
@@ -87,13 +98,15 @@ const pageData = reactive({
       pageSize: 20,
       pageCurrent: 1
     },
-    controlsWidth: 120,
+    controlsWidth: 240,
     tableColumn: [
       { label: '指令标题', prop: 'zlbt' },
       { label: '指令类型', prop: 'zllx',showSolt:true  },
       { label: '指令等级', prop: 'zldj',showSolt:true  },
       { label: '反馈截止时间', prop: 'jssj' },
-      { label: '处置状态', prop: 'czzt',showSolt:true },
+      { label: '处置状态', prop: 'czzt', showSolt: true },
+      { label: '是否反馈', prop: 'sffk', showSolt: true },
+      { label: '是否签收', prop: 'sfqs', showSolt: true },
     ]
   });
 
@@ -150,7 +163,27 @@ const addEdit = (type, row) => {
     detailDiloag.value.init(type, row);
   })
 };
+// 签收
+const signRow = (row) =>{
+  proxy.$confirm("确定要签收", "警告", {type: "warning"}).then(() => {
+    qcckGet({id:row.id},'/mosty-gsxt/zlxx/qs').then(()=>{
+      proxy.$message({ type: "success",  message: "签收成功" });
+      getList();
+    })
+  }).catch(() => {});
+}
+// 反馈
+const isShowFk = ref(false)
+const dataList = ref()
+const fkRow = (row) => {
+  if (row.sfqs=='0') {
+    proxy.$message({ type: "error",  message: "请先签收" });
+    return;
+  }
+  isShowFk.value = true;
+  dataList.value = {...row};
 
+}
 // 表格高度计算
 const tabHeightFn = () => {
   pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;

src/views/backOfficeSystem/fourColorManage/warningList/vehicleWarning/components/localWarning.vue

@@ -116,7 +116,7 @@ const pageData = reactive({
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "checkBox",
+    showSelectType: "null",
     loading: false,
     haveControls: true
   },
@@ -129,15 +129,12 @@ const pageData = reactive({
   controlsWidth: 300, //操作栏宽度
   tableColumn: [
     { label: "预警图片", prop: "yjTp", showSolt: true, width: 100 },
+    { label: "布控车牌号", prop: "yjClcph", showOverflowTooltip: true },
     { label: "处置状态", prop: "czzt", showSolt: true },
     { label: "预警时间", prop: "yjSj", showOverflowTooltip: true },
-    { label: "姓名", prop: "yjRyxm" },
+    { label: "标题", prop: "yjBt" },
-    { label: "年龄", prop: "nl", showSolt: true, width: 80 },
+       { label: "内容", prop: "yjNr", showOverflowTooltip: true },
-    { label: "数据来源", prop: "yjLylx", showOverflowTooltip: true },
+
-    { label: "身份证", prop: "yjRysfzh", showOverflowTooltip: true },
-    // { label: "预警级别", prop: "yjJb", showSolt: true },
-    // { label: "相似度", prop: "xsd", showSolt: true },
-    { label: "布控车牌号", prop: "yjClcph", showOverflowTooltip: true },
 
   ]
 });

src/views/home/components/informationCollection.vue

@@ -0,0 +1,146 @@
+<template>
+  <el-dialog v-model="modelValue" :title="title" width="70%" @close="closeDialog" destroy-on-close append-to-body>
+    <div style="height: 60vh; overflow: auto;">
+      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #qblx="{ row }">
+          <DictTag :tag="false" :value="row.qblx" :options="D_GS_XS_LX" />
+        </template>
+        <template #qbly="{ row }">
+          <DictTag :tag="false" :value="row.qbly" :options="D_BZ_CJLX" />
+        </template>
+        <template #czzt="{ row }">
+          <DictTag :tag="false" :value="row.czzt" :options="D_BZ_QBCZZT" />
+        </template>
+        <template #lczt="{ row }">
+
+          <DictTag :tag="false" :value="row.lczt" :options="D_BZ_LCZT" />
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="closeDialog">确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import { xxcjSelectXxsbPage, xxcjDeletes, xxcjXxzsx, xxcjUpdateCzlc, xxcjXxqd } from '@/api/xxcj.js'
+import { ref, reactive, getCurrentInstance, watch } from "vue";
+const { proxy } = getCurrentInstance()
+const { D_GS_XS_LX,  D_BZ_QBCZZT, D_BZ_CJLX, D_BZ_LCZT } =
+  proxy.$dict("D_GS_XS_LX",  "D_BZ_QBCZZT", "D_BZ_CJLX", "D_BZ_LCZT"); //获取字典数据
+const detailDiloag = ref();
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dict: {
+    type: Object,
+    default: () => ({})
+  }, title: {
+    default: "下发总数",
+    type: String
+  },
+  sfqs: {
+    type: String,
+    default: ''
+  },
+  sffk: {
+    type: String,
+    default: ''
+  }
+})
+const searchConfiger = ref([
+  { label: "名称", prop: 'qbmc', placeholder: "请输入情报名称", showType: "input" },
+  { label: "所属单位", prop: "ssbmdm", placeholder: "请选择所属单位", showType: "department" },
+  { label: "时间", prop: "startTime", placeholder: "请选择时间", showType: "daterange" },
+  { label: "处置状态", prop: 'lczt', placeholder: "请选择处置状态", showType: "select", options: D_BZ_LCZT },
+]);
+const emit = defineEmits(['update:modelValue'])
+const closeDialog = () => {
+  emit('update:modelValue', false)
+}
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    loading: false,
+    rowHieght: 40,
+    haveControls: false,
+    showSelectType: 'null',
+  },
+  controlsWidth: 160, //操作栏宽度
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  tableColumn: [
+    { label: "情报上报时间", prop: "sxsbsj" },
+    { label: "情报编号", prop: "xsBh" },
+    { label: "情报标题", prop: "qbmc" },
+    { label: "情报来源", prop: "qbly", showSolt: true },
+    { label: "流程状态", prop: "lczt", showSolt: true },
+  ],
+  tableHeight: "43vh",
+});
+const parameter = ref()
+const onSearch = (val) => {
+  const promes = {
+    ...pageData.pageConfiger,
+    ...val,
+    startTime: val.startTime ? val.startTime[0] : '',
+    endTime: val.endTime ? val.endTime[1] : '',
+  }
+  parameter.value = { ...promes }
+  pageData.pageConfiger.pageCurrent = 1;
+
+  // parameter.value = { ...val }
+  // pageData.pageConfiger.pageCurrent = 1;
+  changePage()
+}
+watch(() => props.modelValue, (val) => {
+  if (val) {
+    changePage()
+  }
+})
+
+const changePage = () => {
+  pageData.tableConfiger.loading = true;
+  const promes = {
+    ...parameter.value,
+    ...pageData.pageConfiger,
+  }
+  xxcjSelectXxsbPage(promes).then((res) => {
+    pageData.total = res.total || 0;
+    pageData.tableConfiger.loading = false;
+    pageData.tableData = res.records
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  })
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  changePage()
+}
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  changePage()
+}
+</script>
+
+<style scoped></style>

src/views/home/components/keyGroups.vue

@@ -4,24 +4,30 @@
     <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
         <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData" fixed="right">
+         fixed="right" :expand="true">
         <template #qtLb="{ row }">
           <DictTag :tag="false" :value="row.qtLb" :options="D_GS_ZDQT_LB" />
         </template>
         <template #qtFxdj="{ row }">
           <DictTag :tag="false" :value="row.qtFxdj" :options="D_GS_ZDQT_FXDJ" />
         </template>
-        <template #bqList="{ row }">
+        <!-- <template #bqList="{ row }">
           <ul>
             <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
               item.bqFz || 0 }} 分) </li>
           </ul>
-        </template>
+        </template> -->
+
         <template #zdryList="{ row }">
           <span style="color: #0072ff">{{ row.zdryList ? row.zdryList.length : 0 }}</span>
         </template>
-        <template #qtZt="{ row }">
+        <!-- <template #qtZt="{ row }">
           <DictTag :tag="false" :value="row.qtZt" :options="D_GS_ZDQT_ZT" />
+        </template> -->
+                <template #expand="{ props }">
+          <div class="expand-content" style="max-width: 100%">
+        <ZdqtItem :row="props" :dict="{D_GS_ZDR_RYJB,D_GS_ZDR_BK_ZT,D_GS_ZDR_CZZT,D_GS_ZDQT_ZT}" />
+          </div>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -45,7 +51,7 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { ref, reactive, getCurrentInstance, watch } from "vue";
 import { useRoute, useRouter } from 'vue-router'
-import {timeValidate} from '@/utils/tools.js'
+import ZdqtItem from "./zdqtItem.vue";
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance()
@@ -100,6 +106,7 @@ const pageData = reactive({
     loading: false,
     rowHieght: 40,
     haveControls: false,
+        showSelectType:'null'
   },
   controlsWidth: 160, //操作栏宽度
   total: 0,
@@ -108,20 +115,13 @@ const pageData = reactive({
     pageCurrent: 1
   }, //分页
   tableColumn: [
-    { label: "群体名称", prop: "qtMc", width: 150 },
+    { label: "群体名称", prop: "qtMc" },
-    { label: "群体类别", prop: "qtLb", showSolt: true, width: 150 },
+    { label: "群体类别", prop: "qtLb", showSolt: true },
-    { label: "风险等级", prop: "qtFxdj", showSolt: true, width: 150 },
+    { label: "风险等级", prop: "qtFxdj", showSolt: true},
-    { label: "背景资料", prop: "qtBjzl", width: 150 },
+    { label: "背景资料", prop: "qtBjzl" },
-    { label: "背景信息", prop: "bgxx", showSolt: true, width: 150 },
+    { label: "背景信息", prop: "bgxx", showSolt: true },
-    { label: "管辖单位", prop: "gxSsdwmc", width: 150 },
+    { label: "管辖单位", prop: "gxSsdwmc" },
-    { label: "列控原因", prop: "zdrLkyy", width: 150 },
+
-    { label: "开始时间", prop: "zdrRkkssj", width: 150 },
-    { label: "截至时间", prop: "zdrRkjssj", width: 150 },
-    { label: "稳控人数", prop: "zdryList", showSolt: true, width: 150 },
-    { label: "状态", prop: "qtZt", showSolt: true, width: 150 },
-    { label: "标签", prop: "bqList", showSolt: true, showOverflowTooltip: true, width: 400 },
-    { label: "创建单位", prop: "xtCjbmmc", width: 150 },
-    { label: "创建时间", prop: "xtCjsj", width: 150 },
   ],
   tableHeight: "42vh",
 });

src/views/home/components/keyPerson.vue

@@ -6,7 +6,7 @@
     <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
        <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
+        :expand="true">
         <template #bqList="{ row }">
           <ul>
             <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
@@ -25,22 +25,18 @@
         <template #hjdQh="{ row }">
           <DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" />
         </template>
-        <template #zdrRyjb="{ row }">
+
-          <DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB" />
-        </template>
-        <template #zdrBkZt="{ row }">
-          <DictTag :tag="false" :value="row.zdrBkZt" :options="D_GS_ZDR_BK_ZT" />
-        </template>
-        <template #zdrCzzt="{ row }">
-          <DictTag :tag="false" :value="row.zdrCzzt" :options="D_GS_ZDR_CZZT" />
-        </template>
         <template #zdrZt="{ row }">
           <DictTag :tag="false" :value="row.zdrZt" :options="D_GS_ZDQT_ZT" />
         </template>
         <template #xtSjzt="{ row }">
           <div> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
         </template>
-
+        <template #expand="{ props }">
+          <div class="expand-content" style="max-width: 100%">
+        <ZdrItemfrom :row="props" :dict="{D_GS_ZDR_RYJB,D_GS_ZDR_BK_ZT,D_GS_ZDR_CZZT,D_GS_ZDQT_ZT}" />
+          </div>
+        </template>
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-link size="small" type="success" @click="handleremove(row.id)">移除</el-link>
@@ -73,7 +69,8 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { ref, reactive, getCurrentInstance, watch } from "vue";
 import { useRoute, useRouter } from 'vue-router'
-import {timeValidate} from '@/utils/tools.js'
+import { timeValidate } from '@/utils/tools.js'
+import ZdrItemfrom from  './zdrItem.vue'
 const route = useRoute()
 const router = useRouter()
 const { proxy } = getCurrentInstance()
@@ -134,6 +131,7 @@ const pageData = reactive({
     loading: false,
     rowHieght: 40,
     haveControls: false,
+    showSelectType:'null'
   },
   controlsWidth: 160, //操作栏宽度
   total: 0,
@@ -142,22 +140,13 @@ const pageData = reactive({
     pageCurrent: 1
   }, //分页
   tableColumn: [
-     { label: "姓名", prop: "ryXm", width: 150 },
+     { label: "姓名", prop: "ryXm" },
-    { label: "性别", prop: "ryXb", showSolt: true, width: 100 },
+    { label: "性别", prop: "ryXb", showSolt: true },
-    { label: "籍贯", prop: "ryJg", showSolt: true, width: 100 },
+    { label: "籍贯", prop: "ryJg", showSolt: true},
-    { label: "身份证", prop: "rySfzh", width: 200 },
+    { label: "身份证", prop: "rySfzh" },
-    { label: "民族", prop: "ryMz", showSolt: true, width: 100 },
+    { label: "民族", prop: "ryMz", showSolt: true },
-    { label: "户籍地区划", prop: "hjdQh", showSolt: true, width: 150 },
+    { label: "户籍地区划", prop: "hjdQh", showSolt: true },
-    { label: "户籍派出所", prop: "hjdPcsmc", width: 200 },
+    { label: "户籍派出所", prop: "hjdPcsmc" },
-    { 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: "zdrZt", showSolt: true },
-    { label: "状态", prop: "xtSjzt", showSolt: true },
   ],
   tableHeight: "42vh",
 });
@@ -206,4 +195,10 @@ const changeSize = (val) => {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+
+  .expand-content{
+    max-height: 400px;
+    overflow: auto;
+  }
+</style>

src/views/home/components/numberWarnings.vue

@@ -74,8 +74,8 @@ const props = defineProps({
   }
 })
 const searchConfiger = ref([
-  { label: "预警级别", prop: 'yjjbList', placeholder: "请输入姓名", showType: "select", options: D_BZ_YJJB },
+  { 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_GS_ZDQT_YJLB },
   {
     label: "上报时间",
     prop: "startTime",
@@ -89,6 +89,9 @@ const searchConfiger = ref([
   },
 ]);
 const emit = defineEmits(['update:modelValue'])
+    let today = new Date();
+    let startOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+    let endOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59, 999);
 const closeDialog = () => {
   emit('update:modelValue', false)
 }
@@ -99,6 +102,8 @@ const pageData = reactive({
     loading: false,
     rowHieght: 40,
     haveControls: false,
+showSelectType:'null'
+
   },
   controlsWidth: 160, //操作栏宽度
   total: 0,
@@ -119,13 +124,13 @@ const pageData = reactive({
     { label: "所属部门", prop: "ssbm" },
     { label: "车牌号", prop: "cph" },
   ],
-  tableHeight: "47vh",
+  tableHeight: "43vh",
 });
 const parameter = ref()
 const onSearch = (val) => {
   const promes = {
-    startTime: val.startTime && val.startTime.length > 0 ? val.startTime[0] : '',
+    startTime: val.startTime && val.startTime.length > 0 ? val.startTime[0] : timeValidate(startOfDay),
-    endTime: val.startTime && val.startTime.length > 0 ? val.startTime[1] : '',
+    endTime: val.startTime && val.startTime.length > 0 ? val.startTime[1] :timeValidate(endOfDay),
   }
   parameter.value = { ...val, ...promes }
   pageData.pageConfiger.pageCurrent = 1;
@@ -134,9 +139,6 @@ const onSearch = (val) => {
 watch(() => props.modelValue, (val) => {
   if (val) {
     // 获取今天的开始时间和结束时间
-    let today = new Date();
-    let startOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate());
-    let endOfDay = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59, 999);
     parameter.value = {startTime:timeValidate(startOfDay), endTime:timeValidate(endOfDay)}
     changePage()
   }
@@ -148,7 +150,7 @@ pageData.tableConfiger.loading = true;
   const promes = {
     ...parameter.value,
     yjjbList:parameter.value.yjjbList? [parameter.value.yjjbList] : [],
-   yjlxList: parameter.value.yjlxList? [parameter.value.yjlxList] : [],
+   yjlxList:  ['01'],
     pageCurrent: pageData.pageConfiger.pageCurrent,
     pageSize: pageData.pageConfiger.pageSize
   }

src/views/home/components/totalNumberClues.vue

@@ -0,0 +1,145 @@
+<template>
+  <el-dialog v-model="modelValue" :title="title" width="70%" @close="closeDialog" destroy-on-close append-to-body>
+    <div style="height: 60vh; overflow: auto;">
+      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+
+        <template #zllx="{ row }">
+          <DictTag :tag="false" :value="row.zllx" :options="D_GS_XS_ZLLX" />
+        </template>
+        <template #zldj="{ row }">
+          <DictTag :tag="false" :value="row.zldj" :options="D_GS_ZDQT_FXDJ" />
+        </template>
+        <template #czzt="{ row }">
+          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
+        </template>
+        <template #sffk="{ row }">
+          {{ row.sffk == '1' ? '已反馈' : '未反馈' }}
+        </template>
+        <template #sfqs="{ row }">
+          {{ row.sfqs == '0' ? '未签收' : '已签收' }}
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="closeDialog">确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import { xxcjXfxsSelectPage } from "@/api/xxcj.js"
+import { ref, reactive, getCurrentInstance, watch } from "vue";
+const { proxy } = getCurrentInstance()
+const { D_GS_XS_SJLY, D_GS_XS_ZLLX, D_GS_ZDQT_FXDJ, D_GS_XS_CZZT } = proxy.$dict('D_GS_XS_SJLY', 'D_GS_XS_ZLLX', 'D_GS_ZDQT_FXDJ', 'D_GS_XS_CZZT')
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dict: {
+    type: Object,
+    default: () => ({})
+  }, title: {
+    default: "下发总数",
+    type: String
+  },
+  sfqs: {
+    type: String,
+    default: ''
+  },
+  sffk: {
+    type: String,
+    default: ''
+  }
+})
+const searchConfiger = ref([
+  { label: "指令标题", prop: 'zlbt', placeholder: "请输入指令标题", showType: "input" },
+  { label: "指令类型", prop: 'zllx', placeholder: "请选择指令类型", showType: "select", options: D_GS_XS_ZLLX },
+  { label: "指令等级", prop: 'zldj', placeholder: "请选择指令等级", showType: "select", options: D_GS_ZDQT_FXDJ },
+  { label: "处置状态", prop: 'czzt', placeholder: "请选择处置状态", showType: "select", options: D_GS_XS_CZZT },
+]);
+const emit = defineEmits(['update:modelValue'])
+const closeDialog = () => {
+  emit('update:modelValue', false)
+}
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    loading: false,
+    rowHieght: 40,
+    haveControls: false,
+    showSelectType: 'null',
+  },
+  controlsWidth: 160, //操作栏宽度
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  tableColumn: [
+    { label: '指令标题', prop: 'zlbt' },
+    { label: '指令类型', prop: 'zllx', showSolt: true },
+    { label: '指令等级', prop: 'zldj', showSolt: true },
+    { label: '反馈截止时间', prop: 'jssj' },
+    { label: '处置状态', prop: 'czzt', showSolt: true },
+    { label: '是否反馈', prop: 'sffk', showSolt: true },
+    { label: '是否签收', prop: 'sfqs', showSolt: true },
+
+  ],
+  tableHeight: "43vh",
+});
+const parameter = ref()
+const onSearch = (val) => {
+
+  parameter.value = { ...val }
+  pageData.pageConfiger.pageCurrent = 1;
+  changePage()
+}
+watch(() => props.modelValue, (val) => {
+  if (val) {
+    changePage()
+  }
+})
+
+const changePage = () => {
+  pageData.tableConfiger.loading = true;
+  const promes = {
+    ...parameter.value,
+    pageCurrent: pageData.pageConfiger.pageCurrent,
+    pageSize: pageData.pageConfiger.pageSize,
+    sfqs: props.sfqs,
+    sffk: props.sffk,
+  }
+  xxcjXfxsSelectPage(promes).then((res) => {
+    pageData.total = res.total || 0;
+    pageData.tableConfiger.loading = false;
+    pageData.tableData = res.records
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  })
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  changePage()
+}
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  changePage()
+}
+</script>
+
+<style scoped></style>

src/views/home/components/totalNumberDistributions.vue

@@ -0,0 +1,130 @@
+<template>
+  <el-dialog v-model="modelValue" title="线索总数" width="70%" @close="closeDialog" destroy-on-close append-to-body>
+    <div style="height: 60vh; overflow: auto;">
+    <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"></Search>
+     <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+           <template #qblx="{row}">
+          <DictTag :tag="false" :value="row.qblx" :options="D_GS_XS_LX" />
+        </template>
+        <template #cjLx="{row}">
+          <DictTag :tag="false" :value="row.cjLx" :options="D_GS_XS_LY" />
+        </template>
+        <!-- <template #czzt="{row}">
+          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
+        </template> -->
+        <template #shzt="{row}">
+          <!-- 采纳（将这条信息推送到情报管理）,退回！ -->
+          <DictTag :tag="false" :value="row.shzt" :options="D_BZ_XSSHZT" @clickTag="clickTag(row.shzt)" />
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="closeDialog">确认 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+ import { xxcjQbcjSelectPage, xxcjXfxsSelectPage } from "@/api/xxcj.js"
+import { ref, reactive, getCurrentInstance, watch } from "vue";
+const { proxy } = getCurrentInstance()
+const {D_GS_XS_CZZT,D_GS_XS_LY, D_GS_XS_LX ,D_BZ_XSSHZT} = proxy.$dict("D_GS_XS_CZZT","D_GS_XS_LY","D_GS_XS_LX","D_BZ_XSSHZT"); //获取字典数据
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  dict: {
+    type: Object,
+    default: () => ({})
+  },
+
+})
+const searchConfiger = ref([
+  { label: "线索名称", prop: 'qbmc', placeholder: "请输入线索名称", showType: "input" },
+  { label: "内容关键字", prop: 'qbnr', placeholder: "请输入语义关键字", showType: "input" },
+  { label: "线索类型", prop: 'qblx', placeholder: "请选择线索类型", showType: "select",options:D_GS_XS_LX },
+  { label: "线索来源", prop: 'cjLx', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
+]);
+const emit = defineEmits(['update:modelValue'])
+const closeDialog = () => {
+  emit('update:modelValue', false)
+}
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    loading: false,
+    rowHieght: 40,
+    haveControls: false,
+    showSelectType: 'null',
+  },
+  controlsWidth: 160, //操作栏宽度
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  tableColumn: [
+    { label: "线索编号", prop: "xsBh" },
+    { label: "线索名称", prop: "qbmc" },
+    { label: "线索类型", prop: "qblx",showSolt:true },
+    { label: "线索来源", prop: "cjLx",showSolt:true },
+    { label: "上报时间", prop: "sxsbsj",showOverflowTooltip:true },
+    { label: "线索内容", prop: "qbnr"},
+
+    { label: "审核状态", prop: "shzt", showSolt: true },
+  ],
+  tableHeight: "43vh",
+});
+const parameter = ref()
+const onSearch = (val) => {
+  parameter.value = { ...val}
+  pageData.pageConfiger.pageCurrent = 1;
+  changePage()
+}
+watch(() => props.modelValue, (val) => {
+  if (val) {
+    changePage()
+  }
+})
+
+const changePage = () => {
+pageData.tableConfiger.loading = true;
+  const promes = {
+    ...parameter.value,
+    pageCurrent: pageData.pageConfiger.pageCurrent,
+    pageSize: pageData.pageConfiger.pageSize
+  }
+  xxcjQbcjSelectPage(promes).then((res) => {
+    pageData.total = res.total || 0;
+    pageData.tableConfiger.loading = false;
+    pageData.tableData = res.records
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  })
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  changePage()
+}
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  changePage()
+}
+</script>
+
+<style scoped></style>
+

src/views/home/components/zdqtItem.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="warning-item" >
+
+    <el-divider content-position="left">重点群体信息</el-divider>
+    <div class="info-container">
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">户籍地详址：</span>
+          <span class="value">{{ row.hjdXz || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">管辖单位：</span>
+          <span class="value">{{ row.gxSsbmmc || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">人员级别：</span>
+          <span class="value">
+            <DictTag v-if="row.zdrRyjb" :tag="false" :value="row.zdrRyjb" :options="dict.D_GS_ZDR_RYJB" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">列控原因：</span>
+          <span class="value">{{ row.zdrLkyy || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">开始时间：</span>
+          <span class="value">{{ row.zdrRkkssj || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">截至时间：</span>
+          <span class="value">{{ row.zdrRkjssj || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">稳控人数：</span>
+          <span class="value">{{ row.zdryList?.length || 0 }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">状态：</span>
+          <span class="value">
+            <DictTag v-if="row.qtZt" :tag="false" :value="row.qtZt" :options="dict.D_GS_ZDR_CZZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">管控状态：</span>
+          <span class="value">
+               <DictTag v-if="row.zdrBkZt" :tag="false" :value="row.zdrBkZt" :options="dict.D_GS_ZDR_BK_ZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">处置状态：</span>
+          <span class="value">
+             <DictTag v-if="row.zdrCzzt" :tag="false" :value="row.zdrCzzt" :options="dict.D_GS_ZDR_CZZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">审核状态：</span>
+          <span class="value">
+             <DictTag v-if="row.zdrZt" :tag="false" :value="row.zdrZt" :options="dict.D_GS_ZDQT_ZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">系统状态：</span>
+          <span class="value">
+             <div v-if="row.xtSjzt"> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">创建单位：</span>
+          <span class="value">{{ row.xtCjbmmc || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">创建时间：</span>
+          <span class="value">{{ row.xtCjsj || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item full-width">
+          <span class="label">标签：</span>
+          <span class="value tag-container">
+             <ul v-if="row.bqList" style="margin: 0; padding: 0; list-style: none; display: flex; flex-wrap: wrap; align-items: flex-start; gap: 12px;">
+            <li class="" :key="index" v-for="(item, index) in row.bqList" style="white-space: normal; word-break: break-all; flex: 0 0 auto;">
+              {{ item.bqMc }}({{item.bqFz || 0 }} 分) <span v-if="index < row.bqList.length - 1">、</span>
+            </li>
+          </ul>
+          <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+  dict: {
+    type: Object,
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
+  },
+})
+
+</script>
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+// 新增的信息展示样式
+.info-container {
+  margin-bottom: 15px;
+}
+
+.info-row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 10px;
+}
+
+.info-item {
+  flex: 1;
+  min-width: 300px;
+  margin-bottom: 8px;
+  display: flex;
+  // align-items: center;
+}
+
+.info-item.full-width {
+  flex-basis: 100%;
+  min-width: 100%;
+}
+
+.label {
+  font-weight: bold;
+  color: #606266;
+  margin-right: 8px;
+  width: 100px;
+  text-align: right;
+}
+
+.value {
+  color: #303133;
+  flex: 1;
+  word-break: break-word;
+}
+
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+}
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
+  }
+}
+
+</style>
+
+
+
+
+

src/views/home/components/zdrItem.vue

@@ -0,0 +1,157 @@
+<template>
+  <div class="warning-item" >
+
+    <el-divider content-position="left">重点人员信息</el-divider>
+    <div class="info-container">
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">户籍地详址：</span>
+          <span class="value">{{ row.hjdXz || '暂无' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">管辖单位：</span>
+          <span class="value">{{ row.gxSsbmmc || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">人员级别：</span>
+          <span class="value">
+            <DictTag v-if="row.zdrRyjb" :tag="false" :value="row.zdrRyjb" :options="dict.D_GS_ZDR_RYJB" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">管控原因：</span>
+          <span class="value">{{ row.zdrLkyy || '暂无' }}</span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">管控状态：</span>
+          <span class="value">
+               <DictTag v-if="row.zdrBkZt" :tag="false" :value="row.zdrBkZt" :options="dict.D_GS_ZDR_BK_ZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">处置状态：</span>
+          <span class="value">
+             <DictTag v-if="row.zdrCzzt" :tag="false" :value="row.zdrCzzt" :options="dict.D_GS_ZDR_CZZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item">
+          <span class="label">审核状态：</span>
+          <span class="value">
+             <DictTag v-if="row.zdrZt" :tag="false" :value="row.zdrZt" :options="dict.D_GS_ZDQT_ZT" />
+            <span v-else>暂无</span>
+          </span>
+        </div>
+        <div class="info-item">
+          <span class="label">系统状态：</span>
+          <span class="value">
+             <div v-if="row.xtSjzt"> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
+            <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+      <div class="info-row">
+        <div class="info-item full-width">
+          <span class="label">标签：</span>
+          <span class="value">
+             <ul v-if="row.bqList" style="display: flex;" >
+            <li  :key="index" v-for="(item, index) in row.bqList">
+              {{ item.bqMc }}({{item.bqFz || 0 }} 分) <span v-if="index < row.bqList.length - 1">、</span>
+            </li>
+          </ul>
+          <span v-else>暂无</span>
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+const props = defineProps({
+  /** 表格行数据 */
+  row: {
+    type: Object,
+    default: () => ({})
+  },
+  dict: {
+    type: Object,
+    default: () => ({
+      D_GS_SSYJ: [],
+      D_GSXT_YJXX_CZZT: []
+    })
+  },
+})
+
+</script>
+<style lang="scss" scoped>
+.warning-item {
+  width: 100%;
+  padding: 15px;
+  border-radius: 8px;
+  background-color: #fafafa;
+}
+
+// 新增的信息展示样式
+.info-container {
+  margin-bottom: 15px;
+}
+
+.info-row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 10px;
+}
+
+.info-item {
+  flex: 1;
+  min-width: 300px;
+  margin-bottom: 8px;
+  display: flex;
+  align-items: center;
+}
+
+.info-item.full-width {
+  flex-basis: 100%;
+  min-width: 100%;
+}
+
+.label {
+  font-weight: bold;
+  color: #606266;
+  margin-right: 8px;
+  width: 100px;
+  text-align: right;
+}
+
+.value {
+  color: #303133;
+  flex: 1;
+  word-break: break-word;
+}
+
+.item-row{
+  border-bottom: 1px dashed #e8e8e8;
+  line-height: 36px;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+}
+.info-item{
+  line-height: 36px;
+  width: 100%;
+  .text{
+    display: inline-block;
+    width: 25%;
+    margin-right: 10px;
+  }
+}
+
+</style>
+

src/views/home/echarts/3DbarEcharts.vue

@@ -3,157 +3,146 @@
 </template>
 <script setup>
 import * as echarts from "echarts";
-import { defineProps, watch, nextTick } from "vue";
+import { onMounted, ref, reactive, defineProps, onUnmounted, watch, nextTick } from "vue";
 const props = defineProps({
   echartsId:{
     type:String,
-    default:'lineId'
+    default:'3DbarId'
   },
-  data:{
+  data:{ 
-    type:Object,
+    type:Array,
-    default:{
+    default:[]
-      list:[],
-      colors:[],
-      topColor:'#1bd6c2'
-    }
   }
 });
-watch(()=>props.data,val=>{
-  nextTick(()=>{ haandleData(val)  })
-},{immediate:true,deep:true})
 
-const haandleData = (data)=>{
+// 保存echarts实例
-  let val = [],x_value=[]
+const myChart = ref(null);
-  let color = data.colors;
-  let topColor = data.topColor;
-  data.list.forEach(item=>{
-    val.push(item.val);
-    x_value.push(item.label);
-  })
-  chartFn(val,x_value,color,topColor)
-}
 
-function chartFn(val,x_value,color,topColor) {
+// 定义resize处理函数
-  var myChart = echarts.init(document.getElementById(props.echartsId));
+const handleResize = () => {
-  const sideData1 = val//[100, 110, 120, 134, 190, 230];
+  if (myChart.value) {
-  const name = ''; //"销量";
+    myChart.value.resize();
-  var x_value = x_value;//['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+  }
-  var option = {
+};
-    tooltip: { trigger: 'axis' },
+
-    legend: {
+function chartFn() {
-      show: false,
+  // 如果已有实例，先销毁
-    },
+  if (myChart.value) {
+    myChart.value.dispose();
+  }
+  
+  // 创建新实例
+  myChart.value = echarts.init(document.getElementById(props.echartsId));
+  
+  // 处理数据
+  const sideData1 = props.data.map(v => {
+    return {
+      value: v.value * 1.2,
+      itemStyle: {
+        color: v.color || '#1bd6c2'
+      }
+    };
+  });
+
+  const topData1 = props.data.map(v => {
+    return {
+      value: v.value + 0.1,
+      itemStyle: {
+        color: v.color || '#1bd6c2'
+      }
+    };
+  });
+
+  const option = {
     grid: {
-      top:"30px",
+      top: '8%',
-      left:"5px",
+      left: '2%',
-      right:"0px",
+      right: '2%',
-      bottom:"10%",
+      bottom: '12%',
       containLabel: true
     },
-    toolbox: {
+    tooltip: {
-      show: true,
+      trigger: 'axis',
+      axisPointer: {
+        lineStyle: {
+          color: '#ddd'
+        }
+      },
+      backgroundColor: 'rgba(255,255,255,1)',
+      padding: [5, 10],
+      textStyle: {
+        color: '#7588E4'
+      },
+      extraCssText: 'box-shadow: 0 0 5px rgba(0,0,0,0.3)'
     },
-    calculable: true,
+    xAxis: {
-    xAxis: [
+      type: 'category',
-      {
+      data: props.data.map(v => v.label),
-        type: 'category',
+      axisTick: {
-        splitLine: {
+        show: false
-          show: false
+      },
-        },
+      axisLine: {
-        data: x_value,
+        show: false
-        axisLabel: {
+      },
-          show: true,
+      axisLabel: {
-          textStyle: {
+        show: true,
-            color: "#fff" //X轴文字颜色
+        color: '#fff',
-          },
+        interval: 0
-        },
       }
-    ],
+    },
-    yAxis: [
+    yAxis: {
-      {
+      type: 'value',
-        name:'',
+      splitLine: {
-        nameTextStyle: { color: "#fff" },
+        show: true,
-        type: 'value',
+        lineStyle: {
-        splitLine: { show: false },
+          type: 'dashed',
-        axisLabel: {
+          color: 'rgba(14,95,255,0.5)'
-          show: true,
+        }
-          textStyle: {
+      },
-            color: "#FFF" //X轴文字颜色
+      axisTick: {
-          },
+        show: false
-        },
+      },
+      axisLine: {
+        show: false
+      },
+      axisLabel: {
+        color: '#fff'
       }
-    ],
+    },
     series: [
       {
-        name: name,
-        tooltip: { show: false },
         type: 'bar',
-        barWidth: 12,
+        data: props.data.map(v => v.value),
+        barWidth: '22', // 柱子的宽度
+        z: 1,
         itemStyle: {
-          normal: {
+          color: '#004056' // 底部柱子的颜色
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: color ? color[0] : '#28EEBF'// 0% 处的颜色
-            }, {
-              offset: 1,
-              color: color ? color[1] : '#0DBAC5', // 100% 处的颜色
-            }], false)
-          }
-        },
-        data: sideData1,
-        barGap: 0,
-        label: {
-          show: true,
-          position: 'top',
-          distance: 10,
-          textStyle: {
-            color: '#0EBBC5',
-            fontSize: 14,
-            fontWeight: 'bold',
-          },
-          formatter: '{c}'
         }
       },
       {
-        name: name,
         type: 'bar',
-        barWidth: 12,
-        itemStyle: {
-          normal: {
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: color ? color[0] : '#28EEBF'// 0% 处的颜色
-            }, {
-              offset: 1,
-              color: color ? color[1] : '#0DBAC5', // 100% 处的颜色
-            }], false)
-          }
-        },
-        barGap: 0,
         data: sideData1,
-        label: {
+        barWidth: '22', // 柱子的宽度
-          show: false,
+        z: 2,
-          position: 'top',
+        itemStyle: {
-          textStyle: {
+          color: function(params) {
-            color: 'white',
+            return params.data.itemStyle.color || '#1bd6c2';
-            fontSize: 10
           }
         }
-      }, 
+      },
       {
-        name: name,
+        type: 'scatter',
-        tooltip: {
+        data: topData1,
-          show: false
-        },
-        type: 'pictorialBar',
         itemStyle: {
           borderWidth: 1,
           borderColor: '#fff',
-          color: topColor || '#1bd6c2' // 顶部方块的颜色
+          color: function(params) {
+            return params.data.itemStyle.color || '#1bd6c2';
+          }
         },
         symbol: 'path://M 0,0 l 90,0 l -60,60 l -90,0 z',
-        symbolSize: ['22', '12'], // 第一个值控制顶部方形大小
+        symbolSize: ['22', '12'],
-        symbolOffset: ['-0', '-6'], // 控制顶部放行 左右和上下
+        symbolOffset: ['-0', '-6'],
         symbolRotate: -30,
         symbolPosition: 'end',
         barGap: 0,
@@ -162,11 +151,29 @@ function chartFn(val,x_value,color,topColor) {
       }
     ]
   };
-  option && myChart.setOption(option);
+  
-  window.addEventListener('resize',function(){
+  option && myChart.value.setOption(option);
-    myChart.resize();
-  })
 }
+
+// 监听数据变化
+watch(() => props.data, val => {
+  nextTick(() => { chartFn() })
+}, { immediate: true, deep: true })
+
+// 组件挂载时初始化图表并添加事件监听
+onMounted(() => {
+  chartFn();
+  window.addEventListener('resize', handleResize);
+});
+
+// 组件卸载时清理资源
+onUnmounted(() => {
+  if (myChart.value) {
+    myChart.value.dispose();
+    myChart.value = null;
+  }
+  window.removeEventListener('resize', handleResize);
+});
 </script>
 
 <style lang="scss" scoped>

src/views/home/echarts/barEcharts.vue

@@ -7,30 +7,42 @@ import { onMounted, ref, reactive, defineProps, onUnmounted, watch, nextTick } f
 const props = defineProps({
   echartsId:{
     type:String,
-    default:'lineId'
+    default:'barId'
   },
-  data:{
+  color:{ 
-    type:Object,
+    type:String,
-    default:{
+    default:'#fff'
-      list:[],
+  },
-      colors:[]
+  data:{ 
-    }
+    type:Array,
+    default:[]
   }
 });
-watch(()=>props.data,val=>{
+
-  nextTick(()=>{ 
+// 保存echarts实例
-     chartFn()
+const myChart = ref(null);
-   })
+
-},{immediate:true,deep:true})
+// 定义resize处理函数
+const handleResize = () => {
+  if (myChart.value) {
+    myChart.value.resize();
+  }
+};
 
 function chartFn() {
-  var myChart = echarts.init(document.getElementById(props.echartsId));
+  // 如果已有实例，先销毁
+  if (myChart.value) {
+    myChart.value.dispose();
+  }
+  
+  // 创建新实例
+  myChart.value = echarts.init(document.getElementById(props.echartsId));
   var option = {
     grid: {
-      top: "16%",
+      top: "8%",
-      right: "2%",
+      right: "5%",
-      left: "2%",
+      left: "10%",
-      bottom: "4%",
+      bottom: "12%",
       containLabel:true
     },
     tooltip: {
@@ -45,13 +57,19 @@ function chartFn() {
       textStyle: {
         color: "#7588E4"
       },
+      extraCssText: "box-shadow: 0 0 5px rgba(0,0,0,0.3)"
     },
     xAxis: {
       type: "category",
-      data:props.data.list.map(v=>{return v.label}),
+      data:props.data.map(v=>{return v.label}),
       axisTick: { show: false },
       axisLine: { show: false },
-      axisLabel: { color: "#fff",magin:20 },
+      axisLabel: { 
+        show: true,
+        color: props.color,
+        interval: 0, // 强制显示所有标签
+        // rotate: 15, // 标签旋转角度
+      }
     },
     yAxis: {
       type: "value",
@@ -64,41 +82,47 @@ function chartFn() {
       },
       axisTick: { show: false },
       axisLine: { show: false },
-      axisLabel: { color: "#fff" },
+      axisLabel: { color: props.color },
     },
     series: [
       {
+        data: props.data.map(v=>{return v.value}),
         type: "bar",
-        barGap:'80%',
+        barWidth: "30%",
-        barWidth: "20px",
-        data: props.data.list.map(v=>{return v.val}),
-        label:{
-          normal:{show:true,position:'top',color:'#EB00FF'}
-        },
         itemStyle: {
-          normal: {
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-            color:function name(params) {
+            { offset: 0, color: "rgba(102, 195, 226, 1)" },
-                let colorList = []
+            { offset: 1, color: "rgba(2, 80, 212, 1)" }
-                if(props.data.colors && props.data.colors.length>0){
+          ]),
-                  props.data.colors.forEach(item => {
+          borderRadius: [4, 4, 0, 0],
-                    colorList.push(new echarts.graphic.LinearGradient( 0,0,0, 1,[{offset:0,color:item[0]},{offset:1,color:item[1]}]))
+          shadowColor: "rgba(0,160,221,1)",
-                  });
+          shadowBlur: 2
-                }
-              if(colorList.length > 0) return colorList[params.dataIndex]
-              else return new echarts.graphic.LinearGradient( 0,0,0, 1,[{ offset: 0,color: "rgba(0,244,255,1)"},{ offset: 1, color: "rgba(0,77,167,1)" }])
-            },
-            shadowColor: "rgba(0,160,221,1)",
-            shadowBlur: 2
-          }
         },
       }
     ]
   };
-  option && myChart.setOption(option);
+  option && myChart.value.setOption(option);
-  window.addEventListener('resize',function(){
-    myChart.resize();
-  })
 }
+
+// 监听数据变化
+watch(()=>props.data,val=>{
+  nextTick(()=>{ chartFn() })
+},{immediate:true,deep:true})
+
+// 组件挂载时初始化图表并添加事件监听
+onMounted(()=>{
+  chartFn();
+  window.addEventListener('resize', handleResize);
+});
+
+// 组件卸载时清理资源
+onUnmounted(()=>{
+  if (myChart.value) {
+    myChart.value.dispose();
+    myChart.value = null;
+  }
+  window.removeEventListener('resize', handleResize);
+});
 </script>
 
 <style lang="scss" scoped>

src/views/home/echarts/lineEcharts.vue

@@ -9,21 +9,34 @@ const props = defineProps({
     type:String,
     default:'lineId'
   },
-  color:{
+  color:{ 
     type:String,
     default:'#fff'
   },
-  data:{
+  data:{ 
     type:Array,
     default:[]
   }
 });
-watch(()=>props.data,val=>{
+
-  nextTick(()=>{ chartFn() })
+// 保存echarts实例
-},{immediate:true,deep:true})
+const myChart = ref(null);
+
+// 定义resize处理函数
+const handleResize = () => {
+  if (myChart.value) {
+    myChart.value.resize();
+  }
+};
 
 function chartFn() {
-  var myChart = echarts.init(document.getElementById(props.echartsId));
+  // 如果已有实例，先销毁
+  if (myChart.value) {
+    myChart.value.dispose();
+  }
+  
+  // 创建新实例
+  myChart.value = echarts.init(document.getElementById(props.echartsId));
   var option = {
     grid: {
       top: "8%",
@@ -51,8 +64,7 @@ function chartFn() {
       data:props.data.map(v=>{return v.label}),
       axisTick: { show: false },
       axisLine: { show: false },
-      axisLabel: { color: "#fff" },
+      axisLabel: { 
-      axisLabel: {
         show: true,
         color: props.color,
         interval: 0, // 强制显示所有标签
@@ -103,11 +115,28 @@ function chartFn() {
       }
     ]
   };
-  option && myChart.setOption(option);
+  option && myChart.value.setOption(option);
-  window.addEventListener('resize',function(){
-    myChart.resize();
-  })
 }
+
+// 监听数据变化
+watch(()=>props.data,val=>{
+  nextTick(()=>{ chartFn() })
+},{immediate:true,deep:true})
+
+// 组件挂载时初始化图表并添加事件监听
+onMounted(()=>{
+  chartFn();
+  window.addEventListener('resize', handleResize);
+});
+
+// 组件卸载时清理资源
+onUnmounted(()=>{
+  if (myChart.value) {
+    myChart.value.dispose();
+    myChart.value = null;
+  }
+  window.removeEventListener('resize', handleResize);
+});
 </script>
 
 <style lang="scss" scoped>

src/views/home/index.vue

@@ -267,8 +267,8 @@ const makerCenter = () => {
         item.wd = obj.point[1];
       }
     })
-    
+
-    
+
     allDep.value = list;
     emitter.emit("addPointArea", { coords:list, icon: dw, flag: "hm", size: '14px', showTitle: false, offset: [0, -25] });
   })
@@ -327,7 +327,7 @@ onMounted(() => {
   getTbYjxxGetList()
   // 初始化音频播放器
   initAudioPlayer()
-  webSoket.connect()
+  // webSoket.connect()
   // 监听音频播放事件，获取WebSocket消息数据
   emitter.on("openYp", (newsDate) => {
     // 使用工具类播放音频，自动处理静音切换

src/views/home/model/calendar.vue

@@ -216,8 +216,6 @@ const gettingData = () => {
 
 
 const getAllFestivals = (date,boolean=false) => {
-  console.log(date);
-
   const time = new Date(date)
   const solar = Solar.fromDate(time)
   const lunar = solar.getLunar()

src/views/home/model/dbCount.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="comom-title">
     <span class="title">线索研判盯办统计</span>
-    <el-popover placement="right" :width="430"  :visible="visible">
+    <el-popover placement="right" :width="430" :visible="visible">
       <template #reference>
-        <div class="title" style="position: relative;z-index: 10000;height: 40px;width: 40px;" @click="visible = true"></div>
+        <div class="title" style="position: relative;z-index: 10000;height: 40px;width: 40px;" @click="visible = true">
+        </div>
       </template>
       <div>
         <div class="qbltData">
@@ -15,23 +16,30 @@
     </el-popover>
   </div>
   <ul class="comom-cnt xsBox flex flex-warp just-between align-center">
-    <li class="xs-item" v-for="(item, idx) in contentItem" :key="idx">
+    <li class="xs-item" v-for="(item, idx) in contentItem" :key="idx" @click="openTc(item.type)">
       {{ item.label }}:{{ item.value }}条
     </li>
   </ul>
+  <TotalNumberClues v-model="openShow.xfzs" :title="title" :sfqs="sfqs" :sffk="sffk" />
+  <TotalNumberDistributions v-model="openShow.xszs" />
+  <informationCollection v-model="openShow.cjzs"  :title="title"/>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, reactive } from 'vue';
 import TimeData from '@/views/home/model/mesgSwitch/timeData.vue'
+import TotalNumberClues from '@/views/home/components/totalNumberClues.vue'
+import TotalNumberDistributions from '@/views/home/components/totalNumberDistributions.vue'
+import informationCollection from '@/views/home/components/informationCollection.vue'
 import { qbcjDpxsCount } from "@/api/model.js"
+
 const contentItem = ref([
-  { label: '线索总数', value: '0' },
+  { label: '信息采集总数', value: '0', type: 'cjzs' },
-  { label: '下发总数', value: '0' },
+  { label: '线索总数', value: '0', type: 'xszs' },
-  { label: '已处置总数', value: '0' },
+  { label: '下发总数', value: '0', type: 'xfzs' },
-  { label: '反馈总数', value: '0' },
+  { label: '已签收', value: '0', type: 'yqss' },
-  { label: '未反馈总数', value: '0' },
+  { label: '未签收', value: '0', type: 'wqss' },
-  { label: '未处置总数', value: '0' },
+  { label: '已反馈', value: '0', type: 'fkzs' },
 ])
 const visible = ref(false)
 const changeTime = (val) => {
@@ -40,22 +48,84 @@ const changeTime = (val) => {
   }
   getCount()
 }
-
+const title = ref('线索总数')
 onMounted(() => {
-  qbcjDpxsCount({}, '/mosty-gsxt/tbXs/getXsCount').then(res => {
+
+  qbcjDpxsCount({}, '/mosty-gsxt/qbcj/dpxsCount').then(res => {
     res = res || {}
     // 根据API返回的数据更新contentItem
     contentItem.value = [
-      { label: '线索总数', value: res.xszs || 0 },
+      { label: '信息采集总数', value: res.cjzs || 0, type: 'cjzs' },
-      { label: '下发总数', value: res.xfzs || 0 },
+      { label: '线索总数', value: res.xszs || 0, type: 'xszs' },
-      { label: '已处置总数', value: res.yczzs || 0 },
+      { label: '下发总数', value: res.xfzs || 0, type: 'xfzs' },
-      { label: '反馈总数', value: res.fkzs || 0 },
+      { label: '已签收', value: res.yqss || 0, type: 'yqss' },
-      { label: '未反馈总数', value: res.wfkzs || 0 },
+      { label: '未签收', value: res.wfkzs || 0, type: 'wqss' },
-      { label: '未处置总数', value: res.wczzs || 0 },
+      { label: '已反馈', value: res.fkzs || 0, type: 'fkzs' },
     ]
   })
 })
 
+const openShow = reactive({
+  cjzs: false,
+  xszs: false,
+  xfzs: false,
+  yqss: false,
+  wqss: false,
+  fkzs: false,
+})
+const sfqs = ref('')
+const sffk = ref('')
+const openTc = (val) => {
+      sfqs.value = ''
+      sffk.value = ''
+  switch (val) {
+    case 'cjzs':
+      openShow.cjzs = true
+      title.value = '信息采集总数'
+      break;
+    case 'xszs':
+
+      openShow.xszs = true
+      title.value = '线索总数'
+      break;
+    case 'wqss':
+      sfqs.value = '0'
+      sffk.value = ''
+      openShow.xfzs = true
+      title.value = '未签收'
+      break;
+    case 'xfzs':
+      openShow.xfzs = true
+      title.value = '下发总数'
+      break;
+    case 'yqss':
+      sfqs.value = '1'
+      sffk.value = ''
+      openShow.xfzs = true
+      title.value = '已签收'
+      break;
+    case 'fkzs':
+      sfqs.value = ''
+      sffk.value = '1'
+      openShow.xfzs = true
+      title.value = '已反馈'
+      break;
+  }
+}
+
+
+// // 信息采集总数
+// const xsCount = () => {
+//   xxcjQbcjSelectPage({}).then(res => {
+//   console.log(res);
+//   })
+// }
+// // 线索总数
+// const xfxsCount = () => {
+//   xxcjXfxsSelectPage({}).then(res => {
+//     console.log(res);
+//   })
+// }
 const close = () => {
   visible.value = false
 }
@@ -68,8 +138,11 @@ const close = () => {
 .xsBox {
   background: url("~@/assets/images/bg_12.png") no-repeat center center;
   background-size: 100% 100%;
+  position: relative;
+  z-index: 299;
 
   .xs-item {
+    cursor: pointer;
     width: 31%;
     height: 36px;
     line-height: 36px;
@@ -78,6 +151,7 @@ const close = () => {
     background-size: 100% 100%;
   }
 }
+
 .qbltData {
   width: 100%;
   display: flex;

src/views/home/model/experience.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="comom-title" @click="chooseForumPost">
     <!-- <span class="title">情报论坛</span> -->
-        <div class="title">情报论坛<span class="switchover" @click.stop="reversalPush">切换</span></div>
+        <div class="title" style="width: 100%;">情报论坛<span class="switchover" @click.stop="reversalPush">切换</span></div>
   </div>
   <div class="comom-cnt" >
     <div class="zdryBox">
@@ -213,7 +213,8 @@ onBeforeUnmount(() => {
 .switchover{
   cursor: pointer;
   font-size: 14px;
-  margin-left: 20px;
+  margin-left: 20%;
+
   color: rgb(255, 146, 4);
 }
 </style>

src/views/home/model/keyPpersonneltypes.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="comom-title">
-    <div class="title">重点人员类型<span class="switchover" @click.stop="reversalPush">切换</span></div>
+    <div class="title" style="width: 70%;">重点人员类型<span class="switchover" @click.stop="reversalPush">切换</span></div>
-    <div class="title titleFz" style="" @click="visible = true">
+    <div class="title titleFz" @click="visible = true">
       查看列表
     </div>
   </div>
@@ -65,5 +65,6 @@ tbGsxtZdryzdryBqtjFn()
   font-size: 14px;
   margin-left: 20px;
   color: rgb(255, 146, 4);
+  margin-left: 23%;
 }
 </style>

src/views/home/model/mesgSwitch/intelligence.vue

@@ -37,6 +37,7 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import { qbcjSelectPage } from "@/api/Intelligence.js";
+import {xxcjSelectPage,xxcjXxzsx} from '@/api/xxcj.js'
 import { ref, reactive, getCurrentInstance, watch } from "vue";
 import { useRoute,useRouter } from 'vue-router'
 const route = useRoute()
@@ -68,9 +69,9 @@ const searchConfiger = ref([
     options: D_BZ_QBSBLY
   }, {
     label: "上报时间",
-    prop: "lrkssj",
+    prop: "startTime",
     placeholder: "请选择时间",
-    showType: "daterange"
+    showType: "datetimerange"
   },
 
 
@@ -86,7 +87,7 @@ const pageData = reactive({
   tableConfiger: {
     loading: false,
     rowHieght: 40,
-    haveControls: true,
+    haveControls: false,
   },
   controlsWidth: 160, //操作栏宽度
   total: 0,
@@ -109,8 +110,8 @@ const pageData = reactive({
 const parameter = ref()
 const onSearch = (val) => {
   const promes = {
-    lrkssj: val.lrkssj && val.lrkssj.length > 0 ? val.lrkssj[0] : '',
+    startTime: val.startTime && val.startTime.length > 0 ? val.startTime[0] : '',
-    lrjssj: val.lrkssj && val.lrkssj.length > 0 ? val.lrkssj[1] : '',
+    endTime: val.startTime && val.startTime.length > 0 ? val.startTime[1] : '',
   }
   parameter.value = { ...val, ...promes }
   pageData.pageConfiger.pageCurrent = 1;
@@ -123,8 +124,8 @@ watch(() => props.modelValue, (val) => {
 })
 const changePage = () => {
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...parameter.value };
+  let data = { ...pageData.pageConfiger, ...parameter.value,qbjb:'01' };
-  qbcjSelectPage(data).then(res => {
+  xxcjSelectPage(data).then(res => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
     pageData.tableConfiger.loading = false;

src/views/home/model/qblyType.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="comom-title">
-    <div class="title">岗位标兵<span class="switchover" @click="reversalPush">切换</span></div>
+    <div class="title" style="width: 100%;">岗位标兵<span class="switchover" @click="reversalPush">切换</span></div>
     <el-popover :visible="visible" placement="right" :width="430">
       <template #reference>
         <div class="title" style="position: relative;z-index: 10000;height: 40px;width: 40px;" @click="visible = true">
@@ -100,5 +100,6 @@ const close = () => {
   font-size: 14px;
   margin-left: 20px;
   color: rgb(255, 146, 4);
+  margin-left: 25%;
 }
 </style>

src/views/home/model/textType.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="comom-title">
-       <div class="title">信息来源类型统计<span class="switchover" @click="reversalPush">切换</span></div>
+       <div style=" width: 100%;" class="title">信息来源类型统计<span class="switchover" @click="reversalPush">切换</span></div>
         <el-popover placement="right" :width="430"  :visible="visible">
       <template #reference>
         <div class="title" style="position: relative;z-index: 10000;height: 40px;width: 40px;"  @click="visible = true"></div>
@@ -88,5 +88,7 @@ const close = () => {
   font-size: 14px;
   margin-left: 20px;
   color: rgb(255, 146, 4);
+  width: 100%;
+margin-left: 10%;
 }
 </style>

src/views/home/model/yszs.vue

@@ -23,8 +23,8 @@ import keyPerson from "@/views/home/components/keyPerson.vue";
 import keyGroups from "@/views/home/components/keyGroups.vue";
 
 const contentItem = ref([
-  { type:"jqzs", label: "警情总数", value: "0" ,icon:require('@/assets/images/top-1.png')},
+  { type:"jqzs", label: "今日警情", value: "0" ,icon:require('@/assets/images/top-1.png')},
-  { type:"yjzs", label: "预警总数", value: "0",icon:require('@/assets/images/top-2.png') },
+  { type:"yjzs", label: "今日预警", value: "0",icon:require('@/assets/images/top-2.png') },
   { type:"zdry", label: "重点人员总数", value: "0",icon:require('@/assets/images/top-3.png') },
   { type:"zdqt", label: "重点群体总数", value: "0" ,icon:require('@/assets/images/top-4.png')},
 ]);

vue.config.js

@@ -5,12 +5,12 @@ function resolve(dir) {
 }
 // http://47.108.232.77:9537/mosty-api/mosty-zhgj/docs.html
 // const serverHost = "http://47.108.232.77:9537"//线上
-// const serverHost = "http://192.168.0.231:8006"//线上
+const serverHost = "http://192.168.2.206:8006"//线上
 // const serverHost = "http://192.168.191.75:8006"//周
 // const serverHost = "http://192.168.212.75:8016"//周
 // const serverHost = "http://192.168.1.98:8006"//毛毛
 // const serverHost = "http://192.168.193.75:8006"//线上
-const serverHost = "http://47.108.232.77:9537"//线上
+// const serverHost = "http://47.108.232.77:9537"//线上
 module.exports = {
   // configureWebpack: {
   //   resolve: {