lcw

2026-01-06 22:09:05 +08:00
parent 953cb9943d
commit 2ea84f248c
16 changed files with 741 additions and 261 deletions
--- a/gsxt.zip
+++ b/gsxt.zip
--- a/src/router/index.js
+++ b/src/router/index.js
@ -406,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",
@ -739,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",
--- a/src/utils/route.js
+++ b/src/utils/route.js
@ -6,10 +6,7 @@ import { getItem } from '@/utils/storage'
 const getChildrenRoutes = (routes) => {
  const result = [];
  const { deptBizType, deptLevel } = getItem('deptId')[0]
-  const roleList = getItem('roleList').filter(item => item.roleCode == 'JS_666666').length > 0
-  console.log(roleList);
-  console.log(deptBizType, deptLevel);
-
+  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' && roleList) {
--- a/src/views/backOfficeSystem/HumanIntelligence/infoCollection/index.vue
+++ b/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: "endTime", placeholder: "请选择结束时间", showType: "date" },
+  { label: "时间", prop: "startTime", placeholder: "请选择时间", showType: "daterange" },
  { 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] : '',
-    lrjssj: lrkssj ? lrkssj[1] : '',
-    zxkssj: zxkssj ? zxkssj[0] : '',
-    zxjssj: zxkssj ? zxkssj[1] : '',
+     startTime: val.startTime ? val.startTime[0] : '',
+    endTime: val.endTime ? val.endTime[1] : '',
  }

  queryFrom.value = { ...promes }
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
@ -90,7 +90,7 @@ const formData = ref([
  { 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({}); //表单
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/xsxf.vue
+++ b/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>
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
@ -3,106 +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-icon style="vertical-align: middle"><Dete /></el-icon>
+        <el-button type="danger" @click="plDelDictItem">
+          <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
-        :tableData="pageData.tableData"
-        :tableColumn="pageData.tableColumn"
-        :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount"
-        :tableConfiger="pageData.tableConfiger"
-        :controlsWidth="pageData.controlsWidth">
-        <template #qblx="{row}">
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData">
+        <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_GS_XS_LY" />
+        <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 #zxkssj="{row}">
-          <span>{{ row.zxkssj }}</span> 至
-          <span>{{ row.zxjssj }}</span>
-        </template> -->
-        <template #shzt="{row}">
+        <template #czzt="{ row }">
+          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_XSCZZT" />
+        </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'">
-          </template>
-
-          <!-- <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> -->
+          <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="danger" @click="addEdit('info', row)">详情</el-link>
-          <!-- 续报 == 编辑 -->
-           <el-link size="small" type="warning" @click="addEdit('edit', row)">线索下发</el-link>
-          <!-- <el-link size="small" type="warning" @click="addEdit('edit', row)">续报</el-link> -->
+          <el-link size="small" type="warning" @click="openXsxf( row)">线索下发</el-link>
        </template>
      </MyTable>
-      <Pages
-        @changeNo="changeNo"
-        @changeSize="changeSize"
-        :tableHeight="pageData.tableHeight"
-        :pageConfiger="{
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
        ...pageData.pageConfiger,
        total: pageData.total
-        }"
-      ></Pages>
+      }"></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:'线索' }"
-  :path="fixedValue" @getList="getList" />
+  <SubmissionProcess v-model="showSp" :data="rowData"
+    :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";
@ -112,26 +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: 'qbmc', placeholder: "请输入线索名称", showType: "input" },
  { label: "内容关键字", prop: 'qbnr', placeholder: "请输入语义关键字", showType: "input" },
-  { label: "线索类型", prop: 'qblx', placeholder: "请选择线索类型", showType: "select",options:D_GS_XS_LX },
-  { label: "线索来源", prop: 'qbly', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
-  // { label: "开始时间", prop: 'kssj', placeholder: "请选择开始时间", showType: "datetime" },
-  // { label: "结束时间", prop: 'jssj', placeholder: "请选择结束时间", showType: "datetime" },
+  { label: "线索类型", prop: 'qblx', placeholder: "请选择线索类型", showType: "select", options: D_GS_XS_LX },
+  { label: "线索来源", prop: 'cjLx', placeholder: "请选择线索来源", showType: "select", options: D_GS_XS_LY },
 ]);
-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: "qbmc" },
-    { label: "线索类型", prop: "qblx",showSolt:true },
-    { label: "线索来源", prop: "qbly",showSolt:true },
-    // { label: "指向时间", prop: "zxkssj",showSolt:true,showOverflowTooltip:true },
-    { label: "上报时间", prop: "sxsbsj",showOverflowTooltip:true },
+    { label: "线索类型", prop: "qblx", showSolt: true },
+    { label: "线索来源", prop: "cjLx", showSolt: true },
+    { label: "上报时间", prop: "sxsbsj", showOverflowTooltip: true },
    { label: "线索地点", prop: "zxdz" },
