From 05f3dd19cd55fef61fa89ac9f60f915ef7bd9e07 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 15 九月 2023 10:52:52 +0800
Subject: [PATCH] 提示 修改为2种状态+ 无任务页面的显示问题
---
src/views/visualization.vue | 23 +++++++++++++++++------
src/components/AddIssue.vue | 2 ++
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/components/AddIssue.vue b/src/components/AddIssue.vue
index 634f078..770bc09 100644
--- a/src/components/AddIssue.vue
+++ b/src/components/AddIssue.vue
@@ -247,6 +247,7 @@
this.num = 0;
this.showBtn=1;
this.isLoading=false
+ this.$emit('isTip',this.islook)
},
},
methods: {
@@ -282,6 +283,7 @@
this.islook = false;
// this.islook = true;
}
+
},
getDateObj(date, fmt) {
if (/(y+)/.test(fmt)) {
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 12c4058..3745c30 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -2,7 +2,7 @@
<template>
<div class="home">
<!-- v-if="Object.keys(taskData).length > 0 && taskData.Procedure.ID" -->
- <template>
+ <template v-if="Tasks&&Tasks.length>0">
<div class="left">
<p class="title">
<span
@@ -27,7 +27,7 @@
style="float: right;margin-right:20px;font-size:28px;line-height:25px;"
@click="taskClick"
>
- <el-badge :value="TaskCount" :class="TaskCount==0?'item color_666':'item color_fff'">
+ <el-badge :value="TaskCount" :class="(TaskCount==0||isTipShow)?'item color_666':'item color_fff'">
<i class="el-icon-chat-dot-round" />
</el-badge>
</span>
@@ -152,8 +152,10 @@
? parseInt(
(taskData.finishNumber / taskData.Order.amount) *
100
- )
- : 0
+ )>100?100:parseInt(
+ (taskData.finishNumber / taskData.Order.amount) *
+ 100
+ ): 0
"
></el-progress>
</el-descriptions-item>
@@ -274,7 +276,11 @@
(taskData.finishNumber /
taskData.Order.amount) *
100
- )
+ )>100?100:parseInt(
+ (taskData.finishNumber /
+ taskData.Order.amount) *
+ 100
+ )
: 0
"
:show-text="false"
@@ -499,7 +505,7 @@
</div>
</template>
<!-- v-else -->
- <template>
+ <template v-else>
<div class="home-img-box">
<div class="bg-title">
<img src="../../public/bg-title.png" />
@@ -539,6 +545,7 @@
:taskData="taskData"
:Order="taskData.Order"
@getSetProductNumber="getTaskInfo"
+ @isTip="isTip"
/>
</div>
</template>
@@ -665,6 +672,7 @@
cutdownTimer: null,
TaskCount:0,
plcStatus:1,
+ isTipShow:false,
};
},
mounted() {
@@ -689,6 +697,9 @@
this.$message.error('鐩墠娌℃湁浠诲姟锛�')
}
},
+ isTip(val){
+ this.isTipShow=val
+ },
cutClick(val) {
this.activeName = val;
this.getTaskInfo();
--
Gitblit v1.8.0