From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/platform/index.vue |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/admin/src/views/platform/index.vue b/admin/src/views/platform/index.vue
index 7b3ed4a..ff9dd46 100644
--- a/admin/src/views/platform/index.vue
+++ b/admin/src/views/platform/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main_app">
+  <div class="main_app" style="overflow-y: auto;height: calc(100% - 100px);">
     <div class="mb20 main_header">
       <div class="platgroup_tabs">
         <div class="tab" :class="{ active: activeGroup.id === item.id }" @click="platgroupClick(item)"
@@ -80,7 +80,7 @@
               </div> -->
               <div class="ite" style="width: 40%">
                 <span>鎬昏繍杈撻噺锛�</span>
-                <span>{{ task.totalNum }}涓囨敮</span>
+                <span>{{ task.totalNum || task.ioQty }}涓囨敮</span>
               </div>
               <div v-if="task.billCode" class="ite" style="width: 60%">
                 <span>杩愯緭鍏徃锛�</span>
@@ -95,12 +95,14 @@
               </div>
               <div class="right">
                 <el-button v-if="task.status == 5" plain @click="handleErr(task)">寮傚父鎸傝捣</el-button>
+                <el-button v-if="task.status == 8" plain @click="restore(task)">鎭㈠浣滀笟</el-button>
                 <el-button v-if="task.status == 5 || task.status == 8" plain
                   @click="handleTransform(item, task)">杞Щ鏈堝彴</el-button>
                 <el-button v-if="task.status == 4" plain @click="handlePass(task)">杩囧彿</el-button>
-                <el-button v-preventReClick :loading="loadingFinish" v-if="task.status == 5 || task.status == 8" type="primary"
-                  @click="handleFinish(task)">浣滀笟瀹屾垚</el-button>
-                <el-button v-preventReClick :loading="loadingOpen" v-if="task.status == 4" type="primary" @click="handleWork(task)">寮�濮嬩綔涓�</el-button>
+                <el-button v-preventReClick :loading="loadingFinish" v-if="task.status == 5 || task.status == 8"
+                  type="primary" @click="handleFinish(task)">浣滀笟瀹屾垚</el-button>
+                <el-button v-preventReClick :loading="loadingOpen" v-if="task.status == 4" type="primary"
+                  @click="handleWork(task)">寮�濮嬩綔涓�</el-button>
               </div>
             </div>
           </div>
@@ -162,7 +164,8 @@
   platformMove,
   updUserPlatformConfig,
 
-  listByGroupId
+  listByGroupId,
+  restoreWork
 } from '@/api'
 import PlatformQueuing from './components/PlatformQueuing.vue'
 import WaybillDetail from './components/WaybillDetail.vue'
@@ -201,16 +204,25 @@
       detail: {},
       isShowQueuing: false,
       timer: null,
+      timer2: null,
 
       loadingOpen: false,
       loadingFinish: false,
     }
   },
   created() {
-    setInterval(() => {
+    this.timer2 = setInterval(() => {
       this.getPlatGroupList()
     }, 1000 * 20)
     this.getPlatGroupList()
+  },
+  beforeDestroy() {
+    if (this.timer2) {
+      clearInterval(this.timer2)
+    }
+    if (this.timer) {
+      clearInterval(this.timer)
+    }
   },
   methods: {
     handleWork(item) {
@@ -229,7 +241,7 @@
         this.loadingFinish = false
         Message.success('瀹屾垚浣滀笟')
         this.getPlatGroupList()
-      },() => {
+      }, () => {
         this.loadingFinish = false
       })
     },
@@ -266,6 +278,18 @@
       }).then(() => {
         platformErr({ jobId: item.id }).then(ress => {
           Message.success('寮傚父鎸傝捣鎴愬姛')
+          this.getPlatGroupList()
+        })
+      })
+    },
+    restore(item) {
+      this.$confirm('鎮ㄧ‘璁よ瀵硅浠诲姟杩涜鎭㈠浣滀笟鍚�', '娓╅Θ鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        restoreWork({ jobId: item.id }).then(ress => {
+          Message.success('鎭㈠浣滀笟鎴愬姛')
           this.getPlatGroupList()
         })
       })
@@ -313,7 +337,7 @@
               if (item.newStartDate) {
                 const timeNum = time.getTime() - new Date(item.newStartDate).getTime()
                 if (timeNum > 3600000) {
-                  item.startDateTemp = dayjs.duration(timeNum).format('H灏忔椂m鍒唖s绉�')
+                  item.startDateTemp = dayjs.duration(timeNum).format('H灏忔椂m鍒唖绉�')
                 } else {
                   item.startDateTemp = dayjs.duration(timeNum).format('m鍒唖绉�')
                 }
@@ -410,7 +434,7 @@
 @import "@/assets/style/variables.scss";
 
 .platform_list {
-  width: 100%;
+  width: calc(100% - 20px);
 
   .item {
     /* padding: 16px 24px; */

--
Gitblit v1.9.3