Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/App.vue

@@ -156,6 +156,7 @@ v-deep .el-loading-mask {
   transform: translateY(-50%) translateX(-50%);
 }
 .popupCustomBox{
+  width: 130px;
   position: relative;
   background: rgba(2, 55, 114, 0.99);
   color: #fff;
@@ -191,9 +192,11 @@ v-deep .el-loading-mask {
     line-height: 22px;
     text-transform: none;
     margin-bottom: 0;
+    display: flex;
+    justify-content: space-between;
     span{
       display: inline-block;
-      width: 45px;
+      width: 60px;
       text-align: center;
     }
   }

src/api/huiShangyp/strategicApi.js

@@ -93,3 +93,43 @@ export const ypbgSjzlYpsp = (data) => {
 //   / mosty - api / mosty - gsxt / ypbg / sjzl / sendFqzl
 // 工作流审批回掉
 //   / mosty - api / mosty - gsxt / ypbg / sjzl / updateBkgzl
+// /gsxtYpbg/getPageList 获取列表
+export const gsxtYpbgGetPageList = (params) => {
+  return request({
+    url: api + `/gsxtYpbg/getPageList`,
+    method: "get",
+    params
+  })
+};
+
+// /gsxtYpbg/deleteEntity删除
+export const gsxtYpbgDeleteEntity = (data) => {
+  return request({
+    url: api + `/gsxtYpbg/deleteEntity`,
+    method: "delete",
+    data
+  })
+};
+// /gsxtYpbg/addEntity  新增
+export const gsxtYpbgAddEntity = (data) => {
+  return request({
+    url: api + `/gsxtYpbg/addEntity`,
+    method: "post",
+    data
+  })
+};
+// /gsxtYpbg/editEntity 修改
+export const gsxtYpbgEditEntity = (data) => {
+  return request({
+    url: api + `/gsxtYpbg/editEntity`,
+    method: "put",
+    data
+  })
+};
+// /gsxtYpbg/{id} 详情
+export const gsxtYpbgId=(id) => {
+  return request({
+    url: api + `/gsxtYpbg/${id}`,
+    method: "get"
+  })
+};

src/api/semanticAnalysis.js

@@ -207,3 +207,19 @@ export const jqypfxbgCzlfx = (params) => {
     params
   });
 }
+// 网络舆情
+export const gsxtWlyqGetPageList = (params) => {
+  return request({
+    url: api + "/gsxt/wlyq/getPageList",
+    method: "GET",
+    params
+  });
+
+}
+export const gsxtWlyqSelectById = (id) => {
+  return request({
+    url: api + `/gsxt/wlyq/selectById/${id}`,
+    method: "GET",
+  });
+}
+

src/components/GdMap/mapUtil.js

@@ -144,58 +144,60 @@ export function MapUtil(map) {
   }
 
   // 展示气泡框
-  MapUtil.prototype.makerPopup = (val)=>{
+  MapUtil.prototype.makerPopup = (val) => {
 
-    let { data,flag,type = 'Dark'} = val
+    let { data, flag, type = 'Dark' } = val
     // Dark   Light   Custom
     let marker;
-    if(!_that._self[flag]) _that._self[flag] = [];
+    if (!_that._self[flag]) _that._self[flag] = [];
-    if(type == 'Dark' || type == 'Light') { 
+    if (type == 'Dark' || type == 'Light') {
-      let list = zdyContent(flag,data);// 默认的样式
+      let list = zdyContent(flag, data);// 默认的样式
-      marker = map.createPopup([data.jd,data.wd],{
+      marker = map.createPopup([data.jd, data.wd], {
-        style:style, // 气泡框样式:
+        style: style, // 气泡框样式:
-        data:list,
+        data: list,
-        title:data.ssbm,
+        title: data.ssbm,
-        closeButton:false,
+        closeButton: false,
-        anchor:'bottom',
+        anchor: 'bottom',
-        pixelOffset:[0,-50]
+        pixelOffset: [0, -50]
       })
-    }else {
+    } else {
-      marker = map.createPopup([data.jd,data.wd],{
+      marker = map.createPopup([data.jd, data.wd], {
-        style:'Custom', // // 自定义样式
+        style: 'Custom', // // 自定义样式
-        attrs:{
+        attrs: {
-          class:'popupCustom'
+          class: 'popupCustom'
         },
-        container: zdyContentHtml(flag,data),
+        container: zdyContentHtml(flag, data),
-        closeButton:false,
+        closeButton: false,
-        anchor:'bottom',
+        anchor: 'bottom',
-        pixelOffset:[0,-30]
+        pixelOffset: [0, -30]
       })
     }
     _that._self[flag].push(marker)
   }
   // 弹窗自定义默认内容
-  function zdyContent(flag,item){
+  function zdyContent(flag, item) {
     switch (flag) {
       case 'hm':
         return [
-          { label:'林安码线索数量',value:item.lamsx },
+          { label: '林安码线索数量', value: item.lamsx },
-          { label:'布控预警数量',value:item.bkyj },
+          { label: '布控预警数量', value: item.bkyj },
-          { label:'红色预警数量',value:item.hsyj },
+          { label: '红色预警数量', value: item.hsyj },
-          { label:'信息采集数量',value:item.xxcjsl },
+          { label: '信息采集数量', value: item.xxcjsl },
         ]
     }
   }
   // 弹窗自定义标签内容
-  function zdyContentHtml(flag,item){
+  function zdyContentHtml(flag, item) {
+    console.log(item);
+
     let html = ''
     switch (flag) {
       case 'hm_pop':
         const list = [
-          { jb: "一级",sl:'5',ypl:'100%' },
+          { jb: "一级", sl: '5' },
-          { jb: "二级",sl:'5',ypl:'100%' },
+          { jb: "二级", sl: '5' },
-          { jb: "三级",sl:'3',ypl:'60%' },
+          { jb: "三级", sl: '3' },
-          { jb: "四级",sl:'0',ypl:'20%' }
+          { jb: "四级", sl: '0' }
         ];
         html = `
         <div class="popupCustomBox">
@@ -204,8 +206,8 @@ export function MapUtil(map) {
             <span>今日警情${item.jrzs || 0}</span>
           </div>
           <ul>
-            <li class="popupCustomTitle_li"><span>级别</span> <span>数量</span> <span>研判率</span> </li>
+            <li class="popupCustomTitle_li"><span>数据来源</span> <span>数量</span> </li>
-            ${item.jqjb.map(it => `<li class="popupCustomTitle_li"><span>${it.jbmc}</span> <span>${it.jrsl}</span> <span>${it.ypbl}</span></li>`).join('')}
+            ${item.jrtj.map(it => `<li class="popupCustomTitle_li"><span>${it.lyms}</span> <span>${it.jrsl}</span> </li>`).join('')}
           </ul>
         </div>
         `

src/components/flowPath/SelectingPeople.vue

@@ -595,6 +595,11 @@ const sendMessage = (gzlid) => {
       qcckPost(promes, '/mosty-gsxt/gsxt/bqbk/sendFqzl ').then(res => {
         console.log(res);
       })
+      break;
+               case 'QBSP':
+      qcckPost(promes, '/mosty-gsxt/qbcj/callback ').then(res => {
+        console.log(res);
+      })
       break;
   }
 }

src/router/index.js

@@ -65,6 +65,10 @@ export const publicRoutes = [
     path: "/information",
     name: "information",
     component: () => import("@/views/backOfficeSystem/JudgmentHome/internalAuditor/information.vue"),
+  }, {
+    path: "/Spdloyment",
+    name: "Spdloyment",
+    component: () => import("@/views/backOfficeSystem/HumanIntelligence/auditList/components/spdloyment.vue"),
   },
   // 线索
   {
@@ -504,7 +508,7 @@ export const publicRoutes = [
             name: "dataReduction",
             component: () => import("@/views/backOfficeSystem/JudgmentHome/dataReduction/index"),
             meta: {
-              title: "数据整理",
+              title: "研判约稿",
               icon: "article-create"
             }
           },
@@ -519,20 +523,11 @@ export const publicRoutes = [
           //   },
           // 后面写的研判
           {
-            path: "/tacticalResearch",
+            path: "/strategicResearchs",
-            name: "tacticalResearch",
+            name: "strategicResearchs",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue"),
-            meta: {
-              title: "战术研判",
-              icon: "article-create"
-            }
-          },
-          {
-            path: "/strategicResearch",
-            name: "strategicResearch",
             component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue"),
             meta: {
-              title: "战略研判",
+              title: "研判报告",
               icon: "article-create"
             }
           },
@@ -597,7 +592,16 @@ export const publicRoutes = [
             name: "mpvPeo",
             component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index"),
             meta: {
-              title: "重点人管理",
+              title: "重点人员库",
+              icon: "article-create"
+            }
+          },
+          {
+            path: "/gzPeo",
+            name: "gzPeo",
+            component: () => import("@/views/backOfficeSystem/DeploymentDisposal/gzPeo/index"),
+            meta: {
+              title: "关注库",
               icon: "article-create"
             }
           },
@@ -615,7 +619,7 @@ export const publicRoutes = [
             name: "mpvGroup",
             component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index"),
             meta: {
-              title: "重点群体管理",
+              title: "重点群体库",
               icon: "article-create"
             }
           },
@@ -633,7 +637,7 @@ export const publicRoutes = [
             name: "mpvCar",
             component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvCar/index"),
             meta: {
-              title: "重点车辆管理",
+              title: "重点车辆库",
               icon: "article-create"
             }
           },
@@ -1112,8 +1116,42 @@ export const publicRoutes = [
                   title: "重点人员落地审核",
                   icon: "article-create"
                 }
+              }, {
+                path: "/tacticalResearch",
+                name: "tacticalResearch",
+                component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue"),
+                meta: {
+                  title: "战术研判",
+                  icon: "article-create"
+                }
+              },
+              {
+                path: "/strategicResearch",
+                name: "strategicResearch",
+                component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue"),
+                meta: {
+                  title: "战略研判",
+                  icon: "article-create"
+                }
               },
             ]
+          }, {
+            path: "/tacticalResearch",
+            name: "tacticalResearch",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue"),
+            meta: {
+              title: "战术研判",
+              icon: "article-create"
+            }
+          },
+          {
+            path: "/strategicResearch",
+            name: "strategicResearch",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue"),
+            meta: {
+              title: "战略研判",
+              icon: "article-create"
+            }
           },
           // {
           //     path: "/ResearchHome",

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

@@ -18,7 +18,7 @@ import ZdqtPage from "./components/zdqtPage.vue";
 import ZdclPage from "./components/zdclPage.vue";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const tabBtn=ref(["重点人","重点群体","重点车辆"])
+const tabBtn=ref(["重点人库","重点群体库","重点车辆库"])
 const tabActive=ref(0)
 
 onMounted(() => {

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/component/caseLodig.vue

@@ -0,0 +1,70 @@
+<template>
+  <!-- 添加 -->
+  <el-dialog :model-value="modelValue" :title="title" width="40%" :before-close="handleClose">
+    <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
+    </FormMessage>
+    <template #footer>
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" @click="submitForm">确认</el-button>
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+import { defineProps, defineEmits, ref, watch, reactive, getCurrentInstance } from 'vue'
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => { }
+  },
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  title: {
+    type: String,
+    default: '案件信息'
+  },
+  dict: {
+    type: Object,
+    default: () => { }
+  }
+})
+const emit = defineEmits(['update:modelValue', 'comfirm'])
+const listQuery = ref({})
+const formData = ref([
+  { label: "案件名称", prop: "ajmc", type: "input", width: '100%' },
+  { label: "案件时间", prop: "sasj", type: "date", width: '100%' },
+  { label: "案件编码", prop: "ajbm", type: "input", width: '100%' },
+])
+const rules = reactive({
+  ajmc: [{ required: true, message: "请输入案件名称", trigger: "blur" }],
+  sasj: [{ required: true, message: "请输入案件时间", trigger: "change" }],
+  ajbm: [{ required: true, message: "请输入案件编码", trigger: "blur" }],
+})
+
+const elform=ref(null)
+const submitForm = () => {
+  elform.value.submit((val) => {
+    if (val) {
+      emit('comfirm', val)
+      handleClose()
+    }
+  })
+}
+
+watch(
+  () => props.data,
+  (val) => {
+    listQuery.value = val ? { ...val } : {}
+  },
+  { deep: true }
+)
+// 取消：关闭弹窗
+const handleClose = () => {
+  listQuery.value = {}
+  emit('update:modelValue', false)
+}
+</script>
+<style scoped lang="scss"></style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/component/diaLogForm.vue

@@ -0,0 +1,86 @@
+<template>
+  <!-- 添加 -->
+  <el-dialog :model-value="modelValue" :title="title" width="40%" :before-close="handleClose">
+    <el-form ref="historyForm" style="max-width: 600px" :model="diaLogRuleForm" :rules="rules">
+      <el-form-item label-width="160px" label="姓名" prop="ryXm" style="width: 100%;">
+        <el-input v-model="diaLogRuleForm.ryXm" :placeholder="`请输入联系人姓名`" />
+      </el-form-item>
+      <el-form-item label-width="160px" label="人员身份证号" prop="rySfzh" style="width: 100%;">
+        <el-input v-model="diaLogRuleForm.rySfzh" :placeholder="`请输入人员身份证号`" />
+      </el-form-item>
+      <el-form-item label-width="160px" label="对应关系" prop="dygx" style="width: 100%;">
+        <el-select v-model="diaLogRuleForm.dygx" placeholder="请选择对应关系">
+          <el-option v-for="item in dict.D_BZ_QSGXDM" :key="item.dm" :label="item.zdmc" :value="item.dm" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label-width="160px" label="联系人电话" prop="lxrDh" style="width: 100%;">
+        <el-input v-model="diaLogRuleForm.lxrDh" :placeholder="`请输入联系人电话`" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="onSubmit">
+          确认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+import { defineProps, defineEmits, ref, watch, reactive } from 'vue'
+import { generateRandom10Digits } from '@/utils/tools'
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => { }
+  },
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  title: {
+    type: String,
+    default: ''
+  },
+  dict: {
+    type: Object,
+    default: () => { }
+  }
+})
+const historyForm = ref(null)
+const emit = defineEmits(['update:modelValue', 'submit'])
+const diaLogRuleForm = ref({})
+const rules = reactive({
+  ryXm: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+  rySfzh: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
+  dygx: [{ required: true, message: '请选择对应关系', trigger: 'change' }],
+})
+watch(
+  () => props.data,
+  (val) => {
+    diaLogRuleForm.value = val ? { ...val } : {}
+  },
+  { deep: true }
+)
+
+// 取消：关闭弹窗
+const handleClose = () => {
+  diaLogRuleForm.value = {}
+  emit('update:modelValue', false)
+}
+
+// 提交
+const onSubmit = () => {
+  historyForm.value.validate().then((valid) => {
+    if (valid) {
+      emit('submit', { ...diaLogRuleForm.value }) // 提交数据
+      handleClose()
+    }
+  }).catch((err) => {
+    console.log(err);
+
+  });
+}
+</script>
+<style scoped lang="scss"></style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/component/interLoding.vue

@@ -0,0 +1,91 @@
+<template>
+  <!-- 添加 -->
+  <el-dialog :model-value="modelValue" :title="title" width="40%" :before-close="handleClose">
+    <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
+      <template #zfmjXm>
+        <el-input v-model="listQuery.zfmjXm" :placeholder="`请输入民警姓名`" readonly @click="changeShow" />
+      </template>
+    </FormMessage>
+    <template #footer>
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" @click="submitForm">确认</el-button>
+    </template>
+  </el-dialog>
+  <ChooseUser :Single="true" v-model="chooseMarksVisible" @choosedUsers="addMarks" :roleIds="roleIds" />
+</template>
+<script setup>
+import { defineProps, defineEmits, ref, watch, reactive, getCurrentInstance } from 'vue'
+import { generateRandom10Digits } from '@/utils/tools'
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue";
+const { proxy } = getCurrentInstance();
+const { D_ZFNR_MBLX } = proxy.$dict("D_ZFNR_MBLX")
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => { }
+  },
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  title: {
+    type: String,
+    default: '走访信息'
+  },
+  dict: {
+    type: Object,
+    default: () => { }
+  }
+})
+const emit = defineEmits(['update:modelValue', 'comfirm'])
+const historyForm = ref(null)
+const chooseMarksVisible = ref(false)
+const listQuery = ref({})
+const formData = ref([
+  { label: "民警姓名", prop: "zfmjXm", type: "slot", width: '100%' },
+  { label: "走访时间", prop: "zfsj", type: "date", width: '100%' },
+  { label: "走访地址", prop: "zfdz", type: "input", width: '100%' },
+  { label: "走访方式", prop: "zffs", type: "input", width: '100%' },
+  { label: "走访情况", prop: "zfqk", type: "textarea", width: '100%' },
+])
+const rules = reactive({
+  zfmjXm: [{ required: true, message: "请选择民警姓名", trigger: "blur" }],
+  zfsj: [{ required: true, message: "请输入走访时间", trigger: "change" }],
+  zfdz: [{ required: true, message: "请输入走访地址", trigger: "blur" }],
+  zffs: [{ required: true, message: "请输入走访方式", trigger: "blur" }],
+  zfqk: [{ required: true, message: "请输入走访情况", trigger: "blur" }],
+})
+const changeShow = () => {
+  chooseMarksVisible.value = true
+}
+const addMarks = (val) => {
+  listQuery.value.zfmjXm = val[0].userName
+  listQuery.value.zfmjSfzh=val[0].idEntityCard
+}
+const elform=ref(null)
+const submitForm = () => {
+  elform.value.submit((val) => {
+    if (val) {
+      emit('comfirm', val)
+      handleClose()
+    }
+  })
+}
+
+watch(
+  () => props.data,
+  (val) => {
+    console.log(val);
+
+    listQuery.value = val ? { ...val } : {}
+  },
+  { deep: true }
+)
+// 取消：关闭弹窗
+const handleClose = () => {
+  listQuery.value = {}
+  emit('update:modelValue', false)
+}
+</script>
+<style scoped lang="scss"></style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/component/judgmentRecord.vue

@@ -0,0 +1,306 @@
+<template>
+  <el-dialog :title="titleValue" width="800px" :model-value="modelValue" append-to-body @close="closed">
+    <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
+      <template #rrry>
+        <el-input v-model="listQuery.rrry" :placeholder="`请输入民警姓名`" readonly @click="changeShow" />
+      </template>
+      <template #fjxx>
+        <!-- 文件列表区域 -->
+        <div class="file-attachment-section">
+          <div class="section-title">相关附件</div>
+          <div class="file-list-container">
+            <div v-if="listQuery.fileList.length === 0" class="empty-file-list">暂无附件</div>
+            <div v-else class="file-list">
+              <div v-for="(file, index) in listQuery.fileList" :key="index" class="file-item">
+                <div class="file-info">
+                  <span class="file-name">{{ file.originalName }}</span>
+                  <span class="file-time">{{ file.uploadTime }}</span>
+                </div>
+                <div class="file-actions">
+                  <el-button type="text" size="small" @click="downloadFile(file)" title="下载文件" :disabled="disabled">
+                    <el-icon>
+                      <Download />
+                    </el-icon>
+                  </el-button>
+                  <el-button type="text" size="small" @click="deleteFile(index)" title="删除文件" class="delete-btn"
+                    :disabled="disabled">
+                    <el-icon>
+                      <Delete />
+                    </el-icon>
+                  </el-button>
+                </div>
+              </div>
+            </div>
+          </div>
+          <!-- 上传按钮区域 -->
+          <div class="upload-btn-container">
+            <el-upload v-model:file-list="listQuery.fileList" class="upload-demo" :show-file-list="false" multiple
+              :http-request="handleUploadRequest" :on-remove="handleRemove" :limit="3" :on-exceed="handleExceed">
+              <el-button type="primary" :disabled="disabled">上传文件</el-button>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+    </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>
+  <ChooseUser :Single="true" v-model="chooseMarksVisible" @choosedUsers="addMarks" :roleIds="roleIds" />
+</template>
+
+<script setup>
+import { ref, onMounted, reactive, watch, getCurrentInstance } from "vue";
+import { generateRandom10Digits } from '@/utils/tools'
+import { uploadMultipleFiles } from '@/views/backOfficeSystem/DeploymentDisposal/mpvGroup/model/fileUp.js'
+import { ElMessage } from 'element-plus';
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue";
+const { proxy } = getCurrentInstance()
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  titleValue: {
+    type: String,
+    default: "现实表现"
+  },
+  data: {
+    type: Object,
+    default: () => { }
+  }
+});
+const emits = defineEmits(["update:modelValue", "comfirm"]);
+const formData = ref([
+  { label: "录入人员", prop: "rrry", type: "slot", width: '100%' },
+  { label: "录入时间", prop: "lrsj", type: "date", width: '100%' },
+  { label: "表现内容", prop: "bxnr", type: "textarea", width: '100%' },
+  { label: "附件信息", prop: "fjxx", type: "slot", width: '100%' },
+])
+const rules = reactive({
+  rrry: [{ required: true, message: "请选择民警姓名", trigger: "blur" }],
+  lrsj: [{ required: true, message: "请输入录入时间", trigger: "change" }],
+  bxnr: [{ required: true, message: "请输入表现内容", trigger: "blur" }],
+})
+
+
+const listQuery = ref({fileList:[]})
+const roleIds=ref([])
+const chooseMarksVisible=ref(false)
+
+const changeShow = () => {
+  chooseMarksVisible.value = true
+}
+
+const addMarks = (val) => {
+  listQuery.value.rrry = val[0].userName
+  roleIds.value = val.map(item => item.id)
+}
+const closed = () => {
+  listQuery.value={}
+  listQuery.value.fileList = []
+  emits("update:modelValue", false);
+};
+const onComfirm = () => {
+  emits("comfirm", {...listQuery.value,fjxx:listQuery.value.fileList.length>0?JSON.stringify(listQuery.value.fileList):null });
+  emits("update:modelValue", false);
+}
+watch(() => props.data, (val) => {
+  if (val) {
+    listQuery.value={...val,fileList:val.fjxx}
+  }
+},{deep: true})
+
+// 下载文件
+const downloadFile = (file) => {
+  // 实际项目中，这里应该调用下载API
+  console.log('下载文件:', file.name)
+  // 示例：window.open(file.url)
+}
+// 删除文件
+const deleteFile = (index) => {
+  // 实际项目中，这里应该先调用删除API，成功后再从列表中移除
+  listQuery.value.fileList.splice(index, 1)
+  ElMessage.success('文件已删除')
+}
+
+// 上传相关方法
+const handleUploadRequest = async (options) => {
+  try {
+    // 调用uploadMultipleFiles进行文件上传
+    const result = await uploadMultipleFiles(options.file, {
+      uploadedFiles: listQuery.value.fileList,
+      fjIds: [], // 如果需要保存文件ID列表，可以在这里传递
+      compressImage: null // 可选的图片压缩函数
+    });
+    // 更新文件列表，添加上传时间信息
+    const index = listQuery.value.fileList.findIndex(f => f.originalName === options.file.name);
+    if (index !== -1) {
+      listQuery.value.fileList[index].uploadTime = new Date().toLocaleString('zh-CN');
+    }
+    // 调用成功回调
+    if (options.onSuccess) {
+      options.onSuccess(result);
+    }
+  } catch (error) {
+    console.error('文件上传失败:', error);
+    // 调用失败回调
+    if (options.onError) {
+      options.onError(error);
+    }
+  }
+}
+
+const handleRemove = (uploadFile, uploadFiles) => {
+  // 实际项目中，这里应该先调用删除API，成功后再从列表中移除
+  const index = listQuery.value.fileList.findIndex(f => f.name === uploadFile.name);
+  if (index !== -1) {
+    listQuery.value.fileList.splice(index, 1);
+  }
+}
+</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;
+}
+
+.file-attachment-section {
+  margin-top: 15px;
+  width: 100%;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: 500;
+  color: #303133;
+  margin-bottom: 10px;
+  padding-bottom: 5px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.file-list-container {
+  max-height: 100px;
+  overflow-y: auto;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  background-color: #ffffff;
+  margin-bottom: 10px;
+}
+
+/* 自定义滚动条样式 */
+.file-list-container::-webkit-scrollbar {
+  width: 6px;
+}
+
+.file-list-container::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 3px;
+}
+
+.file-list-container::-webkit-scrollbar-thumb {
+  background: #c0c4cc;
+  border-radius: 3px;
+}
+
+.file-list-container::-webkit-scrollbar-thumb:hover {
+  background: #909399;
+}
+
+.empty-file-list {
+  padding: 20px;
+  text-align: center;
+  color: #909399;
+  font-size: 12px;
+}
+
+.file-list {
+  padding: 5px;
+}
+
+.file-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 10px;
+  margin-bottom: 2px;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+  cursor: pointer;
+}
+
+.file-item:hover {
+  background-color: #e6f7ff;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.file-info {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  gap: 15px;
+  min-width: 0;
+}
+
+.file-name {
+  flex: 1;
+  font-size: 12px;
+  color: #303133;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.file-size {
+  font-size: 11px;
+  color: #909399;
+  min-width: 60px;
+}
+
+.file-time {
+  font-size: 11px;
+  color: #909399;
+}
+
+.file-actions {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  margin-left: 10px;
+}
+
+.file-actions .el-button {
+  padding: 0 5px;
+  margin: 0;
+  color: #606266;
+  transition: color 0.3s ease;
+}
+
+.file-actions .el-button:hover {
+  color: #409eff;
+}
+
+.delete-btn:hover {
+  color: #f56c6c !important;
+}
+
+.upload-btn-container {
+  display: flex;
+  justify-content: center;
+  margin-top: 10px;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/component/vehiclDoing.vue

@@ -0,0 +1,242 @@
+<template>
+  <el-dialog :title="titleValue" width="800px" :model-value="modelValue" append-to-body @close="closed">
+    <el-form ref="historyForm" style="max-width: 600px" :model="ruleForm" :rules="rules" label-width="auto">
+      <el-form-item label="车牌号" prop="cph">
+        <el-input v-model="ruleForm.cph" placeholder="请输入车牌号" />
+      </el-form-item>
+      <el-form-item label="车辆识别码" prop="clsbm">
+        <el-input v-model="ruleForm.clsbm" placeholder="请输入车辆识别码" />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="cllx">
+        <el-select v-model="ruleForm.cllx" placeholder="请选择车辆型号">
+          <el-option :label="item.zdmc" :value="item.dm" v-for="(item, index) in dict.D_BZ_CLLX"
+            :key="index"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车辆颜色" prop="clys">
+        <el-select v-model="ruleForm.clys" placeholder="请选择车辆颜色">
+          <el-option :label="item.zdmc" :value="item.dm" v-for="(item, index) in dict.D_BZ_CLYS"
+            :key="index"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车辆品牌" prop="clpp">
+        <el-select v-model="ruleForm.clpp" placeholder="请选择车辆品牌">
+          <el-option :label="item.zdmc" :value="item.dm" v-for="(item, index) in dict.D_BZ_CLPP"
+            :key="index"></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <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 { ref, onMounted, reactive, watch, getCurrentInstance } from "vue";
+import { generateRandom10Digits } from '@/utils/tools'
+
+const { proxy } = getCurrentInstance()
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  titleValue: {
+    type: String,
+    default: "关联车辆"
+  },
+  data: {
+    type: Object,
+    default: () => { }
+  }, dict: {
+    type: Object,
+    default: () => { }
+  }
+});
+const emits = defineEmits(["update:modelValue", "comfirm"]);
+const historyForm = ref(null)
+const ruleForm = ref({})
+const rules = reactive({
+  cph: [
+    { required: true, message: '请输入车牌号', trigger: 'blur' },
+  ],
+
+});
+
+const onComfirm = () => {
+  historyForm.value.validate((valid, fields) => {
+    if (valid) {
+      const promes = {
+        ...ruleForm.value,
+        id: ruleForm.value.id ? ruleForm.value.id : generateRandom10Digits(),
+      }
+      emits("comfirm", { ...promes });
+      closed()
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+watch(() => props.modelValue, (val) => {
+  ruleForm.value = props.data
+}, { deep: true })
+
+
+const closed = () => {
+  ruleForm.value = {}
+  emits("update:modelValue", false);
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/css/layout.scss";
+@import "@/assets/css/element-plus.scss";
+
+.tabBoxRadio .el-checkbox__inner {
+  border-radius: 50% !important;
+}
+
+.tabBoxRadio .el-table__header-wrapper .el-checkbox {
+  display: none;
+}
+
+.file-attachment-section {
+  margin-top: 15px;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: 500;
+  color: #303133;
+  margin-bottom: 10px;
+  padding-bottom: 5px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.file-list-container {
+  max-height: 100px;
+  overflow-y: auto;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  background-color: #ffffff;
+  margin-bottom: 10px;
+}
+
+/* 自定义滚动条样式 */
+.file-list-container::-webkit-scrollbar {
+  width: 6px;
+}
+
+.file-list-container::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 3px;
+}
+
+.file-list-container::-webkit-scrollbar-thumb {
+  background: #c0c4cc;
+  border-radius: 3px;
+}
+
+.file-list-container::-webkit-scrollbar-thumb:hover {
+  background: #909399;
+}
+
+.empty-file-list {
+  padding: 20px;
+  text-align: center;
+  color: #909399;
+  font-size: 12px;
+}
+
+.file-list {
+  padding: 5px;
+}
+
+.file-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 10px;
+  margin-bottom: 2px;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+  cursor: pointer;
+}
+
+.file-item:hover {
+  background-color: #e6f7ff;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.file-info {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  gap: 15px;
+  min-width: 0;
+}
+
+.file-name {
+  flex: 1;
+  font-size: 12px;
+  color: #303133;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.file-size {
+  font-size: 11px;
+  color: #909399;
+  min-width: 60px;
+}
+
+.file-time {
+  font-size: 11px;
+  color: #909399;
+}
+
+.file-actions {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  margin-left: 10px;
+}
+
+.file-actions .el-button {
+  padding: 0 5px;
+  margin: 0;
+  color: #606266;
+  transition: color 0.3s ease;
+}
+
+.file-actions .el-button:hover {
+  color: #409eff;
+}
+
+.delete-btn:hover {
+  color: #f56c6c !important;
+}
+
+.upload-btn-container {
+  display: flex;
+  justify-content: center;
+  margin-top: 10px;
+}
+
+.butHandle {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+::v-deep .el-range-input {
+  color: #000 !important;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/components copy/addForm.vue

@@ -0,0 +1,367 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">{{ title }}重点人管理</span>
+      <div>
+        <el-button type="primary" size="small" v-if="!disabled" :loading="loading" @click="submit">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage :disabled="disabled" v-model="listQuery" :formList="formData" labelWidth="100px" ref="elform"
+        :rules="rules"></FormMessage>
+      <div class="ml50 mr50">
+        <span class="mr10">人员标签模型 : </span><el-button type="primary" v-if="!disabled"
+          @click="chooseMarksVisible = true">选择</el-button>
+      </div>
+      <div class="boxlist ml50 mr50">
+        <MyTable :tableData="listQuery.bqList" :tableColumn="tableDate.tableColumn" :key="tableDate.keyCount"
+          :tableConfiger="tableDate.tableConfiger" :controlsWidth="tableDate.controlsWidth">
+          <template #bqLb="{ row }">
+            <DictTag :value="row.bqLb" :tag="false" :options="props.dic.D_GS_BQ_LB" />
+          </template>
+          <template #bqLx="{ row }">
+            <DictTag :value="row.bqLx" :tag="false" :options="props.dic.D_GS_BQ_LX" />
+          </template>
+          <template #bqZl="{ row }">
+            <DictTag :value="row.bqZl" :tag="false" :options="props.dic.D_GS_BQ_ZL" />
+          </template>
+          <template #controls="{ row }">
+            <el-link type="danger" @click="delDictItem(row.bqId)">删除</el-link>
+          </template>
+        </MyTable>
+      </div>
+      <!-- 选择审核人 -->
+      <div class="ww100 mt20 ml50 mr50">
+        <el-steps direction="vertical" :active="listQuery.wccz" space="500" finish-status="success">
+          <el-step title="发起申请">
+            <template #description>
+              <div class="flex align-center ww100 mt10 mb20">
+                <el-input v-model="listQuery.sqrXm" readonly class="ww20"></el-input>
+                <el-input v-model="listQuery.sqrSsbmmc" readonly class="ww20 ml10 mr10"></el-input>
+                <span class="f12" style="color: #333333">
+                  备注发起人和部门根据登陆人自动填写</span>
+              </div>
+            </template>
+          </el-step>
+          <el-step title="审核确认">
+            <template #description>
+              <div class="flex align-center ww100 mt10 mb20 depBox">
+                <span class="mr4">审核部门 : </span>
+                <MOSTY.Department :isAll="true" @getDepValue="getShdep" v-model="listQuery.shSsbmdm" clearable :placeholder="listQuery.shSsbmmc ? listQuery.shSsbmmc : ''" />
+              </div>
+            </template>
+          </el-step>
+          <el-step title="审批确认">
+            <template #description>
+              <div class="flex align-center ww100 mt10 mb20 depBox">
+                <span lass="mr4">审批部门 : </span>
+                <MOSTY.Department :isAll="true" @getDepValue="getSPdep" v-model="listQuery.spSsbmdm" clearable :placeholder="listQuery.spSsbmmc ? listQuery.spSsbmmc : ''" />
+              </div>
+            </template>
+          </el-step>
+        </el-steps>
+      </div>
+    </div>
+  </div>
+  <ChooseMarks v-model="chooseMarksVisible" @choosed="choosed" :roleIds="roleIds" />
+</template>
+
+<script setup>
+import * as rule from "@/utils/rules.js";
+import * as MOSTY from "@/components/MyComponents/index";
+import { getItem } from "@/utils/storage";
+import ChooseMarks from "@/components/ChooseList/ChooseMarks/index.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  watch
+} from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const roleIds = ref([]);
+const chooseMarksVisible = ref(false);
+const dialogForm = ref(false); //弹窗
+const pcsList = ref([]);
+const rules = reactive({
+  ryXm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+  ...rule.identityCardRule({ validator: true },'rySfzh'), //身份证校验
+  ...rule.phoneRule({ validator: true }, "ryLxdh"), // 是否必填 是否进行校验,
+  rySfzh: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
+  ryLxdh: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+  ryXb: [{ required: true, message: "请选择性别", trigger: "change" }],
+  ryMz: [{ required: true, message: "请选择民族", trigger: "change" }],
+  ryCsrq: [{ required: true, message: "请选择出生日期", trigger: "change" }],
+  ryJg: [{ required: true, message: "请选择籍贯", trigger: "change" }],
+  zdrRyjb: [{ required: true, message: "请选择人员级别", trigger: "change" }],
+  zdrYjdj: [{ required: true, message: "请选择预警等级", trigger: "change" }]
+});
+const listQuery = ref({}); //表单
+const formData = ref([]);
+watch(() => props.dic,(val) => {
+    formData.value = [
+      { label: "姓名", prop: "ryXm", type: "input" },
+      {
+        label: "性别",
+        prop: "ryXb",
+        type: "select",
+        options: props.dic.D_BZ_XB
+      },
+      {
+        label: "民族",
+        prop: "ryMz",
+        type: "select",
+        options: props.dic.D_BZ_MZ
+      },
+      { label: "身份证号", prop: "rySfzh", type: "input" },
+      { label: "联系电话", prop: "ryLxdh", type: "input" },
+      { label: "出生日期", prop: "ryCsrq", type: "date" },
+      {
+        label: "籍贯",
+        prop: "ryJg",
+        type: "select",
+        options: props.dic.D_BZ_XZQHDM
+      },
+      {
+        label: "人员级别",
+        prop: "zdrRyjb",
+        type: "select",
+        options: props.dic.D_GS_ZDR_RYJB
+      },
+      {
+        label: "预警等级",
+        prop: "zdrYjdj",
+        type: "select",
+        options: props.dic.D_GS_ZDR_YJDJ
+      },
+      {
+        label: "户籍地区划",
+        prop: "hjdQh",
+        type: "select",
+        options: props.dic.D_BZ_XZQHDM
+      },
+      { label: "户籍地详址", prop: "hjdXz", type: "input" },
+      {
+        label: "户籍地派出所",
+        prop: "hjdPcsdm",
+        type: "select",
+        options: pcsList
+      },
+      {
+        label: "现住地区划",
+        prop: "xzdQh",
+        type: "select",
+        options: props.dic.D_BZ_XZQHDM
+      },
+      { label: "现住地详址", prop: "xzdXz", type: "input" },
+      {
+        label: "现住地派出所",
+        prop: "xzdPcsdm",
+        type: "select",
+        options: pcsList
+      },
+      { label: "管辖单位", prop: "gxSsbmdm",depMc:'gxSsbmmc', type: "department" },
+      { label: "诉求单位", prop: "sqSsbmdm",depMc:'sqSsbmmc', type: "department" },
+      { label: "责任单位", prop: "zrSsbmdm",depMc:'zrSsbmmc', type: "department" },
+      {
+        label: "所属警种",
+        prop: "zdrSsjz",
+        type: "select",
+        options: props.dic.D_GS_BK_SSJZ
+      },
+      {
+        label: "涉及警种",
+        prop: "zdrSjjz",
+        type: "select",
+        options: props.dic.D_GS_BK_SSJZ,
+        multiple: true
+      },
+      { label: "管控民警姓名", prop: "gkMjXm", type: "input" },
+      { label: "管控民警警号", prop: "gkMjJh", type: "input" },
+      { label: "管控原因", prop: "zdrLkyy", type: "textarea", width: "100%" },
+      {
+        label: "处置状态",
+        prop: "zdrCzzt",
+        type: "select",
+        options: props.dic.D_GS_ZDR_CZZT
+      },
+      { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
+      { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" }
+    ];
+  },
+  { immediate: true, deep: true }
+);
+
+const tableDate = reactive({
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  controlsWidth: 90, //操作栏宽度
+  keyCount: 0,
+  tableColumn: [
+    { label: "标签名称", prop: "bqMc" },
+    { label: "标签代码", prop: "bqDm" },
+    { label: "标签种类", prop: "bqZl", showSolt: true },
+    { label: "标签类型", prop: "bqLx", showSolt: true },
+    { label: "标签类别", prop: "bqLb", showSolt: true }
+  ]
+});
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const showInfo = ref(false);
+const disabled = ref(false);
+
+onMounted(() => {
+  chooseDep();
+});
+
+const chooseDep = () => {
+  qcckPost({ orgLevel: 40 }, "/mosty-base/deptFeign/queryListByDept").then(
+    (res) => {
+      pcsList.value = res.map((item) => {
+        return { zdmc: item.orgName, dm: item.orgCode, value: item.orgCode };
+      });
+    }
+  );
+};
+
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : type == "detail" ? "详情" : "编辑";
+  disabled.value = type == "detail" ? true : false;
+  tableDate.tableConfiger.haveControls = type == "detail" ? false : true;
+  if (type == "add") {
+    listQuery.value.sqrXm = getItem("USERNAME");
+    listQuery.value.bkfqrSfzh = getItem("idEntityCard");
+    listQuery.value.sqrSsbmmc = getItem("deptId")[0].deptName;
+    listQuery.value.sqrSsbmdm = getItem("deptId")[0].deptCode;
+  }
+  setTimeout(() => {
+    showInfo.value = true;
+  }, 5);
+  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;
+    listQuery.value.sqrXm = getItem("USERNAME");
+    listQuery.value.bkfqrSfzh = getItem("idEntityCard");
+    listQuery.value.sqrSsbmmc = getItem("deptId")[0].deptName;
+    listQuery.value.sqrSsbmdm = getItem("deptId")[0].deptCode;
+  });
+};
+
+// 选择标签
+const choosed = (val) => {
+  listQuery.value.bqList = val.map((v) => {
+    return { bqZl: v.bqLb, bqId: v.id, bqLx: v.bqLx, bqLb: v.bqLb, bqMc: v.bqMc, bqDm: v.bqDm };
+  });
+  roleIds.value = val.map((v) => v.id);
+};
+
+// 删除
+const delDictItem = (bqId) => {
+  listQuery.value.bqList = listQuery.value.bqList.filter((v) => v.bqId != bqId);
+  tableDate.keyCount++;
+};
+
+// 提交
+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 };
+    if (params.hjdPcsdm) {
+      let obj = pcsList.value.find((v) => v.dm == params.hjdPcsdm);
+      params.hjdPcsmc = obj ? obj.zdmc : "";
+    }
+    if (params.xzdPcsdm) {
+      let obj1 = pcsList.value.map((v) => v.dm == params.xzdPcsdm);
+      params.xzdPcsmc = obj1 ? obj1.zdmc : "";
+    }
+    loading.value = true;
+    qcckPost(params, url).then(() => {
+      loading.value = false;
+      proxy.$message({ type: "success", message: title.value + "成功" });
+      emit("updateDate");
+      close();
+    }).catch(() => {
+      loading.value = false;
+    });
+  });
+};
+
+
+const getShdep = (val) =>{
+  listQuery.value.shSsbmmc = val ? val.orgName : ''
+}
+const getSPdep = (val) =>{
+  listQuery.value.spSsbmmc = val ? val.orgName : ''
+}
+
+// 关闭
+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: calc(99% - 50px);
+  margin-top: 10px;
+  overflow: hidden;
+}
+
+.depBox {
+  border: 1px solid #e9e9e9;
+  width: 305px;
+  padding: 0 0 0 4px;
+  border-radius: 4px;
+
+  ::v-deep .el-input__inner {
+    border: none;
+  }
+
+  ::v-deep .el-cascader .el-input.is-focus .el-input__inner {
+    border-color: transparent !important;
+  }
+
+  ::v-deep .el-input__inner:focus {
+    box-shadow: none;
+  }
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
+    border-color: transparent !important;
+  }
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/components copy/zxsForm.vue

