From 722231fc31750241c78a63ce7934905ca1892cd9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 25 九月 2023 16:28:57 +0800
Subject: [PATCH] 距离任务 倒计时 为0的时候筛选获取任务的接口
---
src/views/visualization.vue | 310 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 203 insertions(+), 107 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 3745c30..5d2284a 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -1,7 +1,7 @@
<template>
<div class="home">
- <!-- v-if="Object.keys(taskData).length > 0 && taskData.Procedure.ID" -->
+ <!-- -->
<template v-if="Tasks&&Tasks.length>0">
<div class="left">
<p class="title">
@@ -37,6 +37,7 @@
v-for="(taskData, index) in Tasks"
:key="index"
>
+ <template v-if="taskData">
<div class="gong-date">
宸ュ簭杩愯鏃堕棿锛歿{ getFormatTime(taskData.Procedure.startTime) }}
</div>
@@ -44,13 +45,13 @@
<span class="title-item"
>宸ュ崟缂栧彿:
<span class="color_4efefa">{{
- taskData.Order.workOrderId || ""
+ taskData.Order.workOrderId || "--"
}}</span>
</span>
<span class="title-item"
>褰撳墠宸ュ簭:
<span class="color_4efefa">{{
- taskData.Procedure.procedure.procedureName || ""
+ taskData.Procedure.procedure.procedureName || "--"
}}</span>
</span>
<span class="title-item"
@@ -74,8 +75,8 @@
</span>
</span> -->
</div>
- <div class="gongx" v-if="taskData.AllProcedures">
- <el-steps :active="taskData.CurrentProcedureIndex?taskData.CurrentProcedureIndex:0" finish-status="success" class="steps">
+ <div class="gongx">
+ <el-steps v-if="taskData.AllProcedures" :active="taskData.CurrentProcedureIndex?taskData.CurrentProcedureIndex:0" finish-status="success" class="steps">
<el-step icon="" :title="item" v-for="(item,index) in taskData.AllProcedures" :key="index"></el-step>
</el-steps>
</div>
@@ -142,8 +143,8 @@
<el-descriptions-item label="瀹屾垚搴�" style="width: 100%">
<!--:text-format="format" -->
<el-progress
- define-back-color="#133EAF"
- color="#09E5ED"
+ define-back-color="#132f6e"
+ color="#00cc66"
text-color="#fff"
:text-inside="true"
:stroke-width="30"
@@ -198,7 +199,7 @@
<div class="card_content">
<div class="card_contentLeft">{{ list.materialId }}</div>
</div>
- <div class="card_top">
+ <div class="card-top-input-out-l">
<div>
<!-- 璁惧12<i
style="font-size: 14px"
@@ -208,7 +209,7 @@
{{ list.materialName }}
</div>
</div>
- <div class="card_top2">
+ <div class="card-top-input-out-r">
<div style="line-height: 45px; text-align: center">
{{ list.amount }} {{ list.unit }}
</div>
@@ -218,11 +219,11 @@
</div>
</el-carousel-item>
</el-carousel>
- <el-button type="primary" class="color_f70f83">
+ <el-button type="primary" class="color_f70f83 bottom-box-btn">
<i class="el-icon-phone-outline" />鐗╂枡鍛煎彨</el-button
>
</div>
- <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
+ <i class="el-icon-arrow-right font-arrow-20 color_318583"></i>
<div class="bottom_list">
<div class="bottom-title">
褰撳墠宸ュ簭:{{ taskData.Procedure.procedure.procedureName || "" }}
@@ -246,8 +247,16 @@
>
<template v-if="list.name == '宸ュ簭'">
<div class="card_content">
- <div class="card_contentLeft color_blue">
- {{ list.deviceName }}
+ <div class="card_contentLeft color_blue font_dian">
+ <!-- {{ list.deviceName }} -->
+ <el-popover
+ width="200"
+ :content="list.deviceName"
+ placement="top-start"
+ trigger="click"
+ >
+ <span slot="reference">{{ list.deviceName }}</span>
+ </el-popover>
<!-- <span style="float: right">6m/s</span> -->
</div>
</div>
@@ -265,8 +274,8 @@
>
<span class="card-top-r-b">
<el-progress
- define-back-color="#133EAF"
- color="#09E5ED"
+ define-back-color="#132f6e"
+ color="#00cc66"
text-color="#fff"
:text-inside="true"
:stroke-width="10"
@@ -299,8 +308,8 @@
<!-- <div class="card_content">
</div> -->
- <div class="card_top-4">
- <div>宸ヨ壓缂栧彿锛歿{ list.number }}</div>
+ <div :class="activeName==1?'card_top-4 font_size_20px':'card_top-4'">
+ <div>宸ヨ壓缂栧彿锛�<div >{{ list.number }}</div></div>
<!-- <div
style="
font-size: 14px;
@@ -319,7 +328,7 @@
<p
style="font-size: 22px; margin-left: 12px; margin-top: 50px"
></p>
- <div class="right-small-btn">
+ <div class="right-small-btn bottom-box-btn">
<el-button type="primary"> 鎵撳嵃</el-button>
<el-popover
placement="top-end"
@@ -328,7 +337,7 @@
v-model="finishShow['finishShow&'+index]"
trigger="click"
>
- <p>璇风‘璁ゆ槸鍚﹀凡瀹屾垚璇ョ敓浜т换鍔�?</p>
+ <p><i class="el-icon-error" style="color:red;margin-right:5px;"/>璇风‘璁ゆ槸鍚﹀凡瀹屾垚璇ョ敓浜т换鍔�?</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" @click="finishShow['finishShow&'+index] = false">
鍙栨秷</el-button
@@ -336,6 +345,7 @@
<el-button
type="primary"
size="mini"
+ class="color_f70f83"
@click="finishClick(index, taskData)"
>
纭畾</el-button
@@ -345,7 +355,7 @@
</el-popover>
</div>
</div>
- <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
+ <i class="el-icon-arrow-right font-arrow-20 color_318583"></i>
<div class="bottom_list">
<div class="bottom-title">
<span>杈撳嚭璧勬簮</span>
@@ -376,53 +386,32 @@
{{ list.materialId }}
</div>
</div>
- <div class="card_top">
+ <div class="card-top-input-out-l">
<div>
{{ list.materialName }}
- <!-- 璁惧12<i
- style="font-size: 14px"
- class="el-icon-right font-arrow-20"
- ></i>
- 璁惧13 -->
</div>
</div>
- <div class="card_top2">
+ <div class="card-top-input-out-r">
<div style="line-height: 45px; text-align: center">
{{ list.amount }} {{ list.unit }}
</div>
- <!-- <span class="card-top-r-t">鐢熶骇瀹屾垚</span>
- <span class="card-top-r-b">12鏈�28鏃� 08:24</span> -->
</div>
- <!-- <div class="card-info-box">棰勮10鍒嗛挓閫佽揪</div> -->
</div>
- <!-- <div class="card">
- <div class="card_content">
- <div class="card_contentLeft color_green">
- 鍖呭彿:G22122304 100鍚�
- </div>
- </div>
- <div class="card_top">
- <div>
- 璁惧12<i
- style="font-size: 14px"
- class="el-icon-right font-arrow-20"
- ></i>
- 璁惧13
- </div>
- </div>
- <div class="card_top-2">
- <span class="card-top-r-t">鐢熶骇瀹屾垚</span>
- <span class="card-top-r-b">12鏈�28鏃� 08:24</span>
- </div>
- </div> -->
</div>
</el-carousel-item>
</el-carousel>
- <el-button type="primary" class="color_f70f83">
+ <el-button type="primary" class="color_f70f83 bottom-box-btn">
<i class="el-icon-phone-outline" />杩愯緭鍛煎彨</el-button
>
</div>
</div>
+ </template>
+ <!-- 2涓换鍔＄殑鏃跺�欙紝绗簩涓换鍔′负绌虹殑鏃跺�欐樉绀� -->
+ <template
+ v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)"
+ >
+ <el-empty description="鏆傛棤浠诲姟..."></el-empty>
+ </template>
</div>
</div>
<div class="right">
@@ -444,7 +433,7 @@
璁惧鐘舵��:
<!-- 1鏂紑2鐢熶骇3寰呮満 -->
<span style="position: relative"
- >
+ v-if="plcStatus" >
<img v-if="plcStatus == 1" src="../../public/duan.png" />
<img v-else src="../../public/lian.png" />
<!-- <span class="yuandian"></span> -->
@@ -477,9 +466,12 @@
style="font-size: 20px; font-weight: 600; margin-right: 10px"
>{{ item.workerName || "" }}</span
>
- <span>{{ item.phoneNum || "" }}</span>
+ <!-- <span>{{ item.phoneNum || "" }}</span> -->
+ <span class="color_yellow"><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /></span>
</dl>
+
</div>
+
<!-- <div
style="
width: 100%;
@@ -494,7 +486,7 @@
</div> -->
</div>
<div class="right_base">
- <div class="right-small-title" style="line-height: 40px">鐭ヨ瘑搴�</div>
+ <div class="right-small-title" style="line-height: 40px;margin-top:20px;">鐭ヨ瘑搴�</div>
<Knowledge />
<div class="right-base-btn call">
<el-button type="primary"
@@ -504,7 +496,7 @@
</div>
</div>
</template>
- <!-- v-else -->
+ <!-- -->
<template v-else>
<div class="home-img-box">
<div class="bg-title">
@@ -671,8 +663,9 @@
procInfoTimer: null,
cutdownTimer: null,
TaskCount:0,
- plcStatus:1,
+ plcStatus:0,
isTipShow:false,
+ isFinsh:0,
};
},
mounted() {
@@ -688,6 +681,13 @@
this.getDate2();
}, 5000);
this.getTaskInfo();
+ },
+ watch:{
+ isFinsh(){
+ if(this.isFinsh==this.Tasks.length){
+ this.getStartArr()
+ }
+ }
},
methods: {
taskClick(){
@@ -720,6 +720,9 @@
this.countDownMinute = res.data.CountDownMinute
? res.data.CountDownMinute
: 0;
+ if(this.countDownHour==0&& this.countDownMinute==0){
+ this.getTaskInfo();
+ }
}
});
},
@@ -799,11 +802,11 @@
return d;
},
setInterCard(value, name, i) {
- if (this.Tasks[i].Procedure.procedure[value]) {
+ if (this.Tasks[i].Procedure.procedure[value]!=null) {
let height = 200;
let num = 1;
if (this.$refs[name]) {
- height = this.$refs[name].$el.offsetHeight;
+ height = this.$refs[name].$el?this.$refs[name].$el.offsetHeight:200;
num = Math.floor(height / 80);
}
let inputMaterials = JSON.parse(
@@ -839,8 +842,24 @@
procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
},
inputMaterials: [],
- outputMaterials: [],
- procedureList: [],
+ outputMaterials: [
+ // [
+ // {
+ // materialId:11111,
+ // materialName:'272澶у鍟婃斁鍋囦簡鍗¤壈鑻﹀鏂楀瀮鍦惧彂蹇�掑瀮鍦惧弽棣堟潵寰楀強鍏嬮殕',
+ // amount:100,
+ // unit:'浠�'
+ // }
+ // ]
+ ],
+ procedureList: [
+ // [
+ // {
+ // name:"宸ュ簭",
+ // deviceName:'1111dhafjdhajkhf jkdahjkf鎵撴硶鍗冲彲鎵撻枊閺堟帴鑲痉鍩哄晩鐪嬩締jdad澶ч浜笢鍗¤�佸徃鏈虹暘绐犲�掕嚰寮�浜嗘埧閲戦樋濂庣鍗佸叚灞婂弽棣堟媺寰锋柉鍩簁鎵撳崱鏈洪樋鐝傞檮浠舵墦寮�浜嗙偣鍑婚樋閲屽崱鍑忚偉鐨勫崱鎷夎兌寮�浜嗘埧澶ц涓婂厠闅唂k鍟﹀ぇ瀹堕槻绌洪浄閬旀暩鎿氱湅i'
+ // },
+ // ]
+ ],
};
this.Tasks = [];
getTaskInfo({ page: 1, pageSize: this.activeName }).then((res) => {
@@ -852,9 +871,9 @@
})
}
this.Tasks = res.data.Tasks ? res.data.Tasks : [];
+
this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
- this.workers=res.data.workers?res.data.workers:[]
- if (this.Tasks.length == 0) {
+ if (this.Tasks.length == 0&&this.TaskCount==0) {
if (this.activeName == 1) {
this.Tasks.push(object);
} else {
@@ -862,6 +881,7 @@
this.Tasks.push(object);
}
}
+ this.workers=res.data.workers?res.data.workers:[]
for (let i in this.Tasks) {
this.Tasks[i].procedureList = [];
this.Tasks[i].inputMaterials = [];
@@ -872,34 +892,35 @@
.procedure.workers
? this.Tasks[i].Procedure.procedure.workers
: [];
+
this.Tasks[i].procedureList.push([
{
name: "宸ュ簭",
...this.Tasks[i].Procedure.procedure,
},
]);
-
+
if (this.Tasks[i].Procedure.ID) {
startTask({ id: this.Tasks[i].Procedure.ID }).then((res) => {
if (res.code == 200) {
// res.data.number
this.Tasks[i].procedureList[0].push({
number: res.data.Number,
- name: "宸ヨ壓",
- Arr:res.data.Params ? res.data.Params : [],
});
+ this.Tasks[i].Arr=res.data.Params ? res.data.Params : []
+ this.isFinsh=Number(i)+1
}
});
}
this.setInterCard("inputMaterials", "cardBox1&" + i, i);
this.setInterCard("outputMaterials", "cardBox3&" + i, i);
}
- this.getStartArr()
+
this.getProgressInfo();
if (!this.procInfoTimer) {
this.procInfoTimer = setInterval(() => {
this.getProgressInfo();
- }, 9000);
+ }, 3000);
}
}
if (res.code != 200 || this.Tasks.length == 0) {
@@ -912,11 +933,14 @@
}
}
});
+
+ // this.Tasks.push(object)
+ // this.Tasks.push(object)
},
getStartArr(){
for (let i in this.Tasks) {
if (this.Tasks[i].Procedure.Status==1) {
- this.Arr = this.Tasks[i].procedureList[0].Arr ?this.Tasks[i].procedureList[0].Arr: [];
+ this.Arr = this.Tasks[i].Arr ?this.Tasks[i].Arr: [];
this.taskData=this.Tasks[i];
break;
}
@@ -924,17 +948,19 @@
},
getProgressInfo() {
for (let i in this.Tasks){
- getProgress({
- position: Number(i),
- procedureId: this.Tasks[i].Procedure.ID,
- }).then((res) => {
- if (res.code == 200) {
- this.Tasks[i].finishNumber = res.data.finishNumber
- ? res.data.finishNumber
- : 0;
- this.plcStatus=res.data.plcStatus?res.data.plcStatus:1
- }
- });
+ if(this.Tasks[i].Procedure.ID){
+ getProgress({
+ position: Number(i),
+ procedureId: this.Tasks[i].Procedure.ID,
+ }).then((res) => {
+ if (res.code == 200) {
+ this.Tasks[i].finishNumber = res.data.finishNumber
+ ? res.data.finishNumber
+ : 0;
+ this.plcStatus=res.data.plcStatus?res.data.plcStatus:0
+ }
+ });
+ }
}
},
@@ -986,6 +1012,33 @@
</script>
<style lang="scss">
+.tooltip-width-200{
+ width:200px;
+ line-height:1.3!important;
+}
+.el-popover{
+ background:#12234a!important;
+ color:#fff!important;
+ border-color: #09e5ed !important;
+
+ .popper__arrow::after{
+ border-top-color:#09e5ed !important;
+ }
+}
+.color_yellow{
+ color:yellow;
+}
+.color_318583{
+ color:#318583;
+}
+.el-empty{
+ height:100%;
+ .el-empty__description p{
+ font-size:16px!important;
+ color:#fff!important;
+ }
+}
+
.active-one {
width: 100%;
height: calc(100% - 100px);
@@ -996,10 +1049,13 @@
margin-bottom: 20px;
}
.content {
- height: 240px;
+ height: 300px;
}
.bottom {
- height: calc(100% - 410px);
+ height: calc(100% - 470px);
+ }
+ .font_size_20px{
+ font-size:20px!important;
}
}
.active-two {
@@ -1013,6 +1069,7 @@
box-sizing: border-box;
border-right: 1px solid #eee;
}
+
.small_title {
margin-bottom: 30px;
}
@@ -1027,18 +1084,18 @@
line-height: 20px;
}
.content {
- height: 370px;
+ height: 430px;
.content-top {
- height: calc(50% - 20px) !important;
- padding-top: 10px !important;
+ height: calc(50% - 30px) !important;
+ padding-top: 20px !important;
}
.el-descriptions__body {
font-size: 16px !important;
}
}
.bottom {
- height: calc(100% - 560px);
+ height: calc(100% - 610px);
}
.bottom_list .bottom-title {
font-size: 16px;
@@ -1250,14 +1307,21 @@
}
.card-box {
width: 100%;
- height: calc(100% - 50px - 50px);
+ height: calc(100% - 50px - 40px);
// height:300px;
.el-carousel__container{
overflow-y:auto;
}
- // .el-carousel__item{
- // min-height:116px;
- // }
+ .el-carousel__item{
+ // height:auto;
+ min-height:160px;
+ }
+ }
+ .bottom-box-btn{
+ width:calc(100% - 20px);
+ position:absolute;
+ bottom:10px;
+ left:10px;
}
}
@@ -1324,11 +1388,12 @@
align-content: center;
justify-content: space-around;
align-items: center;
+ overflow:hidden;
.title-item {
- width: calc(33.333% - 50px);
+ width: calc((100% - 50px)/3);
float: left;
margin-right: 10px;
- padding: 15px 20px;
+ padding: 10px 5px;
text-align: center;
border-radius: 4px;
display: inline-block;
@@ -1384,6 +1449,9 @@
background: rgb(22 72 173);
border-radius: 6px;
// background: #233b9e;
+ .el-descriptions-row{
+ height:45px;
+ }
.el-descriptions__body {
background: transparent;
font-size: 18px;
@@ -1420,18 +1488,25 @@
// border: 1px solid #ccc;
background: #6b83ff;
border-radius: 5px;
- margin-top: 20px;
+ margin-top: 10px;
color: #333;
position: relative;
- .card_top-2,
+ .card_top-2{
+ width:35%;
+ }
+ .card-top-input-out-r,
.card_top-3 {
- width: 50%;
+ width:65%;
+ }
+ .card_top-2,.card-top-input-out-r,
+ .card_top-3 {
height: 45px;
border-radius: 5px;
background: #6b83ff;
- font-size: 12px;
+ font-size: 13px;
color: #fff;
float: left;
+ font-weight: 700;
.card-top-r-t {
width: 100%;
text-align: center;
@@ -1465,7 +1540,7 @@
}
}
- .card_top,
+ .card_top,.card-top-input-out-l,
.card_top-4 {
width: 50%;
height: 45px;
@@ -1474,10 +1549,8 @@
color: #fff;
font-size: 12px;
line-height: 45px;
- float: left;
-
> div {
- margin-left: 12px;
+ padding-left: 12px;
position: relative;
p {
position: absolute;
@@ -1487,15 +1560,32 @@
}
}
}
+ .card_top{
+ float: left;
+ }
+ .card-top-input-out-l{
+ float:left;
+ width:65%;
+ line-height:20px;
+ vertical-align: middle;
+ display:flex;
+ justify-content:space-around;
+ align-items:center;
+ }
+ .card-top-input-out-r{
+ width:35%;
+ }
.card_top-4 {
width: calc(100% - 20px);
- padding: 0 10px;
- height: 70px;
-
- line-height: 70px;
+ padding: 10px 10px;
color: #fff;
background: rgb(19, 35, 90);
- font-size: 20px;
+ font-size: 14px;
+ height:50px;
+ line-height: 25px;
+ >div{
+ margin-left:0px;
+ }
}
.card-info-box {
position: absolute;
@@ -1521,6 +1611,12 @@
color: #fff;
border-radius: 5px 5px 0 0;
background: rgb(19, 35, 90);
+ }
+ .font_dian{
+ -webkit-box-orient:vertical;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
}
.card_contentRight {
@@ -1619,7 +1715,7 @@
.right_dutyLst {
width: calc(106% - 20px);
// height: 270px;
- height: 310px;
+ height: 370px;
border-radius: 4px;
line-height: 30px;
overflow: hidden;
@@ -1638,7 +1734,7 @@
}
.right-person-box {
width: 100%;
- height: calc(100% - 40px);
+ height: calc(100% - 60px);
overflow: auto;
margin-top: -10px;
}
@@ -1668,7 +1764,7 @@
}
.right_base {
width: 100%;
- height: calc(100% - 520px);
+ height: calc(100% - 580px);
min-height: 200px;
// overflow-y:auto;
position: relative;
--
Gitblit v1.8.0