From 11a32b8fe89cf0f71d4224960bcf6e94943af467 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Sun, 6 Jul 2025 15:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DatAcquisition/components/addForm.vue     |   2 +-
 .../ResearchJudgment/DatAcquisition/index.vue |   8 +-
 .../components/addForm.vue                    | 127 ++++++++++++------
 .../components/addPeo.vue                     |  73 +++++-----
 .../IntelligenceManagement/index.vue          | 124 +++++++----------
 .../MoralAnalysis/components/editAddForm.vue  |  42 +++---
 .../ResearchJudgment/MoralAnalysis/index.vue  |  95 ++++++++-----
 7 files changed, 268 insertions(+), 203 deletions(-)

diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
index 79898b1..6a818b8 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue
@@ -158,7 +158,7 @@ const deleteRow = (index) =>{
 const submit = () => {
   elform.value.submit((data) => {
     let url = title.value == "新增"  ? "/mosty-gsxt/qbcj/add" : "/mosty-gsxt/qbcj/update";
-    let params = { ...data ,ryList:pageForm.tableData,cjLx:'01'};
+    let params = { ...data ,ryList:pageForm.tableData,cjLx:'0'};
     params.fjdz = fjdz.value.length > 0 ? fjdz.value.join(','):'';
     loading.value = true;
     qcckPost(params, url).then((res) => {
diff --git a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
index 1002935..04193d4 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index.vue
@@ -39,6 +39,7 @@
           <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
         </template>
         <template #shzt="{row}">
+          <!-- 采纳（将这条信息推送到情报管理）,退回！ -->
           <DictTag :tag="false" :value="row.shzt" :options="D_BZ_XSSHZT" @clickTag="clickTag(row.shzt)" />
         </template>
         <!-- 操作 -->
@@ -92,7 +93,6 @@
 </template>
 
 <script setup>
-import * as MOSTY from "@/components/MyComponents/index";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -171,7 +171,7 @@ const cancel = (row) =>{
 const handleSumbit = (row) =>{
   rules.bhyy = !chooseRow.value.bhyy ? true :false;
   if(chooseRow.value.shzt == '01' && rules.bhyy) return false;
-  let data = { ...chooseRow.value ,cjLx:'01'}
+  let data = { ...chooseRow.value }
   qcckPost(data,'/mosty-gsxt/qbcj/updateByXssh').then(res=>{
     row.visible = false;
     proxy.$message({ type: "success",  message: "审核成功" });
@@ -199,7 +199,7 @@ const changeSize = (val) =>{
 // 获取列表
 const getList = () =>{
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value,cjLx:'0' };
   qcckGet(data,'/mosty-gsxt/qbcj/selectPage').then(res=>{
     pageData.tableData = res.records || [];
     pageData.total = res.total;
@@ -226,7 +226,7 @@ const addEdit = (type, row) => {
 };
 
 const clickTag = (val) =>{
-  if(val == '01')  router.push('/IntelligenceManagement');
+  if(val == '02')  router.push('/IntelligenceManagement');
 }
 
 // 表格高度计算
diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addForm.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addForm.vue
index da25d6a..a90b95d 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addForm.vue
@@ -2,14 +2,9 @@
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
       <span class="title">人力情报信息采集流转详情</span>
-      <div>
-        <el-button @click="close">保存</el-button>
-        <el-button @click="close">暂存</el-button>
-        <el-button @click="close">关闭</el-button>
-      </div>
     </div>
     <div class="form_cnt">
-      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+      <FormMessage disabled 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>
@@ -21,10 +16,13 @@
           </div>
         </template>
         <template #scfj>
-          <div style="width: 100%;">上传附件: <el-button size="small" type="primary">上传附件</el-button> <span class="f12">（可附电子表格、Word文档、图像、音视频文件）</span></div>
+          <div style="width: 100%;padding-left: 50px;">
+            <div>上传附件:<span class="f12">（可附电子表格、Word文档、图像、音视频文件）</span> </div>
+            <div><MOSTY.Upload :showBtn="true" disabled :limit="10" v-model="fjdz" /> </div>
+          </div>
         </template>
       </FormMessage>
-      <el-divider content-position="left"><span class="mr20">相关人员</span>  <el-button type="primary" size="small" @click="showPeo = true,peoTitle = '新增人员'">添加人员</el-button></el-divider>
+      <el-divider content-position="left"><span class="mr20">相关人员</span> </el-divider>
       <MyTable
         :tableData="pageForm.tableData"
         :tableColumn="pageForm.tableColumn"
@@ -32,52 +30,62 @@
         :key="pageForm.keyCount"
         :tableConfiger="pageForm.tableConfiger"
         :controlsWidth="pageForm.controlsWidth"
-        @chooseData="chooseData"
       >
+      <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>
         <!-- 操作 -->
-        <template #controls="{ row }">
-          <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link >
-          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
-          <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+        <template #controls="{ row,index }">
+          <el-link size="small" type="success" @click="addEdit('detail', row,index)">编辑</el-link>
         </template>
       </MyTable>
     </div>
-
     <!-- 人员 -->
-    <AddPeo v-model="showPeo" :dic="props.dic" :title="peoTitle"></AddPeo>
+    <AddPeo ref="showAdd" :dic="props.dic" @change="getPeo"></AddPeo>
   </div>
 </template>
 
 <script setup>
+import * as MOSTY from "@/components/MyComponents/index";
 import AddPeo from './addPeo.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, nextTick } from "vue";
-const emit = defineEmits(["updateDate"]);
+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([
-  { label: "", prop: "gapdive", type: "slot",width:'100%' },
-  { label: "线索编号", prop: "xsbh", type: "input",},
-  { label: "线索名称", prop: "xsmc", type: "input" },
-  { label: "线索类型", prop: "xslx", type: "select", options:props.dic.D_GS_XS_LX },
-  { label: "情报来源", prop: "qbly", type: "select", options:props.dic.D_GS_XS_LY},
+  { 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: "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: "fjWb", type: "department"},
+  { label: "线索报送单位", prop: "ssbmdm", type: "department"},
 ]);
+const fjdz = ref()
 const listQuery = ref({}); //表单
 const loading = ref(false);
 const elform = ref();
@@ -93,50 +101,75 @@ const pageForm = reactive({
   controlsWidth: 220,
   tableColumn: [
     { label: "姓名", prop: "xm" },
-    { label: "性别", prop: "xb" },
+    { label: "性别", prop: "xb",showSolt:true },
     { label: "身份证号", prop: "sfzh" },
-    { label: "户籍地", prop: "hjd" },
+    { label: "户籍地", prop: "hjdz" },
     { label: "户籍地派出所", prop: "hjdpcs" },
-    { label: "标签", prop: "bq" }
+    { label: "标签", prop: "bqList",showSolt:true }
   ]
 });
-const showPeo = ref(false)
-const peoTitle = ref('')
+const showAdd = ref()
 onMounted(()=>{
   tabHeightFn()
 })
 
+
 // 初始化数据
 const init = (type, row) => {
+  fjdz.value = []
   tabHeightFn()
   dialogForm.value = true;
   title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
   // 初始化表单数据，并根据详情页设置禁用状态
-  // if (row) getDataById(row.id);
+  if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({}, "/mosty-gsxt/tbGsxtRqfjNr/" + id).then((res) => {
-  //   listQuery.value = res;
-  // });
+  qcckGet({id}, "/mosty-gsxt/qbcj/selectByid").then((res) => {
+    listQuery.value = res;
+    pageForm.tableData = res.ryList || [];
+  });
 };
 
+// 打开弹窗
+const addEdit = (type,row,index) =>{
+  showAdd.value.init(type,row,index)
+}
+
+// 新增人员
+const getPeo = (val) =>{
+  if(val.type == '新增'){
+    pageForm.tableData.push(val.data);
+  }else{
+    pageForm.tableData.splice(val.index, 1, val.data); // 在索引2的位置删除一个元素，并插入newValue
+  }
+}
+
+const deleteRow = (index) =>{
+  pageForm.tableData.splice(index,1)
+}
+
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
-    let url = title.value == "新增"  ? "/mosty-gsxt/tbGsxtRqfjNr/save" : "/mosty-gsxt/tbGsxtRqfjNr/update";
-    let params = { ...data };
-    // qcckPost(params, url).then((res) => {
-    //     proxy.$message({ type: "success", message: title.value + "成功" });
-    //     emit("onSearch");
-    //     close();
-    //   })
-    //   .catch(() => {});
+    let url = title.value == "新增"  ? "/mosty-gsxt/qbcj/add" : "/mosty-gsxt/qbcj/update";
+    let params = { ...data ,ryList:pageForm.tableData,cjLx:'0'};
+    params.fjdz = fjdz.value.length > 0 ? fjdz.value.join(','):'';
+    loading.value = true;
+    qcckPost(params, url).then((res) => {
+      loading.value = false;
+      proxy.$message({ type: "success", message: title.value + "成功" });
+      emit("change");
+      close();
+    }).catch(() => {
+      loading.value = false;
+    });
   });
 };
 
 // 关闭
 const close = () => {
+  fjdz.value = []
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;
@@ -166,4 +199,18 @@ defineExpose({ init });
   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>
diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addPeo.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addPeo.vue
index 5273b91..89d59ba 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addPeo.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/addPeo.vue
@@ -1,10 +1,18 @@
 <template>
-  <el-dialog v-model="modelValue" :title="props.title" @close="close" :close-on-click-modal="false">
-    <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules"></FormMessage>
+  <el-dialog v-model="showDialog" :destroy-on-close="true" :title="title+'人员'" @close="close" :close-on-click-modal="false">
+    <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
+        <template #bqList>
+            <div class="marks pointer" >
+                <span style="color: rgb(175 178 184);padding-left: 10px;" v-if="!listQuery.bqList || listQuery.bqList.length == 0 ">请选择标签</span>
+                <span v-else >
+                    <el-tag type="success" v-for="(it,idx) in listQuery.bqList" :key="idx">{{ it.bqMc }}</el-tag >
+                </span>
+            </div>
+        </template>
+    </FormMessage>
     <template #footer>
         <div class="flex just-center">
             <el-button @click="close">取消</el-button>
-            <el-button type="primary" @click="submitForm">确认</el-button>
         </div>
     </template>
   </el-dialog>
@@ -14,34 +22,28 @@
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import { reactive, ref } from 'vue';
 const props = defineProps({
-    modelValue:{
-        type:Boolean,
-        default:false
-    },
     dic:{
         type:Object,
         default:{}
     },
-    title:{
-        type:String,
-        default:'新增人员'
-    }
 })
+const roleIds = ref([])
 const elform = ref()
-const emit = defineEmits('update:modelValue')
+const showDialog = ref(false)
+const emit = defineEmits(['change'])
 const listQuery = ref({})
 const formData = ref([
-    { label: "姓名", prop: "xm", type: "input" },
-    { label: "性别", prop: "xb", type: "select",options:props.dic.D_BZ_XB },
-    { label: "身份证号", prop: "sfzh", type: "input" },
-    { label: "户籍地", prop: "hjd", type: "input" },
-    { label: "户籍地派出所", prop: "hjdpcs", type: "input" },
-    { label: "标签", prop: "bq", type: "input" },
-    { label: "是否挑头人", prop: "sfdtr", type: "select",options:props.dic.D_BZ_SF },
-    { label: "是否响应人", prop: "sfxyr", type: "select" ,options:props.dic.D_BZ_SF },
-    { label: "所属群体", prop: "ssqt", type: "input" },
-    { label: "微信号", prop: "wxh", type: "input" },
-    { label: "QQ", prop: "qqh", type: "input" },
+    { label: "姓名", prop: "xm", type: "input" ,width:'48%'},
+    { label: "性别", prop: "xb", type: "select",options:props.dic.D_BZ_XB ,width:'48%'},
+    { label: "身份证号", prop: "sfzh", type: "input" ,width:'48%'},
+    { label: "户籍地", prop: "hjdz", type: "input",width:'48%' },
+    { label: "户籍地派出所", prop: "hjdpcsdm", type: "department" ,width:'48%'},
+    { label: "标签", prop: "bqList", type: "slot",width:'100%' },
+    { label: "是否挑头人", prop: "sfttr", type: "select",options:props.dic.D_BZ_SF ,width:'48%'},
+    { label: "是否响应人", prop: "sfxyr", type: "select" ,options:props.dic.D_BZ_SF,width:'48%' },
+    { label: "所属群体", prop: "ssqt", type: "input" ,width:'48%'},
+    { label: "微信号", prop: "wx", type: "input" ,width:'48%'},
+    { label: "QQ", prop: "qq", type: "input" ,width:'48%'},
 ])
 const rules = reactive({
     xm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
@@ -49,21 +51,30 @@ const rules = reactive({
     sfzh: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
     hjd: [{ required: true, message: "请输入户籍地", trigger: "blur" }],
 })
-
-const submitForm = () =>{
-    elform.value.submit(()=>{
-        
-    })
+const title = ref('')
+const order = ref(null)
+const init = (type,row,index) =>{
+    title.value = type == 'add' ? '新增' :'编辑';
+    order.value = index;
+    showDialog.value = true;
+    if(row) listQuery.value = {...row};
 }
 
 const close = () =>{
     elform.value.reset();
-    emit('update:modelValue',false)
+    showDialog.value = false;
 }
+
+defineExpose({init})
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-form-item--default {
-    width: 48% !important;
+
+.marks{
+    width: 100%;
+    width: 100%;
+    min-height: 32px;
+    border: 1px solid #e9e9e9;
+    border-radius: 4px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
index 2725446..b812e56 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
@@ -2,14 +2,10 @@
   <div>
     <div class="titleBox">
       <PageTitle title="人力情报信息采集流转">
-        <el-button type="primary" @click="addEdit('add', '')">
+        <el-button type="primary" @click="addEdit">
           <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
           <span style="vertical-align: middle">导出</span>
         </el-button>
-        <el-button type="danger" @click="addEdit('add', '')">
-          <el-icon style="vertical-align: middle"><Dete /></el-icon>
-          <span style="vertical-align: middle">批量删除</span>
-        </el-button>
       </PageTitle>
     </div>
     <!-- 搜索 -->
@@ -27,14 +23,22 @@
         :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData">
 
-        <template #shzt="{row}">
-          <span>采纳（将这条信息推送到）</span>
-          <span>退回！</span>
+        <template #xlLx="{row}">
+          <DictTag :tag="false" :value="row.xlLx" :options="D_GS_XS_LX" />
         </template>
+        <template #qbLy="{row}">
+          <DictTag :tag="false" :value="row.qbLy" :options="D_GS_XS_LY" />
+        </template>
+        <template #czzt="{row}">
+          <DictTag :tag="false" :value="row.czzt" :options="D_GS_XS_CZZT" />
+        </template>
+        <template #shzt="{row}">
+          <DictTag :tag="false" :value="row.shzt" :options="D_BZ_XSSHZT" />
+        </template>
+
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
-          <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
         </template>
       </MyTable>
       <Pages
@@ -48,7 +52,7 @@
       ></Pages>
     </div>
     <!-- 新增 -->
-    <AddForm ref="detailDiloag" :dic="{D_BZ_SF,D_BZ_XB,D_GS_XS_LY,D_BZ_SSZT,D_GS_XS_LX ,D_GS_XS_QTLX}" />
+   <AddForm ref="detailDiloag" v-if="isShow" :dic="{D_BZ_SF,D_BZ_XB,D_GS_XS_LY,D_BZ_SSZT,D_GS_XS_LX ,D_GS_XS_QTLX}" />
   </div>
 </template>
 
@@ -61,58 +65,23 @@ import AddForm from "./components/addForm.vue";
 import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const {D_GS_XS_LY, D_BZ_SSZT,D_BZ_SF,D_GS_XS_LX ,D_GS_XS_QTLX,D_BZ_XB} = proxy.$dict("D_GS_XS_LY","D_BZ_SSZT","D_BZ_SF","D_GS_XS_LX","D_GS_XS_QTLX","D_BZ_XB"); //获取字典数据
+const {D_GS_XS_CZZT,D_GS_XS_LY, D_BZ_SSZT,D_BZ_SF,D_GS_XS_LX ,D_GS_XS_QTLX,D_BZ_XB,D_BZ_XSSHZT} = proxy.$dict("D_GS_XS_CZZT","D_GS_XS_LY","D_BZ_SSZT","D_BZ_SF","D_GS_XS_LX","D_GS_XS_QTLX","D_BZ_XB","D_BZ_XSSHZT"); //获取字典数据
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
-
+const isShow = ref(false)
 const searchConfiger = ref([
-  { label: "线索名称", prop: 'clueTitle', placeholder: "请输入线索名称", showType: "input" },
-  { label: "语义关键字", prop: 'semanticKeywords', placeholder: "请输入语义关键字", showType: "input" },
-  { label: "线索类型", prop: 'clueType', placeholder: "请选择线索类型", showType: "select" },
-  { label: "线索来源", prop: 'clueSource', placeholder: "请选择线索来源", showType: "select" },
+  { label: "线索名称", prop: 'xsMc', placeholder: "请输入线索名称", showType: "input" },
+  { label: "内容关键字", prop: 'xsNr', placeholder: "请输入语义关键字", showType: "input" },
+  { label: "线索类型", prop: 'xlLx', placeholder: "请选择线索类型", showType: "select" },
+  { label: "线索来源", prop: 'qbLy', placeholder: "请选择线索来源", showType: "select" },
   { label: "线索状态", prop: 'xszt', placeholder: "请选择线索状态", showType: "select" },
-  { label: "处置状态", prop: 'czzt', placeholder: "请选择处置状态", showType: "select" },
-  { label: "开始时间", prop: 'startTime', placeholder: "请选择开始时间", showType: "date" },
-  { label: "结束时间", prop: 'endTime', placeholder: "请选择结束时间", showType: "date" },
-  { label: "指向地点", prop: 'targetLocation', placeholder: "请输入指向地点", showType: "input" },
+  { label: "开始时间", prop: 'zxkssj', placeholder: "请选择开始时间", showType: "date" },
+  { label: "结束时间", prop: 'zxjssj', placeholder: "请选择结束时间", showType: "date" },
+  { label: "指向地点", prop: 'zxdz', placeholder: "请输入指向地点", showType: "input" },
 ]);
 
 const pageData = reactive({
-  tableData: [
-    {
-      clueNo: "XS20240101001",
-      clueTitle: "可疑人员活动线索",
-      clueType: "人员线索",
-      clueSource: "群众举报",
-      startTime: "2024-01-01 08:00:00",
-      endTime: "2024-01-01 18:00:00",
-      targetLocation: "某市某区某街道",
-      clueContent: "发现多名可疑人员在该区域频繁出入，疑似从事非法活动。",
-      attachment: "report.pdf"
-    },
-    {
-      clueNo: "XS20240101002",
-      clueTitle: "涉毒交易线索",
-      clueType: "违法犯罪线索",
-      clueSource: "技术侦查",
-      startTime: "2024-01-02 10:00:00",
-      endTime: "2024-01-02 16:00:00",
-      targetLocation: "某市某区某小区",
-      clueContent: "监控发现多次可疑交易活动，疑似涉及违禁物品。",
-      attachment: "evidence.docx"
-    },
-    {
-      clueNo: "XS20240101003",
-      clueTitle: "非法聚集线索",
-      clueType: "群体性事件",
-      clueSource: "网络监控",
-      startTime: "2024-01-03 14:00:00",
-      endTime: "2024-01-03 22:00:00",
-      targetLocation: "某市某广场",
-      clueContent: "网络平台发现有组织策划非法聚集活动的信息。",
-      attachment: "online_evidence.zip"
-    }
-  ],
+  tableData: [],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -126,15 +95,17 @@ const pageData = reactive({
   },
   controlsWidth: 220,
   tableColumn: [
-    { label: "线索编号", prop: "clueNo" },
-    { label: "线索名称", prop: "clueTitle" },
-    { label: "线索类型", prop: "clueType" },
-    { label: "线索来源", prop: "clueSource" },
-    { label: "开始时间", prop: "startTime" },
-    { label: "结束时间", prop: "endTime" },
-    { label: "指向地点", prop: "targetLocation" },
-    { label: "线索内容", prop: "clueContent", width: 200 },
-    { label: "附件", prop: "attachment", solt: true },
+    { label: "线索编号", prop: "xsBh" },
+    { label: "线索名称", prop: "xsMc" },
+    { label: "线索类型", prop: "xlLx",showSolt:true },
+    { label: "线索来源", prop: "qbLy",showSolt:true },
+    { label: "开始时间", prop: "zxkssj" },
+    { label: "结束时间", prop: "zxjssj" },
+    { label: "指向地点", prop: "zxdz" },
+    { label: "线索内容", prop: "xsNr"},
+    { label: "处置状态", prop: "czzt",showSolt: true},
+    { label: "附件", prop: "fjdz", showSolt: true },
+    { label: "审核状态", prop: "shzt", showSolt: true },
   ]
 });
 
@@ -145,12 +116,7 @@ onMounted(() => {
   tabHeightFn();
 });
 
-//选择类型
-const handleType = (val) => {
-  pageData.keyCount++;
-  pageData.pageConfiger.pageCurrent = 1;
-  getList()
-}
+
 // 搜索
 const onSearch = (val) =>{
   queryFrom.value = {...val}
@@ -169,21 +135,21 @@ const changeSize = (val) =>{
 
 // 获取列表
 const getList = (val) =>{
-  // pageData.tableConfiger.loading = true;
+  pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  // let url = '/mosty-lzcj/tbDwMbkf/queryList';
-  // qcckPost(data,url).then(res=>{
-  //   pageData.tableData = res.records || [];
-  //   pageData.total = res.total;
-  //   pageData.tableConfiger.loading = false;
-  // }).catch(()=>{ pageData.tableConfiger.loading = false; })
+  qcckGet(data,'/mosty-gsxt/qbcj/selectPage').then(res=>{
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(()=>{ pageData.tableConfiger.loading = false; })
 }
 
 // 详情
 const addEdit = (type, row) => {
-  nextTick(()=>{
+  isShow.value = true;
+  setTimeout(()=>{
     detailDiloag.value.init(type, row);
-  })
+  },500)
 };
 
 // 表格高度计算
diff --git a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/editAddForm.vue b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/editAddForm.vue
index 054267d..89dcdbd 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/editAddForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/editAddForm.vue
@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="form_cnt">
-      <FormMessage :formList="formData" ref="elform" :rules="rules"></FormMessage>
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules"></FormMessage>
     </div>
   </div>
 </template>
@@ -16,7 +16,6 @@
 <script setup>
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import * as rule from "@/utils/rules.js";
 import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick } from "vue";
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
@@ -25,13 +24,16 @@ const props = defineProps({
 const { proxy } = getCurrentInstance();
 const dialogForm = ref(false); //弹窗
 const formData = ref([
-  { label: "语义名称", prop: "bqmc", type: "input", },
-  { label: "要素类型", prop: "sfbqdl",  type: "select", options: []  },
-  { label: "要素名称", prop: "sfbqxl",  type: "input", options: []  },
+  { label: "语义名称", prop: "yymc", type: "input", },
+  { label: "要素类型", prop: "yslx",  type: "input"},
+  { label: "要素名称", prop: "ysmc",  type: "input"},
   { label: "要素描述", prop: "ysms",  type: "textarea", width: "100%"  },
 ]);
 const rules = reactive({
-  bqmc: [{ required: true, message: "请输入标签名称", trigger: "blur" }]
+  yymc: [{ required: true, message: "请输入标签名称", trigger: "blur" }],
+  yslx: [{ required: true, message: "请输入要素类型", trigger: "blur" }],
+  ysmc: [{ required: true, message: "请输入要素名称", trigger: "blur" }],
+  ysms: [{ required: true, message: "请输入要素描述", trigger: "blur" }],
 });
 const listQuery = ref({}); //表单
 const loading = ref(false);
@@ -39,28 +41,32 @@ const elform = ref();
 const title = ref("");
 onMounted(() => {});
 // 初始化数据
-const init = (type, row,) => {
+const init = (type, id) => {
   dialogForm.value = true;
   title.value = type == 'add' ? "新增" : "编辑";
-  if (row) getDataById(row.id);
+  if (id) getDataById(id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({}, '/mosty-gsxt/tbGsxtBqgl/'+id).then((res) => {
-  //   listQuery.value = res;
-  // });
+  qcckGet({id}, '/mosty-gsxt/qbyy/selectByid').then((res) => {
+    listQuery.value = res;
+  });
 };
 
 // 提交
 const submit = () => {
   elform.value.submit((data)=>{
-    // let url =  title.value == "新增" ? '/mosty-gsxt/tbGsxtBqgl/save':'/mosty-gsxt/tbGsxtBqgl/update';
-    // let params = { ...data }
-    // qcckPost(params, url).then((res) => {
-    //   proxy.$message({ type: "success", message: title.value + "成功" });
-    //   emit("updateDate");
-    //   close();
-    // }).catch(() => {});
+    let url =  title.value == "新增" ? '/mosty-gsxt/qbyy/add':'/mosty-gsxt/qbyy/update';
+    let params = { ...data }
+    loading.value = true;
+    qcckPost(params, url).then((res) => {
+      loading.value = false;
+      proxy.$message({ type: "success", message: title.value + "成功" });
+      emit("updateDate");
+      close();
+    }).catch(()=>{
+      loading.value = false;
+    })
   });
 };
 
diff --git a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
index 6bac69e..b06cb80 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue
@@ -5,25 +5,28 @@
     </div>
     <div class="flex just-between">
       <!-- 左边 -->
-      <div class="ww49">
+      <div class="ww49" style="min-width: 647px;">
         <div ref="searchBox">
-          <Search :searchArr="searchConfiger" @submit="onSearch" />
+          <Search :searchArr="searchConfiger" @submit="onSearch">
+            <el-button type="primary" @click="addForm('add',null)">新增</el-button>
+          </Search>
         </div>
         <div class="tabBox">
           <MyTable
             :tableData="pageData.tableData"
             :tableColumn="pageData.tableColumn"
-            :tableHeight="pageData.tableHeight"
+            :tableHeight="pageData.tableHeight1"
             :key="pageData.keyCount"
             :tableConfiger="pageData.tableConfiger"
             :controlsWidth="pageData.controlsWidth"
             @chooseData="chooseData"
           >
             <template #controls="{ row }">
-              <el-link type="primary" @click="addEdit('edit', row)">编辑</el-link>
-              <el-link type="danger" @click="delDictItem([row.id])">删除</el-link>
+              <el-link type="primary" @click="addForm('edit', row.id)">编辑</el-link>
+              <el-link type="danger" @click="delDictItem(row.id)">删除</el-link>
             </template>
           </MyTable>
+          <div class="txetBox"></div>
           <div class="footBnt">
             <el-button type="primary">导入</el-button>
             <el-button type="primary">语义分析</el-button>
@@ -48,7 +51,7 @@
           >
             <template #controls="{ row }">
               <el-link type="primary" @click="addEdit('edit', row)">编辑</el-link>
-              <el-link type="danger" @click="delDictItem([row.id])">删除</el-link>
+              <el-link type="danger" @click="delDictItemRight(row.id)">删除</el-link>
             </template>
           </MyTable>
           <Pages
@@ -98,13 +101,14 @@ const searchConfiger = ref([
 ]);
 const queryFrom = ref({});
 const pageData = reactive({
-  tableData: [{ id: 1, xh: 1, yymc: "XX公司", yslx: "实体识别", ysmc: "组织", ysms: "林芝某公司", bz: "" }], //表格数据
+  tableData: [], //表格数据
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "checkBox",
+    showSelectType: "null",
     loading: false
   },
+  tableHeight1:300,
   tableConfigerR: {
     rowHieght: 61,
     showSelectType: null,
@@ -117,16 +121,19 @@ const pageData = reactive({
   }, //分页
   controlsWidth: 160, //操作栏宽度
   tableColumn: [
-    { label: "语义名称", prop: "yymc" },
-    { label: "要素类型", prop: "yslx" },
-    { label: "要素名称", prop: "ysmc" },
-    { label: "要素描述", prop: "ysms" },
+    { label: "语义名称", prop: "yymc",showOverflowTooltip:true },
+    { label: "要素类型", prop: "yslx",showOverflowTooltip:true },
+    { label: "要素名称", prop: "ysmc",showOverflowTooltip:true },
+    { label: "要素描述", prop: "ysms",showOverflowTooltip:true },
   ]
 });
 onMounted(() => {
   tabHeightFn();
+  getList();
 });
 
+
+
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
@@ -134,38 +141,57 @@ const onSearch = (val) => {
   getList();
 };
 
-const changeNo = (val) => {
-  pageData.pageConfiger.pageNum = val;
-  getList();
-};
-const changeSize = (val) => {
-  pageData.pageConfiger.pageSize = val;
-  getList();
-};
+
 
 const getList = () => {
-  // pageData.tableConfiger.loading = true;
-  // qcckGet(queryFrom.value).then((res)=>{
-  //   pageData.tableData = res.data.list;
-  //   pageData.total = res.data.total;
-  //   pageData.keyCount++;
-  //   pageData.tableConfiger.loading = false;
-  // })
+  pageData.tableConfiger.loading = true;
+  qcckGet(queryFrom.value,'/mosty-gsxt/qbyy/selectList').then((res)=>{
+    pageData.tableData = res || [];
+    pageData.tableConfiger.loading = false;
+  })
 };
 
 // 删除
-const delDictItem = (ids) => {
+const delDictItem = (id) => {
+  proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
+    qcckPost({id},'/mosty-gsxt/qbyy/delete').then(()=>{
+      proxy.$message({ type: "success",  message: "删除成功" });
+      getList();
+    })
+  }).catch(() => {});
+};
+
+// 删除右边
+const delDictItemRight = (id) => {
   // proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
-  //   qcckPost(ids,url).then(()=>{
+  //   qcckPost({id},'/mosty-gsxt/qbyy/delete').then(()=>{
   //     proxy.$message({ type: "success",  message: "删除成功" });
   //     getList();
   //   })
   // }).catch(() => {});
 };
 
+
+// 新增数据 -- 左边
+const addForm = (type, id) =>{
+  detailDiloag.value.init(type, id);
+}
+
+
+const changeNo = (val) => {
+  // pageData.pageConfiger.pageNum = val;
+  // getListR();
+};
+const changeSize = (val) => {
+  // pageData.pageConfiger.pageSize = val;
+  // getListR();
+};
+
+
+
 // 新增
 const addEdit = (type, row) => {
-  detailDiloag.value.init(type, row);
+  
 };
 
 // 表格高度计算
@@ -185,6 +211,15 @@ const tabHeightFn = () => {
   display: flex;
   justify-content: center;
 }
+.txetBox{
+  position: absolute;
+  bottom: 50px;
+  height: 210px;
+  width: 100%;
+  padding: 0 10px;
+  box-sizing: border-box;
+  background: red;
+}
 </style>
 
 <style>