From b6818d430e711f5022145c89bdc3a30dd9d4ee38 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Tue, 15 Jul 2025 20:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChooseList/ChooseMarks/index.vue          | 22 ++++++++++---------
 src/components/ChooseList/ChooseQt/index.vue  | 16 +++++++-------
 src/components/ChooseList/ChooseXs/index.vue  |  6 ++---
 src/components/ChooseList/ChooseZdr/index.vue | 16 +++++++-------
 .../PreliminaryExcavations/index.vue          |  5 +----
 .../myControl/components/addBkdx.vue          |  3 ++-
 6 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/components/ChooseList/ChooseMarks/index.vue b/src/components/ChooseList/ChooseMarks/index.vue
index 8ee3391..621aa74 100644
--- a/src/components/ChooseList/ChooseMarks/index.vue
+++ b/src/components/ChooseList/ChooseMarks/index.vue
@@ -10,7 +10,7 @@
           <el-button type="info" @click="reset"> 重置 </el-button>
         </el-form-item>
       </el-form>
-      <div class="tabBox" :class="props.Single ? 'tabBoxRadio' : ''" style="margin-top: 0px">
+      <div class="tabBox" :class="props.Single ? 'tabBoxRadio' : ''" :key="keyVal" style="margin-top: 0px">
         <el-table ref="multipleUserRef" @selection-change="handleSelectionChange" :data="tableData" v-loading="loading" border :row-key="keyid" style="width: 100%" height="450">
           <el-table-column type="selection" width="55" :reserve-selection="true"/>
           <el-table-column prop="bqMc" align="center" label="标签名称"/>
@@ -31,8 +31,8 @@
         <el-pagination
           class="pagination"
           @size-change="handleSizeChange"
-          @pageCurrent-change="handleCurrentChange"
-          :pageCurrent-page="listQuery.pageCurrent"
+          @current-change="handleCurrentChange"
+          :current-page="listQuery.pages"
           :page-sizes="[10, 20, 50, 100]"
           :page-size="listQuery.size"
           layout="total, sizes, prev, pager, next, jumper"
