From 5eeac2be08383953337d3789a8d442c21303bb54 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 28 八月 2023 15:25:05 +0800
Subject: [PATCH] 周六的代码更新对比 合并 2023-8-28
---
src/views/visualization.vue | 71 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 20 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 5e63f08..25dbbbf 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -1,6 +1,7 @@
<template>
<div class="home">
+ <!-- -->
<template v-if="Object.keys(taskData).length > 0 && taskData.Procedure.ID">
<div class="left">
<p class="title">
@@ -106,15 +107,17 @@
<el-progress
define-back-color="#133EAF"
color="#09E5ED"
+ text-color="#fff"
:text-inside="true"
:stroke-width="30"
- :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount):0"
+ :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0"
></el-progress>
</el-descriptions-item>
<!-- <el-descriptions-item label="鍚堟牸鐜�" style="width: 100%">
<el-progress
define-back-color="#007101"
color="#00CC66"
+ text-color="#fff"
:text-inside="true"
:stroke-width="30"
:percentage="passrate"
@@ -196,15 +199,16 @@
</div>
<div class="card_top-3">
<span class="card-top-r-t"
- >瀹屾垚杩涘害锛歿{ taskData.Order?parseInt(finishNumber/taskData.Order.amount):0}}</span
+ >瀹屾垚杩涘害锛歿{ taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0}}</span
>
<span class="card-top-r-b">
<el-progress
define-back-color="#133EAF"
color="#09E5ED"
+ text-color="#fff"
:text-inside="true"
:stroke-width="10"
- :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount):0"
+ :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount*100):0"
:show-text="false"
></el-progress>
</span>
@@ -361,7 +365,7 @@
</span>
</div>
<div class="right-top-m-btn">
- <el-button type="primary" @click="controlClick"> 鎺у埗</el-button>
+ <!-- <el-button type="primary" @click="controlClick"> 鎺у埗</el-button> -->
</div>
<div class="right_dutyLst">
<div class="right-small-title">褰撳墠鍊肩彮</div>
@@ -415,6 +419,7 @@
</div>
</div>
</template>
+ <!-- -->
<template v-else>
<div class="home-img-box">
<div class="bg-title">
@@ -439,9 +444,9 @@
</div>
</template>
<!-- 鎺у埗鐨勫脊妗� -->
- <AddControl ref="control" :id="taskData.Procedure.ID" />
+ <AddControl ref="control" :Arr="Arr" />
<!-- 鎺у埗鐨勫脊妗� -->
- <AddIssue ref="control" :taskData="taskData" :Order="taskData.Order" @getSetProductNumber="getTaskInfo" />
+ <AddIssue ref="control" :Arr="Arr" :taskData="taskData" :Order="taskData.Order" @getSetProductNumber="getTaskInfo" />
</div>
</template>
@@ -525,6 +530,10 @@
showCountDown:false,
countDownHour:0,
countDownMinute:0,
+ Arr:[],
+ // 璁板綍瀹氭椂鍣ㄧ姸鎬�
+ procInfoTimer:null,
+ cutdownTimer: null
};
},
mounted() {
@@ -542,6 +551,7 @@
this.getTaskInfo();
},
methods: {
+
reloadPage() {
// window.location.reload();
this.getTaskInfo();
@@ -651,6 +661,7 @@
};
getTaskInfo().then((res) => {
if (res.code == 200) {
+ this.procedureList=[]
this.taskData = res.data
? res.data
: {
@@ -683,12 +694,15 @@
number: res.data.Number,
name: "宸ヨ壓",
});
+ this.Arr=res.data.Params?res.data.Params:[];
}
});
this.getProgressInfo();
- setInterval(() => {
- this.getProgressInfo();
- }, 6000);
+ if (!this.procInfoTimer) {
+ this.procInfoTimer = setInterval(() => {
+ this.getProgressInfo();
+ }, 6000);
+ }
}
console.log(this.procedureList, "===1111procedureList");
// setTimeout(() => {
@@ -699,9 +713,12 @@
}
if(res.code!=200||!this.taskData.Procedure.ID){
this.getcountdown();
- setInterval(() => {
- this.getcountdown();
- }, 60000);
+ // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
+ if (!this.cutdownTimer) {
+ this.cutdownTimer = setInterval(() => {
+ this.getcountdown();
+ }, 60000);
+ }
}
});
},
@@ -720,7 +737,13 @@
if (Object.keys(this.taskData).length > 0 && this.taskData.Procedure.ID) {
this.$refs.control.islook = true;
} else {
- this.$message.error("褰撳墠璁惧娌℃湁宸ュ簭锛�");
+ this.$confirm( "褰撳墠璁惧娌℃湁宸ュ簭!", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {})
+ .catch(() => {});
}
},
// 鍙充晶瀹屾垚
@@ -734,7 +757,13 @@
}
});
} else {
- this.$message.error("褰撳墠璁惧娌℃湁宸ュ簭锛�");
+ this.$confirm( "褰撳墠璁惧娌℃湁宸ュ簭!", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {})
+ .catch(() => {});
}
},
getRandomNumber(min, max) {
@@ -823,11 +852,7 @@
font-size: 30px;
font-weight: 700;
}
-.el-button--primary {
- border: 0;
- font-weight: 700 !important;
- font-size: 16px !important;
-}
+
.color_4efefa {
color: #4efefa;
}
@@ -1254,7 +1279,8 @@
}
.right_dutyLst {
width: calc(100% - 20px);
- height: 270px;
+ // height: 270px;
+ height: 310px;
border-radius: 4px;
line-height: 30px;
overflow: hidden;
@@ -1339,4 +1365,9 @@
}
}
}
+.el-button--primary {
+ border: 0;
+ font-weight: 700 !important;
+ font-size: 16px;
+}
</style>
--
Gitblit v1.8.0