更新页面

src/App.vue

@@ -41,6 +41,7 @@ const initPage = async () => {
   } catch (err) {
     proxy.$message({ type: "error",  message: "加载失败，请刷新页面" });
     imgIsLoad = false;
+    // initPage()
   }
 }
 

src/views/backOfficeSystem/IntelligentControl/DeploymentArea/components/addForm.vue

@@ -10,8 +10,8 @@
             <el-form-item label="区域级别" prop="qyjb">
                 <MOSTY.Select v-model="listQuery.qyjb" filterable :dictEnum="props.dic.D_ZDY_QYJB" width="100%" clearable placeholder="请选择区域类型"/>
             </el-form-item>
-            <el-form-item label="行政区划" prop="xzqh" v-if="listQuery.qylx == 'xzqh'">
+            <el-form-item label="行政区划" prop="xzqhdm" v-if="listQuery.qylx == 'xzqh'">
-                <MOSTY.Select v-model="listQuery.xzqh" filterable :dictEnum="props.dic.D_BZ_XZQHDM" width="100%" clearable placeholder="请选择行政区划"/>
+                <MOSTY.Select v-model="listQuery.xzqhdm" filterable :dictEnum="props.dic.D_BZ_XZQHDM" width="100%" clearable placeholder="请选择行政区划"/>
             </el-form-item>
             <el-form-item label="地图范围" prop="pgis" class="ww100">
                 <div class="flex ww100">
@@ -63,7 +63,7 @@ const rules = {
     qymc: [{ required: true, message: "请输入区域名称", trigger: "blur" }],
     qylx: [{ required: true, message: "请选择区域类型", trigger: "change" }],
     qyjb: [{ required: true, message: "请选择区域级别", trigger: "change" }],
-    xzqh: [{ required: true, message: "请选择行政区划", trigger: "change" }],
+    xzqhdm: [{ required: true, message: "请选择行政区划", trigger: "change" }],
     pgis: [{ required: true, message: "请输入地图范围", trigger: ['change','blur'] }],
     sxts: [{ required: true, message: "请输入感知元信息", trigger: "blur" }],
 };

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

@@ -32,8 +32,8 @@
           <template #qylx="{ row }">
             <DictTag :tag="false" :value="row.qylx" :options="D_ZDY_QYLX" />
           </template>
-          <template #xzqh="{ row }">
+          <template #xzqhdm="{ row }">
-            <DictTag :tag="false" :value="row.xzqh" :options="D_BZ_XZQHDM" />
+            <DictTag :tag="false" :value="row.xzqhdm" :options="D_BZ_XZQHDM" />
           </template>
            <template #sxts="{ row }">
             <span v-for="(it,idx) in row.sxts" :key="idx">{{ it.sbmc }} <span v-if="idx < row.sxts.length-1">、</span></span>
@@ -128,7 +128,7 @@ const pageData = reactive({
     { label: "区域等级", prop: "qyjb", showSolt: true },
     { label: "范围名称", prop: "qymc" },
     { label: "范围类型", prop: "qylx", showSolt: true },
-    { label: "行政区划", prop: "xzqh", showSolt: true },
+    { label: "行政区划", prop: "xzqhdm", showSolt: true },
     { label: "感知源信息", prop: "sxts", showSolt: true },
     { label: "是否启用", prop: "qyzt", showSolt: true }
   ]

src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/components/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">详情</span>
+      <span class="title">{{ title }}</span>
        <div>
         <el-button @click="close">关闭</el-button>
       </div>
@@ -111,16 +111,16 @@ const init = (type, row) => {
   fjdz.value = []
   tabHeightFn()
   dialogForm.value = true;
-  title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
+  title.value = type == "edit" ? "编辑" : "详情"
   // 初始化表单数据，并根据详情页设置禁用状态
-  // if (row) getDataById(row.id);
+  if (row) getDataById(row.id);
 };
 // 根据id查询详情
 const getDataById = (id) => {
-  // qcckGet({id}, "/mosty-gsxt/qbcj/selectByid").then((res) => {
+  qcckGet({id}, "/mosty-gsxt/qbcj/selectByid").then((res) => {
-  //   listQuery.value = res;
+    listQuery.value = res;
-  //   pageForm.tableData = res.ryList || [];
+    pageForm.tableData = res.ryList || [];
-  // });
+  });
 };
 
 // 关闭

src/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index.vue

@@ -41,7 +41,7 @@
       <!-- 右边表格 -->
       <div class="ww49">
         <div ref="searchBox">
-          <Search :searchArr="searchConfiger" @submit="onSearch" />
+          <Search :searchArr="searchConfigerR" @submit="onSearchR" />
         </div>
         <div class="tabBox">
           <MyTable
@@ -53,9 +53,12 @@
             :tableConfiger="pageData.tableConfigerR"
             :controlsWidth="pageData.controlsWidthR"
           >
+            <template #xlLx="{row}">
+              <DictTag :tag="false" :value="row.xlLx" :options="D_GS_XS_LX" />
+            </template>
             <template #controls="{ row }">
               <el-link type="primary" @click="lookdetail('edit', row)">编辑</el-link>
-              <el-link type="primary" @click="lookdetail('row', row)">详情</el-link>
+              <el-link type="primary" @click="lookdetail('detail', row)">详情</el-link>
               <el-link type="danger" @click="delDictItemRight(row.id)">删除</el-link>
             </template>
           </MyTable>
@@ -63,7 +66,7 @@
             @changeNo="changeNo"
             @changeSize="changeSize"
             :tableHeight="pageData.tableHeight"
-            :pageConfiger="{ ...pageData.pageConfiger, total: pageData.total }"
+            :pageConfigerR="{ ...pageData.pageConfigerR, total: pageData.total }"
           />
         </div>
       </div>
@@ -113,7 +116,29 @@ const searchConfiger = ref([
     showType: "input"
   }
 ]);
