From c88b44ec4d27cf616ce587505029e6fd178c545d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 25 八月 2023 14:57:45 +0800
Subject: [PATCH] plc配置的反显问题
---
src/views/visualization.vue | 116 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 39 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 987af08..fefc625 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -27,9 +27,9 @@
<span class="title-item"
>鍚庨亾宸ュ簭:
<span class="color_4efefa">
- <!-- {{
- taskData.NextProcedure.procedure.procedureName || "--"
- }} -->
+ {{
+ taskData.Procedure.procedure.nextProcedureName || "--"
+ }}
</span>
</span>
<span class="title-item"
@@ -106,15 +106,17 @@
<el-progress
define-back-color="#133EAF"
color="#09E5ED"
+ text-color="#fff"
:text-inside="true"
:stroke-width="30"
- :percentage="finishPercent"
+ :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount):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 +198,16 @@
</div>
<div class="card_top-3">
<span class="card-top-r-t"
- >瀹屾垚杩涘害锛歿{ finishPercent || 0 }}</span
+ >瀹屾垚杩涘害锛歿{ taskData.Order?parseInt(finishNumber/taskData.Order.amount):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="finishPercent"
+ :percentage="taskData.Order?parseInt(finishNumber/taskData.Order.amount):0"
:show-text="false"
></el-progress>
</span>
@@ -343,10 +346,10 @@
<div class="right-top-l">浣滀笟鐘舵��</div>
<div class="time">
<dl>
- <dd><span style="font-size: 32px">{{ formatDate3() }}</span></dd>
+ <dd><span style="font-size: 32px">{{ formatTime3 }}</span></dd>
<dd>
<span style="font-size: 12px; "
- >{{ formatDate2() }}</span
+ >{{ formatTime2 }}</span
>
<!--margin-right: 10px <span style="font-size: 14px">鏄熸湡鍥�</span> -->
</dd>
@@ -420,7 +423,7 @@
<div class="bg-title">
<img src="../../public/bg-title.png" />
<span class="bg-title-span">璁惧瀹炴椂鐢熶骇鐪嬫澘</span>
- <div class="bg-date"><span>{{ formatDate3() }}</span><br/>{{formatDate2()}}</div>
+ <div class="bg-date"><span>{{ formatTime3 }}</span><br/>{{formatTime2}}</div>
<span
class="font el-icon-setting set-title bg-set"
@click="setUrl"
@@ -430,7 +433,8 @@
<img src="../../public/yuan.png" />
<div class="btn-img">
<div class="font_size_16" style="line-height: 5; margin-top: 18%">
- 鏆傛棤浠诲姟锛屼紤鎭竴涓嬪惂...
+ <span v-if="showCountDown">璺濈浠诲姟寮�濮嬫椂闂达細{{countDownHour}}鏃� {{countDownMinute}}鍒�</span>
+ <span v-else>鏆傛棤浠诲姟锛屼紤鎭竴涓嬪惂...</span>
</div>
<el-button type="primary" @click="reloadPage">鍒锋柊浠诲姟</el-button>
</div>
@@ -439,10 +443,13 @@
</template>
<!-- 鎺у埗鐨勫脊妗� -->
<AddControl ref="control" :id="taskData.Procedure.ID" />
+ <!-- 鎺у埗鐨勫脊妗� -->
+ <AddIssue ref="control" :taskData="taskData" :Order="taskData.Order" @getSetProductNumber="getTaskInfo" />
</div>
</template>
<script>
+
import {
getTaskInfo,
finishTask,
@@ -450,15 +457,18 @@
saveMiniDict,
startTask,
getProgress,
+ countdown,
} from "@/api/home/index"; // 浜х嚎
import Card from "@/components/Card.vue";
import Knowledge from "../components/Knowledge.vue";
import AddControl from "../components/AddControl.vue";
+import AddIssue from "../components/AddIssue.vue";
export default {
components: {
Card,
Knowledge,
AddControl,
+ AddIssue,
},
data() {
return {
@@ -466,7 +476,8 @@
passrate: 30, //鍚堟牸鐜�
production: 25, //鐢熶骇涓�
finishNumber: 0,
- finishPercent: 0,
+ formatTime2:'',
+ formatTime3:'',
// 鍙充晶瀹屾垚
finishShow: false,
inputMaterials: [],
@@ -513,6 +524,10 @@
},
},
},
+ totalNumber:0,
+ showCountDown:false,
+ countDownHour:0,
+ countDownMinute:0,
};
},
mounted() {
@@ -521,23 +536,33 @@
// this.passrate = this.getRandomNumber(1, 100);
// this.production = this.getRandomNumber(1, 100);
// }, 3000);
+ this.getDate3()
+ this.getDate2()
+ setInterval(()=>{
+ this.getDate3()
+ this.getDate2()
+ },5000)
this.getTaskInfo();
- setInterval(() => {
- this.getProgressInfo();
- }, 60000);
},
-
methods: {
reloadPage() {
- window.location.reload();
+ // window.location.reload();
+ this.getTaskInfo();
+ },
+ getcountdown(){
+ countdown().then((res) => {
+ if (res.code == 200) {
+ this.showCountDown=res.data.ShowCountDown?res.data.ShowCountDown:false;
+ this.countDownHour=res.data.CountDownHour?res.data.CountDownHour:0
+ this.countDownMinute=res.data.CountDownMinute?res.data.CountDownMinute:0
+ }
+ });
},
getProgressInfo() {
getProgress().then((res) => {
if (res.code == 200) {
this.finishNumber = res.data.finishNumber ? res.data.finishNumber : 0;
- this.finishPercent = res.data.finishPercent
- ? res.data.finishPercent
- : 0;
+
}
});
},
@@ -579,15 +604,13 @@
return "";
}
},
- formatDate3() {
- const now = new Date();
- let time = this.getDateObj(now, "hh:mm");
- return time;
+ getDate3(){
+ let now= new Date();
+ this.formatTime3 = this.getDateObj(now, "hh:mm");
},
- formatDate2(){
- const now = new Date();
- let time = this.getDateObj(now, "yyyy骞碝M鏈坉d鏃�");
- return time;
+ getDate2(){
+ let now = new Date();
+ this.formatTime2 = this.getDateObj(now, "yyyy骞碝M鏈坉d鏃�");
},
setInterCard(value, name) {
let height = 200;
@@ -653,16 +676,22 @@
...this.taskData.Procedure.procedure,
},
]);
+
+
if (this.taskData.Procedure.ID) {
startTask({ id: this.taskData.Procedure.ID }).then((res) => {
if (res.code == 200) {
// res.data.number
this.procedureList[0].push({
- number: res.data.number,
+ number: res.data.Number,
name: "宸ヨ壓",
});
}
});
+ this.getProgressInfo();
+ setInterval(() => {
+ this.getProgressInfo();
+ }, 6000);
}
console.log(this.procedureList, "===1111procedureList");
// setTimeout(() => {
@@ -671,14 +700,23 @@
this.setInterCard("outputMaterials", "cardBox3");
// }, 5000);
}
+ if(res.code!=200||!this.taskData.Procedure.ID){
+ this.getcountdown();
+ setInterval(() => {
+ this.getcountdown();
+ }, 60000);
+ }
});
},
// 璁剧疆
setUrl() {
- const { href } = this.$router.resolve({
+ // const { href } = this.$router.resolve({
+ // path: "/set",
+ // });
+ // window.open(href, "_blank");
+ this.$router.push({
path: "/set",
});
- window.open(href, "_blank");
},
// 鍙充晶鎺у埗
controlClick() {
@@ -731,24 +769,24 @@
}
.bg-title-span {
position: absolute;
- width: 400px;
- height: 100px;
- line-height: 100px;
+ width: 30%;
+ height: 4rem;
+ line-height:2.4;
font-size: 26px;
font-weight: 700;
text-align: center;
- left: 39%;
- top: 5%;
+ left: 36%;
+ top: 1.5rem;
display: inline-block;
}
.bg-set{
position:absolute;
right:10%;
- height: 100px;
- line-height: 100px;
+ height: 4rem;
+ line-height:2.4;
font-size: 40px;
font-weight: 700;
- top: 5%;
+ top: 1rem;
}
.bg-date{
position:absolute;
@@ -780,7 +818,7 @@
margin: 0 auto;
text-align: center;
position: absolute;
- top: 21%;
+ top: 9rem;
}
}
}
--
Gitblit v1.8.0