diff --git a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue
index 8d40c26..0034773 100644
--- a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue
+++ b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/IntelligentParsing.vue
@@ -1,82 +1,54 @@
 <template>
   <!-- 弹框 -->
   <el-dialog v-model="dialogVisible" title="智能解析数据" width="80vw">
-    <div style="max-height: 250px; overflow-y: auto; padding-right: 8px">
-      <div
-        v-for="(item, index) in tableData"
-        :key="index"
-        style="font-weight: 700; font-size: 20px; margin-bottom: 20px"
-      >
-        发掘文本{{ index + 1 }}:<span class="text-danger">
-          {{ item.fjWb }}</span
-        >
+    <div class="infoCnt">
+      <div class="baseInfo">
+        <div v-for="(item, index) in tableData" :key="index" >
+          发掘文本{{ index + 1 }}:<span class="text-danger">{{ item.fjWb }}</span>
+        </div>
       </div>
-    </div>
-
-    <MyTable
-      :tableData="pageData.dtoList"
-      :tableColumn="pageData.tableColumn"
-      :tableHeight="pageData.tableHeight"
-      :key="pageData.keyCount"
-      :tableConfiger="pageData.tableConfiger"
-      :controlsWidth="pageData.controlsWidth"
-      :row-class-name="({ row }) => (row.status ? '' : 'row-deleted')"
-    >
-      <!-- 管辖单位 -->
-      <template #gxDwDm="{ row }">
-        <el-select
-          v-model="row.gxDwDm"
-          placeholder="请选择管辖单位"
-          style="width: 130px"
-          @change="handleDeptChange('gxDwMc', $event, row)"
-          :disabled="!row.status"
-        >
-          <el-option
-            v-for="item in deptList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value.toString()"
-          />
-        </el-select>
-      </template>
-      <!-- 是否关注 -->
-      <template #sfGz="{ row }">
-        <el-radio-group v-model="row.sfGz">
-          <el-radio
-            v-for="(item, index) in D_BZ_SF"
-            size="large"
-            :key="item.value"
-            :label="item.zdmc || item.label"
-            :value="item.dm || item.value"
-          ></el-radio>
-        </el-radio-group>
-      </template>
-      <!-- 管辖单位 -->
-      <template #ryFjZp="{ row }"> 照片上传 </template>
-      <template
-        v-for="item in pageData.tableColumn.filter(
-          (col) => !['gxDwDm', 'sfGz', 'ryFjZp'].includes(col.prop)
-        )"
-        #[item.prop]="{ row }"
+      <MyTable
+        :tableData="pageData.dtoList"
+        :tableColumn="pageData.tableColumn"
+        :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount"
+        :tableConfiger="pageData.tableConfiger"
+        :controlsWidth="pageData.controlsWidth"
+        :row-class-name="({ row }) => (row.status ? '' : 'row-deleted')"
       >
-        <el-input
-          style="width: 100px"
-          v-model="row[item.prop]"
-          :placeholder="'请输入' + item.label"
-          :disabled="!row.status"
-        />
-      </template>
-      <!-- 操作列 -->
-      <template #controls="{ row, $index }">
-        <el-link v-if="row.status" type="danger" @click="delDictItem($index)">
-          删除
-        </el-link>
-        <el-link v-else type="primary" @click="recover($index)"> 恢复 </el-link>
-      </template>
-    </MyTable>
-    <div class="stats">
-      共 {{ pageData.dtoList.length }} 条数据， 其中
-      {{ pageData.dtoList.filter((x) => !x.status).length }} 条已标记删除
+        <!-- 管辖单位 -->
+        <template #gxDwDm="{ row }">
+          <el-select
+            v-model="row.gxDwDm"
+            placeholder="请选择管辖单位"
+            style="width: 130px"
+            @change="handleDeptChange('gxDwMc', $event, row)"
+            :disabled="!row.status"
+          >
+            <el-option v-for="item in deptList" :key="item.value" :label="item.label" :value="item.value.toString()"/>
+          </el-select>
+        </template>
+        <!-- 是否关注 -->
+        <template #sfGz="{ row }">
+          <el-radio-group v-model="row.sfGz">
+            <el-radio v-for="(item, index) in D_BZ_SF" size="large" :key="index" :label="item.zdmc || item.label" :value="item.dm || item.value"></el-radio>
+          </el-radio-group>
+        </template>
+        <!-- 管辖单位 -->
+        <template #ryFjZp="{ row }"> 照片上传 </template>
+        <template :key="idx" v-for="(item,idx) in pageData.tableColumn.filter((col) => !['gxDwDm', 'sfGz', 'ryFjZp'].includes(col.prop) )"  #[item.prop]="{ row }">
+          <el-input style="width: 100px" v-model="row[item.prop]" :placeholder="'请输入' + item.label"  :disabled="!row.status"  />
+        </template>
+        <!-- 操作列 -->
+        <template #controls="{ row, $index }">
+          <el-link v-if="row.status" type="danger" @click="delDictItem($index)">删除</el-link>
+          <el-link v-else type="primary" @click="recover($index)"> 恢复 </el-link>
+        </template>
+      </MyTable>
+      <div class="stats">
+        共 {{ pageData.dtoList.length }} 条数据， 其中
+        {{ pageData.dtoList.filter((x) => !x.status).length }} 条已标记删除
+      </div>
     </div>
     <template #footer>
       <div class="dialog-footer">