+const searchConfigerR = ref([
+  {
+    label: "线索名称",
+    prop: "xsMc",
+    placeholder: "请输入线索名称",
+    showType: "input"
+  },
+  {
+    label: "线索类型",
+    prop: "xlLx",
+    placeholder: "请选择线索类型",
+    showType: "select",
+    options:D_GS_XS_LX
+  },
+  {
+    label: "内容关键字",
+    prop: "xsNr",
+    placeholder: "请输入内容关键字",
+    showType: "input"
+  }
+]);
 const queryFrom = ref({});
+const queryFromR = ref({});
 const container = ref('')
 const btnLoading = ref(false)
 const prsentText = ref(null)
@@ -134,7 +159,7 @@ const pageData = reactive({
     loading: false
   },
   total: 0,
-  pageConfiger: {
+  pageConfigerR: {
     pageSize: 20,
     pageCurrent: 1
   }, //分页
@@ -147,26 +172,25 @@ const pageData = reactive({
     { label: "要素描述", prop: "ysms",showOverflowTooltip:true },
   ],
   tableColumnR: [
-    { label: "线索名称", prop: "yymc",showOverflowTooltip:true },
+    { label: "线索名称", prop: "xsMc",showOverflowTooltip:true },
-    { label: "线索类型", prop: "yslx",showOverflowTooltip:true },
+    { label: "线索类型", prop: "xlLx",showOverflowTooltip:true,showSolt:true },
-    { label: "指向地点", prop: "ysms",showOverflowTooltip:true },
+    { label: "指向地点", prop: "zxdz",showOverflowTooltip:true },
-    { label: "线索内容", prop: "ysms",showOverflowTooltip:true },
+    { label: "线索内容", prop: "xsNr",showOverflowTooltip:true },
   ],
 });
 onMounted(() => {
   tabHeightFn();
   getList();
+  getjxListR();
 });
 
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
-  pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
 
 
-
 const getList = () => {
   pageData.tableConfiger.loading = true;
   qcckGet(queryFrom.value,'/mosty-gsxt/qbyy/selectList').then((res)=>{
@@ -175,6 +199,23 @@ const getList = () => {
   })
 };
 
+// 搜索
+const onSearchR = (val) => {
+  queryFromR.value = { ...val };
+  pageData.tableConfigerR.pageCurrent = 1;
+  getjxListR();
+};
+
+const getjxListR = () => {
+  pageData.tableConfigerR.loading = true;
+  qcckGet(queryFromR.value,'/mosty-gsxt/qbcj/selectPage').then((res)=>{
+    pageData.tableDataR = res.records || [];
+    pageData.tableConfigerR.loading = false;
+  }).catch(()=>{
+    pageData.tableConfigerR.loading = false;
+  })
+};
+
 // 删除
 const delDictItem = (id) => {
   proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
@@ -187,12 +228,12 @@ const delDictItem = (id) => {
 
 // 删除右边
 const delDictItemRight = (id) => {
-  // proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
+  proxy.$confirm("确定要删除", "警告", {type: "warning"}).then(() => {
-  //   qcckPost({id},'/mosty-gsxt/qbyy/delete').then(()=>{
+    qcckPost({id},'/mosty-gsxt/qbcj/delete').then(()=>{
-  //     proxy.$message({ type: "success",  message: "删除成功" });
+      proxy.$message({ type: "success",  message: "删除成功" });
-  //     getList();
+      getjxListR();
-  //   })
+    })
-  // }).catch(() => {});
+  }).catch(() => {});
 };
 
 
@@ -210,12 +251,12 @@ const lookdetail = (type, row) =>{
 
 
 const changeNo = (val) => {
-  // pageData.pageConfiger.pageCurrent = val;
+  pageData.pageConfigerR.pageCurrent = val;
-  // getListR();
+  getListR();
 };
 const changeSize = (val) => {
-  // pageData.pageConfiger.pageSize = val;
+  pageData.pageConfigerR.pageSize = val;
-  // getListR();
+  getListR();
 };
 
 
@@ -238,8 +279,7 @@ const getText = (val) =>{
     "max_tokens": 4096,
     "stream": false
   }
-  // 拼接字典
+  // 拼接字典 线索类型：
-  // 线索类型：
   let xslx = '线索类型是一个字典，字典内容包括：' + (D_GS_XS_LX.value.map(item=>item.dm+':'+item.zdmc).join(','))+'\n'
   let qbLy = '情报来源是一个字典，字典内容包括：' + (D_GS_XS_LY.value.map(item=>item.dm+':'+item.zdmc).join(','))+'\n'
   let sszt = '所属专题是一个字典，字典内容包括：' + (D_BZ_SSZT.value.map(item=>item.dm+':'+item.zdmc).join(','))+'\n'
@@ -248,9 +288,8 @@ const getText = (val) =>{
   obj.messages[1].content =  obj.messages[1].content + val.text;
   prsentText.value = obj;
   qcckPost({fjdz:val.fjdz,tjnr:val.text},'/mosty-gsxt/qbcjjl/add').then((res)=>{
-    qbid.value = res || ''
+    qbid.value = res || '';
   })
-
 }
 
 const handleFx = () => {
@@ -275,6 +314,7 @@ const handleFx = () => {
     }
     qcckPost(params,'/mosty-gsxt/qbcj/add').then((res)=>{
       console.log(res,'============');
+      getjxListR()
     })
   })
 }