Merge branch 'main' of http://183.222.39.242:3000/zy_oyj/sgxt_web

src/assets/css/homeScreen.scss

@@ -156,6 +156,7 @@
         right: 20px;
         top: 22px;
         font-size: 17px;
+        z-index: 9;
         span {
           color: #0bb7ff;
           cursor: pointer;

src/components/aboutTable/TagSelectorDialog.vue

@@ -40,13 +40,15 @@
                 width="55"
                 :reserve-selection="true"
               />
+              <el-table-column prop="bqMc" align="center" label="标签名称" />
+
               <el-table-column prop="bqDm" align="center" label="标签代码" />
-              <el-table-column prop="bqLb" align="center" label="标签类别">
+              <el-table-column prop="bqZl" align="center" label="标签种类">
                 <template #default="{ row }">
                   <DictTag
-                    :value="row.bqLb"
+                    :value="row.bqZl"
                     :tag="false"
-                    :options="props.dic.D_GS_BQ_LB"
+                    :options="props.dic.D_GS_BQ_ZL"
                   />
                 </template>
               </el-table-column>
@@ -59,13 +61,12 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column prop="bqMc" align="center" label="标签名称" />
+              <el-table-column prop="bqLb" align="center" label="标签类别">
-              <el-table-column prop="bqZl" align="center" label="标签种类">
                 <template #default="{ row }">
                   <DictTag
-                    :value="row.bqZl"
+                    :value="row.bqLb"
                     :tag="false"
-                    :options="props.dic.D_GS_BQ_ZL"
+                    :options="props.dic.D_GS_BQ_LB"
                   />
                 </template>
               </el-table-column>

src/router/index.js

@@ -396,18 +396,6 @@ export const publicRoutes = [
         name: "ExcavationResearch",
         meta: { title: "重点人发掘研判", icon: "article" },
         children: [
-          {
-            path: "/ZdryFjyp",
-            name: "ZdryFjyp",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index"
-              ),
-            meta: {
-              title: "重点人员发掘研判",
-              icon: "article"
-            }
-          },
           {
             path: "/PreliminaryExcavations",
             name: "PreliminaryExcavations",
@@ -420,6 +408,18 @@ export const publicRoutes = [
               icon: "article"
             }
           },
+          {
+            path: "/ZdryFjyp",
+            name: "ZdryFjyp",
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index"
+              ),
+            meta: {
+              title: "重点人员深度发掘",
+              icon: "article"
+            }
+          },
           {
             path: "/LandingAudit",
             name: "LandingAudit",

src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue

@@ -90,9 +90,13 @@
             </ul>
           </div>
           <div class="flex">
-            <el-button type="primary" size="small"> 涉恐群体</el-button>
+            <el-button
-            <el-button type="primary" size="small"> 涉稳群体</el-button>
+              type="primary"
-            <el-button type="primary" size="small"> 讨薪群体</el-button>
+              size="small"
+              v-for="(item, index) in row.bqList"
+            >
+              {{ item.bqMc }}</el-button
+            >
           </div>
         </template>
         <template #bgxx="{ row }">

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue

@@ -40,13 +40,14 @@
                 width="55"
                 :reserve-selection="true"
               />
+              <el-table-column prop="bqMc" align="center" label="标签名称" />
               <el-table-column prop="bqDm" align="center" label="标签代码" />
-              <el-table-column prop="bqLb" align="center" label="标签类别">
+              <el-table-column prop="bqZl" align="center" label="标签种类">
                 <template #default="{ row }">
                   <DictTag
-                    :value="row.bqLb"
+                    :value="row.bqZl"
                     :tag="false"
-                    :options="props.dic.D_GS_BQ_LB"
+                    :options="props.dic.D_GS_BQ_ZL"
                   />
                 </template>
               </el-table-column>
@@ -59,13 +60,12 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column prop="bqMc" align="center" label="标签名称" />
+              <el-table-column prop="bqLb" align="center" label="标签类别">
-              <el-table-column prop="bqZl" align="center" label="标签种类">
                 <template #default="{ row }">
                   <DictTag
-                    :value="row.bqZl"
+                    :value="row.bqLb"
                     :tag="false"
-                    :options="props.dic.D_GS_BQ_ZL"
+                    :options="props.dic.D_GS_BQ_LB"
                   />
                 </template>
               </el-table-column>
@@ -94,13 +94,14 @@
             :row-key="keyid"
             style="width: 100%"
           >
+            <el-table-column prop="bqMc" align="center" label="标签名称" />
             <el-table-column prop="bqDm" align="center" label="标签代码" />
-            <el-table-column prop="bqLb" align="center" label="标签类别">
+            <el-table-column prop="bqZl" align="center" label="标签种类">
               <template #default="{ row }">
                 <DictTag
-                  :value="row.bqLb"
+                  :value="row.bqZl"
                   :tag="false"
-                  :options="props.dic.D_GS_BQ_LB"
+                  :options="props.dic.D_GS_BQ_ZL"
                 />
               </template>
             </el-table-column>
@@ -113,13 +114,12 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column prop="bqMc" align="center" label="标签名称" />
+            <el-table-column prop="bqLb" align="center" label="标签类别">
-            <el-table-column prop="bqZl" align="center" label="标签种类">
               <template #default="{ row }">
                 <DictTag
-                  :value="row.bqZl"
+                  :value="row.bqLb"
                   :tag="false"
-                  :options="props.dic.D_GS_BQ_ZL"
+                  :options="props.dic.D_GS_BQ_LB"
                 />
               </template>
             </el-table-column>
@@ -212,7 +212,6 @@ const multipleUserRef = ref(null);
 const emits = defineEmits(["update:modelValue", "chooseDate"]);
 const type = ref("标签大类");
 onMounted(() => {
-
   tabs.value = props.dic.D_GS_BQ_ZL;
   activeTab.value = tabs.value?.[0]?.dm || "01";
   handleFilter();
@@ -245,7 +244,6 @@ const onComfirm = () => {
 };
 //数据回显
 const setValues = (list) => {
-
   selectedData.value = list.map((item) => {
     // 统一id字段处理逻辑
     if (item.bqId) {

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue

@@ -160,6 +160,40 @@
             </template>
           </MyTable>
         </template>
+        <template #bqInfo>
+          <el-divider content-position="left">标签信息</el-divider>
+        </template>
+        <!-- 人员标签模型-->
+        <template #bqList>
+          <el-button @click="open('01')">选择</el-button>
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.bqList"
+              :tableColumn="tableDate.tableColumn"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.keyCount"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+            >
+              <template #bqLb="{ row }">
+                <DictTag :value="row.bqLb" :tag="false" :options="D_GS_BQ_LB" />
+              </template>
+              <template #bqLx="{ row }">
+                <DictTag :value="row.bqLx" :tag="false" :options="D_GS_BQ_LX" />
+              </template>
+              <template #bqZl="{ row }">
+                <DictTag :value="row.bqZl" :tag="false" :options="D_GS_BQ_ZL" />
+              </template>
+              <!-- 操作 -->
+              <template #controls="{ row }">
+                <el-link type="danger" @click="delDictItem(row.bqId)"
+                  >删除</el-link
+                >
+              </template>
+            </MyTable>
+          </div>
+        </template>
+
         <!-- 两群采集录入-->
         <template #lqxxList>
           <el-button @click="openDialog('01')">新增</el-button>
@@ -209,6 +243,13 @@
       v-model="selectionValue"
     >
     </selectionList>
+    <!-- 列表弹窗 -->
+    <TagSelectorDialog
+      v-model="choose"
+      ref="tagDialog"
+      @chooseDate="handleTagSelect"
+      :dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }"
+    />
   </div>
 </template>
 
@@ -221,6 +262,8 @@ import addFormPeo from "./addFormPeo.vue";
 import ApprovalInfo from "./approvalInfo.vue";
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
 import * as rule from "@/utils/rules.js";
+import TagSelectorDialog from "./TagSelectorDialogPeo.vue";
+
 import {
   ref,
   defineExpose,
@@ -244,7 +287,10 @@ const {
   D_BZ_MZ,
   D_BZ_XZQHDM,
   D_GS_ZDR_BK_ZT,
-  D_GS_ZDR_CZZT
+  D_GS_ZDR_CZZT,
+  D_GS_BQ_ZL,
+  D_GS_BQ_LB,
+  D_GS_BQ_LX
 } = proxy.$dict(
   "D_BZ_SF",
   "D_GS_ZDQT_FXDJ",
@@ -254,9 +300,13 @@ const {
   "D_BZ_MZ",
   "D_BZ_XZQHDM",
   "D_GS_ZDR_BK_ZT",
-  "D_GS_ZDR_CZZT"
+  "D_GS_ZDR_CZZT",
+  "D_GS_BQ_ZL",
+  "D_GS_BQ_LB",
+  "D_GS_BQ_LX"
 ); //获取字典数据
 const dialogTitle = ref("新增信息"); //弹窗标题
+const tagDialog = ref();
 
 const roleIds = ref([]); //选择角色
 const selectroleId = ref([]); //选择角色
@@ -285,7 +335,9 @@ const formData = ref([
   { label: "联系人", prop: "gkMjXm", type: "input" },
   { label: "联系方式", prop: "gkMjLxfs", type: "input" },
   { label: "", prop: "xzRy", type: "slot", width: "100%" },
-  { label: "", prop: "spXx", type: "slot", width: "100%" }
+  { label: "", prop: "spXx", type: "slot", width: "100%" },
+  { label: "", prop: "bqInfo", type: "slot", width: "100%" },
+  { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
 ]);
 //人员信息
 const pageData = reactive({
@@ -317,6 +369,7 @@ const addFormDiloag = ref();
 //两群信息表格，重点人标签表格
 const tableDate = reactive({
   lqxxList: [], //两群信息表格数据
+  bqList: [], //标签表格数据
   tableConfiger: {
     rowHieght: 30,
     showSelectType: "null",
@@ -336,6 +389,13 @@ const tableDate = reactive({
     { label: "联系人电话", prop: "qzLxdh" },
     { label: "群重要内容", prop: "qZynr" },
     { label: "操作", prop: "controls", showSolt: true }
+  ],
+  tableColumn: [
+    { label: "标签名称", prop: "bqMc" },
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签种类", prop: "bqZl", showSolt: true },
+    { label: "标签类型", prop: "bqLx", showSolt: true },
+    { label: "标签类别", prop: "bqLb", showSolt: true }
   ]
 });
 const chooseShow = ref(false); //选择弹窗
@@ -362,7 +422,6 @@ const init = async (type, row) => {
   await nextTick(); // 等待子组件挂载
   title.value = type == "add" ? "新增" : "编辑";
   if (row) getDataById(row.id);
-  console.log(type, row);
   if (type === "edit" && row) {
     addFormDiloag.value?.setFormData?.(row); // 回显布控信息
     approvalInfoRef.value?.setFormData?.(row); // 回显审批信息
@@ -372,12 +431,26 @@ const init = async (type, row) => {
     approvalInfoRef.value?.resetForm?.();
   }
 };
+
+const handleTagSelect = (selectedTags) => {
+  tableDate.bqList = selectedTags.map((item) => ({
+    bqDm: item.bqDm || "",
+    bqId: item.bqId || "",
+    bqLb: item.bqLb || "",
+    bqLx: item.bqLx || "",
+    bqMc: item.bqMc || "",
+    bqZl: item.bqZl || ""
+  }));
+  listQuery.value.bqList = tableDate.bqList;
+  // 每个标签包含: bqDm, bqId, bqLb, bqLx, bqMc, bqZl 属性
+};
 // 根据id查询详情
 const getDataById = (id) => {
   qcckGet({}, "/mosty-gsxt/tbGsxtZdqt/selectVoById/" + id).then((res) => {
     listQuery.value = res;
     pageData.tableData = res.zdryList;
     tableDate.lqxxList = res.lqxxList;
+    tableDate.bqList = res.bkdxList;
   });
 };
 const handleAddEdit = (type, row) => {
@@ -393,6 +466,14 @@ const openDialog = (type) => {
   chooseType.value = type;
   chooseTitle.value = "请录入两群信息";
 };
+
+// 打开弹窗
+const open = (type) => {
+  choose.value = true;
+  nextTick(() => {
+    tagDialog.value.setValues(listQuery.value.bqList);
+  });
+};
 // 选择数据
 const chooseDate = (data) => {
   tableDate.lqxxList.push(data);

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addFormPeo.vue

@@ -20,6 +20,21 @@
         ref="elform"
         :rules="rules"
       >
+        <template #basic>
+          <el-divider content-position="left">基础管理</el-divider>
+        </template>
+        <template #address>
+          <el-divider content-position="left">地址信息</el-divider>
+        </template>
+        <template #jurisdiction>
+          <el-divider content-position="left">管辖信息</el-divider>
+        </template>
+        <template #status>
+          <el-divider content-position="left">状态信息</el-divider>
+        </template>
+        <template #bqInfo>
+          <el-divider content-position="left">标签信息</el-divider>
+        </template>
         <!-- 人员标签模型-->
         <template #bqList>
           <el-button @click="openDialog('01')">选择</el-button>
@@ -51,12 +66,13 @@
           </div>
         </template>
 
-        <!-- 管辖单位代码 -->
+        <!-- 管辖单位 -->
         <template #gxSsbmdm>
           <el-select
             v-model="listQuery.gxSsbmdm"
-            placeholder="请选择管辖单位代码"
+            placeholder="请选择管辖单位"
             style="width: 240px"
+            @change="handleDeptChange('gxSsbmmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -66,12 +82,13 @@
             />
           </el-select>
         </template>
-        <!-- 户籍派出所代码 -->
+        <!-- 户籍派出所 -->
         <template #hjdPcsdm>
           <el-select
             v-model="listQuery.hjdPcsdm"
-            placeholder="请选择户籍派出所代码"
+            placeholder="请选择户籍派出所"
             style="width: 240px"
+            @change="handleDeptChange('hjdPcsmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -81,12 +98,13 @@
             />
           </el-select>
         </template>
-        <!-- 诉求单位代码 -->
+        <!-- 诉求单位 -->
         <template #sqSsbmdm>
           <el-select
             v-model="listQuery.sqSsbmdm"
-            placeholder="请选择户籍派出所代码"
+            placeholder="请选择户籍派出所"
             style="width: 240px"
+            @change="handleDeptChange('sqSsbmmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -96,12 +114,13 @@
             />
           </el-select>
         </template>
-        <!-- 现住地派出所代码 -->
+        <!-- 现住地派出所 -->
         <template #xzdPcsdm>
           <el-select
             v-model="listQuery.xzdPcsdm"
-            placeholder="请选择现住地派出所代码"
+            placeholder="请选择现住地派出所"
             style="width: 240px"
+            @change="handleDeptChange('xzdPcsmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -111,12 +130,13 @@
             />
           </el-select>
         </template>
-        <!-- 责任单位代码 -->
+        <!-- 责任单位 -->
         <template #zrSsbmdm>
           <el-select
             v-model="listQuery.zrSsbmdm"
-            placeholder="请选择责任单位代码"
+            placeholder="请选择责任单位"
             style="width: 240px"
+            @change="handleDeptChange('zrSsbmmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -196,61 +216,58 @@ const emits = defineEmits([
 const tagDialog = ref();
 const dialogForm = ref(false); //弹窗
 const formData = ref([
+  { label: "", prop: "basic", type: "slot", width: "100%" },
   { label: "姓名", prop: "ryXm", type: "input" },
+  { label: "性别", prop: "ryXb", type: "select", options: D_BZ_XB },
+  { label: "民族", prop: "ryMz", type: "select", options: D_BZ_MZ },
   { label: "身份证号", prop: "rySfzh", type: "input" },
-  { label: "户籍地派出所名称", prop: "hjdPcsmc", type: "input" },
+  { label: "联系电话", prop: "ryLxdh", type: "input" },
+  { label: "出生日期", prop: "ryCsrq", type: "date" },
+  { label: "籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM },
   {
-    label: "户籍地派出所代码",
+    label: "级别",
-    prop: "hjdPcsdm",
-    type: "slot"
-  },
-  { label: "管辖单位", prop: "gxSsbmmc", type: "input" },
-  {
-    label: "管辖单位代码",
-    prop: "gxSsbmdm",
-    type: "slot"
-  },
-
-  { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
-  { label: "户籍地详址", prop: "hjdXz", type: "input" },
-  { label: "人员出生日期", prop: "ryCsrq", type: "date" },
-  { label: "人员籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM },
-  { label: "人员联系电话", prop: "ryLxdh", type: "input" },
-  { label: "人员民族", prop: "ryMz", type: "select", options: D_BZ_MZ },
-  { label: "人员性别", prop: "ryXb", type: "select", options: D_BZ_XB },
-  { label: "诉求单位名称", prop: "sqSsbmmc", type: "input" },
-  {
-    label: "诉求单位代码",
-    prop: "sqSsbmdm",
-    type: "slot"
-  },
-
-  { label: "现住地派出所名称", prop: "xzdPcsmc", type: "input" },
-  {
-    label: "现住地派出所代码",
-    prop: "xzdPcsdm",
-    type: "slot"
-  },
-
-  { label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM },
-  { label: "现住地详址", prop: "xzdXz", type: "input" },
-  {
-    label: "重点人处置状态",
-    prop: "zdrCzzt",
-    type: "select",
-    options: D_GS_ZDR_CZZT
-  },
-
-  { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
-  { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
-  {
-    label: "人员级别",
     prop: "zdrRyjb",
     type: "select",
     options: D_GS_ZDR_RYJB
   },
+  {
+    label: "预警等级",
+    prop: "zdrYjdj",
+    type: "select",
+    options: D_GS_ZDR_YJDJ
+  },
+  { label: "", prop: "address", type: "slot", width: "100%" },
+  { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
+  { label: "户籍地详址", prop: "hjdXz", type: "input" },
+  {
+    label: "户籍地派出所",
+    prop: "hjdPcsdm",
+    type: "slot"
+  },
+  { label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM },
+  { label: "现住地详址", prop: "xzdXz", type: "input" },
+  {
+    label: "现住地派出所",
+    prop: "xzdPcsdm",
+    type: "slot"
+  },
+  { label: "", prop: "jurisdiction", type: "slot", width: "100%" },
+  {
+    label: "管辖单位",
+    prop: "gxSsbmdm",
+    type: "slot"
+  },
+  {
+    label: "诉求单位",
+    prop: "sqSsbmdm",
+    type: "slot"
+  },
+  {
+    label: "责任单位",
+    prop: "zrSsbmdm",
+    type: "slot"
+  },
   { label: "所属警种", prop: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ },
-
   {
     label: "涉及警种",
     prop: "zdrSjjz",
@@ -258,24 +275,23 @@ const formData = ref([
     options: D_GS_BK_SSJZ,
     multiple: true
   },
-  {
-    label: "重点人预警等级",
-    prop: "zdrYjdj",
-    type: "select",
-    options: D_GS_ZDR_YJDJ
-  },
-
   { label: "管控民警姓名", prop: "gkMjXm", type: "input" },
   { label: "管控民警警号", prop: "gkMjJh", type: "input" },
   { label: "管控原因", prop: "zdrLkyy", type: "textarea", width: "100%" },
-  { label: "责任单位", prop: "zrSsbmmc", type: "input" },
+  { label: "", prop: "status", type: "slot", width: "100%" },
   {
-    label: "责任单位代码",
+    label: "处置状态",
-    prop: "zrSsbmdm",
+    prop: "zdrCzzt",
-    type: "slot"
+    type: "select",
+    options: D_GS_ZDR_CZZT
   },
+
+  { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
+  { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
+
   // { label: "人员标签大类", prop: "bqdl", type: "select", options: [] },
   // { label: "人员标签细类", prop: "bqxl", type: "select", options: [] },
+  { label: "", prop: "bqInfo", type: "slot", width: "100%" },
   { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
 ]);
 const listQuery = ref({}); //表单
@@ -298,11 +314,11 @@ const tableDate = reactive({
   }, //分页
   controlsWidth: 90, //操作栏宽度
   tableColumn: [
-    { label: "标签代码", prop: "bqDm" },
-    { label: "标签类别", prop: "bqLb", showSolt: true },
-    { label: "标签类型", prop: "bqLx", showSolt: true },
     { label: "标签名称", prop: "bqMc" },
-    { label: "标签种类", prop: "bqZl", showSolt: true }
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签种类", prop: "bqZl", showSolt: true },
+    { label: "标签类型", prop: "bqLx", showSolt: true },
+    { label: "标签类别", prop: "bqLb", showSolt: true }
   ]
 });
 const chooseType = ref("01"); //选择弹窗类型
@@ -378,9 +394,15 @@ const openDialog = (type) => {
     tagDialog.value.setValues(listQuery.value.bqList);
   });
 };
-
+const handleDeptChange = (nameField, selectedValue) => {
+  // 找到选中的部门
+  const selectedDept = deptList.value.find(
+    (item) => item.value.toString() === selectedValue
+  );
+  // 更新名称
+  listQuery.value[nameField] = selectedDept ? selectedDept.label : "";
+};
 const handleTagSelect = (selectedTags) => {
-  console.log("已选标签:", selectedTags);
   tableDate.bqList = selectedTags.map((item) => ({
     bqDm: item.bqDm || "",
     bqId: item.bqId || "",

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue

@@ -52,7 +52,7 @@
           <el-table-column prop="rySfzh" align="center" label="身份证号" />
           <el-table-column prop="hjdXz" align="center" label="户籍地详址" />
           <el-table-column prop="xzdXz" align="center" label="现居住地详址" />
-          <el-table-column prop="ryLxdh" align="center" label="人员联系电话" />
+          <el-table-column prop="ryLxdh" align="center" label="联系电话" />
           <el-table-column label="人员民族">
             <template #default="scope">
               <span style="margin-left: 10px">{{

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue

@@ -52,9 +52,13 @@
             </ul>
           </div>
           <div class="flex">
-            <el-button type="primary" size="small"> 涉恐群体</el-button>
+            <el-button
-            <el-button type="primary" size="small"> 涉稳群体</el-button>
+              type="primary"
-            <el-button type="primary" size="small"> 讨薪群体</el-button>
+              size="small"
+              v-for="(item, index) in row.bqList"
+            >
+              {{ item.bqMc }}</el-button
+            >
           </div>
         </template>
         <template #bgxx="{ row }">
@@ -82,7 +86,11 @@
             @click="openDetail(row)"
             >送审</el-link
           >
-          <el-link size="small" type="success" @click="addEdit('edit', row)"
+          <el-link
+            size="small"
+            type="success"
+            @click="addEdit('edit', row)"
+            v-if="row.qtZt !== '05'"
             >编辑</el-link
           >
           <el-link size="small" type="primary" @click="infoList('info', row)"

src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/TagSelectorDialog.vue

@@ -33,6 +33,7 @@
               :data="tableData"
               border
               :row-key="keyid"
+              :style="{ 'min-height': '450px' }"
               style="width: 100%"
             >
               <el-table-column
@@ -40,13 +41,14 @@
                 width="55"
                 :reserve-selection="true"
               />
+              <el-table-column prop="bqMc" align="center" label="标签名称" />
               <el-table-column prop="bqDm" align="center" label="标签代码" />
-              <el-table-column prop="bqLb" align="center" label="标签类别">
+              <el-table-column prop="bqZl" align="center" label="标签种类">
                 <template #default="{ row }">
                   <DictTag
-                    :value="row.bqLb"
+                    :value="row.bqZl"
                     :tag="false"
-                    :options="props.dic.D_GS_BQ_LB"
+                    :options="props.dic.D_GS_BQ_ZL"
                   />
                 </template>
               </el-table-column>
@@ -59,13 +61,12 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column prop="bqMc" align="center" label="标签名称" />
+              <el-table-column prop="bqLb" align="center" label="标签类别">
-              <el-table-column prop="bqZl" align="center" label="标签种类">
                 <template #default="{ row }">
                   <DictTag
-                    :value="row.bqZl"
+                    :value="row.bqLb"
                     :tag="false"
-                    :options="props.dic.D_GS_BQ_ZL"
+                    :options="props.dic.D_GS_BQ_LB"
                   />
                 </template>
               </el-table-column>
@@ -86,21 +87,23 @@
         </el-tabs>
       </div>
 
-      <div style="width: 48%">
+      <div style="width: 48%; margin-top: 32px">
         <div class="selected-tabBox">
           <el-table
             :data="selectedData"
             border
             :row-key="keyid"
             style="width: 100%"
+            :style="{ 'min-height': '450px' }"
           >
+            <el-table-column prop="bqMc" align="center" label="标签名称" />
             <el-table-column prop="bqDm" align="center" label="标签代码" />
-            <el-table-column prop="bqLb" align="center" label="标签类别">
+            <el-table-column prop="bqZl" align="center" label="标签种类">
               <template #default="{ row }">
                 <DictTag
-                  :value="row.bqLb"
+                  :value="row.bqZl"
                   :tag="false"
-                  :options="props.dic.D_GS_BQ_LB"
+                  :options="props.dic.D_GS_BQ_ZL"
                 />
               </template>
             </el-table-column>
@@ -113,13 +116,12 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column prop="bqMc" align="center" label="标签名称" />
+            <el-table-column prop="bqLb" align="center" label="标签类别">
-            <el-table-column prop="bqZl" align="center" label="标签种类">
               <template #default="{ row }">
                 <DictTag
-                  :value="row.bqZl"
+                  :value="row.bqLb"
                   :tag="false"
-                  :options="props.dic.D_GS_BQ_ZL"
+                  :options="props.dic.D_GS_BQ_LB"
                 />
               </template>
             </el-table-column>

src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/addForm.vue

@@ -20,6 +20,21 @@
         ref="elform"
         :rules="rules"
       >
+        <template #basic>
+          <el-divider content-position="left">基础管理</el-divider>
+        </template>
+        <template #address>
+          <el-divider content-position="left">地址信息</el-divider>
+        </template>
+        <template #jurisdiction>
+          <el-divider content-position="left">管辖信息</el-divider>
+        </template>
+        <template #status>
+          <el-divider content-position="left">状态信息</el-divider>
+        </template>
+        <template #bqInfo>
+          <el-divider content-position="left">标签信息</el-divider>
+        </template>
         <!-- 人员标签模型-->
         <template #bqList>
           <el-button @click="openDialog('01')">选择</el-button>
@@ -51,12 +66,13 @@
           </div>
         </template>
 
-        <!-- 管辖单位代码 -->
+        <!-- 管辖单位 -->
         <template #gxSsbmdm>
           <el-select
             v-model="listQuery.gxSsbmdm"
-            placeholder="请选择管辖单位代码"
+            placeholder="请选择管辖单位"
             style="width: 240px"
+            @change="handleDeptChange('gxSsbmmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -66,12 +82,13 @@
             />
           </el-select>
         </template>
-        <!-- 户籍派出所代码 -->
+        <!-- 户籍派出所 -->
         <template #hjdPcsdm>
           <el-select
             v-model="listQuery.hjdPcsdm"
-            placeholder="请选择户籍派出所代码"
+            placeholder="请选择户籍派出所"
             style="width: 240px"
+            @change="handleDeptChange('hjdPcsmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -81,12 +98,13 @@
             />
           </el-select>
         </template>
-        <!-- 诉求单位代码 -->
+        <!-- 诉求单位 -->
         <template #sqSsbmdm>
           <el-select
             v-model="listQuery.sqSsbmdm"
-            placeholder="请选择户籍派出所代码"
+            placeholder="请选择户籍派出所"
             style="width: 240px"
+            @change="handleDeptChange('sqSsbmmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -96,12 +114,13 @@
             />
           </el-select>
         </template>
-        <!-- 现住地派出所代码 -->
+        <!-- 现住地派出所 -->
         <template #xzdPcsdm>
           <el-select
             v-model="listQuery.xzdPcsdm"
-            placeholder="请选择现住地派出所代码"
+            placeholder="请选择现住地派出所"
             style="width: 240px"
+            @change="handleDeptChange('xzdPcsmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -111,12 +130,13 @@
             />
           </el-select>
         </template>
-        <!-- 责任单位代码 -->
+        <!-- 责任单位 -->
         <template #zrSsbmdm>
           <el-select
             v-model="listQuery.zrSsbmdm"
-            placeholder="请选择责任单位代码"
+            placeholder="请选择责任单位"
             style="width: 240px"
+            @change="handleDeptChange('zrSsbmmc', $event)"
           >
             <el-option
               v-for="item in deptList"
@@ -191,61 +211,58 @@ const {
 const tagDialog = ref();
 const dialogForm = ref(false); //弹窗
 const formData = ref([
+  { label: "", prop: "basic", type: "slot", width: "100%" },
   { label: "姓名", prop: "ryXm", type: "input" },
+  { label: "性别", prop: "ryXb", type: "select", options: D_BZ_XB },
+  { label: "民族", prop: "ryMz", type: "select", options: D_BZ_MZ },
   { label: "身份证号", prop: "rySfzh", type: "input" },
-  { label: "户籍地派出所名称", prop: "hjdPcsmc", type: "input" },
+  { label: "联系电话", prop: "ryLxdh", type: "input" },
+  { label: "出生日期", prop: "ryCsrq", type: "date" },
+  { label: "籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM },
   {
-    label: "户籍地派出所代码",
+    label: "级别",
-    prop: "hjdPcsdm",
-    type: "slot"
-  },
-  { label: "管辖单位", prop: "gxSsbmmc", type: "input" },
-  {
-    label: "管辖单位代码",
-    prop: "gxSsbmdm",
-    type: "slot"
-  },
-
-  { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
-  { label: "户籍地详址", prop: "hjdXz", type: "input" },
-  { label: "人员出生日期", prop: "ryCsrq", type: "date" },
-  { label: "人员籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM },
-  { label: "人员联系电话", prop: "ryLxdh", type: "input" },
-  { label: "人员民族", prop: "ryMz", type: "select", options: D_BZ_MZ },
-  { label: "人员性别", prop: "ryXb", type: "select", options: D_BZ_XB },
-  { label: "诉求单位名称", prop: "sqSsbmmc", type: "input" },
-  {
-    label: "诉求单位代码",
-    prop: "sqSsbmdm",
-    type: "slot"
-  },
-
-  { label: "现住地派出所名称", prop: "xzdPcsmc", type: "input" },
-  {
-    label: "现住地派出所代码",
-    prop: "xzdPcsdm",
-    type: "slot"
-  },
-
-  { label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM },
-  { label: "现住地详址", prop: "xzdXz", type: "input" },
-  {
-    label: "重点人处置状态",
-    prop: "zdrCzzt",
-    type: "select",
-    options: D_GS_ZDR_CZZT
-  },
-
-  { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
-  { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
-  {
-    label: "人员级别",
     prop: "zdrRyjb",
     type: "select",
     options: D_GS_ZDR_RYJB
   },
+  {
+    label: "预警等级",
+    prop: "zdrYjdj",
+    type: "select",
+    options: D_GS_ZDR_YJDJ
+  },
+  { label: "", prop: "address", type: "slot", width: "100%" },
+  { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
+  { label: "户籍地详址", prop: "hjdXz", type: "input" },
+  {
+    label: "户籍地派出所",
+    prop: "hjdPcsdm",
+    type: "slot"
+  },
+  { label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM },
+  { label: "现住地详址", prop: "xzdXz", type: "input" },
+  {
+    label: "现住地派出所",
+    prop: "xzdPcsdm",
+    type: "slot"
+  },
+  { label: "", prop: "jurisdiction", type: "slot", width: "100%" },
+  {
+    label: "管辖单位",
+    prop: "gxSsbmdm",
+    type: "slot"
+  },
+  {
+    label: "诉求单位",
+    prop: "sqSsbmdm",
+    type: "slot"
+  },
+  {
+    label: "责任单位",
+    prop: "zrSsbmdm",
+    type: "slot"
+  },
   { label: "所属警种", prop: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ },
-
   {
     label: "涉及警种",
     prop: "zdrSjjz",
@@ -253,24 +270,23 @@ const formData = ref([
     options: D_GS_BK_SSJZ,
     multiple: true
   },
-  {
-    label: "重点人预警等级",
-    prop: "zdrYjdj",
-    type: "select",
-    options: D_GS_ZDR_YJDJ
-  },
-
   { label: "管控民警姓名", prop: "gkMjXm", type: "input" },
   { label: "管控民警警号", prop: "gkMjJh", type: "input" },
   { label: "管控原因", prop: "zdrLkyy", type: "textarea", width: "100%" },
-  { label: "责任单位", prop: "zrSsbmmc", type: "input" },
+  { label: "", prop: "status", type: "slot", width: "100%" },
   {
-    label: "责任单位代码",
+    label: "处置状态",
-    prop: "zrSsbmdm",
+    prop: "zdrCzzt",
-    type: "slot"
+    type: "select",
+    options: D_GS_ZDR_CZZT
   },
+
+  { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
+  { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
+
   // { label: "人员标签大类", prop: "bqdl", type: "select", options: [] },
   // { label: "人员标签细类", prop: "bqxl", type: "select", options: [] },
+  { label: "", prop: "bqInfo", type: "slot", width: "100%" },
   { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
 ]);
 const listQuery = ref({}); //表单
@@ -293,11 +309,11 @@ const tableDate = reactive({
   }, //分页
   controlsWidth: 90, //操作栏宽度
   tableColumn: [
-    { label: "标签代码", prop: "bqDm" },
-    { label: "标签类别", prop: "bqLb", showSolt: true },
-    { label: "标签类型", prop: "bqLx", showSolt: true },
     { label: "标签名称", prop: "bqMc" },
-    { label: "标签种类", prop: "bqZl", showSolt: true }
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签种类", prop: "bqZl", showSolt: true },
+    { label: "标签类型", prop: "bqLx", showSolt: true },
+    { label: "标签类别", prop: "bqLb", showSolt: true }
   ]
 });
 const loading = ref(false);
@@ -360,8 +376,15 @@ const openDialog = (type) => {
   });
 };
 
+const handleDeptChange = (nameField, selectedValue) => {
+  // 找到选中的部门
+  const selectedDept = deptList.value.find(
+    (item) => item.value.toString() === selectedValue
+  );
+  // 更新名称
+  listQuery.value[nameField] = selectedDept ? selectedDept.label : "";
+};
 const handleTagSelect = (selectedTags) => {
-  console.log("已选标签:", selectedTags);
   tableDate.bqList = selectedTags.map((item) => ({
     bqDm: item.bqDm || "",
     bqId: item.bqId || "",

src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/components/infoForm.vue

@@ -13,6 +13,21 @@
         ref="elform"
         :rules="rules"
       >
+        <template #basic>
+          <el-divider content-position="left">基础管理</el-divider>
+        </template>
+        <template #address>
+          <el-divider content-position="left">地址信息</el-divider>
+        </template>
+        <template #jurisdiction>
+          <el-divider content-position="left">管辖信息</el-divider>
+        </template>
+        <template #status>
+          <el-divider content-position="left">状态信息</el-divider>
+        </template>
+        <template #bqInfo>
+          <el-divider content-position="left">标签信息</el-divider>
+        </template>
         <!-- 人员标签模型-->
         <template #bqList>
           <!-- <el-button @click="openDialog('01')">选择</el-button> -->
@@ -35,20 +50,20 @@
                 <DictTag :value="row.bqZl" :tag="false" :options="D_GS_BQ_ZL" />
               </template>
               <!-- 操作 -->
-              <template #controls="{ row }">
+              <!-- <template #controls="{ row }">
                 <el-link type="danger" @click="delDictItem(row.bqId)"
                   >删除</el-link
                 >
-              </template>
+              </template> -->
             </MyTable>
           </div>
         </template>
 
-        <!-- 管辖单位代码 -->
+        <!-- 管辖单位 -->
         <template #gxSsbmdm>
           <el-select
             v-model="listQuery.gxSsbmdm"
-            placeholder="请选择管辖单位代码"
+            placeholder="请选择管辖单位"
             style="width: 240px"
             :disabled="true"
           >
@@ -60,11 +75,11 @@
             />
           </el-select>
         </template>
-        <!-- 户籍派出所代码 -->
+        <!-- 户籍派出所 -->
         <template #hjdPcsdm>
           <el-select
             v-model="listQuery.hjdPcsdm"
-            placeholder="请选择户籍派出所代码"
+            placeholder="请选择户籍派出所"
             style="width: 240px"
             :disabled="true"
           >
@@ -76,11 +91,12 @@
             />
           </el-select>
         </template>
-        <!-- 诉求单位代码 -->
+        <!-- 诉求单位 -->
+
         <template #sqSsbmdm>
           <el-select
             v-model="listQuery.sqSsbmdm"
-            placeholder="请选择户籍派出所代码"
+            placeholder="请选择户籍派出所"
             style="width: 240px"
             :disabled="true"
           >
@@ -92,11 +108,11 @@
             />
           </el-select>
         </template>
-        <!-- 现住地派出所代码 -->
+        <!-- 现住地派出所 -->
         <template #xzdPcsdm>
           <el-select
             v-model="listQuery.xzdPcsdm"
-            placeholder="请选择现住地派出所代码"
+            placeholder="请选择现住地派出所"
             style="width: 240px"
             :disabled="true"
           >
@@ -108,11 +124,11 @@
             />
           </el-select>
         </template>
-        <!-- 责任单位代码 -->
+        <!-- 责任单位 -->
         <template #zrSsbmdm>
           <el-select
             v-model="listQuery.zrSsbmdm"
-            placeholder="请选择责任单位代码"
+            placeholder="请选择责任单位"
             style="width: 240px"
             :disabled="true"
           >
@@ -188,29 +204,205 @@ const {
 ); //获取字典数据
 const tagDialog = ref();
 const dialogForm = ref(false); //弹窗
-const formData = ref([
+// const formData = ref([
-  { label: "姓名", prop: "ryXm", type: "input", disabled: true },
+//   { label: "", prop: "basic", type: "slot", width: "100%" },
-  { label: "身份证号", prop: "rySfzh", type: "input", disabled: true },
-  {
-    label: "户籍地派出所名称",
-    prop: "hjdPcsmc",
-    type: "input",
-    disabled: true
-  },
-  {
-    label: "户籍地派出所代码",
-    prop: "hjdPcsdm",
-    type: "slot",
-    disabled: true
-  },
-  { label: "管辖单位", prop: "gxSsbmmc", type: "input", disabled: true },
-  {
-    label: "管辖单位代码",
-    prop: "gxSsbmdm",
-    type: "slot",
-    disabled: true
-  },
 
+//   { label: "姓名", prop: "ryXm", type: "input", disabled: true },
+//   { label: "身份证号", prop: "rySfzh", type: "input", disabled: true },
+//   {
+//     label: "户籍地派出所名称",
+//     prop: "hjdPcsmc",
+//     type: "input",
+//     disabled: true
+//   },
+//   {
+//     label: "户籍地派出所代码",
+//     prop: "hjdPcsdm",
+//     type: "slot",
+//     disabled: true
+//   },
+//   { label: "管辖单位", prop: "gxSsbmmc", type: "input", disabled: true },
+//   {
+//     label: "管辖单位代码",
+//     prop: "gxSsbmdm",
+//     type: "slot",
+//     disabled: true
+//   },
+
+//   {
+//     label: "户籍地区划",
+//     prop: "hjdQh",
+//     type: "select",
+//     options: D_BZ_XZQHDM,
+//     disabled: true
+//   },
+//   { label: "户籍地详址", prop: "hjdXz", type: "input", disabled: true },
+//   { label: "人员出生日期", prop: "ryCsrq", type: "date", disabled: true },
+//   {
+//     label: "人员籍贯",
+//     prop: "ryJg",
+//     type: "select",
+//     options: D_BZ_XZQHDM,
+//     disabled: true
+//   },
+//   { label: "人员联系电话", prop: "ryLxdh", type: "input", disabled: true },
+//   {
+//     label: "人员民族",
+//     prop: "ryMz",
+//     type: "select",
+//     options: D_BZ_MZ,
+//     disabled: true
+//   },
+//   {
+//     label: "人员性别",
+//     prop: "ryXb",
+//     type: "select",
+//     options: D_BZ_XB,
+//     disabled: true
+//   },
+//   { label: "诉求单位名称", prop: "sqSsbmmc", type: "input", disabled: true },
+//   {
+//     label: "诉求单位代码",
+//     prop: "sqSsbmdm",
+//     type: "slot",
+//     disabled: true
+//   },
+
+//   {
+//     label: "现住地派出所名称",
+//     prop: "xzdPcsmc",
+//     type: "input",
+//     disabled: true
+//   },
+//   {
+//     label: "现住地派出所代码",
+//     prop: "xzdPcsdm",
+//     type: "slot",
+//     disabled: true
+//   },
+
+//   {
+//     label: "现住地区划",
+//     prop: "xzdQh",
+//     type: "select",
+//     options: D_BZ_XZQHDM,
+//     disabled: true
+//   },
+//   { label: "现住地详址", prop: "xzdXz", type: "input", disabled: true },
+//   {
+//     label: "重点人处置状态",
+//     prop: "zdrCzzt",
+//     type: "select",
+//     options: D_GS_ZDR_CZZT,
+//     disabled: true
+//   },
+
+//   {
+//     label: "入库开始时间",
+//     prop: "zdrRkkssj",
+//     type: "datetime",
+//     disabled: true
+//   },
+//   {
+//     label: "入库结束时间",
+//     prop: "zdrRkjssj",
+//     type: "datetime",
+//     disabled: true
+//   },
+//   {
+//     label: "人员级别",
+//     prop: "zdrRyjb",
+//     type: "select",
+//     options: D_GS_ZDR_RYJB,
+//     disabled: true
+//   },
+//   {
+//     label: "所属警种",
+//     prop: "zdrSsjz",
+//     type: "select",
+//     options: D_GS_BK_SSJZ,
+//     disabled: true
+//   },
+
+//   {
+//     label: "涉及警种",
+//     prop: "zdrSjjz",
+//     type: "select",
+//     options: D_GS_BK_SSJZ,
+//     multiple: true,
+//     disabled: true
+//   },
+//   {
+//     label: "重点人预警等级",
+//     prop: "zdrYjdj",
+//     type: "select",
+//     options: D_GS_ZDR_YJDJ,
+//     disabled: true
+//   },
+
+//   { label: "管控民警姓名", prop: "gkMjXm", type: "input", disabled: true },
+//   { label: "管控民警警号", prop: "gkMjJh", type: "input", disabled: true },
+//   {
+//     label: "管控原因",
+//     prop: "zdrLkyy",
+//     type: "textarea",
+//     width: "100%",
+//     disabled: true
+//   },
+//   { label: "责任单位", prop: "zrSsbmmc", type: "input", disabled: true },
+//   {
+//     label: "责任单位代码",
+//     prop: "zrSsbmdm",
+//     type: "slot",
+//     disabled: true
+//   },
+//   // { label: "人员标签大类", prop: "bqdl", type: "select", options: [] },
+//   // { label: "人员标签细类", prop: "bqxl", type: "select", options: [] },
+//   { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
+// ]);
+
+const formData = ref([
+  { label: "", prop: "basic", type: "slot", width: "100%" },
+  { label: "姓名", prop: "ryXm", type: "input", disabled: true },
+  {
+    label: "性别",
+    prop: "ryXb",
+    type: "select",
+    options: D_BZ_XB,
+    disabled: true
+  },
+  {
+    label: "民族",
+    prop: "ryMz",
+    type: "select",
+    options: D_BZ_MZ,
+    disabled: true
+  },
+  { label: "身份证号", prop: "rySfzh", type: "input", disabled: true },
+  { label: "联系电话", prop: "ryLxdh", type: "input", disabled: true },
+  { label: "出生日期", prop: "ryCsrq", type: "date", disabled: true },
+  {
+    label: "籍贯",
+    prop: "ryJg",
+    type: "select",
+    options: D_BZ_XZQHDM,
+    disabled: true
+  },
+  {
+    label: "级别",
+    prop: "zdrRyjb",
+    type: "select",
+    options: D_GS_ZDR_RYJB,
+    disabled: true
+  },
+  {
+    label: "预警等级",
+    prop: "zdrYjdj",
+    type: "select",
+    options: D_GS_ZDR_YJDJ,
+    disabled: true
+  },
+  { label: "", prop: "address", type: "slot", width: "100%" },
   {
     label: "户籍地区划",
     prop: "hjdQh",
@@ -219,50 +411,12 @@ const formData = ref([
     disabled: true
   },
   { label: "户籍地详址", prop: "hjdXz", type: "input", disabled: true },
-  { label: "人员出生日期", prop: "ryCsrq", type: "date", disabled: true },
   {
-    label: "人员籍贯",
+    label: "户籍地派出所",
-    prop: "ryJg",
+    prop: "hjdPcsdm",
-    type: "select",
-    options: D_BZ_XZQHDM,
-    disabled: true
-  },
-  { label: "人员联系电话", prop: "ryLxdh", type: "input", disabled: true },
-  {
-    label: "人员民族",
-    prop: "ryMz",
-    type: "select",
-    options: D_BZ_MZ,
-    disabled: true
-  },
-  {
-    label: "人员性别",
-    prop: "ryXb",
-    type: "select",
-    options: D_BZ_XB,
-    disabled: true
-  },
-  { label: "诉求单位名称", prop: "sqSsbmmc", type: "input", disabled: true },
-  {
-    label: "诉求单位代码",
-    prop: "sqSsbmdm",
     type: "slot",
     disabled: true
   },
-
-  {
-    label: "现住地派出所名称",
-    prop: "xzdPcsmc",
-    type: "input",
-    disabled: true
-  },
-  {
-    label: "现住地派出所代码",
-    prop: "xzdPcsdm",
-    type: "slot",
-    disabled: true
-  },
-
   {
     label: "现住地区划",
     prop: "xzdQh",
@@ -272,7 +426,62 @@ const formData = ref([
   },
   { label: "现住地详址", prop: "xzdXz", type: "input", disabled: true },
   {
-    label: "重点人处置状态",
+    label: "现住地派出所",
+    prop: "xzdPcsdm",
+    type: "slot",
+    disabled: true
+  },
+  {
+    label: "",
+    prop: "jurisdiction",
+    type: "slot",
+    width: "100%"
+  },
+  {
+    label: "管辖单位",
+    prop: "gxSsbmdm",
+    type: "slot",
+    disabled: true
+  },
+  {
+    label: "诉求单位",
+    prop: "sqSsbmdm",
+    type: "slot",
+    disabled: true
+  },
+  {
+    label: "责任单位",
+    prop: "zrSsbmdm",
+    type: "slot",
+    disabled: true
+  },
+  {
+    label: "所属警种",
+    prop: "zdrSsjz",
+    type: "select",
+    options: D_GS_BK_SSJZ,
+    disabled: true
+  },
+  {
+    label: "涉及警种",
+    prop: "zdrSjjz",
+    type: "select",
+    options: D_GS_BK_SSJZ,
+    multiple: true,
+    disabled: true
+  },
+  { label: "管控民警姓名", prop: "gkMjXm", type: "input", disabled: true },
+  { label: "管控民警警号", prop: "gkMjJh", type: "input", disabled: true },
+  {
+    label: "管控原因",
+    prop: "zdrLkyy",
+    type: "textarea",
+    width: "100%",
+    disabled: true
+  },
+  { label: "", prop: "status", type: "slot", width: "100%" },
+  {
+    label: "处置状态",
     prop: "zdrCzzt",
     type: "select",
     options: D_GS_ZDR_CZZT,
@@ -291,56 +500,17 @@ const formData = ref([
     type: "datetime",
     disabled: true
   },
-  {
-    label: "人员级别",
-    prop: "zdrRyjb",
-    type: "select",
-    options: D_GS_ZDR_RYJB,
-    disabled: true
-  },
-  {
-    label: "所属警种",
-    prop: "zdrSsjz",
-    type: "select",
-    options: D_GS_BK_SSJZ,
-    disabled: true
-  },
 
-  {
-    label: "涉及警种",
-    prop: "zdrSjjz",
-    type: "select",
-    options: D_GS_BK_SSJZ,
-    multiple: true,
-    disabled: true
-  },
-  {
-    label: "重点人预警等级",
-    prop: "zdrYjdj",
-    type: "select",
-    options: D_GS_ZDR_YJDJ,
-    disabled: true
-  },
-
-  { label: "管控民警姓名", prop: "gkMjXm", type: "input", disabled: true },
-  { label: "管控民警警号", prop: "gkMjJh", type: "input", disabled: true },
-  {
-    label: "管控原因",
-    prop: "zdrLkyy",
-    type: "textarea",
-    width: "100%",
-    disabled: true
-  },
-  { label: "责任单位", prop: "zrSsbmmc", type: "input", disabled: true },
-  {
-    label: "责任单位代码",
-    prop: "zrSsbmdm",
-    type: "slot",
-    disabled: true
-  },
   // { label: "人员标签大类", prop: "bqdl", type: "select", options: [] },
   // { label: "人员标签细类", prop: "bqxl", type: "select", options: [] },
-  { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
+  { label: "", prop: "bqInfo", type: "slot", width: "100%" },
+  {
+    label: "标签列表",
+    prop: "bqList",
+    type: "slot",
+    width: "80%",
+    disabled: true
+  }
 ]);
 const listQuery = ref({}); //表单
 const deptList = ref([]); //部门列表
@@ -363,11 +533,11 @@ const tableDate = reactive({
   }, //分页
   controlsWidth: 90, //操作栏宽度
   tableColumn: [
-    { label: "标签代码", prop: "bqDm" },
-    { label: "标签类别", prop: "bqLb", showSolt: true },
-    { label: "标签类型", prop: "bqLx", showSolt: true },
     { label: "标签名称", prop: "bqMc" },
-    { label: "标签种类", prop: "bqZl", showSolt: true }
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签种类", prop: "bqZl", showSolt: true },
+    { label: "标签类型", prop: "bqLx", showSolt: true },
+    { label: "标签类别", prop: "bqLb", showSolt: true }
   ]
 });
 const chooseType = ref("01"); //选择弹窗类型

src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue

@@ -38,7 +38,7 @@
           <div>
             <img src="" alt="" />
             <ul>
-              <li>姓名：{{ row.rySfzh }}</li>
+              <li>姓名：{{ row.ryXm }}</li>
               <li class="rowClass">
                 性别：
                 <DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" />
@@ -60,9 +60,13 @@
             </ul>
           </div>
           <div class="flex">
-            <el-button type="primary" size="small"> 涉恐人员</el-button>
+            <el-button
-            <el-button type="primary" size="small"> 涉稳人员</el-button>
+              type="primary"
-            <el-button type="primary" size="small"> 在逃人员</el-button>
+              size="small"
+              v-for="(item, index) in row.bqList"
+            >
+              {{ item.bqMc }}</el-button
+            >
           </div>
         </template>
         <template #jzxx="{ row }">

src/views/backOfficeSystem/ExcavationResearch/LandingAudit/index.vue

@@ -10,7 +10,11 @@
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount">
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      >
         <template #defaultSlot>
           <div class="checkbox-group">
             <el-checkbox v-model="queryFrom.myNote">我的笔记</el-checkbox>
@@ -32,7 +36,7 @@
         @chooseData="chooseData"
       >
         <!-- 基础信息 -->
-        <template #basicInfo="{ row }">
+        <!-- <template #basicInfo="{ row }">
           <div class="basic-info">
             <div class="avatar">
               <el-image :src="row.avatar" fit="cover"></el-image>
@@ -45,14 +49,37 @@
               <div>出生日期：{{ row.birthDate }}</div>
             </div>
           </div>
+        </template> -->
+        <template #fxDj="{ row }">
+          <DictTag :tag="false" :value="row.fxDj" :options="D_GS_RQFJ_FXDJ" />
+        </template>
+        <template #fxLb="{ row }">
+          <DictTag :tag="false" :value="row.fxLb" :options="D_GS_RQFJ_FXLB" />
+        </template>
+        <template #sfGz="{ row }">
+          <DictTag :tag="false" :value="row.sfGz" :options="D_BZ_SF" />
+        </template>
+        <template #sfZbkry="{ row }">
+          <DictTag :tag="false" :value="row.sfZbkry" :options="D_BZ_SF" />
+        </template>
+        <template #sfZzdry="{ row }">
+          <DictTag :tag="false" :value="row.sfZzdry" :options="D_BZ_SF" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
           <div class="control-buttons">
-            <el-button type="primary" size="small" @click="handleDetail(row)">审核</el-button>
+            <el-button type="primary" size="small" @click="handleDetail(row)"
-            <el-button type="info" size="small" @click="handleApprove(row)">审批</el-button>
+              >审核</el-button
-            <el-button type="warning" size="small" @click="handleDelete(row)">去除</el-button>
+            >
-            <el-button type="danger" size="small" @click="handleBlacklist(row)">拉黑</el-button>
+            <el-button type="info" size="small" @click="handleApprove(row)"
+              >审批</el-button
+            >
+            <el-button type="warning" size="small" @click="handleDelete(row)"
+              >去除</el-button
+            >
+            <el-button type="danger" size="small" @click="handleBlacklist(row)"
+              >拉黑</el-button
+            >
           </div>
         </template>
       </MyTable>
@@ -81,6 +108,12 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 
 const { proxy } = getCurrentInstance();
+const { D_GS_RQFJ_LX, D_GS_RQFJ_FXDJ, D_BZ_SF, D_GS_RQFJ_FXLB } = proxy.$dict(
+  "D_GS_RQFJ_LX",
+  "D_GS_RQFJ_FXDJ",
+  "D_BZ_SF",
+  "D_GS_RQFJ_FXLB"
+);
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 
@@ -124,12 +157,24 @@ const pageData = reactive({
   },
   controlsWidth: 300,
   tableColumn: [
-    { label: "基础信息", prop: "basicInfo", minWidth: 300 },
+    { label: "姓名", prop: "ryXm" },
-    { label: "列控信息", prop: "controlInfo", minWidth: 200 },
+    { label: "英文姓名", prop: "ryXmYw" },
-    { label: "管控信息", prop: "manageInfo", minWidth: 200 },
+    { label: "别名", prop: "ryBm" },
-    { label: "风险积分", prop: "riskScore", width: 100 },
+    { label: "网名", prop: "ryWm" },
-    { label: "评分项", prop: "scoreItems", minWidth: 150 },
+    { label: "绰号", prop: "ryCh" },
-    { label: "最后关注", prop: "lastFollow", width: 120 },
+    { label: "手机号码", prop: "rySjhm" },
+    { label: "身份证号码", prop: "rySfzh" },
+    { label: "户籍地址", prop: "ryHjdz" },
+    { label: "护照号码", prop: "ryHzhm" },
+    { label: "现住地址", prop: "ryXzdz" },
+    { label: "银行卡号", prop: "ryYhkh" },
+    { label: "附件照片", prop: "ryFjZp" },
+    { label: "管辖单位", prop: "gxDwDm" },
+    { label: "风险等级", prop: "fxDj", showSolt: true },
+    { label: "风险类别", prop: "fxLb", showSolt: true },
+    { label: "是否关注", prop: "sfGz", showSolt: true },
+    { label: "是否转布控人员", prop: "sfZbkry", showSolt: true },
+    { label: "是否转重点人员", prop: "sfZzdry", showSolt: true }
   ]
 });
 
@@ -157,19 +202,22 @@ const changeSize = (val) => {
 
 // 获取列表
 const getList = () => {
-  // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
-  // let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // API调用示例
+  qcckGet(data, "/mosty-gsxt/tbGsxtRqfjRy/selectPage")
-  // qcckPost(data, '/api/deepExcavation/list').then(res => {
+    .then((res) => {
-  //   pageData.tableData = res.records || [];
+      pageData.tableData = res.records || [];
-  //   pageData.total = res.total;
+      pageData.total = res.total;
-  //   pageData.tableConfiger.loading = false;
+      pageData.tableConfiger.loading = false;
-  // }).catch(() => { pageData.tableConfiger.loading = false; });
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
 };
 
 // 操作按钮处理函数
 const handleDetail = (row) => {
-  detailDiloag.value.init('detail', row);
+  detailDiloag.value.init("detail", row);
 };
 
 // 详情
@@ -178,7 +226,7 @@ const addEdit = (type, row) => {
 };
 
 const handleApprove = (row) => {
-  detailDiloag.value.init('approve', row);
+  detailDiloag.value.init("approve", row);
 };
 
 const handleDelete = (row) => {
@@ -191,7 +239,8 @@ const handleBlacklist = (row) => {
 
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  pageData.tableHeight =
+    window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };

src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue

@@ -0,0 +1,217 @@
+<template>
+  <!-- 弹框 -->
+  <el-dialog v-model="dialogVisible" title="智能解析数据" width="80vw">
+    <div style="max-height: 250px; overflow-y: auto; padding-right: 8px">
+      <div
+        v-for="(item, index) in tableData"
+        :key="index"
+        style="font-weight: 700; font-size: 20px; margin-bottom: 20px"
+      >
+        发掘文本{{ index + 1 }}:<span class="text-danger">
+          {{ item.fjWb }}</span
+        >
+      </div>
+    </div>
+
+    <MyTable
+      :tableData="pageData.dtoList"
+      :tableColumn="pageData.tableColumn"
+      :tableHeight="pageData.tableHeight"
+      :key="pageData.keyCount"
+      :tableConfiger="pageData.tableConfiger"
+      :controlsWidth="pageData.controlsWidth"
+      :row-class-name="({ row }) => (row.status ? '' : 'row-deleted')"
+    >
+      <!-- 管辖单位 -->
+      <template #gxDwDm="{ row }">
+        <el-select
+          v-model="row.gxDwDm"
+          placeholder="请选择管辖单位"
+          style="width: 130px"
+          @change="handleDeptChange('gxDwMc', $event, row)"
+          :disabled="!row.status"
+        >
+          <el-option
+            v-for="item in deptList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
+        </el-select>
+      </template>
+      <!-- 是否关注 -->
+      <template #sfGz="{ row }">
+        <el-radio-group v-model="row.sfGz">
+          <el-radio
+            v-for="(item, index) in D_BZ_SF"
+            size="large"
+            :key="item.value"
+            :label="item.zdmc || item.label"
+            :value="item.dm || item.value"
+          ></el-radio>
+        </el-radio-group>
+      </template>
+      <!-- 管辖单位 -->
+      <template #ryFjZp="{ row }"> 照片上传 </template>
+      <template
+        v-for="item in pageData.tableColumn.filter(
+          (col) => !['gxDwDm', 'sfGz', 'ryFjZp'].includes(col.prop)
+        )"
+        #[item.prop]="{ row }"
+      >
+        <el-input
+          style="width: 100px"
+          v-model="row[item.prop]"
+          :placeholder="'请输入' + item.label"
+          :disabled="!row.status"
+        />
+      </template>
+      <!-- 操作列 -->
+      <template #controls="{ row, $index }">
+        <el-link v-if="row.status" type="danger" @click="delDictItem($index)">
+          删除
+        </el-link>
+        <el-link v-else type="primary" @click="recover($index)"> 恢复 </el-link>
+      </template>
+    </MyTable>
+    <div class="stats">
+      共 {{ pageData.dtoList.length }} 条数据， 其中
+      {{ pageData.dtoList.filter((x) => !x.status).length }} 条已标记删除
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="submitData"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import {
+  reactive,
+  ref,
+  onMounted,
+  getCurrentInstance,
+  defineExpose
+} from "vue";
+import { selectUserDeptPage } from "@/api/user-manage";
+import { ElMessage } from "element-plus";
+const { proxy } = getCurrentInstance();
+const { D_BZ_SF } = proxy.$dict("D_BZ_SF"); //获取字典数据
+const props = defineProps({
+  tableData: {
+    type: Array,
+    default: () => []
+  }
+});
+const dialogVisible = ref(false);
+const pageData = reactive({
+  dtoList: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false
+  },
+
+  tableHeight: 500,
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 80,
+
+  tableColumn: [
+    { label: "管辖单位", prop: "gxDwDm", showSolt: true, width: 200 },
+    { label: "姓名", prop: "ryXm", showSolt: true, width: 130 },
+    { label: "英文姓名", prop: "ryXmYw", showSolt: true, width: 130 },
+    { label: "别名", prop: "ryBm", showSolt: true, width: 130 },
+    { label: "网名", prop: "ryWm", showSolt: true, width: 130 },
+    { label: "绰号", prop: "ryCh", showSolt: true, width: 130 },
+    { label: "手机号码", prop: "rySjhm", showSolt: true, width: 130 },
+    { label: "身份证号码", prop: "rySfzh", showSolt: true, width: 130 },
+    { label: "户籍地址", prop: "ryHjdz", showSolt: true, width: 130 },
+    { label: "护照号码", prop: "ryHzhm", showSolt: true, width: 130 },
+    { label: "现住地址", prop: "ryXzdz", showSolt: true, width: 130 },
+    { label: "银行卡号", prop: "ryYhkh", showSolt: true, width: 130 },
+    { label: "是否关注", prop: "sfGz", showSolt: true, width: 130 },
+    { label: "附件照片", prop: "ryFjZp", showSolt: true, width: 130 }
+  ]
+});
+
+const deptList = ref([]); //部门列表
+onMounted(() => {
+  getdepartmentList();
+});
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
+const handleDeptChange = (nameField, selectedValue, row) => {
+  // 找到选中的部门
+  const selectedDept = deptList.value.find(
+    (item) => item.value.toString() === selectedValue
+  );
+  // 更新名称
+  row[nameField] = selectedDept ? selectedDept.label : "";
+};
+const init = () => {
+  dialogVisible.value = true;
+  let url = "/mosty-gsxt/tbGsxtRqfjRy/createCbfj";
+  qcckGet({}, url)
+    .then((res) => {
+      console.log(res);
+      pageData.dtoList = res.map((item) => ({
+        ...item,
+        status: true
+      }));
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
+// 删除方法
+const delDictItem = (index) => {
+  pageData.dtoList[index].status = false;
+  ElMessage.success("已标记为删除");
+};
+// 恢复方法
+const recover = (index) => {
+  pageData.dtoList[index].status = true;
+  ElMessage.success("已恢复");
+};
+// 提交
+const submitData = () => {
+  const validData = pageData.dtoList.filter((item) => item.status);
+  qcckPost(validData, "/mosty-gsxt/tbGsxtRqfjRy/saveList")
+    .then((res) => {
+      ElMessage.success("新增成功");
+      dialogVisible.value = false;
+      emit("onSearch");
+      close();
+    })
+    .catch(() => {});
+};
+
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+/* 为已删除的行添加特殊样式 */
+.el-table .row-deleted {
+  background-color: #fef0f0;
+  color: #f56c6c;
+}
+.text-danger {
+  font-weight: 500;
+}
+</style>

src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/addForm.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box" style="width: 93%">
+      <span class="title">{{ title }}重点人管理</span>
+      <div>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          v-if="title.value !== '详情'"
+          >保存</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"
+      >
+      </FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.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";
+import { selectUserDeptPage } from "@/api/user-manage";
+const emit = defineEmits(["updateDate"]);
+
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+
+const { D_GS_RQFJ_LX } = proxy.$dict("D_GS_RQFJ_LX"); //获取字典数据
+const tagDialog = ref();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "发掘类型", prop: "fjLx", type: "select", options: D_GS_RQFJ_LX },
+  { label: "发掘文本", prop: "fjWb", type: "textarea", width: "100%" }
+]);
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const editpeo = ref();
+
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
+  // 初始化表单数据，并根据详情页设置禁用状态
+  formData.value = [
+    {
+      label: "发掘类型",
+      prop: "fjLx",
+      type: "select",
+      options: D_GS_RQFJ_LX,
+      disabled: title.value === "详情"
+    },
+    {
+      label: "发掘文本",
+      prop: "fjWb",
+      type: "textarea",
+      width: "100%",
+      disabled: title.value === "详情"
+    }
+  ];
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/" + id).then((res) => {
+    listQuery.value = res;
+  });
+};
+
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    let url =
+      title.value == "新增"
+        ? "/mosty-gsxt/tbGsxtRqfjNr/save"
+        : "/mosty-gsxt/tbGsxtRqfjNr/update";
+    let params = { ...data };
+
+    qcckPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("onSearch");
+        close();
+      })
+      .catch(() => {});
+  });
+};
+
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+};
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+
+// 2. 暴露获取数据的方法
+const getFormData = () => {
+  // 可以在这里添加验证逻辑
+  return {
+    formData: listQuery.value
+  };
+};
+defineExpose({ init, setFormData });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+::v-deep .el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
+  color: #0072ff;
+  background: rgba(0, 114, 255, 0.3);
+}
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
+</style>

src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue

@@ -3,20 +3,29 @@
     <!-- 左侧树形菜单 -->
     <ul class="left-menu">
       <li class="f20">重点人初步发掘</li>
-      <li class="left-menu-item" v-for="(it,idx) in btnsList" :key="idx"> {{ it }}</li>
+      <li class="left-menu-item" v-for="(it, idx) in btnsList" :key="idx">
+        {{ it }}
+      </li>
     </ul>
     <!-- 右侧内容区 -->
     <div class="right-content">
-      <Search :searchArr="searchConfiger" @submit="onSearch" @reset="onReset" :key="pageData.keyCount">
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        @reset="onReset"
+        :key="pageData.keyCount"
+      >
         <template #defaultSlot>
           <CheckBox :data="checkData" @changeData="changeData"></CheckBox>
         </template>
       </Search>
-      <div class="tableCnt  mb10 pl10 pr10">
+      <div class="tableCnt mb10 pl10 pr10">
-        <PageTitle title="发掘内容" style="color:#333">
+        <PageTitle title="发掘内容" style="color: #333">
           <el-button type="primary" size="small" @click="addEdit('add', '')">
             <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
-            <span style="vertical-align: middle">新增</span>
+            <span style="vertical-align: middle" @click="addEdit('add', '')"
+              >新增</span
+            >
           </el-button>
           <el-button type="primary" size="small" @click="importData">
             <el-icon style="vertical-align: middle"><Upload /></el-icon>
@@ -35,18 +44,36 @@
             :key="pageData.keyCount"
             :tableConfiger="pageData.tableConfiger"
             :controlsWidth="pageData.controlsWidth"
-            @chooseData="chooseData">
+            @chooseData="chooseData"
+          >
+            <template #fjLx="{ row }">
+              <DictTag :tag="false" :value="row.fjLx" :options="D_GS_RQFJ_LX" />
+            </template>
             <!-- 操作 -->
             <template #controls="{ row }">
-              <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+              <el-link size="small" type="success" @click="addEdit('edit', row)"
-              <el-link size="small" type="primary" @click="viewDetails(row)">查看</el-link>
+                >编辑</el-link
+              >
+              <el-link size="small" type="primary" @click="addEdit('info', row)"
+                >查看</el-link
+              >
+              <el-link size="small" type="danger" @click="deleteRow(row)"
+                >删除</el-link
+              >
             </template>
           </MyTable>
-          <div class="ww100 flex just-center mt8"> <el-button type="primary">智能解析</el-button> </div>
+          <div class="ww100 flex just-center mt8">
+            <el-button type="primary" @click="intelligent()"
+              >智能解析</el-button
+            >
+          </div>
         </div>
       </div>
       <div class="tableCnt mb10 pl10 pr10">
-        <PageTitle title="模型智能识别/LP解析结果" style="color:#333;"></PageTitle>
+        <PageTitle
+          title="模型智能识别/LP解析结果"
+          style="color: #333"
+        ></PageTitle>
         <div ref="searchBox" class="mb8">
           <el-button type="primary" size="small" @click="addEdit('add', '')">
             <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
@@ -105,11 +132,39 @@
             :key="pageData.keyCount"
             :tableConfiger="pageData.tableConfiger2"
             :controlsWidth="pageData.controlsWidth"
-            @chooseData="chooseData">
+            @chooseData="chooseData"
+          >
+            <template #fxDj="{ row }">
+              <DictTag
+                :tag="false"
+                :value="row.fxDj"
+                :options="D_GS_RQFJ_FXDJ"
+              />
+            </template>
+            <template #fxLb="{ row }">
+              <DictTag
+                :tag="false"
+                :value="row.fxLb"
+                :options="D_GS_RQFJ_FXLB"
+              />
+            </template>
+            <template #sfGz="{ row }">
+              <DictTag :tag="false" :value="row.sfGz" :options="D_BZ_SF" />
+            </template>
+            <template #sfZbkry="{ row }">
+              <DictTag :tag="false" :value="row.sfZbkry" :options="D_BZ_SF" />
+            </template>
+            <template #sfZzdry="{ row }">
+              <DictTag :tag="false" :value="row.sfZzdry" :options="D_BZ_SF" />
+            </template>
             <!-- 操作 -->
             <template #controls="{ row }">
-              <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+              <el-link size="small" type="danger" @click="deleteRow(row)"
-              <el-link size="small" type="primary" @click="viewDetails(row)">查看</el-link>
+                >删除</el-link
+              >
+              <el-link size="small" type="primary" @click="viewDetails(row)"
+                >查看</el-link
+              >
             </template>
           </MyTable>
           <Pages
@@ -118,12 +173,19 @@
             :tableHeight="pageData.tableHeight2"
             :pageConfiger="{
               ...pageData.pageConfiger,
-              total: pageData.total
+              total: pageData.total2
             }"
           ></Pages>
         </div>
       </div>
     </div>
+
+    <IntelligentParsing
+      :tableData="pageData.tableData"
+      ref="IntelligentParsingRef"
+    />
+
+    <addForm ref="addFormDiloag" @onSearch="onSearch" />
   </div>
 </template>
 
@@ -133,25 +195,49 @@ 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 addForm from "./components/addForm.vue";
+import IntelligentParsing from "./components/IntelligentParsing.vue";
+import { ElMessage } from "element-plus";
+
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 import { Delete } from "@element-plus/icons";
 import { fa } from "element-plus/es/locale.mjs";
+const { proxy } = getCurrentInstance();
+const { D_GS_RQFJ_LX, D_GS_RQFJ_FXDJ, D_BZ_SF, D_GS_RQFJ_FXLB } = proxy.$dict(
+  "D_GS_RQFJ_LX",
+  "D_GS_RQFJ_FXDJ",
+  "D_BZ_SF",
+  "D_GS_RQFJ_FXLB"
+); //获取字典数据
 const searchConfiger = ref([
-  { label: "管辖部门", prop: 'department', placeholder: "请选择管辖部门", showType: "select" },
+  {
-  { label: "是否关注", prop: 'sfgz', showType: "defaultSlot" },
+    label: "管辖部门",
+    prop: "department",
+    placeholder: "请选择管辖部门",
+    showType: "select"
+  },
+  { label: "是否关注", prop: "sfgz", showType: "defaultSlot" }
 ]);
+const addFormDiloag = ref();
+
 const checkData = reactive({
   list: ["是", "否"],
   hasChoose: ["是", "否"]
 });
-const btnsList = ref(['全部','警情','人力情报','线索','民警处置文本','交通事故']);
+const btnsList = ref([
+  "全部",
+  "警情",
+  "人力情报",
+  "线索",
+  "民警处置文本",
+  "交通事故"
+]);
+const IntelligentParsingRef = ref();
 const searchBox = ref();
+const queryFrom = ref({});
 const pageData = reactive({
-  tableData: [
+  tableData: [],
-    {nrbh:'测试内容',lx:'1',nr:'测试内容'},
-    {nrbh:'测试内容',lx:'1',nr:'测试内容'},
-  ],
   tableData2: [],
   keyCount: 0,
   tableConfiger: {
@@ -163,36 +249,41 @@ const pageData = reactive({
     rowHieght: 61,
     showSelectType: "checkBox",
     loading: false,
-    showIndex:false
+    showIndex: false
   },
-  tableHeight:230,
+  tableHeight: 230,
   total: 0,
+  total2: 0,
   pageConfiger: {
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 120,
+  controlsWidth: 160,
   tableColumn: [
-    { label: "内容编号", prop: "nrbh" },
+    { label: "发掘类型", prop: "fjLx", showSolt: true },
-    { label: "类型", prop: "lx" },
+    { label: "发掘文本	", prop: "fjWb" }
-    { label: "内容", prop: "nr" },
   ],
   tableColumn2: [
-    { label: "积分排名", prop: "nrbh" },
+    { label: "姓名", prop: "ryXm" },
-    { label: "照片", prop: "lx" },
+    { label: "英文姓名", prop: "ryXmYw" },
-    { label: "姓名", prop: "nr" },
+    { label: "别名", prop: "ryBm" },
-    { label: "身份证号", prop: "nr" },
+    { label: "网名", prop: "ryWm" },
-    { label: "居住地址", prop: "nr" },
+    { label: "绰号", prop: "ryCh" },
-    { label: "人员类别", prop: "nr" },
+    { label: "手机号码", prop: "rySjhm" },
-    { label: "布控原因", prop: "nr" },
+    { label: "身份证号码", prop: "rySfzh" },
-    { label: "风险等级", prop: "nr" },
+    { label: "户籍地址", prop: "ryHjdz" },
-    { label: "风险积分", prop: "nr" },
+    { label: "护照号码", prop: "ryHzhm" },
-    { label: "模型标签", prop: "nr" },
+    { label: "现住地址", prop: "ryXzdz" },
-    { label: "是否关注", prop: "nr" },
+    { label: "银行卡号", prop: "ryYhkh" },
-  ],
+    { label: "附件照片", prop: "ryFjZp" },
-})
+    { label: "管辖单位", prop: "gxDwDm" },
-
+    { label: "风险等级", prop: "fxDj", showSolt: true },
-
+    { label: "风险类别", prop: "fxLb", showSolt: true },
+    { label: "是否关注", prop: "sfGz", showSolt: true },
+    { label: "是否转布控人员", prop: "sfZbkry", showSolt: true },
+    { label: "是否转重点人员", prop: "sfZzdry", showSolt: true }
+  ]
+});
 // 树形菜单数据
 const treeData = ref([
   {
@@ -211,12 +302,72 @@ const defaultProps = {
   label: "label"
 };
 
-
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = { ...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getModelList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getModelList();
+};
+// 获取内容列表
+const getList = (val) => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...queryFrom.value };
+  let url = "/mosty-gsxt/tbGsxtRqfjNr/selectPage";
+  qcckGet(data, url)
+    .then((res) => {
+      pageData.tableData = res.records || [];
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
+//获取模型识别列表
+const getModelList = (val) => {
+  pageData.tableConfiger2.loading = true;
+  let data = { ...pageData.pageConfiger };
+  let url = "/mosty-gsxt/tbGsxtRqfjRy/selectPage";
+  qcckGet(data, url)
+    .then((res) => {
+      pageData.tableData2 = res.records || [];
+      pageData.total2 = res.total;
+      pageData.tableConfiger2.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger2.loading = false;
+    });
+};
+//新增编辑
+const addEdit = (type, row) => {
+  addFormDiloag.value.init(type, row);
+};
+const intelligent = () => {
+  IntelligentParsingRef.value.init();
+};
+const submitData = () => {
+  dialogVisible.value = false;
+};
 // 事件处理函数
 const handleNodeClick = (data) => {
   console.log(data);
 };
-
+//删除操作
+const deleteRow = (row) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/closeById/" + row.id)
+    .then((res) => {
+      ElMessage.success("删除成功");
+      getList();
+    })
+    .catch(() => {});
+};
 const handleDateChange = () => {
   // 处理日期变化
 };
@@ -226,14 +377,17 @@ const handleExport = () => {
 };
 
 const tabHeightFn = () => {
-  pageData.tableHeight2 = window.innerHeight - searchBox.value.offsetHeight - 690;
+  pageData.tableHeight2 =
+    window.innerHeight - searchBox.value.offsetHeight - 690;
   window.onresize = function () {
     tabHeightFn();
   };
 };
 
 onMounted(() => {
-  tabHeightFn()
+  getList();
+  tabHeightFn();
+  getModelList();
 });
 </script>
 
@@ -253,29 +407,28 @@ onMounted(() => {
     color: #333;
     line-height: 32px;
     text-align: center;
-    .left-menu-item{
+    .left-menu-item {
       border-bottom: 1px solid #e8e8e8;
-      &:hover{
+      &:hover {
         color: #409eff;
-        background: rgba(0,0,0,0.1);
+        background: rgba(0, 0, 0, 0.1);
       }
     }
   }
   .right-content {
     float: left;
-    width: calc(100% - 290px);
+    width: calc(100% - 402px);
     height: 100%;
-    padding: 0 20px 0 ;
+    padding: 0 20px 0;
     margin-top: 20px;
     margin-left: 10px;
     border-radius: 4px;
     box-sizing: border-box;
-    .tableCnt{
+    .tableCnt {
-      height: calc((100vh - 253px)/2 );
+      height: calc((100vh - 253px) / 2);
       background: #fff;
       border-radius: 4px;
     }
   }
 }
 </style>
-

src/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/components/deepIn.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="dialog" v-if="dialogForm">
-    <div class="head_box">
+    <div class="head_box" style="width: 83vw">
       <span class="title">{{ title }}</span>
       <div>
         <el-button size="small" type="primary" @click="close">暂存</el-button>
-        <el-button size="small" type="primary" @click="close">确认</el-button>
+        <el-button size="small" type="primary" @click="submit">确认</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
@@ -28,9 +28,13 @@
               <img width="60" height="60" :src="pro" alt="" />
             </template>
             <template #controls="{ row }">
-              <el-link size="small" type="success" @click="addEdit('edit', row)">研判确认</el-link>
+              <el-link size="small" type="success" @click="addEdit('edit', row)"
+                >研判确认</el-link
+              >
               <el-link size="small" type="primary">查看</el-link>
-              <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+              <el-link size="small" type="danger" @click="deleteRow(row)"
+                >删除</el-link
+              >
             </template>
           </MyTable>
         </div>
@@ -45,10 +49,37 @@
             :controlsWidth="pageData.controlsWidth"
             @chooseData="chooseData"
           >
+            <template #fxDj="{ row }">
+              <DictTag
+                :tag="false"
+                :value="row.fxDj"
+                :options="D_GS_RQFJ_FXDJ"
+              />
+            </template>
+            <template #fxLb="{ row }">
+              <DictTag
+                :tag="false"
+                :value="row.fxLb"
+                :options="D_GS_RQFJ_FXLB"
+              />
+            </template>
+            <template #sfGz="{ row }">
+              <DictTag :tag="false" :value="row.sfGz" :options="D_BZ_SF" />
+            </template>
+            <template #sfZbkry="{ row }">
+              <DictTag :tag="false" :value="row.sfZbkry" :options="D_BZ_SF" />
+            </template>
+            <template #sfZzdry="{ row }">
+              <DictTag :tag="false" :value="row.sfZzdry" :options="D_BZ_SF" />
+            </template>
             <template #controls="{ row }">
-              <el-link size="small" type="primary" @click="addEdit('edit', row)">关联重点人</el-link>
+              <el-link size="small" type="primary" @click="addEdit('edit', row)"
+                >关联重点人</el-link
+              >
               <el-link size="small" type="primary">查看</el-link>
-              <el-link size="small" type="primary" @click="deleteRow(row)">修改</el-link>
+              <el-link size="small" type="primary" @click="deleteRow(row)"
+                >修改</el-link
+              >
             </template>
           </MyTable>
           <Pages
@@ -68,7 +99,11 @@
         <div class="title">轨迹信息</div>
 
         <div>
-          <div class="step" v-for="(item, index) in stepList" :key="`${index}stepList`">
+          <div
+            class="step"
+            v-for="(item, index) in stepList"
+            :key="`${index}stepList`"
+          >
             <div class="icon">
               <div class="circle"></div>
               <div class="line"></div>
@@ -86,299 +121,422 @@
         </div>
       </div>
     </div>
+    <el-dialog v-model="dialogVisible" title="请选择风险" width="500px">
+      <FormMessage
+        v-model="elform"
+        :formList="elformata"
+        ref="elformRef"
+        :rules="rules"
+      >
+      </FormMessage>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="submitData"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
-  import { ref, reactive, onMounted, nextTick } from "vue";
+import { ref, reactive, onMounted, nextTick, getCurrentInstance } from "vue";
-  import MyTable from "@/components/aboutTable/MyTable.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
-  import Pages from "@/components/aboutTable/Pages.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
-  const dialogForm = ref(false);
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
-  const activeName = ref("basic");
+import { pa } from "element-plus/es/locale.mjs";
-  const title = ref("深度研判");
+import { qcckPost } from "@/api/qcckApi.js";
-  const listQuery = ref({});
-  const topBox = ref();
-  const areaOptions = ref([]); // 区域选项数据
 
-  // 初始化数据
+const { proxy } = getCurrentInstance();
-  const init = (type, row) => {
-    dialogForm.value = true;
-    tabHeightFn();
-    // 根据type和row初始化表单数据
-  };
 
-  const close = () => {
+const { D_GS_RQFJ_FXDJ, D_GS_RQFJ_FXLB } = proxy.$dict(
-    dialogForm.value = false;
+  "D_GS_RQFJ_FXDJ",
-  };
+  "D_GS_RQFJ_FXLB"
-  const pageData = reactive({
+); //获取字典数据
-    tableData: [
+const dialogForm = ref(false);
-      {
+const activeName = ref("basic");
-        tpzy: "GBJD01",
+const title = ref("深度研判");
-        dwmc: "工布江达重点人",
+const listQuery = ref({});
-        zylyxz: "涉稳",
+const topBox = ref();
-        cjhx: "系统新增",
+const areaOptions = ref([]); // 区域选项数据
-        ytp: "低级",
+const rowId = ref(null);
-        rxxsd: "2025/05/05"
+const rules = reactive({
-      },
+  fxDj: [{ required: true, message: "请选择风险等级", trigger: "change" }],
-      {
+  fxLb: [{ required: true, message: "请选择风险类别", trigger: "change" }]
-        tpzy: "GBJD01",
+});
-        dwmc: "工布江达重点人",
+const dialogVisible = ref(false);
-        zylyxz: "涉稳",
+// 初始化数据
-        cjhx: "系统新增",
+const init = (id) => {
-        ytp: "低级",
+  rowId.value = id;
-        rxxsd: "2025/05/05"
+  dialogForm.value = true;
-      },
+  tabHeightFn();
-      {
+  // 根据type和row初始化表单数据
-        tpzy: "GBJD01",
+};
-        dwmc: "工布江达重点人",
-        zylyxz: "涉稳",
-        cjhx: "系统新增",
-        ytp: "低级",
-        rxxsd: "2025/05/05"
-      },
-      {
-        tpzy: "GBJD01",
-        dwmc: "工布江达重点人",
-        zylyxz: "涉稳",
-        cjhx: "系统新增",
-        ytp: "低级",
-        rxxsd: "2025/05/05"
-      },
-      {
-        tpzy: "GBJD01",
-        dwmc: "工布江达重点人",
-        zylyxz: "涉稳",
-        cjhx: "系统新增",
-        ytp: "低级",
-        rxxsd: "2025/05/05"
-      }
-    ],
-    tableDataPeople: [
-      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
-      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
-      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
-      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
-      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" },
-      { xm: "111", xb: "111", sfzh: "111", hjd: "111", xjd: "111", sjh: "111", cph: "111", gkzt: "111" }
-    ],
-    keyCount: 0,
-    tableConfiger: {
-      rowHieght: 61,
-      showSelectType: "checkBox",
-      loading: false
-    },
-    total: 0,
-    pageConfiger: {
-      pageSize: 20,
-      pageCurrent: 1
-    },
-    controlsWidth: 220,
-    tableColumn: [
-      { label: "图片资源", prop: "tpzy" },
-      { label: "单位名称", prop: "dwmc" },
-      { label: "资源来源详址", prop: "zylyxz" },
-      { label: "采集画像", prop: "cjhx", showSolt: true },
-      { label: "原图片", prop: "ytp", showSolt: true },
-      { label: "人像相似度", prop: "rxxsd" }
-    ],
 
-    tableColumnPeople: [
+const close = () => {
-      { label: "姓名", prop: "xm" },
+  dialogForm.value = false;
-      { label: "性别", prop: "xb" },
+};
-      { label: "身份证号", prop: "sfzh" },
+
-      { label: "户籍地", prop: "hjd" },
+const elformRef = ref();
-      { label: "现居地", prop: "xjd" },
+
-      { label: "手机号", prop: "sjh" },
+const elform = ref({}); //表单
-      { label: "车牌号", prop: "cph" },
+const elformata = ref([
-      { label: "管控状态", prop: "gkzt" }
+  { label: "风险等级", prop: "fxDj", type: "select", options: D_GS_RQFJ_FXDJ },
-    ]
+  { label: "风险类别", prop: "fxLb", type: "select", options: D_GS_RQFJ_FXLB }
+]);
+
+//确认
+const submit = () => {
+  dialogVisible.value = true;
+};
+const submitData = () => {
+  elformRef.value.submit((data) => {
+    let url = "/mosty-gsxt/tbGsxtRqfjRy/updateSdfj";
+    let params = { ...data, id: rowId.value };
+    qcckPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        dialogVisible.value = true;
+        close();
+        emit("getList");
+      })
+      .catch(() => {});
   });
-  const stepList = ref([
+};
+const pageData = reactive({
+  tableData: [
     {
-      time: "2025-4-25 16:40",
+      tpzy: "GBJD01",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      dwmc: "工布江达重点人",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      zylyxz: "涉稳",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+      cjhx: "系统新增",
+      ytp: "低级",
+      rxxsd: "2025/05/05"
     },
     {
-      time: "2025-4-25 16:40",
+      tpzy: "GBJD01",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      dwmc: "工布江达重点人",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      zylyxz: "涉稳",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+      cjhx: "系统新增",
+      ytp: "低级",
+      rxxsd: "2025/05/05"
     },
     {
-      time: "2025-4-25 16:40",
+      tpzy: "GBJD01",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      dwmc: "工布江达重点人",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      zylyxz: "涉稳",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+      cjhx: "系统新增",
+      ytp: "低级",
+      rxxsd: "2025/05/05"
     },
     {
-      time: "2025-4-25 16:40",
+      tpzy: "GBJD01",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      dwmc: "工布江达重点人",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      zylyxz: "涉稳",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+      cjhx: "系统新增",
+      ytp: "低级",
+      rxxsd: "2025/05/05"
     },
     {
-      time: "2025-4-25 16:40",
+      tpzy: "GBJD01",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      dwmc: "工布江达重点人",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+      zylyxz: "涉稳",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+      cjhx: "系统新增",
-    },
+      ytp: "低级",
-    {
+      rxxsd: "2025/05/05"
-      time: "2025-4-25 16:40",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
-    },
-    {
-      time: "2025-4-25 16:40",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
-    },
-    {
-      time: "2025-4-25 16:40",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
-    },
-    {
-      time: "2025-4-25 16:40",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
-    },
-    {
-      time: "2025-4-25 16:40",
-      sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
-      szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
     }
-  ]);
+  ],
-  // 表格高度计算
+  tableDataPeople: [
-  const tabHeightFn = () => {
+    {
-    nextTick(() => {
+      xm: "111",
-      console.log("topBox.value", topBox.value.offsetHeight);
+      xb: "111",
-      pageData.tableHeight = window.innerHeight - 410 - 250;
+      sfzh: "111",
-      console.log("pageData.tableHeight", pageData.tableHeight);
+      hjd: "111",
-    });
+      xjd: "111",
-    console.log("pageData.tableHeight", pageData.tableHeight);
+      sjh: "111",
-    window.onresize = function () {
+      cph: "111",
-      tabHeightFn();
+      gkzt: "111"
-    };
+    },
-  };
+    {
+      xm: "111",
+      xb: "111",
+      sfzh: "111",
+      hjd: "111",
+      xjd: "111",
+      sjh: "111",
+      cph: "111",
+      gkzt: "111"
+    },
+    {
+      xm: "111",
+      xb: "111",
+      sfzh: "111",
+      hjd: "111",
+      xjd: "111",
+      sjh: "111",
+      cph: "111",
+      gkzt: "111"
+    },
+    {
+      xm: "111",
+      xb: "111",
+      sfzh: "111",
+      hjd: "111",
+      xjd: "111",
+      sjh: "111",
+      cph: "111",
+      gkzt: "111"
+    },
+    {
+      xm: "111",
+      xb: "111",
+      sfzh: "111",
+      hjd: "111",
+      xjd: "111",
+      sjh: "111",
+      cph: "111",
+      gkzt: "111"
+    },
+    {
+      xm: "111",
+      xb: "111",
+      sfzh: "111",
+      hjd: "111",
+      xjd: "111",
+      sjh: "111",
+      cph: "111",
+      gkzt: "111"
+    }
+  ],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 220,
+  tableColumn: [
+    { label: "图片资源", prop: "tpzy" },
+    { label: "单位名称", prop: "dwmc" },
+    { label: "资源来源详址", prop: "zylyxz" },
+    { label: "采集画像", prop: "cjhx", showSolt: true },
+    { label: "原图片", prop: "ytp", showSolt: true },
+    { label: "人像相似度", prop: "rxxsd" }
+  ],
 
-  defineExpose({ init });
+  tableColumnPeople: [
+    { label: "姓名", prop: "ryXm" },
+    { label: "英文姓名", prop: "ryXmYw" },
+    { label: "别名", prop: "ryBm" },
+    { label: "网名", prop: "ryWm" },
+    { label: "绰号", prop: "ryCh" },
+    { label: "手机号码", prop: "rySjhm" },
+    { label: "身份证号码", prop: "rySfzh" },
+    { label: "户籍地址", prop: "ryHjdz" },
+    { label: "护照号码", prop: "ryHzhm" },
+    { label: "现住地址", prop: "ryXzdz" },
+    { label: "银行卡号", prop: "ryYhkh" },
+    { label: "附件照片", prop: "ryFjZp" },
+    { label: "管辖单位", prop: "gxDwDm" },
+    { label: "风险等级", prop: "fxDj", showSolt: true },
+    { label: "风险类别", prop: "fxLb", showSolt: true },
+    { label: "是否关注", prop: "sfGz", showSolt: true },
+    { label: "是否转布控人员", prop: "sfZbkry", showSolt: true },
+    { label: "是否转重点人员", prop: "sfZzdry", showSolt: true }
+  ]
+});
+const stepList = ref([
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  },
+  {
+    time: "2025-4-25 16:40",
+    sy: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    sjly: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高",
+    szdz: "乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高铁到站乘坐高"
+  }
+]);
+// 表格高度计算
+const tabHeightFn = () => {
+  nextTick(() => {
+    pageData.tableHeight = window.innerHeight - 410 - 250;
+  });
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+
+defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
-  .dialog {
+.dialog {
-    padding: 20px;
+  padding: 20px;
 
-    :deep(.el-form-item__label) {
+  // :deep(.el-form-item__label) {
-      background-color: #f7fafb;
+  //   background-color: #f7fafb;
-      padding: 0px 8px;
+  //   padding: 0px 8px;
-      color: #000;
+  //   color: #000;
-      font-weight: 500;
+  //   font-weight: 500;
-      border: 1px solid #e3e7ed;
+  //   border: 1px solid #e3e7ed;
-    }
+  // }
 
-    .head_box {
+  .head_box {
-      display: flex;
+    display: flex;
-      justify-content: space-between;
+    justify-content: space-between;
-      align-items: center;
+    align-items: center;
+    margin-bottom: 20px;
+  }
+  .cntinfo {
+    height: calc(100% - 70px);
+    overflow: hidden;
+    overflow-y: auto;
+    display: flex;
+    .title {
+      font-size: 20px;
+
+      font-weight: 700;
       margin-bottom: 20px;
+      position: relative;
+
+      &::after {
+        content: "";
+        position: absolute;
+        bottom: 2px;
+        left: 0;
+        width: 78px;
+        height: 4px;
+        background: linear-gradient(
+          90deg,
+          #3597f9c4 0%,
+          rgba(53, 150, 249, 0) 100%
+        );
+        border-radius: 4px 4px 4px 4px;
+      }
     }
-    .cntinfo {
+    .left {
-      height: calc(100% - 70px);
+      width: calc(100% - 560px);
-      overflow: hidden;
+    }
-      overflow-y: auto;
+    .right {
-      display: flex;
+      width: 400px;
-      .title {
+      padding: 10px 0;
-        font-size: 20px;
+      overflow: auto;
-
+      .step {
-        font-weight: 700;
+        //   position: relative;
-        margin-bottom: 20px;
+        display: flex;
-        position: relative;
+        gap: 5px;
-
+        box-sizing: border-box;
-        &::after {
+        .desc {
-          content: "";
+          margin: 5px;
-          position: absolute;
+          color: #929090;
-          bottom: 2px;
+          width: 350px;
-          left: 0;
-          width: 78px;
-          height: 4px;
-          background: linear-gradient(90deg, #3597f9c4 0%, rgba(53, 150, 249, 0) 100%);
-          border-radius: 4px 4px 4px 4px;
         }
-      }
+        .icon {
-      .left {
+          // position: absolute;
-        width: calc(100% - 400px);
+          // top: 0;
-      }
+          // left: 0;
-      .right {
+          text-align: center;
-        width: 400px;
+          .circle {
-        padding: 10px 0;
+            height: 14px;
-        overflow: auto;
+            width: 14px;
-        .step {
+            border-radius: 50%;
-          //   position: relative;
+            background-color: rgb(3, 134, 251);
-          display: flex;
-          gap: 5px;
-          box-sizing: border-box;
-          .desc {
-            margin: 5px;
-            color: #929090;
-            width: 350px;
           }
-          .icon {
+          .line {
-            // position: absolute;
+            margin: 0 auto;
-            // top: 0;
+            width: 0;
-            // left: 0;
+            height: calc(100% - 14px);
-            text-align: center;
+            border: 1px dashed rgb(3, 134, 251);
-            .circle {
-              height: 14px;
-              width: 14px;
-              border-radius: 50%;
-              background-color: rgb(3, 134, 251);
-            }
-            .line {
-              margin: 0 auto;
-              width: 0;
-              height: calc(100% - 14px);
-              border: 1px dashed rgb(3, 134, 251);
-            }
           }
         }
       }
     }
+  }
 
-    .form-row {
+  .form-row {
-      display: flex;
+    display: flex;
 
-      .el-form-item {
+    .el-form-item {
-        flex: 1;
+      flex: 1;
-      }
-    }
-
-    .upload-group {
-      display: flex;
-      // gap: 20px;
-
-      .el-form-item {
-        flex: 1;
-      }
-    }
-
-    .unit {
-      margin-left: 5px;
-    }
-    ::v-deep .el-input__inner {
-      height: 36px !important;
-      line-height: 36px !important;
-      border-radius: 0;
-      color: #777575;
     }
   }
-  .el-form-item--default {
+
-    margin-bottom: 0px;
+  .upload-group {
+    display: flex;
+    // gap: 20px;
+
+    .el-form-item {
+      flex: 1;
+    }
   }
+
+  .unit {
+    margin-left: 5px;
+  }
+  ::v-deep .el-input__inner {
+    height: 36px !important;
+    line-height: 36px !important;
+    border-radius: 0;
+    color: #777575;
+  }
+}
+.el-form-item--default {
+  margin-bottom: 0px;
+}
 </style>

src/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index.vue

@@ -3,12 +3,22 @@
     <!-- 左侧树形菜单 -->
     <div class="left-menu">
       <!-- 这个部分用的是组件-后期替换 -->
-      <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick" default-expand-all />
+      <el-tree
+        :data="treeData"
+        :props="defaultProps"
+        @node-click="handleNodeClick"
+        default-expand-all
+      />
     </div>
 
     <!-- 右侧内容区 -->
     <div class="right-content">
-      <Search :searchArr="searchConfiger" @submit="onSearch" @reset="onReset" :key="pageData.keyCount">
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        @reset="onReset"
+        :key="pageData.keyCount"
+      >
         <template #defaultSlot>
           <CheckBox :data="checkData" @changeData="changeData"></CheckBox>
         </template>
@@ -38,17 +48,29 @@
             :controlsWidth="pageData.controlsWidth"
             @chooseData="chooseData"
           >
+            <template #fjLx="{ row }">
+              <DictTag :tag="false" :value="row.fjLx" :options="D_GS_RQFJ_LX" />
+            </template>
             <!-- 操作 -->
             <template #controls="{ row }">
-              <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+              <el-link size="small" type="danger" @click="deleteRow(row)"
-              <el-link size="small" type="primary" @click="viewDetails(row)">查看</el-link>
+                >删除</el-link
+              >
+              <el-link size="small" type="primary" @click="viewDetails(row)"
+                >查看</el-link
+              >
             </template>
           </MyTable>
-          <div class="ww100 flex just-center mt8"><el-button type="primary">智能解析</el-button></div>
+          <!-- <div class="ww100 flex just-center mt8">
+            <el-button type="primary">智能解析</el-button>
+          </div> -->
         </div>
       </div>
       <div class="tableCnt mb10 pl10 pr10">
-        <PageTitle title="模型智能识别/LP解析结果" style="color: #333"></PageTitle>
+        <PageTitle
+          title="模型智能识别/LP解析结果"
+          style="color: #333"
+        ></PageTitle>
         <div ref="searchBox" class="mb8">
           <el-button
             v-for="(it, idx) in btns"
@@ -73,10 +95,18 @@
           >
             <!-- 操作 -->
             <template #controls="{ row }">
-              <el-link size="small" type="primary" @click="handleDeepIn(row.id)">深度研判</el-link>
+              <el-link size="small" type="primary" @click="handleDeepIn(row.id)"
-              <el-link size="small" type="primary" @click="viewDetails(row)">查看</el-link>
+                >深度研判</el-link
-              <el-link size="small" type="primary" @click="viewDetails(row)">修改</el-link>
+              >
-              <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+              <el-link size="small" type="primary" @click="viewDetails(row)"
+                >查看</el-link
+              >
+              <el-link size="small" type="primary" @click="viewDetails(row)"
+                >修改</el-link
+              >
+              <el-link size="small" type="danger" @click="deleteRow(row)"
+                >删除</el-link
+              >
             </template>
           </MyTable>
           <Pages
@@ -92,172 +122,239 @@
       </div>
     </div>
   </div>
-  <DeepIn ref="deepIn"></DeepIn>
+  <DeepIn ref="deepIn" @getList="getList" ></DeepIn>
 </template>
 
 <script setup>
-  import DeepIn from "./components/deepIn.vue";
+import DeepIn from "./components/deepIn.vue";
-  import CheckBox from "@/components/checkBox/index.vue";
+import CheckBox from "@/components/checkBox/index.vue";
-  import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
-  import MyTable from "@/components/aboutTable/MyTable.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
-  import Pages from "@/components/aboutTable/Pages.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
-  import Search from "@/components/aboutTable/Search.vue";
+import Search from "@/components/aboutTable/Search.vue";
-  import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
-  import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance } from "vue";
-
+const { proxy } = getCurrentInstance();
-  const searchConfiger = ref([
+const { D_GS_RQFJ_LX } = proxy.$dict("D_GS_RQFJ_LX"); //获取字典数据
-    { label: "管辖部门", prop: "department", placeholder: "请选择管辖部门", showType: "select" },
+const searchConfiger = ref([
-    { label: "是否关注", prop: "sfgz", showType: "defaultSlot" }
+  {
-  ]);
+    label: "管辖部门",
-  const checkData = reactive({
+    prop: "department",
-    list: ["是", "否"],
+    placeholder: "请选择管辖部门",
-    hasChoose: ["是", "否"]
+    showType: "select"
-  });
+  },
-  const pageData = reactive({
+  { label: "是否关注", prop: "sfgz", showType: "defaultSlot" }
-    tableData: [
+]);
-      { nrbh: "测试内容", lx: "1", nr: "测试内容" },
+const checkData = reactive({
-      { nrbh: "测试内容", lx: "1", nr: "测试内容" }
+  list: ["是", "否"],
-    ],
+  hasChoose: ["是", "否"]
-    tableData2: [
+});
-      {
+const pageData = reactive({
-        pm: "1",
+  tableData: [
-        lx: "1",
+    { nrbh: "测试内容", lx: "1", nr: "测试内容" },
-        zp: "xx",
+    { nrbh: "测试内容", lx: "1", nr: "测试内容" }
-        xm: "张三",
+  ],
-        sfzh: "12345619900101001X",
+  tableData2: [
-        jzdz: "浙江省杭州市西湖区",
-        rylb: "xx",
-        bkyy: "xx",
-        fxdj: "xx",
-        fxjf: "xx",
-        mxbq: "xx",
-        sfgz: "是"
-      }
-    ],
-    keyCount: 0,
-    tableConfiger: {
-      rowHieght: 61,
-      showSelectType: "checkBox",
-      loading: false
-    },
-    tableConfiger2: {
-      rowHieght: 61,
-      showSelectType: "checkBox",
-      loading: false,
-      showIndex: false
-    },
-    tableHeight: 230,
-    total: 0,
-    pageConfiger: {
-      pageSize: 20,
-      pageCurrent: 1
-    },
-    controlsWidth: 120,
-    controlsWidth2: 220,
-    tableColumn: [
-      { label: "内容编号", prop: "nrbh" },
-      { label: "类型", prop: "lx" },
-      { label: "内容", prop: "nr" }
-    ],
-    tableColumn2: [
-      { label: "积分排名", prop: "pm" },
-      { label: "照片", prop: "zp" },
-      { label: "姓名", prop: "xm" },
-      { label: "身份证号", prop: "sfzh", showOverflowTooltip: true },
-      { label: "居住地址", prop: "jzdz", showOverflowTooltip: true },
-      { label: "人员类别", prop: "rylb", showOverflowTooltip: true },
-      { label: "布控原因", prop: "bkyy", showOverflowTooltip: true },
-      { label: "风险等级", prop: "fxdj", showOverflowTooltip: true },
-      { label: "风险积分", prop: "fxjf", showOverflowTooltip: true },
-      { label: "模型标签", prop: "mxbq", showOverflowTooltip: true },
-      { label: "是否关注", prop: "sfgz", showOverflowTooltip: true }
-    ]
-  });
-  const btns = reactive([
-    { label: "新增", type: "primary", icon: "CirclePlus" },
-    { label: "一件布控", type: "primary" },
-    { label: "级别变更", type: "primary" },
-    { label: "警种变更", type: "primary" },
-    { label: "指定分配", type: "primary" },
-    { label: "添加标签", type: "primary" },
-    { label: "协控申请", type: "primary" },
-    { label: "撤控申请", type: "primary" },
-    { label: "移交管控", type: "primary" },
-    { label: "批量导入", type: "primary" },
-    { label: "导出", type: "primary" },
-    { label: "批量删除", type: "danger", icon: "Delete" }
-  ]);
-
-  const searchBox = ref();
-
-  // 树形菜单数据
-  const treeData = ref([
     {
-      label: "林芝市公安局（200）",
+      pm: "1",
-      children: [
+      lx: "1",
-        { label: "工布江达县公安局（100）" },
+      zp: "xx",
-        { label: "工布江达城区派出所（10）" },
+      xm: "张三",
-        { label: "某某某派出所（10）" },
+      sfzh: "12345619900101001X",
-        { label: "某某某公安局（100）" }
+      jzdz: "浙江省杭州市西湖区",
-      ]
+      rylb: "xx",
+      bkyy: "xx",
+      fxdj: "xx",
+      fxjf: "xx",
+      mxbq: "xx",
+      sfgz: "是"
     }
-  ]);
+  ],
-  const defaultProps = {
+  keyCount: 0,
-    children: "children",
+  tableConfiger: {
-    label: "label"
+    rowHieght: 61,
-  };
+    showSelectType: "checkBox",
+    loading: false
+  },
+  tableConfiger2: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false,
+    showIndex: false
+  },
+  tableHeight: 230,
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 120,
+  controlsWidth2: 220,
+  tableColumn: [
+    { label: "发掘类型", prop: "fjLx", showSolt: true },
+    { label: "发掘文本	", prop: "fjWb" }
+  ],
+  tableColumn2: [
+    { label: "姓名", prop: "ryXm" },
+    { label: "英文姓名", prop: "ryXmYw" },
+    { label: "别名", prop: "ryBm" },
+    { label: "网名", prop: "ryWm" },
+    { label: "绰号", prop: "ryCh" },
+    { label: "手机号码", prop: "rySjhm" },
+    { label: "身份证号码", prop: "rySfzh" },
+    { label: "户籍地址", prop: "ryHjdz" },
+    { label: "护照号码", prop: "ryHzhm" },
+    { label: "现住地址", prop: "ryXzdz" },
+    { label: "银行卡号", prop: "ryYhkh" },
+    { label: "附件照片", prop: "ryFjZp" },
+    { label: "管辖单位", prop: "gxDwDm" },
+    { label: "风险等级", prop: "fxDj", showSolt: true },
+    { label: "风险类别", prop: "fxLb", showSolt: true },
+    { label: "是否关注", prop: "sfGz", showSolt: true },
+    { label: "是否转布控人员", prop: "sfZbkry", showSolt: true },
+    { label: "是否转重点人员", prop: "sfZzdry", showSolt: true }
+  ]
+});
+const btns = reactive([
+  { label: "新增", type: "primary", icon: "CirclePlus" },
+  { label: "一件布控", type: "primary" },
+  { label: "级别变更", type: "primary" },
+  { label: "警种变更", type: "primary" },
+  { label: "指定分配", type: "primary" },
+  { label: "添加标签", type: "primary" },
+  { label: "协控申请", type: "primary" },
+  { label: "撤控申请", type: "primary" },
+  { label: "移交管控", type: "primary" },
+  { label: "批量导入", type: "primary" },
+  { label: "导出", type: "primary" },
+  { label: "批量删除", type: "danger", icon: "Delete" }
+]);
+const queryFrom = ref({});
+const searchBox = ref();
 
-  // 事件处理函数
+// 树形菜单数据
-  const handleNodeClick = data => {
+const treeData = ref([
-    console.log(data);
+  {
-  };
+    label: "林芝市公安局（200）",
+    children: [
+      { label: "工布江达县公安局（100）" },
+      { label: "工布江达城区派出所（10）" },
+      { label: "某某某派出所（10）" },
+      { label: "某某某公安局（100）" }
+    ]
+  }
+]);
+const defaultProps = {
+  children: "children",
+  label: "label"
+};
 
-  const deepIn = ref();
+// 搜索
-  // 处理深度研判
+const onSearch = (val) => {
-  const handleDeepIn = id => {
+  queryFrom.value = { ...val };
-    deepIn.value.init();
+  pageData.pageConfiger.pageCurrent = 1;
-  };
+  getList();
+};
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getModelList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getModelList();
+};
+// 获取内容列表
+const getList = (val) => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...queryFrom.value };
+  let url = "/mosty-gsxt/tbGsxtRqfjNr/selectPage";
+  qcckGet(data, url)
+    .then((res) => {
+      pageData.tableData = res.records || [];
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
+//获取模型识别列表
+const getModelList = (val) => {
+  pageData.tableConfiger2.loading = true;
+  let data = { ...pageData.pageConfiger };
+  let url = "/mosty-gsxt/tbGsxtRqfjRy/selectPage";
+  qcckGet(data, url)
+    .then((res) => {
+      pageData.tableData2 = res.records || [];
+      pageData.total2 = res.total;
+      pageData.tableConfiger2.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger2.loading = false;
+    });
+};
+//删除操作
+const deleteRow = (row) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/closeById/" + row.id)
+    .then((res) => {
+      ElMessage.success("删除成功");
+      getList();
+    })
+    .catch(() => {});
+};
+// 事件处理函数
+const handleNodeClick = (data) => {
+  console.log(data);
+};
 
-  const tabHeightFn = () => {
+const deepIn = ref();
-    pageData.tableHeight2 = window.innerHeight - searchBox.value.offsetHeight - 690;
+// 处理深度研判
-    window.onresize = function () {
+const handleDeepIn = (id) => {
-      tabHeightFn();
+  deepIn.value.init(id);
-    };
+};
-  };
 
-  onMounted(() => {
+const tabHeightFn = () => {
+  pageData.tableHeight2 =
+    window.innerHeight - searchBox.value.offsetHeight - 690;
+  window.onresize = function () {
     tabHeightFn();
-  });
+  };
+};
+
+onMounted(() => {
+  getList();
+  tabHeightFn();
+  getModelList();
+});
 </script>
 
 <style lang="scss" scoped>
-  .statistical-analysis {
+.statistical-analysis {
-    width: 100%;
+  width: 100%;
+  height: 100%;
+  .left-menu {
+    float: left;
+    width: 280px;
+    height: calc(100% - 20px);
+    padding: 20px;
+    margin-top: 20px;
+    border-radius: 4px;
+    background-color: #fff;
+    border-right: 1px solid #e8e8e8;
+  }
+  .right-content {
+    float: left;
+    width: calc(100% - 452px);
     height: 100%;
-    .left-menu {
+    padding: 0 20px 0;
-      float: left;
+    margin-top: 20px;
-      width: 280px;
+    margin-left: 10px;
-      height: calc(100% - 20px);
+    border-radius: 4px;
-      padding: 20px;
+    box-sizing: border-box;
-      margin-top: 20px;
+    .tableCnt {
+      height: calc((100vh - 253px) / 2);
+      background: #fff;
       border-radius: 4px;
-      background-color: #fff;
-      border-right: 1px solid #e8e8e8;
-    }
-    .right-content {
-      float: left;
-      width: calc(100% - 290px);
-      height: 100%;
-      padding: 0 20px 0;
-      margin-top: 20px;
-      margin-left: 10px;
-      border-radius: 4px;
-      box-sizing: border-box;
-      .tableCnt {
-        height: calc((100vh - 253px) / 2);
-        background: #fff;
-        border-radius: 4px;
-      }
     }
   }
+}
 </style>

src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/addForm.vue

@@ -135,6 +135,24 @@
             />
           </el-select>
         </template>
+        <!-- 线索内容-->
+        <template #xsNr>
+          <div style="border: 1px solid #ccc">
+            <Toolbar
+              style="border-bottom: 1px solid #ccc"
+              :editor="clueRef"
+              :defaultConfig="clueConfig"
+              mode="default"
+            />
+            <Editor
+              style="height: 500px; overflow-y: hidden"
+              v-model="clueHtml"
+              :defaultConfig="clueConfig"
+              mode="default"
+              @onCreated="clueCreated"
+            />
+          </div>
+        </template>
 
         <!-- 汇编报刊-->
         <template #hbBk>
@@ -185,8 +203,6 @@ import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
 import * as rule from "@/utils/rules.js";
 import TagSelectorDialog from "@/components/aboutTable/TagSelectorDialog.vue";
 import DialogList from "./dialogList.vue";
-import "@wangeditor/editor/dist/css/style.css"; // 引入 css
-import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import { selectUserDeptPage } from "@/api/user-manage";
 import {
   ref,
@@ -367,7 +383,7 @@ const updateFormData = () => {
         {
           label: "线索内容",
           prop: "xsNr",
-          type: "textarea",
+          type: "slot",
           width: "100%",
           disabled: isReport || shouldDisableAll // report 或详情模式时禁用
         }
@@ -495,10 +511,15 @@ const updateFormData = () => {
 };
 // 编辑器实例，必须用 shallowRef
 const editorRef = shallowRef();
+const clueRef = shallowRef();
+
 // 内容 HTML
 const valueHtml = ref("<p>hello</p>");
+// 内容 HTML
+const clueHtml = ref("<p>hello</p>");
 const toolbarConfig = {};
 const editorConfig = ref({ placeholder: "请输入内容...", readOnly: false });
+const clueConfig = ref({ placeholder: "请输入内容...", readOnly: false });
 
 const listQuery = ref({ sbRyLx: "06", xsLy: "02" }); //表单
 const loading = ref(false);
@@ -539,6 +560,11 @@ const init = (type, row) => {
     editorConfig.readOnly = true; // 禁用
   }
 
+  if (typeOf == "leadDetails") {
+    clueRef.value.enable(); // 启用
+    clueConfig.readOnly = false; // 启用
+  }
+
   if (row) getDataById(row.id);
   if (row.sbRyId) getDataRyId(row.sbRyId);
 };
@@ -605,7 +631,8 @@ const submit = () => {
       submitData = {
         ...Object.fromEntries(
           Object.entries(data).filter(([key]) => !reportFields.includes(key))
-        )
+        ),
+        xsNr: clueHtml.value // 强制覆盖线索内容字段
       };
     }
 
@@ -678,6 +705,9 @@ const close = () => {
 const handleCreated = (editor) => {
   editorRef.value = editor; // 记录 editor 实例，重要！
 };
+const clueCreated = (editor) => {
+  clueRef.value = editor; // 记录 editor 实例，重要！
+};
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
   const editor = editorRef.value;

src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/components/dialogList.vue

@@ -8,10 +8,10 @@
   >
     <div>
       <el-form :model="listQuery" class="mosty-from-wrap" :inline="true">
-        <el-form-item label="标签名称">
+        <el-form-item label="人员姓名">
           <el-input
-            placeholder="请输入标签名称"
+            placeholder="请输入人员姓名"
-            v-model="listQuery.bqMc"
+            v-model="listQuery.ryXm"
             clearable
           ></el-input>
         </el-form-item>

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

@@ -315,7 +315,7 @@ const changeSize = (val) => {
 
 // 获取列表
 const getList = (val) => {
-  pageData.tableConfiger.loading = true;
+  // pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
   let url = "/mosty-gsxt/tbGsxtXs/selectPage";
   qcckGet(data, url)

src/views/backOfficeSystem/HumanIntelligence/TaskScheduling/components/addForm.vue

@@ -96,12 +96,8 @@
                 <el-link size="small" type="danger" @click="delDictItem(row.id)"
                   >删除</el-link
                 >
-                <el-link
+                <el-link size="small" type="warning" @click="relevancyClue(row)"
-                  size="small"
+                  >解除关联</el-link
-                  type="warning"
-                  @click="transferClue(row)"
-                  v-if="row.xsZt == '01'"
-                  >采纳</el-link
                 >
               </template>
             </MyTable>
@@ -260,6 +256,16 @@ const getDataById = (id) => {
     tableDate.xsList = listQuery.value.xsList;
   });
 };
+//解除关联
+const relevancyClue = (row) => {
+  qcckPut({ id: row.id }, "/mosty-gsxt/tbGsxtRlqbRwdd/cancelXsGl/{id}").then(
+    (res) => {
+      tableDate.xsList = tableDate.xsList.filter((item) => item.id !== row.id);
+      listQuery.value.xsList = tableDate.xsList.map((item) => item.id);
+      proxy.$message({ type: "success", message: "解除关联成功" });
+    }
+  );
+};
 
 // 获取部门列表
 const getdepartmentList = () => {
@@ -323,7 +329,6 @@ const close = () => {
 };
 // 删除
 const delDictItem = (id) => {
-  console.log(id, "删除", tableDate.xsList);
   tableDate.xsList = tableDate.xsList.filter((item) => item.id !== id);
   listQuery.value.xsList = tableDate.xsList.map((item) => item.id);
 };

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

@@ -26,7 +26,7 @@
         <template #ssbmdm>
           <el-select
             v-model="listQuery.ssbmdm"
-            placeholder="请选择上报单位代码"
+            placeholder="请选择所属单位"
             style="width: 240px"
           >
             <el-option
@@ -96,7 +96,7 @@
     </div>
     <!-- 新增编辑 -->
     <DetailForm ref="detailDiloag" @updateDate="getList()" />
-    <!-- 新增编辑 -->
+    <!--详情 -->
     <InfoForm ref="infoDiloag" />
   </div>
 </template>

src/views/backOfficeSystem/IntelligentControl/myControl/components/ui/controlArea.vue

@@ -160,7 +160,6 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckPost, qcckPut } from "@/api/qcckApi.js";
 import DialogList from "@/views/backOfficeSystem/IntelligentControl/myControl/components/ui/dialogList.vue";
-import moment from "moment";
 const { D_GS_BK_CZYQ, D_GS_BK_CZJSDWLX, D_GS_BK_DJ, D_GS_BK_YZ, D_GS_BK_SJLX } =
   proxy.$dict(
     "D_GS_BK_CZYQ",

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

@@ -3,194 +3,378 @@
     <div class="head_box">
       <span class="title">新增</span>
       <div>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          >保存</el-button
+        >
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="cntinfo">
+
-      <el-form
+    <div class="form_cnt">
-        :model="listQuery"
+      <FormMessage
-        :label-width="130"
+        v-model="listQuery"
-        inline
+        :formList="formData"
-        label-position="right"
+        ref="elform"
+        :rules="rules"
       >
-        <el-divider content-position="left">基础信息</el-divider>
+        <template #basic>
-        <el-form-item label="线索名称">
+          <el-divider content-position="left">基础信息</el-divider>
-          <el-input v-model="listQuery.xsmc" placeholder="请输入线索名称" />
+        </template>
-        </el-form-item>
+        <template #sbRy>
-        <el-form-item label="线索来源">
+          <el-divider content-position="left">涉及人员</el-divider>
-          <el-input v-model="listQuery.xsly" placeholder="请输入线索来源" />
+        </template>
-        </el-form-item>
+        <template #jurisdiction>
-        <el-form-item label="线索编号">
+          <el-divider content-position="left">审批信息</el-divider>
-          <el-input v-model="listQuery.xsbh" placeholder="请输入线索编号" />
+        </template>
-        </el-form-item>
+        <template #bqInfo>
-        <el-form-item label="所属专题">
+          <el-divider content-position="left">标签信息</el-divider>
-          <el-input v-model="listQuery.sszt" placeholder="请输入所属专题" />
+        </template>
-        </el-form-item>
+        <!-- 人员标签模型-->
-        <el-form-item label="群体名称">
+        <template #bqList>
-          <el-input v-model="listQuery.qtmc" placeholder="请输入群体名称" />
+          <el-button @click="openDialog('01', 'bq')">选择</el-button>
-        </el-form-item>
+          <div class="boxlist">
-        <el-form-item label="群体类型">
+            <MyTable
-          <el-input v-model="listQuery.qtlx" placeholder="请输入群体类型" />
+              :tableData="tableDate.bqList"
-        </el-form-item>
+              :tableColumn="tableDate.tableColumn"
-        <el-form-item label="上报单位">
+              :tableHeight="tableDate.tableHeight"
-          <el-input v-model="listQuery.sbdw" placeholder="请输入上报单位" />
+              :key="tableDate.keyCount"
-        </el-form-item>
+              :tableConfiger="tableDate.tableConfiger"
-        <el-form-item label="上报时间">
+              :controlsWidth="tableDate.controlsWidth"
-          <el-date-picker
+            >
-          style="width:100%"
+              <template #bqLb="{ row }">
-            v-model="listQuery.sbsj"
+                <DictTag :value="row.bqLb" :tag="false" :options="D_GS_BQ_LB" />
-            type="datetime"
+              </template>
-            placeholder="请选择上报时间"
+              <template #bqLx="{ row }">
-          />
+                <DictTag :value="row.bqLx" :tag="false" :options="D_GS_BQ_LX" />
-        </el-form-item>
+              </template>
-        <el-form-item label="线索内容" style="width: 100%">
+              <template #bqZl="{ row }">
-          <el-input
+                <DictTag :value="row.bqZl" :tag="false" :options="D_GS_BQ_ZL" />
-            v-model="listQuery.xsnr"
+              </template>
-            type="textarea"
+              <!-- 操作 -->
-            style="width: 100%"
+              <template #controls="{ row }">
-            :rows="3"
+                <el-link type="danger" @click="delDictItem(row.bqId)"
-            placeholder="请输入线索内容"
+                  >删除</el-link
-          />
+                >
-        </el-form-item>
+              </template>
-        <el-divider content-position="left">标签信息</el-divider>
+            </MyTable>
-        <el-form-item label="线索类型">
+          </div>
-          <el-select v-model="listQuery.xslx" placeholder="请选择线索类型">
+        </template>
-            <el-option label="类型1" value="1" />
+        <!-- 上报人员-->
-            <el-option label="类型2" value="2" />
+        <template #sbRyId>
-          </el-select>
+          <el-button @click="openDialog('01', 'ry')">选择</el-button>
-        </el-form-item>
+          <div class="boxlist">
-        <el-form-item label="线索类型标签大类">
+            <MyTable
-          <el-select
+              :tableData="tableDate.ryList"
-            v-model="listQuery.xsbqdl"
+              :tableColumn="tableDate.tableColumnRy"
-            placeholder="请选择线索类型标签大类"
+              :tableHeight="tableDate.tableHeight"
-          >
+              :key="tableDate.keyCountRy"
-            <el-option label="类型1" value="1" />
+              :tableConfiger="tableDate.tableConfiger"
-            <el-option label="类型2" value="2" />
+              :controlsWidth="tableDate.controlsWidth"
-          </el-select>
+            >
-        </el-form-item>
+              <template #ryMz="{ row }">
-        <el-form-item label="线索类型标签细类">
+                <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
-          <el-select
+              </template>
-            v-model="listQuery.xsbqxl"
+              <!-- 操作 -->
-            placeholder="请选择线索类型标签细类"
+              <template #controls="{ row }">
-          >
+                <el-link
-            <el-option label="类型1" value="1" />
+                  type="danger"
-            <el-option label="类型2" value="2" />
+                  @click="delDict(row.id)"
-          </el-select>
+                  v-if="typeOf == 'edit' || typeOf == 'add'"
-        </el-form-item>
+                  >删除</el-link
-        <el-form-item label="线索来源">
+                >
-          <el-input v-model="listQuery.xsly" placeholder="请输入线索来源" />
+              </template>
-        </el-form-item>
+            </MyTable>
-        <el-form-item label="线索风险等级">
+          </div>
-          <el-select
+        </template>
-            v-model="listQuery.xsfxdj"
-            placeholder="请选择线索风险等级"
-          >
-            <el-option label="状态1" value="1" />
-            <el-option label="状态2" value="2" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="线索备注">
-          <el-input v-model="listQuery.xsbz" placeholder="请输入线索备注" />
-        </el-form-item>
-        <el-form-item label="市内外">
-          <el-input v-model="listQuery.snw" placeholder="请输入市内外" />
-        </el-form-item>
-        <el-form-item label="是否设计外地">
-          <el-select
-            v-model="listQuery.xsfxdj"
-            placeholder="请选择是否设计外地"
-          >
-            <el-option label="是" value="1" />
-            <el-option label="否" value="0" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="指向地点">
-          <el-input v-model="listQuery.zxdd" placeholder="请输入指向地点" />
-        </el-form-item>
-        <el-form-item label="具体部位">
-          <el-input v-model="listQuery.jtbw" placeholder="请输入具体部位" />
-        </el-form-item>
-        <el-form-item label="指向时间类型">
-          <el-input v-model="listQuery.sjlx" placeholder="请输入指向时间类型" />
-        </el-form-item>
 
-        <el-form-item label="指向时间段">
+        <!-- 管辖单位 -->
-          <el-date-picker
+        <template #gxSsbmdm>
-            v-model="listQuery.sjd"
+          <el-select
-            type="daterange"
+            v-model="listQuery.gxSsbmdm"
-            placeholder="请选择指向时间段"
+            placeholder="请选择管辖单位"
-          />
+            style="width: 240px"
-        </el-form-item>
+            @change="handleDeptChange('gxSsbmmc', $event)"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 现住地派出所 -->
+        <template #xzdPcsdm>
+          <el-select
+            v-model="listQuery.xzdPcsdm"
+            placeholder="请选择现住地派出所"
+            style="width: 240px"
+            @change="handleDeptChange('xzdPcsmc', $event)"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 线索正文 -->
+        <template #xsZw>
+          <div style="border: 1px solid #ccc">
+            <Toolbar
+              style="border-bottom: 1px solid #ccc"
+              :editor="editorRef"
+              :defaultConfig="toolbarConfig"
+              mode="default"
+            />
+            <Editor
+              style="height: 500px; overflow-y: hidden"
+              v-model="valueHtml"
+              :defaultConfig="editorConfig"
+              mode="default"
+              @onCreated="handleCreated"
+            />
+          </div>
+        </template>
+      </FormMessage>
 
-        <el-divider content-position="left">涉及人员</el-divider>
+      <!-- 列表弹窗 -->
-        <el-form-item label="姓名">
+      <TagSelectorDialog
-          <el-input v-model="listQuery.xm" placeholder="请输入姓名" />
+        v-model="chooseShow"
-        </el-form-item>
+        ref="tagDialog"
-        <el-form-item label="身份证号">
+        @chooseDate="handleTagSelect"
-          <el-input v-model="listQuery.sfzh" placeholder="请输入身份证号" />
+        :dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }"
-        </el-form-item>
+      />
-        <el-form-item label="联系方式">
+      <!-- 上报人员列表弹窗 -->
-          <el-input v-model="listQuery.lxfs" placeholder="请输入联系方式" />
+      <DialogList
-        </el-form-item>
+        v-if="ryDialog"
-        <el-form-item label="住址">
+        :Single="true"
-          <el-input v-model="listQuery.zz" placeholder="请输入住址" />
+        :roleIds="roleIds"
-        </el-form-item>
+        @chooseDate="chooseDate"
-
+        :titleValue="chooseTitle"
-        <el-divider content-position="left">审批信息</el-divider>
+        v-model="ryDialog"
-        <el-form-item label="申请单位">
+        bqDl="02"
-          <el-input v-model="listQuery.sqdw" placeholder="请输入申请单位" />
+        :dic="{ D_BZ_MZ }"
-        </el-form-item>
+      ></DialogList>
-        <el-form-item label="申请人">
-          <el-input v-model="listQuery.sqr" placeholder="请输入申请人" />
-        </el-form-item>
-        <el-form-item label="审核单位">
-          <el-input v-model="listQuery.shdw" placeholder="请输入审核单位" />
-        </el-form-item>
-        <el-form-item label="审核人">
-          <el-input v-model="listQuery.shr" placeholder="请输入审核人" />
-        </el-form-item>
-        <el-form-item label="审批单位">
-          <el-input v-model="listQuery.spdw" placeholder="请输入审批单位" />
-        </el-form-item>
-        <el-form-item label="审批人">
-          <el-input v-model="listQuery.spr" placeholder="请输入审批人" />
-        </el-form-item>
-
-        <el-form-item label="申请原因" style="width: 100%">
-          <el-input
-            style="width: 100%"
-            v-model="listQuery.sqyy"
-            type="textarea"
-            :rows="3"
-            placeholder="请输入申请原因"
-          />
-        </el-form-item>
-      </el-form>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref } from "vue";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick,
+  shallowRef,
+  onBeforeUnmount,
+  watch
+} from "vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import TagSelectorDialog from "@/components/aboutTable/TagSelectorDialog.vue";
+import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
+import DialogList from "./dialogList.vue";
+import store from "@/store";
 
+const { proxy } = getCurrentInstance();
+
+const {
+  D_GS_BQ_LB,
+  D_GS_BQ_ZL,
+  D_GS_BQ_LX,
+  D_GS_XS_SBRYLX,
+  D_GS_ZDQT_LB,
+  D_GS_XS_FXDJ,
+  D_BZ_MZ,
+  D_GS_XS_LX,
+  D_GS_RLQB_BJSB_BSZT,
+  D_BZ_SF
+} = proxy.$dict(
+  "D_GS_BQ_LB",
+  "D_GS_BQ_ZL",
+  "D_GS_BQ_LX",
+  "D_GS_XS_SBRYLX",
+  "D_GS_ZDQT_LB",
+  "D_GS_XS_FXDJ",
+  "D_BZ_MZ",
+  "D_GS_XS_LX",
+  "D_GS_RLQB_BJSB_BSZT",
+  "D_BZ_SF"
+); //获取字典数据
+const elform = ref();
 const dialogForm = ref(false);
-const listQuery = ref({
+const chooseShow = ref(false); //选择弹窗
-  xsmc: "", // 线索名称
+const tagDialog = ref();
-  xsly: "", // 线索来源
+const ryDialog = ref(false); //选择弹窗
-  xsbh: "", // 线索编号
-  sbsj: "", // 上报时间
-  xslx: "", // 线索类型
-  xszt: "", // 线索状态
-  xsnr: "", // 线索内容
-  xm: "", // 姓名
-  sfzh: "", // 身份证号
-  lxfs: "", // 联系方式
-  zz: "", // 住址
-  sqr: "", // 申请人
-  sqsj: "", // 申请时间
-  sqyy: "" // 申请原因
-});
 
+// 编辑器实例，必须用 shallowRef
+const editorRef = shallowRef();
+const editorConfig = ref({
+  placeholder: "请输入内容...",
+  readOnly: false,
+  MENU_CONF: {
+    // 图片上传配置
+    uploadImage: {
+      server: "http://your-server.com/api/upload-image", // 替换为你的图片上传接口
+      fieldName: "file", // 上传文件的字段名（根据后端接口调整）
+      maxFileSize: 10 * 1024 * 1024, // 10M
+      allowedFileTypes: ["image/*"], // 允许的图片类型
+      // 自定义上传参数（如 token）
+      meta: {
+        token: store.getters.token // 如果需要认证
+      },
+      // 自定义文件名
+      metaWithUrl: false,
+      // 跨域携带 Cookie
+      withCredentials: true
+    },
+    // 视频上传配置（类似）
+    uploadVideo: {
+      server: "http://your-server.com/api/upload-video",
+      fieldName: "file",
+      maxFileSize: 50 * 1024 * 1024 // 50M
+    }
+  }
+});
+const toolbarConfig = {};
+const loading = ref(false);
+// 内容 HTML
+const valueHtml = ref("<p>hello</p>");
+const tableDate = reactive({
+  bqList: [], //表格数据
+  ryList: [], //上报人员列表
+  keyCount: 0,
+  rykeyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  tableHeight: 225,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 90, //操作栏宽度
+  tableColumn: [
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签类别", prop: "bqLb", showSolt: true },
+    { label: "标签类型", prop: "bqLx", showSolt: true },
+    { label: "标签名称", prop: "bqMc" },
+    { label: "标签种类", prop: "bqZl", showSolt: true }
+  ],
+  tableColumnRy: [
+    { label: "姓名", prop: "ryXm" },
+    { label: "联系电话", prop: "ryLxdh" },
+    { label: "身份证号", prop: "rySfzh" },
+    { label: "民族", prop: "ryMz", showSolt: true },
+    { label: "居住地址", prop: "jzdDz" }
+  ]
+});
+const formData = ref([
+  { label: "", prop: "basic", type: "slot", width: "100%" },
+  { label: "线索名称", prop: "xsMc", type: "input" },
+  { label: "线索来源", prop: "ryXb", type: "select" },
+  { label: "线索编号", prop: "ryMz", type: "input" },
+  { label: "线索类型", prop: "ryLxdh", type: "select" },
+  { label: "线索状态", prop: "ryCsrq", type: "select" },
+  { label: "所属专题", prop: "ryMz", type: "input" },
+  { label: "群体名称", prop: "ryMz", type: "input" },
+  { label: "群体类型", prop: "ryMz", type: "select" },
+  { label: "上报单位", prop: "ryMz", type: "select" },
+  { label: "上报时间", prop: "rySfzh", type: "date" },
+  { label: "线索内容", prop: "xsZw", type: "slot", width: "100%" },
+  { label: "线索备注", prop: "ryJg", type: "textarea", width: "100%" },
+  { label: "", prop: "bqInfo", type: "slot", width: "100%" },
+  { label: "标签列表", prop: "bqList", type: "slot", width: "80%" },
+  {
+    label: "市内外",
+    prop: "snw",
+    type: "radio",
+    options: [
+      { value: "1", label: "市内" },
+      { value: "0", label: "市外" }
+    ]
+  },
+  {
+    label: "是否设计外地",
+    prop: "xsfxdj",
+    type: "radio",
+    options: [
+      { value: "1", label: "是" },
+      { value: "0", label: "否" }
+    ]
+  },
+  { label: "指向地点", prop: "zxdd", type: "input" },
+  { label: "具体部位", prop: "jtbw", type: "input" },
+  { label: "指向时间类型", prop: "sjlx", type: "select" },
+  { label: "指向时间段", prop: "sjd", type: "datetimerange" },
+  { label: "", prop: "sbRy", type: "slot", width: "100%" },
+  {
+    label: "上报人员",
+    prop: "sbRyId",
+    type: "slot",
+    width: "80%"
+  },
+  // {
+  //   label: "姓名",
+  //   prop: "zdrRyjb",
+  //   type: "input"
+  // },
+  // {
+  //   label: "身份证号",
+  //   prop: "zdrYjdj",
+  //   type: "input"
+  // },
+  // { label: "住址", prop: "hjdQh", type: "select" },
+  { label: "", prop: "jurisdiction", type: "slot", width: "100%" },
+
+  { label: "申请人", prop: "hjdXz", type: "input" },
+  {
+    label: "申请时间",
+    prop: "hjdPcsdm",
+    type: "date"
+  },
+  { label: "申请原因", prop: "xzdQh", type: "textarea", width: "100%" }
+]);
+const listQuery = ref({});
+
+// 打开弹窗
+const openDialog = (type, value) => {
+  nextTick(() => {
+    if (value == "ry") {
+      ryDialog.value = true;
+    } else if (value == "bq") {
+      chooseShow.value = true;
+      tagDialog.value.setValues(listQuery.value.bqList);
+    }
+  });
+};
+const handleTagSelect = (selectedTags) => {
+  tableDate.bqList = selectedTags.map((item) => ({
+    bqDm: item.bqDm || "",
+    bqId: item.bqId || "",
+    bqLb: item.bqLb || "",
+    bqLx: item.bqLx || "",
+    bqMc: item.bqMc || "",
+    bqZl: item.bqZl || ""
+  }));
+  listQuery.value.bqList = tableDate.bqList;
+  // 每个标签包含: bqDm, bqId, bqLb, bqLx, bqMc, bqZl 属性
+};
+const handleCreated = (editor) => {
+  editorRef.value = editor; // 记录 editor 实例，重要！
+};
 // 初始化数据
 const init = (type, row) => {
   dialogForm.value = true;
@@ -198,8 +382,107 @@ const init = (type, row) => {
 };
 
 const close = () => {
+  listQuery.value = {};
+  tableDate.bqList = [];
   dialogForm.value = false;
+  loading.value = false;
 };
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    // 定义仅在 report 模式下需要的字段
+    const reportFields = [
+      "bsBh",
+      "bsNr",
+      "bsRq",
+      "bsSfCb",
+      "bsZt",
+      "sbDwDm",
+      "sbDwMc",
+      "csDwMc",
+      "csDwDm",
+      "bzDwMc",
+      "bzDwDm",
+      "cbrXm",
+      "cbrSfzh",
+      "shrXm",
+      "shrSfzh",
+      "qfrXm",
+      "qfrSfzh",
+      "hbBk",
+      "xsId" // 新增 xsId
+    ];
+
+    // 准备最终提交数据
+    let submitData;
+
+    if (typeOf.value === "report") {
+      // report 模式：只提交 reportFields 里的字段 + hbBk（富文本）
+      submitData = {
+        ...Object.fromEntries(
+          Object.entries(data).filter(([key]) => reportFields.includes(key))
+        ),
+        hbBk: valueHtml.value, // 强制覆盖富文本字段
+        xsId: listQuery.value.id // 强制添加 xsId
+      };
+    } else {
+      // 非 report 模式：提交除 reportFields 外的所有字段
+      submitData = {
+        ...Object.fromEntries(
+          Object.entries(data).filter(([key]) => !reportFields.includes(key))
+        ),
+        xsNr: clueHtml.value // 强制覆盖线索内容字段
+      };
+    }
+
+    // 根据 title 决定请求 URL
+    let url =
+      title.value == "新增"
+        ? "/mosty-gsxt/tbGsxtXs/save"
+        : title.value == "上报"
+        ? "/mosty-gsxt/tbGsxtRlqbBjsb/save"
+        : "/mosty-gsxt/tbGsxtXs/update";
+
+    // 发起请求
+    qcckPost(submitData, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("getList");
+        close();
+      })
+      .catch(() => {});
+  });
+};
+// 根据id查询详情
+const getDataRyId = (id) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtJwry/" + id).then((res) => {
+    tableDate.ryList = [res];
+    listQuery.value.sbRyId = res.id;
+  });
+};
+// 删除
+const delDictItem = (bqId) => {
+  tableDate.bqList = tableDate.bqList.filter((item) => item.bqId !== bqId);
+  listQuery.value.bqList = tableDate.bqList;
+};
+// 删除
+const delDict = (id) => {
+  tableDate.ryList = tableDate.ryList.filter((item) => item.id !== id);
+  listQuery.value.ryList = tableDate.ryList;
+};
+// 选择数据
+const chooseDate = (data) => {
+  console.log(data[0].id);
+  tableDate.ryList = data;
+  listQuery.value.sbRyId = data[0].id;
+};
+
+// 组件销毁时，也及时销毁编辑器
+onBeforeUnmount(() => {
+  const editor = editorRef.value;
+  if (editor == null) return;
+  editor.destroy();
+});
 
 defineExpose({ init });
 </script>
@@ -219,4 +502,10 @@ defineExpose({ init });
     overflow-y: auto;
   }
 }
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
 </style>

src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/dialogList.vue

@@ -0,0 +1,229 @@
+<template>
+  <el-dialog
+    :title="titleValue"
+    width="900px"
+    :model-value="modelValue"
+    append-to-body
+    @close="closed"
+  >
+    <div>
+      <el-form :model="listQuery" class="mosty-from-wrap" :inline="true">
+        <el-form-item label="人员姓名">
+          <el-input
+            placeholder="请输入人员姓名"
+            v-model="listQuery.ryXm"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="success" @click="handleFilter">查询</el-button>
+          <el-button type="info" @click="reset()"> 重置 </el-button>
+        </el-form-item>
+      </el-form>
+      <div
+        class="tabBox"
+        :class="props.Single ? 'tabBoxRadio' : ''"
+        style="margin-top: 0px"
+      >
+        <el-table
+          v-loading="loading"
+          ref="multipleUserRef"
+          @selection-change="handleSelectionChange"
+          :data="tableData"
+          border
+          :row-key="keyid"
+          style="width: 100%"
+          height="450"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            :reserve-selection="true"
+          />
+          <el-table-column prop="ryXm" align="center" label="姓名" />
+          <el-table-column prop="ryLxdh" align="center" label="联系电话" />
+          <el-table-column prop="rySfzh" align="center" label="身份证号">
+          </el-table-column>
+          <el-table-column prop="bqYs" align="center" label="民族">
+            <template #default="{ row }">
+              <DictTag
+                :value="row.ryMz"
+                :tag="false"
+                :options="props.dic.D_BZ_MZ"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="jzdDz" align="center" label="居住地址">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="fenye" :style="{ top: tableHeight + 'px' }">
+        <el-pagination
+          class="pagination"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="listQuery.current"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="listQuery.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        ></el-pagination>
+      </div>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="closed">取消</el-button>
+        <el-button type="primary" @click="onComfirm">确认</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { defineProps, ref, onMounted } from "vue";
+import { qcckGet } from "@/api/qcckApi.js";
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    required: true
+  },
+  dic: {
+    type: Object,
+    default: () => {}
+  },
+  bqDl: {
+    type: String,
+    default: "01"
+  },
+  bqLx: {
+    type: String,
+    default: "01"
+  },
+  titleValue: {
+    type: String,
+    default: "选择大类"
+  },
+  LeaderType: {
+    type: String,
+    default: ""
+  },
+  //是否单选
+  Single: {
+    type: Boolean,
+    default: true
+  },
+  roleIds: {
+    type: Array,
+    default: []
+  }
+});
+const total = ref(0);
+const listQuery = ref({
+  current: 1,
+  size: 20
+});
+const loading = ref(false);
+const tableData = ref([]);
+const emits = defineEmits(["update:modelValue", "chooseDate"]);
+onMounted(() => {
+  handleFilter();
+});
+const closed = () => {
+  emits("update:modelValue", false);
+};
+const reset = () => {
+  listQuery.value = { current: 1, size: 20 };
+  getDataList();
+};
+
+const keyid = (row) => {
+  return row.id;
+};
+// 为用户分配角色
+const onComfirm = () => {
+  const userList = multipleSelectionUser.value;
+  let list = [];
+  let listId = [];
+  userList.forEach((val) => {
+    if (listId.indexOf(val.id) == -1) {
+      list.push(val);
+      listId.push(val.id);
+    }
+  });
+  emits("chooseDate", list);
+  closed();
+};
+/**
+ * pageSize 改变触发
+ */
+const handleSizeChange = (currentSize) => {
+  listQuery.value.size = currentSize;
+  getDataList();
+};
+
+/**
+ * 页码改变触发
+ */
+const handleCurrentChange = (currentPage) => {
+  listQuery.value.current = currentPage;
+  getDataList();
+};
+
+// 查询标签组合列表
+const getDataList = () => {
+  const data = listQuery.value;
+  loading.value = true;
+  qcckGet(data, "/mosty-gsxt/tbGsxtJwry/selectPage").then((res) => {
+    tableData.value = res?.records;
+    total.value = Number(res.total);
+    loading.value = false;
+    multipleUser();
+  });
+};
+
+//列表回显
+function multipleUser() {
+  tableData.value.forEach((item) => {
+    if (props.roleIds.some((id) => id == item.id)) {
+      multipleUserRef.value.toggleRowSelection(item, true);
+    }
+  });
+}
+
+const handleFilter = () => {
+  listQuery.value.current = 1;
+  getDataList();
+};
+
+const multipleUserRef = ref(null);
+const multipleSelectionUser = ref([]);
+const handleSelectionChange = (val) => {
+  if (props.Single) {
+    if (val.length > 1) {
+      let del_row = val.shift();
+      multipleUserRef.value.toggleRowSelection(del_row, false);
+    }
+    multipleSelectionUser.value = val;
+  } else {
+    multipleSelectionUser.value = val;
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+@import "@/assets/css/element-plus.scss";
+</style>
+<style>
+.tabBoxRadio .el-checkbox__inner {
+  border-radius: 50% !important;
+}
+.tabBoxRadio .el-table__header-wrapper .el-checkbox {
+  display: none;
+}
+:deep(.el-dialog) {
+  background: #fff !important;
+  border-radius: 8px !important;
+  /* 其他样式 */
+}
+</style>

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

@@ -26,7 +26,6 @@
         :key="pageData.keyCount"
         :tableConfiger="pageData.tableConfiger"
         :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData"
       >
         <template #bqYs="{ row }">
           <DictTag :value="row.bqYs" :tag="false" :options="D_GS_SSYJ" />

src/views/home/layout/head.vue

@@ -80,7 +80,6 @@
               <el-icon color="#fff" style="top:2px;"><Notification/></el-icon><i class="ml10" style="color: #fff;">{{iv}}</i>
             </div>
           </el-popover>
-
           <span class="ml10 mr10"><img @click.stop="handleBtns('后台')" src="@/assets/images/meun.png" alt=""></span>
         </div>
       </ul>

src/views/login/index.vue

@@ -128,18 +128,14 @@ const loginRules = ref({
 
 const handleClose = () => {};
 const refreshToken = (e) => {
-  store
+  store.dispatch("user/refreshToken", { deptId: e, jwtToken: authorization.value}).then((res) => {
-    .dispatch("user/refreshToken", { deptId: e, jwtToken: authorization.value })
+    loading.value = false;
-    .then((res) => {
+    store.commit("user/setDeptId", e);
-      loading.value = false;
+    window.location.href = '/'// 登录后操作
-      store.commit("user/setDeptId", e);
+    router.push("/");
-
+  }).catch(() => {
-      // window.location.href = '/'// 登录后操作
+    loading.value = false;
-      router.push("/");
+  });
-    })
-    .catch(() => {
-      loading.value = false;
-    });
 };
 // 处理密码框文本显示状态
 const passwordType = ref("password");

vue.config.js

@@ -4,7 +4,7 @@ function resolve(dir) {
   return path.join(__dirname, dir);
 }
 
-const serverHost = "http://192.168.31.232:8006"
+const serverHost = "http://192.168.31.233:8006"
 module.exports = {
   publicPath: "./",
   outputDir: "ylth",