From b731461e465c123ccc121e8b45417587ddcb0075 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 29 Jul 2024 09:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=89=E5=8F=96=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=B9=B6=E4=B8=94=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homePage/components/tableMain.vue | 70 ++++++++++++++-------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index fd97d78..7673741 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -1005,11 +1005,11 @@
         <el-form-item label="文件路径：" prop="pullFile">
           <el-input
             type="textarea"
-            :autosize="{ minRows: 2, maxRows: 8 }"
+            :autosize="{ minRows: 2, maxRows: 6 }"
             v-model="pullFileForm.pullFile"
           ></el-input>
         </el-form-item>
-        <el-checkbox-group
+        <!-- <el-checkbox-group
           v-model="checkedName"
           @change="handleCheckedCitiesChange"
         >
@@ -1019,10 +1019,16 @@
             :key="item.name"
             >{{ item.desc }}{{ item.name }}</el-checkbox
           >
-        </el-checkbox-group>
-        <!-- <ul>
-          <li @click="handlepullPath(item)">{{ item.desc }}{{ item.name }}</li>
-        </ul> -->
+        </el-checkbox-group> -->
+        <ul>
+          <li
+            @click="handlepullPath(item)"
+            v-for="(item, index) in pullpathOption"
+            :key="item.name"
+          >
+            {{ item.desc }}{{ item.name }}
+          </li>
+        </ul>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="pullFileVisible = false">取 消</el-button>
@@ -1527,6 +1533,10 @@ export default {
           name: "/sdcard/com.xypower.mpapp/data/recog/rb.dat",
           desc: "AI识别文件",
         },
+        {
+          name: "/sdcard/com.xypower.mpmaster/data/Master.json",
+          desc: "运维配置文件",
+        },
       ],
       pullpathOption: [
         {
@@ -1577,6 +1587,10 @@ export default {
           name: "/sdcard/com.xypower.mpapp/data/recog/rb.dat",
           desc: "AI识别文件",
         },
+        {
+          name: "/sdcard/com.xypower.mpmaster/data/Master.json",
+          desc: "运维配置文件",
+        },
       ],
       checkedName: [],
       //上传文件base64
@@ -2381,31 +2395,29 @@ export default {
       });
     },
     //下载文件
-    handleCheckedCitiesChange(value) {
-      // 清除现有的换行符，以便重新添加
-      this.pullFileForm.pullFile = value
-        .map((name) => name + "\n") // 为每个选中的文件路径添加换行符
-        .join(""); // 将数组连接成字符串
-
-      // 如果你不想在文本末尾留下额外的换行符，可以添加一个条件判断来移除它
-      if (this.pullFileForm.pullFile.endsWith("\n")) {
-        this.pullFileForm.pullFile = this.pullFileForm.pullFile.slice(0, -1);
-      }
+    handlepullPath(item) {
+      console.log(item);
+      this.pullFileForm.pullFile += item.name + "\n";
+      console.log(this.pullFileForm.pullFile);
     },
     handlePull() {
       console.log(this.$refs.pullFileFormref);
+      //选中的内容组成数组去重
+      let uniquePaths = [
+        ...new Set(
+          this.pullFileForm.pullFile.split(/\r\n|\n|\r/).filter(Boolean)
+        ),
+      ];
       this.$refs.pullFileFormref.validate((valid) => {
         if (valid) {
           var params = {
             action: "pull_files",
-            paths: this.pullFileForm.pullFile
-              .split(/\r\n|\n|\r/)
-              .filter(Boolean),
+            paths: uniquePaths,
             termIds: this.idArray,
           };
           console.log(params);
-          this.changeIssue(params);
-          this.pullFileVisible = false;
+          // this.changeIssue(params);
+          //this.pullFileVisible = false;
         }
       });
     },
@@ -3041,6 +3053,22 @@ export default {
       }
     }
   }
+  .pullBoxDialog {
+    .el-dialog__body {
+      padding: 12px 12px;
+    }
+    ul {
+      li {
+        list-style: none;
+        font-size: 13px;
+        line-height: 22px;
+        cursor: pointer;
+        &:hover {
+          background-color: #b9e2dd;
+        }
+      }
+    }
+  }
   .deleteDialog {
     .el-dialog__body {
       height: auto;