From 1dba691ab90d611baeb27203c863641141834dbc Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Mon, 2 Dec 2024 13:42: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

---
 src/renderer/App.vue                          |  2 +-
 .../components/workAdd/files/file.vue         | 14 ++++++++----
 src/renderer/components/workAdd/workAdd.vue   | 22 ++++++++-----------
 src/renderer/views/dashboard/index.vue        | 14 ++++++------
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 8f737c6..ba2e30d 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -19,7 +19,7 @@ export default {
     '$store.state.chat.printer_error': {
       handler(val) {
         let that = this
-        const currentTime = dayjs().format('hh:mm:ss');
+        const currentTime = dayjs().format('HH:mm:ss');
         if (val.message) {
           that.$message({
             message: val.message,
diff --git a/src/renderer/components/workAdd/files/file.vue b/src/renderer/components/workAdd/files/file.vue
index f4afecb..a274b19 100644
--- a/src/renderer/components/workAdd/files/file.vue
+++ b/src/renderer/components/workAdd/files/file.vue
@@ -142,10 +142,16 @@ export default {
       const _this = this;
       dialog
         .showOpenDialog({
-          properties: ["openFile", "multiSelections"],
+          properties: ["multiSelections"],
         })
-        .then(async (res) => {
-          for (const item of res.filePaths) {
+        .then(async (rel) => {
+          console.log(rel);
+          for (const item of rel.filePaths) {
+            const stats = fs.statSync(item);
+            let folder = false
+            if (stats.isDirectory()) {
+              folder = true
+            }
             await fs.stat(item, function (err, res) {
               if (err) {
                 return false;
@@ -154,7 +160,7 @@ export default {
                 name: getFileName(item),
                 path: item,
                 size: res.size,
-                folder: false,
+                folder: folder,
               });
             });
           }
diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue
index 5641381..6a29181 100644
--- a/src/renderer/components/workAdd/workAdd.vue
+++ b/src/renderer/components/workAdd/workAdd.vue
@@ -116,10 +116,10 @@
               <div class="flex_box flex_row_between work_left_top">
                 <div class="flex_box">
                   <div class="work_left_top_label">内容</div>
-                  <div @click="addFolder" class="flex_box work_left_top_btn">
+                  <!-- <div @click="addFolder" class="flex_box work_left_top_btn">
                     <img src="@/assets/images/file_icon.png" />
                     <div>添加文件夹</div>
-                  </div>
+                  </div> -->
                   <div @click="addFile" class="flex_box work_left_top_btn">
                     <img src="@/assets/images/paper_icon.png" />
                     <div>添加文件</div>
@@ -381,8 +381,8 @@ export default {
       diskSet: [
         {
           id: 1,
-          name: '文件大小',
-          desc: '按照文件大小进行排序分盘'
+          name: '文件修改时间',
+          desc: '按照文件修改时间进行升序分盘'
         },
         {
           id: 2,
@@ -391,8 +391,8 @@ export default {
         },
         {
           id: 3,
-          name: '文件修改时间',
-          desc: '按照文件修改时间进行升序分盘'
+          name: '文件大小',
+          desc: '按照文件大小进行排序分盘'
         }
       ]
     }
@@ -536,7 +536,6 @@ export default {
         }
         save.soonImg = that.soonImg
         save.soonList = that.soonList
-        console.log(save)
         const v = JSON.stringify(save)
         dialog
           .showSaveDialog({
@@ -612,11 +611,11 @@ export default {
             return 0
           })
         } else if (this.setForm.disk === 3) {
-          // 按最后修改时间排序
-          fileList.sort((a, b) => a.mtime - b.mtime)
-        } else {
           // 按文件大小排序
           fileList.sort((a, b) => a.size - b.size)
+        } else {
+          // 按最后修改时间排序
+          fileList.sort((a, b) => a.mtime - b.mtime)
         }
         let index = 1
         let total_size = 0
@@ -661,7 +660,6 @@ export default {
         that.form.ass_task.push(task)
       }
       // csv文件处理
-      console.log(that.form.udf_file, that.soonList)
       if (!that.form.udf_file && that.soonList.length > 0) {
         that.soonList.forEach((item) => {
           if (item.type == 1&&that.$refs[item.origin_name][0].files[0]) {
@@ -674,8 +672,6 @@ export default {
         let csv1 = that.soonList.map(item => item.origin_name).join(',')
         let csv2 = that.soonList.map(item => item.val).join(',')
         that.csvForm.req_info.file_text = csv1 + '\n' + csv2
-        console.log(that.csvForm.req_info.file_text)
-        return
         that.$store.dispatch('chat/websocketsend', that.csvForm).then(() => {
           
         }).catch(() => {
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue
index ababdc8..b28797c 100644
--- a/src/renderer/views/dashboard/index.vue
+++ b/src/renderer/views/dashboard/index.vue
@@ -670,13 +670,13 @@ export default {
     },
     // 打开作业文件
     openWork() {
-      // if (!that.workStatus) {
-      //   that.$message({
-      //     message: '请先连接服务',
-      //     type: 'warning'
-      //   })
-      //   return
-      // }
+      if (!that.workStatus) {
+        that.$message({
+          message: '请先连接服务',
+          type: 'warning'
+        })
+        return
+      }
       that.isNew = false
       dialog
         .showOpenDialog({