解决冲突

.env.development

@@ -4,5 +4,5 @@ ENV='development'
 # base api
 # VUE_APP_BASE_API = '/api'
 VUE_APP_GATEWAY_API = '/mosty-api/mosty-base'
-VUE_APP_GATEWAY_BASE_URL = 'http://123.60.110.230'
+VUE_APP_GATEWAY_BASE_URL = 'http://172.20.19.62'
 VUE_APP_GATEWAY_HOST = '123.60.110.230'

node.js

@@ -1,5 +0,0 @@
-const express = require('express')
-const app = express()
-app.get('/', (req, res) => res.send('Hello World!'))
-app.use(express.static('./www'))
-app.listen(3000, () => console.log('Example app listening on port 3000!'))

package.json

@@ -16,6 +16,8 @@
     "@fullcalendar/timegrid": "^5.9.0",
     "@fullcalendar/vue3": "^5.9.0",
     "@types/video.js": "^7.3.42",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^0.26.0",
     "core-js": "^3.6.5",
     "echarts": "^5.3.3",
@@ -25,6 +27,7 @@
     "gifler": "^0.1.0",
     "lodash": "^4.17.21",
     "mitt": "^3.0.0",
+    "moment": "^2.30.1",
     "ol": "^6.14.1",
     "pinia": "^3.0.1",
     "vue": "^3.2.8",

src/components/MyComponents/ChooseUser/index.vue

@@ -44,7 +44,11 @@
           style="width: 100%"
           height="450"
         >
-          <el-table-column type="selection" width="55" :reserve-selection="true" />
+          <el-table-column
+            type="selection"
+            width="55"
+            :reserve-selection="true"
+          />
           <el-table-column
             prop="loginName"
             align="center"
@@ -131,7 +135,7 @@ const props = defineProps({
   roleIds: {
     type: Array,
     default: []
-  },
+  }
 });
 const total = ref(0);
 const listQuery = ref({
@@ -163,16 +167,17 @@ const keyid = (row) => {
 // 为用户分配角色
 const onComfirm = () => {
   const userList = multipleSelectionUser.value;
-  let list = []
+  let list = [];
-  let listId = []
+  let listId = [];
-  userList.forEach(val=>{
+  userList.forEach((val) => {
     if (listId.indexOf(val.id) == -1) {
       list.push(val);
       listId.push(val.id);
     }
-  })
+  });
   emits("choosedUsers", list);
   let data = { type: props.LeaderType, userList: userList };
+
   emits("choosedUsersLeader", data);
   closed();
 };
@@ -193,20 +198,20 @@ const handleCurrentChange = (currentPage) => {
 };
 const getListData = () => {
   const params = listQuery.value;
-  selectUserDeptPage(params).then(res=>{
+  selectUserDeptPage(params).then((res) => {
     tableData.value = res?.records;
     total.value = Number(res.total);
-    multipleUser()
+    multipleUser();
   });
 };
 
 //列表回显
 function multipleUser() {
-  tableData.value.forEach(item=>{
+  tableData.value.forEach((item) => {
-    if(props.roleIds.some(id=>id == item.id)){
+    if (props.roleIds.some((id) => id == item.id)) {
       multipleUserRef.value.toggleRowSelection(item, true);
     }
-  })
+  });
 }
 
 const handleFilter = () => {
@@ -226,7 +231,6 @@ const handleSelectionChange = (val) => {
   } else {
     multipleSelectionUser.value = val;
   }
-
 };
 </script>
 
@@ -241,9 +245,7 @@ const handleSelectionChange = (val) => {
 .tabBoxRadio .el-table__header-wrapper .el-checkbox {
   display: none;
 }
-.el-dialog{
+
-    background: #050e33;
-}
 .el-dialog__title {
   color: #fff;
 }

src/components/MyComponents/Department/index.vue

@@ -74,7 +74,6 @@ const endProps = {
 const tableData = ref([]);
 const getSysMenuTree = async () => {
   const res = await selectDeptPage(listQuery.value);
-  debugger
   tableData.value = res;
   depList.value = res
 };

src/components/MyComponents/Select/index.vue

@@ -1,8 +1,19 @@
-
 <template>
   <div class="Select-wrap" :style="{ width: width }">
-    <el-select :disabled="props.disabled" v-bind="$attrs" v-model="modelValue" @change="hanlderSelect" :popper-class="selectOption.length > 20 ? 'nation-select' : ''" :placeholder="placeholder">
+    <el-select
-      <el-option v-for="item in dictEnum" :key="item.value" :label="item.zdmc || item.label" :value="item.dm || item.value">
+      :disabled="props.disabled"
+      v-bind="$attrs"
+      v-model="modelValue"
+      @change="hanlderSelect"
+      :popper-class="selectOption.length > 20 ? 'nation-select' : ''"
+      :placeholder="placeholder"
+    >
+      <el-option
+        v-for="item in dictEnum"
+        :key="item.value"
+        :label="item.zdmc || item.label"
+        :value="item.dm || item.value"
+      >
       </el-option>
     </el-select>
   </div>
@@ -21,15 +32,19 @@ const props = defineProps({
     type: Boolean
   },
   modelValue: {
-    default: "",
+    type: [String, Array], // 允许 String 或 Array
-    type: String
+    default: "", // 默认值设为空字符串
+    validator: (value) => {
+      // 允许：空字符串、非空字符串、数组
+      return typeof value === "string" || Array.isArray(value);
+    }
   },
   dictEnum: {
-    default: Array,
+    default: [],
-    type: String
+    type: Array
   },
   width: {
-    default: '100%',
+    default: "100%",
     type: String
   }
 });

src/components/MyComponents/Sex/index.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="form-item-box" :style="{ width: width }">
-    <el-select :disabled="disabled" v-model="sex" placeholder="请选择性别" @change="onChange">
+    <el-select
+      :disabled="disabled"
+      v-model="sex"
+      placeholder="请选择性别"
+      @change="onChange"
+    >
       <el-option
         v-for="item in D_BZ_XB"
         :key="item"

src/components/aboutTable/FormMessage.vue

@@ -1,38 +1,161 @@
 <template>
-  <el-form ref="elform" :model="listQuery" :label-width="props.labelWidth" :rules="props.rules" :inline="true" label-position="right">
+  <el-form
-    <el-form-item v-for="item in props.formList" :style="{ width: item.width }" :prop="item.prop" :label="item.label" :label-width="item.labelWidth"   :key="item">
+    ref="elform"
+    :model="listQuery"
+    :label-width="props.labelWidth"
+    :rules="props.rules"
+    :inline="true"
+    label-position="right"
+  >
+    <el-form-item
+      v-for="item in props.formList"
+      :style="item.width && { width: item.width }"
+      :prop="item.prop"
+      :label="item.label"
+      :label-width="item.labelWidth"
+      :key="item"
+    >
       <!-- input表单 input-->
-      <MOSTY.Other v-if="item.type == 'input'" width="100%" clearable v-model="listQuery[item.prop]" :placeholder="`请输入${item.label}`"/>
+      <MOSTY.Other
-      <el-input v-model="listQuery[item.prop]" v-else-if="item.type == 'textarea'" type="textarea" :rows="3" :placeholder="`请输入${item.label}`" />
+        v-if="item.type == 'input'"
+        width="100%"
+        clearable
+        v-model="listQuery[item.prop]"
+        :placeholder="`请输入${item.label}`"
+        :disabled="item.disabled"
+      />
+      <el-input
+        v-model="listQuery[item.prop]"
+        v-else-if="item.type == 'textarea'"
+        type="textarea"
+        :rows="3"
+        :placeholder="`请输入${item.label}`"
+        :disabled="item.disabled"
+      />
       <!-- 数值 inputNumber-->
-      <el-input type="number" v-model="listQuery[item.prop]" v-else-if="item.type == 'inputNumber'" :placeholder="`请输入${item.label}`" />
+      <el-input
+        type="number"
+        v-model="listQuery[item.prop]"
+        v-else-if="item.type == 'inputNumber'"
+        :placeholder="`请输入${item.label}`"
+        :disabled="item.disabled"
+      />
       <!-- 数值 number-->
-      <el-input-number v-model="listQuery[item.prop]" v-else-if="item.type == 'number'" style="width:100%"  :min="item.min || 0" :max="item.max || 1000" />
+      <el-input-number
+        v-model="listQuery[item.prop]"
+        v-else-if="item.type == 'number'"
+        style="width: 100%"
+        :min="item.min || 0"
+        :max="item.max || 1000"
+        :disabled="item.disabled"
+      />
       <!--选择 select-->
-      <MOSTY.Select v-else-if="item.type == 'select'" filterable :multiple="item.multiple" v-model="listQuery[item.prop]" :dictEnum="item.options" width="100%"  clearable :placeholder="`请选择${item.label}`"/>
+      <MOSTY.Select
+        v-else-if="item.type == 'select'"
+        filterable
+        :multiple="item.multiple"
+        v-model="listQuery[item.prop]"
+        :dictEnum="item.options"
+        width="100%"
+        clearable
+        :placeholder="`请选择${item.label}`"
+        :disabled="item.disabled"
+      />
       <!-- 部门department -->
       <template v-else-if="item.type === 'department'">
         <MOSTY.Department clearable v-model="listQuery[item.prop]" />
       </template>
 
       <!-- 上传 upload -->
-      <MOSTY.Upload v-else-if="item.type == 'upload'" width="100%" v-model="listQuery[item.prop]"/>
+      <MOSTY.Upload
+        v-else-if="item.type == 'upload'"
+        width="100%"
+        v-model="listQuery[item.prop]"
+        :isImg="item.isImg"
+        :disabled="item.disabled"
+      />
       <!--选择checkbox -->
-      <MOSTY.CheckBox v-else-if="item.type == 'checkbox'" width="100%" clearable v-model="listQuery[item.prop]" :checkList="item.options" :placeholder="`请选择${item.label}`"/>
+      <MOSTY.CheckBox
+        v-else-if="item.type == 'checkbox'"
+        width="100%"
+        clearable
+        v-model="listQuery[item.prop]"
+        :checkList="item.options"
+        :placeholder="`请选择${item.label}`"
+        :disabled="item.disabled"
+      />
 
       <!-- 单选radio -->
-      <el-radio-group v-model="listQuery[item.prop]" v-else-if="item.type == 'radio'">
+      <el-radio-group
-        <el-radio v-for="obj in item.options" :key="obj.value" :label="obj.value" >{{ obj.label }}</el-radio>
+        v-model="listQuery[item.prop]"
+        v-else-if="item.type == 'radio'"
+        :disabled="item.disabled"
+      >
+        <el-radio
+          v-for="obj in item.options"
+          :key="obj.value"
+          :label="obj.value"
+          >{{ obj.label }}</el-radio
+        >
       </el-radio-group>
 
       <!-- 时间选择 -->
-      <el-time-picker v-else-if="item.type == 'time'" v-model="listQuery[item.prop]" placeholder="选择时间" style="width:100%;" />
+      <el-time-picker
-      <el-date-picker v-else-if="item.type == 'date'" v-model="listQuery[item.prop]" type="date" value-format="YYYY-MM-DD" placeholder="请选择日期" style="width:100%;" />
+        v-else-if="item.type == 'time'"
-      <el-date-picker v-else-if="item.type == 'datetime'" v-model="listQuery[item.prop]" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间" style="width:100%;" />
+        v-model="listQuery[item.prop]"
-      <el-date-picker v-else-if="item.type == 'datetimerange'" v-model="listQuery[item.prop]" type="datetimerange" :shortcuts="shortcuts" range-separator="To" value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="选择开始时间" end-placeholder="选择结束时间" style="width:100%;" />
+        placeholder="选择时间"
-      <el-date-picker v-else-if="item.type == 'daterange'" v-model="listQuery[item.prop]" type="daterange" range-separator="To" value-format="YYYY-MM-DD" start-placeholder="选择开始日期" end-placeholder="选择开始日期" style="width:100%;" />
+        style="width: 100%"
+        :disabled="item.disabled"
+      />
+      <el-date-picker
+        v-else-if="item.type == 'date'"
+        v-model="listQuery[item.prop]"
+        type="date"
+        value-format="YYYY-MM-DD"
+        placeholder="请选择日期"
+        style="width: 100%"
+        :disabled="item.disabled"
+      />
+      <el-date-picker
+        v-else-if="item.type == 'datetime'"
+        v-model="listQuery[item.prop]"
+        type="datetime"
+        value-format="YYYY-MM-DD HH:mm:ss"
+        placeholder="请选择时间"
+        style="width: 100%"
+        :disabled="item.disabled"
+      />
+      <el-date-picker
+        v-else-if="item.type == 'datetimerange'"
+        v-model="listQuery[item.prop]"
+        type="datetimerange"
+        :shortcuts="shortcuts"
+        range-separator="To"
+        value-format="YYYY-MM-DD HH:mm:ss"
+        start-placeholder="选择开始时间"
+        end-placeholder="选择结束时间"
+        style="width: 100%"
+        :disabled="item.disabled"
+      />
+      <el-date-picker
+        v-else-if="item.type == 'daterange'"
+        v-model="listQuery[item.prop]"
+        type="daterange"
+        range-separator="To"
+        value-format="YYYY-MM-DD"
+        start-placeholder="选择开始日期"
+        end-placeholder="选择开始日期"
+        style="width: 100%"
+        :disabled="item.disabled"
+      />
 
-      <el-switch v-else-if="item.type == 'switch'" v-model="listQuery[item.prop]" class="ml-2" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"/>
+      <el-switch
+        v-else-if="item.type == 'switch'"
+        v-model="listQuery[item.prop]"
+        class="ml-2"
+        :disabled="item.disabled"
+        style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+      />
 
       <template v-else-if="item.type === 'slot'">
         <slot :name="item.prop"></slot>
@@ -60,7 +183,7 @@ const props = defineProps({
   modelValue: {
     type: Object,
     default: {}
-  },
+  }
 });
 const elform = ref();
 const listQuery = ref({});
@@ -73,16 +196,24 @@ const submit = (resfun) => {
   });
 };
 
-watch(() => listQuery.value,(newVal) => {
+watch(
-    emits('update:modelValue', newVal)
+  () => listQuery.value,
-  },{ immediate: true, deep: true }
+  (newVal) => {
+    emits("update:modelValue", newVal);
+  },
+  { immediate: true, deep: true }
 );
 
-watch(() => props.modelValue,(newVal) => {
+watch(
-  listQuery.value = newVal; //赋值
+  () => props.modelValue,
-  },{ immediate: true, deep: true }
+  (newVal) => {
+    // 只有在新值确实变化时才更新（避免空值覆盖）
+    if (newVal && Object.keys(newVal).length > 0) {
+      listQuery.value = { ...newVal };
+    }
+  },
+  { immediate: true, deep: true }
 );
 
 defineExpose({ submit });
 </script>
-  

src/components/aboutTable/TagSelectorDialog.vue

@@ -0,0 +1,407 @@
+<template>
+  <el-dialog
+    :title="titleValue"
+    width="1500px"
+    :model-value="modelValue"
+    append-to-body
+    @close="closed"
+  >
+    <div class="table_class">
+      <div style="width: 48%">
+        <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+          <el-tab-pane
+            v-for="tab in tabs"
+            :key="tab.dm"
+            :label="tab.label"
+            :name="tab.dm"
+          >
+            <!-- 添加 v-if 条件 -->
+            <template v-if="activeTab !== '03'">
+              <el-button
+                v-for="(it, idx) in props.dic.D_GS_BQ_LB"
+                :key="idx"
+                :type="type == it.zdmc ? 'success' : ''"
+                @click="chooseListType(it.zdmc)"
+              >
+                <span style="vertical-align: middle">{{ it.zdmc }}</span>
+              </el-button>
+            </template>
+            <el-table
+              v-loading="loading"
+              ref="multipleUserRef"
+              @selection-change="handleSelectionChange"
+              :data="tableData"
+              border
+              :row-key="keyid"
+              style="width: 100%"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                :reserve-selection="true"
+              />
+              <el-table-column prop="bqDm" align="center" label="标签代码" />
+              <el-table-column prop="bqLb" align="center" label="标签类别">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqLb"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_LB"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="bqLx" align="center" label="标签类型">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqLx"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_LX"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="bqMc" align="center" label="标签名称" />
+              <el-table-column prop="bqZl" align="center" label="标签种类">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqZl"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_ZL"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="fenye">
+              <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>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+
+      <div style="width: 48%">
+        <div class="selected-tabBox">
+          <el-table
+            :data="selectedData"
+            border
+            :row-key="keyid"
+            style="width: 100%"
+          >
+            <el-table-column prop="bqDm" align="center" label="标签代码" />
+            <el-table-column prop="bqLb" align="center" label="标签类别">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqLb"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LB"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="bqLx" align="center" label="标签类型">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqLx"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LX"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="bqMc" align="center" label="标签名称" />
+            <el-table-column prop="bqZl" align="center" label="标签种类">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqZl"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_ZL"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作">
+              <template #default="{ row }">
+                <el-button
+                  type="danger"
+                  @click="handleRemoveFromSelectedData(row)"
+                  >移除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="fenye">
+          <el-pagination
+            class="pagination"
+            @size-change="handleSizeChangeRight"
+            @current-change="handleCurrentChangeRight"
+            :current-page="listQuery.current"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="listQuery.sizeRight"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="selectedData.length"
+          ></el-pagination>
+        </div>
+      </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, nextTick } 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: false
+  },
+  roleIds: {
+    type: Array,
+    default: []
+  }
+});
+
+const tabs = ref([]);
+const activeTab = ref("");
+const total = ref(0);
+const listQuery = ref({
+  current: 1,
+  size: 20,
+  bqZl: activeTab.value
+});
+const loading = ref(false);
+const tableData = ref([]);
+const selectedData = ref([]);
+const multipleUserRef = ref(null);
+const emits = defineEmits(["update:modelValue", "chooseDate"]);
+const type = ref("标签大类");
+onMounted(() => {
+  console.log(props.dic.D_GS_BQ_ZL, "props.dic.D_GS_BQ_ZL");
+  tabs.value = props.dic.D_GS_BQ_ZL;
+  activeTab.value = tabs.value?.[0]?.dm || "01";
+  handleFilter();
+});
+// 选择列表的大类和细类
+const chooseListType = (val) => {
+  type.value = val;
+  listQuery.current = 1;
+  getDataList();
+};
+const closed = () => {
+  emits("update:modelValue", false);
+};
+
+const reset = () => {
+  listQuery.value = { current: 1, size: 20, bqZl: activeTab.value };
+  getDataList();
+};
+
+const keyid = (row) => {
+  return row.id;
+};
+
+// 为用户分配角色
+const onComfirm = () => {
+  emits("chooseDate", selectedData.value);
+  let data = { type: props.LeaderType, userList: selectedData.value };
+  emits("chooseDateLeader", data);
+  closed();
+};
+//数据回显
+const setValues = (list) => {
+  selectedData.value = list.map((item) => {
+    // 统一id字段处理逻辑
+    if (item.bqId) {
+      return { ...item, id: item.bqId };
+    }
+
+    return item;
+  });
+
+  nextTick(() => {
+    multipleUser();
+  });
+};
+/**
+ * pageSize 改变触发
+ */
+const handleSizeChange = (currentSize) => {
+  listQuery.value.size = currentSize;
+  getDataList();
+};
+
+/**
+ * 页码改变触发
+ */
+const handleCurrentChange = (currentPage) => {
+  listQuery.value.current = currentPage;
+  getDataList();
+};
+
+// 查询标签组合列表
+const getDataList = () => {
+  listQuery.value.bqZl = activeTab.value;
+  loading.value = true;
+  //根据顶部标签切换不同的接口
+  let url =
+    activeTab.value == "01"
+      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
+      : activeTab.value == "02"
+      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
+      : "/mosty-gsxt/tbGsxtBqzh/selectPage";
+  let params = {};
+  console.log(activeTab.value, "activeTab.value");
+  if (activeTab.value === "01") {
+    params.bqLx = "01";
+  } else if (activeTab.value === "02") {
+    params.bqLx = "02";
+  } // activeTab.value 等于 "03" 时不传递参数
+  if (type.value === "标签大类") {
+    params.bqLb = "01";
+  } else if (type.value === "标签细类") {
+    params.bqLb = "02";
+  }
+  qcckGet(params, url).then((res) => {
+    // 添加 bqZl 字段
+    tableData.value = res?.records?.map((item) => ({
+      bqDm: item.bqDm,
+      bqId: item.id ? item.id : item.bqId ? item.bqId : row.bqDlId,
+      bqLb: item.bqLb,
+      bqLx: item.bqLx,
+      bqMc: item.bqMc,
+      bqZl: activeTab.value
+    }));
+    total.value = Number(res.total);
+    loading.value = false;
+    //确保在这里调用 multipleUser
+    multipleUser();
+  });
+};
+
+// 修改 multipleUser 函数
+function multipleUser() {
+  nextTick(() => {
+    if (multipleUserRef.value && tableData.value.length > 0) {
+      tableData.value.forEach((item) => {
+        if (selectedData.value.some((selected) => selected.bqId == item.bqId)) {
+          // 因为 multipleUserRef 是数组，需要确定正确的索引
+          // 如果你只有一个表格，可以使用 [0]
+          multipleUserRef.value[0]?.toggleRowSelection(item, true);
+        }
+      });
+    }
+  });
+}
+
+const handleFilter = () => {
+  listQuery.value.current = 1;
+
+  getDataList();
+};
+
+const handleTabClick = () => {
+  reset();
+};
+
+const handleAddToSelectedData = (row) => {
+  console.log(row, selectedData.value, "handleAddToSelectedData row");
+  if (selectedData.value.some((item) => item.bqId === row.bqId)) {
+    return;
+  }
+  if (props.Single && selectedData.value.length > 0) {
+    selectedData.value = [];
+  }
+  selectedData.value.push({
+    bqDm: row.bqDm,
+    bqId: row.id ? row.id : row.bqId ? row.bqId : row.bqDlId,
+    bqLb: row.bqLb,
+    bqLx: row.bqLx,
+    bqMc: row.bqMc,
+    bqZl: activeTab.value
+  });
+};
+
+const handleRemoveFromSelectedData = (row) => {
+  const index = selectedData.value.findIndex((item) => item.bqId === row.bqId);
+  if (index !== -1) {
+    selectedData.value.splice(index, 1);
+  }
+  // 取消左侧表格中对应行的选中状态
+  multipleUserRef.value.toggleRowSelection(row, false);
+};
+
+const multipleSelectionUser = ref([]);
+const handleSelectionChange = (val) => {
+  multipleSelectionUser.value = val;
+  multipleSelectionUser.value.forEach((row) => {
+    handleAddToSelectedData(row);
+  });
+};
+// 必须暴露方法父组件才能调用
+defineExpose({
+  setValues
+});
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+@import "@/assets/css/element-plus.scss";
+
+.selected-tabBox {
+  margin-top: 56px;
+}
+</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;
+  /* 其他样式 */
+}
+.table_class {
+  display: flex;
+  justify-content: space-between;
+}
+</style>

src/router/index.js

@@ -29,7 +29,8 @@ export const privateRoutes = [
       {
         path: "/user/department-ist",
         name: "departmentList",
-        component: () => import("@/views/backOfficeSystem/systemConfig/department-list/index"),
+        component: () =>
+          import("@/views/backOfficeSystem/systemConfig/department-list/index"),
         meta: {
           title: "部门管理",
           icon: "article-ranking"
@@ -39,7 +40,8 @@ export const privateRoutes = [
       {
         path: "/user/userList",
         name: "userList",
-        component: () => import("@/views/backOfficeSystem/systemConfig/user-list/index"),
+        component: () =>
+          import("@/views/backOfficeSystem/systemConfig/user-list/index"),
         meta: {
           title: "用户管理",
           icon: "article-ranking"
@@ -48,7 +50,8 @@ export const privateRoutes = [
       {
         path: "/user/role",
         name: "userRoleIndex",
-        component: () => import("@/views/backOfficeSystem/systemConfig/role-list/index"),
+        component: () =>
+          import("@/views/backOfficeSystem/systemConfig/role-list/index"),
         meta: {
           title: "角色列表",
           icon: "article-ranking"
@@ -57,7 +60,8 @@ export const privateRoutes = [
       {
         path: "/user/menuList",
         name: "menuList",
-        component: () => import("@/views/backOfficeSystem/systemConfig/menu-list/index"),
+        component: () =>
+          import("@/views/backOfficeSystem/systemConfig/menu-list/index"),
         meta: {
           title: "菜单管理",
           icon: "article-ranking"
@@ -67,7 +71,8 @@ export const privateRoutes = [
       {
         path: "/dict/detail",
         name: "dictDetail",
-        component: () => import("@/views/backOfficeSystem/systemConfig/dict/detail"),
+        component: () =>
+          import("@/views/backOfficeSystem/systemConfig/dict/detail"),
         meta: {
           title: "字典数据"
         }
@@ -75,7 +80,8 @@ export const privateRoutes = [
       {
         path: "/dict/index",
         name: "dictIndex",
-        component: () => import("@/views/backOfficeSystem/systemConfig/dict/index"),
+        component: () =>
+          import("@/views/backOfficeSystem/systemConfig/dict/index"),
         meta: {
           title: "字典列表",
           icon: "article-ranking"
@@ -85,7 +91,10 @@ export const privateRoutes = [
       {
         path: "/user/deptAllocationUser/:id",
         name: "deptAllocationUser",
-        component: () => import("@/views/backOfficeSystem/systemConfig/department-list/deptAllocationUser"),
+        component: () =>
+          import(
+            "@/views/backOfficeSystem/systemConfig/department-list/deptAllocationUser"
+          ),
         meta: {
           title: "管理用户"
         }
@@ -93,7 +102,10 @@ export const privateRoutes = [
       {
         path: "/user/allocationUser/:id",
         name: "allocationUser",
-        component: () => import("@/views/backOfficeSystem/systemConfig/role-list/allocationUser"),
+        component: () =>
+          import(
+            "@/views/backOfficeSystem/systemConfig/role-list/allocationUser"
+          ),
         meta: {
           title: "分配用户"
         }
@@ -102,7 +114,10 @@ export const privateRoutes = [
       {
         path: "/user/systemConfig",
         name: "systemConfig",
-        component: () => import("@/views/backOfficeSystem/systemConfig/system-config-list/index"),
+        component: () =>
+          import(
+            "@/views/backOfficeSystem/systemConfig/system-config-list/index"
+          ),
         meta: {
           title: "系统配置",
           icon: "article-ranking"
@@ -144,7 +159,10 @@ export const publicRoutes = [
           {
             path: "/IdentityManage",
             name: "IdentityManage",
-            component: () => import("@/views/backOfficeSystem/fourColorManage/IdentityManage/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/fourColorManage/IdentityManage/index"
+              ),
             meta: {
               title: "身份标签管理",
               icon: "article"
@@ -153,7 +171,10 @@ export const publicRoutes = [
           {
             path: "/BehaviorLabels",
             name: "BehaviorLabels",
-            component: () => import("@/views/backOfficeSystem/fourColorManage/BehaviorLabels/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/fourColorManage/BehaviorLabels/index"
+              ),
             meta: {
               title: "行为标签管理",
               icon: "article"
@@ -162,7 +183,10 @@ export const publicRoutes = [
           {
             path: "/tagManage",
             name: "tagManage",
-            component: () => import("@/views/backOfficeSystem/fourColorManage/tagManage/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/fourColorManage/tagManage/index"
+              ),
             meta: {
               title: "标签组合管理",
               icon: "article"
@@ -178,7 +202,10 @@ export const publicRoutes = [
           {
             path: "/warningControl",
             name: "warningControl",
-            component: () => import("@/views/backOfficeSystem/IntelligentControl/warningControl/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/IntelligentControl/warningControl/index"
+              ),
             meta: {
               title: "预警布控",
               icon: "article"
@@ -187,7 +214,10 @@ export const publicRoutes = [
           {
             path: "/myControl",
             name: "myControl",
-            component: () => import("@/views/backOfficeSystem/IntelligentControl/myControl/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/IntelligentControl/myControl/index"
+              ),
             meta: {
               title: "我的布控",
               icon: "article"
@@ -196,7 +226,10 @@ export const publicRoutes = [
           {
             path: "/ControlApproval",
             name: "ControlApproval",
-            component: () => import("@/views/backOfficeSystem/IntelligentControl/ControlApproval/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/IntelligentControl/ControlApproval/index"
+              ),
             meta: {
               title: "布控审批",
               icon: "article"
@@ -212,7 +245,10 @@ export const publicRoutes = [
           {
             path: "/DatAcquisition",
             name: "DatAcquisition",
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index"
+              ),
             meta: {
               title: "情报数据采集",
               icon: "article"
@@ -221,7 +257,10 @@ export const publicRoutes = [
           {
             path: "/MoralAnalysis",
             name: "MoralAnalysis",
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index"
+              ),
             meta: {
               title: "情报语义分析",
               icon: "article"
@@ -230,7 +269,10 @@ export const publicRoutes = [
           {
             path: "/IntelligenceManagement",
             name: "IntelligenceManagement",
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index"
+              ),
             meta: {
               title: "情报管理",
               icon: "article"
@@ -246,7 +288,9 @@ export const publicRoutes = [
                 path: "/InformationFlow",
                 name: "InformationFlow",
                 component: () =>
-                  import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InformationFlow/index"),
+                  import(
+                    "@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InformationFlow/index"
+                  ),
                 meta: {
                   title: "情报信息流转",
                   icon: "article"
@@ -256,7 +300,9 @@ export const publicRoutes = [
                 path: "/InstructionInformation",
                 name: "InstructionInformation",
                 component: () =>
-                  import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index"),
+                  import(
+                    "@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index"
+                  ),
                 meta: {
                   title: "指令信息",
                   icon: "article"
@@ -266,7 +312,9 @@ export const publicRoutes = [
                 path: "/StatisticalAnalysis",
                 name: "StatisticalAnalysis",
                 component: () =>
-                  import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/StatisticalAnalysis/index"),
+                  import(
+                    "@/views/backOfficeSystem/ResearchJudgment/InformationFlows/StatisticalAnalysis/index"
+                  ),
                 meta: {
                   title: "情报统计分析",
                   icon: "article"
@@ -277,7 +325,10 @@ export const publicRoutes = [
           {
             path: "/RecordsOperations",
             name: "RecordsOperations",
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/RecordsOperations/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ResearchJudgment/RecordsOperations/index"
+              ),
             meta: {
               title: "操作记录",
               icon: "article"
@@ -293,7 +344,10 @@ export const publicRoutes = [
           {
             path: "/RlStatisticalAnalysis",
             name: "RlStatisticalAnalysis",
-            component: () => import("@/views/backOfficeSystem/HumanIntelligence/RlStatisticalAnalysis/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/HumanIntelligence/RlStatisticalAnalysis/index"
+              ),
             meta: {
               title: "人力情报统计分析",
               icon: "article"
@@ -302,7 +356,10 @@ export const publicRoutes = [
           {
             path: "/CollectCrculate",
             name: "CollectCrculate",
-            component: () => import("@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"
+              ),
             meta: {
               title: "人力情报信息采集流转",
               icon: "article"
@@ -311,7 +368,10 @@ export const publicRoutes = [
           {
             path: "/TaskScheduling",
             name: "TaskScheduling",
-            component: () => import("@/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index"
+              ),
             meta: {
               title: "人力情报信息搜索任务调度",
               icon: "article"
@@ -320,7 +380,10 @@ export const publicRoutes = [
           {
             path: "/ConstructionManagement",
             name: "ConstructionManagement",
-            component: () => import("@/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index"
+              ),
             meta: {
               title: "社会信息人员建设管理",
               icon: "article"
@@ -336,7 +399,10 @@ export const publicRoutes = [
           {
             path: "/ZdryFjyp",
             name: "ZdryFjyp",
-            component: () => import("@/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index"
+              ),
             meta: {
               title: "重点人员发掘研判",
               icon: "article"
@@ -345,7 +411,10 @@ export const publicRoutes = [
           {
             path: "/PreliminaryExcavations",
             name: "PreliminaryExcavations",
-            component: () => import("@/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index"
+              ),
             meta: {
               title: "重点人员初步发掘",
               icon: "article"
@@ -354,7 +423,10 @@ export const publicRoutes = [
           {
             path: "/LandingAudit",
             name: "LandingAudit",
-            component: () => import("@/views/backOfficeSystem/ExcavationResearch/LandingAudit/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ExcavationResearch/LandingAudit/index"
+              ),
             meta: {
               title: "重点人员落地审核",
               icon: "article"
@@ -363,7 +435,10 @@ export const publicRoutes = [
           {
             path: "/WarningModel",
             name: "WarningModel",
-            component: () => import("@/views/backOfficeSystem/ExcavationResearch/WarningModel/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ExcavationResearch/WarningModel/index"
+              ),
             meta: {
               title: "重点人员预警模型",
               icon: "article"
@@ -383,21 +458,25 @@ export const publicRoutes = [
           {
             path: "/ResearchHome",
             name: "ResearchHome",
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/ResearchHome/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/ResearchJudgment/ResearchHome/index"
+              ),
             meta: {
               title: "研判首页",
               icon: "article"
-            },
+            }
           },
           {
             path: "/MeetingRoom",
             name: "MeetingRoom",
-            component: () => import("@/views/backOfficeSystem/MeetingRoom/index"),
+            component: () =>
+              import("@/views/backOfficeSystem/MeetingRoom/index"),
             meta: {
               title: "网上会商室",
               icon: "article"
             }
-          },
+          }
         ]
       },
       {
@@ -412,23 +491,63 @@ export const publicRoutes = [
           {
             path: "/mpvGroup",
             name: "mpvGroup",
-            component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index"
+              ),
             meta: {
               title: "重点群体管理",
               icon: "article"
+            }
           },
+          {
+            path: "/autompvGroup",
+            name: "autompvGroup",
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index"
+              ),
+            meta: {
+              title: "重点群体审批",
+              icon: "article"
+            }
           },
           {
             path: "/mpvPeo",
             name: "mpvPeo",
-            component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index"),
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index"
+              ),
             meta: {
               title: "重点人管理",
               icon: "article"
-            },
+            }
-          },
+          }
         ]
       },
+      {
+        path: "/BasicManagement",
+        name: "BasicManagement",
+        meta: {
+          title: "基础管理",
+          icon: "article"
+        },
+        children: [
+          {
+            path: "/surveillanceControl",
+            name: "surveillanceControl",
+            component: () =>
+              import(
+                "@/views/backOfficeSystem/BasicManagement/surveillanceControl/index"
+              ),
+            meta: {
+              title: "布控监视",
+              icon: "article"
+            }
+          }
+        ]
+      }
     ]
   }
 ];
@@ -441,7 +560,7 @@ const router = createRouter({
 export function resetRouter() {
   if (store.getters?.routeReady && store.getters?.userInfo?.permission?.menus) {
     const menus = store.getters.userInfo.permission.menus;
-    menus.forEach(menu => {
+    menus.forEach((menu) => {
       router.removeRoute(menu);
     });
   }

src/views/backOfficeSystem/BasicManagement/components/dialogList.vue

@@ -0,0 +1,209 @@
+<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.jhMc"
+            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="jhMc" align="center" label="集合名称" />
+          <el-table-column prop="jhSm" align="center" label="集合说明" />
+        </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: () => {}
+  },
+
+
+  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 };
+  getListData();
+};
+
+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);
+  let data = { type: props.LeaderType, userList: userList };
+  emits("chooseDateLeader", data);
+  closed();
+};
+/**
+ * pageSize 改变触发
+ */
+const handleSizeChange = (currentSize) => {
+  listQuery.value.size = currentSize;
+  getListData();
+};
+
+/**
+ * 页码改变触发
+ */
+const handleCurrentChange = (currentPage) => {
+  listQuery.value.current = currentPage;
+  getListData();
+};
+const getListData = () => {
+  const data = listQuery.value;
+  loading.value = true;
+  qcckGet(data, "/mosty-gsxt/tbGsxtBqgl/selectPage")
+    .then((res) => {
+      tableData.value = res?.records;
+      total.value = Number(res.total);
+      loading.value = false;
+      multipleUser();
+    })
+    .catch(() => {
+      loading.value = false;
+    });
+};
+
+//列表回显
+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;
+  getListData();
+};
+
+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;
+}
+</style>

src/views/backOfficeSystem/BasicManagement/surveillanceControl/components/editAddForm.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">设备来源范围{{ 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="form_cnt">
+      <FormMessage
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
+        <!-- 身份标签细类 -->
+        <template #sxtList>
+          <el-button @click="openDialog('01')">选择</el-button>
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.sxtList"
+              :tableColumn="tableDate.tableColumn"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.keyCount"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+            >
+              <!-- 操作 -->
+              <template #controls="{ row }">
+                <el-link
+                  type="danger"
+                  @click="delDictItem(row.id, '身份标签细类')"
+                  >删除</el-link
+                >
+              </template>
+            </MyTable>
+          </div>
+        </template>
+      </FormMessage>
+    </div>
+    <!-- 列表弹窗 -->
+    <DialogList
+      :Single="false"
+      :roleIds="roleIds"
+      v-if="chooseShow"
+      :dic="props.dic"
+      @chooseDate="chooseDate"
+      :titleValue="chooseTitle"
+      v-model="chooseShow"
+      :bqLx="chooseType"
+      bqDl="02"
+    ></DialogList>
+  </div>
+</template>
+
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import DialogList from "@/views/backOfficeSystem/BasicManagement/components/dialogList.vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import {
+  ref,
+  defineExpose,
+  defineProps,
+  reactive,
+  defineEmits,
+  getCurrentInstance
+} from "vue";
+const emit = defineEmits(["updateDate"]);
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  dic: Object
+});
+const roleIds = ref([]); //角色id
+const chooseType = ref("01"); //选择弹窗类型
+const chooseShow = ref(false); //选择弹窗
+const chooseTitle = ref(""); //选择弹窗
+const dialogForm = ref(false); //弹窗
+const formData = reactive([
+  { label: "集合名称", prop: "jhMc", type: "input" },
+  { label: "集合说明", prop: "jhSm", type: "input" },
+
+  { label: "摄像头列表", prop: "sxtList", type: "slot", width: "100%" }
+]);
+const rules = reactive({
+  jhMc: [{ required: true, message: "请输入集合名称", trigger: "blur" }],
+  jhSm: [{ required: true, message: "请输入集合说明", trigger: "blur" }]
+});
+
+const tableDate = reactive({
+  sxtList: [
+    {
+      csmc: "产商名称",
+      csmc: "厂商名称",
+      ipdz: "IP地址",
+      ipv6dz: "IPV6地址",
+      jd: "集合名称",
+      jkdbgbh: "监控点国标编号",
+      sbbh: "设备编号",
+      sbmc: "设备名称",
+      sjly: "数据来源",
+      sjlyid: "	数据来源ID",
+      sxtId: "摄像头ID",
+      wd: "地球纬度"
+    }
+  ], //表格数据
+  xwbqIdList: [], //表格数据
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  tableHeight: 225,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 90, //操作栏宽度
+  tableColumn: [
+    { label: "产商名称", prop: "csmc", showOverflowTooltip: true },
+    { label: "厂商名称", prop: "csmc" },
+    { label: "IP地址", prop: "ipdz" },
+    { label: "IPV6地址", prop: "ipv6dz" },
+    { label: "集合名称", prop: "jd" },
+    { label: "监控点国标编号", prop: "jkdbgbh" },
+    { label: "设备编号", prop: "sbbh" },
+    { label: "设备名称", prop: "sbmc" },
+    { label: "数据来源(1 海康 2 旷视)", prop: "sjly" },
+    { label: "数据来源ID", prop: "sjlyid" },
+    { label: "摄像头ID", prop: "sxtId" },
+    { label: "地球纬度", prop: "wd" }
+  ]
+});
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtGzyJh/selectVoById/" + id).then((res) => {
+    listQuery.value = res;
+    tableDate.sxtList = res.sxtList;
+    listQuery.value.sxtList = res.sxtList.map((item) => item.id);
+    tableDate.keyCount++;
+  });
+};
+
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    let url =
+      title.value == "新增"
+        ? "/mosty-gsxt/tbGsxtGzyJh/save"
+        : "/mosty-gsxt/tbGsxtGzyJh/update";
+    let params = { ...data };
+    params.sxtList = [
+      {
+        csmc: "产商名称",
+        csmc: "厂商名称",
+        ipdz: "IP地址",
+        ipv6dz: "IPV6地址",
+        jd: 29.6510453, //经度
+        jkdbgbh: "监控点国标编号",
+        sbbh: "设备编号",
+        sbmc: "设备名称",
+        sjly: "数据来源",
+        sjlyid: "	数据来源ID",
+        sxtId: "摄像头ID",
+        wd: 94.3602321 //维度
+      }
+    ];
+    loading.value = true;
+    qcckPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("updateDate");
+        loading.value = false;
+        close();
+      })
+      .catch(() => {
+        loading.value = false;
+      });
+  });
+};
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  chooseType.value = type;
+  chooseTitle.value = "选择摄像头列表";
+  roleIds.value = tableDate.sxtList.map((item) => item.id);
+};
+// 选择数据
+const chooseDate = (data) => {
+  if (chooseType.value == "01") {
+    tableDate.sxtList = data;
+    listQuery.value.sxtList = tableDate.sxtList.map((item) => item.id);
+  } else {
+    tableDate.xwbqIdList = data;
+    listQuery.value.xwbqIdList = tableDate.xwbqIdList.map((item) => item.id);
+  }
+};
+
+// 删除
+const delDictItem = (id, type) => {
+  tableDate.sxtList = tableDate.sxtList.filter((item) => item.id !== id);
+  listQuery.value.sxtList = tableDate.sxtList.map((item) => item.id);
+};
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  tableDate.sxtList = [];
+  dialogForm.value = false;
+  loading.value = false;
+};
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
+</style>

src/views/backOfficeSystem/BasicManagement/surveillanceControl/index.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <div class="titleBox">
+      <PageTitle title="布控监视管理">
+        <!-- <el-button>
+          <span style="vertical-align: middle">调级</span>
+        </el-button>
+        <el-button>
+          <span style="vertical-align: middle">导出</span>
+        </el-button>
+        <el-button>
+          <span style="vertical-align: middle">导入</span>
+        </el-button> -->
+        <el-button type="primary" @click="addEdit('add', '')">
+          <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
+          <span style="vertical-align: middle">新增</span>
+        </el-button>
+      </PageTitle>
+    </div>
+    <!-- 搜索 -->
+    <div ref="searchBox">
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      ></Search>
+    </div>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <MyTable
+        :tableData="pageData.tableData"
+        :tableColumn="pageData.tableColumn"
+        :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount"
+        :tableConfiger="pageData.tableConfiger"
+        :controlsWidth="pageData.controlsWidth"
+      >
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link type="primary" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link type="danger" @click="delDictItem(row.id)">删除</el-link>
+        </template>
+      </MyTable>
+      <Pages
+        @changeNo="changeNo"
+        @changeSize="changeSize"
+        :tableHeight="pageData.tableHeight"
+        :pageConfiger="{
+          ...pageData.pageConfiger,
+          total: pageData.total
+        }"
+      ></Pages>
+    </div>
+    <!-- 编辑详情 -->
+    <EditAddForm
+      v-if="show"
+      ref="detailDiloag"
+      :dic="{ D_GS_BQ_LX, D_GS_BQ_DJ, D_GS_SSYJ, D_GS_BQ_LB }"
+      @updateDate="getList"
+    />
+  </div>
+</template>
+
+<script setup>
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import EditAddForm from "./components/editAddForm.vue";
+import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+const { proxy } = getCurrentInstance();
+const { D_GS_BQ_DJ, D_GS_SSYJ, D_GS_BQ_LB, D_GS_BQ_LX } = proxy.$dict(
+  "D_GS_BQ_DJ",
+  "D_GS_SSYJ",
+  "D_GS_BQ_LB",
+  "D_GS_BQ_LX"
+); //获取字典数据
+const detailDiloag = ref();
+const show = ref(false);
+const searchBox = ref(); //搜索框
+const searchConfiger = ref([
+  {
+    label: "集合名称",
+    prop: "jhMc",
+    placeholder: "请输入集合名称",
+    showType: "input"
+  },
+  {
+    label: "集合说明",
+    prop: "jhSm",
+    placeholder: "请输入集合说明",
+    showType: "input"
+  },
+
+]);
+const queryFrom = ref({});
+const pageData = reactive({
+  tableData: [], //表格数据
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 160, //操作栏宽度
+  tableColumn: [
+    {
+      label: "集合名称",
+      prop: "jhMc"
+    },
+    {
+      label: "集合说明",
+      prop: "jhSm"
+    },
+
+  ]
+});
+onMounted(() => {
+  tabHeightFn();
+  getList();
+});
+
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = { ...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageNum = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  qcckGet(queryFrom.value, "/mosty-gsxt/tbGsxtGzyJh/selectPage")
+    .then((res) => {
+      pageData.tableData = res.records;
+      pageData.total = res.total;
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
+
+// 删除
+const delDictItem = (id) => {
+  proxy
+    .$confirm("确定要删除", "警告", { type: "warning" })
+    .then(() => {
+      qcckDelete({}, "/mosty-gsxt/tbGsxtBqzh/" + id).then(() => {
+        proxy.$message({ type: "success", message: "删除成功" });
+        getList();
+      });
+    })
+    .catch(() => {});
+};
+
+// 新增
+const addEdit = (type, row) => {
+  show.value = true;
+  nextTick(() => {
+    detailDiloag.value.init(type, row);
+  });
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight =
+    window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+</script>
+
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/components/detailForm.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">{{ title }}</span>
+      <div>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="cntinfo">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="场所信息" name="basic">
+          <el-form :model="listQuery" :label-width="230" label-position="left">
+            <div class="flex align-center">
+              <div style="width: calc(100% - 176px);">
+                <div class="form-row">
+                  <el-form-item label="统一社会信用代码">
+                    <el-input v-model="listQuery.tyshdm" placeholder="ktv"/>
+                  </el-form-item>
+                  <el-form-item label="单位名称（营业执照登记名称）">
+                    <el-input v-model="listQuery.djmc" placeholder="请输入"/>
+                  </el-form-item>
+                </div>
+                <div class="form-row">
+                  <el-form-item label="场所名称">
+                    <el-input v-model="listQuery.csmc" placeholder="请输入"/>
+                  </el-form-item>
+                  <el-form-item label="场所联系电话">
+                    <el-input v-model="listQuery.cslxdh" placeholder="请输入"/>
+                  </el-form-item>
+                </div>
+                <div class="form-row">
+                  <el-form-item label="经营状况">
+                    <el-input v-model="listQuery.csdm" placeholder="请输入"/>
+                  </el-form-item>
+                  <el-form-item label="场所面积">
+                    <el-input v-model="listQuery.csmj" placeholder="请输入"/>
+                  </el-form-item>
+                </div>
+                <div class="form-row">
+                  <el-form-item label="开业日期">
+                    <el-input v-model="listQuery.kyrq" placeholder="请输入"/>
+                  </el-form-item>
+                </div>
+              </div>
+              <img height="130" src="@/assets/images/person.png" alt="">
+            </div>
+
+            <el-form-item label="单位注册地址">
+              <el-input v-model="listQuery.dwzcdz" placeholder="请输入"/>
+            </el-form-item>
+
+            <el-form-item label="场所地址">
+              <el-input v-model="listQuery.csdz" placeholder="请输入"/>
+            </el-form-item>
+
+            <div class="flex align-center">
+              <div style="width: calc(100% - 176px);">
+                <div class="form-row">
+                  <el-form-item label="法定代表人">
+                    <el-input v-model="listQuery.fddbr" placeholder="请输入"/>
+                  </el-form-item>
+                  <el-form-item label="法定代表人证件号码">
+                    <el-input v-model="listQuery.fddbrzjhm" placeholder="请输入"/>
+                  </el-form-item>
+                </div>
+                <div class="form-row">
+                  <el-form-item label="法定代表人联系电话">
+                    <el-input v-model="listQuery.fddbrLxdh" placeholder="请输入"/>
+                  </el-form-item>
+                  <el-form-item label="法定代表人居住地址">
+                    <el-input v-model="listQuery.fddbrJzdz" placeholder="请输入"/>
+                  </el-form-item>
+                </div>
+                <div class="form-row">
+                  <el-form-item label="场所负责人">
+                    <el-input v-model="listQuery.csfzr" placeholder="请输入"/>
+                  </el-form-item>
+                  <el-form-item label="场所负责人身份证号">
+                    <el-input v-model="listQuery.csfzrSfzh" placeholder="请输入"/>
+                  </el-form-item>
+                </div>
+                <div class="form-row">
+                  <el-form-item label="场所负责人联系方式">
+                    <el-input v-model="listQuery.csfzrLxfs" placeholder="请输入"/>
+                  </el-form-item>
+                  <el-form-item label="场所负责人居住地址">
+                    <el-input v-model="listQuery.csfzrJzdz" placeholder="请输入"/>
+                  </el-form-item>
+                </div>
+              </div>
+              <div>
+                <img height="65" style="width: 100%;" src="@/assets/images/person.png" alt="">
+                <img height="65" style="width: 100%;" src="@/assets/images/person.png" alt="">
+              </div>
+            </div>
+
+            <div class="upload-group">
+              <el-form-item label="营业执照照片">
+                <img height="130" src="@/assets/images/person.png" alt="">
+                <img height="130" src="@/assets/images/person.png" alt="">
+                <img height="130" src="@/assets/images/person.png" alt="">
+              </el-form-item>
+            </div>
+
+            <div class="form-row">
+              <el-form-item label="机修场所备案编号">
+                <el-input v-model="listQuery.jxcsbabh" placeholder="请输入"/>
+              </el-form-item>
+              <el-form-item label="场所备案机构名称">
+                <el-input v-model="listQuery.ylcsbajgmc" placeholder="请输入"/>
+              </el-form-item>
+            </div>
+
+            <div class="form-row">
+              <el-form-item label="备案登记日期">
+                <el-input v-model="listQuery.badjrq" placeholder="请输入"/>
+              </el-form-item>
+              <el-form-item label="所属辖区">
+                <el-input v-model="listQuery.ssxq" placeholder="请输入"/>
+              </el-form-item>
+            </div>
+
+            <div class="form-row">
+              <el-form-item label="责任民警">
+                <el-input v-model="listQuery.zrmj" placeholder="请输入"/>
+              </el-form-item>
+              <el-form-item label="警号">
+                <el-input v-model="listQuery.jh" placeholder="请输入"/>
+              </el-form-item>
+            </div>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="从业人员" name="staff">
+          <!-- 从业人员表格 -->
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue';
+import { Plus } from '@element-plus/icons-vue';
+
+const dialogForm = ref(false);
+const activeName = ref('basic');
+const title = ref('开锁业场所管理详情');
+const listQuery = ref({});
+
+const areaOptions = ref([]); // 区域选项数据
+
+// 初始化数据
+const init = (type, row,) => {
+  dialogForm.value = true;
+  // 根据type和row初始化表单数据
+};
+
+
+const close = () => {
+  dialogForm.value = false;
+};
+
+defineExpose({init})
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 20px;
+
+  :deep(.el-form-item__label) {
+    background-color: #F7FAFB;
+    padding: 0px 8px;
+    color: #000;
+    font-weight: 500;
+    border: 1px solid #E3E7ED;
+  }
+
+  .head_box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20px;
+  }
+  .cntinfo{
+    height: calc(100% - 70px);
+    overflow: hidden;
+    overflow-y: auto;
+  }
+
+  .form-row {
+    display: flex;
+    
+    .el-form-item {
+      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;
+}
+</style>

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

@@ -0,0 +1,439 @@
+<template>
+  <div>
+    <div class="titleBox">
+      <PageTitle title="布控审批" />
+    </div>
+
+    <!-- 搜索 -->
+    <div ref="searchBox">
+      <!-- 顶部主导航 -->
+      <div class="main-nav">
+        <el-button
+          :class="['nav-btn', activeMainNav === 'todo' ? 'active' : '']"
+          @click="activeMainNav = 'todo'"
+        >
+          我的待办
+        </el-button>
+        <el-button
+          :class="['nav-btn', activeMainNav === 'done' ? 'active' : '']"
+          @click="activeMainNav = 'done'"
+        >
+          我的已办
+        </el-button>
+      </div>
+      <!-- 子导航 -->
+      <div class="sub-nav">
+        <el-tabs v-model="activeSubNav" @click="handleType">
+          <el-tab-pane label="我的发起" name="myInitiate"></el-tab-pane>
+          <el-tab-pane label="我的审核" name="myAudit"></el-tab-pane>
+          <el-tab-pane label="我的审批" name="myApprove"></el-tab-pane>
+          <el-tab-pane label="我的签收" name="mySign"></el-tab-pane>
+          <el-tab-pane label="我的处置" name="myHandle"></el-tab-pane>
+        </el-tabs>
+      </div>
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      >
+        <template #defaultSlot>
+          <div>
+            <el-input-number v-model="queryFrom.xqy"></el-input-number>
+            <span class="ml10 mr10" style="color: #000">至</span>
+            <el-input-number v-model="queryFrom.dqy"></el-input-number>
+          </div>
+        </template>
+      </Search>
+    </div>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <div ref="btns" class="btns flexcb">
+        <div class="">
+          <el-button>批量处理</el-button>
+          <el-button>导出</el-button>
+        </div>
+        <el-input
+          v-model="input2"
+          style="max-width: 300px"
+          placeholder="请输入关键字"
+        >
+          <template #append
+            ><el-button type="primary" icon="Search"></el-button
+          ></template>
+        </el-input>
+      </div>
+
+      <MyTable
+        :tableData="pageData.tableData"
+        :tableColumn="pageData.tableColumn"
+        :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount"
+        :tableConfiger="pageData.tableConfiger"
+        :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData"
+      >
+        <template #jbxx="{ row }">
+          <div>
+            <img src="" alt="" />
+            <ul>
+              <li>群体名称：{{ row.qtMc }}</li>
+              <!-- <li>所属辖区：</li> -->
+              <li class="rowClass">
+                风险等级：
+                <DictTag
+                  :tag="false"
+                  :value="row.qtFxdj"
+                  :options="D_GS_ZDQT_FXDJ"
+                />
+              </li>
+              <li>创建时间：{{ row.xtCjsj }}</li>
+            </ul>
+          </div>
+          <div class="flex">
+            <el-button type="primary" size="small"> 涉恐群体</el-button>
+            <el-button type="primary" size="small"> 涉稳群体</el-button>
+            <el-button type="primary" size="small"> 讨薪群体</el-button>
+          </div>
+        </template>
+        <template #bgxx="{ row }">
+          <div>背景资料：{{ row.qtBjzl }}</div>
+          <div>创建单位：{{ row.xtCjbmmc }}</div>
+        </template>
+        <template #gkxx="{ row }">
+          <!-- <div>群体标签：{{  }}</div> -->
+          <div>管辖单位：{{ row.gxSsdwmc }}</div>
+          <div>列控原因：{{ row.zdrLkyy }}</div>
+          <div>开始时间：{{ row.startTime }}</div>
+          <div>截至时间：{{ row.endTime }}</div>
+        </template>
+        <template #wkrs="{ row }">
+          <span style="color: #0072ff">{{ row.wkrs }}</span>
+        </template>
+        <template #qtZt="{ row }">
+          <DictTag :tag="false" :value="row.qtZt" :options="D_GS_ZDR_BK_ZT" />
+        </template>
+
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-button
+            size="small"
+            @click="autoEdit('auto', row)"
+            v-if="row.qtZt === '02' && activeSubNav === 'myAudit'"
+            >审核</el-button
+          >
+          <el-button
+            size="small"
+            @click="autoEdit('approval', row)"
+            v-if="row.qtZt === '04' && activeSubNav === 'myApprove'"
+            >审批</el-button
+          >
+          <el-button size="small" @click="autoEdit('detail', row)"
+            >详情</el-button
+          >
+          <!-- <el-button size="small">从业人员</el-button>
+          <el-button size="small">转区域</el-button> -->
+        </template>
+      </MyTable>
+      <Pages
+        @changeNo="changeNo"
+        @changeSize="changeSize"
+        :tableHeight="pageData.tableHeight + 42"
+        :pageConfiger="{
+          ...pageData.pageConfiger,
+          total: pageData.total
+        }"
+      ></Pages>
+    </div>
+    <!-- 详情 -->
+    <MpvGroupInfo ref="MpvGroupInfoRef" />
+  </div>
+</template>
+
+<script setup>
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import DetailForm from "./components/detailForm.vue";
+import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { setItem, getItem, removeAllItem } from "@/utils/storage";
+import { selectUserDeptPage } from "@/api/user-manage";
+import MpvGroupInfo from "../mpvGroup/index.vue";
+
+const { proxy } = getCurrentInstance();
+const {
+  D_GS_ZDQT_FXDJ,
+  D_GS_ZDR_RYJB,
+  D_GS_ZDQT_LB,
+  D_GS_ZDR_BK_ZT,
+  D_GS_BQ_LX,
+  D_GS_ZDQT_ZT
+} = proxy.$dict(
+  "D_GS_ZDQT_FXDJ",
+  "D_GS_ZDR_RYJB",
+  "D_GS_ZDQT_LB",
+  "D_GS_ZDR_BK_ZT",
+  "D_GS_BQ_LX",
+  "D_GS_ZDQT_ZT"
+); //获取字典数据
+const deptList = ref([]); //部门列表
+const detailDiloag = ref();
+const searchBox = ref(); //搜索框
+const btns = ref();
+const userId = getItem("USERID");
+const MpvGroupInfoRef = ref(null);
+
+// 主导航激活状态
+const activeMainNav = ref("todo");
+// 子导航激活状态
+const activeSubNav = ref("myAudit");
+const searchConfiger = ref([
+  {
+    label: "群体名称",
+    prop: "qtMc",
+    placeholder: "请输入群体名称",
+    showType: "input"
+  },
+  {
+    label: "群体风险等级",
+    prop: "qtFxdj",
+    placeholder: "请选择群体风险等级",
+    showType: "select",
+    options: D_GS_ZDQT_FXDJ
+  },
+  {
+    label: "重点人人员级别",
+    prop: "zdrRyjb",
+    placeholder: "请选择重点人人员级别",
+    showType: "select",
+    options: D_GS_ZDR_RYJB
+  },
+  {
+    label: "成员姓名",
+    prop: "cyXm	",
+    placeholder: "请输入成员姓名",
+    showType: "input"
+  },
+  {
+    label: "群体类别",
+    prop: "qtLb",
+    placeholder: "请选择群体类别",
+    showType: "select",
+    options: D_GS_ZDQT_LB
+  },
+  {
+    label: "成员身份证号",
+    prop: "cySfzh",
+    placeholder: "请输入成员身份证号",
+    showType: "input"
+  },
+  {
+    label: "群体大类",
+    prop: "qtDl",
+    placeholder: "请输入群体大类",
+    showType: "input"
+  },
+  {
+    label: "群体细类",
+    prop: "qtXl",
+    placeholder: "请输入群体细类",
+    showType: "input"
+  },
+  {
+    label: "管辖单位名称",
+    prop: "gxSsdwmc",
+    placeholder: "请输入管辖单位名称",
+    showType: "input"
+  },
+  {
+    label: "开始时间",
+    prop: "startTime",
+    placeholder: "请输入开始时间",
+    showType: "date"
+  },
+  {
+    label: "截至时间",
+    prop: "endTime",
+    placeholder: "请输入截至时间",
+    showType: "date"
+  },
+  {
+    label: "布控状态",
+    prop: "zdrBkZt",
+    placeholder: "请输入布控装态",
+    showType: "select",
+    options: D_GS_ZDR_BK_ZT
+  },
+  {
+    label: "布控类型",
+    prop: "bkzt",
+    placeholder: "请输入布控类型",
+    showType: "select",
+    options: D_GS_BQ_LX
+  }
+]);
+const queryFrom = ref({});
+const userInfo = ref({});
+const pageData = reactive({
+  tableData: [
+    {
+      name: "1",
+      ssxq: "1",
+      cyxm: "1",
+      qqksrxm: "1",
+      qqksrsfzh: "1",
+      jzrxm: "1"
+    }
+  ], //表格数据
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: "240", //操作栏宽度
+
+  tableColumn: [
+    { label: "群体基本信息", prop: "jbxx", showSolt: true },
+    { label: "背景信息", prop: "bgxx", showSolt: true },
+    { label: "管控信息", prop: "gkxx", showSolt: true },
+    { label: "稳控人数", prop: "wkrs", showSolt: true, width: 80 },
+    { label: "状态", prop: "qtZt", showSolt: true }
+  ]
+});
+onMounted(() => {
+  tabHeightFn();
+  getUserInfo();
+  getdepartmentList();
+});
+
+// 详情
+const info = (type, row) => {
+  MpvGroupInfoRef.value.init(type, row);
+};
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
+const getUserInfo = async () => {
+  await qcckGet({}, `/mosty-base/sysUser/getUserInfo/${userId}`).then((res) => {
+    userInfo.value = res;
+    setItem("userInfo", res);
+    getList();
+  });
+};
+
+//选择类型
+const handleType = (val) => {
+  pageData.keyCount++;
+  pageData.pageConfiger.pageCurrent = 1;
+
+  getList();
+};
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = { ...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageNum = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+// 获取列表
+const getList = (val) => {
+  pageData.tableConfiger.loading = true;
+  let data = {
+    ...pageData.pageConfiger,
+    ...queryFrom.value,
+    [activeSubNav.value === "myAudit" ? "bkshrSfzh" : "bksprSfzh"]:
+      userInfo.value.idEntityCard
+  };
+  let url = "/mosty-gsxt/tbGsxtZdqt/selectPage";
+  qcckGet(data, url)
+    .then((res) => {
+      pageData.tableData = res.records || [];
+      pageData.total = res.total;
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
+
+// 详情
+const autoEdit = (type, row) => {
+  MpvGroupInfoRef.value.infoList(type, row);
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  console.log("btns.value.offsetHeight", btns.value.offsetHeight);
+
+  pageData.tableHeight =
+    window.innerHeight -
+    searchBox.value.offsetHeight -
+    btns.value.offsetHeight -
+    30 -
+    250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+</script>
+
+<style lang="scss" scoped>
+.main-nav {
+  padding: 16px;
+  background-color: #fff;
+}
+
+.nav-btn {
+  margin-right: 10px;
+  border: none;
+  background: none;
+  &.active {
+    background-color: #409eff;
+    color: #fff;
+  }
+}
+
+.sub-nav {
+  background-color: #fff;
+  padding: 0 16px;
+}
+
+:deep(.el-tabs__header) {
+  margin-bottom: 0;
+}
+
+:deep(.el-tabs__nav-wrap::after) {
+  height: 1px;
+}
+
+:deep(.el-table--fit) {
+  top: 52px !important;
+}
+.btns {
+  height: 52px;
+  padding: 10px;
+  box-sizing: border-box;
+}
+</style>

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

@@ -0,0 +1,408 @@
+<template>
+  <el-dialog
+    :title="titleValue"
+    width="1500px"
+    :model-value="modelValue"
+    append-to-body
+    @close="closed"
+  >
+    <div class="table_class">
+      <div style="width: 48%">
+        <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+          <el-tab-pane
+            v-for="tab in tabs"
+            :key="tab.dm"
+            :label="tab.label"
+            :name="tab.dm"
+          >
+            <!-- 添加 v-if 条件 -->
+            <template v-if="activeTab !== '03'">
+              <el-button
+                v-for="(it, idx) in props.dic.D_GS_BQ_LB"
+                :key="idx"
+                :type="type == it.zdmc ? 'success' : ''"
+                @click="chooseListType(it.zdmc)"
+              >
+                <span style="vertical-align: middle">{{ it.zdmc }}</span>
+              </el-button>
+            </template>
+            <el-table
+              v-loading="loading"
+              ref="multipleUserRef"
+              @selection-change="handleSelectionChange"
+              :data="tableData"
+              border
+              :row-key="keyid"
+              style="width: 100%"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                :reserve-selection="true"
+              />
+              <el-table-column prop="bqDm" align="center" label="标签代码" />
+              <el-table-column prop="bqLb" align="center" label="标签类别">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqLb"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_LB"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="bqLx" align="center" label="标签类型">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqLx"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_LX"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="bqMc" align="center" label="标签名称" />
+              <el-table-column prop="bqZl" align="center" label="标签种类">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqZl"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_ZL"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="fenye">
+              <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>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+
+      <div style="width: 48%">
+        <div class="selected-tabBox">
+          <el-table
+            :data="selectedData"
+            border
+            :row-key="keyid"
+            style="width: 100%"
+          >
+            <el-table-column prop="bqDm" align="center" label="标签代码" />
+            <el-table-column prop="bqLb" align="center" label="标签类别">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqLb"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LB"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="bqLx" align="center" label="标签类型">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqLx"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LX"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="bqMc" align="center" label="标签名称" />
+            <el-table-column prop="bqZl" align="center" label="标签种类">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqZl"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_ZL"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作">
+              <template #default="{ row }">
+                <el-button
+                  type="danger"
+                  @click="handleRemoveFromSelectedData(row)"
+                  >移除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="fenye">
+          <el-pagination
+            class="pagination"
+            @size-change="handleSizeChangeRight"
+            @current-change="handleCurrentChangeRight"
+            :current-page="listQuery.current"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="listQuery.sizeRight"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="selectedData.length"
+          ></el-pagination>
+        </div>
+      </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, nextTick } 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: false
+  },
+  roleIds: {
+    type: Array,
+    default: []
+  }
+});
+
+const tabs = ref([]);
+const activeTab = ref("");
+const total = ref(0);
+const listQuery = ref({
+  current: 1,
+  size: 20,
+  bqZl: activeTab.value
+});
+const loading = ref(false);
+const tableData = ref([]);
+const selectedData = ref([]);
+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();
+});
+// 选择列表的大类和细类
+const chooseListType = (val) => {
+  type.value = val;
+  listQuery.current = 1;
+  getDataList();
+};
+const closed = () => {
+  emits("update:modelValue", false);
+};
+
+const reset = () => {
+  listQuery.value = { current: 1, size: 20, bqZl: activeTab.value };
+  getDataList();
+};
+
+const keyid = (row) => {
+  return row.id;
+};
+
+// 为用户分配角色
+const onComfirm = () => {
+  emits("chooseDate", selectedData.value);
+  let data = { type: props.LeaderType, userList: selectedData.value };
+  emits("chooseDateLeader", data);
+  closed();
+};
+//数据回显
+const setValues = (list) => {
+
+  selectedData.value = list.map((item) => {
+    // 统一id字段处理逻辑
+    if (item.bqId) {
+      return { ...item, id: item.bqId };
+    }
+
+    return item;
+  });
+
+  nextTick(() => {
+    multipleUser();
+  });
+};
+/**
+ * pageSize 改变触发
+ */
+const handleSizeChange = (currentSize) => {
+  listQuery.value.size = currentSize;
+  getDataList();
+};
+
+/**
+ * 页码改变触发
+ */
+const handleCurrentChange = (currentPage) => {
+  listQuery.value.current = currentPage;
+  getDataList();
+};
+
+// 查询标签组合列表
+const getDataList = () => {
+  listQuery.value.bqZl = activeTab.value;
+  loading.value = true;
+  //根据顶部标签切换不同的接口
+  let url =
+    activeTab.value == "01"
+      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
+      : activeTab.value == "02"
+      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
+      : "/mosty-gsxt/tbGsxtBqzh/selectPage";
+  let params = {};
+  console.log(activeTab.value, "activeTab.value");
+  if (activeTab.value === "01") {
+    params.bqLx = "01";
+  } else if (activeTab.value === "02") {
+    params.bqLx = "02";
+  } // activeTab.value 等于 "03" 时不传递参数
+  if (type.value === "标签大类") {
+    params.bqLb = "01";
+  } else if (type.value === "标签细类") {
+    params.bqLb = "02";
+  }
+  qcckGet(params, url).then((res) => {
+    // 添加 bqZl 字段
+    tableData.value = res?.records?.map((item) => ({
+      bqDm: item.bqDm,
+      bqId: item.id ? item.id : item.bqId ? item.bqId : row.bqDlId,
+      bqLb: item.bqLb,
+      bqLx: item.bqLx,
+      bqMc: item.bqMc,
+      bqZl: activeTab.value
+    }));
+    total.value = Number(res.total);
+    loading.value = false;
+    //确保在这里调用 multipleUser
+    multipleUser();
+  });
+};
+
+// 修改 multipleUser 函数
+function multipleUser() {
+  nextTick(() => {
+    if (multipleUserRef.value && tableData.value.length > 0) {
+      tableData.value.forEach((item) => {
+        if (selectedData.value.some((selected) => selected.bqId == item.bqId)) {
+          // 因为 multipleUserRef 是数组，需要确定正确的索引
+          // 如果你只有一个表格，可以使用 [0]
+          multipleUserRef.value[0]?.toggleRowSelection(item, true);
+        }
+      });
+    }
+  });
+}
+
+const handleFilter = () => {
+  listQuery.value.current = 1;
+
+  getDataList();
+};
+
+const handleTabClick = () => {
+  reset();
+};
+
+const handleAddToSelectedData = (row) => {
+  console.log(row, selectedData.value, "handleAddToSelectedData row");
+  if (selectedData.value.some((item) => item.bqId === row.bqId)) {
+    return;
+  }
+  if (props.Single && selectedData.value.length > 0) {
+    selectedData.value = [];
+  }
+  selectedData.value.push({
+    bqDm: row.bqDm,
+    bqId: row.id ? row.id : row.bqId ? row.bqId : row.bqDlId,
+    bqLb: row.bqLb,
+    bqLx: row.bqLx,
+    bqMc: row.bqMc,
+    bqZl: activeTab.value
+  });
+};
+
+const handleRemoveFromSelectedData = (row) => {
+  const index = selectedData.value.findIndex((item) => item.bqId === row.bqId);
+  if (index !== -1) {
+    selectedData.value.splice(index, 1);
+  }
+  // 取消左侧表格中对应行的选中状态
+  multipleUserRef.value.toggleRowSelection(row, false);
+};
+
+const multipleSelectionUser = ref([]);
+const handleSelectionChange = (val) => {
+  multipleSelectionUser.value = val;
+  multipleSelectionUser.value.forEach((row) => {
+    handleAddToSelectedData(row);
+  });
+};
+// 必须暴露方法父组件才能调用
+defineExpose({
+  setValues
+});
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+@import "@/assets/css/element-plus.scss";
+
+.selected-tabBox {
+  margin-top: 56px;
+}
+</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;
+  /* 其他样式 */
+}
+.table_class {
+  display: flex;
+  justify-content: space-between;
+}
+</style>

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

@@ -3,60 +3,352 @@
     <div class="head_box">
       <span class="title">重点群体管理 </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          >保存</el-button
+        >
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="form_cnt">
-      <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick">
+      <el-tabs
+        v-model="activeName"
+        type="card"
+        class="demo-tabs"
+        @tab-click="handleClick"
+      >
         <el-tab-pane :label="title + '群体'" name="first"></el-tab-pane>
         <el-tab-pane label="轨迹信息" name="second"></el-tab-pane>
         <el-tab-pane label="标签信息" name="third"></el-tab-pane>
       </el-tabs>
-      <QtDetail ref="elform" v-if="activeName == 'first'"></QtDetail>
+      <FormMessage
-      <!-- <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage> -->
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
+        <template #qtXx>
+          <el-divider content-position="left">群体信息</el-divider>
+        </template>
+        <template #qtGlXx>
+          <el-divider content-position="left">群体管理信息</el-divider>
+        </template>
+        <template #spXx>
+          <el-divider content-position="left">审批信息</el-divider>
+          <ApprovalInfo ref="approvalInfoRef" />
+        </template>
+        <template #xzRy>
+          <div class="btns">
+            <el-button type="primary" @click="handleAddEdit('add', '')"
+              >新增</el-button
+            >
+            <el-button type="primary" @click="selectionAdd()"
+              >选择重点人员</el-button
+            >
           </div>
+          <MyTable
+            :tableData="pageData.tableData"
+            :tableColumn="pageData.tableColumn"
+            :key="pageData.keyCount"
+            :tableConfiger="pageData.tableConfiger"
+            :controlsWidth="pageData.controlsWidth"
+            @chooseData="chooseData"
+          >
+            <template #ryxx="{ row }">
+              <div>
+                <img src="" alt="" />
+                <ul>
+                  <li>姓名：{{ row.rySfzh }}</li>
+                  <li class="rowClass">
+                    性别：
+                    <DictTag
+                      :tag="false"
+                      :value="row.ryXb"
+                      :options="D_BZ_XB"
+                    />
+                  </li>
+                  <li class="rowClass">
+                    籍贯：
+                    <DictTag
+                      :tag="false"
+                      :value="row.ryJg"
+                      :options="D_BZ_XZQHDM"
+                    />
+                  </li>
+                  <li>身份证：{{ row.rySfzh }}</li>
+                  <li>出生日期：{{ row.ryCsrq }}</li>
+                  <li class="rowClass">
+                    民族：
+                    <DictTag
+                      :tag="false"
+                      :value="row.ryMz"
+                      :options="D_BZ_MZ"
+                    />
+                  </li>
+                </ul>
+              </div>
+              <div class="flex">
+                <el-button type="primary" size="small"> 涉恐人员</el-button>
+                <el-button type="primary" size="small"> 涉稳人员</el-button>
+                <el-button type="primary" size="small"> 在逃人员</el-button>
+              </div>
+            </template>
+            <template #jzxx="{ row }">
+              <div class="rowClass">
+                户籍地区划：
+                <DictTag
+                  :tag="false"
+                  :value="row.hjdQh"
+                  :options="D_BZ_XZQHDM"
+                />
+              </div>
+              <div>户籍派出所：{{ row.hjdPcsmc }}</div>
+              <div>户籍地详址：{{ row.hjdXz }}</div>
+            </template>
+            <template #gxdw="{ row }">
+              <div>管辖单位：{{ row.gxSsbmmc }}</div>
+              <div class="rowClass">
+                人员级别：
+                <DictTag
+                  :tag="false"
+                  :value="row.zdrRyjb"
+                  :options="D_GS_ZDR_RYJB"
+                />
+              </div>
+              <div>管控原因：{{ zdrLkyy }}</div>
+              <div class="rowClass">
+                管控状态：
+                <DictTag
+                  :tag="false"
+                  :value="row.zdrBkZt"
+                  :options="D_GS_ZDR_BK_ZT"
+                />
+              </div>
+            </template>
+            <template #zdrCzzt="{ row }">
+              <DictTag
+                :tag="false"
+                :value="row.zdrCzzt"
+                :options="D_GS_ZDR_CZZT"
+              />
+            </template>
+            <template #xtSjzt="{ row }">
+              <div>
+                {{
+                  row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存"
+                }}
+              </div>
+            </template>
+            <template #controls="{ row, index }">
+              <el-button
+                size="small"
+                type="primary"
+                @click="handleAddEdit('edit', row)"
+                link
+                >编辑</el-button
+              >
+              <el-button
+                size="small"
+                type="danger"
+                @click="deleteData(index)"
+                link
+                >删除</el-button
+              >
+            </template>
+          </MyTable>
+        </template>
+        <!-- 两群采集录入-->
+        <template #lqxxList>
+          <el-button @click="openDialog('01')">新增</el-button>
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.lqxxList"
+              :tableColumn="tableDate.tableLqColumn"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.keyCount"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+            >
+              <!-- 操作 -->
+              <template #controls="{ row, index }">
+                <el-link type="danger" @click="delDictItem(index)"
+                  >删除</el-link
+                >
+              </template>
+            </MyTable>
+          </div>
+        </template>
+      </FormMessage>
+    </div>
+    <!-- 列表弹窗 -->
+    <DialogList
+      :Single="false"
+      :roleIds="roleIds"
+      v-if="chooseShow"
+      @chooseDate="chooseDate"
+      :titleValue="chooseTitle"
+      v-model="chooseShow"
+      :bqLx="chooseType"
+      bqDl="02"
+    ></DialogList>
+    <addFormPeo
+      ref="addFormDiloag"
+      @chooseDate="addFormPeoDate"
+      @handleEditDate="handleEditDate"
+    />
+
+    <selectionList
+      :Single="false"
+      :roleIds="selectroleId"
+      v-if="selectionValue"
+      @chooseDate="chooseSelectDate"
+      :titleValue="chooseTitle"
+      v-model="selectionValue"
+    >
+    </selectionList>
   </div>
 </template>
 
 <script setup>
-import QtDetail from './qtDetail.vue'
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import DialogList from "./dialogList.vue";
+import selectionList from "./selectionList.vue";
+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 { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
   dic: Object
 });
 const { proxy } = getCurrentInstance();
+const {
+  D_BZ_SF,
+  D_GS_ZDQT_FXDJ,
+  D_GS_ZDQT_LB,
+  D_BZ_XB,
+  D_GS_ZDR_RYJB,
+  D_BZ_MZ,
+  D_BZ_XZQHDM,
+  D_GS_ZDR_BK_ZT,
+  D_GS_ZDR_CZZT
+} = proxy.$dict(
+  "D_BZ_SF",
+  "D_GS_ZDQT_FXDJ",
+  "D_GS_ZDQT_LB",
+  "D_BZ_XB",
+  "D_GS_ZDR_RYJB",
+  "D_BZ_MZ",
+  "D_BZ_XZQHDM",
+  "D_GS_ZDR_BK_ZT",
+  "D_GS_ZDR_CZZT"
+); //获取字典数据
+const dialogTitle = ref("新增信息"); //弹窗标题
+
+const roleIds = ref([]); //选择角色
+const selectroleId = ref([]); //选择角色
+const approvalInfoRef = ref(null);
+
 const dialogForm = ref(false); //弹窗
+const formRef = ref();
 const activeName = ref("first");
 const formData = ref([
-  { label: "线索标题", prop: "xsbt", type: "input", },
+  { label: "", prop: "qtXx", type: "slot", width: "100%" },
-  { label: "线索编号", prop: "xsbh",  type: "input" },
+  { label: "群体名称", prop: "qtMc", type: "input" },
-  { label: "线索类型", prop: "xslx",  type: "select", options: []  },
+  { label: "群体别名", prop: "qtBm", type: "input" },
-  { label: "线索来源", prop: "xsly",  type: "input" },
+  { label: "群体简称", prop: "qtJc", type: "input" },
-  { label: "开始时间", prop: "kssj",  type: "datetime"},
+  { label: "群体类别", prop: "qtLb", type: "select", options: D_GS_ZDQT_LB },
-  { label: "结束时间", prop: "jssj",  type: "datetime"},
+  { label: "成立时间", prop: "qtClsj", type: "datetime" },
-  { label: "指向地点", prop: "zxdd",  type: "input" },
+  {
-  { label: "群体名称", prop: "qtmc",  type: "input"  },
+    label: "风险等级",
-  { label: "群体类型", prop: "qtlx",  type: "input"  },
+    prop: "qtFxdj",
-  { label: "线索细类", prop: "xslx",  type: "input"  },
+    type: "select",
-  { label: "风险等级", prop: "fxdj",  type: "input"  },
+    options: D_GS_ZDQT_FXDJ
-  { label: "是否初报", prop: "qtmc",  type: "input"  },
+  },
-  { label: "线索内容", prop: "nr",  type: "textarea",width: '100%' },
+  { label: "背景资料", prop: "qtBjzl", type: "input" },
-  { label: "报送编号", prop: "bsbh",  type: "input",},
+  { label: "两群采集录入", prop: "lqxxList", type: "slot", width: "100%" },
-  { label: "上报单位", prop: "sbdw",  type: "input",},
+  { label: "", prop: "qtGlXx", type: "slot", width: "100%" },
-  { label: "抄送单位", prop: "csdw",  type: "input",},
+  { label: "管辖单位", prop: "gxSsdwmc", type: "input" },
-  { label: "承办人", prop: "cbr",  type: "input",},
+  { label: "联系人", prop: "gkMjXm", type: "input" },
-  { label: "审核人", prop: "shr",  type: "input",},
+  { label: "联系方式", prop: "gkMjLxfs", type: "input" },
-  { label: "签发人", prop: "qfr",  type: "input",},
+  { label: "", prop: "xzRy", type: "slot", width: "100%" },
+  { label: "", prop: "spXx", type: "slot", width: "100%" }
 ]);
+//人员信息
+const pageData = reactive({
+  tableData: [], //表格数据
+  rykeyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false,
+    size: "small",
+    border: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 220, //操作栏宽度
+  tableColumn: [
+    { label: "重点人员信息", prop: "ryxx", showSolt: true },
+    { label: "户籍居住信息", prop: "jzxx", showSolt: true },
+    { label: "管辖单位", prop: "gxdw", showSolt: true },
+    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
+    { label: "状态", prop: "xtSjzt", showSolt: true }
+  ]
+});
+
+const addFormDiloag = ref();
+//两群信息表格，重点人标签表格
+const tableDate = reactive({
+  lqxxList: [], //两群信息表格数据
+  tableConfiger: {
+    rowHieght: 30,
+    showSelectType: "null",
+    loading: false,
+    haveControls: false,
+    showIndex: false
+  },
+  tableHeight: 200,
+  tableLqColumn: [
+    { label: "微信群", prop: "wxqId" },
+    {
+      label: "QQ群",
+      prop: "qqqId"
+    },
+    { label: "群主昵称", prop: "qzNc" },
+    { label: "群主姓名", prop: "qzXm" },
+    { label: "联系人电话", prop: "qzLxdh" },
+    { label: "群重要内容", prop: "qZynr" },
+    { label: "操作", prop: "controls", showSolt: true }
+  ]
+});
+const chooseShow = ref(false); //选择弹窗
+
+const chooseType = ref(""); //选择类型
+const chooseTitle = ref(""); //选择弹窗标题
+const dialogList = ref(null); //选择弹窗实例
+const currentEditIndex = ref(null);
 const listQuery = ref({
   sfbqdj: []
 }); //表单
 const loading = ref(false);
+const selectionValue = ref(false);
 const elform = ref();
 const title = ref("");
 const rules = reactive({
@@ -65,28 +357,150 @@ const rules = reactive({
 const editpeo = ref();
 onMounted(() => {});
 // 初始化数据
-const init = (type, row,) => {
+const init = async (type, row) => {
   dialogForm.value = true;
-  title.value = type == 'add' ? "新增" : "编辑";
+  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); // 回显审批信息
+  } else {
+    // 如果是新增模式，清空表单（可选）
+    addFormDiloag.value?.resetForm?.();
+    approvalInfoRef.value?.resetForm?.();
+  }
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtZdqt/selectVoById/" + id).then((res) => {
-  //   listQuery.value = res;
+    listQuery.value = res;
-  // });
+    pageData.tableData = res.zdryList;
+    tableDate.lqxxList = res.lqxxList;
+  });
+};
+const handleAddEdit = (type, row) => {
+  addFormDiloag.value.init(type, row);
+  dialogTitle.value = "新增信息";
+};
+const selectionAdd = () => {
+  selectionValue.value = true;
+};
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  chooseType.value = type;
+  chooseTitle.value = "请录入两群信息";
+};
+// 选择数据
+const chooseDate = (data) => {
+  tableDate.lqxxList.push(data);
+  chooseShow.value = false;
 };
 
+//重点人员新增
+const addFormPeoDate = (data) => {
+  console.log(data, "选择的数据");
+  pageData.tableData.push(data);
+  addFormDiloag.value.close();
+};
+
+//编辑数据
+const handleEditDate = (editedData) => {
+  const index = pageData.tableData.findIndex(
+    (item) => item.rySfzh === editedData.rySfzh // 用身份证号匹配
+  );
+  console.log(index, "编辑索引");
+  if (index !== -1) {
+    pageData.tableData[index] = { ...editedData };
+  }
+  addFormDiloag.value.close();
+};
+// 选择数据
+const chooseSelectDate = (data) => {
+  pageData.tableData.push(...data);
+  selectionValue.value = false;
+};
+
+//删除两群信息
+const delDictItem = (index) => {
+  tableDate.lqxxList.splice(index, 1);
+};
+
+const submitForm = () => {
+  // 正确调用子组件的submit方法
+  formRef.value.submit(
+    // 成功回调
+    (validData) => {
+      // 处理编辑情况
+      if (dialogTitle.value === "编辑信息") {
+        // 确保 currentEditIndex 有效
+        if (
+          currentEditIndex.value >= 0 &&
+          currentEditIndex.value < pageData.tableData.length
+        ) {
+          pageData.tableData[currentEditIndex.value] = {
+            ...pageData.tableData[currentEditIndex.value],
+            gkMjXm: validData.gkMjXm,
+            ryXb: validData.ryXb,
+            rySfzh: validData.rySfzh,
+            hjdXz: validData.hjdXz,
+            xzdXz: validData.xzdXz,
+            gkMjLxfs: validData.gkMjLxfs,
+            clCph: validData.clCph,
+            clCjh: validData.clCjh,
+            qtTxzh: validData.qtTxzh,
+            bkLx: validData.bkLx,
+            bkLx: validData.bkLx,
+            fjZp: validData.fjZp
+          };
+        } else {
+          console.error("无效的编辑索引:", currentEditIndex.value);
+        }
+      }
+      // 处理新增情况
+      else {
+        pageData.tableData.push(validData);
+      }
+      //赋值子组件数据传递给父组件
+      listQuery.value.bkdxList = pageData.tableData;
+      // 关闭弹窗并重置表单
+      addFormDiloag.value = false;
+    },
+    // 错误回调（可选）
+    (errors) => {
+      console.error("表单验证失败:", errors);
+      ElMessage.error("请检查表单填写是否正确");
+    }
+  );
+};
+// 根据索引删除数据
+const deleteData = (index) => {
+  pageData.tableData.splice(index, 1);
+};
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
-    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    const { formData } = approvalInfoRef.value?.getFormData?.();
-    // let params = { ...data }
+
-    // qcckPost(params, url).then((res) => {
+    const params = {
-    //   proxy.$message({ type: "success", message: title.value + "成功" });
+      ...(formData || {}), // 如果 formData 是 null/undefined，默认空对象
-    //   emit("updateDate");
+      ...(data || {}), // 如果 data 是 null/undefined，默认空对象
-    //   close();
+      zdryList: pageData.tableData,
-    // }).catch(() => {});
+      lqxxList: tableDate.lqxxList
+    };
+    let url =
+      title.value == "新增"
+        ? "/mosty-gsxt/tbGsxtZdqt/save"
+        : "/mosty-gsxt/tbGsxtZdqt/update";
+    qcckPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("updateDate");
+        close();
+      })
+      .catch(() => {});
   });
 };
 
@@ -106,4 +520,14 @@ defineExpose({ init });
   color: #0072ff;
   background: rgba(0, 114, 255, 0.3);
 }
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
+.btns {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+}
 </style>

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

@@ -0,0 +1,438 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">{{ 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="form_cnt">
+      <FormMessage
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
+        <!-- 人员标签模型-->
+        <template #bqList>
+          <el-button @click="openDialog('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 #gxSsbmdm>
+          <el-select
+            v-model="listQuery.gxSsbmdm"
+            placeholder="请选择管辖单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 户籍派出所代码 -->
+        <template #hjdPcsdm>
+          <el-select
+            v-model="listQuery.hjdPcsdm"
+            placeholder="请选择户籍派出所代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 诉求单位代码 -->
+        <template #sqSsbmdm>
+          <el-select
+            v-model="listQuery.sqSsbmdm"
+            placeholder="请选择户籍派出所代码"
+            style="width: 240px"
+          >
+            <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"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 责任单位代码 -->
+        <template #zrSsbmdm>
+          <el-select
+            v-model="listQuery.zrSsbmdm"
+            placeholder="请选择责任单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+      </FormMessage>
+      <!-- 列表弹窗 -->
+      <TagSelectorDialog
+        v-model="chooseShow"
+        ref="tagDialog"
+        @chooseDate="handleTagSelect"
+        :dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }"
+      />
+    </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 TagSelectorDialog from "./TagSelectorDialogPeo.vue";
+import * as rule from "@/utils/rules.js";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
+import { selectUserDeptPage } from "@/api/user-manage";
+
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+
+const {
+  D_GS_BK_SSJZ,
+  D_GS_ZDR_RYJB,
+  D_GS_SSYJ,
+  D_GS_BQ_DJ,
+  D_BZ_XZQHDM,
+  D_BZ_MZ,
+  D_BZ_XB,
+  D_GS_ZDR_CZZT,
+  D_GS_BQ_ZL,
+  D_GS_BQ_LB,
+  D_GS_BQ_LX,
+  D_GS_ZDR_YJDJ
+} = proxy.$dict(
+  "D_GS_BK_SSJZ",
+  "D_GS_ZDR_RYJB",
+  "D_GS_SSYJ",
+  "D_GS_BQ_DJ",
+  "D_BZ_XZQHDM",
+  "D_BZ_MZ",
+  "D_BZ_XB",
+  "D_GS_ZDR_CZZT",
+  "D_GS_BQ_ZL",
+  "D_GS_BQ_LB",
+  "D_GS_BQ_LX",
+  "D_GS_ZDR_YJDJ"
+); //获取字典数据
+const emits = defineEmits([
+  "update:modelValue",
+  "chooseDate",
+  "handleEditDate"
+]);
+
+const tagDialog = ref();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { label: "姓名", prop: "ryXm", type: "input" },
+  { label: "身份证号", prop: "rySfzh", type: "input" },
+  { label: "户籍地派出所名称", prop: "hjdPcsmc", type: "input" },
+  {
+    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: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ },
+
+  {
+    label: "涉及警种",
+    prop: "zdrSjjz",
+    type: "select",
+    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: "zrSsbmdm",
+    type: "slot"
+  },
+  // { label: "人员标签大类", prop: "bqdl", type: "select", options: [] },
+  // { label: "人员标签细类", prop: "bqxl", type: "select", options: [] },
+  { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
+]);
+const listQuery = ref({}); //表单
+const deptList = ref([]); //部门列表
+const chooseShow = ref(false); //选择弹窗
+const tableDate = reactive({
+  bqList: [], //表格数据
+  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 }
+  ]
+});
+const chooseType = ref("01"); //选择弹窗类型
+const chooseTitle = ref(""); //选择弹窗
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {
+  getdepartmentList();
+});
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
+};
+
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
+
+const submit = () => {
+  elform.value.submit((data) => {
+    // 处理 zdrSjjz 字段（如果是数组就转成字符串）
+    if (Array.isArray(data.zdrSjjz)) {
+      data.zdrSjjz = data.zdrSjjz.join(",");
+    }
+    console.log("提交数据:", data, title.value);
+    // 根据 title 判断是新增还是编辑
+    if (title.value === "新增") {
+      console.log("新增数据:", data);
+      emits("chooseDate", data); // 新增
+    } else if (title.value === "编辑") {
+      emits("handleEditDate", data); // 编辑
+    }
+  });
+};
+// // 提交
+// const submit = () => {
+//   elform.value.submit((data) => {
+//     data.zdrSjjz = data.zdrSjjz.join(",");
+//     emits("chooseDate", data);
+//       let url =
+//         title.value == "新增"
+//           ? "/mosty-gsxt/tbGsxtZdry/save"
+//           : "/mosty-gsxt/tbGsxtZdry/update";
+//       let params = { ...data };
+
+//       qcckPost(params, url)
+//         .then((res) => {
+//           proxy.$message({ type: "success", message: title.value + "成功" });
+//           emit("onSearch");
+//           close();
+//         })
+//         .catch(() => {});
+//   });
+// };
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  chooseType.value = type;
+  chooseTitle.value = "请选择标签";
+  nextTick(() => {
+    tagDialog.value.setValues(listQuery.value.bqList);
+  });
+};
+
+const handleTagSelect = (selectedTags) => {
+  console.log("已选标签:", 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 setFormData = (data) => {
+  tableDate.bqList = data.bqList ?? [];
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+};
+
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+// 删除
+const delDictItem = (bqId) => {
+  tableDate.bqList = tableDate.bqList.filter((item) => item.bqId !== bqId);
+  listQuery.value.bqList = tableDate.bqList;
+};
+// 2. 暴露获取数据的方法
+const getFormData = () => {
+  // 可以在这里添加验证逻辑
+  return {
+    formData: listQuery.value
+  };
+};
+defineExpose({ init, setFormData, close });
+</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/DeploymentDisposal/mpvGroup/components/approvalInfo.vue

@@ -0,0 +1,303 @@
+<template>
+  <el-form :model="formData" label-width="auto" label-position="left">
+    <FormMessage
+      v-model="listQuery"
+      :formList="formData"
+      ref="elform"
+      :rules="rules"
+    >
+      <!-- 自定义插槽（人员标签） -->
+      <template #jsdwdm>
+        <el-select
+          v-model="listQuery.jsdwdm"
+          placeholder="请选择处置接收单位"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in deptList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
+        </el-select>
+      </template>
+    </FormMessage>
+
+    <!-- 审批流程 -->
+    <div class="approval-flow">
+      <div class="approval-flow">
+        <div class="step" v-for="(item, index) in step" :key="`${index}step`">
+          <div class="icon">
+            <div class="circle"></div>
+            <div class="line"></div>
+          </div>
+          <div>
+            <div>{{ item.title }}</div>
+            <div class="desc">
+              <div class="description flexcc">
+                <!-- 使用方案1 + 方案2 -->
+                <div
+                  class="description-item"
+                  :class="{ 'disabled-item': item.default }"
+                  @click="!item.default && handleSelectStep(index)"
+                >
+                  {{ item.sqrXm }}
+                </div>
+                <div class="description-item">{{ item.sqrSsbmmc }}</div>
+                <div class="step-description" v-if="item.description">
+                  {{ item.description }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <ChooseUser
+      v-model="chooseUserVisible"
+      @choosedUsers="handleUserSelected"
+      :roleIds="roleIds"
+    />
+  </el-form>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import ChooseUser from "@/components/MyComponents/ChooseUser/index.vue";
+import DialogList from "@/views/backOfficeSystem/IntelligentControl/myControl/components/dialogList.vue";
+import { qcckPost, qcckPut } from "@/api/qcckApi.js";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import { fa } from "element-plus/es/locale.mjs";
+import { selectUserDeptPage } from "@/api/user-manage";
+
+const { proxy } = getCurrentInstance();
+const { D_GS_BK_CZJSDWLX, D_GS_BK_TJFS, D_BZ_SF } = proxy.$dict(
+  "D_GS_BK_CZJSDWLX",
+  "D_GS_BK_TJFS",
+  "D_BZ_SF"
+); //获取字典数据
+const listQuery = ref({}); //表单
+const chooseUserVisible = ref(false); //审批流程
+const roleIds = ref([]); //角色id
+let currentSelectedIndex = null;
+const deptList = ref([]); //部门列表
+const formData = ref([
+  {
+    label: "接收单位",
+    prop: "jsdwdm",
+    type: "slot"
+  },
+  {
+    label: "处置接收单位类型",
+    prop: "jsdwlx",
+    type: "select",
+    options: D_GS_BK_CZJSDWLX
+  },
+  { label: "是否反馈", prop: "fkSf", type: "select", options: D_BZ_SF }
+]);
+const rules = reactive({
+  bkBt: [{ required: true, message: "请选择处置接收单位", trigger: "blur" }],
+  // bkObj: [{ required: true, message: "请选择提交方式", trigger: "blur" }],
+  bkSjQs: [{ required: true, message: "请选择签收时间", trigger: "change" }]
+});
+const step = ref([
+  { sqrXm: "发起人", sqrSsbmmc: "发起部门", title: "发起申请", default: true },
+  {
+    sqrXm: "发起人",
+    sqrSsbmmc: "发起部门",
+    title: "审核确认",
+    default: false,
+    status: "", // 动态设置状态
+    description: "" // 动态设置描述（如不通过原因）
+  },
+  {
+    sqrXm: "发起人",
+    sqrSsbmmc: "发起部门",
+    title: "审批确认",
+    default: false,
+    status: "", // 动态设置状态
+    description: "" // 动态设置描述（如不通过原因）
+  }
+]);
+
+onMounted(() => {
+  getdepartmentList();
+});
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+    // tableData.value = res?.records;
+  });
+};
+// 处理选择的人员数据
+const handleUserSelected = (userData) => {
+  if (currentSelectedIndex !== null) {
+    step.value[currentSelectedIndex] = {
+      ...step.value[currentSelectedIndex],
+      sqrXm: userData[0].userName,
+      sqrSsbmmc: userData[0].deptName,
+      userId: userData[0].id,
+      rawData: userData[0] // 保留原始数据（可选）
+    };
+    if (currentSelectedIndex == 1) {
+      // 同时更新listQuery（如果需要）
+      listQuery.value = {
+        ...listQuery.value,
+        shrSfzh: userData[0].idEntityCard,
+        shrSsbmdm: userData[0].deptId,
+        shrSsbmmc: userData[0].deptName,
+        shrXm: userData[0].userName
+      };
+    } else if (currentSelectedIndex == 2) {
+      // 同时更新listQuery（如果需要）
+      listQuery.value = {
+        ...listQuery.value,
+        sprSfzh: userData[0].idEntityCard,
+        sprSsbmdm: userData[0].deptId,
+        sprSsbmmc: userData[0].deptName,
+        sprXm: userData[0].userName
+      };
+    }
+  }
+  console.log(step.value, "选择的数据");
+  chooseUserVisible.value = false;
+};
+
+// 点击步骤触发
+const handleSelectStep = (index) => {
+  currentSelectedIndex = index;
+  chooseUserVisible.value = true;
+};
+
+// 2. 暴露获取数据的方法
+const getFormData = () => {
+  // 可以在这里添加验证逻辑
+  return {
+    formData: listQuery.value
+  };
+};
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+  console.log(data, "部门");
+  step.value = [
+    {
+      sqrXm: "发起人",
+      sqrSsbmmc: "发起部门",
+      title: "发起申请",
+      default: true
+    },
+    {
+      sqrXm: data.shrXm || "系统管理", // 审核人姓名
+      sqrSsbmmc: data.shrSsbmmc || "西藏", // 审核部门
+      title: "审核确认",
+      status: "", // 动态设置状态
+      description: "" // 动态设置描述（如不通过原因）
+    },
+    {
+      sqrXm: data.sprXm || "测试", // 审批人姓名
+      sqrSsbmmc: data.sprSsbmmc || "西藏", // 审批部门
+      title: "审批确认",
+      status: "", // 动态设置状态
+      description: "" // 动态设置描述（如不通过原因）
+    }
+  ];
+  // 根据 bkZt 的值设置不同的状态
+  switch (data.bkZt) {
+    case "02": // 审核中
+      step.value[1].status = "process";
+      step.value[1].description = "审核中";
+      break;
+    case "03": // 审核不通过
+      step.value[1].status = "error";
+      step.value[1].description = `审核不通过（原因：${data.bkshBtgyy}）`;
+      break;
+    case "04": // 审批中
+      step.value[1].status = "finish"; // 审核已完成
+      step.value[2].status = "process"; // 审批中
+      step.value[2].description = "审批中";
+      break;
+    case "05": // 审批通过
+      step.value[1].status = "finish"; // 审核已完成
+      step.value[2].status = "finish"; // 审批已完成
+      step.value[2].description = "审批通过";
+      break;
+    case "06": // 审批不通过
+      step.value[1].status = "finish"; // 审核已完成
+      step.value[2].status = "error"; // 审批不通过
+      step.value[2].description = `审批不通过（原因：${data.bkshBtgyy}）`;
+      break;
+    default:
+      break;
+  }
+};
+
+// 3. 暴露方法给父组件
+defineExpose({
+  getFormData,
+  setFormData
+});
+</script>
+
+<style lang="scss" scoped>
+.step {
+  //   position: relative;
+  display: flex;
+  gap: 5px;
+  box-sizing: border-box;
+  .desc {
+    margin: 5px;
+    color: #929090;
+    // width: 350px;
+  }
+  .icon {
+    // position: absolute;
+    // top: 0;
+    // left: 0;
+    text-align: center;
+    .circle {
+      height: 14px;
+      width: 14px;
+      border-radius: 50%;
+      background-color: rgb(196, 219, 240);
+    }
+    .line {
+      margin: 0 auto;
+      width: 0;
+      height: calc(100% - 14px);
+      border: 1px dashed rgb(196, 219, 240);
+    }
+  }
+}
+
+.unit-selection {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
+.description {
+  gap: 10px;
+}
+.description-item {
+  width: 300px;
+  height: 30px;
+  padding: 0 20px;
+  line-height: 30px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: rgb(131, 132, 135);
+  box-sizing: border-box;
+}
+.disabled-item {
+  cursor: not-allowed;
+  opacity: 0.6;
+  pointer-events: none;
+}
+</style>

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

@@ -0,0 +1,119 @@
+<template>
+  <el-dialog
+    :title="titleValue"
+    width="900px"
+    :model-value="modelValue"
+    append-to-body
+    @close="closed"
+  >
+    <FormMessage
+      v-model="formForData"
+      :formList="formDataModel"
+      ref="formRef"
+      label-width="120px"
+    >
+    </FormMessage>
+
+    <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 FormMessage from "@/components/aboutTable/FormMessage.vue";
+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({});
+// 表单数据
+const formForData = ref({
+  wxqId: "", // 微信群
+  qqqId: "", // QQ群
+  qzNc: "", // 群主昵称
+  qzXm: "", // 群主姓名
+  qzLxdh: "", // 联系人电话
+  qZynr: "" // 群重要内容
+});
+const loading = ref(false);
+const tableData = ref([]);
+const emits = defineEmits(["update:modelValue", "chooseDate"]);
+// 表单字段配置
+const formDataModel = ref([
+  { label: "微信群", prop: "wxqId", type: "input" },
+  {
+    label: "QQ群",
+    prop: "qqqId",
+    type: "input"
+  },
+  { label: "群主昵称", prop: "qzNc", type: "input" },
+  { label: "群主姓名", prop: "qzXm", type: "input" },
+  { label: "联系人电话", prop: "qzLxdh", type: "input" },
+  { label: "群重要内容", prop: "qZynr", type: "input" }
+]);
+const closed = () => {
+  emits("update:modelValue", false);
+};
+
+const keyid = (row) => {
+  return row.id;
+};
+// 子表单提交方法
+const onComfirm = () => {
+  emits("chooseDate", formForData.value);
+  closed();
+};
+
+defineExpose({});
+</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;
+}
+</style>

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

@@ -0,0 +1,608 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">重点群体管理 </span>
+      <div>
+        <el-button
+          size="small"
+          type="primary"
+          @click="autoClick"
+          v-if="typetext == 'auto'"
+          >审核</el-button
+        >
+        <el-button
+          size="small"
+          @click="autoClick"
+          type="primary"
+          v-if="typetext == 'approval'"
+          >审批</el-button
+        >
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+
+    <div class="form_cnt">
+      <el-tabs
+        v-model="activeName"
+        type="card"
+        class="demo-tabs"
+        @tab-click="handleClick"
+      >
+        <el-tab-pane :label="title + '群体'" name="first"></el-tab-pane>
+        <el-tab-pane label="轨迹信息" name="second"></el-tab-pane>
+        <el-tab-pane label="标签信息" name="third"></el-tab-pane>
+      </el-tabs>
+      <FormMessage
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
+        <template #qtXx>
+          <el-divider content-position="left">群体信息</el-divider>
+        </template>
+        <template #qtGlXx>
+          <el-divider content-position="left">群体管理信息</el-divider>
+        </template>
+        <template #spXx>
+          <el-divider content-position="left">审批信息</el-divider>
+          <ApprovalInfo ref="approvalInfoRef" />
+        </template>
+        <template #xzRy>
+          <MyTable
+            :tableData="pageData.tableData"
+            :tableColumn="pageData.tableColumn"
+            :key="pageData.keyCount"
+            :tableConfiger="pageData.tableConfiger"
+            :controlsWidth="pageData.controlsWidth"
+            @chooseData="chooseData"
+          >
+            <template #ryxx="{ row }">
+              <div>
+                <img src="" alt="" />
+                <ul>
+                  <li>姓名：{{ row.rySfzh }}</li>
+                  <li class="rowClass">
+                    性别：
+                    <DictTag
+                      :tag="false"
+                      :value="row.ryXb"
+                      :options="D_BZ_XB"
+                    />
+                  </li>
+                  <li class="rowClass">
+                    籍贯：
+                    <DictTag
+                      :tag="false"
+                      :value="row.ryJg"
+                      :options="D_BZ_XZQHDM"
+                    />
+                  </li>
+                  <li>身份证：{{ row.rySfzh }}</li>
+                  <li>出生日期：{{ row.ryCsrq }}</li>
+                  <li class="rowClass">
+                    民族：
+                    <DictTag
+                      :tag="false"
+                      :value="row.ryMz"
+                      :options="D_BZ_MZ"
+                    />
+                  </li>
+                </ul>
+              </div>
+              <div class="flex">
+                <el-button type="primary" size="small"> 涉恐人员</el-button>
+                <el-button type="primary" size="small"> 涉稳人员</el-button>
+                <el-button type="primary" size="small"> 在逃人员</el-button>
+              </div>
+            </template>
+            <template #jzxx="{ row }">
+              <div class="rowClass">
+                户籍地区划：
+                <DictTag
+                  :tag="false"
+                  :value="row.hjdQh"
+                  :options="D_BZ_XZQHDM"
+                />
+              </div>
+              <div>户籍派出所：{{ row.hjdPcsmc }}</div>
+              <div>户籍地详址：{{ row.hjdXz }}</div>
+            </template>
+            <template #gxdw="{ row }">
+              <div>管辖单位：{{ row.gxSsbmmc }}</div>
+              <div class="rowClass">
+                人员级别：
+                <DictTag
+                  :tag="false"
+                  :value="row.zdrRyjb"
+                  :options="D_GS_ZDR_RYJB"
+                />
+              </div>
+              <div>管控原因：{{ zdrLkyy }}</div>
+              <div class="rowClass">
+                管控状态：
+                <DictTag
+                  :tag="false"
+                  :value="row.zdrBkZt"
+                  :options="D_GS_ZDR_BK_ZT"
+                />
+              </div>
+            </template>
+            <template #zdrCzzt="{ row }">
+              <DictTag
+                :tag="false"
+                :value="row.zdrCzzt"
+                :options="D_GS_ZDR_CZZT"
+              />
+            </template>
+            <template #xtSjzt="{ row }">
+              <div>
+                {{
+                  row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存"
+                }}
+              </div>
+            </template>
+          </MyTable>
+        </template>
+        <!-- 两群采集录入-->
+        <template #lqxxList>
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.lqxxList"
+              :tableColumn="tableDate.tableLqColumn"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.keyCount"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+            >
+            </MyTable>
+          </div>
+        </template>
+      </FormMessage>
+    </div>
+    <!-- 列表弹窗 -->
+    <DialogList
+      :Single="false"
+      :roleIds="roleIds"
+      v-if="chooseShow"
+      @chooseDate="chooseDate"
+      :titleValue="chooseTitle"
+      v-model="chooseShow"
+      :bqLx="chooseType"
+      bqDl="02"
+    ></DialogList>
+    <addFormPeo
+      ref="addFormDiloag"
+      @chooseDate="addFormPeoDate"
+      @handleEditDate="handleEditDate"
+    />
+
+    <selectionList
+      :Single="false"
+      :roleIds="selectroleId"
+      v-if="selectionValue"
+      @chooseDate="chooseSelectDate"
+      :titleValue="chooseTitle"
+      v-model="selectionValue"
+    >
+    </selectionList>
+    <el-dialog v-model="dialogVisible" title="审核" width="500px">
+      <FormMessage
+        v-model="listQueryAuto"
+        :formList="formAutoData"
+        ref="elform"
+      >
+        <!-- 自定义原因字段渲染 -->
+        <template #shBtgyy>
+          <el-form-item
+            label="原因"
+            prop="shBtgyy"
+            v-if="listQueryAuto.sftg == '0'"
+            style="width: 100%"
+          >
+            <el-input
+              type="textarea"
+              v-model="listQueryAuto.shBtgyy"
+              placeholder="请输入不通过原因"
+            />
+          </el-form-item>
+        </template>
+      </FormMessage>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleClose"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import DialogList from "./dialogList.vue";
+import selectionList from "./selectionList.vue";
+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 { ElMessage } from "element-plus";
+import { useRouter } from "vue-router";
+
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const {
+  D_BZ_SF,
+  D_GS_ZDQT_FXDJ,
+  D_GS_ZDQT_LB,
+  D_BZ_XB,
+  D_GS_ZDR_RYJB,
+  D_BZ_MZ,
+  D_BZ_XZQHDM,
+  D_GS_ZDR_BK_ZT,
+  D_GS_ZDR_CZZT
+} = proxy.$dict(
+  "D_BZ_SF",
+  "D_GS_ZDQT_FXDJ",
+  "D_GS_ZDQT_LB",
+  "D_BZ_XB",
+  "D_GS_ZDR_RYJB",
+  "D_BZ_MZ",
+  "D_BZ_XZQHDM",
+  "D_GS_ZDR_BK_ZT",
+  "D_GS_ZDR_CZZT"
+); //获取字典数据
+const dialogTitle = ref("新增信息"); //弹窗标题
+const dialogVisible = ref(false);
+const router = useRouter();
+
+const roleIds = ref([]); //选择角色
+const selectroleId = ref([]); //选择角色
+const approvalInfoRef = ref(null);
+
+const dialogForm = ref(false); //弹窗
+const formRef = ref();
+const activeName = ref("first");
+const formData = ref([
+  { label: "", prop: "qtXx", type: "slot", width: "100%", disabled: true },
+  { label: "群体名称", prop: "qtMc", type: "input", disabled: true },
+  { label: "群体别名", prop: "qtBm", type: "input", disabled: true },
+  { label: "群体简称", prop: "qtJc", type: "input", disabled: true },
+  {
+    label: "群体类别",
+    prop: "qtLb",
+    type: "select",
+    options: D_GS_ZDQT_LB,
+    disabled: true
+  },
+  { label: "成立时间", prop: "qtClsj", type: "datetime", disabled: true },
+  {
+    label: "风险等级",
+    prop: "qtFxdj",
+    type: "select",
+    options: D_GS_ZDQT_FXDJ,
+    disabled: true
+  },
+  { label: "背景资料", prop: "qtBjzl", type: "input", disabled: true },
+  { label: "两群采集录入", prop: "lqxxList", type: "slot", width: "100%" },
+  { label: "", prop: "qtGlXx", type: "slot", width: "100%" },
+  { label: "管辖单位", prop: "gxSsdwmc", type: "input", disabled: true },
+  { label: "联系人", prop: "gkMjXm", type: "input", disabled: true },
+  { label: "联系方式", prop: "gkMjLxfs", type: "input", disabled: true },
+  { label: "", prop: "xzRy", type: "slot", width: "100%" },
+  { label: "", prop: "spXx", type: "slot", width: "100%" }
+]);
+//人员信息
+const pageData = reactive({
+  tableData: [], //表格数据
+  rykeyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false,
+    size: "small",
+    border: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 220, //操作栏宽度
+  tableColumn: [
+    { label: "重点人员信息", prop: "ryxx", showSolt: true },
+    { label: "户籍居住信息", prop: "jzxx", showSolt: true },
+    { label: "管辖单位", prop: "gxdw", showSolt: true },
+    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
+    { label: "状态", prop: "xtSjzt", showSolt: true }
+  ]
+});
+
+const addFormDiloag = ref();
+//两群信息表格，重点人标签表格
+const tableDate = reactive({
+  lqxxList: [], //两群信息表格数据
+  tableConfiger: {
+    rowHieght: 30,
+    showSelectType: "null",
+    loading: false,
+    haveControls: false,
+    showIndex: false
+  },
+  tableHeight: 200,
+  tableLqColumn: [
+    { label: "微信群", prop: "wxqId" },
+    {
+      label: "QQ群",
+      prop: "qqqId"
+    },
+    { label: "群主昵称", prop: "qzNc" },
+    { label: "群主姓名", prop: "qzXm" },
+    { label: "联系人电话", prop: "qzLxdh" },
+    { label: "群重要内容", prop: "qZynr" },
+    { label: "操作", prop: "controls", showSolt: true }
+  ]
+});
+const formAutoData = ref([
+  {
+    label: "是否通过",
+    prop: "sftg",
+    type: "radio",
+    options: D_BZ_SF,
+    width: "100%"
+  },
+  {
+    label: "",
+    prop: "shBtgyy",
+    type: "slot",
+    width: "100%"
+  }
+]);
+const chooseShow = ref(false); //选择弹窗
+const typetext = ref("");
+
+const chooseType = ref(""); //选择类型
+const chooseTitle = ref(""); //选择弹窗标题
+const dialogList = ref(null); //选择弹窗实例
+const currentEditIndex = ref(null);
+const listQuery = ref({}); //表单
+const listQueryAuto = ref({}); //自动审核表单
+const currentEditRow = ref({}); //当前编辑行
+const loading = ref(false);
+const selectionValue = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {});
+// 初始化数据
+const init = async (type, row) => {
+  console.log(row, "编辑数据", type);
+  listQuery.value = {
+    ...listQuery.value, // 保留原有值
+    ...row
+  };
+  listQueryAuto.value = {
+    ...listQueryAuto.value, // 保留原有值
+    sftg: "0" // 设置新值
+  };
+  dialogForm.value = true;
+  typetext.value = type;
+  await nextTick(); // 等待子组件挂载
+  if (row) getDataById(row.id);
+  addFormDiloag.value?.setFormData?.(row); // 回显布控信息
+  approvalInfoRef.value?.setFormData?.(row); // 回显审批信息
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtZdqt/selectVoById/" + id).then((res) => {
+    listQuery.value = res;
+    pageData.tableData = res.zdryList;
+    tableDate.lqxxList = res.lqxxList;
+  });
+};
+const autoClick = () => {
+  dialogVisible.value = true;
+};
+const handleAddEdit = (type, row) => {
+  addFormDiloag.value.init(type, row);
+  dialogTitle.value = "新增信息";
+};
+const selectionAdd = () => {
+  selectionValue.value = true;
+};
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  chooseType.value = type;
+  chooseTitle.value = "请录入两群信息";
+};
+// 选择数据
+const chooseDate = (data) => {
+  tableDate.lqxxList.push(data);
+  chooseShow.value = false;
+};
+
+//重点人员新增
+const addFormPeoDate = (data) => {
+  console.log(data, "选择的数据");
+  pageData.tableData.push(data);
+  addFormDiloag.value.close();
+};
+
+//编辑数据
+const handleEditDate = (editedData) => {
+  const index = pageData.tableData.findIndex(
+    (item) => item.rySfzh === editedData.rySfzh // 用身份证号匹配
+  );
+  console.log(index, "编辑索引");
+  if (index !== -1) {
+    pageData.tableData[index] = { ...editedData };
+  }
+  addFormDiloag.value.close();
+};
+// 选择数据
+const chooseSelectDate = (data) => {
+  pageData.tableData.push(...data);
+  selectionValue.value = false;
+};
+
+//删除两群信息
+const delDictItem = (index) => {
+  tableDate.lqxxList.splice(index, 1);
+};
+
+const submitForm = () => {
+  // 正确调用子组件的submit方法
+  formRef.value.submit(
+    // 成功回调
+    (validData) => {
+      // 处理编辑情况
+      if (dialogTitle.value === "编辑信息") {
+        // 确保 currentEditIndex 有效
+        if (
+          currentEditIndex.value >= 0 &&
+          currentEditIndex.value < pageData.tableData.length
+        ) {
+          pageData.tableData[currentEditIndex.value] = {
+            ...pageData.tableData[currentEditIndex.value],
+            gkMjXm: validData.gkMjXm,
+            ryXb: validData.ryXb,
+            rySfzh: validData.rySfzh,
+            hjdXz: validData.hjdXz,
+            xzdXz: validData.xzdXz,
+            gkMjLxfs: validData.gkMjLxfs,
+            clCph: validData.clCph,
+            clCjh: validData.clCjh,
+            qtTxzh: validData.qtTxzh,
+            bkLx: validData.bkLx,
+            bkLx: validData.bkLx,
+            fjZp: validData.fjZp
+          };
+        } else {
+          console.error("无效的编辑索引:", currentEditIndex.value);
+        }
+      }
+      // 处理新增情况
+      else {
+        pageData.tableData.push(validData);
+      }
+      //赋值子组件数据传递给父组件
+      listQuery.value.bkdxList = pageData.tableData;
+      // 关闭弹窗并重置表单
+      addFormDiloag.value = false;
+    },
+    // 错误回调（可选）
+    (errors) => {
+      console.error("表单验证失败:", errors);
+      ElMessage.error("请检查表单填写是否正确");
+    }
+  );
+};
+// 提交审核/审批
+const handleClose = async () => {
+  try {
+    const data = {
+      id: listQuery.value.id, // 主键id (required)
+      sftg: listQueryAuto.value.sftg // 是否通过 (required)
+    };
+
+    // 如果不通过，添加原因
+    if (data.sftg !== "1") {
+      data.shBtgyy = listQueryAuto.value.shBtgyy; // 不通过原因
+    }
+
+    // 根据 typetext.value 决定调用哪个接口
+    const apiUrl =
+      typetext.value === "auto"
+        ? "/mosty-gsxt/tbGsxtZdqt/toExamine" // 审核接口
+        : "/mosty-gsxt/tbGsxtZdqt/audits"; // 审批接口
+
+    // 调用接口
+    const res = await qcckPost(data, apiUrl);
+    if (res) {
+      ElMessage.success(typetext.value === "auto" ? "审核成功" : "审批成功");
+      dialogVisible.value = false;
+      router.push({ name: "autompvGroup" });
+    } else {
+      ElMessage.error(
+        res.message || (typetext.value === "auto" ? "审核失败" : "审批失败")
+      );
+    }
+  } catch (error) {
+    console.error(typetext.value === "auto" ? "审核出错:" : "审批出错:", error);
+    ElMessage.error("请求过程中发生错误");
+  }
+};
+
+// 根据索引删除数据
+const deleteData = (index) => {
+  pageData.tableData.splice(index, 1);
+};
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    const { formData } = approvalInfoRef.value?.getFormData?.();
+
+    const params = {
+      ...(formData || {}), // 如果 formData 是 null/undefined，默认空对象
+      ...(data || {}), // 如果 data 是 null/undefined，默认空对象
+      zdryList: pageData.tableData,
+      lqxxList: tableDate.lqxxList
+    };
+    let url =
+      title.value == "新增"
+        ? "/mosty-gsxt/tbGsxtZdqt/save"
+        : "/mosty-gsxt/tbGsxtZdqt/update";
+    qcckPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("updateDate");
+        close();
+      })
+      .catch(() => {});
+  });
+};
+
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+defineExpose({ init });
+</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;
+}
+.btns {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+}
+</style>

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

@@ -19,24 +19,7 @@
         <el-form-item prop="fxdj" label="风险等级">
             <MOSTY.Select filterable v-model="listQuery.fxdj" :dictEnum="[]" width="100%"  clearable :placeholder="`请选择风险等级`"/>
         </el-form-item>
-        <el-form-item prop="fxjc" label="风险检测" style="width:100%">
+     
-            <div class="flex align-center">
-                <MOSTY.Other filterable v-model="listQuery.fxjc" readonly />
-                <span class="ml5"><el-icon color="#0072FF" style="top:4px" size="20px"><CirclePlus /></el-icon></span>
-            </div>
-        </el-form-item> 
-        <el-form-item prop="ybjc" label="一般监测" style="width:100%">
-            <div class="flex align-center">
-                <MOSTY.Other filterable v-model="listQuery.ybjc" readonly />
-                <span class="ml5"><el-icon color="#0072FF" style="top:4px" size="20px"><CirclePlus /></el-icon></span>
-            </div>
-        </el-form-item> 
-        <el-form-item prop="ybjc" label="重点监测" style="width:100%">
-            <div class="flex align-center">
-                <MOSTY.Other filterable v-model="listQuery.zdjc" readonly />
-                <span class="ml5"><el-icon color="#0072FF" style="top:4px" size="20px"><CirclePlus /></el-icon></span>
-            </div>
-        </el-form-item> 
         <el-form-item prop="ybjc" label="背景资料" style="width:100%">
             <MOSTY.Other filterable v-model="listQuery.bjzl" style="width:100%" />
         </el-form-item>

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

@@ -0,0 +1,277 @@
+<template>
+  <el-dialog
+    :title="titleValue"
+    width="1200px"
+    :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="fjZp" align="center" label="照片" />
+          <el-table-column prop="ryXm" align="center" label="姓名" />
+          <el-table-column label="性别">
+            <template #default="scope">
+              <span style="margin-left: 10px">{{
+                getLabelByValue(scope.row.ryXb, D_BZ_XB)
+              }}</span>
+            </template>
+          </el-table-column>
+          <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 label="人员民族">
+            <template #default="scope">
+              <span style="margin-left: 10px">{{
+                getLabelByValue(scope.row.ryMz, D_BZ_MZ)
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="重点人处置状态">
+            <template #default="scope">
+              <span style="margin-left: 10px">{{
+                getLabelByValue(scope.row.zdrCzzt, D_GS_ZDR_CZZT)
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="人员级别">
+            <template #default="scope">
+              <span style="margin-left: 10px">{{
+                getLabelByValue(scope.row.zdrRyjb, D_GS_ZDR_RYJB)
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="所属警种">
+            <template #default="scope">
+              <span style="margin-left: 10px">{{
+                getLabelByValue(scope.row.zdrSsjz, D_GS_BK_SSJZ)
+              }}</span>
+            </template>
+          </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, getCurrentInstance } from "vue";
+import { qcckGet } from "@/api/qcckApi.js";
+const { proxy } = getCurrentInstance();
+const {
+  D_GS_BK_DX,
+  D_GS_BK_SSJZ,
+  D_GS_SSYJ,
+  D_GS_BQ_DJ,
+  D_BZ_XB,
+  D_GS_BK_LX,
+  D_BZ_MZ,
+  D_GS_ZDR_CZZT,
+  D_GS_ZDR_RYJB
+} = proxy.$dict(
+  "D_GS_BK_DX",
+  "D_GS_BK_SSJZ",
+  "D_GS_SSYJ",
+  "D_GS_BQ_DJ",
+  "D_BZ_XB",
+  "D_GS_BK_LX",
+  "D_BZ_MZ",
+  "D_GS_ZDR_CZZT",
+  "D_GS_ZDR_RYJB"
+); //获取字典数据
+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 getLabelByValue = (value, Array) => {
+  console.log(Array, "D_BZ_XB");
+  const item = Array.find((item) => item.value === value);
+  return item ? item.label : "未知";
+};
+/**
+ * 页码改变触发
+ */
+const handleCurrentChange = (currentPage) => {
+  listQuery.value.current = currentPage;
+  getDataList();
+};
+
+// 查询标签组合列表
+const getDataList = () => {
+  const data = listQuery.value;
+  loading.value = true;
+  qcckGet(data, "/mosty-gsxt/tbGsxtZdry/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;
+}
+</style>

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

@@ -2,7 +2,9 @@
   <div>
     <div class="titleBox">
       <PageTitle title="重点群体管理">
-        <el-button type="primary" size="small" v-for="it in btns" :key="it"> {{ it }}</el-button>
+        <el-button type="primary" size="small" v-for="it in btns" :key="it">
+          {{ it }}</el-button
+        >
         <el-button type="primary" size="small" @click="addEdit('add', '')">
           <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
           <span style="vertical-align: middle">新增</span>
@@ -32,14 +34,21 @@
         :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData"
       >
-      <template #jbxx>
+        <template #jbxx="{ row }">
           <div>
-          <img src="" alt="">
+            <img src="" alt="" />
             <ul>
-            <li>群体名称：</li>
+              <li>群体名称：{{ row.qtMc }}</li>
-            <li>所属辖区：</li>
+              <!-- <li>所属辖区：</li> -->
-            <li>群体级别：</li>
+              <li class="rowClass">
-            <li>风险等级：</li>
+                风险等级：
+                <DictTag
+                  :tag="false"
+                  :value="row.qtFxdj"
+                  :options="D_GS_ZDQT_FXDJ"
+                />
+              </li>
+              <li>创建时间：{{ row.xtCjsj }}</li>
             </ul>
           </div>
           <div class="flex">
@@ -49,27 +58,39 @@
           </div>
         </template>
         <template #bgxx="{ row }">
-        <div>背景资料：</div>
+          <div>背景资料：{{ row.qtBjzl }}</div>
-        <div>创建单位：</div>
+          <div>创建单位：{{ row.xtCjbmmc }}</div>
-        <div>风险监测：</div>
-        <div>一般监测：</div>
-        <div>重点监测：</div>
         </template>
         <template #gkxx="{ row }">
-        <div>群体标签：</div>
+          <!-- <div>群体标签：{{  }}</div> -->
-        <div>管辖单位：</div>
+          <div>管辖单位：{{ row.gxSsdwmc }}</div>
-        <div>列控原因：</div>
+          <div>列控原因：{{ row.zdrLkyy }}</div>
-        <div>开始时间：</div>
+          <div>开始时间：{{ row.startTime }}</div>
-        <div>截至时间：</div>
+          <div>截至时间：{{ row.endTime }}</div>
         </template>
         <template #wkrs="{ row }">
           <span style="color: #0072ff">{{ row.wkrs }}</span>
         </template>
+        <template #qtZt="{ row }">
+          <DictTag :tag="false" :value="row.qtZt" :options="D_GS_ZDQT_ZT" />
+        </template>
+
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link
-          <el-link size="small" type="primary">查看</el-link>
+            v-if="row.qtZt == '01' || row.qtZt == '03' || row.qtZt == '06'"
-          <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+            @click="openDetail(row)"
+            >送审</el-link
+          >
+          <el-link size="small" type="success" @click="addEdit('edit', row)"
+            >编辑</el-link
+          >
+          <el-link size="small" type="primary" @click="infoList('info', row)"
+            >查看</el-link
+          >
+          <el-link size="small" type="danger" @click="deleteRow(row)"
+            >删除</el-link
+          >
         </template>
       </MyTable>
       <Pages
@@ -82,75 +103,164 @@
         }"
       ></Pages>
     </div>
+    <el-dialog
+      v-model="dialogVisible"
+      title="发起送审"
+      width="500px"
+      :before-close="handleClose"
+    >
+      <span>是否要发起送审</span>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="autoEdit()"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 编辑 -->
+    <EditForm @updateDate="updateDate" ref="editFormDiloag" />
     <!-- 详情 -->
     <DetailForm ref="detailDiloag" />
   </div>
 </template>
 
 <script setup>
+import DetailForm from "./components/infoForm.vue";
 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 DetailForm from "./components/addForm.vue";
+import EditForm from "./components/addForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
-import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { ElMessage } from "element-plus";
+
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
+const {
+  D_GS_ZDQT_FXDJ,
+  D_GS_ZDR_RYJB,
+  D_GS_ZDQT_LB,
+  D_GS_ZDR_BK_ZT,
+  D_GS_BQ_LX,
+  D_GS_ZDQT_ZT
+} = proxy.$dict(
+  "D_GS_ZDQT_FXDJ",
+  "D_GS_ZDR_RYJB",
+  "D_GS_ZDQT_LB",
+  "D_GS_ZDR_BK_ZT",
+  "D_GS_BQ_LX",
+  "D_GS_ZDQT_ZT"
+); //获取字典数据
+const editFormDiloag = ref();
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
-const btns = reactive(['一键布控','维护群体','矛盾化解','转指令','转线索','转督导','转合成','移交管控','批量导入','导出'])
+const autoId = ref();
+const dialogVisible = ref(false);
+const btns = reactive([
+  "一键布控",
+  "维护群体",
+  "矛盾化解",
+  "转指令",
+  "转线索",
+  "转督导",
+  "转合成",
+  "移交管控",
+  "批量导入",
+  "导出"
+]);
 const searchConfiger = ref([
   {
     label: "群体名称",
-    prop: "groupName",
+    prop: "qtMc",
     placeholder: "请输入群体名称",
     showType: "input"
   },
   {
     label: "群体风险等级",
-    prop: "riskLevel",
+    prop: "qtFxdj",
     placeholder: "请选择群体风险等级",
-    showType: "select"
+    showType: "select",
+    options: D_GS_ZDQT_FXDJ
   },
   {
-    label: "监测级别",
+    label: "重点人人员级别",
-    prop: "monitorLevel",
+    prop: "zdrRyjb",
-    placeholder: "请选择监测级别",
+    placeholder: "请选择重点人人员级别",
-    showType: "select"
+    showType: "select",
+    options: D_GS_ZDR_RYJB
   },
   {
     label: "成员姓名",
-    prop: "memberName",
+    prop: "cyXm	",
     placeholder: "请输入成员姓名",
     showType: "input"
   },
   {
-    label: "时间敏感词",
+    label: "群体类别",
-    prop: "timeSensitive",
+    prop: "qtLb",
-    placeholder: "请输入时间敏感词",
+    placeholder: "请选择群体类别",
+    showType: "select",
+    options: D_GS_ZDQT_LB
+  },
+  {
+    label: "成员身份证号",
+    prop: "cySfzh",
+    placeholder: "请输入成员身份证号",
     showType: "input"
   },
   {
-    label: "群体类别",
+    label: "群体大类",
-    prop: "groupType",
+    prop: "qtDl",
-    placeholder: "请选择群体类别",
+    placeholder: "请输入群体大类",
-    showType: "select"
+    showType: "input"
+  },
+  {
+    label: "群体细类",
+    prop: "qtXl",
+    placeholder: "请输入群体细类",
+    showType: "input"
+  },
+  {
+    label: "管辖单位名称",
+    prop: "gxSsdwmc",
+    placeholder: "请输入管辖单位名称",
+    showType: "input"
+  },
+  {
+    label: "开始时间",
+    prop: "startTime",
+    placeholder: "请输入开始时间",
+    showType: "date"
+  },
+  {
+    label: "截至时间",
+    prop: "endTime",
+    placeholder: "请输入截至时间",
+    showType: "date"
   },
   {
     label: "布控状态",
-    prop: "bkzt",
+    prop: "zdrBkZt",
-    placeholder: "请选择布控状态",
+    placeholder: "请输入布控装态",
-    showType: "select"
+    showType: "select",
+    options: D_GS_ZDR_BK_ZT
   },
+  {
+    label: "布控类型",
+    prop: "bkzt",
+    placeholder: "请输入布控类型",
+    showType: "select",
+    options: D_GS_BQ_LX
+  }
 ]);
 
 const pageData = reactive({
   tableData: [
     {
-      img:'',
+      img: "",
       jbxx: "",
-      wkrs:'1/5'
+      wkrs: "1/5"
-    },
+    }
   ],
   keyCount: 0,
   tableConfiger: {
@@ -169,7 +279,7 @@ const pageData = reactive({
     { label: "背景信息", prop: "bgxx", showSolt: true },
     { label: "管控信息", prop: "gkxx", showSolt: true },
     { label: "稳控人数", prop: "wkrs", showSolt: true, width: 80 },
-    { label: "状态", prop: "status" }
+    { label: "状态", prop: "qtZt", showSolt: true }
   ]
 });
 
@@ -180,6 +290,26 @@ onMounted(() => {
   tabHeightFn();
 });
 
+const openDetail = (row) => {
+  autoId.value = row.id;
+  dialogVisible.value = true;
+};
+//送审
+const autoEdit = () => {
+  dialogVisible.value = false;
+  let url = `/mosty-gsxt/tbGsxtZdqt/subExamine/${autoId.value}`;
+  qcckPost({}, url)
+    .then((res) => {
+      ElMessage.success("提交成功");
+      getList();
+    })
+    .catch(() => {
+      ElMessage.error("提交失败");
+    });
+};
+const updateDate = () => {
+  getList();
+};
 //选择类型
 const handleType = (val) => {
   pageData.keyCount++;
@@ -192,7 +322,10 @@ const onSearch = (val) => {
   pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
-
+// 详情
+const infoList = (type, row) => {
+  detailDiloag.value.init(type, row);
+};
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
   getList();
@@ -204,19 +337,23 @@ const changeSize = (val) => {
 
 // 获取列表
 const getList = (val) => {
-  // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // let url = '/mosty-lzcj/tbDwMbkf/queryList';
+  let url = "/mosty-gsxt/tbGsxtZdqt/selectPage";
-  // qcckPost(data,url).then(res=>{
+  qcckGet(data, url)
-  //   pageData.tableData = res.records || [];
+    .then((res) => {
-  //   pageData.total = res.total;
+      pageData.tableData = res.records || [];
-  //   pageData.tableConfiger.loading = false;
+      pageData.total = res.total;
-  // }).catch(()=>{ pageData.tableConfiger.loading = false; })
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
 };
 
 // 详情
 const addEdit = (type, row) => {
-  detailDiloag.value.init(type, row);
+  editFormDiloag.value.init(type, row);
 };
 
 // 表格高度计算
@@ -227,13 +364,16 @@ const tabHeightFn = () => {
     tabHeightFn();
   };
 };
+defineExpose({ infoList });
 </script>
 
 <style>
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
+.rowClass {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>
-  
-  
-  

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

@@ -0,0 +1,407 @@
+<template>
+  <el-dialog
+    :title="titleValue"
+    width="1500px"
+    :model-value="modelValue"
+    append-to-body
+    @close="closed"
+  >
+    <div class="table_class">
+      <div style="width: 48%">
+        <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+          <el-tab-pane
+            v-for="tab in tabs"
+            :key="tab.dm"
+            :label="tab.label"
+            :name="tab.dm"
+          >
+            <!-- 添加 v-if 条件 -->
+            <template v-if="activeTab !== '03'">
+              <el-button
+                v-for="(it, idx) in props.dic.D_GS_BQ_LB"
+                :key="idx"
+                :type="type == it.zdmc ? 'success' : ''"
+                @click="chooseListType(it.zdmc)"
+              >
+                <span style="vertical-align: middle">{{ it.zdmc }}</span>
+              </el-button>
+            </template>
+            <el-table
+              v-loading="loading"
+              ref="multipleUserRef"
+              @selection-change="handleSelectionChange"
+              :data="tableData"
+              border
+              :row-key="keyid"
+              style="width: 100%"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                :reserve-selection="true"
+              />
+              <el-table-column prop="bqDm" align="center" label="标签代码" />
+              <el-table-column prop="bqLb" align="center" label="标签类别">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqLb"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_LB"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="bqLx" align="center" label="标签类型">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqLx"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_LX"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column prop="bqMc" align="center" label="标签名称" />
+              <el-table-column prop="bqZl" align="center" label="标签种类">
+                <template #default="{ row }">
+                  <DictTag
+                    :value="row.bqZl"
+                    :tag="false"
+                    :options="props.dic.D_GS_BQ_ZL"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="fenye">
+              <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>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+
+      <div style="width: 48%">
+        <div class="selected-tabBox">
+          <el-table
+            :data="selectedData"
+            border
+            :row-key="keyid"
+            style="width: 100%"
+          >
+            <el-table-column prop="bqDm" align="center" label="标签代码" />
+            <el-table-column prop="bqLb" align="center" label="标签类别">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqLb"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LB"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="bqLx" align="center" label="标签类型">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqLx"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LX"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column prop="bqMc" align="center" label="标签名称" />
+            <el-table-column prop="bqZl" align="center" label="标签种类">
+              <template #default="{ row }">
+                <DictTag
+                  :value="row.bqZl"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_ZL"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作">
+              <template #default="{ row }">
+                <el-button
+                  type="danger"
+                  @click="handleRemoveFromSelectedData(row)"
+                  >移除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="fenye">
+          <el-pagination
+            class="pagination"
+            @size-change="handleSizeChangeRight"
+            @current-change="handleCurrentChangeRight"
+            :current-page="listQuery.current"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="listQuery.sizeRight"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="selectedData.length"
+          ></el-pagination>
+        </div>
+      </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, nextTick } 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: false
+  },
+  roleIds: {
+    type: Array,
+    default: []
+  }
+});
+
+const tabs = ref([]);
+const activeTab = ref("");
+const total = ref(0);
+const listQuery = ref({
+  current: 1,
+  size: 20,
+  bqZl: activeTab.value
+});
+const loading = ref(false);
+const tableData = ref([]);
+const selectedData = ref([]);
+const multipleUserRef = ref(null);
+const emits = defineEmits(["update:modelValue", "chooseDate"]);
+const type = ref("标签大类");
+onMounted(() => {
+  console.log(props.dic.D_GS_BQ_ZL, "props.dic.D_GS_BQ_ZL");
+  tabs.value = props.dic.D_GS_BQ_ZL;
+  activeTab.value = tabs.value?.[0]?.dm || "01";
+  handleFilter();
+});
+// 选择列表的大类和细类
+const chooseListType = (val) => {
+  type.value = val;
+  listQuery.current = 1;
+  getDataList();
+};
+const closed = () => {
+  emits("update:modelValue", false);
+};
+
+const reset = () => {
+  listQuery.value = { current: 1, size: 20, bqZl: activeTab.value };
+  getDataList();
+};
+
+const keyid = (row) => {
+  return row.id;
+};
+
+// 为用户分配角色
+const onComfirm = () => {
+  emits("chooseDate", selectedData.value);
+  let data = { type: props.LeaderType, userList: selectedData.value };
+  emits("chooseDateLeader", data);
+  closed();
+};
+//数据回显
+const setValues = (list) => {
+  selectedData.value = list.map((item) => {
+    // 统一id字段处理逻辑
+    if (item.bqId) {
+      return { ...item, id: item.bqId };
+    }
+
+    return item;
+  });
+
+  nextTick(() => {
+    multipleUser();
+  });
+};
+/**
+ * pageSize 改变触发
+ */
+const handleSizeChange = (currentSize) => {
+  listQuery.value.size = currentSize;
+  getDataList();
+};
+
+/**
+ * 页码改变触发
+ */
+const handleCurrentChange = (currentPage) => {
+  listQuery.value.current = currentPage;
+  getDataList();
+};
+
+// 查询标签组合列表
+const getDataList = () => {
+  listQuery.value.bqZl = activeTab.value;
+  loading.value = true;
+  //根据顶部标签切换不同的接口
+  let url =
+    activeTab.value == "01"
+      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
+      : activeTab.value == "02"
+      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
+      : "/mosty-gsxt/tbGsxtBqzh/selectPage";
+  let params = {};
+  console.log(activeTab.value, "activeTab.value");
+  if (activeTab.value === "01") {
+    params.bqLx = "01";
+  } else if (activeTab.value === "02") {
+    params.bqLx = "02";
+  } // activeTab.value 等于 "03" 时不传递参数
+  if (type.value === "标签大类") {
+    params.bqLb = "01";
+  } else if (type.value === "标签细类") {
+    params.bqLb = "02";
+  }
+  qcckGet(params, url).then((res) => {
+    // 添加 bqZl 字段
+    tableData.value = res?.records?.map((item) => ({
+      bqDm: item.bqDm,
+      bqId: item.id ? item.id : item.bqId ? item.bqId : row.bqDlId,
+      bqLb: item.bqLb,
+      bqLx: item.bqLx,
+      bqMc: item.bqMc,
+      bqZl: activeTab.value
+    }));
+    total.value = Number(res.total);
+    loading.value = false;
+    //确保在这里调用 multipleUser
+    multipleUser();
+  });
+};
+
+// 修改 multipleUser 函数
+function multipleUser() {
+  nextTick(() => {
+    if (multipleUserRef.value && tableData.value.length > 0) {
+      tableData.value.forEach((item) => {
+        if (selectedData.value.some((selected) => selected.bqId == item.bqId)) {
+          // 因为 multipleUserRef 是数组，需要确定正确的索引
+          // 如果你只有一个表格，可以使用 [0]
+          multipleUserRef.value[0]?.toggleRowSelection(item, true);
+        }
+      });
+    }
+  });
+}
+
+const handleFilter = () => {
+  listQuery.value.current = 1;
+
+  getDataList();
+};
+
+const handleTabClick = () => {
+  reset();
+};
+
+const handleAddToSelectedData = (row) => {
+  console.log(row, selectedData.value, "handleAddToSelectedData row");
+  if (selectedData.value.some((item) => item.bqId === row.bqId)) {
+    return;
+  }
+  if (props.Single && selectedData.value.length > 0) {
+    selectedData.value = [];
+  }
+  selectedData.value.push({
+    bqDm: row.bqDm,
+    bqId: row.id ? row.id : row.bqId ? row.bqId : row.bqDlId,
+    bqLb: row.bqLb,
+    bqLx: row.bqLx,
+    bqMc: row.bqMc,
+    bqZl: activeTab.value
+  });
+};
+
+const handleRemoveFromSelectedData = (row) => {
+  const index = selectedData.value.findIndex((item) => item.bqId === row.bqId);
+  if (index !== -1) {
+    selectedData.value.splice(index, 1);
+  }
+  // 取消左侧表格中对应行的选中状态
+  multipleUserRef.value.toggleRowSelection(row, false);
+};
+
+const multipleSelectionUser = ref([]);
+const handleSelectionChange = (val) => {
+  multipleSelectionUser.value = val;
+  multipleSelectionUser.value.forEach((row) => {
+    handleAddToSelectedData(row);
+  });
+};
+// 必须暴露方法父组件才能调用
+defineExpose({
+  setValues
+});
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+@import "@/assets/css/element-plus.scss";
+
+.selected-tabBox {
+  margin-top: 56px;
+}
+</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;
+  /* 其他样式 */
+}
+.table_class {
+  display: flex;
+  justify-content: space-between;
+}
+</style>

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

@@ -1,51 +1,305 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">重点群体管理 </span>
+      <span class="title">{{ title }}重点人管理</span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          >保存</el-button
+        >
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="form_cnt">
-      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
+      <FormMessage
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
+        <!-- 人员标签模型-->
+        <template #bqList>
+          <el-button @click="openDialog('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 #gxSsbmdm>
+          <el-select
+            v-model="listQuery.gxSsbmdm"
+            placeholder="请选择管辖单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 户籍派出所代码 -->
+        <template #hjdPcsdm>
+          <el-select
+            v-model="listQuery.hjdPcsdm"
+            placeholder="请选择户籍派出所代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 诉求单位代码 -->
+        <template #sqSsbmdm>
+          <el-select
+            v-model="listQuery.sqSsbmdm"
+            placeholder="请选择户籍派出所代码"
+            style="width: 240px"
+          >
+            <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"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 责任单位代码 -->
+        <template #zrSsbmdm>
+          <el-select
+            v-model="listQuery.zrSsbmdm"
+            placeholder="请选择责任单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+      </FormMessage>
+      <!-- 列表弹窗 -->
+      <TagSelectorDialog
+        v-model="chooseShow"
+        ref="tagDialog"
+        @chooseDate="handleTagSelect"
+        :dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }"
+      />
     </div>
   </div>
 </template>
 
 <script setup>
-import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import TagSelectorDialog from "./TagSelectorDialog.vue";
 import * as rule from "@/utils/rules.js";
-import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+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_BK_SSJZ,
+  D_GS_ZDR_RYJB,
+  D_GS_SSYJ,
+  D_GS_BQ_DJ,
+  D_BZ_XZQHDM,
+  D_BZ_MZ,
+  D_BZ_XB,
+  D_GS_ZDR_CZZT,
+  D_GS_BQ_ZL,
+  D_GS_BQ_LB,
+  D_GS_BQ_LX,
+  D_GS_ZDR_YJDJ
+} = proxy.$dict(
+  "D_GS_BK_SSJZ",
+  "D_GS_ZDR_RYJB",
+  "D_GS_SSYJ",
+  "D_GS_BQ_DJ",
+  "D_BZ_XZQHDM",
+  "D_BZ_MZ",
+  "D_BZ_XB",
+  "D_GS_ZDR_CZZT",
+  "D_GS_BQ_ZL",
+  "D_GS_BQ_LB",
+  "D_GS_BQ_LX",
+  "D_GS_ZDR_YJDJ"
+); //获取字典数据
+const tagDialog = ref();
 const dialogForm = ref(false); //弹窗
 const formData = ref([
-  { label: "姓名", prop: "xm", type: "input", },
+  { label: "姓名", prop: "ryXm", type: "input" },
-  { label: "身份证号", prop: "sfzh",  type: "input" },
+  { label: "身份证号", prop: "rySfzh", type: "input" },
-  { label: "户籍地", prop: "hjd",  type: "input"},
+  { label: "户籍地派出所名称", prop: "hjdPcsmc", type: "input" },
-  { label: "户籍地派出所", prop: "hjdpcs",  type: "input" },
+  {
-  { label: "入库开始时间", prop: "kssj",  type: "datetime"},
+    label: "户籍地派出所代码",
-  { label: "入库结束时间", prop: "jssj",  type: "datetime"},
+    prop: "hjdPcsdm",
-  { label: "人员级别", prop: "ryjb",  type: "select",options:[] },
+    type: "slot"
-  { label: "所属警种", prop: "ssjz",  type: "input"  },
+  },
-  { label: "管辖单位", prop: "gxdw",  type: "input"  },
+  { label: "管辖单位", prop: "gxSsbmmc", type: "input" },
-  { label: "涉及警种", prop: "sjjz",  type: "input"  },
+  {
-  { label: "管控民警姓名", prop: "njxm",  type: "input"  },
+    label: "管辖单位代码",
-  { label: "管控民警警号", prop: "mjjh",  type: "input"  },
+    prop: "gxSsbmdm",
-  { label: "管控原因", prop: "gkyy",  type: "textarea",width: '100%' },
+    type: "slot"
-  { label: "被管控人联系方式", prop: "lxfs",  type: "input",},
+  },
-  { label: "责任单位", prop: "zedw",  type: "input",},
+
-  { label: "人员标签大类", prop: "bqdl",  type: "select",options:[]},
+  { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
-  { label: "人员标签细类", prop: "bqxl",  type: "select",options:[]},
+  { 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: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ },
+
+  {
+    label: "涉及警种",
+    prop: "zdrSjjz",
+    type: "select",
+    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: "zrSsbmdm",
+    type: "slot"
+  },
+  // { label: "人员标签大类", prop: "bqdl", type: "select", options: [] },
+  // { label: "人员标签细类", prop: "bqxl", type: "select", options: [] },
+  { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
 ]);
-const listQuery = ref({
+const listQuery = ref({}); //表单
-  sfbqdj: []
+const deptList = ref([]); //部门列表
-}); //表单
+const chooseShow = ref(false); //选择弹窗
+const tableDate = reactive({
+  bqList: [], //表格数据
+  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 }
+  ]
+});
 const loading = ref(false);
 const elform = ref();
 const title = ref("");
@@ -53,40 +307,99 @@ const rules = reactive({
   xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
 });
 const editpeo = ref();
-onMounted(() => {});
+onMounted(() => {
+  getdepartmentList();
+});
 // 初始化数据
-const init = (type, row,) => {
+const init = (type, row) => {
   dialogForm.value = true;
-  title.value = type == 'add' ? "新增" : "编辑";
+  title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
   if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtZdry/selectVoById/" + id).then((res) => {
-  //   listQuery.value = res;
+    listQuery.value = res;
-  // });
+    listQuery.value.zdrSjjz = listQuery.value.zdrSjjz.split(",");
+    tableDate.bqList = res.bqList;
+  });
+};
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
 };
-
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
-    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    data.zdrSjjz = data.zdrSjjz.join(",");
-    // let params = { ...data }
+    let url =
-    // qcckPost(params, url).then((res) => {
+      title.value == "新增"
-    //   proxy.$message({ type: "success", message: title.value + "成功" });
+        ? "/mosty-gsxt/tbGsxtZdry/save"
-    //   emit("updateDate");
+        : "/mosty-gsxt/tbGsxtZdry/update";
-    //   close();
+    let params = { ...data };
-    // }).catch(() => {});
+
+    qcckPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("onSearch");
+        close();
+      })
+      .catch(() => {});
+  });
+};
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  nextTick(() => {
+    tagDialog.value.setValues(listQuery.value.bqList);
   });
 };
 
+const handleTagSelect = (selectedTags) => {
+  console.log("已选标签:", 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 setFormData = (data) => {
+  tableDate.bqList = data.bqList ?? [];
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+};
 // 关闭
 const close = () => {
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;
 };
-defineExpose({ init });
+// 删除
+const delDictItem = (bqId) => {
+  tableDate.bqList = tableDate.bqList.filter((item) => item.bqId !== bqId);
+  listQuery.value.bqList = tableDate.bqList;
+};
+// 2. 暴露获取数据的方法
+const getFormData = () => {
+  // 可以在这里添加验证逻辑
+  return {
+    formData: listQuery.value
+  };
+};
+defineExpose({ init, setFormData });
 </script>
 
 <style lang="scss" scoped>
@@ -96,4 +409,10 @@ defineExpose({ init });
   color: #0072ff;
   background: rgba(0, 114, 255, 0.3);
 }
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
 </style>

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

@@ -0,0 +1,492 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">{{ title }}重点人管理</span>
+      <div>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
+        <!-- 人员标签模型-->
+        <template #bqList>
+          <!-- <el-button @click="openDialog('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 #gxSsbmdm>
+          <el-select
+            v-model="listQuery.gxSsbmdm"
+            placeholder="请选择管辖单位代码"
+            style="width: 240px"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 户籍派出所代码 -->
+        <template #hjdPcsdm>
+          <el-select
+            v-model="listQuery.hjdPcsdm"
+            placeholder="请选择户籍派出所代码"
+            style="width: 240px"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 诉求单位代码 -->
+        <template #sqSsbmdm>
+          <el-select
+            v-model="listQuery.sqSsbmdm"
+            placeholder="请选择户籍派出所代码"
+            style="width: 240px"
+            :disabled="true"
+          >
+            <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"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 责任单位代码 -->
+        <template #zrSsbmdm>
+          <el-select
+            v-model="listQuery.zrSsbmdm"
+            placeholder="请选择责任单位代码"
+            style="width: 240px"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+      </FormMessage>
+      <!-- 列表弹窗 -->
+      <TagSelectorDialog
+        v-model="chooseShow"
+        ref="tagDialog"
+        @chooseDate="handleTagSelect"
+        :dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }"
+      />
+    </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 TagSelectorDialog from "./TagSelectorDialog.vue";
+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_BK_SSJZ,
+  D_GS_ZDR_RYJB,
+  D_GS_SSYJ,
+  D_GS_BQ_DJ,
+  D_BZ_XZQHDM,
+  D_BZ_MZ,
+  D_BZ_XB,
+  D_GS_ZDR_CZZT,
+  D_GS_BQ_ZL,
+  D_GS_BQ_LB,
+  D_GS_BQ_LX,
+  D_GS_ZDR_YJDJ
+} = proxy.$dict(
+  "D_GS_BK_SSJZ",
+  "D_GS_ZDR_RYJB",
+  "D_GS_SSYJ",
+  "D_GS_BQ_DJ",
+  "D_BZ_XZQHDM",
+  "D_BZ_MZ",
+  "D_BZ_XB",
+  "D_GS_ZDR_CZZT",
+  "D_GS_BQ_ZL",
+  "D_GS_BQ_LB",
+  "D_GS_BQ_LX",
+  "D_GS_ZDR_YJDJ"
+); //获取字典数据
+const tagDialog = ref();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+  { 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 listQuery = ref({}); //表单
+const deptList = ref([]); //部门列表
+
+const chooseShow = ref(false); //选择弹窗
+const tableDate = reactive({
+  bqList: [], //表格数据
+  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 }
+  ]
+});
+const chooseType = ref("01"); //选择弹窗类型
+const chooseTitle = ref(""); //选择弹窗
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {
+  getdepartmentList();
+});
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtZdry/selectVoById/" + id).then((res) => {
+    listQuery.value = res;
+    listQuery.value.zdrSjjz = listQuery.value.zdrSjjz.split(",");
+    tableDate.bqList = res.bqList;
+  });
+};
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    data.zdrSjjz = data.zdrSjjz.join(",");
+    let url =
+      title.value == "新增"
+        ? "/mosty-gsxt/tbGsxtZdry/save"
+        : "/mosty-gsxt/tbGsxtZdry/update";
+    let params = { ...data };
+
+    qcckPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("onSearch");
+        close();
+      })
+      .catch(() => {});
+  });
+};
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  chooseType.value = type;
+  chooseTitle.value = "请选择标签";
+  nextTick(() => {
+    tagDialog.value.setValues(listQuery.value.bqList);
+  });
+};
+
+const handleTagSelect = (selectedTags) => {
+  console.log("已选标签:", 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 setFormData = (data) => {
+  tableDate.bqList = data.bqList ?? [];
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+};
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+// 删除
+const delDictItem = (bqId) => {
+  tableDate.bqList = tableDate.bqList.filter((item) => item.bqId !== bqId);
+  listQuery.value.bqList = tableDate.bqList;
+};
+// 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/DeploymentDisposal/mpvPeo/index.vue

@@ -2,7 +2,9 @@
   <div>
     <div class="titleBox">
       <PageTitle title="重点人管理">
-        <el-button type="primary" size="small" v-for="it in btns" :key="it"> {{ it }}</el-button>
+        <el-button type="primary" size="small" v-for="it in btns" :key="it">
+          {{ it }}</el-button
+        >
         <el-button type="primary" size="small" @click="addEdit('add', '')">
           <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
           <span style="vertical-align: middle">新增</span>
@@ -32,16 +34,29 @@
         :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData"
       >
-      <template #ryxx>
+        <template #ryxx="{ row }">
           <div>
-          <img src="" alt="">
+            <img src="" alt="" />
             <ul>
-            <li>姓名：</li>
+              <li>姓名：{{ row.rySfzh }}</li>
-            <li>性别：</li>
+              <li class="rowClass">
-            <li>籍贯：</li>
+                性别：
-            <li>身份证：</li>
+                <DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" />
-            <li>出生日期：</li>
+              </li>
-            <li>民族：</li>
+              <li class="rowClass">
+                籍贯：
+                <DictTag
+                  :tag="false"
+                  :value="row.ryJg"
+                  :options="D_BZ_XZQHDM"
+                />
+              </li>
+              <li>身份证：{{ row.rySfzh }}</li>
+              <li>出生日期：{{ row.ryCsrq }}</li>
+              <li class="rowClass">
+                民族：
+                <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
+              </li>
             </ul>
           </div>
           <div class="flex">
@@ -51,22 +66,53 @@
           </div>
         </template>
         <template #jzxx="{ row }">
-        <div>户籍地区化：</div>
+          <div class="rowClass">
-        <div>户籍派出所：</div>
+            户籍地区划：
-        <div>户籍地详址：</div>
+            <DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" />
+          </div>
+          <div>户籍派出所：{{ row.hjdPcsmc }}</div>
+          <div>户籍地详址：{{ row.hjdXz }}</div>
         </template>
         <template #gxdw="{ row }">
-        <div>管辖单位：</div>
+          <div>管辖单位：{{ row.gxSsbmmc }}</div>
-        <div>人类类别：</div>
+          <div class="rowClass">
-        <div>人员级别：</div>
+            人员级别：
-        <div>管控原因：</div>
+            <DictTag
-        <div>管控状态：</div>
+              :tag="false"
+              :value="row.zdrRyjb"
+              :options="D_GS_ZDR_RYJB"
+            />
+          </div>
+          <div>管控原因：{{ zdrLkyy }}</div>
+          <div class="rowClass">
+            管控状态：
+            <DictTag
+              :tag="false"
+              :value="row.zdrBkZt"
+              :options="D_GS_ZDR_BK_ZT"
+            />
+          </div>
         </template>
+        <template #zdrCzzt="{ row }">
+          <DictTag :tag="false" :value="row.zdrCzzt" :options="D_GS_ZDR_CZZT" />
+        </template>
+        <template #xtSjzt="{ row }">
+          <div>
+            {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}
+          </div>
+        </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 size="small" type="primary">查看</el-link>
+            >编辑</el-link
-          <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+          >
+          <el-link size="small" type="primary" @click="infoList('info', row)"
+            >查看</el-link
+          >
+          <el-link size="small" type="danger" @click="deleteRow(row)"
+            >删除</el-link
+          >
         </template>
       </MyTable>
       <Pages
@@ -80,6 +126,7 @@
       ></Pages>
     </div>
     <!-- 详情 -->
+    <addForm ref="addFormDiloag" />
     <DetailForm ref="detailDiloag" />
   </div>
 </template>
@@ -89,47 +136,179 @@ 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 DetailForm from "./components/addForm.vue";
+import addForm from "./components/addForm.vue";
+import DetailForm from "./components/infoForm.vue";
+
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import AddForm from "./components/addForm.vue";
 const { proxy } = getCurrentInstance();
+const {
+  D_GS_BK_SSJZ,
+  D_GS_ZDR_RYJB,
+  D_BZ_XB,
+  D_BZ_MZ,
+  D_BZ_XZQHDM,
+  D_GS_ZDR_BK_ZT,
+  D_GS_ZDR_CZZT
+} = proxy.$dict(
+  "D_GS_BK_SSJZ",
+  "D_GS_ZDR_RYJB",
+  "D_BZ_XB",
+  "D_BZ_MZ",
+  "D_BZ_XZQHDM",
+  "D_GS_ZDR_BK_ZT",
+  "D_GS_ZDR_CZZT"
+); //获取字典数据
 const detailDiloag = ref();
+const addFormDiloag = ref();
 const searchBox = ref(); //搜索框
-const btns = reactive(['一键布控','维护群体','矛盾化解','转指令','转线索','转督导','转合成','移交管控','批量导入','导出'])
+const btns = reactive([
+  "一键布控",
+  "维护群体",
+  "矛盾化解",
+  "转指令",
+  "转线索",
+  "转督导",
+  "转合成",
+  "移交管控",
+  "批量导入",
+  "导出"
+]);
 const searchConfiger = ref([
   {
     label: "姓名",
-    prop: "Name",
+    prop: "ryXm",
     placeholder: "请输入姓名",
     showType: "input"
   },
   {
     label: "身份证",
-    prop: "sfz",
+    prop: "rySfzh",
     placeholder: "请输入身份证",
     showType: "input"
   },
+  {
+    label: "户籍地",
+    prop: "hjdXz",
+    placeholder: "请输入户籍地",
+    showType: "input"
+  },
+  {
+    label: "户籍地派出所",
+    prop: "hjdPcsdm",
+    placeholder: "请输入户籍地派出所",
+    showType: "input"
+  },
+  {
+    label: "现居地",
+    prop: "xzdXz",
+    placeholder: "请输入现居地",
+    showType: "input"
+  },
+  {
+    label: "现居地派出所",
+    prop: "xzdPcsmc",
+    placeholder: "请输入现居地派出所",
+    showType: "input"
+  },
+  {
+    label: "入库开始时间",
+    prop: "startTime",
+    placeholder: "请选择入库开始时间",
+    showType: "date"
+  },
+  {
+    label: "入库结束时间",
+    prop: "endTime",
+    placeholder: "请输入入库结束时间",
+    showType: "date"
+  },
+  {
+    label: "人员级别",
+    prop: "zdrRyjb",
+    placeholder: "请输入人员级别",
+    showType: "select",
+    options: D_GS_ZDR_RYJB
+  },
+  {
+    label: "所属警种",
+    prop: "zdrSsjz",
+    placeholder: "请选择所属警种",
+    showType: "select",
+    options: D_GS_BK_SSJZ
+  },
+  {
+    label: "管辖单位",
+    prop: "gxSsbmmc",
+    placeholder: "请选择管辖单位",
+    showType: "input"
+  },
+  {
+    label: "涉及警种",
+    prop: "zdrSjjz",
+    placeholder: "请选择涉及警种",
+    showType: "select",
+    options: D_GS_BK_SSJZ,
+    multiple: true
+  },
+  {
+    label: "管辖民警姓名",
+    prop: "gkMjXm",
+    placeholder: "请输入管辖民警姓名",
+    showType: "input"
+  },
+  {
+    label: "管辖民警警号",
+    prop: "gkMjJh",
+    placeholder: "请输入管辖民警警号",
+    showType: "input"
+  },
+  {
+    label: "管辖民警联系方式",
+    prop: "gkMjLxfs",
+    placeholder: "请输入管辖民警联系方式",
+    showType: "input"
+  },
+  {
+    label: "管辖原因",
+    prop: "zdrLkyy",
+    placeholder: "请输入管辖原因",
+    showType: "input"
+  },
+  {
+    label: "被管控人联系方式",
+    prop: "ryLxdh",
+    placeholder: "请输入被管控人联系方式",
+    showType: "input"
+  },
+  {
+    label: "责任单位",
+    prop: "zrSsbmmc",
+    placeholder: "请选择责任单位",
+    showType: "input"
+  },
   {
     label: "人员标签大类",
-    prop: "bqdl",
+    prop: "bqDl",
     placeholder: "请选择人员标签大类",
     showType: "select"
   },
   {
     label: "人员标签细类",
-    prop: "bqxl",
+    prop: "bqXl",
     placeholder: "请选择人员标签细类",
     showType: "select"
-  },
+  }
 ]);
 
 const pageData = reactive({
   tableData: [
     {
-      img:'',
+      img: "",
       jbxx: "",
-      wkrs:'1/5'
+      wkrs: "1/5"
-    },
+    }
   ],
   keyCount: 0,
   tableConfiger: {
@@ -147,8 +326,8 @@ const pageData = reactive({
     { label: "重点人员信息", prop: "ryxx", showSolt: true },
     { label: "户籍居住信息", prop: "jzxx", showSolt: true },
     { label: "管辖单位", prop: "gxdw", showSolt: true },
-    { label: "处置状态", prop: "czzt"},
+    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
-    { label: "状态", prop: "status" }
+    { label: "状态", prop: "xtSjzt", showSolt: true }
   ]
 });
 
@@ -183,21 +362,28 @@ const changeSize = (val) => {
 
 // 获取列表
 const getList = (val) => {
-  // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // let url = '/mosty-lzcj/tbDwMbkf/queryList';
+  let url = "/mosty-gsxt/tbGsxtZdry/selectPage";
-  // qcckPost(data,url).then(res=>{
+  qcckGet(data, url)
-  //   pageData.tableData = res.records || [];
+    .then((res) => {
-  //   pageData.total = res.total;
+      pageData.tableData = res.records || [];
-  //   pageData.tableConfiger.loading = false;
+      pageData.total = res.total;
-  // }).catch(()=>{ pageData.tableConfiger.loading = false; })
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
 };
 
-// 详情
+//新增编辑
 const addEdit = (type, row) => {
+  addFormDiloag.value.init(type, row);
+};
+// 详情
+const infoList = (type, row) => {
   detailDiloag.value.init(type, row);
 };
-
 // 表格高度计算
 const tabHeightFn = () => {
   pageData.tableHeight =
@@ -212,7 +398,9 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
+.rowClass {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>
-  
-  
-  

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

@@ -3,95 +3,702 @@
     <div class="head_box">
       <span class="title">情报信息流转{{ title }} </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          v-if="typeOf == 'edit' || typeOf == 'add' || typeOf == 'report'"
+          >保存</el-button
+        >
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="form_cnt">
-      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
+      <FormMessage
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
+        <!-- 上报人员-->
+        <template #sbRyId>
+          <el-button
+            @click="openDialog('01', 'ry')"
+            v-if="typeOf == 'edit' || typeOf == 'add'"
+            >选择</el-button
+          >
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.ryList"
+              :tableColumn="tableDate.tableColumnRy"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.keyCountRy"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+            >
+              <template #ryMz="{ row }">
+                <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
+              </template>
+              <!-- 操作 -->
+              <template #controls="{ row }">
+                <el-link
+                  type="danger"
+                  @click="delDict(row.id)"
+                  v-if="typeOf == 'edit' || typeOf == 'add'"
+                  >删除</el-link
+                >
+              </template>
+            </MyTable>
           </div>
+        </template>
+        <!-- 人员标签模型-->
+        <template #bqList>
+          <el-button
+            @click="openDialog('01', 'bq')"
+            v-if="typeOf == 'edit' || typeOf == 'add'"
+            >选择</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)"
+                  v-if="typeOf == 'edit' || typeOf == 'add'"
+                  >删除</el-link
+                >
+              </template>
+            </MyTable>
+          </div>
+        </template>
+
+        <!-- 上报单位代码 -->
+        <template #sbDwDm>
+          <el-select
+            v-model="listQuery.sbDwDm"
+            placeholder="请选择上报单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 抄送单位代码 -->
+        <template #csDwDm>
+          <el-select
+            v-model="listQuery.csDwDm"
+            placeholder="请选择抄送单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 编制单位代码 -->
+        <template #bzDwDm>
+          <el-select
+            v-model="listQuery.bzDwDm"
+            placeholder="请选择编制单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+
+        <!-- 汇编报刊-->
+        <template #hbBk>
+          <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>
+    </div>
+    <!-- 标签列表弹窗 -->
+    <TagSelectorDialog
+      v-model="chooseShow"
+      ref="tagDialog"
+      @chooseDate="handleTagSelect"
+      :dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }"
+    />
+
+    <!-- 上报人员列表弹窗 -->
+    <DialogList
+      v-if="ryDialog"
+      :Single="true"
+      :roleIds="roleIds"
+      @chooseDate="chooseDate"
+      :titleValue="chooseTitle"
+      v-model="ryDialog"
+      bqDl="02"
+      :dic="{ D_BZ_MZ }"
+    ></DialogList>
   </div>
 </template>
 
 <script setup>
-import FormMessage from '@/components/aboutTable/FormMessage.vue'
+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 TagSelectorDialog from "@/components/aboutTable/TagSelectorDialog.vue";
+import DialogList from "./dialogList.vue";
+import { selectUserDeptPage } from "@/api/user-manage";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick,
+  shallowRef,
+  onBeforeUnmount,
+  watch
+} from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
   dic: Object
 });
+const chooseShow = ref(false); //选择弹窗
+
 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 ryDialog = ref(false); //选择弹窗
+
+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 dialogForm = ref(false); //弹窗
-const formData = ref([
+const title = ref(""); //弹窗标题
-  { label: "线索标题", prop: "xsbt", type: "input", },
+const typeOf = ref(""); //弹窗类型
-  { label: "线索编号", prop: "xsbh",  type: "input" },
+const formData = ref([]);
-  { label: "线索类型", prop: "xslx",  type: "select", options: []  },
+const deptList = ref([]); //部门列表
-  { label: "线索来源", prop: "xsly",  type: "input" },
+// 更新 formData 的函数
-  { label: "开始时间", prop: "kssj",  type: "datetime"},
+const updateFormData = () => {
-  { label: "结束时间", prop: "jssj",  type: "datetime"},
+  const isReport = typeOf.value === "report";
-  { label: "指向地点", prop: "zxdd",  type: "input" },
+  const isReportDetails = typeOf.value === "reportDetails";
-  { label: "群体名称", prop: "qtmc",  type: "input"  },
+  const isLeadDetails = typeOf.value === "leadDetails";
-  { label: "群体类型", prop: "qtlx",  type: "input"  },
+  // 判断是否应该全部禁用（reportDetails 或 leadDetails）
-  { label: "线索细类", prop: "xslx",  type: "input"  },
+  const shouldDisableAll = isReportDetails || isLeadDetails;
-  { label: "风险等级", prop: "fxdj",  type: "input"  },
+  const baseFields = isReportDetails
-  { label: "是否初报", prop: "qtmc",  type: "input"  },
+    ? [] // reportDetails 模式下不显示 baseFields
-  { label: "线索内容", prop: "nr",  type: "textarea",width: '100%' },
+    : [
-  { label: "报送编号", prop: "bsbh",  type: "input",},
+        {
-  { label: "上报单位", prop: "sbdw",  type: "input",},
+          label: "标签列表",
-  { label: "抄送单位", prop: "csdw",  type: "input",},
+          prop: "bqList",
-  { label: "承办人", prop: "cbr",  type: "input",},
+          type: "slot",
-  { label: "审核人", prop: "shr",  type: "input",},
+          width: "80%",
-  { label: "签发人", prop: "qfr",  type: "input",},
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
-]);
+        },
-const listQuery = ref({
+        {
-  sfbqdj: []
+          label: "上报人员",
-}); //表单
+          prop: "sbRyId",
+          type: "slot",
+          width: "80%",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "上报人员类型",
+          prop: "sbRyLx",
+          type: "select",
+          options: D_GS_XS_SBRYLX,
+          disabled: true // 原本就禁用的保持不变
+        },
+        {
+          label: "线索标题",
+          prop: "xsBt",
+          type: "input",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "线索编号",
+          prop: "xsBh",
+          type: "input",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "线索类型",
+          prop: "xsLx",
+          type: "select",
+          options: D_GS_XS_LX,
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "线索开始日期",
+          prop: "xsRqKs",
+          type: "date",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "线索截止日期",
+          prop: "xsRqJs",
+          type: "date",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "指向地点",
+          prop: "xsZxdd",
+          type: "input",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "群体名称",
+          prop: "xsQtmc",
+          type: "input",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "群体类型",
+          prop: "xsQtlx",
+          type: "select",
+          options: D_GS_ZDQT_LB,
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "风险等级",
+          prop: "xsFxdj",
+          type: "select",
+          options: D_GS_XS_FXDJ,
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "线索名称",
+          prop: "xsMc",
+          type: "input",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        },
+        {
+          label: "线索内容",
+          prop: "xsNr",
+          type: "textarea",
+          width: "100%",
+          disabled: isReport || shouldDisableAll // report 或详情模式时禁用
+        }
+      ];
+
+  const conditionalFields =
+    isReport || isReportDetails
+      ? [
+          {
+            label: "报送编号",
+            prop: "bsBh",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "报送日期",
+            prop: "bsRq",
+            type: "date",
+            disabled: isReportDetails
+          },
+          {
+            label: "是否初报",
+            prop: "bsSfCb",
+            type: "radio",
+            options: D_BZ_SF,
+            disabled: isReportDetails
+          },
+          {
+            label: "报送状态",
+            prop: "bsZt",
+            type: "select",
+            options: D_GS_RLQB_BJSB_BSZT,
+            disabled: isReportDetails
+          },
+          {
+            label: "上报单位",
+            prop: "sbDwMc",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "上报单位代码",
+            prop: "sbDwDm",
+            type: "slot",
+            disabled: isReportDetails
+          },
+          {
+            label: "抄送单位",
+            prop: "csDwMc",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "抄送单位代码",
+            prop: "csDwDm",
+            type: "slot",
+            disabled: isReportDetails
+          },
+          {
+            label: "编制单位",
+            prop: "bzDwMc",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "编制单位代码",
+            prop: "bzDwDm",
+            type: "slot",
+            disabled: isReportDetails
+          },
+          {
+            label: "承办人",
+            prop: "cbrXm",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "承办人身份证号",
+            prop: "cbrSfzh",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "审核人",
+            prop: "shrXm",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "审核人身份证号",
+            prop: "shrSfzh",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "签发人",
+            prop: "qfrXm",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "签发人身份证号",
+            prop: "qfrSfzh",
+            type: "input",
+            disabled: isReportDetails
+          },
+          {
+            label: "报送内容",
+            prop: "bsNr",
+            type: "textarea",
+            width: "100%",
+            disabled: isReportDetails
+          },
+          {
+            label: "汇编报刊",
+            prop: "hbBk",
+            type: "slot",
+            width: "100%",
+            disabled: isReportDetails
+          }
+        ]
+      : [];
+  // 最终表单数据
+  formData.value = [...baseFields, ...conditionalFields];
+};
+// 编辑器实例，必须用 shallowRef
+const editorRef = shallowRef();
+// 内容 HTML
+const valueHtml = ref("<p>hello</p>");
+const toolbarConfig = {};
+const editorConfig = ref({ placeholder: "请输入内容...", readOnly: false });
+
+const listQuery = ref({ sbRyLx: "06", xsLy: "02" }); //表单
 const loading = ref(false);
 const elform = ref();
-const title = ref("");
+const tagDialog = ref();
+const TYPE_TO_TITLE = {
+  add: "新增",
+  report: "上报",
+  edit: "编辑",
+  leadDetails: "详情", // 保持原逻辑
+  reportDetails: "上报详情" // 保持原逻辑
+};
 const rules = reactive({
   xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
 });
 const editpeo = ref();
-onMounted(() => {});
+onMounted(() => {
+  getdepartmentList();
+});
+
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
 // 初始化数据
-const init = (type, row,) => {
+const init = (type, row) => {
   dialogForm.value = true;
-  title.value = type == 'add' ? "新增" : "编辑";
+  title.value = TYPE_TO_TITLE[type] || "新增"; // 安全回退
+
+  typeOf.value = type;
+  if (typeOf == "reportDetails") {
+    editorRef.value.disable(); // 禁用
+    editorConfig.readOnly = true; // 禁用
+  }
+
   if (row) getDataById(row.id);
+  if (row.sbRyId) getDataRyId(row.sbRyId);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  // 根据 typeOf 的值决定调用哪个接口
-  //   listQuery.value = res;
+  const apiUrl =
-  // });
+    typeOf.value === "reportDetails"
-};
+      ? "/mosty-gsxt/tbGsxtRlqbBjsb/selectVoByXsId/" + id
-
+      : "/mosty-gsxt/tbGsxtXs/selectVoById/" + id;
-// 提交
+  qcckGet({}, apiUrl).then((res) => {
-const submit = () => {
+    listQuery.value = res;
-  elform.value.submit((data)=>{
+    tableDate.bqList = listQuery.value.bqList;
-    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
-    // let params = { ...data }
-    // qcckPost(params, url).then((res) => {
-    //   proxy.$message({ type: "success", message: title.value + "成功" });
-    //   emit("updateDate");
-    //   close();
-    // }).catch(() => {});
   });
 };
 
+// 根据id查询详情
+const getDataRyId = (id) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtJwry/" + id).then((res) => {
+    tableDate.ryList = [res];
+    listQuery.value.sbRyId = res.id;
+  });
+};
+// 提交
+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))
+        )
+      };
+    }
+
+    // 根据 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(() => {});
+  });
+};
+// 打开弹窗
+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 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;
+};
+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 close = () => {
   listQuery.value = {};
+  tableDate.bqList = [];
+  tableDate.ryList = [];
   dialogForm.value = false;
   loading.value = false;
 };
+const handleCreated = (editor) => {
+  editorRef.value = editor; // 记录 editor 实例，重要！
+};
+// 组件销毁时，也及时销毁编辑器
+onBeforeUnmount(() => {
+  const editor = editorRef.value;
+  if (editor == null) return;
+  editor.destroy();
+});
+// 初始化调用一次
+updateFormData();
+
+// 监听 title 变化
+watch(title, () => {
+  updateFormData();
+});
 defineExpose({ init });
 </script>
 
 <style lang="scss" scoped>
 @import "~@/assets/css/layout.scss";
 @import "~@/assets/css/element-plus.scss";
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
 </style>

src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/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.bqMc"
+            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/HumanIntelligence/CollectCrculate/index.vue

@@ -17,7 +17,11 @@
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"/>
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      />
     </div>
     <!-- 表格 -->
     <div class="tabBox">
@@ -28,13 +32,58 @@
         :key="pageData.keyCount"
         :tableConfiger="pageData.tableConfiger"
         :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
+        @chooseData="chooseData"
+      >
+        <template #xsLy="{ row }">
+          <DictTag :tag="false" :value="row.xsLy" :options="D_GS_XS_LY" />
+        </template>
+        <template #xsFxdj="{ row }">
+          <DictTag :tag="false" :value="row.xsFxdj" :options="D_GS_XS_FXDJ" />
+        </template>
+        <template #xsQtlx="{ row }">
+          <DictTag :tag="false" :value="row.xsQtlx" :options="D_GS_ZDQT_LB" />
+        </template>
+        <template #xsZtCz="{ row }">
+          <DictTag :tag="false" :value="row.xsZtCz" :options="D_GS_XS_CZZT" />
+        </template>
+        <template #xsZt="{ row }">
+          <DictTag :tag="false" :value="row.xsZt" :options="D_GS_XS_ZT" />
+        </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 size="small" type="primary">处置</el-link>
+            >编辑</el-link
-          <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+          >
-          <el-link size="small" type="warning" @click="transferClue(row)">采纳</el-link>
+          <el-link
+            size="small"
+            type="plain"
+            @click="addEdit('leadDetails', row)"
+            >线索详情</el-link
+          >
+          <el-link
+            size="small"
+            type="warning"
+            @click="addEdit('reportDetails', row)"
+            v-if="row.sfBjsb == 1"
+            >上报详情</el-link
+          >
+          <el-link
+            size="small"
+            type="primary"
+            @click="addEdit('report', row)"
+            v-if="row.sfBjsb == 0"
+            >上报</el-link
+          >
+          <el-link size="small" type="danger" @click="deleteRow(row)"
+            >删除</el-link
+          >
+          <el-link
+            size="small"
+            type="warning"
+            @click="transferClue(row)"
+            v-if="row.xsZt == '01'"
+            >采纳</el-link
+          >
         </template>
       </MyTable>
       <Pages
@@ -48,7 +97,16 @@
       ></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" />
+    <DetailForm ref="detailDiloag" @getList="getList" />
+    <el-dialog v-model="dialogVisible" title="是否采纳" width="500px">
+      <span>是否采纳该条数据</span>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="submitClue"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -61,16 +119,59 @@ import DetailForm from "./components/addForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 const { proxy } = getCurrentInstance();
+
+const { D_GS_XS_LY, D_GS_XS_FXDJ, D_GS_ZDQT_LB, D_GS_XS_CZZT, D_GS_XS_ZT } =
+  proxy.$dict(
+    "D_GS_XS_LY",
+    "D_GS_XS_FXDJ",
+    "D_GS_ZDQT_LB",
+    "D_GS_XS_CZZT",
+    "D_GS_XS_ZT"
+  ); //获取字典数据
+const dialogTitle = ref("新增信息"); //弹窗标题
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
-
+const dialogVisible = ref(false);
+const transferClueId = ref();
 const searchConfiger = ref([
-  { label: "线索名称", prop: 'clueTitle', placeholder: "请输入线索名称", showType: "input" },
+  {
-  { label: "线索内容", prop: 'semanticKeywords', placeholder: "请输入线索内容", showType: "input" },
+    label: "线索名称",
-  { label: "线索大类", prop: 'clueType', placeholder: "请选择线索大型", showType: "select" },
+    prop: "xsMc",
-  { label: "线索细类", prop: 'xsxl', placeholder: "请选择线索细类", showType: "select" },
+    placeholder: "请输入线索名称",
-  { label: "线索来源", prop: 'xsly', placeholder: "请选择线索来源", showType: "select" },
+    showType: "input"
-  { label: "线索风险等级", prop: 'xsfxdj', placeholder: "请选择线索风险等级", showType: "select" },
+  },
+  {
+    label: "线索内容",
+    prop: "xsNr",
+    placeholder: "请输入线索内容",
+    showType: "input"
+  },
+  {
+    label: "线索大类",
+    prop: "xsDl",
+    placeholder: "请选择线索大型",
+    showType: "input"
+  },
+  {
+    label: "线索细类",
+    prop: "xsXl",
+    placeholder: "请选择线索细类",
+    showType: "input"
+  },
+  {
+    label: "线索来源",
+    prop: "xsLy",
+    placeholder: "请选择线索来源",
+    showType: "select",
+    options: D_GS_XS_LY
+  },
+  {
+    label: "线索风险等级",
+    prop: "xsFxdj",
+    placeholder: "请选择线索风险等级",
+    showType: "select",
+    options: D_GS_XS_FXDJ
+  }
 ]);
 
 const pageData = reactive({
@@ -90,7 +191,8 @@ const pageData = reactive({
       reportUnit: "林芝公安局",
       reportTime: "2025/05/05",
       involvedCount: 2,
-      status: "未处置"
+      status: "未处置",
+      xsZt: "01"
     },
     {
       clueNo: "GBJD01",
@@ -138,32 +240,36 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 220,
+  controlsWidth: 350,
   tableColumn: [
-    { label: "线索编号", prop: "clueNo" },
+    { label: "线索编号", prop: "xsBh" },
-    { label: "线索名称", prop: "clueTitle" },
+    { label: "线索名称", prop: "xsMc" },
-    { label: "线索类型", prop: "clueType" },
+    // { label: "线索类型", prop: "xsQtlx", options: D_GS_ZDQT_LB },
-    { label: "线索来源", prop: "clueSource" },
+    { label: "线索来源", prop: "xsLy", showSolt: true },
-    { label: "风险等级", prop: "riskLevel" },
+    { label: "风险等级", prop: "xsFxdj", showSolt: true },
     { label: "开始时间", prop: "startTime" },
     { label: "结束时间", prop: "endTime" },
-    { label: "指向地点", prop: "targetLocation" },
+    { label: "指向地点", prop: "xsZxdd" },
-    { label: "线索内容", prop: "clueContent", width: 200 },
+    { label: "线索内容", prop: "xsNr" },
-    { label: "群体类型", prop: "attachmentType" },
+    { label: "群体类型", prop: "xsQtlx", showSolt: true },
-    { label: "群题名称", prop: "attachmentName" },
+    { label: "群体名称", prop: "xsQtmc" },
-    { label: "上报单位", prop: "reportUnit" },
+    { label: "上报单位", prop: "sbDwMc" },
-    { label: "上报时间", prop: "reportTime" },
+    { label: "上报时间", prop: "sbSj" },
-    { label: "涉及人数", prop: "involvedCount" },
+    { label: "涉及人数", prop: "xsSjrs" },
-    { label: "附件", prop: "involvedCount" },
+    { label: "附件", prop: "xsFj" },
-    { label: "处置状态", prop: "status" },
+    {
-    { label: "状态", prop: "status" }
+      label: "处置状态",
+      prop: "xsZtCz",
+      showSolt: true
+    },
+    { label: "状态", prop: "xsZt", showSolt: true }
   ]
-})
+});
 
 const queryFrom = ref({});
 
 onMounted(() => {
-  getList()
+  getList();
   tabHeightFn();
 });
 
@@ -171,35 +277,57 @@ onMounted(() => {
 const handleType = (val) => {
   pageData.keyCount++;
   pageData.pageConfiger.pageCurrent = 1;
-  getList()
+  getList();
-}
+};
 // 搜索
 const onSearch = (val) => {
-  queryFrom.value = {...val}
+  queryFrom.value = { ...val };
   pageData.pageConfiger.pageCurrent = 1;
-  getList()
+  getList();
-}
+};
 
+//采纳
+const transferClue = (row) => {
+  dialogVisible.value = true;
+  transferClueId.value = row.id;
+};
+
+const submitClue = () => {
+  dialogVisible.value = false;
+  qcckGet({}, "/mosty-gsxt/tbGsxtXs/adopt/" + transferClueId.value)
+    .then((res) => {
+      proxy.$message({ type: "success", message: "采纳成功" });
+      getList();
+      transferClueId.value = "";
+    })
+    .catch(() => {
+      transferClueId.value = "";
+    });
+};
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
-  getList()
+  getList();
-}
+};
 const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
-  getList()
+  getList();
-}
+};
 
 // 获取列表
 const getList = (val) => {
-  // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // let url = '/mosty-lzcj/tbDwMbkf/queryList';
+  let url = "/mosty-gsxt/tbGsxtXs/selectPage";
-  // qcckPost(data,url).then(res=>{
+  qcckGet(data, url)
-  //   pageData.tableData = res.records || [];
+    .then((res) => {
-  //   pageData.total = res.total;
+      pageData.tableData = res.records || [];
-  //   pageData.tableConfiger.loading = false;
+      pageData.total = res.total;
-  // }).catch(()=>{ pageData.tableConfiger.loading = false; })
+      pageData.tableConfiger.loading = false;
-}
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
 
 // 详情
 const addEdit = (type, row) => {
@@ -208,7 +336,8 @@ const addEdit = (type, row) => {
 
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  pageData.tableHeight =
+    window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };
@@ -220,5 +349,3 @@ const tabHeightFn = () => {
   background: rgba(0, 0, 0, 0.5) !important;
 }
 </style>
-
-

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

@@ -3,38 +3,100 @@
     <div class="head_box">
       <span class="title">社会信息人员建设管理{{ title }} </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          >保存</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>
+      <FormMessage
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      ></FormMessage>
     </div>
   </div>
 </template>
 
 <script setup>
 import { IdCard } from "@/utils/validate.js";
-import FormMessage from '@/components/aboutTable/FormMessage.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 {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
-  dic: Object,
+  dic: Object
 });
 const validateIdentity = () => {
   return (rule, value, callback) => {
     if (!value) {
-      return callback(new Error('身份证号不能为空'));
+      return callback(new Error("身份证号不能为空"));
     } else if (!/(^\d{15}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
       callback(new Error("输入的身份证长度或格式错误"));
     }
     //身份证城市
-    var aCity = {11: "北京",12: "天津",13: "河北",14: "山西",15: "内蒙古",21: "辽宁",22: "吉林",23: "黑龙江",31: "上海",32: "江苏",33: "浙江",34: "安徽",35: "福建",36: "江西",37: "山东",41: "河南",42: "湖北",43: "湖南",44: "广东",45: "广西",46: "海南",50: "重庆",51: "四川",52: "贵州",53: "云南",54: "西藏",61: "陕西",62: "甘肃",63: "青海",64: "宁夏",65: "新疆",71: "台湾",81: "香港",82: "澳门",91: "国外"};
+    var aCity = {
-    if (!aCity[parseInt(value?.substr(0, 2))]) callback(new Error("身份证地区非法"));
+      11: "北京",
+      12: "天津",
+      13: "河北",
+      14: "山西",
+      15: "内蒙古",
+      21: "辽宁",
+      22: "吉林",
+      23: "黑龙江",
+      31: "上海",
+      32: "江苏",
+      33: "浙江",
+      34: "安徽",
+      35: "福建",
+      36: "江西",
+      37: "山东",
+      41: "河南",
+      42: "湖北",
+      43: "湖南",
+      44: "广东",
+      45: "广西",
+      46: "海南",
+      50: "重庆",
+      51: "四川",
+      52: "贵州",
+      53: "云南",
+      54: "西藏",
+      61: "陕西",
+      62: "甘肃",
+      63: "青海",
+      64: "宁夏",
+      65: "新疆",
+      71: "台湾",
+      81: "香港",
+      82: "澳门",
+      91: "国外"
+    };
+    if (!aCity[parseInt(value?.substr(0, 2))])
+      callback(new Error("身份证地区非法"));
     // 出生日期验证
-    var sBirthday = ( value.substr(6, 4) + "-" + Number(value.substr(10, 2)) + "-" + Number(value.substr(12, 2))).replace(/-/g, "-"),
+    var sBirthday = (
+        value.substr(6, 4) +
+        "-" +
+        Number(value.substr(10, 2)) +
+        "-" +
+        Number(value.substr(12, 2))
+      ).replace(/-/g, "-"),
       d = new Date(sBirthday);
     let yyyy = d.getFullYear();
     let mm = d.getMonth() + 1;
@@ -47,18 +109,21 @@ const validateIdentity = () => {
       listQuery.value.ryCsrq = yyyy + "-" + month + "-" + dd;
     }
     // 身份证号码校验
-    var sum = 0, weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2],  codes = "10X98765432";
+    var sum = 0,
+      weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2],
+      codes = "10X98765432";
     for (var i = 0; i < value.length - 1; i++) {
       sum += value[i] * weights[i];
     }
     var last = codes[sum % 11]; //计算出来的最后一位身份证号码
     if (value[value.length - 1] !== last) {
-      listQuery.value.ryXb = ''
+      listQuery.value.ryXb = "";
       callback(new Error("输入的身份证号非法"));
     } else {
       if (value.length === 18) {
-        listQuery.value.ryCsrq= IdCard(value,1)
+        listQuery.value.ryCsrq = IdCard(value, 1);
-        listQuery.value.ryXb = parseInt(value.substr(16, 1)) % 2 === 1 ? "1" : "2";
+        listQuery.value.ryXb =
+          parseInt(value.substr(16, 1)) % 2 === 1 ? "1" : "2";
       }
     }
     callback();
@@ -75,9 +140,14 @@ const formData = ref([
   { label: "性别", prop: "ryXb", type: "select", options: props.dic.D_BZ_XB },
   { label: "民族", prop: "ryMz", type: "select", options: props.dic.D_BZ_MZ },
   { label: "学历", prop: "ryXl", type: "select", options: props.dic.D_BZ_WHCD },
-  { label: "政治面貌", prop: "ryZzmm",  type: "select", options: props.dic.D_BZ_ZZMM },
+  {
+    label: "政治面貌",
+    prop: "ryZzmm",
+    type: "select",
+    options: props.dic.D_BZ_ZZMM
+  },
   { label: "所在单位", prop: "rySzdw", type: "input" },
-  { label: "居住地地址", prop: "jzdDz",  type: "textarea",width:'100%' },
+  { label: "居住地地址", prop: "jzdDz", type: "textarea", width: "100%" }
 ]);
 const listQuery = ref({}); //表单
 const loading = ref(false);
@@ -87,22 +157,26 @@ const rules = reactive({
   gxbmDm: [{ required: true, message: "请选择管辖部门", trigger: "change" }],
   ryXm: [{ required: true, message: "请输入人员姓名", trigger: "blur" }],
   rySfzh: [
-    { required: true, message: "请输入人员身份证号", trigger: ["blur",'change'] },
+    {
-    { trigger: ["blur",'change'], validator: validateIdentity()}
+      required: true,
+      message: "请输入人员身份证号",
+      trigger: ["blur", "change"]
+    },
+    { trigger: ["blur", "change"], validator: validateIdentity() }
   ],
-  ...rule.phoneRule({ require: true, validator: true }, "ryLxdh"), // 是否必填 是否进行校验 可以传第二个参数
+  ...rule.phoneRule({ require: true, validator: true }, "ryLxdh") // 是否必填 是否进行校验 可以传第二个参数
 });
 onMounted(() => {});
 
 // 初始化数据
-const init = (type, row,) => {
+const init = (type, row) => {
   dialogForm.value = true;
-  title.value = type == 'add' ? "新增" : "编辑";
+  title.value = type == "add" ? "新增" : "编辑";
   if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  qcckGet({}, '/mosty-gsxt/tbGsxtJwry/'+id).then((res) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtJwry/" + id).then((res) => {
     listQuery.value = res;
   });
 };
@@ -110,13 +184,18 @@ const getDataById = (id) => {
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
-    let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtJwry/save':'/mosty-gsxt/tbGsxtJwry/update';
+    let url =
-    let params = { ...data,ryLx: '01' }
+      title.value == "新增"
-    qcckPost(params, url).then((res) => {
+        ? "/mosty-gsxt/tbGsxtJwry/save"
+        : "/mosty-gsxt/tbGsxtJwry/update";
+    let params = { ...data, ryLx: "01" };
+    qcckPost(params, url)
+      .then((res) => {
         proxy.$message({ type: "success", message: title.value + "成功" });
         emit("updateDate");
         close();
-    }).catch(() => {});
+      })
+      .catch(() => {});
   });
 };
 

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

@@ -18,7 +18,11 @@
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"/>
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      />
     </div>
     <!-- 表格 -->
     <div class="tabBox">
@@ -29,14 +33,19 @@
         :key="pageData.keyCount"
         :tableConfiger="pageData.tableConfiger"
         :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
+        @chooseData="chooseData"
+      >
         <template #ryMz="{ row }">
           <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
         </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 size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
+            >编辑</el-link
+          >
+          <el-link size="small" type="danger" @click="deleteRow(row.id)"
+            >删除</el-link
+          >
         </template>
       </MyTable>
       <Pages
@@ -50,7 +59,12 @@
       ></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm v-if="show" @updateDate="getList" ref="detailDiloag" :dic="{D_BZ_WHCD,D_BZ_MZ, D_BZ_XB,D_BZ_ZZMM}" />
+    <DetailForm
+      v-if="show"
+      @updateDate="getList"
+      ref="detailDiloag"
+      :dic="{ D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM }"
+    />
   </div>
 </template>
 
@@ -62,16 +76,26 @@ import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/addForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
-import { CirclePlus, Upload, Download } from '@element-plus/icons-vue';
+import { CirclePlus, Upload, Download } from "@element-plus/icons-vue";
-import { ElMessage } from 'element-plus';
+import { ElMessage } from "element-plus";
 const { proxy } = getCurrentInstance();
-const { D_BZ_WHCD,D_BZ_MZ, D_BZ_XB,D_BZ_ZZMM } = proxy.$dict("D_BZ_WHCD",'D_BZ_MZ','D_BZ_XB','D_BZ_ZZMM'); //获取字典数据
+const { D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM } = proxy.$dict(
+  "D_BZ_WHCD",
+  "D_BZ_MZ",
+  "D_BZ_XB",
+  "D_BZ_ZZMM"
+); //获取字典数据
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
-const show = ref(false)
+const show = ref(false);
 const searchConfiger = ref([
-  { label: "姓名", prop: 'ryXm', placeholder: "请输入姓名", showType: "input" },
+  { label: "姓名", prop: "ryXm", placeholder: "请输入姓名", showType: "input" },
-  { label: "身份证号", prop: 'rySfzh', placeholder: "请输入身份证号", showType: "input" },
+  {
+    label: "身份证号",
+    prop: "rySfzh",
+    placeholder: "请输入身份证号",
+    showType: "input"
+  }
 ]);
 
 const pageData = reactive({
@@ -93,65 +117,73 @@ const pageData = reactive({
     { label: "联系电话", prop: "ryLxdh" },
     { label: "身份证号", prop: "rySfzh" },
     { label: "民族", prop: "ryMz", showSolt: true },
-    { label: "居住地址", prop: "jzdDz" },
+    { label: "居住地址", prop: "jzdDz" }
   ]
-})
+});
 
 const queryFrom = ref({});
 
 onMounted(() => {
-  getList()
+  getList();
   tabHeightFn();
 });
 
 // 搜索
 const onSearch = (val) => {
-  queryFrom.value = {...val}
+  queryFrom.value = { ...val };
   pageData.pageConfiger.pageCurrent = 1;
-  getList()
+  getList();
-}
+};
 
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
-  getList()
+  getList();
-}
+};
 const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
-  getList()
+  getList();
-}
+};
 
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  qcckGet(data,'/mosty-gsxt/tbGsxtJwry/selectPage').then(res=>{
+  qcckGet(data, "/mosty-gsxt/tbGsxtJwry/selectPage")
+    .then((res) => {
       pageData.tableData = res.records || [];
       pageData.total = res.total;
       pageData.tableConfiger.loading = false;
-  }).catch(()=>{ pageData.tableConfiger.loading = false; })
+    })
-}
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
 
 // 删除
 const deleteRow = (id) => {
-  proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
+  proxy
-    qcckDelete({}, '/mosty-gsxt/tbGsxtJwry/'+id).then(()=>{
+    .$confirm("确定要删除", "警告", { type: "warning" })
+    .then(() => {
+      qcckDelete({}, "/mosty-gsxt/tbGsxtJwry/" + id).then(() => {
         proxy.$message({ type: "success", message: "删除成功" });
         getList();
+      });
     })
-  }).catch(() => {});
+    .catch(() => {});
-}
+};
 
 // 详情
 const addEdit = (type, row) => {
   show.value = true;
   nextTick(() => {
     detailDiloag.value.init(type, 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/HumanIntelligence/TaskScheduling/components/addForm.vue

@@ -3,86 +3,340 @@
     <div class="head_box">
       <span class="title">人力情报信息搜索任务调度{{ title }} </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          >保存</el-button
+        >
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="form_cnt">
-      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
+      <FormMessage
+        :formList="formData"
+        v-model="listQuery"
+        ref="elform"
+        :rules="rules"
+      >
+        <!-- 上报单位代码 -->
+        <template #bsDwDm>
+          <el-select
+            v-model="listQuery.bsDwDm"
+            placeholder="请选择上报单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 上报单位代码 -->
+        <template #ssbmdm>
+          <el-select
+            v-model="listQuery.ssbmdm"
+            placeholder="请选择所属单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 线索列表-->
+        <template #xsList>
+          <el-button @click="openDialog()">选择</el-button>
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.xsList"
+              :tableColumn="tableDate.tableColumn"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.keyCount"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+              @chooseData="chooseData"
+            >
+              <template #xsLy="{ row }">
+                <DictTag :tag="false" :value="row.xsLy" :options="D_GS_XS_LY" />
+              </template>
+              <template #xsFxdj="{ row }">
+                <DictTag
+                  :tag="false"
+                  :value="row.xsFxdj"
+                  :options="D_GS_XS_FXDJ"
+                />
+              </template>
+
+              <template #xsQtlx="{ row }">
+                <DictTag
+                  :tag="false"
+                  :value="row.xsQtlx"
+                  :options="D_GS_ZDQT_LB"
+                />
+              </template>
+              <template #xsZtCz="{ row }">
+                <DictTag
+                  :tag="false"
+                  :value="row.xsZtCz"
+                  :options="D_GS_XS_CZZT"
+                />
+              </template>
+              <template #xsZt="{ row }">
+                <DictTag :tag="false" :value="row.xsZt" :options="D_GS_XS_ZT" />
+              </template>
+              <!-- 操作 -->
+              <template #controls="{ row }">
+                <el-link size="small" type="danger" @click="delDictItem(row.id)"
+                  >删除</el-link
+                >
+                <el-link
+                  size="small"
+                  type="warning"
+                  @click="transferClue(row)"
+                  v-if="row.xsZt == '01'"
+                  >采纳</el-link
+                >
+              </template>
+            </MyTable>
+          </div>
+        </template>
+      </FormMessage>
+      <!-- 列表弹窗 -->
+      <DialogList
+        :Single="false"
+        :roleIds="roleIds"
+        v-if="chooseShow"
+        @chooseDate="chooseDate"
+        :titleValue="chooseTitle"
+        v-model="chooseShow"
+        :bqLx="chooseType"
+        bqDl="02"
+      ></DialogList>
     </div>
   </div>
 </template>
 
 <script setup>
-import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import DialogList from "./dialogList.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
 import * as rule from "@/utils/rules.js";
-import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
+import { selectUserDeptPage } from "@/api/user-manage";
+
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
   dic: Object
 });
 const { proxy } = getCurrentInstance();
+const {
+  D_GS_RLQB_RWDD_LX,
+  D_GS_RLQB_RWDD_LY,
+  D_GS_RLQB_RWDD_YZCD,
+  D_GS_XS_FXDJ,
+  D_GS_XS_CZZT,
+  D_GS_XS_ZT,
+  D_GS_XS_LY,
+  D_GS_ZDQT_LB
+} = proxy.$dict(
+  "D_GS_RLQB_RWDD_LX",
+  "D_GS_RLQB_RWDD_LY",
+  "D_GS_RLQB_RWDD_YZCD",
+  "D_GS_XS_FXDJ",
+  "D_GS_XS_CZZT",
+  "D_GS_XS_ZT",
+  "D_GS_XS_LY",
+  "D_GS_ZDQT_LB"
+);
+const tableDate = reactive({
+  xsList: [], //表格数据
+  rykeyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false,
+    size: "small",
+    border: true
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 220, //操作栏宽度
+  tableColumn: [
+    { label: "线索名称", prop: "xsMc", width: "100px" },
+    { label: "线索编号", prop: "xsBh", width: "100px" },
+    { label: "线索来源", prop: "xsLy", showSolt: true, width: "100px" },
+    { label: "风险等级", prop: "xsFxdj", showSolt: true, width: "100px" },
+    { label: "开始时间", prop: "startTime", width: "100px" },
+    { label: "结束时间", prop: "ryXjd", width: "100px" },
+    { label: "指向地点", prop: "xsZxdd", width: "100px" },
+    { label: "线索内容", prop: "xsNr", width: "100px" },
+    { label: "群体类型", prop: "xsQtlx", showSolt: true, width: "100px" },
+    { label: "群体名称", prop: "xsQtmc", width: "100px" },
+    { label: "上报单位", prop: "sbDwMc", width: "100px" },
+    { label: "上报时间", prop: "sbSj", width: "100px" },
+    { label: "涉及人数", prop: "xsSjrs", width: "100px" },
+    { label: "处置状态", prop: "xsZtCz", width: "100px", showSolt: true },
+    { label: "状态", prop: "xsZt", width: "100px", showSolt: true }
+  ]
+});
 const dialogForm = ref(false); //弹窗
+const chooseTitle = ref(""); //选择弹窗
 const formData = ref([
-  { label: "任务标题", prop: "rwbt",  type: "input" },
+  { label: "报送单位代码", prop: "bsDwDm", type: "slot" },
-  { label: "任务编号", prop: "rwbh", type: "input", },
+  { label: "报送单位名称", prop: "bsDwMc", type: "input" },
-  { label: "任务类型", prop: "rwlx",  type: "select", options: []  },
+  { label: "任务标题", prop: "rwBt", type: "input" },
-  { label: "任务来源", prop: "xsly",  type: "input" },
+  { label: "任务编号", prop: "rwBh", type: "input" },
-  { label: "反馈截止时间", prop: "kssj",  type: "datetime"},
+  {
-  { label: "严重程度", prop: "yzcd",  type: "select", options: []},
+    label: "任务类型",
-  { label: "任务类型细类", prop: "rwlxxl",  type: "select", options: []},
+    prop: "rwLx",
-  { label: "状态", prop: "cpcd",  type: "select", options: []},
+    type: "select",
-  { label: "任务内容", prop: "nr",  type: "textarea",width: '100%' },
+    options: D_GS_RLQB_RWDD_LX
-  { label: "备注", prop: "bz",  type: "textarea",width: '100%' },
+  },
+  {
+    label: "任务来源",
+    prop: "rwLy",
+    type: "select",
+    options: D_GS_RLQB_RWDD_LY
+  },
+  { label: "反馈开始时间", prop: "rwSjKs", type: "datetime" },
+  { label: "反馈截止时间", prop: "rwSjFkjz", type: "datetime" },
+  {
+    label: "严重程度",
+    prop: "rwYzcd",
+    type: "select",
+    options: D_GS_RLQB_RWDD_YZCD
+  },
+  { label: "所属单位代码", prop: "ssbmdm", type: "slot" },
+  { label: "所属单位名称", prop: "ssbmmc", type: "input" },
+  { label: "任务内容", prop: "rwNr", type: "textarea", width: "100%" },
+  { label: "线索列表", prop: "xsList", type: "slot", width: "80%" }
 ]);
-const listQuery = ref({
+const listQuery = ref({}); //表单
-  sfbqdj: []
+const roleIds = ref([]); //角色id
-}); //表单
+
+const chooseShow = ref(false); //选择弹窗
 const loading = ref(false);
 const elform = ref();
 const title = ref("");
+const deptList = ref([]); //部门列表
+const chooseType = ref("01"); //选择弹窗类型
+
 const rules = reactive({
   rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
 });
 const editpeo = ref();
-onMounted(() => {});
+onMounted(() => {
+  getdepartmentList();
+});
 // 初始化数据
-const init = (type, row,) => {
+const init = (type, row) => {
   dialogForm.value = true;
-  title.value = type == 'add' ? "新增" : "编辑";
+  title.value = type == "add" ? "新增" : "编辑";
   if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtRlqbRwdd/selectVoById/" + id).then((res) => {
-  //   listQuery.value = res;
+    listQuery.value = res;
-  // });
+    tableDate.xsList = listQuery.value.xsList;
-};
-
-// 提交
-const submit = () => {
-  elform.value.submit((data)=>{
-    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
-    // let params = { ...data }
-    // qcckPost(params, url).then((res) => {
-    //   proxy.$message({ type: "success", message: title.value + "成功" });
-    //   emit("updateDate");
-    //   close();
-    // }).catch(() => {});
   });
 };
 
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    data.xsList = tableDate.xsList.map((item) => item.id);
+    let url =
+      title.value == "新增"
+        ? "/mosty-gsxt/tbGsxtRlqbRwdd/save"
+        : "/mosty-gsxt/tbGsxtRlqbRwdd/update";
+    let params = { ...data };
+    qcckPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("updateDate");
+        close();
+      })
+      .catch(() => {});
+  });
+};
+
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  chooseTitle.value = "请选择线索列表";
+  roleIds.value = tableDate.xsList.map((item) => item.id);
+};
+const handleAdd = () => {
+  dialogFormVisible.value = true;
+  dialogTitle.value = "新增信息";
+};
+
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  tableDate.xsList = data.xsList ?? [];
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+  tableDate.tableData = data.bkdxList;
+  console.log(listQuery.value);
+};
+// 选择数据
+const chooseDate = (data) => {
+  console.log(data, "选择数据");
+  tableDate.xsList = data;
+  listQuery.value.xsList = tableDate.xsList.map((item) => item.id);
+};
 // 关闭
 const close = () => {
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;
 };
-defineExpose({ init });
+// 删除
+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);
+};
+defineExpose({ init, setFormData });
 </script>
 
 <style lang="scss" scoped>
 @import "~@/assets/css/layout.scss";
 @import "~@/assets/css/element-plus.scss";
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
 </style>

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

@@ -0,0 +1,269 @@
+<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.xsMc"
+            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="xsMc" align="center" label="线索名称" />
+          <el-table-column prop="xsBh" align="center" label="线索编号" />
+          <el-table-column prop="xsLy" align="center" label="线索来源">
+            <template #default="{ row }">
+              <DictTag :value="row.xsLy" :tag="false" :options="D_GS_XS_LY" />
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="xsFxdj" align="center" label="风险等级">
+            <template #default="{ row }">
+              <DictTag
+                :value="row.xsFxdj"
+                :tag="false"
+                :options="D_GS_XS_FXDJ"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="startTime" align="center" label="开始时间" />
+          <el-table-column prop="endTime" align="center" label="结束时间" />
+          <el-table-column prop="xsZxdd" align="center" label="指向地点" />
+          <el-table-column prop="xsNr" align="center" label="线索内容" />
+          <el-table-column prop="xsQtlx" align="center" label="群体类型">
+            <template #default="{ row }">
+              <DictTag
+                :value="row.xsQtlx"
+                :tag="false"
+                :options="D_GS_ZDQT_LB"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="xsQtmc" align="center" label="群体名称" />
+          <el-table-column prop="sbDwMc" align="center" label="上报单位" />
+          <el-table-column prop="sbSj" align="center" label="上报时间" />
+          <el-table-column prop="xsSjrs" align="center" label="涉及人数" />
+          <el-table-column prop="xsZtCz" align="center" label="处置状态">
+            <template #default="{ row }">
+              <DictTag
+                :value="row.xsZtCz"
+                :tag="false"
+                :options="D_GS_XS_CZZT"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="xsZt" align="center" label="状态">
+            <template #default="{ row }">
+              <DictTag :value="row.xsZt" :tag="false" :options="D_GS_XS_ZT" />
+            </template>
+          </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, getCurrentInstance } from "vue";
+import { qcckGet } from "@/api/qcckApi.js";
+const { proxy } = getCurrentInstance();
+const { D_GS_XS_LY, D_GS_XS_FXDJ, D_GS_ZDQT_LB, D_GS_XS_CZZT, D_GS_XS_ZT } =
+  proxy.$dict(
+    "D_GS_XS_LY",
+    "D_GS_XS_FXDJ",
+    "D_GS_ZDQT_LB",
+    "D_GS_XS_CZZT",
+    "D_GS_XS_ZT"
+  ); //获取字典数据
+
+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);
+  let data = { type: props.LeaderType, userList: userList };
+  emits("chooseDateLeader", data);
+  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/tbGsxtXs/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;
+}
+</style>

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

@@ -0,0 +1,285 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">人力情报信息搜索任务调度详情 </span>
+      <div>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage
+        :formList="formData"
+        v-model="listQuery"
+        ref="elform"
+        :rules="rules"
+      >
+        <!-- 上报单位代码 -->
+        <template #bsDwDm>
+          <el-select
+            v-model="listQuery.bsDwDm"
+            placeholder="请选择上报单位代码"
+            style="width: 240px"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 上报单位代码 -->
+        <template #ssbmdm>
+          <el-select
+            v-model="listQuery.ssbmdm"
+            placeholder="请选择所属单位代码"
+            style="width: 240px"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+        <!-- 线索列表-->
+        <template #xsList>
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.xsList"
+              :tableColumn="tableDate.tableColumn"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.keyCount"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+              @chooseData="chooseData"
+            >
+              <template #xsLy="{ row }">
+                <DictTag :tag="false" :value="row.xsLy" :options="D_GS_XS_LY" />
+              </template>
+              <template #xsFxdj="{ row }">
+                <DictTag
+                  :tag="false"
+                  :value="row.xsFxdj"
+                  :options="D_GS_XS_FXDJ"
+                />
+              </template>
+
+              <template #xsQtlx="{ row }">
+                <DictTag
+                  :tag="false"
+                  :value="row.xsQtlx"
+                  :options="D_GS_ZDQT_LB"
+                />
+              </template>
+              <template #xsZtCz="{ row }">
+                <DictTag
+                  :tag="false"
+                  :value="row.xsZtCz"
+                  :options="D_GS_XS_CZZT"
+                />
+              </template>
+              <template #xsZt="{ row }">
+                <DictTag :tag="false" :value="row.xsZt" :options="D_GS_XS_ZT" />
+              </template>
+            </MyTable>
+          </div>
+        </template>
+      </FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import DialogList from "./dialogList.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import * as rule from "@/utils/rules.js";
+import { selectUserDeptPage } from "@/api/user-manage";
+
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const {
+  D_GS_RLQB_RWDD_LX,
+  D_GS_RLQB_RWDD_LY,
+  D_GS_RLQB_RWDD_YZCD,
+  D_GS_XS_FXDJ,
+  D_GS_XS_CZZT,
+  D_GS_XS_ZT,
+  D_GS_XS_LY,
+  D_GS_ZDQT_LB
+} = proxy.$dict(
+  "D_GS_RLQB_RWDD_LX",
+  "D_GS_RLQB_RWDD_LY",
+  "D_GS_RLQB_RWDD_YZCD",
+  "D_GS_XS_FXDJ",
+  "D_GS_XS_CZZT",
+  "D_GS_XS_ZT",
+  "D_GS_XS_LY",
+  "D_GS_ZDQT_LB"
+);
+const tableDate = reactive({
+  xsList: [], //表格数据
+  rykeyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false,
+    size: "small",
+    border: true
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 220, //操作栏宽度
+  tableColumn: [
+    { label: "线索名称", prop: "xsMc", width: "100px" },
+    { label: "线索编号", prop: "xsBh", width: "100px" },
+    { label: "线索来源", prop: "xsLy", showSolt: true, width: "100px" },
+    { label: "风险等级", prop: "xsFxdj", showSolt: true, width: "100px" },
+    { label: "开始时间", prop: "startTime", width: "100px" },
+    { label: "结束时间", prop: "ryXjd", width: "100px" },
+    { label: "指向地点", prop: "xsZxdd", width: "100px" },
+    { label: "线索内容", prop: "xsNr", width: "100px" },
+    { label: "群体类型", prop: "xsQtlx", showSolt: true, width: "100px" },
+    { label: "群体名称", prop: "xsQtmc", width: "100px" },
+    { label: "上报单位", prop: "sbDwMc", width: "100px" },
+    { label: "上报时间", prop: "sbSj", width: "100px" },
+    { label: "涉及人数", prop: "xsSjrs", width: "100px" },
+    { label: "处置状态", prop: "xsZtCz", width: "100px", showSolt: true },
+    { label: "状态", prop: "xsZt", width: "100px", showSolt: true }
+  ]
+});
+const dialogForm = ref(false); //弹窗
+const chooseTitle = ref(""); //选择弹窗
+const formData = ref([
+  { label: "报送单位代码", prop: "bsDwDm", type: "slot", disabled: true },
+  { label: "报送单位名称", prop: "bsDwMc", type: "input", disabled: true },
+  { label: "任务标题", prop: "rwBt", type: "input", disabled: true },
+  { label: "任务编号", prop: "rwBh", type: "input", disabled: true },
+  {
+    label: "任务类型",
+    prop: "rwLx",
+    type: "select",
+    options: D_GS_RLQB_RWDD_LX,
+    disabled: true
+  },
+  {
+    label: "任务来源",
+    prop: "rwLy",
+    type: "select",
+    options: D_GS_RLQB_RWDD_LY,
+    disabled: true
+  },
+  { label: "反馈开始时间", prop: "rwSjKs", type: "datetime", disabled: true },
+  { label: "反馈截止时间", prop: "rwSjFkjz", type: "datetime", disabled: true },
+  {
+    label: "严重程度",
+    prop: "rwYzcd",
+    type: "select",
+    options: D_GS_RLQB_RWDD_YZCD,
+    disabled: true
+  },
+  { label: "所属单位代码", prop: "ssbmdm", type: "slot", disabled: true },
+  { label: "所属单位名称", prop: "ssbmmc", type: "input", disabled: true },
+  {
+    label: "任务内容",
+    prop: "rwNr",
+    type: "textarea",
+    width: "100%",
+    disabled: true
+  },
+  {
+    label: "线索列表",
+    prop: "xsList",
+    type: "slot",
+    width: "80%",
+    disabled: true
+  }
+]);
+const listQuery = ref({}); //表单
+const roleIds = ref([]); //角色id
+
+const chooseShow = ref(false); //选择弹窗
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const deptList = ref([]); //部门列表
+const chooseType = ref("01"); //选择弹窗类型
+
+const rules = reactive({
+  rwbt: [{ required: true, message: "请输入任务标题", trigger: "blur" }]
+});
+const editpeo = ref();
+onMounted(() => {
+  getdepartmentList();
+});
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtRlqbRwdd/selectVoById/" + id).then((res) => {
+    listQuery.value = res;
+    tableDate.xsList = listQuery.value.xsList;
+  });
+};
+
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
+
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  tableDate.xsList = data.xsList ?? [];
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+  tableDate.tableData = data.bkdxList;
+};
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+defineExpose({ init, setFormData });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
+</style>

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

@@ -17,7 +17,27 @@
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount"/>
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      >
+        <!-- 所属单位 -->
+        <template #ssbmdm>
+          <el-select
+            v-model="listQuery.ssbmdm"
+            placeholder="请选择上报单位代码"
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in deptList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </el-select>
+        </template>
+      </Search>
     </div>
     <!-- 表格 -->
     <div class="tabBox">
@@ -28,13 +48,40 @@
         :key="pageData.keyCount"
         :tableConfiger="pageData.tableConfiger"
         :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
+        @chooseData="chooseData"
+      >
+        <template #rwLy="{ row }">
+          <DictTag
+            :tag="false"
+            :value="row.rwLy"
+            :options="D_GS_RLQB_RWDD_LY"
+          />
+        </template>
+        <template #rwYzcd="{ row }">
+          <DictTag
+            :tag="false"
+            :value="row.rwYzcd"
+            :options="D_GS_RLQB_RWDD_YZCD"
+          />
+        </template>
+        <template #rwZt="{ row }">
+          <DictTag
+            :tag="false"
+            :value="row.rwZt"
+            :options="D_GS_RLQB_RWDD_ZT"
+          />
+        </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 size="small" type="primary">处置</el-link>
+            >编辑</el-link
-          <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+          >
-          <el-link size="small" type="warning" @click="transferClue(row)">采纳</el-link>
+          <el-link size="small" type="primary" @click="infoList('info', row)"
+            >详情</el-link
+          >
+          <el-link size="small" type="danger" @click="deleteRow(row)"
+            >删除</el-link
+          >
         </template>
       </MyTable>
       <Pages
@@ -47,8 +94,10 @@
         }"
       ></Pages>
     </div>
-    <!-- 详情 -->
+    <!-- 新增编辑 -->
-    <DetailForm ref="detailDiloag" />
+    <DetailForm ref="detailDiloag" @updateDate="getList()" />
+    <!-- 新增编辑 -->
+    <InfoForm ref="infoDiloag" />
   </div>
 </template>
 
@@ -59,18 +108,64 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/addForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import { selectUserDeptPage } from "@/api/user-manage";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import InfoForm from "./components/infoForm.vue";
 const { proxy } = getCurrentInstance();
+const { D_GS_RLQB_RWDD_LY, D_GS_RLQB_RWDD_YZCD, D_GS_RLQB_RWDD_ZT } =
+  proxy.$dict("D_GS_RLQB_RWDD_LY", "D_GS_RLQB_RWDD_YZCD", "D_GS_RLQB_RWDD_ZT"); //获取字典数据
+
 const detailDiloag = ref();
+const infoDiloag = ref();
 const searchBox = ref(); //搜索框
+const deptList = ref([]); //部门列表
 
 const searchConfiger = ref([
-  { label: "所属单位", prop: 'belongUnit', placeholder: "请选择所属单位", showType: "select" },
+  {
-  { label: "任务标题", prop: 'taskTitle', placeholder: "请输入任务标题", showType: "input" },
+    label: "所属单位",
-  { label: "任务编号", prop: 'taskNo', placeholder: "请输入任务编号", showType: "input" },
+    prop: "ssbmdm",
-  { label: "任务内容", prop: 'taskContent', placeholder: "请输入任务内容", showType: "input" },
+    placeholder: "请选择所属单位",
-  { label: "任务来源", prop: 'taskSource', placeholder: "请选择任务来源", showType: "select" },
+    showType: "department"
-  { label: "严重程度", prop: 'severity', placeholder: "请选择严重程度", showType: "select" },
+  },
+  {
+    label: "任务标题",
+    prop: "rwBt",
+    placeholder: "请输入任务标题",
+    showType: "input"
+  },
+  {
+    label: "任务编号",
+    prop: "rwBh",
+    placeholder: "请输入任务编号",
+    showType: "input"
+  },
+  {
+    label: "任务内容",
+    prop: "rwNr",
+    placeholder: "请输入任务内容",
+    showType: "input"
+  },
+  {
+    label: "任务来源",
+    prop: "rwLy",
+    placeholder: "请选择任务来源",
+    showType: "select",
+    options: D_GS_RLQB_RWDD_LY
+  },
+  {
+    label: "严重程度",
+    prop: "rwYzcd",
+    placeholder: "请选择严重程度",
+    showType: "select",
+    options: D_GS_RLQB_RWDD_YZCD
+  },
+  {
+    label: "任务状态",
+    prop: "rwZt",
+    placeholder: "请选择任务状态",
+    showType: "select",
+    options: D_GS_RLQB_RWDD_ZT
+  }
 ]);
 
 const pageData = reactive({
@@ -88,68 +183,86 @@ const pageData = reactive({
   },
   controlsWidth: 220,
   tableColumn: [
-    { label: "任务编号", prop: "taskNo" },
+    { label: "任务编号", prop: "rwBh" },
-    { label: "任务标题", prop: "taskTitle" },
+    { label: "任务标题", prop: "rwBt" },
-    { label: "任务内容", prop: "taskContent", width: 200 },
+    { label: "任务内容", prop: "rwNr", width: 200 },
-    { label: "任务来源", prop: "taskSource" },
+    { label: "任务来源", prop: "rwLy", showSolt: true },
-    { label: "严重程度", prop: "severity" },
+    { label: "严重程度", prop: "rwYzcd", showSolt: true },
-    { label: "处理情况", prop: "processStatus" },
+    // { label: "处理情况", prop: "processStatus" },
-    { label: "上报时间", prop: "reportTime" },
+    { label: "上报时间", prop: "sbSj" },
-    { label: "采集状态", prop: "collectStatus" },
+    // { label: "采集状态", prop: "collectStatus" },
-    { label: "填充部门", prop: "fillDepartment" },
+    // { label: "填充部门", prop: "fillDepartment" },
-    { label: "状态", prop: "status" }
+    { label: "状态", prop: "rwZt", showSolt: true }
   ]
-})
+});
 
 const queryFrom = ref({});
 
 onMounted(() => {
-  getList()
+  getList();
   tabHeightFn();
+  getdepartmentList();
 });
-
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
 //选择类型
 const handleType = (val) => {
   pageData.keyCount++;
   pageData.pageConfiger.pageCurrent = 1;
-  getList()
+  getList();
-}
+};
 // 搜索
 const onSearch = (val) => {
-  queryFrom.value = {...val}
+  queryFrom.value = { ...val };
   pageData.pageConfiger.pageCurrent = 1;
-  getList()
+  getList();
-}
+};
 
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
-  getList()
+  getList();
-}
+};
 const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
-  getList()
+  getList();
-}
+};
 
 // 获取列表
 const getList = (val) => {
   // pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // let url = '/mosty-lzcj/tbDwMbkf/queryList';
+  let url = "/mosty-gsxt/tbGsxtRlqbRwdd/selectPage";
-  // qcckPost(data,url).then(res=>{
+  qcckGet(data, url)
-  //   pageData.tableData = res.records || [];
+    .then((res) => {
-  //   pageData.total = res.total;
+      pageData.tableData = res.records || [];
-  //   pageData.tableConfiger.loading = false;
+      pageData.total = res.total;
-  // }).catch(()=>{ pageData.tableConfiger.loading = false; })
+      pageData.tableConfiger.loading = false;
-}
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
 
 // 详情
 const addEdit = (type, row) => {
   detailDiloag.value.init(type, row);
 };
+// 详情
+const infoList = (type, row) => {
+  infoDiloag.value.init(type, row);
+};
 
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  pageData.tableHeight =
+    window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };
@@ -161,4 +274,3 @@ const tabHeightFn = () => {
   background: rgba(0, 0, 0, 0.5) !important;
 }
 </style>
-

src/views/backOfficeSystem/IntelligentControl/ControlApproval/index.vue

@@ -8,16 +8,22 @@
     <div ref="searchBox">
       <!-- 顶部主导航 -->
       <div class="main-nav">
-        <el-button :class="['nav-btn', activeMainNav === 'todo' ? 'active' : '']" @click="activeMainNav = 'todo'">
+        <el-button
+          :class="['nav-btn', activeMainNav === 'todo' ? 'active' : '']"
+          @click="activeMainNav = 'todo'"
+        >
           我的待办
         </el-button>
-        <el-button :class="['nav-btn', activeMainNav === 'done' ? 'active' : '']" @click="activeMainNav = 'done'">
+        <el-button
+          :class="['nav-btn', activeMainNav === 'done' ? 'active' : '']"
+          @click="activeMainNav = 'done'"
+        >
           我的已办
         </el-button>
       </div>
       <!-- 子导航 -->
       <div class="sub-nav">
-        <el-tabs v-model="activeSubNav">
+        <el-tabs v-model="activeSubNav" @click="handleType">
           <el-tab-pane label="我的发起" name="myInitiate"></el-tab-pane>
           <el-tab-pane label="我的审核" name="myAudit"></el-tab-pane>
           <el-tab-pane label="我的审批" name="myApprove"></el-tab-pane>
@@ -25,7 +31,11 @@
           <el-tab-pane label="我的处置" name="myHandle"></el-tab-pane>
         </el-tabs>
       </div>
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount">
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      >
         <template #defaultSlot>
           <div>
             <el-input-number v-model="queryFrom.xqy"></el-input-number>
@@ -42,8 +52,14 @@
           <el-button>批量处理</el-button>
           <el-button>导出</el-button>
         </div>
-        <el-input v-model="input2" style="max-width: 300px" placeholder="请输入关键字">
+        <el-input
-          <template #append><el-button type="primary" icon="Search"></el-button></template>
+          v-model="input2"
+          style="max-width: 300px"
+          placeholder="请输入关键字"
+        >
+          <template #append
+            ><el-button type="primary" icon="Search"></el-button
+          ></template>
         </el-input>
       </div>
 
@@ -56,11 +72,47 @@
         :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData"
       >
+        <template #bkDj="{ row }">
+          <DictTag :tag="false" :value="row.bkDj" :options="D_GS_BK_DJ" />
+        </template>
+        <template #bkDx="{ row }">
+          <DictTag :tag="false" :value="row.bkDx" :options="D_GS_BK_DX" />
+        </template>
+        <template #bkZt="{ row }">
+          <DictTag :tag="false" :value="row.bkZt" :options="D_GS_BK_ZT" />
+        </template>
+        <template #czYq="{ row }">
+          <DictTag :tag="false" :value="row.czYq" :options="D_GS_BK_CZYQ" />
+        </template>
+        <template #czJsdwdm="{ row }">
+          <div>
+            {{
+              deptList.find((item) => item.id == row.czJsdwdm)?.label ||
+              "未知单位"
+            }}
+          </div>
+        </template>
+
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-button size="small" @click="addEdit('detail', row)">详情</el-button>
+
-          <el-button size="small">从业人员</el-button>
+          <el-button
-          <el-button size="small">转区域</el-button>
+            size="small"
+            @click="autoEdit('auto', row)"
+            v-if="row.bkZt === '02' && activeSubNav === 'myAudit'"
+            >审核</el-button
+          >
+          <el-button
+            size="small"
+            @click="autoEdit('approval', row)"
+            v-if="row.bkZt === '04'&& activeSubNav === 'myApprove'"
+            >审批</el-button
+          >
+           <el-button size="small" @click="autoEdit('detail', row)"
+              >详情</el-button
+            >
+          <!-- <el-button size="small">从业人员</el-button>
+          <el-button size="small">转区域</el-button> -->
         </template>
       </MyTable>
       <Pages
@@ -74,7 +126,7 @@
       ></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" />
+    <MyControlInfo ref="myControlInfoRef" />
   </div>
 </template>
 
@@ -86,85 +138,107 @@
 import DetailForm from "./components/detailForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { setItem, getItem, removeAllItem } from "@/utils/storage";
+import { selectUserDeptPage } from "@/api/user-manage";
+import MyControlInfo from "../MyControlInfo/components/sendControl.vue";
+
 const { proxy } = getCurrentInstance();
+const {
+  D_GS_BK_DJ,
+  D_GS_BK_DX,
+  D_GS_BK_ZT,
+  D_GS_BK_SJLX,
+  D_GS_BK_CZYQ,
+  D_GS_BK_CZJSDWLX
+} = proxy.$dict(
+  "D_GS_BK_DJ",
+  "D_GS_BK_DX",
+  "D_GS_BK_ZT",
+  "D_GS_BK_SJLX",
+  "D_GS_BK_CZYQ",
+  "D_GS_BK_CZJSDWLX"
+); //获取字典数据
+const deptList = ref([]); //部门列表
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 const btns = ref();
+const userId = getItem("USERID");
+const myControlInfoRef = ref(null);
+
 // 主导航激活状态
 const activeMainNav = ref("todo");
 // 子导航激活状态
 const activeSubNav = ref("myAudit");
 const searchConfiger = ref([
   {
-      label: "布控类别",
+    label: "布控等级",
-      prop: "category",
+    prop: "bqDj",
-      placeholder: "请输入布控类别",
+    placeholder: "请选择布控等级",
     showType: "select",
-      options: [{ label: "在业", value: "在业" }]
+    options: D_GS_BK_DJ
   },
   {
     label: "布控对象",
-      prop: "target",
+    prop: "bkDx",
-      placeholder: "请输入布控对象",
+    placeholder: "请选择布控对象",
     showType: "select",
-      options: [{ label: "在业", value: "在业" }]
+    options: D_GS_BK_DX
   },
   {
     label: "布控状态",
-      prop: "status",
+    prop: "bkZt",
-      placeholder: "请输入布控状态",
+    placeholder: "请选择布控状态",
     showType: "select",
-      options: [{ label: "在业", value: "在业" }]
+    options: D_GS_BK_ZT
   },
-    { label: "布控时间", prop: "dateRange", placeholder: "请输入布控时间", showType: "daterange" },
   {
-      label: "预计布控类型",
+    label: "布控时间类型",
-      prop: "controlType",
+    prop: "bkSjLx",
-      placeholder: "请输入布控类别",
+    placeholder: "请选择布控时间",
+    showType: "date",
+    options: D_GS_BK_SJLX
+  },
+  {
+    label: "预计标签模型",
+    prop: "jyzt",
+    placeholder: "请选预计标签模型",
     showType: "select",
     options: [{ label: "在业", value: "在业" }]
   },
   {
     label: "最近预警时间",
-      prop: "lastAlertTime",
+    prop: "checkDate",
-      placeholder: "请输入布控对象",
+    placeholder: "最近预警时间",
+    showType: "date"
+  },
+  {
+    label: "布控对象信息",
+    prop: "jyzt",
+    placeholder: "请选择布控对象信息",
     showType: "select",
     options: [{ label: "在业", value: "在业" }]
   },
   {
-      label: "布控发起单位",
+    label: "处理接受部门",
-      prop: "initiatingUnit",
+    prop: "jyzt",
-      placeholder: "请输入布控状态",
+    placeholder: "请选择经营状况",
-      showType: "select",
-      options: [{ label: "在业", value: "在业" }]
-    },
-    {
-      label: "处置接收单位",
-      prop: "receivingUnit",
-      placeholder: "请输入布控状态",
     showType: "select",
     options: [{ label: "在业", value: "在业" }]
   }
 ]);
 const queryFrom = ref({});
+const userInfo = ref({});
 const pageData = reactive({
   tableData: [
-      [
     {
-          taskId: "任务编号",
+      name: "1",
-          target: "人员",
+      ssxq: "1",
-          targetInfo: "石某某",
+      cyxm: "1",
-          measures: "布控公安机关",
+      qqksrxm: "1",
-          scope: "布控范围",
+      qqksrsfzh: "1",
-          alertInfo: "预警信息",
+      jzrxm: "1"
-          startTime: "2024-04-05 12:00",
-          endTime: "2024-04-10 12:00",
-          lastAlertTime: "2024-04-10 12:00",
-          creator: "张三"
     }
-        // ... 更多数据
+  ], //表格数据
-      ]
-    ],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -175,70 +249,116 @@
   pageConfiger: {
     pageSize: 20,
     pageCurrent: 1
-    },
+  }, //分页
-    controlsWidth: 250,
+  controlsWidth: "240", //操作栏宽度
+
   tableColumn: [
-      { label: "任务编号", prop: "taskId" },
+    { label: "布控级别", prop: "bkDj", showSolt: true },
-      { label: "布控对象", prop: "target" },
+    { label: "布控标题", prop: "bkBt" },
-      { label: "布控对象信息", prop: "targetInfo" },
+    // { label: "布控对象", prop: "bkDx", showSolt: true },
-      { label: "布控管控措施", prop: "measures" },
+    // { label: "布控对象信息", prop: "bkDxxx" },
-      { label: "布控范围", prop: "scope" },
+    // { label: "预警标签模型", prop: "yjbqmx" },
-      { label: "预警信息", prop: "alertInfo" },
+    // { label: "布控范围", prop: "bkfw" },
-      { label: "开始时间", prop: "startTime" },
+    // { label: "预警信息", prop: "yjxx" },
-      { label: "结束时间", prop: "endTime" },
+    { label: "处置接收单位", prop: "czJsdwdm", showSolt: true },
-      { label: "最近预警时间", prop: "lastAlertTime" },
+    { label: "处置要求", prop: "czYq", showSolt: true },
-      { label: "布控发起人", prop: "creator" }
+    { label: "开始时间", prop: "bkSjKs" },
+    { label: "结束时间", prop: "bkSjJs" },
+    // { label: "最近预警时间", prop: "zjyjsj" },
+    { label: "失效时间", prop: "bkSjSx" },
+    { label: "布控发起人", prop: "bkfqrXm" },
+    { label: "布控状态", prop: "bkZt", showSolt: true }
   ]
 });
 onMounted(() => {
-    // getList()
   tabHeightFn();
+  getUserInfo();
+  getdepartmentList();
 });
 
+
+// 详情
+const info = (type, row) => {
+  myControlInfoRef.value.init(type, row);
+};
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
+const getUserInfo = async () => {
+  console.log(userId, "userId");
+  await qcckGet({}, `/mosty-base/sysUser/getUserInfo/${userId}`).then((res) => {
+    console.log(res, "res");
+    userInfo.value = res;
+    setItem("userInfo", res);
+    getList();
+  });
+};
+
 //选择类型
-  const handleType = val => {
+const handleType = (val) => {
   pageData.keyCount++;
   pageData.pageConfiger.pageCurrent = 1;
+
   getList();
 };
 // 搜索
-  const onSearch = val => {
+const onSearch = (val) => {
   queryFrom.value = { ...val };
   pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
 
-  const changeNo = val => {
+const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
   getList();
 };
-  const changeSize = val => {
+const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
   getList();
 };
 
 // 获取列表
-  const getList = val => {
+const getList = (val) => {
-    // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
-    // let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  let data = {
-    // let url = '/mosty-lzcj/tbDwKscs/queryList';
+    ...pageData.pageConfiger,
-    // qcckPost(data,url).then(res=>{
+    ...queryFrom.value,
-    //   pageData.tableData = res.records || [];
+    [activeSubNav.value === "myAudit" ? "bkshrSfzh" : "bksprSfzh"]:
-    //   pageData.total = res.total;
+      userInfo.value.idEntityCard
-    //   pageData.tableConfiger.loading = false;
+  };
-    // }).catch(()=>{ pageData.tableConfiger.loading = false; })
+  let url = "/mosty-gsxt/tbGsxtBk/selectPage";
+  qcckGet(data, url)
+    .then((res) => {
+      pageData.tableData = res.records || [];
+      pageData.total = res.total;
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
 };
 
 // 详情
-  const addEdit = (type, row) => {
+const autoEdit = (type, row) => {
-    detailDiloag.value.init(type, row);
+  myControlInfoRef.value.init(type, row);
 };
 
 // 表格高度计算
 const tabHeightFn = () => {
   console.log("btns.value.offsetHeight", btns.value.offsetHeight);
 
-    pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - btns.value.offsetHeight - 30 - 250;
+  pageData.tableHeight =
+    window.innerHeight -
+    searchBox.value.offsetHeight -
+    btns.value.offsetHeight -
+    30 -
+    250;
   window.onresize = function () {
     tabHeightFn();
   };

src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/areaModel.vue

@@ -0,0 +1,86 @@
+<template>
+  <el-dialog v-model="dialogTableVisible" title="添加范围模型" width="1000px" @close="close">
+    <div class="dialog-container">
+      <el-form :model="formData" label-width="auto" label-position="left">
+        <div class="form-row">
+          <el-form-item label="模型名称">
+            <el-input v-model="formData.modelName" placeholder="请输入模型名称" />
+          </el-form-item>
+          <el-form-item label="感知模型类型" prop="region">
+            <el-select v-model="formData.region" placeholder="重点区域类型">
+              <el-option label="Zone one" value="shanghai" />
+              <el-option label="Zone two" value="beijing" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="生成时间范围">
+            <el-date-picker
+              v-model="formData.dateRange"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </div>
+        <el-form-item label="感知源信息">
+          <el-input v-model="formData.perceptionDomain" placeholder="请输入模型名称">
+            <template #append>
+              <el-button type="primary">选择感知源</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="地图范围">
+          <el-input v-model="formData.mapRange" placeholder="请输入模型名称">
+            <template #append>
+              <el-button type="primary">选择地图范围</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div class="map"></div>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup>
+  import { ref } from "vue";
+
+  const formData = ref({
+    modelName: "",
+    perceptionDomain: "",
+    mapRange: "",
+    dateRange: [],
+    region: ""
+  });
+  const dialogTableVisible = ref(false);
+  // 初始化数据
+  const init = (type, row) => {
+    dialogTableVisible.value = true;
+  };
+
+  const close = () => {};
+
+  defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+  .dialog-container {
+    height: 550px;
+    .map {
+      height: 400px;
+      border: 1px solid #ccc;
+      border-radius: 5px;
+    }
+
+    .form-row {
+      display: flex;
+      gap: 5px;
+      .el-form-item {
+        flex: 1;
+      }
+    }
+  }
+</style>

src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/detailForm.vue

@@ -0,0 +1,131 @@
+
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">开锁业务信息详情</span>
+      <div>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="cntinfo">
+      <el-form :model="listQuery" :label-width="230" label-position="left">
+        <div class="form-row">
+          <el-form-item label="业务流水号码">
+            <el-input v-model="listQuery.ywlsh" placeholder="01131213"/>
+          </el-form-item>
+          <el-form-item label="开锁业务日期">
+            <el-input v-model="listQuery.ywrq" placeholder="2025/1/20 10:00:00"/>
+          </el-form-item>
+        </div>
+
+        <div class="form-row">
+          <el-form-item label="场所名称">
+            <el-input v-model="listQuery.csmc" placeholder="毛王开锁"/>
+          </el-form-item>
+          <el-form-item label="从业人员姓名">
+            <el-input v-model="listQuery.cyrxm" placeholder="张三"/>
+          </el-form-item>
+        </div>
+
+        <div class="form-row">
+          <el-form-item label="从业人员证件号码">
+            <el-input v-model="listQuery.cyrzjhm" placeholder="511123456789654125"/>
+          </el-form-item>
+          <el-form-item label="请求开锁人姓名">
+            <el-input v-model="listQuery.qqksrxm" placeholder="李四"/>
+          </el-form-item>
+        </div>
+
+        <div class="form-row">
+          <el-form-item label="请求开锁人证件号码">
+            <el-input v-model="listQuery.qqksrzjhm" placeholder="511111111111111111"/>
+          </el-form-item>
+          <el-form-item label="开锁业务地址">
+            <el-input v-model="listQuery.ywdz" placeholder="林芝市巴宜区xxxx路18号"/>
+          </el-form-item>
+        </div>
+
+        <div class="form-row">
+          <el-form-item label="开锁业务类型">
+            <el-input v-model="listQuery.ywlx" placeholder="开锁"/>
+          </el-form-item>
+          <el-form-item label="见证人姓名">
+            <el-input v-model="listQuery.jzrxm" placeholder="王五"/>
+          </el-form-item>
+        </div>
+
+        <div class="form-row">
+          <el-form-item label="见证人证件号">
+            <el-input v-model="listQuery.jzrzjh" placeholder="514154785965214741"/>
+          </el-form-item>
+          <el-form-item label="见证人联系方式">
+            <el-input v-model="listQuery.jzrlxfs" placeholder="15222222222"/>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue';
+
+const dialogForm = ref(false);
+const listQuery = ref({});
+
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  // 根据type和row初始化表单数据
+};
+
+const close = () => {
+  dialogForm.value = false;
+};
+
+defineExpose({init})
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 20px;
+
+  :deep(.el-form-item__label) {
+    background-color: #F7FAFB;
+    padding: 0px 8px;
+    color: #000;
+    font-weight: 500;
+    border: 1px solid #E3E7ED;
+  }
+
+  .head_box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20px;
+  }
+  .cntinfo{
+    height: calc(100% - 70px);
+    overflow: hidden;
+    overflow-y: auto;
+  }
+
+  .form-row {
+    display: flex;
+    
+    .el-form-item {
+      flex: 1;
+    }
+  }
+
+   ::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/IntelligentControl/MyControlInfo/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.bqMc"
+            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="bqMc" align="center" label="标签名称" />
+          <el-table-column prop="bqDm" align="center" label="标签代码" />
+          <el-table-column prop="bqDj" align="center" label="标签等级">
+          </el-table-column>
+          <el-table-column prop="bqYs" align="center" label="标签颜色">
+            <template #default="{ row }">
+              <DictTag
+                :value="row.bqYs"
+                :tag="false"
+                :options="props.dic.D_GS_SSYJ"
+              />
+            </template>
+          </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);
+  let data = { type: props.LeaderType, userList: userList };
+  emits("chooseDateLeader", data);
+  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/tbGsxtBqzh/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/IntelligentControl/MyControlInfo/components/drawerAreaModel.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class="drawer-model">
+    <el-drawer v-model="drawer" title="范围模型(3)" direction="rtl" style="width: 300px">
+      <div class="project-list">
+        <!-- 搜索区域 -->
+        <div class="search-area">
+          <!-- 搜索区域 -->
+          <el-form :model="searchForm" label-width="auto" style="max-width: 600px">
+            <el-form-item label="模型名称">
+              <el-input v-model="searchForm.projectName" />
+            </el-form-item>
+            <el-form-item label="启用状态">
+              <el-select v-model="searchForm.status" placeholder="启用状态">
+                <el-option label="启用" value="shanghai" />
+                <el-option label="禁用" value="beijing" />
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div>
+            <el-button type="primary" icon="Search">查询</el-button>
+            <el-button type="primary" icon="CirclePlus" @click="areaModel">添加应用模型</el-button>
+          </div>
+
+          <!-- <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" /> -->
+        </div>
+        <!-- 列表区域 -->
+        <div class="list-area">
+          <div v-for="(item, index) in pageData.tableData" :key="index" class="list-item">
+            <div class="model-info">
+              <div class="model-name">巴宜区公路外国模型</div>
+              <div class="model-type">模型类型：重点区域城规模型</div>
+            </div>
+            <el-divider border-style="dotted"></el-divider>
+            <div class="actions flexcb">
+              <el-checkbox v-model="item.checked" label="启用" />
+              <div class="btns">
+                <span class="set">设置</span>
+                <span class="delete">删除</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-drawer>
+    <!-- 添加范围模型 -->
+    <AreaModel ref="areaModelRef"></AreaModel>
+  </div>
+</template>
+
+<script setup>
+  import { ref, reactive } from "vue";
+  import Search from "@/components/aboutTable/Search.vue";
+  import AreaModel from "./areaModel.vue";
+  const areaModelRef = ref();
+  const areaModel = () => {
+    areaModelRef.value.init();
+  };
+  const searchConfiger = ref([
+    {
+      label: "项目名称",
+      prop: "name",
+      placeholder: "请选择经营状况",
+      showType: "input"
+    },
+    {
+      label: "启用状态",
+      prop: "jyzt",
+      placeholder: "请选择经营状况",
+      showType: "select",
+      options: [{ label: "在业", value: "在业" }]
+    }
+  ]);
+  // 搜索
+  const onSearch = val => {
+    searchForm.value = { ...val };
+    pageData.pageConfiger.pageCurrent = 1;
+    getList();
+  };
+  const searchForm = ref({
+    projectName: "",
+    status: ""
+  });
+  // 获取列表
+  const getList = val => {
+    // pageData.tableConfiger.loading = true;
+    // let data = { ...pageData.pageConfiger, ...queryFrom.value };
+    // let url = '/mosty-lzcj/tbDwMbkf/queryList';
+    // qcckPost(data,url).then(res=>{
+    //   pageData.tableData = res.records || [];
+    //   pageData.total = res.total;
+    //   pageData.tableConfiger.loading = false;
+    // }).catch(()=>{ pageData.tableConfiger.loading = false; })
+  };
+
+  const pageData = reactive({
+    tableData: [
+      { checked: false },
+      { checked: false },
+      { checked: false },
+      { checked: false },
+      { checked: false },
+      { checked: false }
+    ], //表格数据
+    keyCount: 0,
+    total: 0,
+    pageConfiger: {
+      pageSize: 20,
+      pageCurrent: 1
+    } //分页
+  });
+  const drawer = ref(false);
+  // 初始化数据
+  const init = () => {
+    drawer.value = true;
+    // 根据type和row初始化表单数据
+  };
+  defineExpose({ init });
+</script>
+<style lang="scss" scoped>
+  .drawer-model {
+    header {
+      background: none;
+    }
+    :deep(.el-drawer) {
+      width: 400px !important;
+    }
+  }
+
+  .search-area {
+    margin-bottom: 20px;
+  }
+
+  .list-area {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    .model-name {
+      color: rgb(64, 158, 255);
+      font-size: 20px;
+      margin-bottom: 10px;
+    }
+    .model-type {
+      font-size: 18px;
+      color: #ccc;
+    }
+  }
+
+  .list-item {
+    border: 1px solid #e4e7ed;
+    border-radius: 4px;
+    padding: 16px;
+    .el-divider--horizontal {
+      margin: 10px 0;
+    }
+  }
+
+  .actions {
+    .btns {
+      .set {
+        color: rgb(64, 158, 255);
+      }
+      .delete {
+        margin-left: 10px;
+        color: rgb(245, 108, 108);
+      }
+    }
+  }
+</style>

src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/personNum.vue

@@ -0,0 +1,125 @@
+<template>
+  <el-dialog v-model="dialogTableVisible" title="XXXXXXX涉及人数" width="1000px" @close="close">
+    <div class="dialog-container">
+      <!-- 搜索 -->
+      <div ref="searchBox">
+        <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" class="seacrh" />
+      </div>
+      <!-- 表格 -->
+      <div class="tabBox">
+        <MyTable
+          :tableData="pageData.tableData"
+          :tableColumn="pageData.tableColumn"
+          tableHeight="400px"
+          :key="pageData.keyCount"
+          :tableConfiger="pageData.tableConfiger"
+          :controlsWidth="pageData.controlsWidth"
+          @chooseData="chooseData"
+        >
+          <!-- 操作 -->
+          <template #controls="{ row }">
+            <el-button size="small" @click="addEdit('detail', row)">详情</el-button>
+          </template>
+        </MyTable>
+        <Pages
+          @changeNo="changeNo"
+          @changeSize="changeSize"
+          :tableHeight="pageData.tableHeight"
+          :pageConfiger="{
+            ...pageData.pageConfiger,
+            total: pageData.total
+          }"
+        ></Pages>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup>
+  import { ref, reactive } from "vue";
+  import Search from "@/components/aboutTable/Search.vue";
+  import MyTable from "@/components/aboutTable/MyTable.vue";
+  const dialogTableVisible = ref(false);
+  const searchConfiger = ref([
+    {
+      label: "姓名",
+      prop: "name",
+      placeholder: "请输入场所名称",
+      showType: "input"
+    },
+    {
+      label: "身份证号",
+      prop: "idCard",
+      placeholder: "请输入从业人姓名",
+      showType: "input"
+    },
+    {
+      label: "车牌号",
+      prop: "plateNumber",
+      placeholder: "请输入场所名称",
+      showType: "input"
+    },
+    {
+      label: "车牌号",
+      prop: "plateNumber2",
+      placeholder: "请输入从业人姓名",
+      showType: "input"
+    }
+  ]);
+  const pageData = reactive({
+    tableData: [
+      {
+        name: "1"
+      }
+    ], //表格数据
+    keyCount: 0,
+    tableConfiger: {
+      rowHieght: 61,
+      showSelectType: "null",
+      loading: false
+    },
+    total: 0,
+    pageConfiger: {
+      pageSize: 20,
+      pageCurrent: 1
+    }, //分页
+    controlsWidth: 120, //操作栏宽度
+
+    tableColumn: [
+      { label: "照片", prop: "photo", width: "80" },
+      { label: "姓名", prop: "name", width: "100" },
+      { label: "性别", prop: "gender", width: "80" },
+      { label: "身份证号", prop: "idCard", width: "180" },
+      { label: "户籍地", prop: "residence", width: "150" },
+      { label: "现居住地", prop: "currentAddress", width: "150" },
+      { label: "手机号", prop: "phone", width: "120" },
+      { label: "虚拟身份", prop: "virtualId", width: "120" },
+      { label: "车牌号", prop: "plateNumber", width: "120" },
+      { label: "车牌号", prop: "plateNumber2", width: "120" },
+      { label: "特征描述", prop: "features", width: "150" },
+      { label: "人员标签", prop: "personTags", width: "150" }
+    ]
+  });
+
+  // 初始化数据
+  const init = (type, row) => {
+    dialogTableVisible.value = true;
+  };
+
+  const close = () => {};
+
+  defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+  .dialog-container {
+    // .box {
+    //   flex-wrap: nowrap !important;
+    // }
+    .seacrh {
+      .box {
+        flex-wrap: nowrap !important;
+      }
+    }
+  }
+</style>

src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/sendControl.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">布控详情</span>
+      <div>
+        <el-button
+          size="small"
+          type="primary"
+          @click="autoClick"
+          v-if="typetext == 'auto'"
+          >审核</el-button
+        >
+        <el-button
+          size="small"
+          @click="autoClick"
+          type="primary"
+          v-if="typetext == 'approval'"
+          >审批</el-button
+        >
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="cntinfo">
+      <div class="title-item">布控信息</div>
+      <ControlInfo ref="controlInfoRef" />
+      <div class="title-item">布控范围</div>
+      <ControlArea ref="controlAreaRef" />
+      <div class="title-item">审批信息</div>
+      <ApprovalInfo ref="approvalInfoRef" />
+    </div>
+
+    <el-dialog v-model="dialogVisible" title="审核" width="500px">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform">
+        <!-- 自定义原因字段渲染 -->
+        <template #bkshBtgyy>
+          <el-form-item
+            label="原因"
+            prop="bkshBtgyy"
+            v-if="listQuery.sftg === '0'"
+          >
+            <el-input
+              type="textarea"
+              v-model="listQuery.bkshBtgyy"
+              placeholder="请输入不通过原因"
+            />
+          </el-form-item>
+          <div v-else></div>
+        </template>
+      </FormMessage>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleClose"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, nextTick, getCurrentInstance, watch } from "vue";
+import ControlInfo from "./ui/controlInfo.vue";
+import ControlArea from "./ui/controlArea.vue";
+import ApprovalInfo from "./ui/approvalInfo.vue";
+import { qcckPost } from "@/api/qcckApi.js";
+import { useRouter } from "vue-router";
+import { ElMessage } from "element-plus";
+import { info } from "sass";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+
+const { proxy } = getCurrentInstance();
+const { D_BZ_SF } = proxy.$dict("D_BZ_SF"); //获取字典数据
+
+const listQuery = ref({}); //表单
+
+const dialogForm = ref(false);
+
+const router = useRouter();
+const dialogVisible = ref(false);
+// 获取子组件引用
+const controlInfoRef = ref(null);
+const controlAreaRef = ref(null);
+const approvalInfoRef = ref(null);
+const infoData = ref({});
+const typetext = ref("");
+
+const formData = ref([
+  {
+    label: "是否通过",
+    prop: "sftg",
+    type: "radio",
+    options: D_BZ_SF
+  },
+  {
+    label: "",
+    prop: "bkshBtgyy",
+    type: "slot"
+  }
+]);
+// 初始化数据
+const init = async (type, row) => {
+  listQuery.value = {
+    ...listQuery.value, // 保留原有值
+    ...row,
+    sftg: "0" // 设置新值
+  };
+  typetext.value = type;
+  dialogForm.value = true;
+  await nextTick(); // 等待子组件挂载
+  controlInfoRef.value?.setFormData?.(row); // 回显布控信息
+  controlAreaRef.value?.setFormData?.(row); // 回显布控范围
+  approvalInfoRef.value?.setFormData?.(row); // 回显审批信息
+};
+
+const autoClick = () => {
+  dialogVisible.value = true;
+};
+
+// 提交审核/审批
+const handleClose = async () => {
+  try {
+    const data = {
+      id: listQuery.value.id, // 主键id (required)
+      sftg: listQuery.value.sftg // 是否通过 (required)
+    };
+
+    // 如果不通过，添加原因
+    if (data.sftg !== "1") {
+      data.bkshBtgyy = listQuery.value.bkshBtgyy; // 不通过原因
+    }
+
+    // 根据 typetext.value 决定调用哪个接口
+    const apiUrl =
+      typetext.value === "auto"
+        ? "/mosty-gsxt/tbGsxtBk/toExamine" // 审核接口
+        : "/mosty-gsxt/tbGsxtBk/audits"; // 审批接口
+
+    // 调用接口
+    const res = await qcckPost(data, apiUrl);
+    if (res) {
+      ElMessage.success(typetext.value === "auto" ? "审核成功" : "审批成功");
+      dialogVisible.value = false;
+      router.push({ name: "myControl" });
+    } else {
+      ElMessage.error(
+        res.message || (typetext.value === "auto" ? "审核失败" : "审批失败")
+      );
+    }
+  } catch (error) {
+    console.error(typetext.value === "auto" ? "审核出错:" : "审批出错:", error);
+    ElMessage.error("请求过程中发生错误");
+  }
+};
+
+const close = () => {
+  dialogForm.value = false;
+};
+
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 20px;
+
+  .cntinfo {
+    color: #000;
+    height: calc(100% - 70px);
+    overflow: hidden;
+    overflow-y: auto;
+    .title-item {
+      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;
+      }
+    }
+  }
+}
+</style>

src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/approvalInfo.vue

@@ -0,0 +1,205 @@
+<template>
+  <el-form :model="formData" label-width="auto" label-position="left">
+    <!-- 处置接收单位 -->
+
+    <FormMessage
+      v-model="listQuery"
+      :formList="formData"
+      ref="elform"
+      :rules="rules"
+    >
+      <!-- 自定义插槽（人员标签） -->
+      <template #czJsdwdm>
+        <el-select
+          v-model="listQuery.czJsdwdm"
+          placeholder="请选择处置接收单位"
+          style="width: 240px"
+          :disabled="true"
+        >
+          <el-option
+            v-for="item in deptList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
+        </el-select>
+      </template>
+    </FormMessage>
+
+    <!-- 审批流程 -->
+    <div class="approval-flow">
+      <div class="approval-flow">
+        <div class="step" v-for="(item, index) in step" :key="`${index}step`">
+          <div class="icon">
+            <div class="circle"></div>
+            <div class="line"></div>
+          </div>
+          <div>
+            <div>{{ item.title }}</div>
+            <div class="desc">
+              <div class="description flexcc">
+                <!-- 使用方案1 + 方案2 -->
+                <div
+                  class="description-item"
+                  :class="{ 'disabled-item': item.default }"
+                >
+                  {{ item.fqr }}
+                </div>
+                <div class="description-item">{{ item.fqbm }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-form>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckPost, qcckPut } from "@/api/qcckApi.js";
+import { fa } from "element-plus/es/locale.mjs";
+import { selectUserDeptPage } from "@/api/user-manage";
+const { proxy } = getCurrentInstance();
+const { D_GS_BK_CZJSDWLX, D_GS_BK_TJFS } = proxy.$dict(
+  "D_GS_BK_CZJSDWLX",
+  "D_GS_BK_TJFS"
+); //获取字典数据
+const listQuery = ref({}); //表单
+const deptList = ref([]); //部门列表
+const formData = ref([
+  {
+    label: "处置接收单位",
+    prop: "czJsdwdm",
+    type: "slot"
+  },
+  {
+    label: "处置接收单位类型",
+    prop: "czJsdwlx",
+    type: "select",
+    options: D_GS_BK_CZJSDWLX,
+    disabled: true
+  },
+  // {
+  //   label: "提交方式",
+  //   prop: "bkTjfs",
+  //   type: "radio",
+  //   options: D_GS_BK_TJFS,
+  //   disabled: true
+  // },
+  {
+    label: "签收时间",
+    prop: "bkSjQs",
+    type: "datetime",
+    disabled: true
+  }
+]);
+const rules = reactive({
+  bkBt: [{ required: true, message: "请选择处置接收单位", trigger: "blur" }],
+  // bkObj: [{ required: true, message: "请选择提交方式", trigger: "blur" }],
+  bkSjQs: [{ required: true, message: "请选择签收时间", trigger: "change" }]
+});
+const step = ref([
+  { fqr: "发起人", fqbm: "发起部门", title: "发起申请", default: true },
+  { fqr: "发起人", fqbm: "发起部门", title: "审核确认", default: false },
+  { fqr: "发起人", fqbm: "发起部门", title: "审批确认", default: false }
+]);
+
+onMounted(() => {
+  getdepartmentList();
+});
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+
+    console.log(deptList.value, D_GS_BK_CZJSDWLX);
+    // tableData.value = res?.records;
+  });
+};
+
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+  step.value = [
+    { fqr: "发起人", fqbm: "发起部门", title: "发起申请", default: true },
+    {
+      fqr: data.bkshrXm || "系统管理", // 审核人姓名
+      fqbm: data.bkshrSsbmmc || "西藏", // 审核部门
+      title: "审核确认"
+    },
+    {
+      fqr: data.bksprXm || "测试", // 审批人姓名
+      fqbm: data.bksprSsbmmc || "西藏", // 审批部门
+      title: "审批确认"
+    }
+  ];
+};
+
+// 3. 暴露方法给父组件
+defineExpose({
+  setFormData
+});
+</script>
+
+<style lang="scss" scoped>
+.step {
+  //   position: relative;
+  display: flex;
+  gap: 5px;
+  box-sizing: border-box;
+  .desc {
+    margin: 5px;
+    color: #929090;
+    width: 350px;
+  }
+  .icon {
+    // position: absolute;
+    // top: 0;
+    // left: 0;
+    text-align: center;
+    .circle {
+      height: 14px;
+      width: 14px;
+      border-radius: 50%;
+      background-color: rgb(196, 219, 240);
+    }
+    .line {
+      margin: 0 auto;
+      width: 0;
+      height: calc(100% - 14px);
+      border: 1px dashed rgb(196, 219, 240);
+    }
+  }
+}
+
+.unit-selection {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
+.description {
+  gap: 10px;
+}
+.description-item {
+  width: 300px;
+  height: 30px;
+  padding: 0 20px;
+  line-height: 30px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: rgb(131, 132, 135);
+  box-sizing: border-box;
+}
+.disabled-item {
+  cursor: not-allowed;
+  opacity: 0.6;
+  pointer-events: none;
+}
+</style>

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

@@ -0,0 +1,192 @@
+<template>
+  <div class="control-area">
+    <FormMessage
+      v-model="listQuery"
+      :formList="formData"
+      ref="elform"
+      :rules="rules"
+    >
+      <!-- 布控范围-->
+      <template #bkfwList="{ row }">
+        <div class="boxlist">
+          <MyTable
+            :tableData="tableDate.bkfwList"
+            :tableColumn="tableDate.tableColumn"
+            :tableHeight="tableDate.tableHeight"
+            :key="tableDate.keyCount"
+            :tableConfiger="tableDate.tableConfiger"
+            :controlsWidth="tableDate.controlsWidth"
+          >
+            <!-- 操作 -->
+            <template #controls="{ row }">
+              <el-link type="danger" @click="delDictItem(row.id)">删除</el-link>
+            </template>
+          </MyTable>
+        </div>
+      </template>
+    </FormMessage>
+  </div>
+</template>
+
+<script setup>
+import {
+  reactive,
+  ref,
+  onMounted,
+  getCurrentInstance,
+  nextTick,
+  computed
+} from "vue";
+const { proxy } = getCurrentInstance();
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckPost, qcckPut } from "@/api/qcckApi.js";
+
+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",
+    "D_GS_BK_CZJSDWLX",
+    "D_GS_BK_DJ",
+    "D_GS_BK_YZ",
+    "D_GS_BK_SJLX"
+  ); //获取字典数据
+
+const chooseShow = ref(false); //选择弹窗
+const chooseTitle = ref(""); //选择弹窗
+const dialogForm = ref(false); //弹窗
+const chooseType = ref("01"); //选择弹窗类型
+const roleIds = ref([]); //选择弹窗角色id
+const fileList = ref([]); //上传附件
+const tableDate = reactive({
+  bkfwList: [], //表格数据
+  rybqList: [], //内置表格数据
+  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: "jhMc" },
+    { label: "集合说明", prop: "jhSm" }
+  ]
+});
+const formData = ref([
+  { label: "布控范围", prop: "bkfwList", type: "slot", width: "90%" },
+  {
+    label: "布控时间类型",
+    prop: "bkSjLx",
+    type: "select",
+    options: D_GS_BK_SJLX,
+    disabled: true
+  },
+  {
+    label: "布控开始时间",
+    prop: "bkSjKs",
+    type: "datetime",
+    disabled: true
+  },
+  {
+    label: "布控结束时间",
+    prop: "bkSjJs",
+    type: "datetime",
+    disabled: true
+  },
+  {
+    label: "布控失效时间",
+    prop: "bkSjSx",
+    type: "datetime",
+    disabled: true
+  },
+
+  {
+    label: "处置要求",
+    prop: "czYq",
+    type: "select",
+    options: D_GS_BK_CZYQ,
+    disabled: true
+  },
+  {
+    label: "布控等级",
+    prop: "bkDj",
+    type: "select",
+    options: D_GS_BK_DJ,
+    disabled: true
+  },
+  {
+    label: "布控要旨",
+    prop: "bkYz",
+    type: "select",
+    options: D_GS_BK_YZ,
+    disabled: true
+  },
+  {
+    label: "布控事由",
+    prop: "bkSy",
+    type: "textarea",
+    disabled: true
+  },
+  {
+    label: "上传附件",
+    prop: "bkFj",
+    type: "upload",
+    isImg: false,
+    disabled: true
+  }
+]);
+const rules = reactive({
+  // bkSjKs: [{ required: true, message: "请选择布控开始时间", trigger: "blur" }],
+  // bkSjJs: [{ required: true, message: "请选择布控结束时间", trigger: "blur" }],
+  czYq: [{ required: true, message: "请选择处置要求", trigger: "change" }],
+  bkDj: [{ required: true, message: "请选择布控等级", trigger: "change" }],
+  bkYz: [{ required: true, message: "请选择布控要旨", trigger: "change" }]
+});
+const listQuery = ref({});
+
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  tableDate.bkfwList = data.bkfwList;
+  tableDate.rybqList = data.rybqList;
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+};
+// 3. 暴露方法给父组件
+defineExpose({
+  setFormData
+});
+</script>
+
+<style lang="scss" scoped>
+.control-area {
+  .map {
+    height: 200px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    box-sizing: border-box;
+    margin: 10px 0;
+  }
+  .el-form {
+    /* max-width: 1200px;
+    margin: 20px auto; */
+  }
+
+  :deep(.el-textarea__inner) {
+    font-family: inherit;
+  }
+}
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
+</style>

src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/controlInfo.vue

@@ -0,0 +1,282 @@
+<template>
+  <div class="info-container">
+    <!-- 布控信息 -->
+    <FormMessage v-model="listQuery" :formList="formData" ref="elform">
+      <!-- 预警标签模型-->
+      <template #yjbqList>
+        <div class="boxlist">
+          <MyTable
+            :tableData="tableDate.yjbqList"
+            :tableColumn="tableDate.tableColumn"
+            :tableHeight="tableDate.tableHeight"
+            :key="tableDate.keyCount"
+            :tableConfiger="tableDate.tableConfiger"
+            :controlsWidth="tableDate.controlsWidth"
+          >
+            <template #bqYs="{ row }">
+              <DictTag :value="row.bqYs" :tag="false" :options="D_GS_SSYJ" />
+            </template>
+            <template #bqDj="{ row }">
+              <DictTag :tag="false" :value="row.bqDj" :options="D_GS_BQ_DJ" />
+            </template>
+          </MyTable>
+        </div>
+      </template>
+    </FormMessage>
+    <!-- 按钮 -->
+
+    <div class="btns">
+
+    </div>
+    <MyTable
+      :tableData="pageData.tableData"
+      :tableColumn="pageData.tableColumn"
+      :key="pageData.keyCount"
+      :tableConfiger="pageData.tableConfiger"
+      :controlsWidth="pageData.controlsWidth"
+      @chooseData="chooseData"
+    >
+      <template #fjZp="{ row }">
+        <img width="30" src="@/assets/images/icon100.png" alt="" />
+      </template>
+      <template #ryXb="{ row }">
+        <DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" />
+      </template>
+      <template #qtTbsc="{ row }">
+        <div>
+          {{ row.qtTbsc == true ? "是" : "否" }}
+        </div>
+      </template>
+      <template #bkLx="{ row }">
+        <DictTag :tag="false" :value="row.bkLx" :options="D_GS_BK_LX" />
+      </template>
+      <!-- <template #controls="{ row }">
+        <el-button size="small" type="primary" link>查看档案</el-button>
+        <el-button size="small" type="primary" @click="editData(row)" link
+          >编辑</el-button
+        >
+        <el-button size="small" type="danger" @click="deleteData(row.id)" link
+          >删除</el-button
+        >
+      </template> -->
+    </MyTable>
+    <!-- 列表弹窗 -->
+
+
+
+  </div>
+</template>
+<script setup>
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckPost, qcckPut } from "@/api/qcckApi.js";
+import { add } from "lodash";
+import { tr } from "element-plus/es/locale.mjs";
+import { ElMessage } from "element-plus";
+
+const { proxy } = getCurrentInstance();
+const { D_GS_BK_DX, D_GS_BK_SSJZ, D_GS_SSYJ, D_GS_BQ_DJ, D_BZ_XB, D_GS_BK_LX } =
+  proxy.$dict(
+    "D_GS_BK_DX",
+    "D_GS_BK_SSJZ",
+    "D_GS_SSYJ",
+    "D_GS_BQ_DJ",
+    "D_BZ_XB",
+    "D_GS_BK_LX"
+  ); //获取字典数据
+
+const formRef = ref();
+
+const dialogFormVisible = ref(false);
+const chooseShow = ref(false); //选择弹窗
+const chooseTitle = ref(""); //选择弹窗
+const dialogForm = ref(false); //弹窗
+const chooseType = ref("01"); //选择弹窗类型
+const listQuery = ref({}); //表单
+const roleIds = ref([]); //角色id
+const dialogTitle = ref("新增信息"); //弹窗标题
+// 表单数据
+const formForData = ref({
+  ryXm: "", // 姓名
+  ryXb: "", // 性别
+  rySfzh: "", // 身份证号
+  ryHjd: "", // 户籍地
+  ryXjd: "", // 现居住地
+  rySjhm: "", // 手机号
+  qtTbsc: false, // 同步上传
+  clCph: "", // 车牌号
+  clCjh: "", // 车号
+  qtTxzh: "", // 特许证号
+  bkLx: "", // 人员标签
+  fjZp: "" // 照片
+});
+
+// 表单字段配置
+const formDataModel = ref([
+  { label: "姓名", prop: "ryXm", type: "input", width: "45%" },
+  {
+    label: "性别",
+    prop: "ryXb",
+    type: "select",
+    options: D_BZ_XB,
+    width: "45%"
+  },
+  { label: "身份证号", prop: "rySfzh", type: "input", width: "45%" },
+  { label: "户籍地", prop: "ryHjd", type: "input", width: "45%" },
+  { label: "现居住地", prop: "ryXjd", type: "input", width: "45%" },
+  { label: "手机号", prop: "rySjhm", type: "input", width: "45%" },
+  { label: "同步上传", prop: "qtTbsc", type: "switch" },
+  { label: "车牌号", prop: "clCph", type: "input", width: "45%" },
+  { label: "车架号", prop: "clCjh", type: "input", width: "45%" },
+  { label: "特许证号", prop: "qtTxzh", type: "input", width: "45%" },
+  {
+    label: "布控类型",
+    prop: "bkLx",
+    type: "radio",
+    width: "45%",
+    options: D_GS_BK_LX
+  },
+
+  { label: "照片", prop: "fjZp", type: "upload" },
+  { label: "人员标签", prop: "rybqList", type: "slot", width: "100%" } // 使用插槽自定义
+]);
+// 表单验证规则
+// const rulesModel = {
+//   ryXm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+//   ryXb: [{ required: true, message: "请选择性别", trigger: "change" }],
+//   rySfzh: [
+//     { required: true, message: "请输入身份证号", trigger: "blur" },
+//     {
+//       pattern: /^\d{17}[\dXx]$/,
+//       message: "身份证号格式不正确",
+//       trigger: "blur"
+//     }
+//   ],
+//   rySjhm: [
+//     { required: true, message: "请输入手机号", trigger: "blur" },
+//     { pattern: /^1[3-9]\d{9}$/, message: "手机号格式不正确", trigger: "blur" }
+//   ]
+// };
+const tableDate = reactive({
+  yjbqList: [], //表格数据
+  rybqList: [], //内置表格数据
+  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: "bqMc", showOverflowTooltip: true },
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签等级", prop: "bqDj", showSolt: true },
+    { label: "标签颜色", prop: "bqYs", showSolt: true }
+  ]
+});
+const editFormRef = ref(null);
+const currentEditIndex = ref(null);
+const pageData = reactive({
+  tableData: [], //表格数据
+  rykeyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false,
+    size: "small",
+    border: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  }, //分页
+  controlsWidth: 220, //操作栏宽度
+  tableColumn: [
+    { label: "照片", prop: "fjZp", showSolt: true },
+    { label: "姓名", prop: "ryXm" },
+    { label: "性别", prop: "ryXb", showSolt: true },
+    { label: "身份证号", prop: "rySfzh" },
+    { label: "户籍地", prop: "ryHjd" },
+    { label: "现居住地", prop: "ryXjd" },
+    { label: "手机号", prop: "rySjhm" },
+    { label: "同步上传", prop: "qtTbsc", showSolt: true },
+    { label: "车牌号", prop: "clCph" },
+    { label: "车架号", prop: "clCjh" },
+    { label: "特许证号", prop: "qtTxzh" },
+    { label: "布控类型", prop: "bkLx", showSolt: true },
+    { label: "人员标签", prop: "" }
+  ]
+});
+const formData = ref([
+  {
+    label: "布控标题",
+    prop: "bkBt",
+    type: "input",
+    disabled: true
+  },
+
+  {
+    label: "所属警种",
+    prop: "bkSsjz",
+    type: "select",
+    options: D_GS_BK_SSJZ,
+    disabled: true
+  },
+  {
+    label: "布控对象",
+    prop: "bkDx",
+    type: "select",
+    options: D_GS_BK_DX,
+    disabled: true
+  },
+  { label: "预警标签模型", prop: "yjbqList", type: "slot", width: "80%" }
+]);
+// const rules = reactive({
+//   bkBt: [{ required: true, message: "请输入布控标题", trigger: "blur" }],
+//   bkObj: [{ required: true, message: "请选择布控对象", trigger: "blur" }],
+//   yjbqList: [
+//     { required: true, message: "请选择预警标签模型", trigger: "change" }
+//   ]
+// });
+
+
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  tableDate.yjbqList = data.yjbqList;
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+  pageData.tableData = data.bkdxList;
+  console.log(listQuery.value);
+};
+
+
+
+// 3. 暴露方法给父组件
+defineExpose({
+  setFormData
+});
+</script>
+
+<style lang="scss" scoped>
+.info-container {
+  .btns {
+    margin-bottom: 10px;
+  }
+}
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
+</style>

src/views/backOfficeSystem/IntelligentControl/MyControlInfo/components/ui/dialogList.vue

@@ -0,0 +1,215 @@
+<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.jhMc"
+            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="jhMc" align="center" label="集合名称" />
+          <el-table-column prop="jhSm" align="center" label="集合说明" />
+
+        </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);
+  let data = { type: props.LeaderType, userList: userList };
+  emits("chooseDateLeader", data);
+  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/tbGsxtGzyJh/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;
+}
+
+</style>

src/views/backOfficeSystem/IntelligentControl/myControl/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.bqMc"
+            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="bqMc" align="center" label="标签名称" />
+          <el-table-column prop="bqDm" align="center" label="标签代码" />
+          <el-table-column prop="bqDj" align="center" label="标签等级">
+          </el-table-column>
+          <el-table-column prop="bqYs" align="center" label="标签颜色">
+            <template #default="{ row }">
+              <DictTag
+                :value="row.bqYs"
+                :tag="false"
+                :options="props.dic.D_GS_SSYJ"
+              />
+            </template>
+          </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);
+  let data = { type: props.LeaderType, userList: userList };
+  emits("chooseDateLeader", data);
+  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/tbGsxtBqzh/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/IntelligentControl/myControl/components/sendControl.vue

@@ -3,35 +3,101 @@
     <div class="head_box">
       <span class="title">发起布控</span>
       <div>
+        <el-button size="small" @click="submit">保存</el-button>
+
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="cntinfo">
       <div class="title-item">布控信息</div>
-      <ControlInfo></ControlInfo>
+      <ControlInfo ref="controlInfoRef" />
       <div class="title-item">布控范围</div>
-      <ControlArea></ControlArea>
+      <ControlArea ref="controlAreaRef" />
       <div class="title-item">审批信息</div>
-      <ApprovalInfo></ApprovalInfo>
+      <ApprovalInfo ref="approvalInfoRef" />
     </div>
   </div>
 </template>
 
 <script setup>
-  import { ref, reactive } from "vue";
+import { ref, reactive, nextTick } from "vue";
 import ControlInfo from "./ui/controlInfo.vue";
 import ControlArea from "./ui/controlArea.vue";
 import ApprovalInfo from "./ui/approvalInfo.vue";
+import { qcckPost } from "@/api/qcckApi.js";
+import { useRouter } from "vue-router";
+import { ElMessage } from "element-plus";
 
 const dialogForm = ref(false);
+
+const router = useRouter();
 const listQuery = ref({});
 
+// 获取子组件引用
+const controlInfoRef = ref(null);
+const controlAreaRef = ref(null);
+const approvalInfoRef = ref(null);
+
 // 初始化数据
-  const init = (type, row) => {
+const init = async (type, row) => {
   dialogForm.value = true;
+  await nextTick(); // 等待子组件挂载
   // 根据type和row初始化表单数据
+  // 如果是编辑模式，将数据传递给子组件
+  if (type === "edit" && row) {
+    controlInfoRef.value?.setFormData?.(row); // 回显布控信息
+    controlAreaRef.value?.setFormData?.(row); // 回显布控范围
+    approvalInfoRef.value?.setFormData?.(row); // 回显审批信息
+  } else {
+    // 如果是新增模式，清空表单（可选）
+    controlInfoRef.value?.resetForm?.();
+    controlAreaRef.value?.resetForm?.();
+    approvalInfoRef.value?.resetForm?.();
+  }
 };
 
+const cleanObj = (obj) => {
+  if (!obj) return {};
+  return Object.fromEntries(
+    Object.entries(obj).filter(([_, v]) => v !== null && v !== undefined)
+  );
+};
+const submit = async () => {
+  try {
+  
+    // 1. 分别获取各子组件数据
+    const controlInfoData = controlInfoRef.value?.getFormData?.();
+    const controlAreaData = controlAreaRef.value?.getFormData?.();
+    const approvalInfoData = approvalInfoRef.value?.getFormData?.();
+    // 2. 合并数据
+    const formData = {
+      ...cleanObj(controlInfoData?.formData),
+      ...cleanObj(controlAreaData?.formData),
+      ...cleanObj(approvalInfoData?.formData)
+    };
+    // 根据是否有 id 判断是新增还是编辑
+    const url = formData.id
+      ? "/mosty-gsxt/tbGsxtBk/update" // 编辑接口
+      : "/mosty-gsxt/tbGsxtBk/save"; // 新增接口
+    // 提交数据
+    await qcckPost(formData, url);
+    ElMessage.success(formData.id ? "编辑成功" : "新增成功");
+    close();
+    // 触发父组件方法
+    if (window.parent.updateList) {
+      window.parent.getList(); // 调用父组件方法
+    }
+    router.push("@/views/backOfficeSystem/IntelligentControl/myControl/index");
+    // qcckPost(formData, "/mosty-gsxt/tbGsxtBk/save").then((res) => {
+    //   router.push(
+    //     "@/views/backOfficeSystem/IntelligentControl/myControl/index"
+    //   );
+    // });
+  } catch (error) {
+    console.error("提交失败:", error);
+    ElMessage.error(error.message || "提交失败");
+  }
+};
 const close = () => {
   dialogForm.value = false;
 };
@@ -61,7 +127,11 @@
         left: 0;
         width: 78px;
         height: 4px;
-          background: linear-gradient(90deg, #3597f9c4 0%, rgba(53, 150, 249, 0) 100%);
+        background: linear-gradient(
+          90deg,
+          #3597f9c4 0%,
+          rgba(53, 150, 249, 0) 100%
+        );
         border-radius: 4px 4px 4px 4px;
       }
     }

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

@@ -1,7 +1,7 @@
 <template>
   <el-form :model="formData" label-width="auto" label-position="left">
     <!-- 处置接收单位 -->
-    <el-form-item label="处置接收单位">
+    <!-- <el-form-item label="处置接收单位">
       <div class="unit-selection">
         <el-select v-model="formData.receivingUnit" placeholder="请选择单位" style="width: 200px">
           <el-option label="巴宜区公安局" value="巴宜区公安局" />
@@ -32,50 +32,256 @@
             value-format="YYYY-MM-DD HH:mm"
           /> </el-form-item
       ></el-col>
-    </el-row>
+    </el-row> -->
+    <FormMessage
+      v-model="listQuery"
+      :formList="formData"
+      ref="elform"
+      :rules="rules"
+    >
+      <!-- 自定义插槽（人员标签） -->
+      <template #czJsdwdm>
+        <el-select
+          v-model="listQuery.czJsdwdm"
+          placeholder="请选择处置接收单位"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in deptList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
+        </el-select>
+      </template>
+    </FormMessage>
 
     <!-- 审批流程 -->
+    <div class="approval-flow">
       <div class="approval-flow">
         <div class="step" v-for="(item, index) in step" :key="`${index}step`">
           <div class="icon">
             <div class="circle"></div>
             <div class="line"></div>
           </div>
-
           <div>
             <div>{{ item.title }}</div>
             <div class="desc">
               <div class="description flexcc">
-              <div class="description-item">{{ item.fqr }}</div>
+                <!-- 使用方案1 + 方案2 -->
+                <div
+                  class="description-item"
+                  :class="{ 'disabled-item': item.default }"
+                  @click="!item.default && handleSelectStep(index)"
+                >
+                  {{ item.fqr }}
+                </div>
                 <div class="description-item">{{ item.fqbm }}</div>
+                <div class="step-description" v-if="item.description">
+                  {{ item.description }}
                 </div>
               </div>
             </div>
           </div>
         </div>
+      </div>
+    </div>
+    <ChooseUser
+      v-model="chooseUserVisible"
+      @choosedUsers="handleUserSelected"
+      :roleIds="roleIds"
+    />
   </el-form>
 </template>
 
 <script setup>
-  import { ref } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import ChooseUser from "@/components/MyComponents/ChooseUser/index.vue";
+import DialogList from "@/views/backOfficeSystem/IntelligentControl/myControl/components/dialogList.vue";
+import { qcckPost, qcckPut } from "@/api/qcckApi.js";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import { fa } from "element-plus/es/locale.mjs";
+import { selectUserDeptPage } from "@/api/user-manage";
 
-  const formData = ref({
+const { proxy } = getCurrentInstance();
-    receivingUnit: "",
+const { D_GS_BK_CZJSDWLX, D_GS_BK_TJFS } = proxy.$dict(
-    unitTypes: [],
+  "D_GS_BK_CZJSDWLX",
-    submitMethods: [],
+  "D_GS_BK_TJFS"
-    receiveTime: "",
+); //获取字典数据
-    initiator: "",
+const listQuery = ref({}); //表单
-    initiatingDepartment: "",
+const chooseUserVisible = ref(false); //审批流程
-    reviewer: "",
+const roleIds = ref([]); //角色id
-    reviewDepartment: "",
+let currentSelectedIndex = null;
-    approver: "",
+const deptList = ref([]); //部门列表
-    approveDepartment: ""
+const formData = ref([
+  {
+    label: "处置接收单位",
+    prop: "czJsdwdm",
+    type: "slot"
+  },
+  {
+    label: "处置接收单位类型",
+    prop: "czJsdwlx",
+    type: "select",
+    options: D_GS_BK_CZJSDWLX
+  },
+  // {
+  //   label: "提交方式",
+  //   prop: "bkTjfs",
+  //   type: "radio",
+  //   options: D_GS_BK_TJFS
+  // },
+  {
+    label: "签收时间",
+    prop: "bkSjQs",
+    type: "datetime"
+  }
+]);
+const rules = reactive({
+  bkBt: [{ required: true, message: "请选择处置接收单位", trigger: "blur" }],
+  // bkObj: [{ required: true, message: "请选择提交方式", trigger: "blur" }],
+  bkSjQs: [{ required: true, message: "请选择签收时间", trigger: "change" }]
 });
 const step = ref([
-    { fqr: "发起人", fqbm: "发起部门", title: "发起申请" },
+  { fqr: "发起人", fqbm: "发起部门", title: "发起申请", default: true },
-    { fqr: "发起人", fqbm: "发起部门", title: "审核确认" },
+  {
-    { fqr: "发起人", fqbm: "发起部门", title: "审批确认" }
+    fqr: "发起人",
+    fqbm: "发起部门",
+    title: "审核确认",
+    default: false,
+    status: "", // 动态设置状态
+    description: "" // 动态设置描述（如不通过原因）
+  },
+  {
+    fqr: "发起人",
+    fqbm: "发起部门",
+    title: "审批确认",
+    default: false,
+    status: "", // 动态设置状态
+    description: "" // 动态设置描述（如不通过原因）
+  }
 ]);
+
+onMounted(() => {
+  getdepartmentList();
+});
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+
+    console.log(deptList.value, D_GS_BK_CZJSDWLX);
+    // tableData.value = res?.records;
+  });
+};
+// 处理选择的人员数据
+const handleUserSelected = (userData) => {
+  if (currentSelectedIndex !== null) {
+    step.value[currentSelectedIndex] = {
+      ...step.value[currentSelectedIndex],
+      fqr: userData[0].userName,
+      fqbm: userData[0].deptName,
+      userId: userData[0].id,
+      rawData: userData[0] // 保留原始数据（可选）
+    };
+    if (currentSelectedIndex == 1) {
+      // 同时更新listQuery（如果需要）
+      listQuery.value = {
+        ...listQuery.value,
+        bkshrSfzh: userData[0].idEntityCard,
+        bkshrSsbmdm: userData[0].deptId,
+        bkshrSsbmmc: userData[0].deptName,
+        bkshrXm: userData[0].userName
+      };
+    } else if (currentSelectedIndex == 2) {
+      // 同时更新listQuery（如果需要）
+      listQuery.value = {
+        ...listQuery.value,
+        bksprSfzh: userData[0].idEntityCard,
+        bksprSsbmdm: userData[0].deptId,
+        bksprSsbmmc: userData[0].deptName,
+        bksprXm: userData[0].userName
+      };
+    }
+  }
+
+  chooseUserVisible.value = false;
+};
+
+// 点击步骤触发
+const handleSelectStep = (index) => {
+  currentSelectedIndex = index;
+  chooseUserVisible.value = true;
+};
+
+// 2. 暴露获取数据的方法
+const getFormData = () => {
+  // 可以在这里添加验证逻辑
+  return {
+    formData: listQuery.value
+  };
+};
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+  step.value = [
+    { fqr: "发起人", fqbm: "发起部门", title: "发起申请", default: true },
+    {
+      fqr: data.bkshrXm || "系统管理", // 审核人姓名
+      fqbm: data.bkshrSsbmmc || "西藏", // 审核部门
+      title: "审核确认",
+      status: "", // 动态设置状态
+      description: "" // 动态设置描述（如不通过原因）
+    },
+    {
+      fqr: data.bksprXm || "测试", // 审批人姓名
+      fqbm: data.bksprSsbmmc || "西藏", // 审批部门
+      title: "审批确认",
+      status: "", // 动态设置状态
+      description: "" // 动态设置描述（如不通过原因）
+    }
+  ];
+  // 根据 bkZt 的值设置不同的状态
+  switch (data.bkZt) {
+    case "02": // 审核中
+      step.value[1].status = "process";
+      step.value[1].description = "审核中";
+      break;
+    case "03": // 审核不通过
+      step.value[1].status = "error";
+      step.value[1].description = `审核不通过（原因：${data.bkshBtgyy}）`;
+      break;
+    case "04": // 审批中
+      step.value[1].status = "finish"; // 审核已完成
+      step.value[2].status = "process"; // 审批中
+      step.value[2].description = "审批中";
+      break;
+    case "05": // 审批通过
+      step.value[1].status = "finish"; // 审核已完成
+      step.value[2].status = "finish"; // 审批已完成
+      step.value[2].description = "审批通过";
+      break;
+    case "06": // 审批不通过
+      step.value[1].status = "finish"; // 审核已完成
+      step.value[2].status = "error"; // 审批不通过
+      step.value[2].description = `审批不通过（原因：${data.bkshBtgyy}）`;
+      break;
+    default:
+      break;
+  }
+};
+
+// 3. 暴露方法给父组件
+defineExpose({
+  getFormData,
+  setFormData
+});
 </script>
 
 <style lang="scss" scoped>
@@ -87,7 +293,7 @@
   .desc {
     margin: 5px;
     color: #929090;
-      width: 350px;
+    // width: 350px;
   }
   .icon {
     // position: absolute;
@@ -127,4 +333,9 @@
   color: rgb(131, 132, 135);
   box-sizing: border-box;
 }
+.disabled-item {
+  cursor: not-allowed;
+  opacity: 0.6;
+  pointer-events: none;
+}
 </style>

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

@@ -1,24 +1,61 @@
 <template>
   <div class="control-area">
-    <div class="map"></div>
+    <FormMessage
-    <el-form :model="formData" label-width="auto" label-position="left">
+      v-model="listQuery"
-      <!-- 布控类型 -->
+      :formList="formData"
-      <el-form-item label="布控类型">
+      ref="elform"
-        <el-radio-group v-model="formData.controlType">
+      :rules="rules"
-          <el-radio-button label="人员布控">人员布控</el-radio-button>
+    >
-          <el-radio-button label="车辆布控">车辆布控</el-radio-button>
+      <!-- 布控范围-->
-          <el-radio-button label="电话布控信息">电话布控信息</el-radio-button>
+      <template #bkfwList="{ row }">
-          <el-radio-button label="网络信息">网络信息</el-radio-button>
+        <el-button @click="openDialog('01')">选择</el-button>
-          <el-radio-button label="人像布控">人像布控</el-radio-button>
+        <div class="boxlist">
-        </el-radio-group>
+          <MyTable
-      </el-form-item>
+            :tableData="tableDate.bkfwList"
+            :tableColumn="tableDate.tableColumn"
+            :tableHeight="tableDate.tableHeight"
+            :key="tableDate.keyCount"
+            :tableConfiger="tableDate.tableConfiger"
+            :controlsWidth="tableDate.controlsWidth"
+          >
+            <!-- 操作 -->
+            <template #controls="{ row }">
+              <el-link type="danger" @click="delDictItem(row.id)">删除</el-link>
+            </template>
+          </MyTable>
+        </div>
+      </template>
+      <!-- 布控范围-->
+      <template #bkSjSx>
+        {{
+          listQuery?.bkSjKs && listQuery?.bkSjJs
+            ? calculateDays(listQuery.bkSjKs, listQuery.bkSjJs)
+            : "--"
+        }}
+      </template>
+    </FormMessage>
 
-      <!-- 时间选择 -->
+    <!-- 列表弹窗 -->
-      <el-row :gutter="20">
+    <DialogList
+      :Single="false"
+      :roleIds="roleIds"
+      v-if="chooseShow"
+      @chooseDate="chooseDate"
+      :titleValue="chooseTitle"
+      v-model="chooseShow"
+      :bqLx="chooseType"
+      :dic="{ D_GS_SSYJ }"
+      bqDl="02"
+    ></DialogList>
+
+    <!-- <div class="map"></div> -->
+    <!-- <el-form :model="formData" label-width="auto" label-position="left">
+       时间选择 -->
+    <!-- <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="布控开始时间">
             <el-date-picker
-              v-model="formData.startTime"
+              v-model="formData.bkSjKs"
               type="datetime"
               placeholder="选择开始时间"
               format="YYYY-MM-DD HH:mm"
@@ -30,7 +67,7 @@
         <el-col :span="6">
           <el-form-item label="布控结束时间">
             <el-date-picker
-              v-model="formData.endTime"
+              v-model="formData.bkSjJs"
               type="datetime"
               placeholder="选择结束时间"
               format="YYYY-MM-DD HH:mm"
@@ -39,81 +76,251 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
 
     <!-- 布控要求和级别 -->
-      <el-row :gutter="20">
+    <!-- <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="处置要求">
-            <el-select v-model="formData.requirement" placeholder="请选择">
+            <el-select v-model="formData.czYq" placeholder="请选择">
-              <el-option label="实时跟踪" value="track" />
+              <el-option
-              <!-- 添加更多选项 -->
+                :label="item.label"
+                :value="item.id"
+                v-for="item in D_GS_BK_CZYQ"
+                :key="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="布控等级">
-            <el-select v-model="formData.level" placeholder="请选择">
+            <el-select v-model="formData.bkDj" placeholder="请选择">
-              <el-option label="请选择" value="" />
+              <el-option
-              <!-- 添加更多选项 -->
+                :label="item.label"
+                :value="item.id"
+                v-for="item in D_GS_BK_DJ"
+                :key="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="布控要旨">
-            <el-select v-model="formData.purpose" placeholder="请选择">
+            <el-select v-model="formData.bkYz" placeholder="请选择">
-              <el-option label="请选择" value="" />
+              <el-option
-              <!-- 添加更多选项 -->
+                :label="item.label"
+                :value="item.id"
+                v-for="item in D_GS_BK_YZ"
+                :key="item.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+      </el-row> -->
-          <el-form-item label="布控地址">
-            <el-select v-model="formData.location" placeholder="请选择">
-              <el-option label="请选择" value="" />
-              <!-- 添加更多选项 -->
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
 
     <!-- 布控事由 -->
-      <el-form-item label="布控事由">
+    <!-- <el-form-item label="布控事由">
-        <el-input v-model="formData.reason" type="textarea" :rows="4" placeholder="请输入布控事由" />
+        <el-input
-      </el-form-item>
+          v-model="formData.bkSy"
+          type="textarea"
+          :rows="4"
+          placeholder="请输入布控事由"
+        />
+      </el-form-item> -->
 
     <!-- 上传附件 -->
-      <el-form-item label="上传附件">
+    <!-- <el-form-item label="上传附件">
-        <el-upload action="#" :auto-upload="false" :on-change="handleFileChange" :file-list="fileList">
+        <el-upload
+          action="#"
+          :auto-upload="false"
+          :on-change="handleFileChange"
+          :file-list="fileList"
+        >
           <el-button type="primary">
             <el-icon><Plus /></el-icon>
             支持jpg、png、pdf等上传
           </el-button>
         </el-upload>
       </el-form-item>
-    </el-form>
+    </el-form> -->
   </div>
 </template>
 
 <script setup>
-  import { ref } from "vue";
+import {
+  reactive,
+  ref,
+  onMounted,
+  getCurrentInstance,
+  nextTick,
+  computed
+} from "vue";
+const { proxy } = getCurrentInstance();
+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";
+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",
+    "D_GS_BK_CZJSDWLX",
+    "D_GS_BK_DJ",
+    "D_GS_BK_YZ",
+    "D_GS_BK_SJLX"
+  ); //获取字典数据
 
-  const formData = ref({
+const chooseShow = ref(false); //选择弹窗
-    controlType: "人员布控",
+const chooseTitle = ref(""); //选择弹窗
-    startTime: "",
+const dialogForm = ref(false); //弹窗
-    endTime: "",
+const chooseType = ref("01"); //选择弹窗类型
-    requirement: "",
+const roleIds = ref([]); //选择弹窗角色id
-    level: "",
+const fileList = ref([]); //上传附件
-    purpose: "",
+const tableDate = reactive({
-    location: "",
+  bkfwList: [], //表格数据
-    reason: ""
+  rybqList: [], //内置表格数据
+  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: "jhMc" },
+    { label: "集合说明", prop: "jhSm" }
+  ]
 });
+const formData = ref([
+  { label: "布控范围", prop: "bkfwList", type: "slot", width: "90%" },
+  {
+    label: "布控时间类型",
+    prop: "bkSjLx",
+    type: "select",
+    options: D_GS_BK_SJLX
+  },
+  {
+    label: "布控开始时间",
+    prop: "bkSjKs",
+    type: "datetime"
+  },
+  {
+    label: "布控结束时间",
+    prop: "bkSjJs",
+    type: "datetime"
+  },
+  {
+    label: "布控失效时间",
+    prop: "bkSjSx",
+    type: "slot"
+  },
 
-  const fileList = ref([]);
+  {
+    label: "处置要求",
+    prop: "czYq",
+    type: "select",
+    options: D_GS_BK_CZYQ
+  },
+  {
+    label: "布控等级",
+    prop: "bkDj",
+    type: "select",
+    options: D_GS_BK_DJ
+  },
+  {
+    label: "布控要旨",
+    prop: "bkYz",
+    type: "select",
+    options: D_GS_BK_YZ
+  },
+  {
+    label: "布控事由",
+    prop: "bkSy",
+    type: "textarea"
+  },
+  {
+    label: "上传附件",
+    prop: "bkFj",
+    type: "upload",
+    isImg: false
+  }
+]);
+const rules = reactive({
+  // bkSjKs: [{ required: true, message: "请选择布控开始时间", trigger: "blur" }],
+  // bkSjJs: [{ required: true, message: "请选择布控结束时间", trigger: "blur" }],
+  czYq: [{ required: true, message: "请选择处置要求", trigger: "change" }],
+  bkDj: [{ required: true, message: "请选择布控等级", trigger: "change" }],
+  bkYz: [{ required: true, message: "请选择布控要旨", trigger: "change" }]
+});
+const listQuery = ref({});
 
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  chooseType.value = type;
+  chooseTitle.value = type == "01" ? "请选择布控范围" : "请选择人员标签";
+  roleIds.value =
+    type == "01"
+      ? tableDate.bkfwList.map((item) => item.id)
+      : tableDate.rybqList.map((item) => item.id);
+};
+
+const calculateDays = (start, end) => {
+  if (!start || !end) return null; // 如果参数为空，返回 null
+  const startDate = new Date(start);
+  const endDate = new Date(end);
+
+  // 检查日期是否有效
+  if (isNaN(startDate) || isNaN(endDate)) return null;
+
+  const diffInDays = (endDate - startDate) / (24 * 60 * 60 * 1000); // 计算天数差
+  return diffInDays.toFixed(1); // 保留1位小数（返回字符串，如 "6.3"）
+};
+
+// 选择数据
+const chooseDate = (data) => {
+  if (chooseType.value == "01") {
+    tableDate.bkfwList = data;
+    listQuery.value.bkfwList = tableDate.bkfwList.map((item) => item.id);
+  } else {
+    tableDate.rybqList = data;
+    listQuery.value.rybqList = tableDate.rybqList.map((item) => item.id);
+  }
+};
 const handleFileChange = (file, fileList) => {
   console.log(file, fileList);
 };
+
+// 2. 暴露获取数据的方法
+const getFormData = () => {
+  if (listQuery.value.bkSjLx == "01") {
+    listQuery.value.bkSjSx = calculateDays(listQuery.value.bkSjKs, listQuery.value.bkSjJs);
+  }
+  console.log(listQuery.value, "listQuery.value",'数据');
+  // 可以在这里添加验证逻辑
+  return {
+    formData: listQuery.value
+  };
+};
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  tableDate.bkfwList = data.bkfwList ?? [];
+  tableDate.rybqList = data.rybqList ?? [];
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+};
+// 3. 暴露方法给父组件
+defineExpose({
+  getFormData,
+  setFormData
+});
 </script>
 
 <style lang="scss" scoped>
@@ -134,4 +341,10 @@
     font-family: inherit;
   }
 }
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
 </style>

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

@@ -1,32 +1,78 @@
 <template>
   <div class="info-container">
     <!-- 布控信息 -->
-    <el-form :inline="true" :model="formInline" class="demo-form-inline">
+    <!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">
       <el-form-item label="布控标题">
-        <el-input v-model="formInline.user" placeholder="Approved by" clearable />
+        <el-input
+          v-model="formInline.bkBt"
+          placeholder="请输入布控标题"
+          clearable
+        />
       </el-form-item>
       <el-form-item label="预警标签模型">
-        <el-select v-model="formInline.region" placeholder="Activity zone" clearable>
+        <el-select
+          v-model="formInline.region"
+          placeholder="Activity zone"
+          clearable
+        >
           <el-option label="Zone one" value="shanghai" />
           <el-option label="Zone two" value="beijing" />
         </el-select>
       </el-form-item>
       <el-form-item label="所属警钟">
-        <el-select v-model="formInline.region" placeholder="Activity zone" clearable>
+        <el-select
+          v-model="formInline.bkSsjz"
+          placeholder="Activity zone"
+          clearable
+        >
           <el-option label="Zone one" value="shanghai" />
           <el-option label="Zone two" value="beijing" />
         </el-select>
       </el-form-item>
       <el-form-item label="布控对象">
-        <el-select v-model="formInline.person" placeholder="Activity zone" clearable>
+        <el-select
+          v-model="formInline.person"
+          placeholder="Activity zone"
+          clearable
+        >
           <el-option label="Zone one" value="shanghai" />
           <el-option label="Zone two" value="beijing" />
         </el-select>
       </el-form-item>
-    </el-form>
+    </el-form> -->
+    <FormMessage v-model="listQuery" :formList="formData" ref="elform">
+      <!-- 预警标签模型-->
+      <template #yjbqList>
+        <el-button @click="openDialog('01')">选择</el-button>
+        <div class="boxlist">
+          <MyTable
+            :tableData="tableDate.yjbqList"
+            :tableColumn="tableDate.tableColumn"
+            :tableHeight="tableDate.tableHeight"
+            :key="tableDate.keyCount"
+            :tableConfiger="tableDate.tableConfiger"
+            :controlsWidth="tableDate.controlsWidth"
+          >
+            <template #bqYs="{ row }">
+              <DictTag :value="row.bqYs" :tag="false" :options="D_GS_SSYJ" />
+            </template>
+            <template #bqDj="{ row }">
+              <DictTag :tag="false" :value="row.bqDj" :options="D_GS_BQ_DJ" />
+            </template>
+            <!-- 操作 -->
+            <template #controls="{ row }">
+              <el-link type="danger" @click="delDictItem(row.id, '预警标签')"
+                >删除</el-link
+              >
+            </template>
+          </MyTable>
+        </div>
+      </template>
+    </FormMessage>
     <!-- 按钮 -->
+
     <div class="btns">
-      <el-button type="primary">新增</el-button>
+      <el-button type="primary" @click="handleAdd()">新增</el-button>
       <el-button type="danger">批量删除</el-button>
     </div>
     <MyTable
@@ -37,43 +83,209 @@
       :controlsWidth="pageData.controlsWidth"
       @chooseData="chooseData"
     >
-      <template #photo="{ row }">
+      <template #fjZp="{ row }">
         <img width="30" src="@/assets/images/icon100.png" alt="" />
       </template>
+      <template #ryXb="{ row }">
+        <DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" />
+      </template>
+      <template #qtTbsc="{ row }">
+        <div>
+          {{ row.qtTbsc == true ? "是" : "否" }}
+        </div>
+      </template>
+      <template #bkLx="{ row }">
+        <DictTag :tag="false" :value="row.bkLx" :options="D_GS_BK_LX" />
+      </template>
       <template #controls="{ row }">
         <el-button size="small" type="primary" link>查看档案</el-button>
-        <el-button size="small" type="primary" link>编辑</el-button>
+        <el-button size="small" type="primary" @click="editData(row)" link
-        <el-button size="small" type="danger" link>删除</el-button>
+          >编辑</el-button
+        >
+        <el-button size="small" type="danger" @click="deleteData(row.id)" link
+          >删除</el-button
+        >
+      </template>
+    </MyTable>
+    <!-- 列表弹窗 -->
+    <DialogList
+      :Single="false"
+      :roleIds="roleIds"
+      v-if="chooseShow"
+      @chooseDate="chooseDate"
+      :titleValue="chooseTitle"
+      v-model="chooseShow"
+      :bqLx="chooseType"
+      :dic="{ D_GS_SSYJ }"
+      bqDl="02"
+    ></DialogList>
+
+    <el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800px">
+      <FormMessage
+        v-model="formForData"
+        :formList="formDataModel"
+        ref="formRef"
+        label-width="120px"
+      >
+        <!-- 自定义插槽（人员标签） -->
+        <template #rybqList>
+          <el-button @click="openDialog('02')">选择</el-button>
+          <div class="boxlist">
+            <MyTable
+              :tableData="tableDate.rybqList"
+              :tableColumn="tableDate.tableColumn"
+              :tableHeight="tableDate.tableHeight"
+              :key="tableDate.rykeyCount"
+              :tableConfiger="tableDate.tableConfiger"
+              :controlsWidth="tableDate.controlsWidth"
+            >
+              <template #bqYs="{ row }">
+                <DictTag :value="row.bqYs" :tag="false" :options="D_GS_SSYJ" />
+              </template>
+              <template #bqDj="{ row }">
+                <DictTag :tag="false" :value="row.bqDj" :options="D_GS_BQ_DJ" />
+              </template>
+              <!-- 操作 -->
+              <template #controls="{ row }">
+                <el-link type="danger" @click="delDictItem(row.id, '人员标签')"
+                  >删除</el-link
+                >
               </template>
             </MyTable>
           </div>
         </template>
+      </FormMessage>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">关闭</el-button>
+          <el-button type="primary" @click="submitForm"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
 <script setup>
-  import { reactive } from "vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import DialogList from "@/views/backOfficeSystem/IntelligentControl/myControl/components/dialogList.vue";
+import { qcckPost, qcckPut } from "@/api/qcckApi.js";
+import { add } from "lodash";
+import { tr } from "element-plus/es/locale.mjs";
+import { ElMessage } from "element-plus";
 
-  const formInline = reactive({
+const { proxy } = getCurrentInstance();
-    user: "",
+const { D_GS_BK_DX, D_GS_BK_SSJZ, D_GS_SSYJ, D_GS_BQ_DJ, D_BZ_XB, D_GS_BK_LX } =
-    region: "",
+  proxy.$dict(
-    date: ""
+    "D_GS_BK_DX",
+    "D_GS_BK_SSJZ",
+    "D_GS_SSYJ",
+    "D_GS_BQ_DJ",
+    "D_BZ_XB",
+    "D_GS_BK_LX"
+  ); //获取字典数据
+
+const formRef = ref();
+
+const dialogFormVisible = ref(false);
+const chooseShow = ref(false); //选择弹窗
+const chooseTitle = ref(""); //选择弹窗
+const dialogForm = ref(false); //弹窗
+const chooseType = ref("01"); //选择弹窗类型
+const listQuery = ref({}); //表单
+const roleIds = ref([]); //角色id
+const dialogTitle = ref("新增信息"); //弹窗标题
+// 表单数据
+const formForData = ref({
+  ryXm: "", // 姓名
+  ryXb: "", // 性别
+  rySfzh: "", // 身份证号
+  ryHjd: "", // 户籍地
+  ryXjd: "", // 现居住地
+  rySjhm: "", // 手机号
+  qtTbsc: false, // 同步上传
+  clCph: "", // 车牌号
+  clCjh: "", // 车号
+  qtTxzh: "", // 特许证号
+  bkLx: "", // 人员标签
+  fjZp: "" // 照片
 });
-  const pageData = reactive({
+
-    tableData: [
+// 表单字段配置
+const formDataModel = ref([
+  { label: "姓名", prop: "ryXm", type: "input", width: "45%" },
   {
-        photo: "",
+    label: "性别",
-        name: "某三",
+    prop: "ryXb",
-        gender: "男",
+    type: "select",
-        idNumber: "500352199705022365",
+    options: D_BZ_XB,
-        currentAddress: "西藏特警...",
+    width: "45%"
-        phoneNumber: "1525421452",
+  },
-        uploadStatus: "smsj",
+  { label: "身份证号", prop: "rySfzh", type: "input", width: "45%" },
-        carNumber: "藏A12345",
+  { label: "户籍地", prop: "ryHjd", type: "input", width: "45%" },
-        vehicleNumber: "AKBC123",
+  { label: "现居住地", prop: "ryXjd", type: "input", width: "45%" },
-        specialLicense: "已同步上传",
+  { label: "手机号", prop: "rySjhm", type: "input", width: "45%" },
-        personTag: "网络延迟"
+  { label: "同步上传", prop: "qtTbsc", type: "switch" },
-      }
+  { label: "车牌号", prop: "clCph", type: "input", width: "45%" },
-    ], //表格数据
+  { label: "车架号", prop: "clCjh", type: "input", width: "45%" },
+  { label: "特许证号", prop: "qtTxzh", type: "input", width: "45%" },
+  {
+    label: "布控类型",
+    prop: "bkLx",
+    type: "radio",
+    width: "45%",
+    options: D_GS_BK_LX
+  },
+
+  { label: "照片", prop: "fjZp", type: "upload" },
+  { label: "人员标签", prop: "rybqList", type: "slot", width: "100%" } // 使用插槽自定义
+]);
+// 表单验证规则
+// const rulesModel = {
+//   ryXm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+//   ryXb: [{ required: true, message: "请选择性别", trigger: "change" }],
+//   rySfzh: [
+//     { required: true, message: "请输入身份证号", trigger: "blur" },
+//     {
+//       pattern: /^\d{17}[\dXx]$/,
+//       message: "身份证号格式不正确",
+//       trigger: "blur"
+//     }
+//   ],
+//   rySjhm: [
+//     { required: true, message: "请输入手机号", trigger: "blur" },
+//     { pattern: /^1[3-9]\d{9}$/, message: "手机号格式不正确", trigger: "blur" }
+//   ]
+// };
+const tableDate = reactive({
+  yjbqList: [], //表格数据
+  rybqList: [], //内置表格数据
   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: "bqMc", showOverflowTooltip: true },
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签等级", prop: "bqDj", showSolt: true },
+    { label: "标签颜色", prop: "bqYs", showSolt: true }
+  ]
+});
+const editFormRef = ref(null);
+const currentEditIndex = ref(null);
+const pageData = reactive({
+  tableData: [], //表格数据
+  rykeyCount: 0,
   tableConfiger: {
     rowHieght: 61,
     showSelectType: "checkBox",
@@ -88,26 +300,216 @@
   }, //分页
   controlsWidth: 220, //操作栏宽度
   tableColumn: [
-      { label: "照片", prop: "photo", showSolt: true },
+    { label: "照片", prop: "fjZp", showSolt: true },
-      { label: "姓名", prop: "name" },
+    { label: "姓名", prop: "ryXm" },
-      { label: "性别", prop: "gender" },
+    { label: "性别", prop: "ryXb", showSolt: true },
-      { label: "身份证号", prop: "idNumber" },
+    { label: "身份证号", prop: "rySfzh" },
-      { label: "户籍地", prop: "户籍地" },
+    { label: "户籍地", prop: "ryHjd" },
-      { label: "现居住地", prop: "currentAddress" },
+    { label: "现居住地", prop: "ryXjd" },
-      { label: "手机号", prop: "phoneNumber" },
+    { label: "手机号", prop: "rySjhm" },
-      { label: "同步上传", prop: "uploadStatus" },
+    { label: "同步上传", prop: "qtTbsc", showSolt: true },
-      { label: "车牌号", prop: "carNumber" },
+    { label: "车牌号", prop: "clCph" },
-      { label: "车号", prop: "vehicleNumber" },
+    { label: "车架号", prop: "clCjh" },
-      { label: "特许证号", prop: "specialLicense" },
+    { label: "特许证号", prop: "qtTxzh" },
-      { label: "人员标签", prop: "personTag" }
+    { label: "布控类型", prop: "bkLx", showSolt: true },
+    { label: "人员标签", prop: "" }
   ]
 });
+const formData = ref([
+  {
+    label: "布控标题",
+    prop: "bkBt",
+    type: "input"
+  },
 
-  const onSubmit = () => {
+  {
-    console.log("submit!");
+    label: "所属警种",
+    prop: "bkSsjz",
+    type: "select",
+    options: D_GS_BK_SSJZ
+  },
+  {
+    label: "布控对象",
+    prop: "bkDx",
+    type: "select",
+    options: D_GS_BK_DX
+  },
+  { label: "预警标签模型", prop: "yjbqList", type: "slot", width: "80%" }
+]);
+// const rules = reactive({
+//   bkBt: [{ required: true, message: "请输入布控标题", trigger: "blur" }],
+//   bkObj: [{ required: true, message: "请选择布控对象", trigger: "blur" }],
+//   yjbqList: [
+//     { required: true, message: "请选择预警标签模型", trigger: "change" }
+//   ]
+// });
+
+// 2. 暴露获取数据的方法
+const getFormData = () => {
+  // 可以在这里添加验证逻辑
+  return {
+    formData: listQuery.value
   };
+};
+// 打开弹窗
+const openDialog = (type) => {
+  chooseShow.value = true;
+  chooseType.value = type;
+  chooseTitle.value = type == "01" ? "请选择预警标签模型" : "请选择人员标签";
+  roleIds.value =
+    type == "01"
+      ? tableDate.yjbqList.map((item) => item.id)
+      : tableDate.rybqList.map((item) => item.id);
+};
+const handleAdd = () => {
+  dialogFormVisible.value = true;
+  dialogTitle.value = "新增信息";
+};
+
+// 选择数据
+const chooseDate = (data) => {
+  if (chooseType.value == "01") {
+    tableDate.yjbqList = data;
+    listQuery.value.yjbqList = tableDate.yjbqList.map((item) => item.id);
+  } else {
+    tableDate.rybqList = data;
+    listQuery.value.rybqList = tableDate.rybqList.map((item) => item.id);
+  }
+};
+const submitForm = () => {
+  // 正确调用子组件的submit方法
+  formRef.value.submit(
+    // 成功回调
+    (validData) => {
+      // 处理编辑情况
+      if (dialogTitle.value === "编辑信息") {
+        // 确保 currentEditIndex 有效
+        if (
+          currentEditIndex.value >= 0 &&
+          currentEditIndex.value < pageData.tableData.length
+        ) {
+          pageData.tableData[currentEditIndex.value] = {
+            ...pageData.tableData[currentEditIndex.value],
+            ryXm: validData.ryXm,
+            ryXb: validData.ryXb,
+            rySfzh: validData.rySfzh,
+            ryHjd: validData.ryHjd,
+            ryXjd: validData.ryXjd,
+            rySjhm: validData.rySjhm,
+            qtTbsc: validData.qtTbsc,
+            clCph: validData.clCph,
+            clCjh: validData.clCjh,
+            qtTxzh: validData.qtTxzh,
+            bkLx: validData.bkLx,
+            fjZp: validData.fjZp
+          };
+        } else {
+          console.error("无效的编辑索引:", currentEditIndex.value);
+        }
+      }
+      // 处理新增情况
+      else {
+        // 根据 chooseType 处理不同类型的布控
+        if (chooseType.value === "01") {
+          // 预警标签类型
+          const newItem = {
+            ...validData,
+            yjbqList: tableDate.yjbqList.map((item) => item.id)
+          };
+          pageData.tableData.push(newItem);
+        } else {
+          // 人员标签类型
+          const newItem = {
+            ...validData,
+            rybqList: tableDate.rybqList.map((item) => item.id)
+          };
+          pageData.tableData.push(newItem);
+        }
+      }
+      //赋值子组件数据传递给父组件
+      listQuery.value.bkdxList = pageData.tableData;
+      // 关闭弹窗并重置表单
+      dialogFormVisible.value = false;
+    },
+    // 错误回调（可选）
+    (errors) => {
+      console.error("表单验证失败:", errors);
+      ElMessage.error("请检查表单填写是否正确");
+    }
+  );
+};
+
+// 接收父组件传入的数据并回显
+const setFormData = (data) => {
+  tableDate.yjbqList = data.yjbqList ?? [];
+  listQuery.value = {
+    ...data // 假设 data 包含所有需要的字段
+  };
+  pageData.tableData = data.bkdxList;
+  console.log(listQuery.value);
+};
+
+// 打开编辑弹窗
+const editData = (rowData) => {
+  // 找到当前行在tableData中的索引
+  currentEditIndex.value = pageData.tableData.findIndex(
+    (item) => item.rySfzh === rowData.rySfzh // 使用身份证号作为唯一标识
+  );
+  // 1. 使用解构提取原始值（避免响应式代理）
+  const rawData = { ...rowData }; // 浅拷贝解除响应式
+
+  // 2. 手动指定需要更新的字段
+  const safeUpdate = {
+    ryXm: rowData.ryXm, // 姓名
+    ryXb: rowData.ryXb, // 性别
+    rySfzh: rowData.rySfzh, // 身份证号
+    ryHjd: rowData.ryHjd, // 户籍地
+    ryXjd: rowData.ryXjd, // 现居住地
+    rySjhm: rowData.rySjhm, // 手机号
+    qtTbsc: rowData.qtTbsc, // 同步上传
+    clCph: rowData.clCph, // 车牌号
+    clCjh: rowData.clCjh, // 车号
+    qtTxzh: rowData.qtTxzh, // 特许证号
+    bkLx: rowData.bkLx, // 布控类型
+    bkLx: rowData.bkLx, // 人员标签
+    fjZp: rowData.fjZp // 照片
+  };
+  // 3. 一次性赋值
+  formForData.value = safeUpdate;
+  // 4. 延迟打开弹窗
+  nextTick(() => {
+    dialogFormVisible.value = true;
+    dialogTitle.value = "编辑信息";
+  });
+};
+
+// 根据索引删除数据
+const deleteData = (index) => {
+  pageData.tableData.splice(index, 1);
+};
+// 删除
+const delDictItem = (id, type) => {
+  switch (type) {
+    case "人员标签":
+      tableDate.rybqList = tableDate.rybqList.filter((item) => item.id !== id);
+      listQuery.value.rybqList = tableDate.rybqList.map((item) => item.id);
+      break;
+    case "预警标签":
+      tableDate.yjbqList = tableDate.yjbqList.filter((item) => item.id !== id);
+      listQuery.value.yjbqList = tableDate.yjbqList.map((item) => item.id);
+      break;
+  }
+};
+// 根据id查询详情
+
 // 选择
 const chooseData = () => {};
+
+// 3. 暴露方法给父组件
+defineExpose({
+  getFormData,
+  setFormData
+});
 </script>
 
 <style lang="scss" scoped>
@@ -123,4 +525,10 @@
     margin-bottom: 10px;
   }
 }
+.boxlist {
+  width: 99%;
+  height: 225px;
+  margin-top: 10px;
+  overflow: hidden;
+}
 </style>

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

@@ -0,0 +1,215 @@
+<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.jhMc"
+            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="jhMc" align="center" label="集合名称" />
+          <el-table-column prop="jhSm" align="center" label="集合说明" />
+
+        </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);
+  let data = { type: props.LeaderType, userList: userList };
+  emits("chooseDateLeader", data);
+  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/tbGsxtGzyJh/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;
+}
+
+</style>

src/views/backOfficeSystem/IntelligentControl/myControl/index.vue

@@ -5,7 +5,11 @@
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
+      <Search
+        :searchArr="searchConfiger"
+        @submit="onSearch"
+        :key="pageData.keyCount"
+      />
     </div>
     <!-- 按钮组 -->
     <div class="content">
@@ -15,11 +19,21 @@
           <el-button type="primary">导出</el-button>
           <el-button type="danger">批量删除</el-button>
           <el-button type="primary" icon="CirclePlus">添加标签模型</el-button>
-          <el-button type="primary" icon="CirclePlus" @click="drawerModel">添加范围模型</el-button>
+          <el-button type="primary" icon="CirclePlus" @click="drawerModel"
-          <el-button type="primary" icon="CirclePlus" @click="personNum">涉及人数</el-button>
+            >添加范围模型</el-button
+          >
+          <el-button type="primary" icon="CirclePlus" @click="personNum"
+            >涉及人数</el-button
+          >
         </div>
-        <el-input v-model="input2" style="max-width: 300px" placeholder="请输入关键字">
+        <el-input
-          <template #append><el-button type="primary" icon="Search"></el-button></template>
+          v-model="input2"
+          style="max-width: 300px"
+          placeholder="请输入关键字"
+        >
+          <template #append
+            ><el-button type="primary" icon="Search"></el-button
+          ></template>
         </el-input>
       </div>
       <!-- 表格 -->
@@ -33,9 +47,43 @@
           :controlsWidth="pageData.controlsWidth"
           @chooseData="chooseData"
         >
+          <template #bkDj="{ row }">
+            <DictTag :tag="false" :value="row.bkDj" :options="D_GS_BK_DJ" />
+          </template>
+          <template #bkDx="{ row }">
+            <DictTag :tag="false" :value="row.bkDx" :options="D_GS_BK_DX" />
+          </template>
+          <template #bkZt="{ row }">
+            <DictTag :tag="false" :value="row.bkZt" :options="D_GS_BK_ZT" />
+          </template>
+          <template #czYq="{ row }">
+            <DictTag :tag="false" :value="row.czYq" :options="D_GS_BK_CZYQ" />
+          </template>
+          <template #czJsdwdm="{ row }">
+            <div>
+              {{
+                deptList.find((item) => item.id == row.czJsdwdm)?.label ||
+                "未知单位"
+              }}
+            </div>
+          </template>
           <!-- 操作 -->
           <template #controls="{ row }">
-            <el-button size="small" @click="addEdit('detail', row)">详情</el-button>
+            <el-button
+              v-if="row.bkZt == '01' || row.bkZt == '03' || row.bkZt == '06'"
+              size="small"
+              @click="editControl('edit', row)"
+              >编辑</el-button
+            >
+            <el-button
+              v-if="row.bkZt == '01' || row.bkZt == '03' || row.bkZt == '06'"
+              size="small"
+              @click="openDetail(row)"
+              >送审</el-button
+            >
+            <el-button size="small" @click="info('detail', row)"
+              >详情</el-button
+            >
           </template>
         </MyTable>
         <Pages
@@ -48,14 +96,27 @@
           }"
         ></Pages>
       </div>
+      <el-dialog
+        v-model="dialogVisible"
+        title="发起送审"
+        width="500px"
+        :before-close="handleClose"
+      >
+        <span>是否要发起送审</span>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button @click="dialogVisible = false">取消</el-button>
+            <el-button type="primary" @click="autoEdit()"> 确定 </el-button>
+          </div>
+        </template>
+      </el-dialog>
     </div>
 
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" />
+    <MyControlInfo ref="myControlInfoRef" />
     <!-- 发起布控 -->
     <SendControl ref="sendControlRef"></SendControl>
     <PersonNum ref="personNumRef"></PersonNum>
-
     <!-- 侧边栏 -->
     <DrawerAreaModel ref="drawerModelRef"></DrawerAreaModel>
   </div>
@@ -66,41 +127,69 @@
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
-  import DetailForm from "./components/detailForm.vue";
+import MyControlInfo from "../MyControlInfo/components/sendControl.vue";
 import SendControl from "./components/sendControl.vue";
 import PersonNum from "./components/personNum.vue";
 import DrawerAreaModel from "./components/drawerAreaModel.vue";
 
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { ElMessage } from "element-plus";
+
+import { selectUserDeptPage } from "@/api/user-manage";
 const { proxy } = getCurrentInstance();
+const {
+  D_GS_BK_DJ,
+  D_GS_BK_DX,
+  D_GS_BK_ZT,
+  D_GS_BK_SJLX,
+  D_GS_BK_CZYQ,
+  D_GS_BK_CZJSDWLX
+} = proxy.$dict(
+  "D_GS_BK_DJ",
+  "D_GS_BK_DX",
+  "D_GS_BK_ZT",
+  "D_GS_BK_SJLX",
+  "D_GS_BK_CZYQ",
+  "D_GS_BK_CZJSDWLX"
+); //获取字典数据
+const deptList = ref([]); //部门列表
 const detailDiloag = ref();
+const dialogVisible = ref(false);
 const searchBox = ref(); //搜索框
 const sendControlRef = ref();
 const personNumRef = ref();
+const autoId = ref();
+const myControlInfoRef = ref(null);
 const searchConfiger = ref([
   {
-      label: "布控级别",
+    label: "布控等级",
-      prop: "jyzt",
+    prop: "bqDj",
-      placeholder: "请选择经营状况",
+    placeholder: "请选择布控等级",
     showType: "select",
-      options: [{ label: "在业", value: "在业" }]
+    options: D_GS_BK_DJ
   },
   {
     label: "布控对象",
-      prop: "jyzt",
+    prop: "bkDx",
-      placeholder: "请选择经营状况",
+    placeholder: "请选择布控对象",
     showType: "select",
-      options: [{ label: "在业", value: "在业" }]
+    options: D_GS_BK_DX
   },
   {
     label: "布控状态",
-      prop: "jyzt",
+    prop: "bkZt",
-      placeholder: "请选择经营状况",
+    placeholder: "请选择布控状态",
     showType: "select",
-      options: [{ label: "在业", value: "在业" }]
+    options: D_GS_BK_ZT
+  },
+  {
+    label: "布控时间类型",
+    prop: "bkSjLx",
+    placeholder: "请选择布控时间",
+    showType: "date",
+    options: D_GS_BK_SJLX
   },
-    { label: "布控时间", prop: "checkDate", placeholder: "布控时间", showType: "date" },
   {
     label: "预计标签模型",
     prop: "jyzt",
@@ -108,7 +197,12 @@
     showType: "select",
     options: [{ label: "在业", value: "在业" }]
   },
-    { label: "最近预警时间", prop: "checkDate", placeholder: "最近预警时间", showType: "date" },
+  {
+    label: "最近预警时间",
+    prop: "checkDate",
+    placeholder: "最近预警时间",
+    showType: "date"
+  },
   {
     label: "布控对象信息",
     prop: "jyzt",
@@ -148,73 +242,113 @@
     pageSize: 20,
     pageCurrent: 1
   }, //分页
-    controlsWidth: 120, //操作栏宽度
+  controlsWidth: "240", //操作栏宽度
 
   tableColumn: [
-      { label: "布控级别", prop: "bkjb" },
+    { label: "布控级别", prop: "bkDj", showSolt: true },
-      { label: "布控标题", prop: "bkbt" },
+    { label: "布控标题", prop: "bkBt" },
-      { label: "布控对象", prop: "bkdx" },
+    // { label: "布控对象", prop: "bkDx", showSolt: true },
-      { label: "布控对象信息", prop: "bkdx" },
+    // { label: "布控对象信息", prop: "bkDxxx" },
-      { label: "预警标签模型", prop: "yjbqmx" },
+    // { label: "预警标签模型", prop: "yjbqmx" },
-      { label: "布控范围", prop: "bkfw" },
+    // { label: "布控范围", prop: "bkfw" },
-      { label: "预警信息", prop: "yjxx" },
+    // { label: "预警信息", prop: "yjxx" },
-      { label: "处置接收单位", prop: "czjsdw" },
+    { label: "处置接收单位", prop: "czJsdwdm", showSolt: true },
-      { label: "处置要求", prop: "czyq" },
+    { label: "处置要求", prop: "czYq", showSolt: true },
-      { label: "开始时间", prop: "kssj" },
+    { label: "开始时间", prop: "bkSjKs" },
-      { label: "结束时间", prop: "jssj" },
+    { label: "结束时间", prop: "bkSjJs" },
-      { label: "最近预警时间", prop: "zjyjsj" },
+    // { label: "最近预警时间", prop: "zjyjsj" },
-      { label: "失效时间", prop: "sxsj" },
+    { label: "失效时间", prop: "bkSjSx" },
-      { label: "布控发起人", prop: "bkfqr" },
+    { label: "布控发起人", prop: "bkfqrXm" },
-      { label: "布控状态", prop: "bkzt" }
+    { label: "布控状态", prop: "bkZt", showSolt: true }
   ]
 });
+
 onMounted(() => {
-    // getList()
+  getList();
   tabHeightFn();
+  getdepartmentList();
 });
 
+// 获取部门列表
+const getdepartmentList = () => {
+  selectUserDeptPage().then((res) => {
+    deptList.value = res?.records.map((item) => ({
+      label: item.deptName,
+      value: item.deptId
+    }));
+  });
+};
+const openDetail = (row) => {
+  autoId.value = row.id;
+  dialogVisible.value = true;
+};
 //选择类型
-  const handleType = val => {
+const handleType = (val) => {
   pageData.keyCount++;
   pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
 // 搜索
-  const onSearch = val => {
+const onSearch = (val) => {
   queryFrom.value = { ...val };
   pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
 
-  const changeNo = val => {
+const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
   getList();
 };
-  const changeSize = val => {
+const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
   getList();
 };
 
 // 获取列表
-  const getList = val => {
+const getList = (val) => {
-    // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
-    // let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
-    // let url = '/mosty-lzcj/tbDwMbkf/queryList';
+  let url = "/mosty-gsxt/tbGsxtBk/selectPage";
-    // qcckPost(data,url).then(res=>{
+  qcckGet(data, url)
-    //   pageData.tableData = res.records || [];
+    .then((res) => {
-    //   pageData.total = res.total;
+      console.log(res, "4");
-    //   pageData.tableConfiger.loading = false;
+      pageData.tableData = res.records || [];
-    // }).catch(()=>{ pageData.tableConfiger.loading = false; })
+      pageData.total = res.total;
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
 };
 
 // 详情
-  const addEdit = (type, row) => {
+const info = (type, row) => {
-    detailDiloag.value.init(type, row);
+  myControlInfoRef.value.init(type, row);
+};
+
+//送审
+const autoEdit = () => {
+  dialogVisible.value = false;
+  let url = `/mosty-gsxt/tbGsxtBk/subExamine/${autoId.value}`;
+  qcckPost({}, url)
+    .then((res) => {
+      ElMessage.success("提交成功");
+      getList();
+    })
+    .catch(() => {
+      ElMessage.error("提交失败");
+    });
 };
 // 发起
 const sendControl = () => {
   sendControlRef.value.init();
 };
+//编辑
+// 发起
+const editControl = (type, row) => {
+  sendControlRef.value.init(type, row);
+};
+
 // 涉及人数
 const personNum = () => {
   personNumRef.value.init();
@@ -227,7 +361,8 @@
 };
 // 表格高度计算
 const tabHeightFn = () => {
-    pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 292;
+  pageData.tableHeight =
+    window.innerHeight - searchBox.value.offsetHeight - 292;
   window.onresize = function () {
     tabHeightFn();
   };

src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue

@@ -3,31 +3,62 @@
     <div class="head_box">
       <span class="title">行为标签管理{{ title }} </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          >保存</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
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
         <template #bqDlMc>
-          <el-input readonly @click="showDialog = true" v-model="listQuery.bqDlMc" placeholder="请选择标签大类" clearable />
+          <el-input
+            readonly
+            @click="showDialog = true"
+            v-model="listQuery.bqDlMc"
+            placeholder="请选择标签大类"
+            clearable
+          />
         </template>
       </FormMessage>
     </div>
     <!-- 选择框 -->
-    <DialogList bqDl="02" bqLx="02" titleValue="选择大类" v-model="showDialog" :dic="props.dic" @chooseDate="chooseDate"></DialogList>
+    <DialogList
+      bqDl="02"
+      bqLx="02"
+      titleValue="选择大类"
+      v-model="showDialog"
+      :dic="props.dic"
+      @chooseDate="chooseDate"
+    ></DialogList>
   </div>
 </template>
 
 <script setup>
-import DialogList from '@/views/backOfficeSystem/fourColorManage/components/dialogList.vue'
+import DialogList from "@/views/backOfficeSystem/fourColorManage/components/dialogList.vue";
-import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import { ref,defineProps, defineExpose, reactive, defineEmits, getCurrentInstance, } from "vue";
+import {
+  ref,
+  defineProps,
+  defineExpose,
+  reactive,
+  defineEmits,
+  getCurrentInstance
+} from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
   type: String,
-  dic:Object,
+  dic: Object
 });
 const showDialog = ref(false); //弹窗
 const listQuery = ref({}); //表单
@@ -39,32 +70,53 @@ const dialogForm = ref(false); //弹窗
 const formData = reactive([
   { label: "标签名称", prop: "bqMc", type: "input" },
   { label: "标签代码", prop: "bqDm", type: "input" },
-  { label: "标签等级", prop: "bqDj", type: "select", options: props.dic.D_GS_BQ_DJ },
+  {
-  { label: "标签颜色", prop: "bqYs", type: "select", options: props.dic.D_GS_SSYJ },
+    label: "标签等级",
+    prop: "bqDj",
+    type: "select",
+    options: props.dic.D_GS_BQ_DJ
+  },
+  {
+    label: "标签颜色",
+    prop: "bqYs",
+    type: "select",
+    options: props.dic.D_GS_SSYJ
+  },
   { label: "标签分值", prop: "bqFz", type: "number", max: 100 },
-  { label: "标签说明", prop: "bqSm", type: "textarea",width: '100%'  },
+  { label: "标签说明", prop: "bqSm", type: "textarea", width: "100%" }
 ]);
 
 const rules = reactive({
   bqMc: [{ required: true, message: "请输入标签名称", trigger: "blur" }],
   bqDm: [{ required: true, message: "请输入标签代码", trigger: "blur" }],
-  bqDj: [{ required: true, message: "请选择标签等级", trigger: ['blur','change'] }],
+  bqDj: [
-  bqYs: [{ required: true, message: "请选择标签颜色", trigger: ['blur','change'] }],
+    { required: true, message: "请选择标签等级", trigger: ["blur", "change"] }
-  bqFz: [{ required: true, message: "请输入标签分值", trigger: ['blur','change'] }],
+  ],
+  bqYs: [
+    { required: true, message: "请选择标签颜色", trigger: ["blur", "change"] }
+  ],
+  bqFz: [
+    { required: true, message: "请输入标签分值", trigger: ["blur", "change"] }
+  ]
 });
 
-
 // 初始化数据
-const init = (type, row,) => {
+const init = (type, row) => {
-  title.value = type == 'add' ? "新增" : "编辑";
+  title.value = type == "add" ? "新增" : "编辑";
   dialogForm.value = true;
-  if(props.type == '标签细类') formData.push({ label: "标签大类", prop: "bqDlMc", width: '100%' , type: "slot" })
+  if (props.type == "标签细类")
+    formData.push({
+      label: "标签大类",
+      prop: "bqDlMc",
+      width: "100%",
+      type: "slot"
+    });
   if (row) getDataById(row.id);
 };
 
 // 根据id查询详情
 const getDataById = (id) => {
-  qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/selectVoById/'+id).then((res) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtBqgl/selectVoById/" + id).then((res) => {
     listQuery.value = res;
   });
 };
@@ -72,16 +124,26 @@ const getDataById = (id) => {
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
-    let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
+    let url =
-    let params = { ...data, bqLb:props.dic.D_GS_BQ_LB.find((it)=>it.zdmc == props.type).dm }
+      title.value == "新增"
-    params.bqLx = '02';
+        ? "/mosty-gsxt/tbGsxtBqgl/save"
+        : "/mosty-gsxt/tbGsxtBqgl/update";
+    let params = {
+      ...data,
+      bqLb: props.dic.D_GS_BQ_LB.find((it) => it.zdmc == props.type).dm
+    };
+    params.bqLx = "02";
     loading.value = true;
-    qcckPost(params, url).then((res) => {
+    qcckPost(params, url)
+      .then((res) => {
         proxy.$message({ type: "success", message: title.value + "成功" });
         emit("updateDate");
         loading.value = false;
         close();
-    }).catch(() => {loading.value = false;});
+      })
+      .catch(() => {
+        loading.value = false;
+      });
   });
 };
 
@@ -90,15 +152,14 @@ const chooseDate = (val) => {
   if (!val && val.length == 0) return;
   listQuery.value.bqDlId = val[0].id;
   listQuery.value.bqDlMc = val[0].bqMc;
-}
+};
 
 // 关闭
 const close = () => {
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;
-  if(props.type == '标签细类') formData.pop()
+  if (props.type == "标签细类") formData.pop();
-  
 };
 defineExpose({ init });
 </script>

src/views/backOfficeSystem/fourColorManage/components/dialogList.vue

@@ -1,28 +1,63 @@
 <template>
-  <el-dialog :title="titleValue" width="900px" :model-value="modelValue" append-to-body @close="closed" >
+  <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.bqMc" clearable  ></el-input>
+          <el-input
+            placeholder="请输入标签名称"
+            v-model="listQuery.bqMc"
+            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">
+      <div
-        <el-table v-loading="loading" ref="multipleUserRef" @selection-change="handleSelectionChange" :data="tableData" border :row-key="keyid" style="width: 100%" height="450" >
+        class="tabBox"
-          <el-table-column type="selection" width="55" :reserve-selection="true" />
+        :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="bqMc" align="center" label="标签名称" />
           <el-table-column prop="bqDm" align="center" label="标签代码" />
           <el-table-column prop="bqLx" align="center" label="标签类型">
             <template #default="{ row }">
-                <DictTag :value="row.bqLx" :tag="false" :options="props.dic.D_GS_BQ_LX" />
+              <DictTag
+                :value="row.bqLx"
+                :tag="false"
+                :options="props.dic.D_GS_BQ_LX"
+              />
             </template>
           </el-table-column>
           <el-table-column prop="bqYs" align="center" label="标签颜色">
             <template #default="{ row }">
-                <DictTag :value="row.bqYs" :tag="false" :options="props.dic.D_GS_SSYJ" />
+              <DictTag
+                :value="row.bqYs"
+                :tag="false"
+                :options="props.dic.D_GS_SSYJ"
+              />
             </template>
           </el-table-column>
         </el-table>
@@ -102,7 +137,7 @@ const closed = () => {
   emits("update:modelValue", false);
 };
 const reset = () => {
-  listQuery.value = { current: 1, size: 20, };
+  listQuery.value = { current: 1, size: 20 };
   getListData();
 };
 
@@ -142,17 +177,19 @@ const handleCurrentChange = (currentPage) => {
 };
 const getListData = () => {
   const data = listQuery.value;
-  data.bqLx = props.bqLx //01 身份标签， 02 行为标签
+  data.bqLx = props.bqLx; //01 身份标签， 02 行为标签
   data.bqLb = props.bqDl; //01 大类， 02 细类类
   loading.value = true;
-  qcckGet(data,'/mosty-gsxt/tbGsxtBqgl/selectPage').then(res=>{
+  qcckGet(data, "/mosty-gsxt/tbGsxtBqgl/selectPage")
+    .then((res) => {
       tableData.value = res?.records;
       total.value = Number(res.total);
       loading.value = false;
       multipleUser();
-  }).catch(()=>{loading.value = false;})
+    })
-
+    .catch(() => {
-  
+      loading.value = false;
+    });
 };
 
 //列表回显
@@ -196,4 +233,3 @@ const handleSelectionChange = (val) => {
   display: none;
 }
 </style>
-  

src/views/backOfficeSystem/fourColorManage/tagManage/components/editAddForm.vue

@@ -3,12 +3,23 @@
     <div class="head_box">
       <span class="title">组合标签管理{{ title }} </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit" >保存</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="loading"
+          @click="submit"
+          >保存</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
+        v-model="listQuery"
+        :formList="formData"
+        ref="elform"
+        :rules="rules"
+      >
         <!-- 身份标签细类 -->
         <template #sfbqIdList>
           <el-button @click="openDialog('01')">选择</el-button>
@@ -22,20 +33,40 @@
               :controlsWidth="tableDate.controlsWidth"
             >
               <template #bqLx="{ row }">
-                  <DictTag :value="row.bqLx" :tag="false" :options="props.dic.D_GS_BQ_LX" />
+                <DictTag
+                  :value="row.bqLx"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LX"
+                />
               </template>
               <template #bqLb="{ row }">
-                  <DictTag :value="row.bqLb" :tag="false" :options="props.dic.D_GS_BQ_LB" />
+                <DictTag
+                  :value="row.bqLb"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LB"
+                />
               </template>
               <template #bqYs="{ row }">
-                  <DictTag :value="row.bqYs" :tag="false" :options="props.dic.D_GS_SSYJ" />
+                <DictTag
+                  :value="row.bqYs"
+                  :tag="false"
+                  :options="props.dic.D_GS_SSYJ"
+                />
               </template>
               <template #bqDj="{ row }">
-                  <DictTag :tag="false"  :value="row.bqDj" :options="props.dic.D_GS_BQ_DJ" />
+                <DictTag
+                  :tag="false"
+                  :value="row.bqDj"
+                  :options="props.dic.D_GS_BQ_DJ"
+                />
               </template>
               <!-- 操作 -->
               <template #controls="{ row }">
-                  <el-link type="danger"  @click="delDictItem(row.id,'身份标签细类')">删除</el-link>
+                <el-link
+                  type="danger"
+                  @click="delDictItem(row.id, '身份标签细类')"
+                  >删除</el-link
+                >
               </template>
             </MyTable>
           </div>
@@ -53,20 +84,40 @@
               :controlsWidth="tableDate.controlsWidth"
             >
               <template #bqLx="{ row }">
-              <DictTag :value="row.bqLx" :tag="false" :options="props.dic.D_GS_BQ_LX" />
+                <DictTag
+                  :value="row.bqLx"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LX"
+                />
               </template>
               <template #bqLb="{ row }">
-              <DictTag :value="row.bqLb" :tag="false" :options="props.dic.D_GS_BQ_LB" />
+                <DictTag
+                  :value="row.bqLb"
+                  :tag="false"
+                  :options="props.dic.D_GS_BQ_LB"
+                />
               </template>
               <template #bqYs="{ row }">
-              <DictTag :value="row.bqYs" :tag="false" :options="props.dic.D_GS_SSYJ" />
+                <DictTag
+                  :value="row.bqYs"
+                  :tag="false"
+                  :options="props.dic.D_GS_SSYJ"
+                />
               </template>
               <template #bqDj="{ row }">
-              <DictTag :tag="false"  :value="row.bqDj" :options="props.dic.D_GS_BQ_DJ" />
+                <DictTag
+                  :tag="false"
+                  :value="row.bqDj"
+                  :options="props.dic.D_GS_BQ_DJ"
+                />
               </template>
               <!-- 操作 -->
               <template #controls="{ row }">
-                <el-link type="danger"  @click="delDictItem(row.id,'行为标签细类')">删除</el-link>
+                <el-link
+                  type="danger"
+                  @click="delDictItem(row.id, '行为标签细类')"
+                  >删除</el-link
+                >
               </template>
             </MyTable>
           </div>
@@ -74,42 +125,73 @@
       </FormMessage>
     </div>
     <!-- 列表弹窗 -->
-    <DialogList :Single="false" :roleIds="roleIds" v-if="chooseShow" :dic="props.dic" @chooseDate="chooseDate" :titleValue="chooseTitle" v-model="chooseShow" :bqLx="chooseType" bqDl="02"></DialogList>
+    <DialogList
+      :Single="false"
+      :roleIds="roleIds"
+      v-if="chooseShow"
+      :dic="props.dic"
+      @chooseDate="chooseDate"
+      :titleValue="chooseTitle"
+      v-model="chooseShow"
+      :bqLx="chooseType"
+      bqDl="02"
+    ></DialogList>
   </div>
 </template>
 
 <script setup>
 import MyTable from "@/components/aboutTable/MyTable.vue";
-import DialogList from '@/views/backOfficeSystem/fourColorManage/components/dialogList.vue'
+import DialogList from "@/views/backOfficeSystem/fourColorManage/components/dialogList.vue";
-import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import { ref, defineExpose,defineProps, reactive, defineEmits, getCurrentInstance } from "vue";
+import {
+  ref,
+  defineExpose,
+  defineProps,
+  reactive,
+  defineEmits,
+  getCurrentInstance
+} from "vue";
 const emit = defineEmits(["updateDate"]);
 const { proxy } = getCurrentInstance();
 const props = defineProps({
   dic: Object
 });
 const roleIds = ref([]); //角色id
-const chooseType = ref('01');//选择弹窗类型
+const chooseType = ref("01"); //选择弹窗类型
 const chooseShow = ref(false); //选择弹窗
-const chooseTitle = ref('');//选择弹窗
+const chooseTitle = ref(""); //选择弹窗
 const dialogForm = ref(false); //弹窗
 const formData = reactive([
   { label: "组合标签名称", prop: "bqMc", type: "input" },
   { label: "组合标签代码", prop: "bqDm", type: "input" },
-  { label: "标签等级", prop: "bqDj", type: "select", options: props.dic.D_GS_BQ_DJ },
+  {
-  { label: "标签颜色", prop: "bqYs", type: "select", options: props.dic.D_GS_SSYJ },
+    label: "标签等级",
+    prop: "bqDj",
+    type: "select",
+    options: props.dic.D_GS_BQ_DJ
+  },
+  {
+    label: "标签颜色",
+    prop: "bqYs",
+    type: "select",
+    options: props.dic.D_GS_SSYJ
+  },
   { label: "组合标签分值", prop: "bqFz", type: "input" },
   { label: "组合标签说明", prop: "bqSm", type: "input" },
-  { label: "身份标签细类", prop: "sfbqIdList",  type: "slot",width: '100%', },
+  { label: "身份标签细类", prop: "sfbqIdList", type: "slot", width: "100%" },
-  { label: "行为标签细类", prop: "xwbqIdList",  type: "slot" ,width: '100%', },
+  { label: "行为标签细类", prop: "xwbqIdList", type: "slot", width: "100%" }
 ]);
 const rules = reactive({
   bqMc: [{ required: true, message: "请输入组合标签名称", trigger: "blur" }],
   bqDm: [{ required: true, message: "请输入组合标签代码", trigger: "blur" }],
   zhbqjf: [{ required: true, message: "请输入组合标签积分", trigger: "blur" }],
-  sfbqIdList: [{ required: true, message: "请选择身份标签细类", trigger: "change" }],
+  sfbqIdList: [
-  xwbqIdList	: [{ required: true, message: "请选择行为标签细类", trigger: "change" }],
+    { required: true, message: "请选择身份标签细类", trigger: "change" }
+  ],
+  xwbqIdList: [
+    { required: true, message: "请选择行为标签细类", trigger: "change" }
+  ]
 });
 
 const tableDate = reactive({
@@ -135,7 +217,7 @@ const tableDate = reactive({
     { label: "标签类型", prop: "bqLx", showSolt: true },
     { label: "标签类别", prop: "bqLb", showSolt: true },
     { label: "标签颜色", prop: "bqYs", showSolt: true },
-    { label: "标签等级",  prop: "bqDj",showSolt: true },
+    { label: "标签等级", prop: "bqDj", showSolt: true }
   ]
 });
 const listQuery = ref({}); //表单
@@ -143,14 +225,14 @@ const loading = ref(false);
 const elform = ref();
 const title = ref("");
 // 初始化数据
-const init = (type, row,) => {
+const init = (type, row) => {
   dialogForm.value = true;
-  title.value = type == 'add' ? "新增" : "编辑";
+  title.value = type == "add" ? "新增" : "编辑";
   if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  qcckGet({}, '/mosty-gsxt/tbGsxtBqzh/selectVoById/'+id).then((res) => {
+  qcckGet({}, "/mosty-gsxt/tbGsxtBqzh/selectVoById/" + id).then((res) => {
     listQuery.value = res;
     tableDate.sfbqIdList = res.sfbqList;
     listQuery.value.sfbqIdList = res.sfbqList.map((item) => item.id);
@@ -163,27 +245,37 @@ const getDataById = (id) => {
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
-    let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqzh/save':'/mosty-gsxt/tbGsxtBqzh/update';
+    let url =
-    let params = { ...data }
+      title.value == "新增"
+        ? "/mosty-gsxt/tbGsxtBqzh/save"
+        : "/mosty-gsxt/tbGsxtBqzh/update";
+    let params = { ...data };
     loading.value = true;
-    qcckPost(params, url).then((res) => {
+    qcckPost(params, url)
+      .then((res) => {
         proxy.$message({ type: "success", message: title.value + "成功" });
         emit("updateDate");
-      loading.value = false
+        loading.value = false;
         close();
-    }).catch(() => {loading.value = false});
+      })
+      .catch(() => {
+        loading.value = false;
+      });
   });
 };
 // 打开弹窗
 const openDialog = (type) => {
-  chooseShow.value = true
+  chooseShow.value = true;
   chooseType.value = type;
-  chooseTitle.value = type == '01'? '选择身份标签细类':'选择行为标签细类';
+  chooseTitle.value = type == "01" ? "选择身份标签细类" : "选择行为标签细类";
-  roleIds.value = type == '01' ? tableDate.sfbqIdList.map((item) => item.id):tableDate.xwbqIdList.map((item) => item.id);
+  roleIds.value =
+    type == "01"
+      ? tableDate.sfbqIdList.map((item) => item.id)
+      : tableDate.xwbqIdList.map((item) => item.id);
 };
 // 选择数据
 const chooseDate = (data) => {
-  if(chooseType.value == '01'){
+  if (chooseType.value == "01") {
     tableDate.sfbqIdList = data;
     listQuery.value.sfbqIdList = tableDate.sfbqIdList.map((item) => item.id);
   } else {
@@ -195,21 +287,25 @@ const chooseDate = (data) => {
 // 删除
 const delDictItem = (id, type) => {
   switch (type) {
-    case '身份标签细类':
+    case "身份标签细类":
-      tableDate.sfbqIdList = tableDate.sfbqIdList.filter((item) => item.id !== id);
+      tableDate.sfbqIdList = tableDate.sfbqIdList.filter(
+        (item) => item.id !== id
+      );
       listQuery.value.sfbqIdList = tableDate.sfbqIdList.map((item) => item.id);
       break;
-    case '行为标签细类':
+    case "行为标签细类":
-      tableDate.xwbqIdList = tableDate.xwbqIdList.filter((item) => item.id !== id);
+      tableDate.xwbqIdList = tableDate.xwbqIdList.filter(
+        (item) => item.id !== id
+      );
       listQuery.value.xwbqIdList = tableDate.xwbqIdList.map((item) => item.id);
       break;
   }
-}
+};
 // 关闭
 const close = () => {
   listQuery.value = {};
-  tableDate.sfbqIdList = []
+  tableDate.sfbqIdList = [];
-  tableDate.xwbqIdList = []
+  tableDate.xwbqIdList = [];
   dialogForm.value = false;
   loading.value = false;
 };

src/views/home/layout/head.vue

@@ -151,6 +151,7 @@ onMounted(() => {
 // 按钮切换
 const handleBtns = (val) => {
   btnsActive.value = val;
+  
   switch (val) {
     case "预警布控":
       router.push("/warningControl");

src/views/login/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="login-container">
-    <el-form class="login-form" ref="loginFromRef" :model="loginForm" :rules="loginRules" @submit.native.prevent>
+    <el-form
+      class="login-form"
+      ref="loginFromRef"
+      :model="loginForm"
+      :rules="loginRules"
+      @submit.native.prevent
+    >
       <div class="title-container">
         <h3 class="title">用户登录</h3>
       </div>
@@ -8,22 +14,41 @@
         <span class="svg-container">
           <svg-icon icon="user" />
         </span>
-        <el-input placeholder="请输入账号" name="userName" type="text" v-model="loginForm.userName" />
+        <el-input
+          placeholder="请输入账号"
+          name="userName"
+          type="text"
+          v-model="loginForm.userName"
+        />
       </el-form-item>
 
       <el-form-item prop="password1">
         <span class="svg-container">
           <svg-icon icon="password" />
         </span>
-        <el-input placeholder="请输入密码" name="password" :type="passwordType" v-model="loginForm.password"/>
+        <el-input
+          placeholder="请输入密码"
+          name="password"
+          :type="passwordType"
+          v-model="loginForm.password"
+        />
         <span class="show-pwd">
-          <svg-icon @click="onChangePwdType" :icon="passwordType === 'password' ? 'eye' : 'eye-open'"/>
+          <svg-icon
+            @click="onChangePwdType"
+            :icon="passwordType === 'password' ? 'eye' : 'eye-open'"
+          />
         </span>
       </el-form-item>
 
       <el-form-item v-if="isShowKaptCha" prop="kaptcha">
         <span class="svg-container"><svg-icon icon="kaptcha" /></span>
-        <el-input @keydown.enter="handleLogin()" v-model="loginForm.kaptcha" placeholder="请输入验证码" name="kaptcha" type="text"/>
+        <el-input
+          @keydown.enter="handleLogin()"
+          v-model="loginForm.kaptcha"
+          placeholder="请输入验证码"
+          name="kaptcha"
+          type="text"
+        />
         <span @click="getKaptchaImg">
           <el-image class="show-kaptcha" :src="kaptchaUrl" fit="cover">
             <template #error>
@@ -35,12 +60,28 @@
 
       <!---登录按钮-->
       <el-form-item style="height: 49px" v-if="!loginDialog">
-        <el-button @click="handleLogin" type="primary" style="width: 520px; height: 49px" :loading="loading" native-type="submit">登录</el-button>
+        <el-button
+          @click="handleLogin"
+          type="primary"
+          style="width: 520px; height: 49px"
+          :loading="loading"
+          native-type="submit"
+          >登录</el-button
+        >
       </el-form-item>
 
       <el-form-item class="choosedept-wrap" v-if="loginDialog">
-        <el-select v-model="deptId" @change="refreshToken" placeholder="请选择部门">
+        <el-select
-          <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"></el-option>
+          v-model="deptId"
+          @change="refreshToken"
+          placeholder="请选择部门"
+        >
+          <el-option
+            v-for="item in deptList"
+            :key="item.deptId"
+            :label="item.deptName"
+            :value="item.deptId"
+          ></el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -49,7 +90,7 @@
 
 <script>
 export default {
-  name: "login",
+  name: "login"
 };
 </script>
 <script setup>
@@ -79,7 +120,9 @@ const isShowKaptCha = ref(false);
 // 验证规则
 const loginRules = ref({
   userName: [{ required: true, trigger: "blur", message: "用户名为必填项" }],
-  password: [{ required: true, trigger: "blur", validator: validatePassword() }],
+  password: [
+    { required: true, trigger: "blur", validator: validatePassword() }
+  ],
   kaptcha: [{ required: true, trigger: "blur", message: "验证码为必填项" }]
 });
 
@@ -112,18 +155,25 @@ const handleLogin = () => {
   loginFromRef.value.validate((valid) => {
     if (!valid) return false;
     loading.value = true;
-    store.dispatch("user/login", loginForm.value).then((res) => {
+    store
+      .dispatch("user/login", loginForm.value)
+      .then((res) => {
         loading.value = false;
         // 登录后操作
         if (res.deptList.length === 1) {
-        window.location.href = '/'
+          window.location.href = "/";
         } else {
           deptList.value = [...res.deptList];
           loginDialog.value = true;
           authorization.value = res.jwtToken;
-        ElNotification({title: "提示",message: "请选择部门",duration: 3000});
+          ElNotification({
+            title: "提示",
+            message: "请选择部门",
+            duration: 3000
+          });
         }
-    }).catch(() => {
+      })
+      .catch(() => {
         loading.value = false;
       });
   });
@@ -131,11 +181,11 @@ const handleLogin = () => {
 const logout = () => {
   store.dispatch("user/logout");
 };
-onMounted(() => {
+onMounted(() => {});
- 
-});
 const getKaptchaImg = () => {
-  const res =`${process.env.VUE_APP_GATEWAY_BASE_URL}/mosty-api/mosty-base/kaptcha?date=` + new Date();
+  const res =
+    `${process.env.VUE_APP_GATEWAY_BASE_URL}/mosty-api/mosty-base/kaptcha?date=` +
+    new Date();
   kaptchaUrl.value = res;
 };
 </script>

vue.config.js

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