-    { label: "线索内容", prop: "qbnr"},
-    // { label: "处置状态", prop: "czzt",showSolt: true},
-    { label: "附件", prop: "fjdz", showSolt: true },
+    { label: "线索内容", prop: "qbnr" },
+    { label: "处置状态", prop: "czzt", 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) =>{
-  queryFrom.value = {...val}
+const onSearch = (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' };
-  qcckGet(data,'/mosty-gsxt/qbcj/selectPage').then(res=>{
+  let data = { ...pageData.pageConfiger, ...queryFrom.value, cjLx: '0' };
+  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) =>{
-  proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
-    qcckPost({id},'/mosty-gsxt/qbcj/delete').then(()=>{
+const delDictItem = (id) => {
+  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
+    qcckPost({ id }, '/mosty-gsxt/qbcj/delete').then(() => {
      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) =>{
-  if(val == '02')  router.push('/IntelligenceManagement');
+const clickTag = (val) => {
+  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>
-
--- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue
@ -3,20 +3,44 @@
    <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">
-      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+    <div class="form_cnt flex-between">
+      <div class="main-content" :class="{ 'content-with-timeline': title == '详情' }">
+        <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" :disabled="title == '详情'">
          <template #glxsid>
            <div class="box pointer ellipsis" @click="chooseVisible = true">
              <span v-if="listQuery.glxs">{{ listQuery.glxs }}</span>
-            <span v-else style="color: #b8b8b8;">请选择关联线索</span>
+              <span v-else class="placeholder-text">请选择关联线索</span>
            </div>
          </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>
  </div>
@ -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({
@ -46,8 +69,8 @@ const formData = ref([
  { label: "关联线索", prop: "glxsid", type: "slot" },
  { label: "主送单位", prop: "zsdw", type: "department" },
  { label: "抄送单位", prop: "csdw", type: "department" },
-  { label: "指令内容", prop: "zlnr",  type: "textarea",width: '100%' },
-  { label: "附件", prop: "fjzd",  type: "upload",width: '100%' },
+  { label: "指令内容", prop: "zlnr", type: "textarea", 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) => {
-    res.fjzd = res.fjzd ? res.fjzd.split(','):[];
-    listQuery.value = res;
+  qcckGet({ id }, '/mosty-gsxt/zlxx/selectByid').then((res) => {
+    res.fjzd = res.fjzd ? res.fjzd.split(',') : [];
+    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)=>{
-    let url =  title.value == "新增" ? '/mosty-gsxt/zlxx/add':'/mosty-gsxt/zlxx/update';
+  elform.value.submit((data) => {
+    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>
--- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/fk.vue
+++ b/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>
--- a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index.vue
+++ b/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;
--- a/src/views/home/components/informationCollection.vue
+++ b/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>
--- a/src/views/home/components/totalNumberClues.vue
+++ b/src/views/home/components/totalNumberClues.vue
@ -2,35 +2,29 @@
  <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"
-      >
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">

-        <template #zllx="{row}">
+        <template #zllx="{ row }">
          <DictTag :tag="false" :value="row.zllx" :options="D_GS_XS_ZLLX" />
        </template>
-        <template #zldj="{row}">
+        <template #zldj="{ row }">
          <DictTag :tag="false" :value="row.zldj" :options="D_GS_ZDQT_FXDJ" />
        </template>
-        <template #czzt="{row}">
+        <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="{
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
        ...pageData.pageConfiger,
        total: pageData.total
-        }"
-      ></Pages>
+      }"></Pages>
    </div>
    <template #footer>
      <div class="dialog-footer">
@ -45,10 +39,10 @@
 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 { 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 { 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,
@ -57,16 +51,24 @@ const props = defineProps({
  dict: {
    type: Object,
    default: () => ({})
-  },title: {
+  }, 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},
+  { 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 = () => {
@ -79,6 +81,7 @@ const pageData = reactive({
    loading: false,
    rowHieght: 40,
    haveControls: false,
+    showSelectType: 'null',
  },
  controlsWidth: 160, //操作栏宽度
  total: 0,
@ -88,10 +91,13 @@ const pageData = reactive({
  }, //分页
  tableColumn: [
    { label: '指令标题', prop: 'zlbt' },
-      { label: '指令类型', prop: 'zllx',showSolt:true  },
-      { label: '指令等级', prop: 'zldj',showSolt:true  },
+    { 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 },
+
  ],
  tableHeight: "43vh",
 });
@ -109,11 +115,13 @@ watch(() => props.modelValue, (val) => {
 })

 const changePage = () => {
-pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
  const promes = {
    ...parameter.value,
    pageCurrent: pageData.pageConfiger.pageCurrent,
-    pageSize: pageData.pageConfiger.pageSize
+    pageSize: pageData.pageConfiger.pageSize,
+    sfqs: props.sfqs,
+    sffk: props.sffk,
  }
  xxcjXfxsSelectPage(promes).then((res) => {
    pageData.total = res.total || 0;
@ -135,4 +143,3 @@ const changeSize = (val) => {
 </script>

 <style scoped></style>
-
--- a/src/views/home/components/totalNumberDistributions.vue
+++ b/src/views/home/components/totalNumberDistributions.vue
@ -7,8 +7,8 @@
           <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_GS_XS_LY" />
+        <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" />
@ -49,12 +49,13 @@ const props = defineProps({
    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: 'qbly', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
+  { label: "线索来源", prop: 'cjLx', placeholder: "请选择线索来源", showType: "select",options:D_GS_XS_LY },
 ]);
 const emit = defineEmits(['update:modelValue'])
 const closeDialog = () => {
@ -67,6 +68,7 @@ const pageData = reactive({
    loading: false,
    rowHieght: 40,
    haveControls: false,
+    showSelectType: 'null',
  },
  controlsWidth: 160, //操作栏宽度
  total: 0,
@ -78,11 +80,10 @@ const pageData = reactive({
    { label: "线索编号", prop: "xsBh" },
    { label: "线索名称", prop: "qbmc" },
    { label: "线索类型", prop: "qblx",showSolt:true },
-    { label: "线索来源", prop: "qbly",showSolt:true },
+    { label: "线索来源", prop: "cjLx",showSolt:true },
    { label: "上报时间", prop: "sxsbsj",showOverflowTooltip:true },
    { label: "线索内容", prop: "qbnr"},
-    // { label: "处置状态", prop: "czzt",showSolt: true},
-    { label: "附件", prop: "fjdz", showSolt: true },
+
    { label: "审核状态", prop: "shzt", showSolt: true },
  ],
  tableHeight: "43vh",
--- a/src/views/home/model/dbCount.vue
+++ b/src/views/home/model/dbCount.vue
@ -20,8 +20,9 @@
      {{ item.label }}:{{ item.value }}条
    </li>
  </ul>
-  <TotalNumberClues  v-model="openShow.xfzs" :title="title"/>
+  <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>
@ -29,14 +30,16 @@ 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', type: 'cjzs' },
  { label: '线索总数', value: '0', type: 'xszs' },
  { label: '下发总数', value: '0', type: 'xfzs' },
-  { label: '已处置总数', value: '0', type: 'yczzs' },
-  { label: '反馈总数', value: '0', type: 'fkzs' },
-  { label: '未反馈总数', value: '0', type: 'wfks' },
-  { label: '未处置总数', value: '0', type: 'wczzs' },
+  { label: '已签收', value: '0', type: 'yqss' },
+  { label: '未签收', value: '0', type: 'wqss' },
+  { label: '已反馈', value: '0', type: 'fkzs' },
 ])
 const visible = ref(false)
 const changeTime = (val) => {
@ -45,61 +48,79 @@ const changeTime = (val) => {
  }
  getCount()
 }
-const title = ref('下发总数')
+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.cjzs || 0, type: 'cjzs' },
      { label: '线索总数', value: res.xszs || 0, type: 'xszs' },
      { label: '下发总数', value: res.xfzs || 0, type: 'xfzs' },
-      { label: '已处置总数', value: res.yczzs || 0, type: 'yczzs' },
-      { label: '反馈总数', value: res.fkzs || 0, type: 'fkzs' },
-      { label: '未反馈总数', value: res.wfkzs || 0, type: 'wfks' },
-      { label: '未处置总数', value: res.wczzs || 0, type: 'wczzs' },
+      { label: '已签收', value: res.yqss || 0, type: 'yqss' },
+      { label: '未签收', value: res.wfkzs || 0, type: 'wqss' },
+      { label: '已反馈', value: res.fkzs || 0, type: 'fkzs' },
    ]
  })
 })

-const openShow=reactive({
+const openShow = reactive({
+  cjzs: false,
  xszs: false,
  xfzs: false,
-  yczzs: false,
+  yqss: false,
+  wqss: false,
  fkzs: false,
-  wfks: false,
-  wczzs: false,
 })
+const sfqs = ref('')
+const sffk = ref('')
 const openTc = (val) => {
-  console.log(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 'yjzs': break;
-    case 'yczzs': break;
-    case 'fkzs': break;
-    case 'wfks':
+    case 'yqss':
+      sfqs.value = '1'
+      sffk.value = ''
      openShow.xfzs = true
-      title.value = '未反馈数'
+      title.value = '已签收'
+      break;
+    case 'fkzs':
+      sfqs.value = ''
+      sffk.value = '1'
+      openShow.xfzs = true
+      title.value = '已反馈'
      break;
-    case 'wczzs': break;
  }
 }


-// // 线索总数
+// // 信息采集总数
 // const xsCount = () => {
 //   xxcjQbcjSelectPage({}).then(res => {
 //   console.log(res);
 //   })
 // }
-// // 下发总数
+// // 线索总数
 // const xfxsCount = () => {
 //   xxcjXfxsSelectPage({}).then(res => {
 //     console.log(res);
@ -117,8 +138,9 @@ const close = () => {
 .xsBox {
  background: url("~@/assets/images/bg_12.png") no-repeat center center;
  background-size: 100% 100%;
-position: relative;
-z-index: 299;
+  position: relative;
+  z-index: 299;
+
  .xs-item {
    cursor: pointer;
    width: 31%;
--- a/vue.config.js
+++ b/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: {