@@ -90,13 +62,7 @@
 <script setup>
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
-import {
-  reactive,
-  ref,
-  onMounted,
-  getCurrentInstance,
-  defineExpose
-} from "vue";
+import { reactive, ref, defineEmits,onMounted, getCurrentInstance, defineExpose } from "vue";
 import { selectUserDeptPage } from "@/api/user-manage";
 import { ElMessage } from "element-plus";
 const { proxy } = getCurrentInstance();
@@ -107,6 +73,7 @@ const props = defineProps({
     default: () => []
   }
 });
+const emit = defineEmits(['onSearch'])
 const dialogVisible = ref(false);
 const pageData = reactive({
   dtoList: [],
@@ -116,15 +83,13 @@ const pageData = reactive({
     showSelectType: "checkBox",
     loading: false
   },
-
-  tableHeight: 500,
+  tableHeight: 330,
   total: 0,
   pageConfiger: {
     pageSize: 20,
     pageCurrent: 1
   },
   controlsWidth: 80,
-
   tableColumn: [
     { label: "管辖单位", prop: "gxDwDm", showSolt: true, width: 200 },
     { label: "姓名", prop: "ryXm", showSolt: true, width: 130 },
@@ -142,7 +107,6 @@ const pageData = reactive({
     { label: "附件照片", prop: "ryFjZp", showSolt: true, width: 130 }
   ]
 });
-
 const deptList = ref([]); //部门列表
 onMounted(() => {
   getdepartmentList();
@@ -158,26 +122,17 @@ const getdepartmentList = () => {
 };
 const handleDeptChange = (nameField, selectedValue, row) => {
   // 找到选中的部门
-  const selectedDept = deptList.value.find(
-    (item) => item.value.toString() === selectedValue
-  );
+  const selectedDept = deptList.value.find((item) => item.value.toString() === selectedValue);
   // 更新名称
   row[nameField] = selectedDept ? selectedDept.label : "";
 };
 const init = () => {
   dialogVisible.value = true;
-  let url = "/mosty-gsxt/tbGsxtRqfjRy/createCbfj";
-  qcckGet({}, url)
-    .then((res) => {
-      console.log(res);
-      pageData.dtoList = res.map((item) => ({
-        ...item,
-        status: true
-      }));
-    })
-    .catch(() => {
-      pageData.tableConfiger.loading = false;
-    });
+  qcckGet({}, "/mosty-gsxt/tbGsxtRqfjRy/createCbfj").then((res) => {
+    pageData.dtoList = res.map((item) => ({ ...item,  status: true }));
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
 };
 // 删除方法
 const delDictItem = (index) => {
@@ -192,14 +147,12 @@ const recover = (index) => {
 // 提交
 const submitData = () => {
   const validData = pageData.dtoList.filter((item) => item.status);
-  qcckPost(validData, "/mosty-gsxt/tbGsxtRqfjRy/saveList")
-    .then((res) => {
-      ElMessage.success("新增成功");
-      dialogVisible.value = false;
-      emit("onSearch");
-      close();
-    })
-    .catch(() => {});
+  qcckPost(validData, "/mosty-gsxt/tbGsxtRqfjRy/saveList").then((res) => {
+    ElMessage.success("新增成功");
+    dialogVisible.value = false;
+    emit("onSearch");
+    close();
+  })
 };
 
 defineExpose({ init });
@@ -211,7 +164,23 @@ defineExpose({ init });
   background-color: #fef0f0;
   color: #f56c6c;
 }
-.text-danger {
-  font-weight: 500;
+
+
+.infoCnt{
+  height: 63vh;
+}
+.baseInfo{
+  font-size: 16px;
+  max-height: 230px;
+  overflow: hidden;
+  overflow-y: auto;
+  line-height: 24px;
+  color: #000;
+  font-weight: 600;
+  letter-spacing: 1px;
+  .text-danger {
+    color: #333;
+    font-weight: normal;
+  }
 }
 </style>
diff --git a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/detailForm.vue b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/detailForm.vue
deleted file mode 100644
index 88c87c3..0000000
--- a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/detailForm.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <div class="dialog" v-if="dialogForm">
-    <div class="head_box">
-      <span class="title">3D打印业务信息详情</span>
-      <div>
-        <el-button size="small" @click="close">关闭</el-button>
-      </div>
-    </div>
-    <div class="cntinfo">
-      <el-form :model="listQuery" :label-width="230" label-position="left">
-        <div class="form-row">
-          <el-form-item label="业务流水号码">
-            <el-input v-model="listQuery.ywlsh" placeholder="01131213"/>
-          </el-form-item>
-          <el-form-item label="单位名称">
-            <el-input v-model="listQuery.dwmc" placeholder="老王打印店"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="场所名称">
-            <el-input v-model="listQuery.csmc" placeholder="老王打印店"/>
-          </el-form-item>
-          <el-form-item label="3D打印设备品牌型号">
-            <el-input v-model="listQuery.sbppxh" placeholder="sa5421321321"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="3D打印设备号码">
-            <el-input v-model="listQuery.sbhm" placeholder="1002"/>
-          </el-form-item>
-          <el-form-item label="3D打印设备数量">
-            <el-input v-model="listQuery.sbsl" placeholder="5"/>
-          </el-form-item>
-        </div>
-
-        <div class="form-row">
-          <el-form-item label="3D打印材料名称">
-            <el-input v-model="listQuery.clmc" placeholder="塑料"/>
-          </el-form-item>
-          <el-form-item label="申请单位单位名称">
-            <el-input v-model="listQuery.sqdwmc" placeholder="xxxxx单位"/>
-          </el-form-item>
-        </div>
-      </el-form>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive } from 'vue';
-
-const dialogForm = ref(false);
-const listQuery = ref({});
-
-// 初始化数据
-const init = (type, row) => {
-  dialogForm.value = true;
-  // 根据type和row初始化表单数据
-};
-
-const close = () => {
-  dialogForm.value = false;
-};
-
-defineExpose({init})
-</script>
-
-<style lang="scss" scoped>
-.dialog {
-  padding: 20px;
-
-  :deep(.el-form-item__label) {
-    background-color: #F7FAFB;
-    padding: 0px 8px;
-    color: #000;
-    font-weight: 500;
-    border: 1px solid #E3E7ED;
-  }
-
-  .head_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20px;
-  }
-  .cntinfo{
-    height: calc(100% - 70px);
-    overflow: hidden;
-    overflow-y: auto;
-  }
-
-  .form-row {
-    display: flex;
-    
-    .el-form-item {
-      flex: 1;
-    }
-  }
-  .image-group {
-    display: flex;
-    gap: 10px;
-    flex-wrap: wrap;
-  
-    
-    .image-item {
-      width: 150px;
-      height: 150px;
-      border: 1px solid #dcdfe6;
-      
-      .el-image {
-        width: 100%;
-        height: 100%;
-      }
-    }
-  }
-
-   ::v-deep .el-input__inner{
-    height: 36px !important;
-    line-height: 36px !important;
-    border-radius: 0;
-    color: #777575;
-  }
-}
-.el-form-item--default{
-  margin-bottom: 0px;
-}
-</style>
diff --git a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/model.vue b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/model.vue
new file mode 100644
index 0000000..4f09114
--- /dev/null
+++ b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/components/model.vue
@@ -0,0 +1,81 @@
+<template>
+  <el-dialog v-model="modelValue" title="等级切换" width="500px" @close="handleClose">
+    <el-form :model="listQuery" ref="formValidate" :rules="rules">
+        <el-form-item prop="fxDj" label="风险等级" v-if="props.type == '级别变更'">
+            <MOSTY.Select filterable v-model="listQuery.fxDj" :dictEnum="props.dic.D_GS_RQFJ_FXDJ" width="100%" clearable placeholder="请选择风险等级"/>
+        </el-form-item>
+        <el-form-item prop="ssbmdm" label="所属部门" v-if="props.type == '警种变更'">
+            <MOSTY.Department filterable v-model="listQuery.ssbmdm" width="100%" clearable placeholder="请选择所属部门"/>
+        </el-form-item>
+        <el-form-item prop="uid" label="选择民警" v-if="props.type == '指定分配'">
+            <MOSTY.Other @click="chooseUserVisible = true" readonly v-model="listQuery.uidMc" width="100%" clearable placeholder="请选择选择民警"/>
+        </el-form-item>
+    </el-form>
+    <template #footer>
+        <div class="tc">
+            <el-button @click="handleClose">取消</el-button>
+            <el-button type="primary" @click="submitForm">确定</el-button>
+        </div>
+    </template>
+</el-dialog>
+<ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" />
+
+</template>
+
+<script setup>
+import ChooseUser from "@/components/MyComponents/ChooseUser/index.vue";
+import { ElMessage } from "element-plus";
+import { qcckPost } from "@/api/qcckApi.js";
+import * as MOSTY from "@/components/MyComponents/index";
+import { ref ,defineProps,defineEmits, reactive} from 'vue';
+const props = defineProps({
+    modelValue:{
+        type:Boolean,
+        default:false
+    },
+    ids:{
+        type:Array,
+        default:[]
+    },
+    type:String,
+    dic:Object
+})
+const chooseUserVisible = ref(false)
+const roleIds = ref([])
+const emits = defineEmits(["update:modelValue",'getDepValue']);
+const formValidate = ref()
+const rules = reactive({
+    fxDj: [{ required: true, message: "请选择风险等级", trigger: "change" }],
+    ssbmdm: [{ required: true, message: "请选择所属部门", trigger: "change" }],
+    uid: [{ required: true, message: "请选择民警", trigger: "change" }],
+})
+const listQuery = ref({});
+
+const handleUserSelected = (val) => {
+    listQuery.value.uid = val[0].id;
+    listQuery.value.uidMc = val[0].userName;
+    roleIds.value = [val[0].id]
+}
+
+const submitForm  = () =>{
+    formValidate.value.validate((valid) => {
+        if (!valid) return false;
+        let params = { ids:props.ids, ...listQuery.value  }
+        let url = props.type == '指定分配' ? '/mosty-gsxt/tbGsxtRqfjRy/updateByMj':'/mosty-gsxt/tbGsxtRqfjRy/updateByFxDj'
+        qcckPost(params,url).then(res=>{
+            ElMessage.success("修改成功");
+            emits('update:modelValue',false)
+            emits('change')
+        })
+    })
+}
+
+const handleClose = () =>{
+    emits('update:modelValue',false)
+    formValidate.value.resetFields();
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue
index 08c9e7a..f2430c4 100644
--- a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue
+++ b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue
@@ -1,34 +1,19 @@
 <template>
   <div class="statistical-analysis">
     <!-- 左侧树形菜单 -->
-    <ul class="left-menu">
-      <li class="f20">重点人初步发掘</li>
-      <li class="left-menu-item" v-for="(it, idx) in btnsList" :key="idx">
-        {{ it }}
-      </li>
-    </ul>
+    <div class="left-menu">
+      <CheckBox :data="checkData" customClass="all" @changeData="changeData"></CheckBox>
+    </div>
     <!-- 右侧内容区 -->
     <div class="right-content">
-      <Search
-        :searchArr="searchConfiger"
-        @submit="onSearch"
-        @reset="onReset"
-        :key="pageData.keyCount"
-      >
-        <template #defaultSlot>
-          <CheckBox :data="checkData" @changeData="changeData"></CheckBox>
-        </template>
-      </Search>
-      <div class="tableCnt mb10 pl10 pr10">
+      <Search :searchArr="searchConfiger"  @submit="onSearch"> </Search>
+      <div class="tableCnt1 mb10 pl10 pr10">
         <PageTitle title="发掘内容" style="color: #333">
-          <el-button type="primary" size="small" @click="addEdit('add', '')">
+          <el-button type="primary" size="small" @click="handleData('add', '')">
             <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
-            <span style="vertical-align: middle" @click="addEdit('add', '')"
-              >新增</span
-            >
+            <span style="vertical-align: middle" @click="handleData('add', '')" >新增</span>
           </el-button>
           <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
             <span style="vertical-align: middle">导入内容</span>
           </el-button>
           <el-button type="danger" size="small" @click="exportData">
@@ -36,93 +21,33 @@
             <span style="vertical-align: middle">删除</span>
           </el-button>
         </PageTitle>
-        <div>
-          <MyTable
-            :tableData="pageData.tableData"
-            :tableColumn="pageData.tableColumn"
-            :tableHeight="pageData.tableHeight"
-            :key="pageData.keyCount"
-            :tableConfiger="pageData.tableConfiger"
-            :controlsWidth="pageData.controlsWidth"
-            @chooseData="chooseData"
-          >
-            <template #fjLx="{ row }">
-              <DictTag :tag="false" :value="row.fjLx" :options="D_GS_RQFJ_LX" />
-            </template>
-            <!-- 操作 -->
-            <template #controls="{ row }">
-              <el-link size="small" type="success" @click="addEdit('edit', row)"
-                >编辑</el-link
-              >
-              <el-link size="small" type="primary" @click="addEdit('info', row)"
-                >查看</el-link
-              >
-              <el-link size="small" type="danger" @click="deleteRow(row)"
-                >删除</el-link
-              >
-            </template>
-          </MyTable>
-          <div class="ww100 flex just-center mt8">
-            <el-button type="primary" @click="intelligent()"
-              >智能解析</el-button
-            >
-          </div>
+        <MyTable
+          :tableData="pageData.tableData"
+          :tableColumn="pageData.tableColumn"
+          :tableHeight="pageData.tableHeight"
+          :key="pageData.keyCount"
+          :tableConfiger="pageData.tableConfiger0"
+          :controlsWidth="pageData.controlsWidth"
+          @chooseData="chooseData"
+        >
+          <template #fjLx="{ row }">
+            <DictTag :tag="false" :value="row.fjLx" :options="D_GS_RQFJ_LX" />
+          </template>
+          <!-- 操作 -->
+          <template #controls="{ row }">
+            <el-link size="small" type="success" @click="handleData('edit', row)">编辑</el-link>
+            <el-link size="small" type="primary" @click="handleData('info', row)">查看</el-link>
+            <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+          </template>
+        </MyTable>
+        <div class="ww100 flex just-center mt8">
+          <el-button type="primary" @click="intelligent">智能解析</el-button>
         </div>
       </div>
       <div class="tableCnt mb10 pl10 pr10">
-        <PageTitle
-          title="模型智能识别/LP解析结果"
-          style="color: #333"
-        ></PageTitle>
+        <PageTitle title="模型智能识别/LP解析结果" style="color: #333" ></PageTitle>
         <div ref="searchBox" class="mb8">
-          <el-button type="primary" size="small" @click="addEdit('add', '')">
-            <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
-            <span style="vertical-align: middle">新增</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">一件布控</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">级别变更</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">警种变更</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">指定分配</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">添加标签</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">协控申请</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">撤控申请</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">移交管控</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">批量导入</span>
-          </el-button>
-          <el-button type="primary" size="small" @click="importData">
-            <el-icon style="vertical-align: middle"><Upload /></el-icon>
-            <span style="vertical-align: middle">导出</span>
-          </el-button>
-          <el-button type="danger" size="small" @click="exportData">
-            <el-icon style="vertical-align: middle"><Delete /></el-icon>
-            <span style="vertical-align: middle">批量删除</span>
-          </el-button>
+          <el-button :type="it == '批量删除' ? 'danger':'primary'" size="small" v-for="it in btnsList" :key="it"  @click="chooseType(it)"> {{ it }} </el-button>
         </div>
         <div>
           <MyTable
@@ -130,9 +55,9 @@
             :tableColumn="pageData.tableColumn2"
             :tableHeight="pageData.tableHeight2"
             :key="pageData.keyCount"
-            :tableConfiger="pageData.tableConfiger2"
+            :tableConfiger="pageData.tableConfiger"
             :controlsWidth="pageData.controlsWidth"
-            @chooseData="chooseData"
+            @chooseData="chooseDataBottom"
           >
             <template #fxDj="{ row }">
               <DictTag
@@ -159,12 +84,8 @@
             </template>
             <!-- 操作 -->
             <template #controls="{ row }">
-              <el-link size="small" type="danger" @click="deleteRow(row)"
-                >删除</el-link
-              >
-              <el-link size="small" type="primary" @click="viewDetails(row)"
-                >查看</el-link
-              >
+              <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+              <el-link size="small" type="primary" @click="viewDetails(row)">查看</el-link>
             </template>
           </MyTable>
           <Pages
@@ -173,19 +94,14 @@
             :tableHeight="pageData.tableHeight2"
             :pageConfiger="{
               ...pageData.pageConfiger,
-              total: pageData.total2
-            }"
-          ></Pages>
+              total: pageData.total  }"></Pages>
         </div>
       </div>
     </div>
-
-    <IntelligentParsing
-      :tableData="pageData.tableData"
-      ref="IntelligentParsingRef"
-    />
-
-    <addForm ref="addFormDiloag" @onSearch="onSearch" />
+    <!-- 弹窗智能分析 -->
+    <IntelligentParsing :tableData="pageData.tableData" ref="IntelligentParsingRef" />
+    <addForm ref="addFormDiloag" @onSearch="getModelList" />
+    <Jbbg v-model="isShow" :type="chooselx" :ids="ids" @change="getModelList" :dic="{D_GS_RQFJ_FXDJ}"></Jbbg>
   </div>
 </template>
 
@@ -196,43 +112,28 @@ 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 Jbbg from "./components/model.vue";
 import IntelligentParsing from "./components/IntelligentParsing.vue";
 import { ElMessage } from "element-plus";
-
-import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
+import { qcckGet } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
-import { Delete } from "@element-plus/icons";
-import { fa } from "element-plus/es/locale.mjs";
 const { proxy } = getCurrentInstance();
-const { D_GS_RQFJ_LX, D_GS_RQFJ_FXDJ, D_BZ_SF, D_GS_RQFJ_FXLB } = proxy.$dict(
-  "D_GS_RQFJ_LX",
-  "D_GS_RQFJ_FXDJ",
-  "D_BZ_SF",
-  "D_GS_RQFJ_FXLB"
-); //获取字典数据
+const { D_GS_RQFJ_LX, D_GS_RQFJ_FXDJ, D_BZ_SF, D_GS_RQFJ_FXLB } = proxy.$dict('D_GS_RQFJ_FXDJ',"D_GS_RQFJ_LX","D_GS_RQFJ_FXDJ","D_BZ_SF","D_GS_RQFJ_FXLB"); //获取字典数据
 const searchConfiger = ref([
-  {
-    label: "管辖部门",
-    prop: "department",
-    placeholder: "请选择管辖部门",
-    showType: "select"
-  },
-  { label: "是否关注", prop: "sfgz", showType: "defaultSlot" }
+  { label: "管辖部门", prop: "ssbm", placeholder: "请选择管辖部门", showType: "department" },
+  { label: "是否关注", prop: "sfgz", placeholder: "请选择是否关注", showType: "select", options:D_BZ_SF },
 ]);
-const addFormDiloag = ref();
-
 const checkData = reactive({
-  list: ["是", "否"],
-  hasChoose: ["是", "否"]
+  hasChoose: ["警情"],
+  list: ["警情","人力情报","线索","民警处置文本", "交通事故"],
 });
-const btnsList = ref([
-  "全部",
-  "警情",
-  "人力情报",
-  "线索",
-  "民警处置文本",
-  "交通事故"
-]);
+const btnsList = reactive(['级别变更','警种变更','指定分配','添加标签','批量导入','导出','批量删除'])
+
+const chooselx = ref('')
+const isShow = ref(false)
+const ids = ref([])
+
+const addFormDiloag = ref();
 const IntelligentParsingRef = ref();
 const searchBox = ref();
 const queryFrom = ref({});
@@ -240,20 +141,18 @@ const pageData = reactive({
   tableData: [],
   tableData2: [],
   keyCount: 0,
+  tableConfiger0: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
   tableConfiger: {
     rowHieght: 61,
     showSelectType: "checkBox",
     loading: false
   },
-  tableConfiger2: {
-    rowHieght: 61,
-    showSelectType: "checkBox",
-    loading: false,
-    showIndex: false
-  },
-  tableHeight: 230,
+  tableHeight: 190,
   total: 0,
-  total2: 0,
   pageConfiger: {
     pageSize: 20,
     pageCurrent: 1
@@ -261,46 +160,24 @@ const pageData = reactive({
   controlsWidth: 160,
   tableColumn: [
     { label: "发掘类型", prop: "fjLx", showSolt: true },
-    { label: "发掘文本	", prop: "fjWb" }
+    { label: "发掘文本	", prop: "fjWb",showOverflowTooltip:true }
   ],
   tableColumn2: [
-    { label: "姓名", prop: "ryXm" },
-    { label: "英文姓名", prop: "ryXmYw" },
-    { label: "别名", prop: "ryBm" },
-    { label: "网名", prop: "ryWm" },
-    { label: "绰号", prop: "ryCh" },
-    { label: "手机号码", prop: "rySjhm" },
-    { label: "身份证号码", prop: "rySfzh" },
-    { label: "户籍地址", prop: "ryHjdz" },
-    { label: "护照号码", prop: "ryHzhm" },
-    { label: "现住地址", prop: "ryXzdz" },
-    { label: "银行卡号", prop: "ryYhkh" },
-    { label: "附件照片", prop: "ryFjZp" },
-    { label: "管辖单位", prop: "gxDwDm" },
-    { label: "风险等级", prop: "fxDj", showSolt: true },
-    { label: "风险类别", prop: "fxLb", showSolt: true },
-    { label: "是否关注", prop: "sfGz", showSolt: true },
-    { label: "是否转布控人员", prop: "sfZbkry", showSolt: true },
-    { label: "是否转重点人员", prop: "sfZzdry", showSolt: true }
+    { label: "姓名", prop: "ryXm",showOverflowTooltip:true },
+    { label: "手机号码", prop: "rySjhm",showOverflowTooltip:true },
+    { label: "身份证号码", prop: "rySfzh",showOverflowTooltip:true },
+    { label: "户籍地址", prop: "ryHjdz" ,showOverflowTooltip:true},
+    { label: "护照号码", prop: "ryHzhm" ,showOverflowTooltip:true},
+    { label: "现住地址", prop: "ryXzdz" ,showOverflowTooltip:true},
+    { label: "附件照片", prop: "ryFjZp" ,showOverflowTooltip:true},
+    { label: "管辖单位", prop: "gxDwDm" ,showOverflowTooltip:true},
+    { label: "风险等级", prop: "fxDj",showOverflowTooltip:true, showSolt: true },
+    { label: "风险类别", prop: "fxLb",showOverflowTooltip:true, showSolt: true },
+    { label: "是否关注", prop: "sfGz",showOverflowTooltip:true, showSolt: true },
+    { label: "是否转布控人员", prop: "sfZbkry",showOverflowTooltip:true, showSolt: true },
+    { label: "是否转重点人员", prop: "sfZzdry",showOverflowTooltip:true, showSolt: true }
   ]
 });
-// 树形菜单数据
-const treeData = ref([
-  {
-    label: "林芝市公安局（200）",
-    children: [
-      { label: "工布江达县公安局（100）" },
-      { label: "工布江达城区派出所（10）" },
-      { label: "某某某派出所（10）" },
-      { label: "某某某公安局（100）" }
-    ]
-  }
-]);
-
-const defaultProps = {
-  children: "children",
-  label: "label"
-};
 
 // 搜索
 const onSearch = (val) => {
@@ -308,6 +185,7 @@ const onSearch = (val) => {
   pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
+
 const changeNo = (val) => {
   pageData.pageConfiger.pageCurrent = val;
   getModelList();
@@ -316,72 +194,60 @@ const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
   getModelList();
 };
+
 // 获取内容列表
 const getList = (val) => {
   pageData.tableConfiger.loading = true;
   let data = { ...queryFrom.value };
   let url = "/mosty-gsxt/tbGsxtRqfjNr/selectPage";
-  qcckGet(data, url)
-    .then((res) => {
-      pageData.tableData = res.records || [];
-      pageData.tableConfiger.loading = false;
-    })
-    .catch(() => {
-      pageData.tableConfiger.loading = false;
-    });
+  qcckGet(data, url).then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
 };
+
 //获取模型识别列表
 const getModelList = (val) => {
-  pageData.tableConfiger2.loading = true;
   let data = { ...pageData.pageConfiger };
   let url = "/mosty-gsxt/tbGsxtRqfjRy/selectPage";
-  qcckGet(data, url)
-    .then((res) => {
-      pageData.tableData2 = res.records || [];
-      pageData.total2 = res.total;
-      pageData.tableConfiger2.loading = false;
-    })
-    .catch(() => {
-      pageData.tableConfiger2.loading = false;
-    });
+  qcckGet(data, url).then((res) => {
+    pageData.tableData2 = res.records || [];
+    pageData.total = res.total;
+  })
 };
-//新增编辑
-const addEdit = (type, row) => {
+//新增- 编辑
+const handleData = (type, row) => {
   addFormDiloag.value.init(type, row);
 };
+// 智能解析
 const intelligent = () => {
   IntelligentParsingRef.value.init();
 };
-const submitData = () => {
-  dialogVisible.value = false;
-};
-// 事件处理函数
-const handleNodeClick = (data) => {
-  console.log(data);
-};
 //删除操作
 const deleteRow = (row) => {
-  qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/closeById/" + row.id)
-    .then((res) => {
-      ElMessage.success("删除成功");
-      getList();
-    })
-    .catch(() => {});
-};
-const handleDateChange = () => {
-  // 处理日期变化
+  qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/closeById/" + row.id).then((res) => {
+    ElMessage.success("删除成功");
+    getList();
+  })
 };
 
-const handleExport = () => {
-  // 处理导出
-};
+
+// 选择数据
+const chooseDataBottom = (val) =>{
+  if(Array.isArray(val)) ids.value = val.map(item=>item.id);
+}
+
+const chooseType = (val)=>{
+  if(ids.value.length == 0) return ElMessage.warning("请选择对应的数据");
+  chooselx.value = val;
+  isShow.value = true;
+}
 
 const tabHeightFn = () => {
-  pageData.tableHeight2 =
-    window.innerHeight - searchBox.value.offsetHeight - 690;
-  window.onresize = function () {
-    tabHeightFn();
-  };
+  pageData.tableHeight2 = window.innerHeight - searchBox.value.offsetHeight - 650;
+  window.onresize = function () { tabHeightFn(); };
 };
 
 onMounted(() => {
@@ -398,34 +264,53 @@ onMounted(() => {
   .left-menu {
     float: left;
     width: 280px;
-    height: calc(100% - 20px);
-    padding: 20px;
+    height: calc(100% - 10px);
+    padding: 20px 4px;
     margin-top: 20px;
     border-radius: 4px;
     background-color: #fff;
     border-right: 1px solid #e8e8e8;
     color: #333;
     line-height: 32px;
-    text-align: center;
-    .left-menu-item {
-      border-bottom: 1px solid #e8e8e8;
-      &:hover {
-        color: #409eff;
-        background: rgba(0, 0, 0, 0.1);
+    ::v-deep .checkBox{
+      flex-direction: column;
+      .checkall{
+        margin: 0;
       }
     }
+    ::v-deep .el-checkbox-group{
+      display: flex;
+      flex-direction: column;
+    }
+    ::v-deep .is-checked{
+      background: rgb(242, 249, 255);
+      margin-bottom: 4px;
+    }
+    ::v-deep .el-checkbox{
+      padding-left: 8px;
+      margin-right: 4px;
+    }
+    .all{
+      width: calc(100% - 4px);
+    }
+   
   }
   .right-content {
     float: left;
-    width: calc(100% - 402px);
+    width: calc(100% - 290px);
     height: 100%;
     padding: 0 20px 0;
     margin-top: 20px;
     margin-left: 10px;
     border-radius: 4px;
     box-sizing: border-box;
+    .tableCnt1{
+      height: 290px;
+      background: #fff;
+      border-radius: 4px;
+    }
     .tableCnt {
-      height: calc((100vh - 253px) / 2);
+      height: calc(100vh - 257px - 290px);
       background: #fff;
       border-radius: 4px;
     }