From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/platform/index.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/platform/index.vue b/admin/src/views/platform/index.vue
index 7b3ed4a..ba7ef07 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>
@@ -98,9 +98,10 @@
<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>
@@ -201,16 +202,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 +239,7 @@
this.loadingFinish = false
Message.success('瀹屾垚浣滀笟')
this.getPlatGroupList()
- },() => {
+ }, () => {
this.loadingFinish = false
})
},
@@ -313,7 +323,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鍒唖绉�')
}
--
Gitblit v1.9.3