更新页面

src/components/ExtractionText/index.vue

@@ -29,7 +29,7 @@
         <div class="flex align-center just-between">
           <h1>文件文本提取工具</h1>
           <span title="刷新" class="pointer"  >
-            <el-icon color="#0072ff" size="30px" @click="initPage"><RefreshRight /></el-icon>
+            <el-icon color="#0072ff" size="30px" @click="frashJs"><RefreshRight /></el-icon>
             <el-icon color="#23c044" size="14px" v-if="hasLoadingJS"><CircleCheckFilled /></el-icon>
             <el-icon color="#e60e0e" size="14px" v-if="!hasLoadingJS"><CircleCloseFilled /></el-icon>
           </span>
@@ -37,7 +37,7 @@
         <p>上传文件提取文本内容（支持 .png, .jpg ）</p>
         <div class="container flex" style="height: 248px;">
           <div class="mr10">
-            <el-upload class="upload-demo" accept=".png,.jpg" action="abc" :auto-upload="false" :on-change="onHandleChange" :show-file-list="false">
+            <el-upload class="upload-demo" accept=".png,.jpg,jpeg" action="abc" :auto-upload="false" :on-change="onHandleChange" :show-file-list="false">
               <el-button size="medium" type="primary">上传图片</el-button>
             </el-upload>
             <p id="file-info">{{ files.name || '未选择文件' }} </p>
