From ebe4f10feba18e18bd4c744858a779ab75bcf622 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 01 八月 2025 15:44:09 +0800
Subject: [PATCH] qx

---
 vue.config.js                   |    5 -----
 src/components/public/index.vue |   20 +++++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index b14b956..a1a56db 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -60,11 +60,12 @@
             :data="dataList"
             ref="multipleTable"
             v-loading="loading"
+            row-key="aid"
             @selection-change="handleSelectionChange"
             border
             height="480px"
           >
-            <el-table-column type="selection" width="40" align="center" />
+            <el-table-column type="selection" width="40" align="center" :reserve-selection="true"/>
             <el-table-column
               label="搴忓彿"
               type="index"
@@ -180,7 +181,7 @@
       queryParams: {
         ruleStr: "",
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
       },
       list: [],
       fList: {},
@@ -190,7 +191,6 @@
   },
   watch: {
     checkStatus(newValue) {
-      console.log(565658);
       if (newValue === "1") {
         this.updateData(this.proResult, this.conclusion);
       }
@@ -263,10 +263,7 @@
       if (this.checkStatus == 1) {
         this.form.jcsj = proResult; // 鏇存柊妫�鏌ユ墍瑙�
         this.form.desc = conclusion; // 鏇存柊妫�鏌ョ粨璁�
-      } else {
-        this.form.desc = "";
-        this.form.jcsj = "";
-      }
+      } 
 
       if (this.list.length != 0) {
         let desc = "";
@@ -279,8 +276,11 @@
           .map((item) => item.yxbx)
           .filter(Boolean)
           .join(",");
-        this.form.jcsj = this.form.jcsj + jcsj; // 鏇存柊妫�鏌ユ墍瑙�
-        this.form.desc = this.form.desc + desc;
+        this.form.jcsj = jcsj; // 鏇存柊妫�鏌ユ墍瑙�
+        this.form.desc =  desc;
+      }else {
+        this.form.desc = "";
+        this.form.jcsj = "";
       }
     },
 
@@ -339,6 +339,7 @@
         this.$emit("add", this.form.desc, this.form.jcsj);
         this.resetForm();
         this.open = false;
+         this.$refs.multipleTable.clearSelection();
       } catch (error) {
         console.error("澶勭悊鏁版嵁澶辫触:", error);
         this.$message.error("鎿嶄綔澶辫触");
@@ -355,6 +356,7 @@
     },
     callcolos() {
       this.open = false;
+       this.$refs.multipleTable.clearSelection();
     },
   },
   computed: {
diff --git a/vue.config.js b/vue.config.js
index 46b9cb2..01c9aaf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,11 +53,6 @@
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://ltpeis.xaltjdkj.cn:5801/`,
-        // target: `http://192.168.1.99:5012`,
-<<<<<<< HEAD
-=======
-        target: `http://192.168.1.113:5011`,
->>>>>>> c12ce4c405d92c0bf11e876468108d1edb134ff2
         // target: `http://192.168.1.244:5011`,
         target: `http://192.168.1.113:5011`,
         // // target: `http://192.168.0.99:8080/ltkj-admin`,

--
Gitblit v1.8.0