@@ -80,10 +80,11 @@ const props = defineProps({
 const loading = ref(false)
 const total = ref(0);
 const listQuery = ref({
-  pageCurrent: 1,
-  pageSize: 20
+  pages: 1,
+  size: 20
 });
 
+const keyVal = ref()
 const multipleUserRef = ref(null);
 const multipleSelectionUser = ref([]);
 const tableData = ref([]);
@@ -96,7 +97,7 @@ const closed = () => {
   emits("update:modelValue", false);
 };
 const reset = () => {
-  listQuery.value = {  pageCurrent: 1, pageSize: 20, };
+  listQuery.value = {  pages: 1, size: 20, };
   getListData();
 };
 
@@ -116,20 +117,21 @@ const onComfirm = () => {
   closed();
 };
 /**
- * pageSize 改变触发
+ * size 改变触发
  */
 const handleSizeChange = (currentSize) => {
-  listQuery.value.pageSize = currentSize;
+  listQuery.value.size = currentSize;
   getListData();
 };
 /**
  * 页码改变触发
  */
 const handleCurrentChange = (currentPage) => {
-  listQuery.value.pageCurrent = currentPage;
+  listQuery.value.pages = currentPage;
   getListData();
 };
 const getListData = () => {
+  keyVal.value++;
   loading.value = true;
   const params = { ...listQuery.value, bqLb:'02',}
   qcckGet(params,'/mosty-gsxt/tbGsxtBqgl/selectPage').then(res=>{
@@ -153,7 +155,7 @@ function multipleUser() {
 }
 
 const handleFilter = () => {
-  listQuery.value.pageCurrent = 1;
+  listQuery.value.pages = 1;
   getListData();
 };
 
diff --git a/src/components/ChooseList/ChooseQt/index.vue b/src/components/ChooseList/ChooseQt/index.vue
index 4840e09..00596af 100644
--- a/src/components/ChooseList/ChooseQt/index.vue
+++ b/src/components/ChooseList/ChooseQt/index.vue
@@ -54,14 +54,14 @@
     </div>
     <div class="fenye flex just-end " :style="{ top: tableHeight + 'px' }">
     <el-pagination
-        class="pagination"
-        @size-change="handleSizeChange"
-        @pageCurrent-change="handleCurrentChange"
-        :pageCurrent-page="listQuery.pageCurrent"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="listQuery.size"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
+      class="pagination"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="listQuery.pageCurrent"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="listQuery.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
     ></el-pagination>
     </div>
     <template #footer>
diff --git a/src/components/ChooseList/ChooseXs/index.vue b/src/components/ChooseList/ChooseXs/index.vue
index d7ff325..ced58a8 100644
--- a/src/components/ChooseList/ChooseXs/index.vue
+++ b/src/components/ChooseList/ChooseXs/index.vue
@@ -32,10 +32,10 @@
         <el-pagination
           class="pagination"
           @size-change="handleSizeChange"
-          @pageCurrent-change="handleCurrentChange"
-          :pageCurrent-page="listQuery.pageCurrent"
+          @current-change="handleCurrentChange"
+          :current-page="listQuery.pageCurrent"
           :page-sizes="[10, 20, 50, 100]"
-          :page-size="listQuery.size"
+          :page-size="listQuery.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"
         ></el-pagination>
diff --git a/src/components/ChooseList/ChooseZdr/index.vue b/src/components/ChooseList/ChooseZdr/index.vue
index 342ff03..234c0bb 100644
--- a/src/components/ChooseList/ChooseZdr/index.vue
+++ b/src/components/ChooseList/ChooseZdr/index.vue
@@ -52,14 +52,14 @@
     </div>
     <div class="fenye flex just-end " :style="{ top: tableHeight + 'px' }">
     <el-pagination
-        class="pagination"
-        @size-change="handleSizeChange"
-        @pageCurrent-change="handleCurrentChange"
-        :pageCurrent-page="listQuery.pageCurrent"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="listQuery.size"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
+      class="pagination"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="listQuery.pageCurrent"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="listQuery.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
     ></el-pagination>
     </div>
     <template #footer>
diff --git a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue
index a129af5..404a8a6 100644
--- a/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue
+++ b/src/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index.vue
@@ -107,7 +107,7 @@
     <IntelligentParsing :tableData="pageData.tableData" ref="IntelligentParsingRef"  @upadate="getModelList" />
     <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="handleImport" />
+    <Export :show="isImport" lx="fjnr" @closeImport="isImport = false" @handleImport="getList" />
   </div>
 </template>
 
@@ -282,9 +282,6 @@ const chooseType = (val)=>{
   }
 }
 
-const handleImport =  (val) =>{
-  getList()
-}
 
 const tabHeightFn = () => {
   pageData.tableHeight2 = window.innerHeight - searchBox.value.offsetHeight - 650;
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue
index 45dd579..a9e7ae9 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue
@@ -249,7 +249,7 @@ const get_bkqy_list = (row) =>{
 const getDataById = (id) =>{
     qcckGet({},'/mosty-gsxt/tbGsxtBk/selectVoById/'+id).then(res=>{
        res.bkfj = res.bkfj ? res.bkfj.split(',') : [];
-       res.bkqyList = res.qyList || [];
+       res.bkqyList = res.qyList ? res.qyList.map(v=>v.id) : [];
        listQuery.value = res || {}
     })
 }
@@ -310,6 +310,7 @@ const handleAddPeo = () =>{
     listQuery.value.bkDx == '01' ? chooseVisible_RY.value = true : chooseVisible_QT.value = true;
 }
 
+
 // 提交
 const submit = () => {
   elform.value.validate((validate) => {