@@ -102,7 +102,7 @@ watch(()=>props.modelValue,val=>{
 
 
 const initDemo = () =>{
-  if(hasLoadingJS.value == null  || hasLoadingJS.value == 2) initPage();
+  if(hasLoadingJS.value == null) initPage();
   nextTick(() => {
     const fileInput = document.getElementById("file-input");
     const fileInfo = document.getElementById("file-info");
@@ -242,6 +242,10 @@ const initPage = async () => {
     loading.value = false;
     hasLoadingJS.value = 2;
   }
+}
+const frashJs = () =>{
+  if(hasLoadingJS.value == 1) return;
+  initPage()
 }
  /**
  *@Descripttion:图片上传事件
@@ -272,9 +276,7 @@ const getRecognize = async () => {
 
 // 切换标签
 const changeRadio = (val) =>{
-  if(val == '图片解析') {
+  if(val == '图片解析') if(hasLoadingJS.value == 2) initPage();
-    if(hasLoadingJS.value == 2) initPage();
-  }
   const resultDiv = document.getElementById("result");
   resultDiv.textContent = "请先上传文件...";
   const fileInfo = document.getElementById("file-info");

src/components/MyComponents/Department/index.vue

@@ -20,6 +20,7 @@ import { COMPONENT_WIDTH } from "@/constant";
 import { qcckPost, qcckGet, qcckFlvGet } from "@/api/qcckApi.js";
 import { ref, defineProps, defineEmits, defineExpose, computed, onMounted, watch } from "vue";
 import { selectDeptPage } from "@/api/user-manage";
+import { tr } from "element-plus/es/locale.mjs";
 const props = defineProps({
   //获取组件传值
   placeholder: {
@@ -41,9 +42,13 @@ const props = defineProps({
   width: {
     default: COMPONENT_WIDTH,
     type: String
+  },
+  isAll:{
+    default: false,
+    type: Boolean
   }
 });
-const modelShow = ref(false);
+const firstLoad = ref(true)
 const oldmodelValue = ref([]);
 const listQuery = ref({
   deptname: "",
@@ -61,7 +66,12 @@ const endProps = {
   lazy: true,
   lazyLoad(node, resolve) {
     listQuery.value.parentid = node.data.id;
-    selectDeptPage(listQuery.value).then((res) => {
+    let params = { ...listQuery.value };
+    if(props.isAll && firstLoad.value) {
+      params.parentid = 1;
+      firstLoad.value = false;
+    }
+    selectDeptPage(params).then((res) => {
       depList.value = depList.value.concat(res)
       //处理部门是否包含下级
       for (let i = 0; i < res.length; i++) {
@@ -73,7 +83,11 @@ const endProps = {
 };
 const tableData = ref([]);
 const getSysMenuTree = async () => {
-  const res = await selectDeptPage(listQuery.value);
+  let params = { ...listQuery.value }
+  if(props.isAll) params.parentid = 1;
+  console.log('初始化-----');
+  
+  const res = await selectDeptPage(params);
   tableData.value = res;
   depList.value = res
 };

src/components/aboutTable/FormMessage.vue

@@ -67,6 +67,7 @@
         <MOSTY.Department 
           style="width: 100%;" 
           clearable 
+          :isAll="item.isAll"
           @getDepValue="getdep($event,item.depMc)"
           v-model="listQuery[item.prop]"
           :placeholder="listQuery[item.depMc] ? listQuery[item.depMc]:'请选择'"

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

@@ -67,7 +67,7 @@
               <template #description>
                 <div class="flex align-center ww100 mt10 mb20 depBox">
                   <span class="mr4">审核部门 : </span>
-                  <MOSTY.Department @getDepValue="getShdep" v-model="listQuery.shrSsbmdm" clearable :placeholder="listQuery.shrSsbmmc ? listQuery.shrSsbmmc : '' "  />
+                  <MOSTY.Department :isAll="true" @getDepValue="getShdep" v-model="listQuery.shrSsbmdm" clearable :placeholder="listQuery.shrSsbmmc ? listQuery.shrSsbmmc : '' "  />
                 </div>
               </template>
             </el-step>
@@ -75,7 +75,7 @@
               <template #description>
                 <div class="flex align-center ww100 mt10 mb20 depBox">
                   <span lass="mr4">审批部门 : </span>
-                  <MOSTY.Department @getDepValue="getSPdep" v-model="listQuery.sprSsbmdm" clearable :placeholder="listQuery.sprSsbmmc ? listQuery.sprSsbmmc : '' "  />
+                  <MOSTY.Department :isAll="true" @getDepValue="getSPdep" v-model="listQuery.sprSsbmdm" clearable :placeholder="listQuery.sprSsbmmc ? listQuery.sprSsbmmc : '' "  />
                 </div>
               </template>
             </el-step>

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

@@ -48,7 +48,7 @@
             <template #description>
               <div class="flex align-center ww100 mt10 mb20 depBox">
                 <span class="mr4">审核部门 : </span>
-                <MOSTY.Department @getDepValue="getShdep" v-model="listQuery.shSsbmdm" clearable :placeholder="listQuery.shSsbmmc ? listQuery.shSsbmmc : ''" />
+                <MOSTY.Department :isAll="true" @getDepValue="getShdep" v-model="listQuery.shSsbmdm" clearable :placeholder="listQuery.shSsbmmc ? listQuery.shSsbmmc : ''" />
               </div>
             </template>
           </el-step>
@@ -56,7 +56,7 @@
             <template #description>
               <div class="flex align-center ww100 mt10 mb20 depBox">
                 <span lass="mr4">审批部门 : </span>
-                <MOSTY.Department @getDepValue="getSPdep" v-model="listQuery.spSsbmdm" clearable :placeholder="listQuery.spSsbmmc ? listQuery.spSsbmmc : ''" />
+                <MOSTY.Department :isAll="true" @getDepValue="getSPdep" v-model="listQuery.spSsbmdm" clearable :placeholder="listQuery.spSsbmmc ? listQuery.spSsbmmc : ''" />
               </div>
             </template>
           </el-step>

src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue

@@ -15,9 +15,6 @@
             </el-icon>
             <span style="vertical-align: middle" @click="handleData('add', '')">新增</span>
           </el-button>
-          <!-- <el-button type="primary" size="small" @click="showText = true">
-            <span style="vertical-align: middle">导入内容</span>
-          </el-button> -->
           <el-button type="primary" size="small" @click="isImport = true">
             <span style="vertical-align: middle">导入内容</span>
           </el-button>
@@ -95,14 +92,12 @@
     <addForm ref="addFormDiloag" @onSearch="onSearch" />
     <Model v-model="isShow" :type="chooselx" :ids="ids" @change="getModelList" :dic="{ D_GS_RQFJ_FXDJ }"></Model>
     <Export :show="isImport" lx="fjnr" @closeImport="isImport = false" @handleImport="getList" />
-    <!-- 文字解析 -->
+    
-    <ExtractionText  v-model="showText" @change="getText"></ExtractionText>
   </div>
 </template>
 
 <script setup>
 import { download } from "@/utils/request";
-import ExtractionText from "@/components/ExtractionText/index.vue";
 import Export from "@/components/export/index.vue";
 import CheckBox from "@/components/checkBox/index.vue";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
@@ -123,7 +118,7 @@ const { D_GS_RQFJ_LX, D_GS_RQFJ_FXDJ, D_BZ_SF, D_GS_RQFJ_FXLB } = proxy.$dict(
   "D_BZ_SF",
   "D_GS_RQFJ_FXLB"
 ); //获取字典数据
-const showText = ref(false);
+
 const searchConfiger = ref([
   {
     label: "管辖部门",

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :title="title" width="800px" :model-value="modelShow" append-to-body @close="closed" :close-on-click-modal="false">
+    <el-dialog :title="title" width="800px" :model-value="modelShow" append-to-body @close="closed" :destroy-on-close="true" :close-on-click-modal="false">
         <el-form :model="listQuery" inline :rules="rules" ref="formRef" :label-width="130" >
             <el-form-item label="区域名称" prop="qymc">
                 <MOSTY.Other width="100%" clearable v-model="listQuery.qymc" placeholder="请输入区域名称"/>
@@ -10,7 +10,7 @@
             <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">
+            <el-form-item label="行政区划" prop="xzqh" v-if="listQuery.qylx == 'xzqh'">
                 <MOSTY.Select v-model="listQuery.xzqh" filterable :dictEnum="props.dic.D_BZ_XZQHDM" width="100%" clearable placeholder="请选择行政区划"/>
             </el-form-item>
             <el-form-item label="地图范围" prop="pgis" class="ww100">
@@ -25,13 +25,9 @@
             <el-form-item label="感知源信息" prop="sxts" class="ww100">
                 <div class="flex ww100">
                     <div class="boo">
-                        <span v-if="!listQuery.sxts || listQuery.sxts.length == 0" class="f12 ml10" style="color: #e1e1e1;">感知元信息</span>
+                        <span v-if="!listQuery.sxts || listQuery.sxts.length == 0" class="f14 ml10" style="color: #e1e1e1;">感知源信息</span>
                         <el-tag class="ml4 mr4" v-for="(it,idx) in listQuery.sxts" :key="idx">{{ it.sbmc }}</el-tag>
                     </div>
-                    <el-button type="primary" style="width: 136px;" class="ml10" :disabled="disabled">
-                        <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
-                        <span style="vertical-align: middle">选择感知源</span>
-                    </el-button>
                 </div>
             </el-form-item>
             <div class="mapbox" v-if="showMap" v-loading="disabled"><GdMap></GdMap></div>
@@ -68,7 +64,7 @@ const rules = {
     qylx: [{ required: true, message: "请选择区域类型", trigger: "change" }],
     qyjb: [{ required: true, message: "请选择区域级别", trigger: "change" }],
     xzqh: [{ required: true, message: "请选择行政区划", trigger: "change" }],
-    pgis: [{ required: true, message: "请输入地图范围", trigger: "blur" }],
+    pgis: [{ required: true, message: "请输入地图范围", trigger: ['change','blur'] }],
     sxts: [{ required: true, message: "请输入感知元信息", trigger: "blur" }],
 };
 
@@ -147,8 +143,8 @@ const submit = () => {
 const closed = () => {
     emitter.emit('removeEara','bkqy_ht')
     emitter.emit('deletePointArea','gzy_ht')
-    formRef.value.resetFields();
     showMap.value = false;
+    formRef.value.resetFields();
     modelShow.value = false;
 };
 
@@ -170,7 +166,7 @@ defineExpose({
     background: red;
 }
 .boo{
-    width: 77%;
+    width: 100%;
     min-height: 32px;
     max-height: 74px;
     overflow: hidden;
@@ -179,5 +175,6 @@ defineExpose({
     border-radius: 4px;
     padding: 4px;
     box-sizing: border-box;
+    letter-spacing: 1px;
 }
 </style>

src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue

@@ -126,7 +126,7 @@
                         <template #description>
                             <div class="ww100 mt10 mb20 depBox">
                                 <el-form-item prop="bkshrSsbmdm" label="审核部门：" label-width="100" style="width: 100%;">
-                                    <MOSTY.Department v-model="listQuery.bkshrSsbmdm" clearable :placeholder="listQuery.bkshrSsbmmc ? listQuery.bkshrSsbmmc : '' "  />
+                                    <MOSTY.Department :isAll="true" v-model="listQuery.bkshrSsbmdm" clearable :placeholder="listQuery.bkshrSsbmmc ? listQuery.bkshrSsbmmc : '' "  />
                                 </el-form-item>
                             </div>
                         </template>
@@ -135,7 +135,7 @@
                         <template #description>
                             <div class="ww100 mt10 mb20 depBox">
                                 <el-form-item prop="bkshrSsbmdm" label="审批部门：" label-width="100" style="width: 100%;">
-                                    <MOSTY.Department v-model="listQuery.bksprSsbmdm" clearable :placeholder="listQuery.bksprSsbmmc ? listQuery.bksprSsbmmc : '' "  />
+                                    <MOSTY.Department :isAll="true" v-model="listQuery.bksprSsbmdm" clearable :placeholder="listQuery.bksprSsbmmc ? listQuery.bksprSsbmmc : '' "  />
                                 </el-form-item>
                             </div>
                         </template>

src/views/backOfficeSystem/ResearchJudgment/DatAcquisition/components/addForm.vue

@@ -88,7 +88,7 @@ const formData = ref([
   { 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"},
+  { label: "线索报送单位", prop: "ssbmdm", isAll:true, type: "department"},
 ]);
 const fjdz = ref()
 const listQuery = ref({}); //表单

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

@@ -28,7 +28,7 @@
           </MyTable>
           <div class="txetBox"></div>
           <div class="footBnt">
-            <el-button type="primary">导入</el-button>
+            <el-button type="primary" @click="showText = true">导入</el-button>
             <el-button type="primary">语义分析</el-button>
           </div>
         </div>
@@ -65,10 +65,13 @@
     </div>
     <!-- 编辑详情 -->
     <EditAddForm ref="detailDiloag" @updateDate="getList" />
+    <!-- 文字解析 -->
+    <ExtractionText  v-model="showText" @change="getText"></ExtractionText>
   </div>
 </template>
 
 <script setup>
+import ExtractionText from "@/components/ExtractionText/index.vue";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -79,6 +82,7 @@ import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 const { proxy } = getCurrentInstance();
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
+const showText = ref(false);
 const searchConfiger = ref([
   {
     label: "语义名称",