@@ -0,0 +1,228 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">流线索</span>
+      <div>
+        <el-button type="primary" :loading="loading" @click="submit">保存</el-button>
+        <el-button @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+        <template #gapdive>
+          <div style="width: 100%; height: 10px" class="mb20">
+            <el-divider content-position="left">基础信息</el-divider>
+          </div>
+        </template>
+        <template #gapline>
+          <div style="width: 100%; height: 10px" class="mb20">
+            <el-divider content-position="left">线索内容</el-divider>
+          </div>
+        </template>
+        <template #scfj>
+          <div style="width: 100%; padding-left: 50px">
+            <div>
+              上传附件:<span class="f12">（可附电子表格、Word文档、图像、音视频文件）</span>
+            </div>
+            <div>
+              <MOSTY.Upload :showBtn="true" :limit="10" v-model="fjdz" />
+            </div>
+          </div>
+        </template>
+      </FormMessage>
+      <el-divider content-position="left"><span class="mr20">相关人员</span>
+      </el-divider>
+      <MyTable :tableData="pageForm.tableData" :tableColumn="pageForm.tableColumn" :tableHeight="pageForm.tableHeight"
+        :key="pageForm.keyCount" :tableConfiger="pageForm.tableConfiger" :controlsWidth="pageForm.controlsWidth">
+        <template #xb="{ row }">
+          <DictTag :value="row.xb" :tag="false" :options="props.dic.D_BZ_XB" />
+        </template>
+        <template #bqList="{ row }">
+          <div v-if="row.bqList">
+            <el-tag type="success" v-for="(it, idx) in row.bqList" :key="idx">{{
+              it.bqMc
+              }}</el-tag>
+          </div>
+        </template>
+      </MyTable>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import * as MOSTY from "@/components/MyComponents/index";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckPost } from "@/api/qcckApi.js";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
+const emit = defineEmits(["change"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const rules = reactive({
+  xsMc: [{ required: true, message: "请输入线索名称", trigger: "blur" }],
+  xlLx: [{ required: true, message: "请选择线索类型", trigger: "change" }],
+  qbLy: [{ required: true, message: "请选择情报来源", trigger: "change" }]
+});
+const formData = ref([
+  { prop: "gapdive", type: "slot", width: "100%" },
+  { label: "线索名称", prop: "xsMc", type: "input" },
+  {
+    label: "线索类型",
+    prop: "xlLx",
+    type: "select",
+    options: props.dic.D_GS_XS_LX
+  },
+  {
+    label: "情报来源",
+    prop: "qbLy",
+    type: "select",
+    options: props.dic.D_GS_XS_LY
+  },
+  { label: "指向开始时间", prop: "zxkssj", type: "datetime" },
+  { label: "指向结束时间", prop: "zxjssj", type: "datetime" },
+  { label: "指向地点", prop: "zxdz", type: "input" },
+  {
+    label: "所属专题",
+    prop: "sszt",
+    type: "select",
+    options: props.dic.D_BZ_SSZT
+  },
+  { prop: "gapline", type: "slot", width: "100%" },
+  { prop: "scfj", type: "slot", width: "100%" },
+  { label: "线索内容", prop: "xsNr", type: "textarea", width: "100%" },
+  {
+    label: "群体类型",
+    prop: "qtlx",
+    type: "select",
+    options: props.dic.D_GS_XS_QTLX
+  },
+  { label: "群体名称", prop: "qtmc", type: "input" },
+  { label: "涉及人数", prop: "sjrs", type: "inputNumber" },
+  { label: "线索报送单位", prop: "ssbmdm", type: "department" }
+]);
+const fjdz = ref();
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const pageForm = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false,
+    haveControls: false
+  },
+  controlsWidth: 220,
+  tableColumn: [
+    { label: "姓名", prop: "xm" },
+    { label: "性别", prop: "xb", showSolt: true },
+    { label: "身份证号", prop: "sfzh" },
+    { label: "户籍地", prop: "hjdz" },
+    { label: "户籍地派出所", prop: "hjdpcs" },
+    { label: "标签", prop: "bqList", showSolt: true }
+  ]
+});
+onMounted(() => {
+  tabHeightFn();
+});
+
+// 初始化数据
+const init = (list) => {
+  fjdz.value = [];
+  tabHeightFn();
+  dialogForm.value = true;
+  pageForm.tableData = list.map((it) => {
+    return {
+      xm: it.ryXm,
+      xb: it.ryXb,
+      sfzh: it.rySfzh,
+      hjdz: it.xzdXz,
+      hjdpcs: it.hjdPcsmc,
+      hjdpcsdm: it.hjdPcsdm,
+      bqList: it.bqList || []
+    };
+  });
+  pageForm.keyCount++;
+};
+
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    let params = { ...data, ryList: pageForm.tableData, cjLx: "0" };
+    params.fjdz = fjdz.value.length > 0 ? fjdz.value.join(",") : "";
+    loading.value = true;
+    qcckPost(params, "/mosty-gsxt/qbcj/add")
+      .then((res) => {
+        loading.value = false;
+        proxy.$message({ type: "success", message: "成功" });
+        emit("change");
+        close();
+      })
+      .catch(() => {
+        loading.value = false;
+      });
+  });
+};
+
+// 关闭
+const close = () => {
+  fjdz.value = [];
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageForm.tableHeight = window.innerHeight - 720;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+
+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;
+}
+
+::v-deep .avatar-uploader {
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-upload-list {
+  margin-left: 20px;
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-upload-list__item-name .el-icon {
+  top: 3px;
+}
+</style>

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

@@ -0,0 +1,526 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">{{ title }}关注人管理</span>
+      <div>
+        <el-button type="primary" size="small" v-if="butShow" :loading="loading" @click="submit">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt flex just-between">
+      <div class="left_box">
+        <ul class="anchor-list">
+          <li @click="scrollToSection('info-section')" :class="activeSection === 'info-section' ? 'active' : ''">人员信息
+          </li>
+          <li @click="scrollToSection('backinfo-section')"
+            :class="activeSection === 'backinfo-section' ? 'active' : ''">人员标签</li>
+          <li @click="scrollToSection('groupLabels-section')"
+            :class="activeSection === 'groupLabels-section' ? 'active' : ''" v-if="!butShow">关联车辆</li>
+          <li @click="scrollToSection('character-section')"
+            :class="activeSection === 'character-section' ? 'active' : ''">背景信息</li>
+          <li @click="scrollToSection('controlInfo-section')"
+            :class="activeSection === 'controlInfo-section' ? 'active' : ''" v-if="!butShow">管控信息</li>
+          <li @click="scrollToSection('featinfo-section')"
+            :class="activeSection === 'featinfo-section' ? 'active' : ''" v-if="!butShow">全要素布控</li>
+          <li @click="scrollToSection('demandsInfo-section')"
+            :class="activeSection === 'demandsInfo-section' ? 'active' : ''" v-if="!butShow">密切联系人</li>
+          <li @click="scrollToSection('requestInfo-section')"
+            :class="activeSection === 'requestInfo-section' ? 'active' : ''" v-if="!butShow">动态轨迹</li>
+          <li @click="scrollToSection('personnel-section')"
+            :class="activeSection === 'personnel-section' ? 'active' : ''" v-if="!butShow">行为信息</li>
+          <li @click="scrollToSection('judgmentRecord-section')"
+            :class="activeSection === 'judgmentRecord-section' ? 'active' : ''" v-if="!butShow">走访记录</li>
+          <li @click="scrollToSection('historyAssembly-section')"
+            :class="activeSection === 'historyAssembly-section' ? 'active' : ''" v-if="!butShow">案件信息</li>
+          <li @click="scrollToSection('joblogging-section')"
+            :class="activeSection === 'joblogging-section' ? 'active' : ''" v-if="!butShow">现实表现</li>
+          <li @click="scrollToSection('joblogging-joblog')"
+            :class="activeSection === 'joblogging-joblog' ? 'active' : ''" v-if="!butShow">操作日志</li>
+        </ul>
+      </div>
+      <div class="right_box" ref="rightBox">
+        <div id="info-section">
+          <Info ref="info" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="backinfo-section">
+          <PersonnelTags ref="personnelTags" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="groupLabels-section" v-if="!butShow">
+          <Vehicle ref="vehicle" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="character-section">
+          <BackInfo ref="backInfo" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="controlInfo-section" v-if="!butShow">
+          <ControlInfo ref="controlInfo" title="重点人" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="featinfo-section" v-if="!butShow">
+          <Deployment ref="deployment" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="demandsInfo-section" v-if="!butShow">
+          <Contact ref="contact" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="requestInfo-section" v-if="!butShow">
+          <DynamicTrajectory ref="dynamicTrajectory" :disabled="disabled" :showBut="showBut" />
+        </div>
+        <div id="personnel-section" v-if="!butShow">
+          <BehaviorInfo ref="behaviorInfo" :disabled="disabled" :showBut="showBut" />
+        </div>
+        <div id="judgmentRecord-section" v-if="!butShow">
+          <VisitRecord ref="visitRecord" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="historyAssembly-section" v-if="!butShow" >
+          <CaseInfo ref="caseInfo" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="joblogging-section" v-if="!butShow">
+          <ActualPerformance ref="actualPerformance" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+        <div id="joblogging-joblog" v-if="!butShow" >
+          <CzModel ref="czModel" :disabled="disabled" :showBut="showBut" :dataList="listQuery" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { getItem } from "@/utils/storage";
+import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
+import { tbGsxtZdrySelectVoById, tbGsxtZdrySave } from "@/api/zdr.js";
+import ControlInfo from '../../mpvGroup/model/controlInfo.vue'
+import Info from "../model/info.vue";
+import PersonnelTags from '../model/personnelTags.vue'
+import Vehicle from '../model/vehicle.vue'
+import BackInfo from '../model/bakInfo.vue'
+import Deployment from '../model/deployment.vue'
+import Contact from '../model/contact.vue'
+import DynamicTrajectory from '../model/dynamicTrajectory.vue'
+import BehaviorInfo from '../model/behaviorInfo.vue'
+import VisitRecord from '../model/visitRecord.vue'
+import CaseInfo from '../model/caseInfo.vue'
+import ActualPerformance from '../model/actualPerformance.vue'
+import CzModel from '../model/czModel.vue'
+import { useRouter, useRoute } from 'vue-router'
+import { ref, onUnmounted, getCurrentInstance } from "vue";
+const router = useRouter()
+const route = useRoute()
+const { proxy } = getCurrentInstance();
+const emit = defineEmits(["updateDate"]);
+const chooseMarksVisible = ref(false);
+const dialogForm = ref(false); //弹窗
+const loading = ref(false);
+const disabled = ref(false)
+const showBut = ref(false)
+const listQuery = ref({});
+const butShow = ref(false)
+const title = ref('新增')
+const showData=ref(false)
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  if (type == 'add') {
+    butShow.value = true
+    title.value = '新增'
+    disabled.value = false
+    showBut.value = false
+  } else {
+
+    butShow.value = false
+    tbGsxtZdrySelectVoById({ id: row.id }).then(res => {
+      listQuery.value = { ...res }
+    })
+    if (type == 'edit') {
+      showBut.value = true
+      disabled.value = false
+      title.value = '编辑'
+    } else if (type == "del") {
+      disabled.value = true
+      showBut.value = false
+      title.value = '删除'
+    }
+    else {
+      disabled.value = true
+      showBut.value = false
+      title.value = '详情'
+    }
+  }
+};
+
+const activeSection = ref('info-section')
+const rightBox = ref(null)
+// 滚动到指定区域
+const scrollToSection = (sectionId) => {
+  const element = document.getElementById(sectionId);
+  if (element && rightBox.value) {
+    // 计算需要滚动的距离
+    const elementTop = element.offsetTop;
+    rightBox.value.scrollTo({
+      top: elementTop - 150, // 减去一些偏移量，让内容更好看
+      behavior: 'smooth' // 平滑滚动
+    });
+    activeSection.value = sectionId;
+  }
+}
+
+// 监听滚动，更新当前激活的锚点
+const handleScroll = () => {
+  if (!rightBox.value) return;
+  const scrollPosition = rightBox.value.scrollTop + 50;
+  const sections = [
+    'info-section', 'backinfo-section', 'groupLabels-section',
+    'character-section', 'controlInfo-section', 'featinfo-section',
+    'demandsInfo-section', 'requestInfo-section', 'personnel-section',
+    'judgmentRecord-section', 'historyAssembly-section', 'joblogging-section', "czModel-section"
+  ];
+
+  for (let i = sections.length - 1; i >= 0; i--) {
+    const section = document.getElementById(sections[i]);
+    if (section && section.offsetTop <= scrollPosition) {
+      activeSection.value = sections[i];
+      break;
+    }
+  }
+}
+
+// 监听右侧区域的滚动事件
+if (typeof window !== 'undefined') {
+  window.addEventListener('load', () => {
+    if (rightBox.value) {
+      rightBox.value.addEventListener('scroll', handleScroll);
+    }
+  });
+
+  // 组件卸载时移除事件监听
+  onUnmounted(() => {
+    if (rightBox.value) {
+      rightBox.value.removeEventListener('scroll', handleScroll);
+    }
+  });
+}
+
+const info = ref()
+const personnelTags = ref()
+// 提交
+const submit = async () => {
+  // 使用Promise.all处理所有子组件的验证和数据获取
+  const [infoData, personnelTagsData] = await Promise.all([
+    info.value.throwData()
+    // personnelTags.value.throwData(),
+  ]);
+  tbGsxtZdrySave({...infoData,rylx:'03'}).then(res => {
+    proxy.$message({
+      message: '新增成功',
+      type: 'success',
+    })
+    close()
+  })
+  console.log(infoData);
+
+};
+
+
+// 关闭
+const close = () => {
+    if (route.query.id) {
+    const query = { ...route.query };
+    delete query.id;
+    router.replace({ query });
+  }
+
+  dialogForm.value = false;
+  loading.value = false;
+  emit('updateDate')
+};
+
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.behaviorInfo {
+
+  margin: 0 0 10px 0;
+  // padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+
+  h3 {
+    font-size: 18px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+}
+
+.textContent {
+  margin-top: 10px;
+}
+
+/* 外层容器：控制尺寸和隐藏默认滚动条 */
+.list-container {
+  width: 100%;
+  height: 400px;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  overflow: hidden;
+  /* 隐藏外层滚动条，由内部控制 */
+  margin: 20px auto;
+  font-family: Arial, sans-serif;
+}
+
+/* 固定标题行 */
+.list-header {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  background-color: #f5f5f5;
+  color: #333;
+  font-weight: 600;
+  padding: 0 16px;
+  height: 50px;
+  border-bottom: 2px solid #ddd;
+  position: sticky;
+  /* 关键：固定标题 */
+  top: 0;
+  z-index: 10;
+  /* 确保在最上层 */
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+/* 可滚动内容区域 */
+.list-body {
+  height: calc(100% - 50px);
+  /* 容器高度减去标题高度 */
+  overflow-y: auto;
+  /* 垂直滚动 */
+  overflow-x: hidden;
+  background-color: #fff;
+}
+
+/* 每一行内容 */
+.list-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 16px;
+  height: 50px;
+  border-bottom: 1px dashed #eee;
+  font-size: 14px;
+  color: #555;
+}
+
+.list-item:hover {
+  background-color: #f9f9f9;
+}
+
+/* 自定义滚动条（可选） */
+.list-container::-webkit-scrollbar {
+  width: 8px;
+}
+
+.list-container::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 4px;
+}
+
+.list-container::-webkit-scrollbar-thumb {
+  background: #999;
+  border-radius: 4px;
+}
+
+.list-container::-webkit-scrollbar-thumb:hover {
+  background: #666;
+}
+
+/* Firefox 支持 */
+.list-container {
+  scrollbar-width: thin;
+  scrollbar-color: #999 #f1f1f1;
+}
+
+::v-deep .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
+  color: #0072ff;
+  background: rgba(0, 114, 255, 0.3);
+}
+
+#contact-section {
+  margin-top: 20px;
+}
+
+.boxlist {
+  width: calc(99% - 50px);
+  margin-top: 10px;
+  overflow: hidden;
+}
+
+.depBox {
+  border: 1px solid #e9e9e9;
+  width: 305px;
+  padding: 0 0 0 4px;
+  border-radius: 4px;
+
+  ::v-deep .el-input__inner {
+    border: none;
+  }
+
+  ::v-deep .el-cascader .el-input.is-focus .el-input__inner {
+    border-color: transparent !important;
+  }
+
+  ::v-deep .el-input__inner:focus {
+    box-shadow: none;
+  }
+
+  ::v-deep .el-input.is-disabled .el-input__inner {
+    border-color: transparent !important;
+  }
+}
+
+.left_box {
+  width: 220px;
+  background-color: #fafafa;
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  padding: 15px;
+  transition: all 0.3s ease;
+}
+
+.left_box:hover {
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  border-color: #409eff;
+}
+
+// 锚点列表样式
+.anchor-list {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.anchor-list li {
+  padding: 10px 15px;
+  margin-bottom: 5px;
+  cursor: pointer;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+  font-size: 14px;
+  color: #606266;
+  position: relative;
+}
+
+.anchor-list li:hover {
+  background-color: #e6f7ff;
+  color: #409eff;
+}
+
+.anchor-list li.active {
+  background-color: #409eff;
+  color: #ffffff;
+  font-weight: 500;
+}
+
+.anchor-list li.active::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 3px;
+  background-color: #ffffff;
+  border-radius: 0 2px 2px 0;
+}
+
+.right_box {
+  width: calc(100% - 240px);
+  overflow-y: auto;
+  // padding: 15px;
+  background-color: #ffffff;
+  // border: 1px solid #ebeef5;
+  border-radius: 6px;
+
+  .right_box>div {
+    background-color: #f8f9fa;
+    border-radius: 6px;
+    padding: 20px;
+    transition: all 0.3s ease;
+    margin-bottom: 10px;
+  }
+
+  .right_box>div:hover {
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  }
+
+  .right_box h3 {
+    font-size: 18px;
+    font-weight: 600;
+    color: #303133;
+    margin: 0 0 10px 0;
+    padding-bottom: 10px;
+    border-bottom: 2px solid #409eff;
+    position: relative;
+  }
+
+  .right_box h3::after {
+    content: '';
+    position: absolute;
+    left: 0;
+    bottom: -2px;
+    width: 60px;
+    height: 2px;
+    background-color: #409eff;
+  }
+
+  .headline {
+    font-size: 16px;
+    font-weight: 500;
+    color: #303133;
+    margin-bottom: 15px;
+  }
+
+  // 按钮样式优化
+  .el-button {
+    margin-left: 8px;
+    transition: all 0.3s ease;
+  }
+
+  .el-button:first-child {
+    margin-left: 0;
+  }
+}
+
+// 响应式设计
+@media screen and (max-width: 768px) {
+  .form_cnt {
+    flex-direction: column;
+  }
+
+  .left_box {
+    width: 100%;
+    margin-bottom: 20px;
+  }
+
+  .right_box {
+    width: 100%;
+  }
+
+  .anchor-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 5px;
+  }
+
+  .anchor-list li {
+    flex: 1 1 calc(33.333% - 10px);
+    margin-bottom: 5px;
+    text-align: center;
+    padding: 8px 5px;
+    font-size: 12px;
+  }
+}
+
+::v-deep .avatar-uploader {
+  display: flex
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/components/zxsForm.vue

@@ -0,0 +1,228 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">流线索</span>
+      <div>
+        <el-button type="primary" :loading="loading" @click="submit">保存</el-button>
+        <el-button @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+        <template #gapdive>
+          <div style="width: 100%; height: 10px" class="mb20">
+            <el-divider content-position="left">基础信息</el-divider>
+          </div>
+        </template>
+        <template #gapline>
+          <div style="width: 100%; height: 10px" class="mb20">
+            <el-divider content-position="left">线索内容</el-divider>
+          </div>
+        </template>
+        <template #scfj>
+          <div style="width: 100%; padding-left: 50px">
+            <div>
+              上传附件:<span class="f12">（可附电子表格、Word文档、图像、音视频文件）</span>
+            </div>
+            <div>
+              <MOSTY.Upload :showBtn="true" :limit="10" v-model="fjdz" />
+            </div>
+          </div>
+        </template>
+      </FormMessage>
+      <el-divider content-position="left"><span class="mr20">相关人员</span>
+      </el-divider>
+      <MyTable :tableData="pageForm.tableData" :tableColumn="pageForm.tableColumn" :tableHeight="pageForm.tableHeight"
+        :key="pageForm.keyCount" :tableConfiger="pageForm.tableConfiger" :controlsWidth="pageForm.controlsWidth">
+        <template #xb="{ row }">
+          <DictTag :value="row.xb" :tag="false" :options="props.dic.D_BZ_XB" />
+        </template>
+        <template #bqList="{ row }">
+          <div v-if="row.bqList">
+            <el-tag type="success" v-for="(it, idx) in row.bqList" :key="idx">{{
+              it.bqMc
+              }}</el-tag>
+          </div>
+        </template>
+      </MyTable>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import * as MOSTY from "@/components/MyComponents/index";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { qcckPost } from "@/api/qcckApi.js";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
+const emit = defineEmits(["change"]);
+const props = defineProps({
+  dic: Object
+});
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const rules = reactive({
+  xsMc: [{ required: true, message: "请输入线索名称", trigger: "blur" }],
+  xlLx: [{ required: true, message: "请选择线索类型", trigger: "change" }],
+  qbLy: [{ required: true, message: "请选择情报来源", trigger: "change" }]
+});
+const formData = ref([
+  { prop: "gapdive", type: "slot", width: "100%" },
+  { label: "线索名称", prop: "xsMc", type: "input" },
+  {
+    label: "线索类型",
+    prop: "xlLx",
+    type: "select",
+    options: props.dic.D_GS_XS_LX
+  },
+  {
+    label: "情报来源",
+    prop: "qbLy",
+    type: "select",
+    options: props.dic.D_GS_XS_LY
+  },
+  { label: "指向开始时间", prop: "zxkssj", type: "datetime" },
+  { label: "指向结束时间", prop: "zxjssj", type: "datetime" },
+  { label: "指向地点", prop: "zxdz", type: "input" },
+  {
+    label: "所属专题",
+    prop: "sszt",
+    type: "select",
+    options: props.dic.D_BZ_SSZT
+  },
+  { prop: "gapline", type: "slot", width: "100%" },
+  { prop: "scfj", type: "slot", width: "100%" },
+  { label: "线索内容", prop: "xsNr", type: "textarea", width: "100%" },
+  {
+    label: "群体类型",
+    prop: "qtlx",
+    type: "select",
+    options: props.dic.D_GS_XS_QTLX
+  },
+  { label: "群体名称", prop: "qtmc", type: "input" },
+  { label: "涉及人数", prop: "sjrs", type: "inputNumber" },
+  { label: "线索报送单位", prop: "ssbmdm", type: "department" }
+]);
+const fjdz = ref();
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const pageForm = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false,
+    haveControls: false
+  },
+  controlsWidth: 220,
+  tableColumn: [
+    { label: "姓名", prop: "xm" },
+    { label: "性别", prop: "xb", showSolt: true },
+    { label: "身份证号", prop: "sfzh" },
+    { label: "户籍地", prop: "hjdz" },
+    { label: "户籍地派出所", prop: "hjdpcs" },
+    { label: "标签", prop: "bqList", showSolt: true }
+  ]
+});
+onMounted(() => {
+  tabHeightFn();
+});
+
+// 初始化数据
+const init = (list) => {
+  fjdz.value = [];
+  tabHeightFn();
+  dialogForm.value = true;
+  pageForm.tableData = list.map((it) => {
+    return {
+      xm: it.ryXm,
+      xb: it.ryXb,
+      sfzh: it.rySfzh,
+      hjdz: it.xzdXz,
+      hjdpcs: it.hjdPcsmc,
+      hjdpcsdm: it.hjdPcsdm,
+      bqList: it.bqList || []
+    };
+  });
+  pageForm.keyCount++;
+};
+
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    let params = { ...data, ryList: pageForm.tableData, cjLx: "0" };
+    params.fjdz = fjdz.value.length > 0 ? fjdz.value.join(",") : "";
+    loading.value = true;
+    qcckPost(params, "/mosty-gsxt/qbcj/add")
+      .then((res) => {
+        loading.value = false;
+        proxy.$message({ type: "success", message: "成功" });
+        emit("change");
+        close();
+      })
+      .catch(() => {
+        loading.value = false;
+      });
+  });
+};
+
+// 关闭
+const close = () => {
+  fjdz.value = [];
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageForm.tableHeight = window.innerHeight - 720;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+
+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;
+}
+
+::v-deep .avatar-uploader {
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-upload-list {
+  margin-left: 20px;
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-upload-list__item-name .el-icon {
+  top: 3px;
+}
+</style>

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

@@ -0,0 +1,357 @@
+<template>
+  <div>
+    <!-- 搜索 -->
+    <div ref="searchBox"  class="mt10">
+      <Search :searchArr="searchConfiger" @submit="onSearch" />
+    </div>
+     <PageTitle  :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
+      <template #left>
+        <!-- <el-popover placement="bottom" :visible="visible" :width="400" trigger="click">
+          <template #reference>
+            <el-button type="primary" @click="(visible = !visible), (visiblefp = false)" size="small">布控申请</el-button>
+          </template>
+          <div class="flex just-center">
+            <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm"
+              @click="handleApplication(it)">{{ it.zdmc }}</el-button>
+          </div>
+        </el-popover> -->
+        <!-- <el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
+          <template #reference>
+            <el-button size="small" type="primary" @click="(visiblefp = !visiblefp), (visible = false)">指定分配</el-button>
+          </template>
+          <div>
+            <el-input readonly v-model="obj.fpmc" @click="chooseUserVisible = true" placeholder="请选择民警"></el-input>
+            <div class="flex just-center mt10">
+              <el-button @click="(visiblefp = false), (obj = {})" size="small">取消</el-button>
+              <el-button type="primary" @click="handlefp" size="small">分配</el-button>
+            </div>
+          </div>
+        </el-popover> -->
+        <!-- <el-button size="small" type="primary" @click="handleZxs">转线索</el-button> -->
+        <!-- <el-button size="small" type="primary" @click="handleMove">移交管控</el-button> -->
+        <!-- <el-button size="small" type="primary">导入</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>
+        </el-button>
+      </template>
+      </PageTitle>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData">
+        <template #bqList="{ row }">
+          <ul>
+            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
+              item.bqFz || 0 }} 分) </li>
+          </ul>
+        </template>
+        <template #ryXb="{ row }">
+          <DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" />
+        </template>
+        <template #ryJg="{ row }">
+          <DictTag :tag="false" :value="row.ryJg" :options="D_BZ_XZQHDM" />
+        </template>
+        <template #ryMz="{ row }">
+          <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
+        </template>
+        <template #hjdQh="{ row }">
+          <DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" />
+        </template>
+        <template #zdrRyjb="{ row }">
+          <DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB" />
+        </template>
+        <template #zdrBkZt="{ row }">
+          <DictTag :tag="false" :value="row.zdrBkZt" :options="D_GS_ZDR_BK_ZT" />
+        </template>
+        <template #zdrCzzt="{ row }">
+          <DictTag :tag="false" :value="row.zdrCzzt" :options="D_GS_ZDR_CZZT" />
+        </template>
+        <template #zdrZt="{ row }">
+          <DictTag :tag="false" :value="row.zdrZt" :options="D_GS_ZDQT_ZT" />
+        </template>
+
+        <template #xtSjzt="{ row }">
+          <div> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
+        </template>
+
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link size="small" type="success" @click="handleremove(row.id)">移除</el-link>
+          <el-link size="small" type="success" v-if="row.zdrZt == '01' || row.zdrZt == '03'"
+            @click="handleSend(row.id)">送审</el-link>
+          <el-link size="small" type="primary" v-if="row.zdrZt == '01' || row.zdrZt == '03'"
+            @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
+          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+    <!-- 详情 -->
+    <AddForm ref="addFormDiloag" @updateDate="getList"
+      :dic="{ D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ }" />
+    <!-- 选择用户 -->
+    <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" />
+    <!-- 转线索 -->
+    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList"
+      :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }"></ZxsForm>
+  </div>
+</template>
+
+<script setup>
+import { ElMessage } from "element-plus";
+import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue";
+import ZxsForm from "./components/zxsForm.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 AddForm from "./components/addForm.vue";
+import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import { useRouter, useRoute } from 'vue-router'
+const router = useRouter()
+const route = useRoute()
+const { proxy } = getCurrentInstance();
+const { D_GS_ZDQT_ZT, D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_BK_SQLX, D_BZ_SF, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } =
+  proxy.$dict("D_GS_ZDQT_ZT", "D_GS_ZDR_RYJB", "D_BZ_XB", "D_BZ_MZ", "D_BZ_XZQHDM", "D_GS_ZDR_BK_ZT", "D_GS_ZDR_CZZT", "D_GS_BQ_ZL", "D_GS_BQ_LB", "D_GS_BQ_LX", "D_GS_ZDR_YJDJ", "D_GS_BK_SSJZ", "D_GS_BK_SQLX", "D_BZ_SF", "D_GS_XS_LY", "D_BZ_SSZT", "D_GS_XS_LX", "D_GS_XS_QTLX");
+const obj = ref({});
+const showzxs = ref(false);
+const zxsDilof = ref();
+const show = ref(false);
+const addFormDiloag = ref();
+const searchBox = ref(); //搜索框
+const chooseUserVisible = ref(false); //审批流程
+const ids = ref([]);
+const choosList = ref([]);
+const visible = ref(false);
+const visiblefp = ref(false);
+const searchConfiger = ref([
+  {
+    label: "姓名",
+    prop: "ryXm",
+    placeholder: "请输入姓名",
+    showType: "input"
+  },
+  {
+    label: "身份证",
+    prop: "rySfzh",
+    placeholder: "请输入身份证",
+    showType: "input"
+  },
+  {
+    label: "户籍地",
+    prop: "hjdXz",
+    placeholder: "请输入户籍地",
+    showType: "input"
+  },
+  {
+    label: "人员级别",
+    prop: "zdrRyjb",
+    placeholder: "请输入人员级别",
+    showType: "select",
+    options: D_GS_ZDR_RYJB
+  },
+]);
+const queryFrom = ref({});
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 250,
+  tableColumn: [
+    { label: "姓名", prop: "ryXm", width: 150 },
+    { label: "性别", prop: "ryXb", showSolt: true, width: 100 },
+    { label: "籍贯", prop: "ryJg", showSolt: true, width: 100 },
+    { label: "身份证", prop: "rySfzh", width: 200 },
+    { label: "民族", prop: "ryMz", showSolt: true, width: 100 },
+    { label: "户籍地区划", prop: "hjdQh", showSolt: true, width: 150 },
+    { label: "户籍派出所", prop: "hjdPcsmc", width: 200 },
+    { label: "户籍地详址", prop: "hjdXz", width: 200 },
+    { label: "标签", prop: "bqList", showSolt: true, width: 400, showOverflowTooltip: true },
+    { label: "管辖单位", prop: "gxSsbmmc", width: 200 },
+    { label: "人员级别", prop: "zdrRyjb", showSolt: true, width: 130 },
+    { label: "管控原因", prop: "zdrLkyy", width: 200, showOverflowTooltip: true },
+    { label: "管控状态", prop: "zdrBkZt", width: 200, showOverflowTooltip: true },
+    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
+    { label: "审核状态", prop: "zdrZt", showSolt: true },
+    { label: "状态", prop: "xtSjzt", showSolt: true },
+  ]
+});
+
+onMounted(() => {
+   tabHeightFn();
+  if (route.query.id) {
+    addEdit('x', {
+      id: route.query.id
+    })
+  }else{
+    getList();
+  }
+});
+
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = { ...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+// 获取列表
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  // 人员类型D_ZDRY_RYLX(01 重点 02 普通〉
+  //  rylx: '01',
+  let data = {...pageData.pageConfiger, ...queryFrom.value,rylx: '03' };
+  qcckGet(data, "/mosty-gsxt/tbGsxtZdry/selectPage").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
+};
+
+//送审
+const handleSend = (id) => {
+  proxy.$confirm("确定要送审？", "警告", { type: "warning" }).then(() => {
+    qcckPost({ id }, "/mosty-gsxt/tbGsxtZdry/subSh").then(() => {
+      proxy.$message({ type: "success", message: "送审成功" });
+      getList();
+    });
+  })
+};
+// 移除
+const handleremove = (id) => {
+  proxy.$confirm("确定要移除此重点人员？", "警告", { type: "warning" }).then(() => {
+    qcckPost({ id, rylx: '02' }, "/mosty-gsxt/tbGsxtZdry/update").then(() => {
+      proxy.$message({ type: "success", message: "移除成功" });
+      getList();
+    });
+  })
+}
+
+
+const chooseData = (data) => {
+  ids.value = Array.isArray(data) ? data.map((item) => item.id) : [];
+  choosList.value = Array.isArray(data) ? data : [];
+};
+// 选择申请数据数据
+const handleApplication = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要布控的重点人");
+  qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdry/addBksq").then(() => {
+    ElMessage.success("申请成功");
+    visible.value = false;
+    getList();
+  }).catch(() => {
+    ElMessage.error("布控申请失败");
+  });
+};
+
+const handleUserSelected = (val) => {
+  obj.value.fpmc = val[0].userName;
+  obj.value.fpid = val[0].id;
+};
+
+// 处理分配
+const handlefp = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要布控的重点人");
+  qcckPost({ ids: ids.value, uid: obj.value.fpid }, "/mosty-gsxt/tbGsxtZdry/addGkmj").then(() => {
+    ElMessage.success("分配成功");
+    visible.value = false;
+    visiblefp.value = false;
+    getList();
+  }).catch(() => {
+    ElMessage.error("分配失败");
+  });
+};
+
+// 移交管控
+const handleMove = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要移交管控的重点群体");
+  proxy.$confirm("是否确定移交？", "警告", { type: "warning" }).then(() => {
+    qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdry/addSfyj").then(() => {
+      ElMessage.success("移交管控成功");
+      getList();
+    }).catch(() => {
+      ElMessage.error("移交管控失败");
+    });
+  });
+};
+
+// 转线索
+const handleZxs = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要转线索的重点群体");
+  showzxs.value = true;
+  nextTick(() => {
+    zxsDilof.value.init(choosList.value);
+  });
+};
+
+//删除操作
+const deleteRow = (id) => {
+  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
+    qcckDelete({}, "/mosty-gsxt/tbGsxtZdry/" + id).then((res) => {
+      ElMessage.success("删除成功");
+      getList();
+    });
+  });
+};
+
+
+//新增编辑
+const addEdit = (type, row) => {
+  show.value = true;
+  nextTick(() => {
+    addFormDiloag.value.init(type, row);
+  })
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+</script>
+
+<style lang="scss" scoped>
+.marks {
+  padding: 0 4px;
+  white-space: nowrap;
+  background: #73acf1;
+  border-radius: 4px;
+  color: #fff;
+}
+</style>
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/actualPerformance.vue

@@ -0,0 +1,294 @@
+<template>
+  <div>
+    <div class="headClass" style="">
+      <h3>现实表现</h3>
+      <el-button @click="AddPore" type="primary" v-if="showBut">新增</el-button>
+    </div>
+    <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+      :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+      <template #showSolt="{ row }">
+        <span v-for="(item,index) in row.fjxx" :key="index">{{ item.originalName }}<span v-if="index < row.fjxx.length - 1">、</span></span>
+      </template>
+      <!-- 操作 -->
+      <template #controls="{ row }">
+        <el-link type="danger" @click="delDictItem(row.id)">删除</el-link>
+        <el-link type="danger" @click="updDictItem(row)">修改</el-link>
+      </template>
+    </MyTable>
+  </div>
+  <!-- <VehiclDoing v-model="JudgmentShow" @comfirm="addMarks" :data="dataModel"
+    :dict="{ D_BZ_CLLX, D_BZ_CLYS, D_BZ_CLPP }" /> -->
+
+    <JudgmentRecord v-model="JudgmentShow" @comfirm="onComfirm" :data="dataModel" />
+
+</template>
+
+<script setup>
+import { identityCardRule } from "@/utils/rules"
+import { ref, reactive, watch, toRaw, getCurrentInstance, onMounted,  onUnmounted } from "vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import JudgmentRecord from "../component/judgmentRecord.vue";
+import { tbGsxtZdryXsbxSaveOrUpdateXsbx,tbGsxtZdryXsbxSelectZfjl,tbGsxtZdryXsbx } from '@/api/zdr.js'
+import { ElMessage, ElMessageBox } from "element-plus";
+const { proxy } = getCurrentInstance();
+const { D_BZ_CLLX, D_BZ_CLYS, D_BZ_CLPP } = proxy.$dict("D_BZ_CLLX", "D_BZ_CLYS", "D_BZ_CLPP"); //获取字典数据
+const JudgmentShow = ref(false)
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const listData = ref({})
+const addUpd = ref(true)
+watch(() => props.dataList, (val) => {
+  if (val) {
+    listData.value = val
+    gettbZdryClxxSelectPage()
+  }
+}, { deep: true })
+// 表格数据
+const pageData = reactive({
+  tableData: [],
+  tableColumn: [{
+    prop: 'rrry',
+    label: '录入人员',
+  }, {
+    prop: 'lrsj',
+    label: '录入时间',
+  }, {
+    prop: 'bxnr',
+    label: '表现内容',
+  }, {
+    showSolt: true,
+    prop: 'fjxx',
+    label: '附件信息',
+  }],
+  tableHeight: '200px',
+  keyCount: 0,
+  tableConfiger: {
+    border: true,
+    stripe: true,
+    showHeader: true,
+    showIndex: true,
+    indexLabel: '序号',
+    indexWidth: 60,
+    align: 'center',
+    showOverflowTooltip: true,
+    haveControls: !props.disabled
+  },
+  controlsWidth: 200,
+})
+
+// 修改数据接口
+const dataModel = ref()
+const onComfirm = (val) => {
+  const params = {
+    ...val,
+    zdryId: listData.value.id,
+  }
+  console.log(params);
+
+  // if (props.showBut && !props.disabled) {
+  //   if (addUpd.value) {
+    tbGsxtZdryXsbxSaveOrUpdateXsbx(params).then(res => {
+        gettbZdryClxxSelectPage()
+        proxy.$message({
+          message: '现实表现添加成功',
+          type: 'success'
+        })
+      })
+    // }
+  //   else {
+  //     tbZdryClxxUpdate(params).then(res => {
+  //       gettbZdryClxxSelectPage()
+  //       proxy.$message({
+  //         message: '关联车辆修改成功',
+  //         type: 'success'
+  //       })
+  //     })
+  //   }
+  // } else {
+  //   pageData.tableData.push(val)
+  // }
+}
+onMounted(() => {
+})
+// 删除车辆
+const delDictItem = (val) => {
+  if (!props.disabled && props.showBut) {
+    ElMessageBox.confirm(
+      '是否删除关联车辆',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    )
+      .then(() => {
+        tbGsxtZdryXsbx(val).then(res => {
+          gettbZdryClxxSelectPage()
+          proxy.$message({
+            message: '表现信息删除成功',
+            type: 'success'
+          })
+        })
+      })
+      .catch(() => {
+        ElMessage({
+          type: 'info',
+          message: '取消删除',
+        })
+      })
+  } else {
+    pageData.tableData = pageData.tableData.filter(v => v.id != val)
+  }
+
+}
+
+const updDictItem = (val) => {
+  JudgmentShow.value = true
+  addUpd.value = false
+  dataModel.value = val
+}
+const AddPore = () => {
+  JudgmentShow.value = true
+  addUpd.value = true
+}
+// 查询车辆
+const gettbZdryClxxSelectPage = () => {
+  const promes = {
+    zdrid: listData.value.id
+  }
+  tbGsxtZdryXsbxSelectZfjl(promes).then(res => {
+    pageData.tableData = res.map(item => {
+      return {
+        ...item,
+        fjxx: item.fjxx ? JSON.parse(item.fjxx) : []
+      }
+    })
+  })
+}
+// 抛出数据并验证标签列表不为空
+const throwData = () => {
+  return new Promise((resolve) => {
+    // // 验证：确保标签列表不为空
+    // if (!pageData.tableData || pageData.tableData.length === 0) {
+    //   throw new Error('请录入车辆信息');
+    // }
+    resolve(pageData.tableData);
+  });
+}
+defineExpose({
+  throwData
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 10px;
+}
+
+::v-deep(.el-form) {
+  display: flex;
+  justify-content: space-between;
+}
+
+.left_box {
+  width: 200px;
+  border: 1px solid #c8c8c89a;
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.right_box {
+  width: calc(100% - 230px);
+  overflow-y: auto;
+  padding: 5px;
+}
+
+::v-deep .el-form-item__content {
+  display: block !important;
+}
+
+.headClass {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 20px 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+
+}
+
+.headSelect {
+  width: 100%;
+  padding: 0 16px;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  justify-content: end;
+  padding-bottom: 20px;
+}
+
+/* 移除冲突样式：不要用 justify-content */
+
+/* 控制所有 el-form-item 高度和垂直居中 */
+.form-inline :deep(.el-form-item) {
+  margin-bottom: 0;
+  height: 60px;
+  display: flex;
+  align-items: center;
+}
+
+/* ✅ 按钮区域靠右，且不换行 */
+.form-inline .form-actions {
+  margin-left: auto;
+  /* 推到最右边 */
+  white-space: nowrap;
+  /* 防止按钮换行 */
+}
+
+/* 统一按钮样式，增加间距和视觉舒适度 */
+.form-inline :deep(.el-button) {
+  height: 36px;
+  padding: 8px 16px;
+  font-size: 14px;
+  border-radius: 4px;
+}
+
+/* 按钮之间留出间距（除了第一个） */
+.form-inline :deep(.el-button:not(:first-child)) {
+  margin-left: 12px;
+  /* 比原来的 8px 更宽松 */
+}
+
+// .headClass::after {
+//   content: '';
+//   position: absolute;
+//   left: 0;
+//   bottom: -2px;
+//   width: 60px;
+//   height: 2px;
+//   background-color: #409eff;
+// }
+
+h3 {
+  margin: 0;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/bakInfo.vue

@@ -0,0 +1,368 @@
+<template>
+
+  <div class="backinfo-container">
+    <div class="headClass" style="">
+      <h3>背景信息</h3>
+      <el-button type="primary" v-if="showBut" :disabled="disabled" @click="submitForm(ruleFormRef)">保存</el-button>
+    </div>
+    <div>
+      <!-- 全部输入框 -->
+      <el-form class="record" ref="ruleFormRef" :model="ruleForm" :rules="rules">
+        <!-- 拘留所记录 -->
+        <div class="detentionFacility">
+          <div>拘留所记录：</div>
+          <div>
+            <div v-for="(item, i) in ruleForm.detentionCenterRecords" :key="item.id" class="detentionFacilityArr">
+              <el-form-item :prop="'detentionCenterRecords.' + i + '.str'" :rules="rules.str">
+                <el-input v-model="ruleForm.detentionCenterRecords[i].str" type="textarea"
+                  class="detentionFacilityInput" placeholder="请输入拘留所记录" />
+              </el-form-item>
+              <div style="width: 100px;" v-if="showBut">
+                <el-button type="primary" v-if="ruleForm.detentionCenterRecords.length != 1"
+                  @click="decreaseRecord(i, '拘留所')">−</el-button>
+                <el-button type="primary" @click="addRecord(i, '拘留所')"
+                  v-if="i == ruleForm.detentionCenterRecords.length - 1">+</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- 看守所记录 -->
+        <div class="detentionFacility">
+          <div>看守所记录：</div>
+          <div>
+            <div v-for="(item, i) in ruleForm.prison" :key="item.id" class="detentionFacilityArr">
+              <el-form-item :prop="'prison.' + i + '.str'" :rules="rules.str">
+                <el-input v-model="ruleForm.prison[i].str" type="textarea" class="detentionFacilityInput"
+                  placeholder="请输入拘留所记录" />
+              </el-form-item>
+              <div style="width: 100px;" v-if="showBut">
+                <el-button type="primary" v-if="ruleForm.prison.length != 1"
+                @click="decreaseRecord(i, '看守所')">−</el-button>
+              <el-button type="primary" @click="addRecord(i, '看守所')"
+                v-if="i == ruleForm.prison.length - 1">+</el-button>
+              </div>
+
+            </div>
+          </div>
+        </div>
+      </el-form>
+    </div>
+
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, watch, onMounted, getCurrentInstance } from "vue";
+import { tbGsxtZdryUpdate } from '@/api/zdr.js'
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const ruleFormRef = ref()
+const ruleForm = reactive({
+  detentionCenterRecords: [{ id: 0, str: "" }],
+  prison: [{ id: 0, str: "" }],
+})
+// 表单校验
+const rules = reactive({
+  // str: [
+  //   { required: true, message: '请输入具体信息', trigger: 'blur' },
+  //   { min: 3, max: 20, message: '请最少输入3个字,最多输入20个字', trigger: 'blur' },
+  // ],
+})
+watch(() => props.dataList, (val) => {
+  if (val) {
+    ruleForm.detentionCenterRecords = val.jlsJl && val.kssJl.length > 0 ? val.jlsJl.map((item, index) => {
+      return {
+        id: index,
+        str: item
+      }
+    }) : [{ id: 0, str: "" }],
+      ruleForm.prison = val.kssJl && val.kssJl.length > 0 ? val.kssJl.map((item, index) => {
+        return {
+          id: index,
+          str: item
+        }
+      }) : [{ id: 0, str: "" }]
+  }
+}, { deep: true })
+
+// 增加输入记录输入框
+const addRecord = (val, type) => {
+  if (type == '拘留所') {
+    ruleForm.detentionCenterRecords.push({ id: val })
+  } else {
+    ruleForm.prison.push({ id: val })
+  }
+}
+// 减少输入记录输入框
+const decreaseRecord = (val, type) => {
+  if (type == '拘留所') {
+    ruleForm.detentionCenterRecords.splice(val, 1)
+  } else {
+    ruleForm.prison.splice(val, 1)
+  }
+
+}
+
+//提交数据校验表单
+const submitForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const promes = {
+        id: props.dataList.id,
+        jlsJl: ruleForm.detentionCenterRecords.map(item => item.str),
+        kssJl: ruleForm.prison.map(item => item.str),
+      }
+      tbGsxtZdryUpdate(promes).then((res) => {
+        proxy.$message.success('保存成功')
+      }).catch((err) => {
+        proxy.$message.error('保存失败')
+      });
+      console.log('submit!')
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+const throwData = () => {
+  return new Promise((resolve) => {
+    resolve(ruleForm);
+  });
+}
+defineExpose({
+  throwData
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 10px;
+
+}
+
+.sumbitBtnBOX {
+  position: relative;
+  width: 100%;
+  height: 50px;
+
+  // background-color: saddlebrown;
+  .sumbitBtn {
+    position: absolute;
+    right: 18px;
+    bottom: 0px;
+  }
+}
+
+.backinfo-container>:nth-child(2) {
+
+  width: 100%;
+  // height: 50px;
+  justify-content: space-between;
+
+  .detentionFacility {
+    width: 100%;
+    display: flex;
+    align-items: baseline;
+    box-sizing: border-box;
+    padding: 20px;
+    justify-content: space-between;
+  }
+
+  .detentionFacility>:nth-child(1) {
+    width: 100px;
+  }
+
+  .detentionFacility>:nth-child(2) {
+    width: 98%;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .detentionFacilityArr {
+    display: flex;
+
+    margin-top: 20px;
+    justify-content: space-between;
+
+    .el-form-item {
+      width: 93%;
+      height: 100%;
+
+
+    }
+  }
+
+}
+
+.background-info-input {
+  width: 100%;
+  margin-bottom: 15px;
+}
+
+.file-attachment-section {
+  margin-top: 15px;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: 500;
+  color: #303133;
+  margin-bottom: 10px;
+  padding-bottom: 5px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.file-list-container {
+  max-height: 100px;
+  overflow-y: auto;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  background-color: #ffffff;
+  margin-bottom: 10px;
+}
+
+/* 自定义滚动条样式 */
+.file-list-container::-webkit-scrollbar {
+  width: 6px;
+}
+
+.file-list-container::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 3px;
+}
+
+.file-list-container::-webkit-scrollbar-thumb {
+  background: #c0c4cc;
+  border-radius: 3px;
+}
+
+.file-list-container::-webkit-scrollbar-thumb:hover {
+  background: #909399;
+}
+
+.empty-file-list {
+  padding: 20px;
+  text-align: center;
+  color: #909399;
+  font-size: 12px;
+}
+
+.file-list {
+  padding: 5px;
+}
+
+.file-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 10px;
+  margin-bottom: 2px;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+  cursor: pointer;
+}
+
+.file-item:hover {
+  background-color: #e6f7ff;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.file-info {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  gap: 15px;
+  min-width: 0;
+}
+
+.file-name {
+  flex: 1;
+  font-size: 12px;
+  color: #303133;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.file-size {
+  font-size: 11px;
+  color: #909399;
+  min-width: 60px;
+}
+
+.file-time {
+  font-size: 11px;
+  color: #909399;
+}
+
+.file-actions {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  margin-left: 10px;
+}
+
+.file-actions .el-button {
+  padding: 0 5px;
+  margin: 0;
+  color: #606266;
+  transition: color 0.3s ease;
+}
+
+.file-actions .el-button:hover {
+  color: #409eff;
+}
+
+.delete-btn:hover {
+  color: #f56c6c !important;
+}
+
+.upload-btn-container {
+  display: flex;
+  justify-content: center;
+  margin-top: 10px;
+}
+
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.headClass::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -2px;
+  width: 60px;
+  height: 2px;
+  background-color: #409eff;
+}
+
+h3 {
+  margin: 0;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/behaviorInfo.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="backinfo-container">
+    <div class="headClass">
+      <h3>行为信息</h3>
+    </div>
+
+
+
+    <!-- 列表区域 -->
+    <div class="list-container">
+      <div v-loading="loading" class="behavior-list">
+          <div class="behavior-list-inner">
+            <div
+              v-for="(item, index) in behaviorList"
+              :key="item.id"
+              class="behavior-item"
+            >
+              <div class="behavior-item-header">
+                <span class="behavior-index">{{ index + 1 }}.</span>
+                <el-tag :type="getTagType(item.behaviorType)">{{ item.behaviorTypeName }}</el-tag>
+                <span class="behavior-time">{{ item.time }}</span>
+              </div>
+              <div class="behavior-item-content">
+                <p class="behavior-description">{{ item.description }}</p>
+                <p class="behavior-location"><i class="el-icon-location-outline"></i> {{ item.location }}</p>
+              </div>
+            </div>
+
+            <div v-if="!loading && behaviorList.length === 0" class="empty-state">
+              <el-empty description="暂无行为记录" />
+            </div>
+          </div>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, getCurrentInstance, onMounted } from 'vue'
+import GdMap from "@/components/GdMap/index.vue";
+
+const { proxy } = getCurrentInstance();
+const { D_BZ_ZJLX } = proxy.$dict("D_BZ_ZJLX")
+
+// 搜索表单
+const searchForm = ref({
+  behaviorType: '',
+  timeRange: null
+})
+
+// 列表数据
+const behaviorList = ref([])
+const loading = ref(false)
+
+// 获取标签类型
+const getTagType = (type) => {
+  const typeMap = {
+    'ticket': 'success',
+    'hotel': 'primary',
+    'border': 'warning',
+    'baseStation': 'info'
+  }
+  return typeMap[type] || 'default'
+}
+
+// 搜索
+const handleSearch = () => {
+  fetchData()
+}
+
+// 重置搜索
+const resetSearch = () => {
+  searchForm.value = {
+    behaviorType: '',
+    timeRange: null
+  }
+  fetchData()
+}
+
+// 获取数据
+const fetchData = () => {
+  loading.value = true
+
+  // 模拟API请求延迟
+  setTimeout(() => {
+    // 模拟数据
+    const mockData = [
+      {
+        id: 1,
+        behaviorType: 'baseStation',
+        behaviorTypeName: '基站认证',
+        description: '2025-5-22 14:30:20出现在南宁市青秀区云网网咖',
+        location: '广西壮族自治区南宁市青秀区',
+        time: '2025-05-22 14:30:20'
+      }
+    ]
+
+    // 根据搜索条件过滤数据
+    let filteredData = [...mockData]
+    if (searchForm.value.behaviorType) {
+      filteredData = filteredData.filter(item => item.behaviorType === searchForm.value.behaviorType)
+    }
+
+    if (searchForm.value.timeRange && searchForm.value.timeRange.length === 2) {
+      const [startTime, endTime] = searchForm.value.timeRange
+      filteredData = filteredData.filter(item => {
+        const itemTime = new Date(item.time)
+        return itemTime >= new Date(startTime) && itemTime <= new Date(endTime)
+      })
+    }
+
+    behaviorList.value = filteredData
+
+    loading.value = false
+  }, 500)
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+  fetchData()
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 20px;
+width: 100%;
+  background-color: #f5f7fa;
+}
+
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 20px 0;
+  padding-bottom: 15px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+}
+
+h3 {
+  margin: 0;
+}
+
+.search-container {
+  background-color: #fff;
+  padding: 16px;
+  border-radius: 6px;
+  margin-bottom: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+
+}
+
+.demo-form-inline {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 16px;
+}
+
+.list-container {
+    background-color: #fff;
+    padding: 16px;
+    border-radius: 6px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  }
+
+  .behavior-list {
+    max-height: 600px;
+    overflow: hidden; /* 完全禁止滚动条 */
+    position: relative;
+  }
+
+  .behavior-list-inner {
+    max-height: 600px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-right: 10px; /* 为滚动条留出空间但不显示 */
+  }
+
+  .behavior-item {
+    padding: 16px;
+    border-bottom: 1px solid #f0f0f0;
+    transition: all 0.3s ease;
+    position: relative;
+    left: 0; /* 初始位置 */
+  }
+
+  .behavior-item:hover {
+    background-color: #fafafa;
+    left: 5px; /* 使用left属性代替transform，避免触发滚动条 */
+  }
+
+  .behavior-item:last-child {
+    border-bottom: none;
+  }
+
+  .behavior-item-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 12px;
+  }
+
+  .behavior-index {
+    font-weight: 600;
+    color: #606266;
+    margin-right: 12px;
+    min-width: 20px;
+  }
+
+  .behavior-time {
+    margin-left: auto;
+    color: #909399;
+    font-size: 13px;
+  }
+
+  .behavior-item-content {
+    padding-left: 32px;
+  }
+
+  .behavior-description {
+    margin: 0 0 8px 0;
+    color: #303133;
+    line-height: 1.5;
+  }
+
+  .behavior-location {
+    margin: 0;
+    color: #606266;
+    font-size: 13px;
+    line-height: 1.5;
+  }
+
+  .empty-state {
+    padding: 60px 0;
+    text-align: center;
+  }
+
+::v-deep .el-tag {
+  margin-right: 0;
+}
+
+::v-deep .el-date-editor .el-range-separator {
+  color: #606266;
+}
+
+@media (max-width: 768px) {
+  .backinfo-container {
+    padding: 10px;
+  }
+
+  .demo-form-inline {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .demo-form-inline .el-form-item {
+    margin-bottom: 10px;
+  }
+
+  .pagination-container {
+    justify-content: center;
+  }
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/caseInfo.vue

@@ -0,0 +1,263 @@
+<template>
+  <div>
+    <div class="headClass" style="">
+      <h3>案件信息</h3>
+      <el-button @click="AddPore" type="primary" v-if="showBut">新增</el-button>
+    </div>
+
+    <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="danger" @click="delDictItem(row.id)">删除</el-link>
+        <el-link type="danger" @click="updDictItem(row)">修改</el-link>
+      </template>
+    </MyTable>
+  </div>
+  <CaseLodig v-model="chooseMarksVisible" @comfirm="addMarks" :data="dataModel" />
+</template>
+
+<script setup>
+import { identityCardRule } from "@/utils/rules"
+import { ref, reactive, watch, toRaw, getCurrentInstance, onMounted, onUnmounted } from "vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import CaseLodig from "../component/caseLodig.vue";
+import { tbGsxtZdryAjxxSaveOrUpdateAjxx, tbGsxtZdryAjxx, tbGsxtZdryAjxxselectAjxx } from '@/api/zdr.js'
+import { ElMessage, ElMessageBox } from "element-plus";
+const { proxy } = getCurrentInstance();
+const { D_BZ_CLLX, D_BZ_CLYS, D_BZ_CLPP } = proxy.$dict("D_BZ_CLLX", "D_BZ_CLYS", "D_BZ_CLPP"); //获取字典数据
+const chooseMarksVisible = ref(false)
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const listData = ref({})
+const addUpd = ref(true)
+watch(() => props.dataList, (val) => {
+  if (val) {
+    listData.value = val
+    gettbZdryClxxSelectPage()
+  }
+}, { deep: true })
+// 表格数据
+const pageData = reactive({
+  tableData: [],
+  tableColumn: [{
+    prop: 'ajbm',
+    label: '案件编号',
+  }, {
+    prop: 'ajmc',
+    label: '案件名称',
+  }, {
+    prop: 'sasj',
+    label: '受案时间',
+  },],
+  tableHeight: '200px',
+  keyCount: 0,
+  tableConfiger: {
+    border: true,
+    stripe: true,
+    showHeader: true,
+    showIndex: true,
+    indexLabel: '序号',
+    indexWidth: 60,
+    align: 'center',
+    showOverflowTooltip: true,
+    haveControls: !props.disabled
+  },
+  controlsWidth: 200,
+})
+// 修改数据接口
+const dataModel = ref()
+const addMarks = (val) => {
+  const params = {
+    ...val,
+    zdryId: listData.value.id,
+  }
+  tbGsxtZdryAjxxSaveOrUpdateAjxx(params).then(res => {
+    gettbZdryClxxSelectPage()
+    proxy.$message({
+      message: '案件信息操作成功',
+      type: 'success'
+    })
+  })
+
+}
+onMounted(() => {
+})
+// 删除车辆
+const delDictItem = (val) => {
+  if (!props.disabled && props.showBut) {
+    ElMessageBox.confirm(
+      '是否删除案件信息',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    )
+      .then(() => {
+        tbGsxtZdryAjxx(val).then(res => {
+          gettbZdryClxxSelectPage()
+          proxy.$message({
+            message: '案件信息删除成功',
+            type: 'success'
+          })
+        })
+      })
+      .catch(() => {
+        ElMessage({
+          type: 'info',
+          message: '取消删除',
+        })
+      })
+  } else {
+    pageData.tableData = pageData.tableData.filter(v => v.id != val)
+  }
+
+}
+
+const updDictItem = (val) => {
+  chooseMarksVisible.value = true
+  addUpd.value = false
+  dataModel.value = val
+}
+const AddPore = () => {
+  chooseMarksVisible.value = true
+  dataModel.value = {}
+  addUpd.value = true
+}
+// 查询车辆
+const gettbZdryClxxSelectPage = () => {
+  const promes = {
+    zdrid: listData.value.id
+  }
+  tbGsxtZdryAjxxselectAjxx(promes).then(res => {
+    pageData.tableData = res
+  })
+}
+// 抛出数据并验证标签列表不为空
+const throwData = () => {
+  return new Promise((resolve) => {
+    // // 验证：确保标签列表不为空
+    // if (!pageData.tableData || pageData.tableData.length === 0) {
+    //   throw new Error('请录入车辆信息');
+    // }
+    resolve(pageData.tableData);
+  });
+}
+defineExpose({
+  throwData
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 10px;
+}
+
+::v-deep(.el-form) {
+  display: flex;
+  justify-content: space-between;
+}
+
+.left_box {
+  width: 200px;
+  border: 1px solid #c8c8c89a;
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.right_box {
+  width: calc(100% - 230px);
+  overflow-y: auto;
+  padding: 5px;
+}
+
+::v-deep .el-form-item__content {
+  display: block !important;
+}
+
+.headClass {
+  font-size: 18px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-weight: 600;
+  color: #303133;
+  margin: 20px 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+
+}
+
+.headSelect {
+  width: 100%;
+  padding: 0 16px;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  justify-content: end;
+  padding-bottom: 20px;
+}
+
+/* 移除冲突样式：不要用 justify-content */
+
+/* 控制所有 el-form-item 高度和垂直居中 */
+.form-inline :deep(.el-form-item) {
+  margin-bottom: 0;
+  height: 60px;
+  display: flex;
+  align-items: center;
+}
+
+/* ✅ 按钮区域靠右，且不换行 */
+.form-inline .form-actions {
+  margin-left: auto;
+  /* 推到最右边 */
+  white-space: nowrap;
+  /* 防止按钮换行 */
+}
+
+/* 统一按钮样式，增加间距和视觉舒适度 */
+.form-inline :deep(.el-button) {
+  height: 36px;
+  padding: 8px 16px;
+  font-size: 14px;
+  border-radius: 4px;
+}
+
+/* 按钮之间留出间距（除了第一个） */
+.form-inline :deep(.el-button:not(:first-child)) {
+  margin-left: 12px;
+  /* 比原来的 8px 更宽松 */
+}
+
+// .headClass::after {
+//   content: '';
+//   position: absolute;
+//   left: 0;
+//   bottom: -2px;
+//   width: 60px;
+//   height: 2px;
+//   background-color: #409eff;
+// }
+
+h3 {
+  margin: 0;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/contact.vue

@@ -0,0 +1,305 @@
+<template>
+  <div>
+    <div class="headClass" style="">
+      <h3>密切联系人</h3>
+      <el-button type="primary" @click="openDialog('新增密切联系人', {}, true)" v-if="showBut">新增</el-button>
+    </div>
+    <div class="headSelect">
+      <el-form :model="formData" :inline="true" ref="formRef" :rules="rulesForm" class="form-inline">
+        <el-form-item label="身份证号码">
+          <el-input v-model="formData.rySfzh" placeholder="请输入身份证号码" />
+        </el-form-item>
+        <!-- 按钮组：统一放在一个 item 中 -->
+        <el-form-item class="form-actions">
+          <el-button type="primary" @click="check">查询</el-button>
+          <el-button @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+      :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+      <template #dygx="{ row }">
+        <DictTag :tag="false" :value="row.dygx" :options="D_BZ_QSGXDM" />
+      </template>
+      <!-- 操作 -->
+      <template #controls="{ row }">
+        <el-link type="danger" @click="delDictItem(row.id)">删除</el-link>
+        <el-link type="danger" @click="openDialog('修改密切联系人', row, false)">修改</el-link>
+      </template>
+    </MyTable>
+    <diaLogForm v-model="dialogVisible" :data="diaLogRuleForm" @submit="addPersonOrModifica" :title="Tips"
+      :dict="{ D_BZ_QSGXDM }">
+    </diaLogForm>
+  </div>
+</template>
+<script setup>
+import { identityCardRule } from "@/utils/rules"
+import { ref, reactive, watch, toRaw, getCurrentInstance, onMounted, onUnmounted } from "vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import diaLogForm from "../component/diaLogForm.vue";
+import { tbZdryClxxUpdate, tbGsxtZdryLxrsaveOrUpdateLxr,tbGsxtZdryLxrselectLxrBy ,tbGsxtZdryLxr} from '@/api/zdr.js'
+import { ElMessage, ElMessageBox } from "element-plus";
+const { proxy } = getCurrentInstance();
+const { D_BZ_QSGXDM } = proxy.$dict("D_BZ_QSGXDM"); //获取字典数据
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const dialogVisible = ref(false)
+const listData = ref({})
+const Tips = ref("密切联系人")
+// 表格数据
+const pageData = reactive({
+  tableData: [],
+  tableColumn: [{
+    prop: 'ryXm',
+    label: '人员姓名',
+  }, {
+    prop: 'rySfzh',
+    label: '身份证号码',
+  }, {
+    prop: 'dygx',
+    label: '关系',
+    showSolt: true,
+  }, {
+    prop: 'lxrDh',
+    label: '联系电话',
+  }],
+  tableHeight: '200px',
+  keyCount: 0,
+  tableConfiger: {
+    border: true,
+    stripe: true,
+    showHeader: true,
+    showIndex: true,
+    indexLabel: '序号',
+    indexWidth: 60,
+    align: 'center',
+    showOverflowTooltip: true,
+    haveControls: !props.disabled
+  },
+  controlsWidth: 200,
+})
+//  表单数据
+const formData = ref({
+  username: "",
+  ID: ""
+})
+const touchIn = ref(true)
+const rulesForm = ref(identityCardRule({ validator: true }, 'rySfzh'))
+const diaLogRuleForm = ref({})
+watch(() => props.dataList, (val) => {
+  if (val) {
+    listData.value = val
+    getContact()
+  }
+}, { deep: true })
+// 弹出增加或者修改弹窗
+const openDialog = (type, formVal, bool) => {
+  touchIn.value = bool
+  dialogVisible.value = true
+  Tips.value = type
+  diaLogRuleForm.value = { ...formVal }
+}
+// 提交表单
+const addPersonOrModifica = (val) => {
+  if (touchIn.value) {
+    const item = pageData.tableData.findIndex(item => item.rySfzh == val.rySfzh)
+    if (item != -1) {
+      proxy.$message({
+        message: '该人员已存在',
+        type: 'warning'
+      })
+      return
+    }
+  }
+  const promes = {
+    ...val,
+    zdryId: listData.value.id
+  }
+  tbGsxtZdryLxrsaveOrUpdateLxr(promes).then((res) => {
+    proxy.$message({
+      message: '操作成功',
+      type: 'success'
+    })
+    getContact()
+  }).catch((err) => {
+    proxy.$message({
+      message: '操作失败',
+      type: 'error'
+    })
+  });
+}
+const delDictItem = (val) => {
+  ElMessageBox.confirm(
+    '是否删除该联系人',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+
+      tbGsxtZdryLxr(val).then((res) => {
+        proxy.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        getContact()
+      }).catch((err) => {
+
+      });
+    })
+    .catch(() => {
+      proxy.$message({
+        message: '删除失败',
+        type: 'info',
+      })
+    })
+}
+const getContact = () => {
+  const promes = { zdryId: listData.value.id }
+  tbGsxtZdryLxrselectLxrBy(promes).then((res) => {
+    pageData.tableData = res
+  })
+}
+const resetForm = () => {
+  formData.value = {}
+  getContact()
+}
+const check = () => {
+  if (formData.value.rySfzh) {
+    // 模糊查询：检查身份证号码是否包含输入的内容
+    pageData.tableData = pageData.tableData.filter(item => item.rySfzh && item.rySfzh.includes(formData.value.rySfzh))
+  } else {
+    // 如果输入为空，显示所有数据
+    getContact()
+  }
+}
+
+// 抛出数据并验证标签列表不为空
+const throwData = () => {
+  return new Promise((resolve) => {
+    // // 验证：确保标签列表不为空
+    // if (!pageData.tableData || pageData.tableData.length === 0) {
+    //   throw new Error('请录入车辆信息');
+    // }
+    resolve(pageData.tableData);
+  });
+}
+defineExpose({
+  throwData
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 10px;
+}
+
+
+
+.left_box {
+  width: 200px;
+  border: 1px solid #c8c8c89a;
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.right_box {
+  width: calc(100% - 230px);
+  overflow-y: auto;
+  padding: 5px;
+}
+
+::v-deep .el-form-item__content {
+  display: block !important;
+}
+
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.headSelect {
+  width: 100%;
+  padding: 0 16px;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
+
+  ::v-deep(.el-form) {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  /* 移除冲突样式：不要用 justify-content */
+
+  /* 控制所有 el-form-item 高度和垂直居中 */
+  .form-inline :deep(.el-form-item) {
+    margin-bottom: 0;
+    height: 60px;
+    display: flex;
+    align-items: center;
+  }
+
+  /* ✅ 按钮区域靠右，且不换行 */
+  .form-inline .form-actions {
+    margin-left: auto;
+    /* 推到最右边 */
+    white-space: nowrap;
+    /* 防止按钮换行 */
+  }
+
+  /* 统一按钮样式，增加间距和视觉舒适度 */
+  .form-inline :deep(.el-button) {
+    height: 36px;
+    padding: 8px 16px;
+    font-size: 14px;
+    border-radius: 4px;
+  }
+
+  /* 按钮之间留出间距（除了第一个） */
+  .form-inline :deep(.el-button:not(:first-child)) {
+    margin-left: 12px;
+    /* 比原来的 8px 更宽松 */
+  }
+}
+
+
+
+// .headClass::after {
+//   content: '';
+//   position: absolute;
+//   left: 0;
+//   bottom: -2px;
+//   width: 60px;
+//   height: 2px;
+//   background-color: #409eff;
+// }
+
+h3 {
+  margin: 0;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/czModel.vue

@@ -0,0 +1,222 @@
+<template>
+  <div class="backinfo-container">
+    <div class="headClass">
+      <h3>操作日志</h3>
+    </div>
+    <!-- 列表区域 -->
+    <div class="list-container">
+      <div v-loading="loading" class="behavior-list">
+          <div class="behavior-list-inner">
+            <div
+              v-for="(item, index) in behaviorList"
+              :key="item.id"
+              class="behavior-item"
+            >
+              <div class="behavior-item-header">
+                <span class="behavior-index">{{ index + 1 }}.</span>
+                <el-tag :type="getTagType(item.behaviorType)">{{ item.zhmc }}</el-tag>
+                <span class="behavior-time">{{ item.czsj }}</span>
+              </div>
+              <div class="behavior-item-content">
+                <p class="behavior-description">{{ item.czjl }}</p>
+                <p class="behavior-location"><i class="el-icon-location-outline"></i> {{ item.bz }}</p>
+              </div>
+            </div>
+            <div v-if="!loading && behaviorList.length === 0" class="empty-state">
+              <el-empty description="暂无操作记录" />
+            </div>
+          </div>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, getCurrentInstance, onMounted,watch } from 'vue'
+import GdMap from "@/components/GdMap/index.vue";
+import {tbGsxtZdryCzrzSelectCzrz} from '@/api/zdr'
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const listData = ref({})
+watch(() => props.dataList, (val) => {
+  if (val) {
+    listData.value = val
+    fetchData()
+  }
+}, { deep: true })
+// 列表数据
+const behaviorList = ref([])
+const loading = ref(false)
+
+// 获取数据
+const fetchData = () => {
+  loading.value = true
+  tbGsxtZdryCzrzSelectCzrz({ zdrid: listData.value.id }).then(res => {
+    behaviorList.value = res
+  }).finally(() => {
+    loading.value = false
+  })
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding-top: 20px;
+width: 100%;
+  background-color: #f5f7fa;
+}
+
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 20px 0;
+  padding-bottom: 15px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+}
+
+h3 {
+  margin: 0;
+}
+
+.search-container {
+  background-color: #fff;
+  padding: 16px;
+  border-radius: 6px;
+  margin-bottom: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+
+}
+
+.demo-form-inline {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 16px;
+}
+
+.list-container {
+    background-color: #fff;
+    padding: 16px;
+    border-radius: 6px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  }
+
+  .behavior-list {
+    max-height: 600px;
+    overflow: hidden; /* 完全禁止滚动条 */
+    position: relative;
+  }
+
+  .behavior-list-inner {
+    max-height: 600px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-right: 10px; /* 为滚动条留出空间但不显示 */
+  }
+
+  .behavior-item {
+    padding: 16px;
+    border-bottom: 1px solid #f0f0f0;
+    transition: all 0.3s ease;
+    position: relative;
+    left: 0; /* 初始位置 */
+  }
+
+  .behavior-item:hover {
+    background-color: #fafafa;
+    left: 5px; /* 使用left属性代替transform，避免触发滚动条 */
+  }
+
+  .behavior-item:last-child {
+    border-bottom: none;
+  }
+
+  .behavior-item-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 12px;
+  }
+
+  .behavior-index {
+    font-weight: 600;
+    color: #606266;
+    margin-right: 12px;
+    min-width: 20px;
+  }
+
+  .behavior-time {
+    margin-left: auto;
+    color: #909399;
+    font-size: 13px;
+  }
+
+  .behavior-item-content {
+    padding-left: 32px;
+  }
+
+  .behavior-description {
+    margin: 0 0 8px 0;
+    color: #303133;
+    line-height: 1.5;
+  }
+
+  .behavior-location {
+    margin: 0;
+    color: #606266;
+    font-size: 13px;
+    line-height: 1.5;
+  }
+
+  .empty-state {
+    padding: 60px 0;
+    text-align: center;
+  }
+
+::v-deep .el-tag {
+  margin-right: 0;
+}
+
+::v-deep .el-date-editor .el-range-separator {
+  color: #606266;
+}
+
+@media (max-width: 768px) {
+  .backinfo-container {
+    padding: 10px;
+  }
+
+  .demo-form-inline {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .demo-form-inline .el-form-item {
+    margin-bottom: 10px;
+  }
+
+  .pagination-container {
+    justify-content: center;
+  }
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/deployment.vue

@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <div class="headClass" style="">
+      <h3>全要素布控</h3>
+
+    </div>
+    <div class="marginBox">
+      <div>身份证号码：{{ listData.rySfzh }} <span>({{ listData.zdrBkZt ? '已布控' : '未布控' }})</span></div>
+      <div v-if="listData.ryLxdh&&listData.ryLxdh.length>0"> 手机号码：
+        <span style="color: #000;" v-for="(item, index) in listData.ryLxdh" :key="index">{{ item }}
+          <span v-if="index != listData.ryLxdh.length - 1">、</span>
+        </span>
+        <div> {{ listData.ryLxdh?.[1] }}<span>({{ listData.zdrBkZt ? '已布控' : '未布控' }})</span></div>
+      </div>
+      <div v-if="listData.clxxList">车牌号码：
+        <span style="color: #000;" v-for="(item, index) in listData.clxxList" :key="index">{{ item.cph }}
+          <span v-if="index != listData.clxxList.length - 1">、</span>
+        </span>
+        <span>({{ listData.zdrBkZt ? '已布控' : '未布控' }})</span>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from 'vue';
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const status = ref(false)
+const listData = ref({})
+watch(() => props.dataList, (val) => {
+  if (val) {
+    listData.value = val
+
+  }
+}, { deep: true })
+onMounted(() => {
+  console.log('Deployment 组件已挂载！')
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 10px 0;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.marginBox {
+  span {
+    margin-left: 10px;
+    color: #ff4040;
+  }
+
+  &>:nth-child(1) {
+    // width: 300px;
+    height: 30px;
+
+    display: flex;
+    align-items: center;
+  }
+
+  &>:nth-child(2) {
+    // width: 400px;
+    height: 30px;
+
+    display: flex;
+    align-items: center;
+    // justify-content: space-between;
+  }
+
+  &>:nth-child(3) {
+    // width: 210px;
+    height: 30px;
+
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/dynamicTrajectory.vue

@@ -0,0 +1,106 @@
+<template>
+  <div>
+    <div class="headClass" style="">
+      <h3>动态轨迹</h3>
+    </div>
+    <div class="headSelect">
+      <el-select v-model="listData.zjlx" placeholder="身份证号码" style="width: 240px">
+        <el-option v-for="item in D_BZ_ZJLX" :key="item.dm" :label="item.zdmc" :value="item.dm" />
+      </el-select>
+      <el-input v-model="listData.msg" placeholder="请输入证件号码" style="width: 300px" />
+      <div class="demo-datetime-picker">
+        <div class="block">
+          <el-date-picker v-model="listData.time" type="datetimerange" start-placeholder="开始时间"
+            end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd"/>
+        </div>
+      </div>
+      <el-button type="primary" @click="check">查询</el-button>
+      <el-button @click="resetForm">重置</el-button>
+    </div>
+    <div class="mapBox">
+      <GdMap />
+    </div>
+
+  </div>
+
+</template>
+
+<script setup>
+import { ref, getCurrentInstance } from 'vue'
+import GdMap from "@/components/GdMap/index.vue";
+// import
+const { proxy } = getCurrentInstance();
+const { D_BZ_ZJLX } = proxy.$dict("D_BZ_ZJLX")
+const listData= ref({})
+const check = () => { }
+const resetForm = () => {
+  listData.value = {}
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 10px;
+}
+
+::v-deep(.el-form) {
+  display: flex;
+  justify-content: space-between;
+}
+
+.left_box {
+  width: 200px;
+  border: 1px solid #c8c8c89a;
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.right_box {
+  width: calc(100% - 230px);
+  overflow-y: auto;
+  padding: 5px;
+}
+
+::v-deep .el-form-item__content {
+  display: block !important;
+}
+::v-deep .el-range-input{
+  color: #000 !important;
+}
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+
+}
+
+.headSelect {
+  width: 100%;
+  margin: 20px 0;
+  padding: 0 16px;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+
+}
+
+.mapBox {
+  width: 100%;
+  height: 300px;
+  position: relative;
+  background-color: rgba(0, 123, 255, 0.5);
+}
+
+h3 {
+  margin: 0;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/info.vue

@@ -0,0 +1,346 @@
+<template>
+  <div>
+    <div class="headClass">
+      <h3>人员信息</h3>
+      <!-- @click="gettbGsxtZdqtUpdate" -->
+      <el-button type="primary" v-if="showBut" :disabled="disabled" @click="submit">保存</el-button>
+    </div>
+    <div>
+      <FormMessage :disabled="disabled" v-model="listQuery" :formList="formData" labelWidth="100px" ref="elform"
+        :rules="rules">
+        <template #ryzp>
+          <div style="width: 100%; padding-left: 50px">
+            <MOSTY.Upload :showBtn="false" :limit="1" v-model="listQuery.ryzp" />
+          </div>
+        </template>
+        <template #ryLxdh>
+          <div class="phone-input-container">
+            <div class="inputGroup" v-for="(item, index) in listQuery.ryLxdh" :key="index">
+              <el-input v-model="listQuery.ryLxdh[index]" class="group" placeholder="请输入电话号码" />
+              <div class="flex align-center but" v-if="showBut">
+                <el-button type="primary" :icon="Plus" circle @click="addPhone" title="添加电话号码"
+                  v-if="listQuery.ryLxdh.length - 1 == index" />
+                <el-button type="success" :icon="Minus" circle @click="removePhone(index)" title="删除电话号码" />
+              </div>
+            </div>
+          </div>
+        </template>
+
+      </FormMessage>
+    </div>
+  </div>
+  <!-- <ChooseMarks v-model="chooseMarksVisible" @choosed="choosed" :roleIds="roleIds" /> -->
+</template>
+
+<script setup>
+import * as rule from "@/utils/rules.js";
+import * as MOSTY from "@/components/MyComponents/index";
+import { Plus, Minus } from "@element-plus/icons-vue";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import ChooseMarks from "@/components/ChooseList/ChooseMarks/index.vue";
+import { ref, reactive, onMounted, getCurrentInstance, watch } from "vue";
+import { tbGsxtZdryUpdate } from "@/api/zdr.js";
+const { proxy } = getCurrentInstance();
+const { D_BZ_XB, D_BZ_ZZMM, D_BZ_HYZK, D_BZ_MZ, D_BZ_XZQHDM, D_ZDRY_RYLX, D_BZ_RCBKZT, D_GS_ZDR_RYJB, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_ZDR_CZZT, D_BZ_WHCD, D_ZDRY_ZYLB } =
+  proxy.$dict('D_BZ_XB', 'D_BZ_ZZMM', 'D_BZ_HYZK', 'D_BZ_MZ', "D_ZDRY_RYLX", 'D_BZ_XZQHDM', 'D_BZ_RCBKZT', 'D_GS_ZDR_RYJB', 'D_GS_ZDR_YJDJ', 'D_GS_BK_SSJZ', 'D_GS_ZDR_CZZT', 'D_BZ_WHCD', 'D_ZDRY_ZYLB')
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const rules = reactive({
+  ryXm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+  ...rule.identityCardRule({ validator: true }, 'rySfzh'), //身份证校验
+  ...rule.phoneRule({ validator: true }, "ryLxdh"), // 是否必填 是否进行校验,
+  rySfzh: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
+  ryLxdh: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+  ryXb: [{ required: true, message: "请选择性别", trigger: "change" }],
+  zyBm: [{ required: true, message: "请选择职业", trigger: "change" }],
+  ryMz: [{ required: true, message: "请选择民族", trigger: "change" }],
+  ryCsrq: [{ required: true, message: "请选择出生日期", trigger: "change" }],
+  ryJg: [{ required: true, message: "请选择籍贯", trigger: "change" }],
+  zdrRyjb: [{ required: true, message: "请选择人员级别", trigger: "change" }],
+  zdrYjdj: [{ required: true, message: "请选择预警等级", trigger: "change" }],
+  // rylx: [{ required: true, message: "请选择人员类型", trigger: "change" }]
+});
+const listQuery = ref({ ryLxdh: [""] }); //表单
+const chooseMarksVisible = ref(false); // 控制标签选择弹窗显示
+const roleIds = ref([]); // 已选择的标签ID
+const formData = ref([
+  { label: "人员照片", prop: "ryzp", type: "slot", width: "100%" },
+  { label: "姓名", prop: "ryXm", type: "input" },
+  { label: "性别", prop: "ryXb", type: "select", options: D_BZ_XB },
+  { label: "身份证号", prop: "rySfzh", type: "input" },
+  { label: "籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM },
+  { label: "曾用名", prop: "cym", type: "input" },
+  { label: "文化程度", prop: "whcdBm", type: "select", options: D_BZ_WHCD },
+  { label: "民族", prop: "ryMz", type: "select", options: D_BZ_MZ },
+  { label: "政治面貌", prop: "zzmm", type: "select", options: D_BZ_ZZMM },
+  { label: "职业", prop: "zyBm", type: "select", options: D_ZDRY_ZYLB },
+  { label: "人员级别", prop: "zdrRyjb", type: "select", options: D_GS_ZDR_RYJB },
+  { label: "预警等级", prop: "zdrYjdj", type: "select", options: D_GS_ZDR_YJDJ },
+  { label: "出生日期", prop: "ryCsrq", type: "date" },
+  { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
+  { label: "户籍地详址", prop: "hjdXz", type: "input" },
+  { label: "户籍地派出所", prop: "hjdPcsdm",depMc:"hjdPcsmc" ,type: "department" },
+  { label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM },
+  { label: "现住地详址", prop: "xzdXz", type: "input" },
+  { label: "现住地派出所", prop: "xzdPcsdm",depMc:"xzdPcsmc" ,type: "department" },
+  { label: "管辖单位", prop: "gxSsbmdm", depMc: 'gxSsbmmc', type: "department" },
+  { label: "诉求单位", prop: "sqSsbmdm", depMc: 'sqSsbmmc', type: "department" },
+  { label: "责任单位", prop: "zrSsbmdm", depMc: 'zrSsbmmc', type: "department" },
+  { label: "所属警种", prop: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ },
+  { label: "涉及警种", prop: "zdrSjjz", type: "select", options: D_GS_BK_SSJZ, multiple: true },
+  { label: "婚姻状态", prop: "hyzk", type: "select", options: D_BZ_HYZK },
+  // { label: "处置状态", prop: "zdrCzzt", type: "select", options: D_GS_ZDR_CZZT },
+  // { label: "布控状态", prop: "zdrBkZt", type: "select", options: D_BZ_RCBKZT },
+  // { label: "人员类型", prop: "rylx", type: "select", options: D_ZDRY_RYLX },
+  { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
+  { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
+  { label: "Mac地址", prop: "macDz", type: "input" },
+  { label: "联系电话", prop: "ryLxdh", type: "slot", width: "100%" },
+  // { label: "标签选择", prop: "tags", type: "slot", width: "100%" },
+  { label: "管控原因", prop: "zdrLkyy", type: "textarea", width: "100%" },
+]);
+const loading = ref(false);
+const elform = ref();
+const disabled = ref(false);
+// phoneList已重构为listQuery.value.ryLxdh
+// 创建一个工具函数进行深拷贝
+const deepClone = (obj) => {
+  if (obj === null || typeof obj !== 'object') {
+    return obj;
+  }
+  if (obj instanceof Date) {
+    return new Date(obj.getTime());
+  }
+  if (obj instanceof Array) {
+    return obj.map(item => deepClone(item));
+  }
+  const clonedObj = {};
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      clonedObj[key] = deepClone(obj[key]);
+    }
+  }
+  return clonedObj;
+};
+// 监听props.dataList变化，处理初始化数据
+watch(() => props.dataList, (val) => {
+  if (val) {
+    // 使用深拷贝避免直接引用同一个对象
+    listQuery.value = deepClone(val);
+    // 处理照片数据
+    listQuery.value.ryzp = val.ryzp == null || val.ryzp == '' ? [] : [val.ryzp];
+    listQuery.value.zdrSjjz = val.zdrSjjz == null || val.zdrSjjz == '' ? [] : JSON.parse(val.zdrSjjz);
+    // 处理标签ID数据，确保数据回显
+    if (val.tagIds && Array.isArray(val.tagIds) && val.tagIds.length > 0) {
+      roleIds.value = [...val.tagIds];
+    } else if (val.bqIds && Array.isArray(val.bqIds) && val.bqIds.length > 0) {
+      roleIds.value = [...val.bqIds];
+    } else {
+      roleIds.value = [];
+    }
+  }
+}, { deep: true })
+// 提交
+const submit = () => {
+  loading.value = true
+  gettbGsxtZdryUpdate()
+};
+//
+const gettbGsxtZdryUpdate = () => {
+
+
+
+
+  const promes = {
+    ...listQuery.value,
+    ryzp: listQuery.value.ryzp.length > 0 ? listQuery.value.ryzp.toString() : "",
+    ryLxdh: listQuery.value.ryLxdh,
+    zdrSjjz: JSON.stringify(listQuery.value.zdrSjjz),
+
+  }
+  elform.value.submit((data) => {
+    tbGsxtZdryUpdate(promes).then((res) => {
+    listQuery.value.ryzp = []
+    proxy.$message({
+      message: '更新成功',
+      type: 'success',
+    })
+  }).catch((err) => {
+
+  }).finally(() => {
+    loading.value = false
+  });
+})
+
+
+
+}
+// 添加电话号码
+const addPhone = () => {
+  // 确保新添加的电话号码与现有数据结构一致
+  // 创建深拷贝以避免响应式更新问题
+  const newPhoneList = [...listQuery.value.ryLxdh];
+  newPhoneList.push('');
+  // 用全新数组替换现有数组，确保Vue正确检测到变化
+  listQuery.value.ryLxdh = newPhoneList;
+}
+
+// 删除电话号码
+const removePhone = (index) => {
+  if (listQuery.value.ryLxdh.length > 1) {
+    listQuery.value.ryLxdh.splice(index, 1);
+  } else {
+    // 清空输入但保留输入框
+    listQuery.value.ryLxdh[0] = '';
+    proxy.$message.warning('至少保留一个联系电话');
+  }
+}
+
+const throwData = () => {
+  return new Promise((resolve, reject) => {
+    if (elform.value && elform.value.validate) {
+      elform.value.submit((data) => {
+        // 过滤掉空的电话号码
+        const validPhones = listQuery.value.ryLxdh.filter(phone => phone && phone.trim());
+        if (validPhones.length === 0) {
+          proxy.$message.warning('请至少输入一个有效的联系电话');
+          reject(new Error('请至少输入一个有效的联系电话'));
+          return;
+        }
+        resolve({
+          ...listQuery.value,
+          ryzp: listQuery.value.ryzp && listQuery.value.ryzp.length > 0 ? listQuery.value.ryzp.toString() : '',
+          ryLxdh: validPhones,
+          zdrSjjz: JSON.stringify(listQuery.value.zdrSjjz),
+        });
+      })
+    } else {
+      elform.value.submit((data) => {
+        // 如果没有验证方法，直接返回数据
+        const validPhones = listQuery.value.ryLxdh.filter(phone => phone && phone.trim());
+        if (validPhones.length === 0) {
+          proxy.$message.warning('请至少输入一个有效的联系电话');
+          reject(new Error('请至少输入一个有效的联系电话'));
+          return;
+        }
+        resolve({
+          ...listQuery.value,
+          ryzp: listQuery.value.ryzp && listQuery.value.ryzp.length > 0 ? listQuery.value.ryzp.toString() : '',
+          ryLxdh: validPhones,
+          zdrSjjz: JSON.stringify(listQuery.value.zdrSjjz),
+        });
+
+      })
+
+    }
+  });
+};
+
+defineExpose({
+  throwData,
+});
+
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.left_box {
+  width: 200px;
+  border: 1px solid #c8c8c89a;
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.right_box {
+  width: calc(100% - 230px);
+  overflow-y: auto;
+  padding: 5px;
+}
+
+::v-deep .el-form-item__content {
+  display: block !important;
+  width: 100%;
+  padding: 0 !important;
+}
+
+::v-deep .form-item-box {
+  width: 100% !important;
+}
+
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.headClass::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -2px;
+  width: 60px;
+  height: 2px;
+  background-color: #409eff;
+}
+
+h3 {
+  margin: 0;
+}
+
+.phone-input-container {
+  display: flex;
+  // flex-direction: column;
+  flex-wrap: wrap;
+  width: 100%;
+  padding: 0;
+}
+
+.inputGroup {
+  margin-left: 10px;
+  width: 100%;
+  max-width: 400px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+
+  .group {
+    width: 250px;
+    margin-right: 10px;
+  }
+
+  .but {
+    display: flex;
+    gap: 5px;
+  }
+}
+
+::v-deep .el-button--primary {
+  background-color: #409eff !important;
+  border-color: #409eff !important;
+}
+
+::v-deep .el-button--success {
+  background-color: #67c23a !important;
+  border-color: #67c23a !important;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/personnelTags.vue

@@ -0,0 +1,211 @@
+<template>
+  <div>
+    <div class="headClass" style="">
+      <h3>人员标签</h3>
+      <el-button type="primary" :disabled="disabled" @click="chooseMarksVisible = true">选择</el-button>
+    </div>
+    <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+      :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+      <template #bqLx="{ row }">
+        <DictTag :tag="false" :value="row.bqLx" :options="D_GS_BQ_DJ" />
+      </template>
+      <template #bqLb="{ row }">
+        <DictTag :tag="false" :value="row.bqLb" :options="D_GS_SSYJ" />
+      </template>
+      <!-- 操作 -->
+      <template #controls="{ row }">
+        <el-link type="danger" @click="delDictItem(row.bqId)">删除</el-link>
+      </template>
+    </MyTable>
+  </div>
+  <ChooseMarks v-model="chooseMarksVisible" @choosed="addMarks" :roleIds="roleIds" />
+</template>
+
+<script setup>
+import { ref, reactive, watch, toRaw, getCurrentInstance, onMounted, onUnmounted } from "vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import ChooseMarks from "@/components/ChooseList/ChooseMarks/index.vue";
+import { tbGsxtZdryUpdate } from '@/api/zdr.js'
+import { ElMessage, ElMessageBox } from "element-plus";
+const { proxy } = getCurrentInstance();
+const { D_GS_BQ_DJ, D_GS_SSYJ } = proxy.$dict("D_GS_BQ_DJ", "D_GS_SSYJ"); //获取字典数据
+const chooseMarksVisible = ref(false)
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const listData = ref({})
+watch(() => props.dataList, (val) => {
+  if (val) {
+    listData.value = val
+    pageData.tableData = val.bqList
+    roleIds.value = val.bqList.map(v => v.bqId)
+    console.log(roleIds.value);
+
+  }
+}, { deep: true })
+const roleIds = ref([])
+// 表格数据
+const pageData = reactive({
+  tableData: [],
+  tableColumn: [{
+    prop: 'bqMc',
+    label: '标签名称',
+    showOverflowTooltip: true
+  }, {
+    prop: 'bqDm',
+    label: '标签代码',
+  }, {
+    showSolt: true,
+    prop: 'bqLx',
+    label: '标签类型',
+  }, {
+    showSolt: true,
+    prop: 'bqLb',
+    label: '标签类别',
+  }],
+  tableHeight: '200px',
+  keyCount: 0,
+  tableConfiger: {
+    border: true,
+    stripe: true,
+    showHeader: true,
+    showIndex: true,
+    indexLabel: '序号',
+    indexWidth: 60,
+    align: 'center',
+    showOverflowTooltip: true,
+    haveControls: !props.disabled
+  },
+  controlsWidth: 200,
+})
+// 修改数据接口
+const zdqtUpdate = (val) => {
+  const params = {
+    id: listData.value.id,
+    bqList: pageData.tableData,
+    rySfzh: listData.value.rySfzh,
+  }
+  tbGsxtZdryUpdate(params).then(res => {
+    proxy.$message({
+      message: val,
+      type: 'success'
+    })
+  })
+}
+// 新增标签
+const addMarks = (val) => {
+  pageData.tableData = val.map(v => {
+    return { bqDm: v.bqDm, bqId: v.id, bqLb: v.bqLb, bqLx: v.bqLx, bqMc: v.bqMc }
+  });
+  roleIds.value = val.map(v => v.id)
+  if (!props.disabled && props.showBut) {
+    zdqtUpdate("标签添加成功")
+  }
+}
+// 删除标签
+const delDictItem = (val) => {
+  if (!props.disabled && props.showBut) {
+    ElMessageBox.confirm(
+    '是否删除标签',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      pageData.tableData = pageData.tableData.filter(v => v.bqId != val)
+      roleIds.value = roleIds.value.filter(v => v != val)
+        zdqtUpdate("标签删除成功")
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消删除',
+      })
+    })
+
+  } else {
+    pageData.tableData = pageData.tableData.filter(v => v.bqId != val)
+    roleIds.value = roleIds.value.filter(v => v != val)
+  }
+
+}
+// 抛出数据并验证标签列表不为空
+const throwData = () => {
+  return new Promise((resolve) => {
+    // 验证：确保标签列表不为空
+    if (!pageData.tableData || pageData.tableData.length === 0) {
+      throw new Error('请选择群体标签');
+    }
+    resolve(pageData.tableData);
+  });
+}
+defineExpose({
+  throwData
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 10px;
+}
+
+.left_box {
+  width: 200px;
+  border: 1px solid #c8c8c89a;
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.right_box {
+  width: calc(100% - 230px);
+  overflow-y: auto;
+  padding: 5px;
+}
+
+::v-deep .el-form-item__content {
+  display: block !important;
+}
+
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.headClass::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -2px;
+  width: 60px;
+  height: 2px;
+  background-color: #409eff;
+}
+
+h3 {
+  margin: 0;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/vehicle.vue

@@ -0,0 +1,248 @@
+<template>
+  <div>
+    <div class="headClass" style="">
+      <h3>关联车辆</h3>
+      <el-button type="primary" :disabled="disabled" @click="AddPore" v-if="showBut">选择</el-button>
+    </div>
+    <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+      :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+      <template #clys="{ row }">
+        <DictTag :tag="false" :value="row.clys" :options="D_BZ_CLYS" />
+      </template>
+      <template #cllx="{ row }">
+        <DictTag :tag="false" :value="row.cllx" :options="D_BZ_CLLX" />
+      </template>
+      <template #clpp="{ row }">
+        <DictTag :tag="false" :value="row.clpp" :options="D_BZ_CLPP" />
+      </template>
+      <!-- 操作 -->
+      <template #controls="{ row }">
+        <el-link type="danger" @click="delDictItem(row.id)">删除</el-link>
+        <el-link type="danger" @click="updDictItem(row)">修改</el-link>
+      </template>
+    </MyTable>
+  </div>
+  <VehiclDoing v-model="chooseMarksVisible" @comfirm="addMarks" :data="dataModel"
+    :dict="{ D_BZ_CLLX, D_BZ_CLYS, D_BZ_CLPP }" />
+</template>
+
+<script setup>
+import { ref, reactive, watch, toRaw, getCurrentInstance, onMounted, onUnmounted } from "vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import VehiclDoing from "../component/vehiclDoing.vue";
+import { tbZdryClxxAdd, tbZdryClxxDelete, tbZdryClxxSelectPage, tbZdryClxxUpdate } from '@/api/zdr.js'
+import { ElMessage, ElMessageBox } from "element-plus";
+const { proxy } = getCurrentInstance();
+const { D_BZ_CLLX, D_BZ_CLYS, D_BZ_CLPP } = proxy.$dict("D_BZ_CLLX", "D_BZ_CLYS", "D_BZ_CLPP"); //获取字典数据
+const chooseMarksVisible = ref(false)
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => { },
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const listData = ref({})
+const addUpd = ref(true)
+watch(() => props.dataList, (val) => {
+  if (val) {
+    listData.value = val
+    gettbZdryClxxSelectPage()
+  }
+}, { deep: true })
+// 表格数据
+const pageData = reactive({
+  tableData: [],
+  tableColumn: [{
+    prop: 'cph',
+    label: '车牌号',
+  }, {
+    prop: 'cllx',
+    label: '车辆类型',
+    showSolt: true,
+    prop: 'clpp',
+  }, {
+    showSolt: true,
+    prop: 'clys',
+    label: '车辆颜色',
+  }, {
+    showSolt: true,
+    prop: 'clpp',
+    label: '车辆品牌',
+
+    prop: 'clsbm',
+    label: '车辆识别码',
+  }],
+  tableHeight: '200px',
+  keyCount: 0,
+  tableConfiger: {
+    border: true,
+    stripe: true,
+    showHeader: true,
+    showIndex: true,
+    indexLabel: '序号',
+    indexWidth: 60,
+    align: 'center',
+    showOverflowTooltip: true,
+    haveControls: !props.disabled
+  },
+  controlsWidth: 200,
+})
+// 修改数据接口
+const dataModel = ref()
+const addMarks = (val) => {
+
+  const params = {
+    ...val,
+    zdrid: listData.value.id,
+  }
+  if (props.showBut && !props.disabled) {
+    if (addUpd.value) {
+      tbZdryClxxAdd(params).then(res => {
+        gettbZdryClxxSelectPage()
+        proxy.$message({
+          message: '关联车辆添加成功',
+          type: 'success'
+        })
+      })
+    }
+    else {
+      tbZdryClxxUpdate(params).then(res => {
+        gettbZdryClxxSelectPage()
+        proxy.$message({
+          message: '关联车辆修改成功',
+          type: 'success'
+        })
+      })
+    }
+  } else {
+    pageData.tableData.push(val)
+  }
+}
+// 删除车辆
+const delDictItem = (val) => {
+  if (!props.disabled && props.showBut) {
+    ElMessageBox.confirm(
+      '是否删除关联车辆',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    )
+      .then(() => {
+        tbZdryClxxDelete({ ids: [val] }).then(res => {
+          gettbZdryClxxSelectPage()
+          proxy.$message({
+            message: '关联车辆删除成功',
+            type: 'success'
+          })
+        })
+      })
+      .catch(() => {
+        ElMessage({
+          type: 'info',
+          message: '取消删除',
+        })
+      })
+  } else {
+    pageData.tableData = pageData.tableData.filter(v => v.id != val)
+  }
+
+}
+
+const updDictItem = (val) => {
+  chooseMarksVisible.value = true
+  addUpd.value = false
+  dataModel.value = val
+}
+const AddPore = () => {
+  chooseMarksVisible.value = true
+  dataModel.value = {}
+  addUpd.value = true
+}
+// 查询车辆
+const gettbZdryClxxSelectPage = () => {
+  const promes = {
+    pageCurrent: 1,
+    pageSize: 20,
+    zdrid: listData.value.id
+  }
+  tbZdryClxxSelectPage(promes).then(res => {
+    pageData.tableData = res.records
+  })
+}
+// 抛出数据并验证标签列表不为空
+const throwData = () => {
+  return new Promise((resolve) => {
+    // // 验证：确保标签列表不为空
+    // if (!pageData.tableData || pageData.tableData.length === 0) {
+    //   throw new Error('请录入车辆信息');
+    // }
+    resolve(pageData.tableData);
+  });
+}
+defineExpose({
+  throwData
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 10px;
+}
+
+.left_box {
+  width: 200px;
+  border: 1px solid #c8c8c89a;
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.right_box {
+  width: calc(100% - 230px);
+  overflow-y: auto;
+  padding: 5px;
+}
+
+::v-deep .el-form-item__content {
+  display: block !important;
+}
+
+.headClass {
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 0 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.headClass::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -2px;
+  width: 60px;
+  height: 2px;
+  background-color: #409eff;
+}
+
+h3 {
+  margin: 0;
+}
+</style>

src/views/backOfficeSystem/DeploymentDisposal/gzPeo/model/visitRecord.vue

@@ -0,0 +1,275 @@
+<template>
+  <div>
+    <div class="headClass" style="">
+      <h3>走访记录</h3>
+      <el-button @click="AddPore" type="primary" v-if="showBut">新增</el-button>
+    </div>
+    <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="danger" @click="delDictItem(row.id)">删除</el-link>
+        <el-link type="danger" @click="updDictItem(row)">修改</el-link>
+      </template>
+    </MyTable>
+  </div>
+  <InterLoding v-model="chooseMarksVisible" @comfirm="addMarks" :data="dataModel"  />
+</template>
+
+<script setup>
+import { ref, reactive, watch, toRaw, getCurrentInstance, onMounted, onUnmounted } from "vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import InterLoding from "../component/interLoding.vue";
+import { tbGsxtZdryZfjlsaveOrUpdateZfjl,tbGsxtZdryZfjlselectZfjl,tbGsxtZdryZfjl } from '@/api/zdr.js'
+import { ElMessage, ElMessageBox } from "element-plus";
+const { proxy } = getCurrentInstance();
+const chooseMarksVisible = ref(false)
+const props = defineProps({
+  dataList: {
+    type: Object,
+    default: () => {},
+  }, disabled: {
+    type: Boolean,
+    default: false
+  },
+  showBut: {
+    type: Boolean,
+    default: false
+  },
+})
+const listData = ref({})
+const addUpd = ref(true)
+watch(() => props.dataList, (val) => {
+  if (val) {
+    listData.value = {...val}
+    gettbZdryClxxSelectPage()
+  }
+}, { deep: true })
+// 表格数据
+const pageData = reactive({
+  tableData: [],
+  tableColumn: [{
+    prop: 'zfmjXm',
+    width: 150,
+    label: '走访民警',
+  }, {
+    prop: 'zffs',
+    label: '走访方式',
+  }, {
+    prop: 'zfsj',
+    label: '走访时间',
+  }, {
+    prop: 'zfdz',
+    label: '走访地址',
+  },
+  {
+    prop: 'zfqk',
+    label: '走访情况',
+  }],
+  tableHeight: '200px',
+  keyCount: 0,
+  tableConfiger: {
+    border: true,
+    stripe: true,
+    showHeader: true,
+    showIndex: true,
+    indexLabel: '序号',
+    indexWidth: 60,
+    align: 'center',
+    showOverflowTooltip: true,
+    haveControls: !props.disabled
+  },
+  controlsWidth: 200,
+})
+
+// 修改数据接口
+const dataModel = ref()
+const addMarks = (val) => {
+  const params = {
+    ...val,
+    zdryId: listData.value.id,
+  }
+    if (addUpd.value) {
+      tbGsxtZdryZfjlsaveOrUpdateZfjl(params).then(res => {
+        gettbZdryClxxSelectPage()
+        proxy.$message({
+          message: '走访记录添加成功',
+          type: 'success'
+        })
+      })
+    }
+    else {
+      tbGsxtZdryZfjlsaveOrUpdateZfjl(params).then(res => {
+        gettbZdryClxxSelectPage()
+        proxy.$message({
+          message: '走访记录修改成功',
+          type: 'success'
+        })
+      })
+    }
+}
+
+// 删除走访记录
+const delDictItem = (val) => {
+  if (!props.disabled && props.showBut) {
+    ElMessageBox.confirm(
+      '是否删除走访记录',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    )
+      .then(() => {
+        tbGsxtZdryZfjl(val).then(res => {
+          gettbZdryClxxSelectPage()
+          proxy.$message({
+            message: '走访记录删除成功',
+            type: 'success'
+          })
+        })
+      })
+      .catch(() => {
+        ElMessage({
+          type: 'info',
+          message: '取消删除',
+        })
+      })
+  } else {
+    pageData.tableData = pageData.tableData.filter(v => v.id != val)
+  }
+
+}
+
+const updDictItem = (val) => {
+  chooseMarksVisible.value = true
+  addUpd.value = false
+  dataModel.value = val
+}
+const AddPore = () => {
+  chooseMarksVisible.value = true
+  dataModel.value = {}
+  addUpd.value = true
+}
+// 查询走访记录
+const gettbZdryClxxSelectPage = () => {
+  const promes = {
+    zdrid: listData.value.id
+  }
+  tbGsxtZdryZfjlselectZfjl(promes).then(res => {
+    console.log(res, "走访记录");
+    pageData.tableData = res
+  })
+}
+// 抛出数据并验证标签列表不为空
+const throwData = () => {
+  return new Promise((resolve) => {
+    resolve(pageData.tableData);
+  });
+}
+defineExpose({
+  throwData
+})
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+.backinfo-container {
+  padding: 10px;
+}
+
+::v-deep(.el-form) {
+  display: flex;
+  justify-content: space-between;
+}
+
+.left_box {
+  width: 200px;
+  border: 1px solid #c8c8c89a;
+  border-radius: 5px;
+  padding: 5px;
+}
+
+.right_box {
+  width: calc(100% - 230px);
+  overflow-y: auto;
+  padding: 5px;
+}
+
+::v-deep .el-form-item__content {
+  display: block !important;
+}
+
+.headClass {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  margin: 20px 0 10px 0;
+  padding-bottom: 10px;
+  border-bottom: 2px solid #409eff;
+
+}
+
+.headSelect {
+  width: 100%;
+  padding: 0 16px;
+  background-color: #fff;
+  border-bottom: 1px solid #eee;
+  display: flex;
+  justify-content: end;
+  padding-bottom: 20px;
+}
+
+/* 移除冲突样式：不要用 justify-content */
+
+/* 控制所有 el-form-item 高度和垂直居中 */
+.form-inline :deep(.el-form-item) {
+  margin-bottom: 0;
+  height: 60px;
+  display: flex;
+  align-items: center;
+}
+
+/* ✅ 按钮区域靠右，且不换行 */
+.form-inline .form-actions {
+  margin-left: auto;
+  /* 推到最右边 */
+  white-space: nowrap;
+  /* 防止按钮换行 */
+}
+
+/* 统一按钮样式，增加间距和视觉舒适度 */
+.form-inline :deep(.el-button) {
+  height: 36px;
+  padding: 8px 16px;
+  font-size: 14px;
+  border-radius: 4px;
+}
+
+/* 按钮之间留出间距（除了第一个） */
+.form-inline :deep(.el-button:not(:first-child)) {
+  margin-left: 12px;
+  /* 比原来的 8px 更宽松 */
+}
+
+// .headClass::after {
+//   content: '';
+//   position: absolute;
+//   left: 0;
+//   bottom: -2px;
+//   width: 60px;
+//   height: 2px;
+//   background-color: #409eff;
+// }
+
+h3 {
+  margin: 0;
+}
+</style>

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

@@ -207,7 +207,7 @@ const submit = async () => {
     info.value.throwData()
     // personnelTags.value.throwData(),
   ]);
-  tbGsxtZdrySave(infoData).then(res => {
+  tbGsxtZdrySave({...infoData,rylx:'01'}).then(res => {
     proxy.$message({
       message: '新增成功',
       type: 'success',

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

@@ -227,7 +227,7 @@ const getList = () => {
   pageData.tableConfiger.loading = true;
   // 人员类型D_ZDRY_RYLX(01 重点 02 普通〉
   //  rylx: '01',
-  let data = {...pageData.pageConfiger, ...queryFrom.value };
+  let data = {...pageData.pageConfiger, ...queryFrom.value,rylx: '01' };
   qcckGet(data, "/mosty-gsxt/tbGsxtZdry/selectPage").then((res) => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;

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

@@ -6,11 +6,12 @@
           <template #reference>
             <el-button type="primary" @click="(visible = !visible), (visiblefp = false)" size="small">布控申请</el-button>
           </template>
-          <div class="flex just-center">
+<div class="flex just-center">
-            <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm" @click="handleApplication(it)" >{{ it.zdmc }}</el-button>
+  <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm" @click="handleApplication(it)">{{
-          </div>
+    it.zdmc }}</el-button>
-        </el-popover>
+</div>
-        <el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
+</el-popover>
+<el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
   <template #reference>
             <el-button size="small" type="primary" @click="(visiblefp = !visiblefp), (visible = false)" >指定分配</el-button>
           </template>
@@ -21,55 +22,67 @@
       <el-button type="primary" @click="handlefp" size="small">分配</el-button>
     </div>
   </div>
-        </el-popover>
+</el-popover>
-        <el-button size="small" type="primary" @click="handleZxs">转线索</el-button>
+<el-button size="small" type="primary" @click="handleZxs">转线索</el-button>
-        <el-button size="small" type="primary" @click="handleMove">移交管控</el-button> -->
+<el-button size="small" type="primary" @click="handleMove">移交管控</el-button> -->
     <!-- </PageTitle>
     </div> -->
     <!-- 搜索 -->
     <div ref="searchBox" class="mt10 mb10">
       <Search :searchArr="searchConfiger" @submit="onSearch" />
     </div>
+    <!-- <PageTitle :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
+      <template #left>
+          <el-button type="primary" @click="showYpdolog = true" size="small" :disabled="!ids.length">批量审批</el-button>
+      </template>
+    </PageTitle> -->
     <!-- 表格 -->
     <div class="tabBox heightBox">
-      <MyTable
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :tableData="pageData.tableData"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        :tableColumn="pageData.tableColumn"
+        @chooseData="chooseData">
-        :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount"
-        :tableConfiger="pageData.tableConfiger"
-        :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData"
-      >
         <template #ryxx="{ row }">
           <div class="flex">
             <img src="" alt="" style="width: 80px;height: 90px;" />
             <ul class="tl ml10" style="flex:1 0 0">
               <li class="one_text_detail">姓名：{{ row.ryXm }}</li>
-              <li class="flex one_text_detail">性别：<DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" /></li>
+              <li class="flex one_text_detail">性别：
-              <li class="flex one_text_detail">籍贯：<DictTag :tag="false" :value="row.ryJg" :options="D_BZ_XZQHDM"/></li>
+                <DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" />
+              </li>
+              <li class="flex one_text_detail">籍贯：
+                <DictTag :tag="false" :value="row.ryJg" :options="D_BZ_XZQHDM" />
+              </li>
               <li class="one_text_detail">身份证：{{ row.rySfzh }}</li>
               <li class="one_text_detail">出生日期：{{ row.ryCsrq }}</li>
-              <li class="flex one_text_detail">民族：<DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" /></li>
+              <li class="flex one_text_detail">民族：
+                <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
+              </li>
             </ul>
           </div>
         </template>
         <template #bqList="{ row }">
-         <ul >
+          <ul>
-            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{ item.bqFz || 0  }} 分) </li>
+            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
+              item.bqFz || 0 }} 分) </li>
           </ul>
         </template>
 
         <template #jzxx="{ row }">
-          <div class="flex one_text_detail">户籍地区划：<DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" /></div>
+          <div class="flex one_text_detail">户籍地区划：
+            <DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" />
+          </div>
           <div class="flex one_text_detail">户籍派出所：{{ row.hjdPcsmc }}</div>
           <div class="flex one_text_detail">户籍地详址：{{ row.hjdXz }}</div>
         </template>
         <template #gxdw="{ row }">
           <div class="flex one_text_detail">管辖单位：{{ row.gxSsbmmc }}</div>
-          <div class="flex">人员级别：<DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB"/> </div>
+          <div class="flex">人员级别：
+            <DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB" />
+          </div>
           <div class="flex one_text_detail">管控原因：{{ row.zdrLkyy }}</div>
-          <div class="flex">管控状态：<DictTag :tag="false" :value="row.zdrBkZt" :options="D_GS_ZDR_BK_ZT" /></div>
+          <div class="flex">管控状态：
+            <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" />
@@ -85,14 +98,17 @@
         <template #controls="{ row }">
           <el-popover placement="left" :visible="row.visible" :width="400" trigger="manual">
             <template #reference>
-              <el-link size="small" type="warning" v-if="row.zdrZt == '02'" @click="row.visible = !row.visible,chooseRow.id = row.id">审核</el-link>
+              <el-link size="small" type="warning" v-if="row.zdrZt == '02'"
+                @click="row.visible = !row.visible, chooseRow.id = row.id">审核</el-link>
             </template>
             <el-form :model="chooseRow" ref="elRowForm" :inline="true" label-width="100px" :rules="rules">
               <el-form-item label="是否通过" prop="sftg" class="mt10 mb10" style="width: 100%;">
-                <MOSTY.Select filterable v-model="chooseRow.sftg" :dictEnum="D_BZ_SF" width="100%" clearable  placeholder="请选择是否通过"/>
+                <MOSTY.Select filterable v-model="chooseRow.sftg" :dictEnum="D_BZ_SF" width="100%" clearable
+                  placeholder="请选择是否通过" />
               </el-form-item>
               <el-form-item label="不通过原因" prop="shBtgyy" v-if="chooseRow.sftg == 0" style="width: 100%;">
-                <MOSTY.Other style="width: 100%;" clearable v-model="chooseRow.shBtgyy" type="textarea" placeholder="请输入不通过原因"/>
+                <MOSTY.Other style="width: 100%;" clearable v-model="chooseRow.shBtgyy" type="textarea"
+                  placeholder="请输入不通过原因" />
               </el-form-item>
             </el-form>
             <div class="flex just-center mt10">
@@ -103,14 +119,17 @@
 
           <el-popover placement="left" :visible="row.visible1" :width="400" trigger="manual">
             <template #reference>
-              <el-link size="small" type="primary" v-if="row.zdrZt == '04'" @click="row.visible1 = !row.visible1,chooseRow.id = row.id">审批</el-link>
+              <el-link size="small" type="primary" v-if="row.zdrZt == '04'"
+                @click="row.visible1 = !row.visible1, chooseRow.id = row.id">审批</el-link>
             </template>
             <el-form :model="chooseRow" ref="elRowForm1" :inline="true" label-width="100px" :rules="rules">
               <el-form-item label="是否通过" prop="sftg" class="mt10 mb10" style="width: 100%;">
-                <MOSTY.Select filterable v-model="chooseRow.sftg" :dictEnum="D_BZ_SF" width="100%" clearable  placeholder="请选择是否通过"/>
+                <MOSTY.Select filterable v-model="chooseRow.sftg" :dictEnum="D_BZ_SF" width="100%" clearable
+                  placeholder="请选择是否通过" />
               </el-form-item>
               <el-form-item label="不通过原因" prop="spBtgyy" v-if="chooseRow.sftg == 0" style="width: 100%;">
-                <MOSTY.Other style="width: 100%;" clearable v-model="chooseRow.spBtgyy" type="textarea" placeholder="请输入不通过原因"/>
+                <MOSTY.Other style="width: 100%;" clearable v-model="chooseRow.spBtgyy" type="textarea"
+                  placeholder="请输入不通过原因" />
               </el-form-item>
             </el-form>
             <div class="flex just-center mt10">
@@ -119,25 +138,23 @@
             </div>
           </el-popover>
 
-          <el-link size="small" type="primary" @click="addEdit('detail', row)" >详情</el-link>
+          <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
         </template>
       </MyTable>
-      <Pages
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
-        @changeNo="changeNo"
-        @changeSize="changeSize"
-        :tableHeight="pageData.tableHeight"
-        :pageConfiger="{
         ...pageData.pageConfiger,
         total: pageData.total
-        }"
+      }"></Pages>
-      ></Pages>
     </div>
     <!-- 详情 -->
-    <AddForm ref="addFormDiloag" @updateDate="getList" :dic="{D_GS_ZDR_RYJB,D_BZ_XB,D_BZ_MZ,D_BZ_XZQHDM,D_GS_ZDR_BK_ZT,D_GS_ZDR_CZZT,D_GS_BQ_ZL,D_GS_BQ_LB,D_GS_BQ_LX,D_GS_ZDR_YJDJ,D_GS_BK_SSJZ}"/>
+    <AddForm ref="addFormDiloag" @updateDate="getList"
+      :dic="{ D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ }" />
     <!-- 选择用户 -->
-    <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds"/>
+    <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" />
     <!-- 转线索 -->
-    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList" :dic="{D_BZ_SF,D_BZ_XB,D_GS_XS_LY,D_BZ_SSZT,D_GS_XS_LX,D_GS_XS_QTLX }"></ZxsForm>
+    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList"
+      :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }"></ZxsForm>
+      <Ypdolog v-model="showYpdolog" :dataList="ids"/>
   </div>
 </template>
 
@@ -152,9 +169,10 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import AddForm from "../mpvPeo/components/addForm.vue";
 import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import Ypdolog from "./ypdolog.vue";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const { D_GS_ZDQT_ZT,D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_BK_SQLX, D_BZ_SF, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDQT_ZT","D_GS_ZDR_RYJB","D_BZ_XB","D_BZ_MZ","D_BZ_XZQHDM","D_GS_ZDR_BK_ZT","D_GS_ZDR_CZZT","D_GS_BQ_ZL","D_GS_BQ_LB","D_GS_BQ_LX","D_GS_ZDR_YJDJ","D_GS_BK_SSJZ","D_GS_BK_SQLX","D_BZ_SF","D_GS_XS_LY","D_BZ_SSZT","D_GS_XS_LX","D_GS_XS_QTLX");
+const { D_GS_ZDQT_ZT, D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_BK_SQLX, D_BZ_SF, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDQT_ZT", "D_GS_ZDR_RYJB", "D_BZ_XB", "D_BZ_MZ", "D_BZ_XZQHDM", "D_GS_ZDR_BK_ZT", "D_GS_ZDR_CZZT", "D_GS_BQ_ZL", "D_GS_BQ_LB", "D_GS_BQ_LX", "D_GS_ZDR_YJDJ", "D_GS_BK_SSJZ", "D_GS_BK_SQLX", "D_BZ_SF", "D_GS_XS_LY", "D_BZ_SSZT", "D_GS_XS_LX", "D_GS_XS_QTLX");
 const obj = ref({});
 const showzxs = ref(false);
 const zxsDilof = ref();
@@ -226,10 +244,10 @@ const pageData = reactive({
   },
   controlsWidth: 120,
   tableColumn: [
-    { label: "重点人员信息", prop: "ryxx", showSolt: true,width:300,showOverflowTooltip:true },
+    { label: "重点人员信息", prop: "ryxx", showSolt: true, width: 300, showOverflowTooltip: true },
-    { label: "户籍居住信息", prop: "jzxx", showSolt: true,width:300, },
+    { label: "户籍居住信息", prop: "jzxx", showSolt: true, width: 300, },
-    { label: "标签", prop: "bqList", showSolt: true ,width:200,showOverflowTooltip:true},
+    { label: "标签", prop: "bqList", showSolt: true, width: 200, showOverflowTooltip: true },
-    { label: "管辖单位", prop: "gxdw", showSolt: true,width:300, },
+    { label: "管辖单位", prop: "gxdw", showSolt: true, width: 300, },
     { label: "处置状态", prop: "zdrCzzt", showSolt: true },
     { label: "状态", prop: "xtSjzt", showSolt: true },
     { label: "审核状态", prop: "zdrZt", showSolt: true },
@@ -260,7 +278,7 @@ const changeSize = (val) => {
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...queryFrom.value,zdrZt:'02' };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value, zdrZt: '02' };
   qcckGet(data, "/mosty-gsxt/tbGsxtZdry/selectPage").then((res) => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
@@ -295,7 +313,7 @@ const handleUserSelected = (val) => {
 // 处理分配
 const handlefp = () => {
   if (ids.value.length === 0) return ElMessage.error("请先选择需要布控的重点人");
-  qcckPost({ ids: ids.value, uid: obj.value.fpid },"/mosty-gsxt/tbGsxtZdry/addGkmj").then(() => {
+  qcckPost({ ids: ids.value, uid: obj.value.fpid }, "/mosty-gsxt/tbGsxtZdry/addGkmj").then(() => {
     ElMessage.success("分配成功");
     visible.value = false;
     visiblefp.value = false;
@@ -336,47 +354,47 @@ const cancelRow = (row) => {
 };
 
 // 审核
-const handleSend = (val) =>{
+const handleSend = (val) => {
   elRowForm.value.validate((valid) => {
-    if(!valid) return;
+    if (!valid) return;
     btnloading.value = true;
     qcckPost(chooseRow.value, "/mosty-gsxt/tbGsxtZdry/updateSh").then(() => {
       proxy.$message({ type: "success", message: "审核成功" });
       cancelRow(val)
       getList();
-    }).catch(()=>{
+    }).catch(() => {
       btnloading.value = false;
     });
   })
 }
 
 // 审批
-const cancelRowSp = (row) =>{
+const cancelRowSp = (row) => {
   row.visible1 = false;
   chooseRow.value = {};
   btnloading.value = false;
   elRowForm1.value.resetFields()
 }
 // 审批
-const handleSendSp = (val) =>{
+const handleSendSp = (val) => {
   elRowForm1.value.validate((valid) => {
-    if(!valid) return;
+    if (!valid) return;
     btnloading.value = true;
     qcckPost(chooseRow.value, "/mosty-gsxt/tbGsxtZdry/updateSp").then(() => {
       proxy.$message({ type: "success", message: "审批成功" });
       cancelRowSp(val);
       getList();
-    }).catch(()=>{
+    }).catch(() => {
       btnloading.value = false;
     });
   })
 }
-
+const showYpdolog=ref(false)
 
 //新增编辑
 const addEdit = (type, row) => {
   show.value = true;
-  nextTick(()=>{
+  nextTick(() => {
     addFormDiloag.value.init(type, row);
   })
 };
@@ -391,7 +409,7 @@ const tabHeightFn = () => {
 </script>
 
 <style lang="scss" scoped>
-.marks{
+.marks {
   padding: 0 4px;
   white-space: nowrap;
   background: #73acf1;
@@ -404,5 +422,4 @@ const tabHeightFn = () => {
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-
 </style>

src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/ypdolog.vue

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

src/views/backOfficeSystem/HumanIntelligence/auditList/components/spdloyment.vue

@@ -0,0 +1,561 @@
+<template>
+  <div class="dialog">
+    <div class="form-container">
+      <div class="form-content" v-loading="loading">
+        <!-- <div class="form_cnt"> -->
+        <FormMessage :disabled="disabled" v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+          <!-- <template #jbxx>
+            <div>
+              <h3 class="tags-title">报送情况</h3>
+              <div style="display: flex;justify-content:space-between;width: 200%;">
+                <div>录入人：{{ userName }}</div>
+                <div>录入单位：{{ userInfo.deptName }}</div>
+                <div>本年度报送信息量：{{ tjcll.cnl || 0 }}</div>
+                <div>采纳量：{{ tjcll.sbsl || 0 }}</div>
+              </div>
+            </div>
+          </template> -->
+          <template #shzt>
+            <div v-if="disabled">
+              <h3 class="tags-title">审核状态</h3>
+              <div style="display: flex;justify-content:space-between;width: 200%;">
+                <div style="display: flex;">
+                  市审核状态：
+                  <DictTag v-model:value="listQuery.sldshzt" :options="D_BZ_SSSHZT" :tag="false" />
+                </div>
+                <div style="display: flex;">
+                  县审核状态：
+                  <DictTag v-model:value="listQuery.xldshzt" :options="D_BZ_SSSHZT" :tag="false" />
+                </div>
+              </div>
+            </div>
+          </template>
+        </FormMessage>
+        <!-- </div> -->
+        <div class="tags-section" v-if="disabled">
+          <h3 class="tags-title">关注部门</h3>
+          <div class="tags-container">
+            <div v-for="(tag, index) in listQuery.gzbmList" :key="tag.id || index" class="tag-item">
+              <div class="tag-content">
+                {{ tag.ssbm }}
+              </div>
+            </div>
+            <span v-if="!listQuery.gzbmList || listQuery.gzbmList.length === 0" class="no-tags">
+              暂无标签
+            </span>
+          </div>
+        </div>
+        <div class="tags-section" v-if="disabled">
+          <h3 class="tags-title">关联标签</h3>
+          <div class="tags-container">
+            <div v-for="(tag, index) in listQuery.glbqList" :key="tag.id || index" class="tag-item">
+              <div class="tag-content">
+                {{ tag.bqmc }}
+              </div>
+            </div>
+            <span v-if="!listQuery.glbqList || listQuery.glbqList.length === 0" class="no-tags">
+              暂无标签
+            </span>
+          </div>
+        </div>
+        <div class="tags-section" v-if="disabled">
+          <h3 class="tags-title">续报信息</h3>
+          <div class="list-container">
+            <div v-for="(item, index) in dataList.xb" :key="item.id || index" class="list-item">
+              <div class="list-content">
+                {{ item.bcnr }}
+              </div>
+
+            </div>
+            <span v-if="!dataList.xb || dataList.xb.length === 0" class="no-tags">
+              暂无续报信息
+            </span>
+          </div>
+        </div>
+        <div class="tags-section" v-if="disabled">
+          <h3 class="tags-title">补充信息</h3>
+          <div class="list-container">
+            <div v-for="(item, index) in dataList.bc" :key="item.id || index" class="list-item">
+              <div class="list-content">
+                {{ item.bcnr }}
+              </div>
+            </div>
+            <span v-if="!dataList.bc || dataList.bc.length === 0" class="no-tags">
+              暂无补充信息
+            </span>
+          </div>
+        </div>
+      </div>
+      <div class="ml50 mr50 timeline-container" v-if="disabled">
+        <div class="timeline-title">信息流程展示</div>
+        <el-timeline class="timeline-full-width">
+          <el-timeline-item :timestamp="item.czsj" placement="top" v-for="(item, index) in lcList" :key="index">
+            <el-card class="process-card">
+              <div class="process-info">
+                <div class="info-label">处置人：</div>
+                <div class="info-value">{{ item.czrxm || '未记录' }}</div>
+              </div>
+              <div class="process-info">
+                <div class="info-label">处置结果：</div>
+                <div class="info-value">
+                  <DictTag :tag="false" :value="item.czzt" :options="D_BZ_LCZT" />
+                </div>
+              </div>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+        <MOSTY.Empty :show="lcList.length == 0" :imgSize="100"></MOSTY.Empty>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { xxcjSelectByid, xxcjSelectCzlcList, xxcjSelectListBc } from "@/api/xxcj.js"
+import { ref, defineExpose, onMounted, defineEmits, watch, getCurrentInstance } from "vue"
+import { getItem } from '@//utils/storage.js'
+import { useRoute, useRouter } from 'vue-router'
+import * as MOSTY from "@/components/MyComponents/index";
+
+const { proxy } = getCurrentInstance()
+const {D_BZ_SSSHZT,D_BZ_LCZT} =proxy.$dict('D_BZ_SSSHZT','D_BZ_LCZT')
+const route=useRoute()
+const emit = defineEmits(["getList"]);
+const props = defineProps({
+  dict: Object,
+  titleData: {
+    type: String,
+    default: ""
+  },
+  showBc: {
+    type: Boolean,
+    default: false
+  }
+});
+const loading = ref(false)
+const formData = ref([
+  { label: "情报标题", prop: "qbmc", type: "input", width: '45%' },
+  { label: "情报内容", prop: "qbnr", type: "textarea", width: '100%', rows: 100 },
+  { label: "附件上传", prop: "fjdz", type: "upload", width: '100%', isImg: false },
+  { label: "", prop: "jbxx", type: "slot", width: '100%', },
+  { label: "", prop: "shzt", type: "slot", width: '100%' },
+]);
+const rules = ref({
+  qbmc: [{ required: true, message: "请输入情报标题", trigger: "blur" }],
+  qbnr: [{ required: true, message: "请输入情报内容", trigger: "blur" }],
+  bcnr: [{ required: true, message: "请输入续报内容", trigger: "blur" }],
+})
+
+
+
+const fjdz = ref()
+const listQuery = ref({}); //表单
+const disabled = ref(false)
+/** 类型 add 新增 info 详情 edit 编辑 followUpReport 续报*/
+
+onMounted(() => {
+  init()
+})
+// 初始化数据
+const init = () => {
+const id=  route.query.id
+  disabled.value = true
+  fjdz.value = []
+  getqbcjPldb(id)
+  getxxcjSelectListBc(id, '01')
+  getxxcjSelectListBc(id, '02')
+   getDataById(id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  xxcjSelectByid({ id }).then((res) => {
+    lcList.value = res.czlcList || []
+    listQuery.value = res;
+    listQuery.value.fjdz = res.fjdz ? res.fjdz?.split(",") : []
+  });
+};
+
+
+
+
+
+const lcList = ref([])
+const getqbcjPldb = (id) => {
+  xxcjSelectCzlcList({ qbid: id }).then(res => {
+    lcList.value = res || []
+  })
+    .catch(() => {
+    })
+}
+//
+const dataList = ref({
+  xb: [],
+  bc: [],
+})
+const getxxcjSelectListBc = (id, lx) => {
+  xxcjSelectListBc({ qbid: id, czlx: lx }).then(res => {
+    if (lx == '01') {
+      dataList.value.xb = res || []
+    } else {
+      dataList.value.bc = res || []
+    }
+  })
+}
+
+
+
+
+
+
+
+</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;
+}
+
+::v-deep .avatar-uploader {
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-upload-list {
+  margin-left: 20px;
+  display: flex;
+  align-items: center;
+}
+
+::v-deep .el-upload-list__item-name .el-icon {
+  top: 3px;
+}
+
+.form_cnt {
+  // width: 75%;
+  flex: 1;
+}
+
+.person {
+  padding-left: 20px;
+  width: 25%;
+  // height: 100vh;
+}
+
+/* 补充信息样式 */
+.supplement-title {
+  font-size: 14px;
+  font-weight: 500;
+  color: #333;
+  margin: 16px 0 10px 0;
+  padding-left: 5px;
+  border-left: 3px solid #24b6dd;
+}
+
+.supplement-list {
+  margin-left: 5px;
+}
+
+.supplement-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8px 12px;
+  background-color: #f5f7fa;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  margin-bottom: 8px;
+  margin-right: 10px;
+  transition: all 0.3s ease;
+}
+
+.supplement-item:hover {
+  background-color: #ecf5ff;
+  border-color: #c6e2ff;
+}
+
+.supplement-content {
+  flex: 1;
+  font-size: 14px;
+  color: #606266;
+  line-height: 1.5;
+}
+
+.supplement-actions {
+  display: flex;
+  gap: 12px;
+}
+
+.action-icon {
+  // font-size: 24px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.edit-icon {
+  color: #24b6dd;
+}
+
+.edit-icon:hover {
+  color: #409eff;
+  transform: scale(1.1);
+}
+
+.delete-icon {
+  color: #f56c6c;
+}
+
+.delete-icon:hover {
+  color: #f78989;
+  transform: scale(1.1);
+}
+
+/* 时间线标题样式 */
+.timeline-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+  padding: 12px 16px;
+  margin-bottom: 10px;
+  background-color: #f5f7fa;
+  border-bottom: 1px solid #ebeef5;
+  border-radius: 4px 4px 0 0;
+}
+
+/* 时间线样式优化 */
+.el-timeline {
+  margin-top: 20px;
+}
+
+/* 处置流程卡片样式 */
+.process-card {
+  border: none;
+  border-radius: 8px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
+  transition: all 0.3s ease;
+  margin-bottom: 16px;
+  border-left: 3px solid #409EFF;
+}
+
+.process-card:hover {
+  box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.12);
+  transform: translateY(-2px);
+}
+
+/* 卡片内部信息样式 */
+.process-info {
+  display: flex;
+  align-items: flex-start;
+  margin-bottom: 12px;
+  flex-wrap: wrap;
+}
+
+.process-info:last-child {
+  margin-bottom: 0;
+}
+
+.info-label {
+  font-size: 14px;
+  font-weight: 600;
+  color: #409EFF;
+  margin-right: 8px;
+  min-width: 65px;
+}
+
+.info-value {
+  font-size: 14px;
+  color: #606266;
+  line-height: 1.6;
+  flex: 1;
+  word-break: break-word;
+}
+
+/* 时间戳样式 */
+.el-timeline-item__timestamp {
+  font-size: 13px;
+  color: #909399;
+  margin-bottom: 8px;
+}
+
+/* 时间线节点样式 */
+.el-timeline-item__node {
+  background-color: #409EFF;
+}
+
+::v-deep .el-textarea__inner {
+  height: 50vh !important;
+}
+
+/* 容器类样式 */
+.form-container {
+  display: flex;
+  width: 100%;
+}
+
+.form-content {
+  // display: flex;
+  width: 80%;
+}
+
+.timeline-container {
+  border: 1px solid #ebeef5;
+  flex: 1;
+  margin: 0 10px;
+}
+
+/* 时间线宽度 */
+.timeline-full-width {
+  width: 100%;
+}
+
+/* 标签区域样式 */
+.tags-section {
+  margin-top: 20px;
+}
+
+/* 标签标题样式 */
+.tags-title {
+  font-size: 14px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 8px;
+  padding-left: 5px;
+  border-left: 3px solid #409EFF;
+}
+
+/* 标签容器样式 */
+.tags-container {
+  padding: 12px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+  align-items: center;
+}
+
+/* 标签项目样式 */
+.tag-item {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 10px;
+  background-color: #ecf5ff;
+  border-radius: 4px;
+  border: 1px solid #d9ecff;
+  transition: all 0.3s ease;
+}
+
+/* 标签项目悬停效果 */
+.tag-item:hover {
+  background-color: #e6f7ff;
+  border-color: #91d5ff;
+  box-shadow: 0 2px 8px rgba(0, 123, 255, 0.15);
+}
+
+/* 标签内容样式 */
+.tag-content {
+  margin: 0;
+  font-size: 14px;
+  color: #303133;
+  font-weight: 500;
+}
+
+/* 标签操作按钮样式 */
+.tag-actions {
+  display: flex;
+  // align-items: flex-start;
+  gap: 8px;
+}
+
+/* 操作图标样式 */
+.action-icon {
+  font-size: 18px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  padding: 6px 8px;
+  border-radius: 4px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 编辑图标样式 */
+.edit-icon {
+  color: #409EFF;
+  background-color: #ecf5ff;
+}
+
+.edit-icon:hover {
+  color: #66B1FF;
+  background-color: #e6f7ff;
+  transform: scale(1.05);
+  box-shadow: 0 2px 4px rgba(64, 158, 255, 0.2);
+}
+
+/* 列表容器样式 */
+.list-container {
+  padding: 12px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+}
+
+/* 列表项样式 */
+.list-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 12px;
+  background-color: #ffffff;
+  border-radius: 4px;
+  margin-bottom: 8px;
+  border: 1px solid #e4e7ed;
+  transition: all 0.3s ease;
+}
+
+/* 列表项悬停效果 */
+.list-item:hover {
+  background-color: #f5f7fa;
+  border-color: #dcdfe6;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+/* 列表内容样式 */
+.list-content {
+  margin: 0;
+  font-size: 14px;
+  color: #303133;
+  font-weight: 500;
+}
+
+/* 删除图标样式 */
+.delete-icon {
+  color: #F56C6C;
+  background-color: #fef0f0;
+}
+
+.delete-icon:hover {
+  color: #F78989;
+  background-color: #fde2e2;
+  transform: scale(1.05);
+  box-shadow: 0 2px 4px rgba(245, 108, 108, 0.2);
+}
+
+/* 无标签提示样式 */
+.no-tags {
+  color: #909399;
+  font-size: 14px;
+  font-style: italic;
+}
+</style>

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

@@ -27,10 +27,13 @@
           <DictTag :tag="false" :value="row.sldshzt" :options="D_BZ_SSSHZT" />
         </template>
         <template #controls="{ row }">
+
           <el-link size="small" type="danger" @click="openDoingLogin(row)"
             v-if="row.sldshzt == '01' && getRole() == '02'">审批</el-link>
           <el-link size="small" type="danger" @click="openDoingLogin(row)"
             v-if="row.xldshzt == '01' && getRole() == '01'">审批</el-link>
+          <el-link size="small" type="warning" @click="createProcess(row)"
+            v-if="row.sldshzt == '02' && getRole() == '02'">送审</el-link>
           <el-link size="small" type="primary" @click="addEdit('info', row)">详情</el-link>
         </template>
       </MyTable>
@@ -43,6 +46,8 @@
     <AddForm ref="detailDiloag" @getList="getList" :dict="{ D_BZ_LCZT, D_BZ_SSSHZT }" />
   </div>
   <Doinglogin v-model="doingloginModel" :dataModel="dataModel" :dict="{ D_BZ_SSSHZT }" @getList="getList" />
+    <SubmissionProcess v-model="showSp" :data="rowData" :userData="{ ajmc: '情报审批', flowType: 'QBSP', modelName: '情报' }"
+    :path="fixedValue" @getList="getList" />
 </template>
 
 <script setup>
@@ -51,6 +56,7 @@ import Doinglogin from "./components/doinglogin.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Searchs from "@/components/aboutTable/Search.vue";
 import AddForm from "./components/addForm.vue";
+import SubmissionProcess from '@/components/flowPath/submissionProcess.vue'
 import { xxcjSelectDshPage } from '@/api/xxcj.js'
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 import { getItem } from "@/utils/storage";
@@ -148,13 +154,25 @@ const openDoingLogin = (row) => {
   dataModel.value = row
   doingloginModel.value = true
 }
-const detailDiloag=ref()
+const detailDiloag = ref()
 const addEdit = (type, row) => {
   setTimeout(() => {
     detailDiloag.value.init(type, row);
   }, 500)
 };
-
+// 固定值
+const fixedValue = {
+  clueVerification: 'Spdloyment',
+  byMeansOf: '/qbcj/callback',
+  nobyMeansOf: '/qbcj/callback',
+  recycle: '/qbcj/callback',
+}
+const showSp = ref(false);
+const rowData = ref()
+const createProcess = (row) => {
+  showSp.value = true;
+  rowData.value = row
+}
 
 // 表格高度计算
 const tabHeightFn = () => {

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

@@ -166,6 +166,7 @@ const searchConfiger = ref([
   { label: "编号", prop: 'xsBh', placeholder: "请输入编号", showType: "input" },
   { label: "时间", prop: "startTime", placeholder: "请选择时间", showType: "daterange" },
   { label: "情报标题", prop: 'qbmc', placeholder: "请输入情报标题", showType: "input" },
+    { label: "标签内容", prop: 'bqdmList', placeholder: "请选择标签内容", showType: "select", options: D_XXCJ_BQLX,multiple:true},
   { label: "标签级别", prop: 'qbjb', placeholder: "请选择标签级别", showType: "select", options: D_BZ_BQJB },
   { label: "情报处置状态", prop: 'lczt', placeholder: "请选择处置状态", showType: "select", options: D_BZ_LCZT },
   { label: "关键字", prop: 'keyword', placeholder: "请输入关键字", showType: "input" },
@@ -370,12 +371,14 @@ const butcontroll = (val, zt) => {
 
 // 搜索
 const onSearch = (val) => {
+console.log(val.bqdmList);
 
   const promes = {
     ...pageData.pageConfiger,
     ...val,
     startTime: val.startTime ? val.startTime[0] : '',
     endTime: val.endTime ? val.endTime[1] : '',
+    bqdmList:val.bqdmList?val.bqdmList.join(','):""
   }
 
   queryFrom.value = { ...promes }

src/views/backOfficeSystem/JudgmentHome/ResearchHome/components/PublicOpinionDialog.vue

@@ -0,0 +1,89 @@
+<template>
+  <div>
+    <el-dialog :model-value="modelValue" :destroy-on-close="true" :title="title" @close="close"
+      :close-on-click-modal="true">
+      <div style="height: 50vh;overflow: auto;">
+        <FormMessage v-model="listQuery" :formList="formData" labelWidth="150px" ref="elform">
+        </FormMessage>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="close">取消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, getCurrentInstance, watch } from 'vue'
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { gsxtWlyqSelectById } from '@/api/semanticAnalysis.js'
+const { proxy } = getCurrentInstance();
+const { GA_D_ASJLYFLDM, GA_D_XSAJLBDM, BD_D_BJFSDM, GA_D_SACSFLDM, GA_D_DYLBDM } = proxy.$fzdict('GA_D_ASJLYFLDM', 'GA_D_XSAJLBDM', 'BD_D_BJFSDM', 'GA_D_SACSFLDM', 'GA_D_DYLBDM')
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  title: {
+    type: String,
+    default: '舆情详情'
+  },
+  dataList: {
+    type: Object,
+    default: () => { }
+  }, lx: {
+    type: String,
+    default: '1'
+  }
+})
+const emits = defineEmits(['update:modelValue'])
+const listQuery = ref({})
+const xsaj = [
+  { label: "信息标题", prop: "xxbt", type: "textarea", width: "90%" },
+  { label: "摘要", prop: "zy", type: "textarea" , width: "90%"},
+  { label: "作者昵称", prop: "zznc", type: "input" },
+  { label: "粉丝量", prop: "fsl", type: "input" },
+  { label: "作者主页", prop: "zzzy", type: "input" },
+  { label: "阅读数", prop: "yds", type: "input" },
+  { label: "来源平台", prop: "lypt", type: "input" },
+  { label: "转发数", prop: "zfs", type: "input" },
+  { label: "关键词", prop: "gjc", type: "input"},
+  { label: "是否藏语", prop: "sfzy", type: "input" },
+  { label: "是否精选舆情", prop: "sfjx", type: "input" },
+  { label: "情感倾向", prop: "qgqx", type: "input" },
+  { label: "签到地", prop: "qdd", type: "input" },
+  { label: "评论数", prop: "pls", type: "input" },
+  { label: "内容涉及地域", prop: "nrsjdy", type: "input" },
+  { label: "发布时间", prop: "fbsj", type: "input" },
+  { label: "发布地", prop: "fbd", type: "input" },
+  { label: "点赞数", prop: "dzs", type: "input" },
+  { label: "所属部门", prop: "ssbm", type: "input" },
+  { label: "所属县公安局", prop: "ssxgaj", type: "input" },
+  { label: "所属市公安局", prop: "sssgaj", type: "input" },
+  { label: "备注", prop: "bz", type: "textarea", width: "90%" },
+]
+
+
+const formData = ref()
+const elform = ref()
+watch(() => props.modelValue, (val) => {
+  if (val) {
+    console.log(props.dataList);
+    formData.value=xsaj
+    tbJqIdFunc()
+  }
+})
+const tbJqIdFunc = () => {
+  gsxtWlyqSelectById(props.dataList.id).then((res) => {
+    listQuery.value = res
+  })
+}
+const close = () => {
+  elform.value.reset()
+  emits('update:modelValue', false)
+}
+
+
+</script>

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

@@ -74,6 +74,9 @@
                 <template #jjdbh="{ row }">
                   <span @click="jqDetail(row)">{{ row.jjdbh }}</span>
                 </template>
+                <template #xxbt="{ row }">
+                  <span @click="openPublicOpinionDialog(row)">{{ row.xxbt }}</span>
+                </template>
                 <template #asjbh="{ row }">
                   <span @click="caseDetail(row, row.lx)">{{ row.asjbh }}</span>
                 </template>
@@ -104,11 +107,12 @@
   <JudgmentReport v-model="visible" :search="search" :xzlx="xzlx"></JudgmentReport>
   <DiscussionDialog v-model="showDialog" :dataList="dataList" :lx="lx" />
   <PoliceIncidentDetails v-model="showJqDetail" :dataList="dataList" title="警情详情" />
+  <PublicOpinionDialog v-model="showPublicOpinionDialog" :dataList="dataList" />"
   <CaseDetails v-model="showCaseDetail" :dataList="dataList" title="案件详情" :lx="ajlx" />
 </template>
 
 <script setup>
-import { lzJcjPjdbSelectPage } from '@/api/semanticAnalysis.js'
+import { lzJcjPjdbSelectPage, gsxtWlyqGetPageList, } from '@/api/semanticAnalysis.js'
 import { ElMessage } from "element-plus";
 import JudgmentReport from './components/judgmentReport.vue'
 import { qcckPost, qcckGet } from "@/api/qcckApi.js";
@@ -120,6 +124,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { tbJqGetPageList, xsajSelectPage, xzajSelectPage } from '@/api/yj.js'
 import DiscussionDialog from './components/discussionDialog.vue';
 import PoliceIncidentDetails from './components/policeIncidentDetails.vue';
+import PublicOpinionDialog from './components/PublicOpinionDialog.vue';
 import CaseDetails from './components/caseDetails.vue';
 const router = useRouter();
 import { nextTick, onMounted, reactive, getCurrentInstance, ref, watch } from 'vue';
@@ -193,13 +198,13 @@ const list = reactive([
     pageConfiger: {
       page: 1,
       total: 0,
-      pageSize: 6,
+      pageSize: 10,
     },
     tableColumn: [
-      { label: "舆情标题", prop: "yqbt", showOverflowTooltip: true },
+      { label: "舆情标题", prop: "xxbt", showOverflowTooltip: true, showSolt: true },
-      { label: "舆情内容", prop: "yqnr", showOverflowTooltip: true },
+      { label: "昵称", prop: "zznc", showOverflowTooltip: true },
-      { label: "舆情来源", prop: "yqly", showOverflowTooltip: true },
+      { label: "来源平台", prop: "lypt", showOverflowTooltip: true },
-      { label: "舆情时间", prop: "yqsj", showOverflowTooltip: true },
+      { label: "发布时间", prop: "fbsj", showOverflowTooltip: true },
     ],
   },
   {
@@ -286,6 +291,7 @@ onMounted(() => {
   tabHeightFn()
   getJqList() //警情列表
   getAjList()//案件列表
+  getgsxtWlyqGetPageList()//网络舆情列表
 });
 
 
@@ -336,6 +342,7 @@ const onSearch = () => {
 
   switch (xzlx.value) {
     case '01':
+      getgsxtWlyqGetPageList()
       break;
     case '02':
       getJqList()
@@ -399,6 +406,29 @@ const getAjList = () => {
     })
   }
 }
+
+
+// 网络舆情
+const getgsxtWlyqGetPageList = () => {
+  let params = {
+    pageCurrent: list[0].pageConfiger.page,
+    pageSize: list[0].pageConfiger.pageSize,
+    startTime: dataSearch.value.startTime,
+    endTime: dataSearch.value.endTime,
+  }
+  gsxtWlyqGetPageList(params).then(res => {
+    console.log(res);
+    list[0].tableList = res.records.map(item => {
+      return {
+        ...item,
+      }
+    }) || [];
+    list[0].pageConfiger.total = res.total;
+  })
+
+}
+
+
 // 网上会商
 const showDialog = ref(false)
 const dataList = ref()
@@ -459,6 +489,7 @@ const changeNo = (e, type) => {
   switch (type) {
     case '网络舆情':
       list[0].pageConfiger.page = e;
+      getgsxtWlyqGetPageList()
       break;
     case '警情':
       list[1].pageConfiger.page = e;
@@ -479,6 +510,7 @@ const changeSize = (e, type) => {
   switch (type) {
     case '网络舆情':
       list[0].pageConfiger.pageSize = e;
+      getgsxtWlyqGetPageList()
       break;
     case '警情':
       list[1].pageConfiger.pageSize = e;
@@ -549,19 +581,11 @@ const handleYP = () => {
     default:
       break;
   }
-
+}
-
+const showPublicOpinionDialog = ref(false)
-
+const openPublicOpinionDialog = (row) => {
-
+  showPublicOpinionDialog.value = true
-
+dataList.value = {...row}
-
-
-
-
-
-
-
-
 
 }
 // 表格高度计算

src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue

@@ -16,13 +16,14 @@
               <el-table-column prop="ypbmmc" label="部门" width="150" align="center" />
               <el-table-column label="素材要求" align="center">
                 <template #default="{ row }">
-                  <el-input v-model="row.scyq" type="textarea" :rows="4" :disabled="isDetail || !isShiQingBaoZhongXin" placeholder="请输入研判素材" />
+                  <el-input v-model="row.scyq" type="textarea" :rows="4" :disabled="isDetail || !isShiQingBaoZhongXin"
+                    placeholder="请输入研判素材" />
                 </template>
               </el-table-column>
               <el-table-column label="附件" align="center">
                 <template #default="{ row }">
-                  <UploadFile v-model="row.fj" :disabled="isDetail || (!isShiQingBaoZhongXin && !isAdd)" :limit="1" :isImg="false"
+                  <UploadFile v-model="row.fj" :disabled="isDetail || (!isShiQingBaoZhongXin && !isAdd)" :limit="1"
-                    :isAll="true" />
+                    :isImg="false" :isAll="true" />
                 </template>
               </el-table-column>
               <el-table-column prop="wcqk" label="完成状态" width="80" align="center">
@@ -32,7 +33,7 @@
                   </el-tag>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="180" align="center">
+              <!-- <el-table-column label="操作" width="180" align="center">
                 <template #default="{ row }">
 
                   <el-button type="text" size="small" @click="updateStatus(row)" :disabled="updateDis(row)">
@@ -42,14 +43,14 @@
                     提交素材
                   </el-button>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
           </div>
         </template>
       </FormMessage>
     </div>
     <!-- 底部按钮 -->
-    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id && listQuery.ssbmdm == userInfo.deptCode" >
+    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id && listQuery.ssbmdm == userInfo.deptCode">
       <el-button type="primary" size="small" @click="sendNotice" :loading="noticeLoading">下发通知</el-button>
       <el-button type="success" size="small" @click="confirmJudgment" :loading="confirmLoading">确认研判</el-button>
     </div>
@@ -148,20 +149,28 @@ const confirmLoading = ref(false) // 确认研判加载状态
 
 const rules = reactive({
   // 可以在这里添加表单验证规则
+  ypsj: [
+    { required: true, message: '请选择约稿时间', trigger: 'change' }
+  ],
+  jzsj:[ { required: true, message: '请选择截止时间', trigger: 'change' }]
+
 });
 watch(() => props.dict, (val) => {
   if (val) {
     formData.value = [
-      { label: "研判议题", prop: "ypyt", type: "input", width: '48%', disabled: isDetail.value },
+      // { label: "研判议题", prop: "ypyt", type: "input", width: '48%', disabled: isDetail.value },
-      { label: "研判时间", prop: "ypsj", type: "datetime", width: '48%' , disabled: isDetail.value },
+      { label: "约稿时间", prop: "ypsj", type: "datetime", width: '48%', disabled: isDetail.value },
-      { label: "报告类型", prop: "bglx", type: "radio", options: props.dict.D_BZ_YPLX, width: '48%' , disabled: isDetail.value },
+      { label: "截止时间", prop: "jzsj", type: "datetime", width: '48%', disabled: isDetail.value },
-      { label: "研判方式", prop: "ypfs", type: "radio", options: props.dict.D_BZ_YPFS, width: '48%' , disabled: isDetail.value },
+      // { label: "报告类型", prop: "bglx", type: "radio", options: props.dict.D_BZ_YPLX, width: '48%' , disabled: isDetail.value },
-      { label: "参与研判部门", prop: "jsdxBmDm", type: "department", multiple: true, depMc: 'jsdxBmMc', width: '48%' , disabled: isDetail.value },
+      // { label: "研判方式", prop: "ypfs", type: "radio", options: props.dict.D_BZ_YPFS, width: '48%' , disabled: isDetail.value },
-      { label: "研判要求", prop: "ypyq", type: "textarea", width: '100%' , disabled: isDetail.value },
+      { label: "约稿部门", prop: "jsdxBmDm", type: "department", multiple: true, depMc: 'jsdxBmMc', width: '48%', disabled: isDetail.value },
+      { label: "约稿要求", prop: "ypyq", type: "textarea", width: '100%', disabled: isDetail.value },
       { label: "列表", prop: "bmList", type: "slot", width: '100%' },
     ]
   }
 })
+
+
 /** 是否修改禁用 */
 function updateDis(row) {
   /** 无id 禁用 */
@@ -461,6 +470,7 @@ defineExpose({ init });
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
   // z-index: 1000;
 }
+
 .table-box {
   // width: calc(100% - 2px);
   width: 100%;

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

@@ -26,9 +26,11 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link size="small" type="primary" @click="getDataById('edit', row)" :disabled="userInfo.deptCode!=row.ssbmdm">修改</el-link>
+          <el-link size="small" type="primary" @click="getDataById('edit', row)"
+            :disabled="userInfo.deptCode != row.ssbmdm">修改</el-link>
           <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
-          <el-link size="small" type="danger" @click="deleteFile(row)" :disabled="userInfo.deptCode!=row.ssbmdm">删除</el-link>
+          <el-link size="small" type="danger" @click="deleteFile(row)"
+            :disabled="userInfo.deptCode != row.ssbmdm">删除</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -48,7 +50,7 @@ import Search from "@/components/aboutTable/Search.vue";
 import { useRoute } from 'vue-router'
 import { getItem } from "@/utils/storage.js";
 import { sjzlGetPageList, sjzldeleteEntity } from "@/api/yj.js";
-import { reactive, ref, onMounted, getCurrentInstance, watch,computed } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance, watch, computed } from "vue";
 import AddForm from "./addForm.vue";
 const { proxy } = getCurrentInstance();
 const { D_BZ_YPFS, D_BZ_YPLX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX")
@@ -57,7 +59,7 @@ const searchBox = ref(); //搜索框
 
 const userInfo = ref({})
 onMounted(() => {
-  userInfo.value = getItem('deptId')?getItem('deptId')[0]:{}
+  userInfo.value = getItem('deptId') ? getItem('deptId')[0] : {}
   tabHeightFn()
   if (route.query.id) {
     detailDiloag.value.init('edit', {
@@ -77,7 +79,8 @@ const isShiQingBaoZhongXin = computed(() => {
 })
 
 const searchConfiger = ref([
-  { label: "研判议题", prop: 'ypyt', placeholder: "请输入研判议题", showType: "input" },
+  { label: "约稿时间", prop: 'startTime', placeholder: "请输入约稿时间", showType: "datetimerange" },
+    { label: "约稿要求", prop: 'ypyq', placeholder: "请输入约稿要求", showType: "input" },
   // { label: "研判方式", prop: 'ypfs', placeholder: "请输入研判方式", showType: "radio",options:D_BZ_YPFS },
 ]);
 
@@ -96,11 +99,12 @@ const pageData = reactive({
   },
   controlsWidth: 240,
   tableColumn: [
-    { label: "研判议题", prop: "ypyt" },
+    // { label: "研判议题", prop: "ypyt" },
-    { label: "研判方式", prop: "ypfs", showSolt: true },
+    // { label: 方式", prop: "ypfs", showSolt: true },
-    { label: "报告类型", prop: "bglx", showSolt: true },
+    // { label: "报告类型", prop: "bglx", showSolt: true },
-    { label: "研判时间", prop: "ypsj" },
+    { label: "约稿时间", prop: "ypsj" },
-    { label: "研判要求", prop: "ypyq" },
+    { label: "截止时间", prop: "jzsj" },
+    { label: "约稿要求", prop: "ypyq" },
     { label: "发起部门", prop: "ssbm" },
   ]
 });
@@ -111,6 +115,8 @@ const onSearch = (val) => {
   const promes = {
     ...val,
     ...pageData.pageConfiger,
+    startTime: val.startTime ? val.startTime[0] : '',
+    endTime: val.startTime ? val.startTime[1] : '',
   }
   queryFrom.value = { ...promes }
   pageData.pageConfiger.pageCurrent = 1;

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

@@ -3,7 +3,7 @@
     <div class="head_box">
       <span class="title">报告{{ title }} </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
+        <el-button type="primary" size="small" :loading="loading" @click="submit" v-if="title!='详情'">保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
@@ -49,8 +49,7 @@ import "@wangeditor/editor/dist/css/style.css";
 // import Consultation from './consultation.vue'
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, shallowRef, onBeforeUnmount, watch } from "vue";
-import { gsxtYpbgAddEntity, gsxtYpbgEditEntity } from "@/api/huiShangyp/tacticalApi.js"
+import { gsxtYpbgAddEntity, gsxtYpbgEditEntity, gsxtYpbgId } from "@/api/huiShangyp/strategicApi.js"
-
 const emit = defineEmits(["updateDate", 'ok']);
 const props = defineProps({
   dic: Object,
@@ -108,11 +107,19 @@ const rules = reactive({
     { required: true, message: "请输入经验内容", trigger: "blur" }
   ]
 });
-const formData = ref([
+const formData = ref();
+watch(() =>props.dic.D_BZ_YPLX, (newVal) => {
+if(newVal){
+formData.value=[
   { label: "报告名称", prop: "bgmc", type: "input", width: "100%", blur: setEditorTextContent },
+  {
+    label: "报告类型", prop: "bglx", type: "select", width: "100%", options: props.dic.D_BZ_YPLX
+  },
   { label: "报告内容", prop: "bgnr", type: "slot", width: "100%", blur: setEditorTextContent },
-  // { label: "附件内容", prop: "fj", type: "slot", width: "100%" },
+]
-]);
+}
+})
+
 const listQuery = ref({
   bgmc: "",
   bgnr: "",
@@ -132,11 +139,11 @@ const init = (type, reportData, row) => {
     bgmc: reportData.bgmc,
     bgnr: reportData.bgnr,
     id: reportData.id,
-    // fj: reportData.fj
+    bglx: reportData.bglx,
   }
   outRow.value = { ...row }
   dialogForm.value = true;
-  title.value = type == "add" ? "新增" : "编辑";
+  title.value = type == "add" ? "新增" :type == "edit"? "编辑" : "详情";
   setEditorTextContent()
 };
 const getText = (val, row = {}) => {

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

@@ -7,7 +7,7 @@
     </div>
     <PageTitle :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
       <template #left>
-        <el-button size="small" type="primary" @click="selfCreateResearch('add')">
+        <el-button size="small" type="primary" @click="createReport('add')">
           <el-icon style="vertical-align: middle">
             <CirclePlus />
           </el-icon>
@@ -28,10 +28,11 @@
         <!-- 操作 -->
         <template #controls="{ row }">
           <!-- <el-link size="small" type="primary" @click="getDataById('edit', row)">修改</el-link> -->
-          <el-link size="small" type="danger" @click="getypbgSjzlTjspId(row.id)">提交申请</el-link>
+          <!-- <el-link size="small" type="danger" @click="getypbgSjzlTjspId(row.id)">提交申请</el-link> -->
-          <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
+         <el-link size="small" type="primary" @click="createReport('edit', row)">编辑</el-link>
-          <el-link size="small" type="primary" @click="createReport(row)">{{ row.ypbg?.id ? '编辑' : '创建' }}报告</el-link>
+          <el-link size="small" type="primary" @click="createReport('detail', row)">详情</el-link>
-          <el-link size="small" type="success" @click="createMeeting(row)">创建会议</el-link>
+
+          <!-- <el-link size="small" type="success" @click="createMeeting(row)">创建会议</el-link>-->
           <el-link size="small" type="danger" @click="deleteFile(row)">删除</el-link>
         </template>
       </MyTable>
@@ -44,7 +45,7 @@
   <AddForm ref="addForm" :bglx="bglx" @getList="getList" :dict="{ D_BZ_YPFS, D_BZ_YPLX }" />
 
   <!-- 创建报告 -->
-  <addReport ref="reportTc" :row="currRow" :dic="{ D_GS_BQ_LX }" @ok="getList" />
+  <addReport ref="reportTc" :row="currRow" :dic="{ D_GS_BQ_LX,D_BZ_YPLX }" @ok="getList" />
   <!-- 创建报告 -->
   <addMeeting ref="meetingTc" :row="currRow" @updateDate="getList" />
 </template>
@@ -55,9 +56,8 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import { useRoute, useRouter } from 'vue-router'
-import { tacticalGet, strategicDelete } from "@/api/huiShangyp/tacticalApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, watch, computed, nextTick } from "vue";
-import { ypbgSjzlTjspId } from "@/api/huiShangyp/strategicApi.js"
+import { ypbgSjzlTjspId,gsxtYpbgGetPageList ,gsxtYpbgDeleteEntity} from "@/api/huiShangyp/strategicApi.js"
 import addReport from "./addReport.vue";
 import AddForm from "./addForm.vue";
 import addMeeting from "./addMeeting.vue";
@@ -91,8 +91,8 @@ const isShiQingBaoZhongXin = computed(() => {
 })
 
 const searchConfiger = ref([
-  { label: "研判议题", prop: 'ypyt', placeholder: "请输入研判议题", showType: "input" },
+  { label: "报告名称", prop: 'bgmc', placeholder: "请输入报告名称", showType: "input" },
-  // { label: "研判方式", prop: 'ypfs', placeholder: "请输入研判方式", showType: "radio",options:D_BZ_YPFS },
+  { label: "研判类型", prop: 'bglx', placeholder: "请输入研判类型", showType: "select",options:D_BZ_YPLX },
 ]);
 
 const pageData = reactive({
@@ -100,7 +100,7 @@ const pageData = reactive({
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "checkBox",
+    showSelectType: "null",
     loading: false
   },
   total: 0,
@@ -110,12 +110,10 @@ const pageData = reactive({
   },
   controlsWidth: 240,
   tableColumn: [
-    { label: "研判议题", prop: "ypyt" },
+    { label: "报告名称", prop: "bgmc" },
-    { label: "研判方式", prop: "ypfs", showSolt: true },
     { label: "报告类型", prop: "bglx", showSolt: true },
-    { label: "研判时间", prop: "ypsj" },
+    { label: "生成时间", prop: "scsj" },
-    { label: "研判要求", prop: "ypyq" },
+    { label: "生成部门", prop: "ssbm" },
-    { label: "发起部门", prop: "ssbm" },
   ]
 });
 
@@ -147,9 +145,11 @@ const changeSize = (val) => {
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
-  // bglx 报告类型（01 战术研判 02 战略研判）
+  // bglx 报告类型（01 战术研判 02 战略研判）, bglx: '02'
-  let data = { ...pageData.pageConfiger, ...queryFrom.value, bglx: '02' };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value};
-  tacticalGet(data).then(res => {
+  gsxtYpbgGetPageList(data).then(res => {
+    console.log(res);
+
     pageData.tableData = res.records || [];
     pageData.total = res.total;
     pageData.tableConfiger.loading = false;
@@ -177,7 +177,7 @@ const deleteFile = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    strategicDelete({ ids: [row.id] }).then(res => {
+    gsxtYpbgDeleteEntity({ ids: [row.id] }).then(res => {
       proxy.$message.success('删除成功');
       getList();
     }).catch(() => {
@@ -192,9 +192,9 @@ const selfCreateResearch = (type = 'add') => {
   addForm.value.init(type, null, '01');
 }
 /** 创建报告 */
-const createReport = (row) => {
+const createReport = (type,row) => {
-  const type = !row.id ? 'add' : 'edit'
+  console.log(row);
-  reportTc.value.init(type, row?.ypbg || {}, row)
+  reportTc.value.init(type, row)
   // currRow.value = { ...row }
   // isShowReport.value = true
 }

src/views/home/index.vue

@@ -253,27 +253,75 @@ const handleOpenNotification = () => {
 }
 const makerCenter = () => {
   const dw = require("@/assets/point/dingwei.png")
-  qcckGet({},'/mosty-gsxt/lzJcjPjdb/selectCount').then(res=>{
+  // qcckGet({},'/mosty-gsxt/lzJcjPjdb/selectCount').then(res=>{
-  // qcckGet({},'/mosty-gsxt/tbYjxx/selectSsbm').then(res=>{
+  // // qcckGet({},'/mosty-gsxt/tbYjxx/selectSsbm').then(res=>{
-    emitter.emit('deletePointArea','hm')
+  //   emitter.emit('deletePointArea','hm')
-    let list = res || [];
+  //   let list = res || [];
+  //   list.forEach(item => {
+  //     (item.jqjb || []).forEach(v=>{
+  //       v.jbmc = D_BZ_JQDJ.value.find(itm => itm.value == v.jbdm).label
+  //     })
+  //     let obj = centralPoint.find(i => i.name == item.ssbm || i.ssbmdm == item.ssbmdm);
+  //     if(obj){
+  //       item.jd = obj.point[0];
+  //       item.wd = obj.point[1];
+  //     }
+  //   })
+
+
+  //   allDep.value = list;
+  //   console.log( allDep.value);
+
+  //   emitter.emit("addPointArea", { coords:list, icon: dw, flag: "hm", size: '14px', showTitle: false, offset: [0, -25] });
+  // })
+
+
+
+  qcckGet({}, '/mosty-gsxt/lzJcjPjdb/selectCountNew').then(res => {
+    console.log(res);
+
+let list = res || [];
     list.forEach(item => {
-      (item.jqjb || []).forEach(v=>{
+      // (item.jqjb || []).forEach(v=>{
-        v.jbmc = D_BZ_JQDJ.value.find(itm => itm.value == v.jbdm).label
+      //   v.jbmc = D_BZ_JQDJ.value.find(itm => itm.value == v.jbdm).label
-      })
+      // })
+      // console.log(item);
+
+      // jbmc:item.jqjb.jbmc
       let obj = centralPoint.find(i => i.name == item.ssbm || i.ssbmdm == item.ssbmdm);
       if(obj){
         item.jd = obj.point[0];
         item.wd = obj.point[1];
       }
     })
-
-
     allDep.value = list;
-    console.log( allDep.value);
-
       emitter.emit("addPointArea", { coords:list, icon: dw, flag: "hm", size: '14px', showTitle: false, offset: [0, -25] });
+    // let obj = centralPoint.find(i => i.name == item.ssbm || i.ssbmdm == item.ssbmdm);
+    //  if(obj){
+    //     item.jd = obj.point[0];
+    //     item.wd = obj.point[1];
+    //   }
+  // qcckGet({},'/mosty-gsxt/tbYjxx/selectSsbm').then(res=>{
+    // emitter.emit('deletePointArea','hm')
+    // let list = res || [];
+    // list.forEach(item => {
+    //   (item.jqjb || []).forEach(v=>{
+    //     v.jbmc = D_BZ_JQDJ.value.find(itm => itm.value == v.jbdm).label
+    //   })
+    //   let obj = centralPoint.find(i => i.name == item.ssbm || i.ssbmdm == item.ssbmdm);
+    //   if(obj){
+    //     item.jd = obj.point[0];
+    //     item.wd = obj.point[1];
+    //   }
+    // })
+
+
+    // allDep.value = list;
+    // console.log( allDep.value);
+
+    // emitter.emit("addPointArea", { coords:list, icon: dw, flag: "hm", size: '14px', showTitle: false, offset: [0, -25] });
   })
+
 }
 //播放音频
 const ispLayBack = ref(true)