From 6565e619523f045ba3e5e15a5bf3ea3ccbb33ba2 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 28 九月 2023 10:26:01 +0800
Subject: [PATCH] 如果工艺参数是空，或者报错，弹框提示工艺参数错误的提示而不是新任务的弹框
---
src/views/visualization.vue | 336 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 232 insertions(+), 104 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 0366efe..7dc5a4a 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -1,22 +1,36 @@
<template>
- <div class="home">
- <!-- -->
- <template v-if="Tasks&&Tasks.length>0">
+ <div class="home" ref="homeRef">
+ <!-- v-if="Tasks&&Tasks.length>0" -->
+ <template >
<div class="left">
<p class="title">
- <span
- class="font set-title"
- style="float: left; margin-right: 15px;"
- @click="cutClick(1)"
- >
- <img style="width:32px;" v-if="activeName == 1" src="../../public/one-blue.png" />
- <img style="width:32px;" v-else src="../../public/one.png" />
- </span>
- <span class="font set-title" style="float: left" @click="cutClick(2)">
- <img style="width:32px;" v-if="activeName == 2" src="../../public/two-blue.png" />
- <img style="width:32px;" v-else src="../../public/two.png" />
- </span>
+ <template v-if="Number(ChannelAmount)>1">
+ <span
+ class="font set-title"
+ style="float: left; margin-right: 15px;"
+ @click="cutClick(1)"
+ >
+ <img style="width:32px;" v-if="activeName == 1" src="../../public/one-blue.png" />
+ <span v-else>
+ <img style="width:32px;" src="../../public/one.png" />
+ </span>
+ </span>
+ <span class="font set-title" style="float: left;margin-right: 15px;" @click="cutClick(2)">
+ <img style="width:32px;" v-if="activeName == 2" src="../../public/two-blue.png" />
+ <img style="width:32px;" v-else src="../../public/two.png" />
+ </span>
+ <span
+ class="font set-title"
+ style="float: left;"
+ @click="cutClick(3)"
+ >
+ <img style="width:32px;" v-if="activeName == 3" src="../../public/right-blue.png" />
+ <span v-else>
+ <img style="width:32px;" src="../../public/right.png" />
+ </span>
+ </span>
+ </template>
鐢熶骇绠＄悊鐪嬫澘
<span
class="font el-icon-setting set-title"
@@ -33,7 +47,7 @@
</span>
</p>
<div
- :class="activeName == 1 ? 'active-one' : 'active-two'"
+ :class="(activeName == 1||activeName == 3) ? 'active-one' : 'active-two'"
v-for="(taskData, index) in Tasks"
:key="index"
>
@@ -110,7 +124,7 @@
</div>
</div>
<div class="content_right">
- <el-descriptions :column="activeName == 1 ? 2 : 1" :colon="true">
+ <el-descriptions :column="(activeName == 1||activeName == 3) ? 2 : 1" :colon="true">
<el-descriptions-item label="浜у搧鍚嶇О">{{
taskData.Order.productName || ""
}}</el-descriptions-item>
@@ -197,16 +211,32 @@
v-for="(list, index2) in item"
>
<div class="card_content">
- <div class="card_contentLeft">{{ list.materialId }}</div>
+ <div class="card_contentLeft font_dian">
+ <el-popover
+ width="200"
+ :content="list.materialId"
+ placement="top-start"
+ trigger="click"
+ >
+ <span slot="reference">{{ list.materialId }}</span>
+ </el-popover>
+ </div>
</div>
<div class="card-top-input-out-l">
- <div>
+ <div class="font_dian">
<!-- 璁惧12<i
style="font-size: 14px"
class="el-icon-right font-arrow-20"
></i>
璁惧13 -->
- {{ list.materialName }}
+ <el-popover
+ width="200"
+ :content="list.materialName"
+ placement="top-start"
+ trigger="click"
+ >
+ <span slot="reference">{{ list.materialName }}</span>
+ </el-popover>
</div>
</div>
<div class="card-top-input-out-r">
@@ -298,7 +328,7 @@
</div>
<div class="card_top-2">
<div style="line-height: 45px; text-align: center">
- 鐢熶骇涓�
+ {{ taskData.Procedure.Status==3?'鐢熶骇瀹屾垚':'鐢熶骇涓�' }}
</div>
<!-- <span class="card-top-r-t">瀹屾垚杩涘害锛�50%</span>
<span class="card-top-r-b">12鏈�28鏃� 08:24</span> -->
@@ -308,7 +338,7 @@
<!-- <div class="card_content">
</div> -->
- <div :class="activeName==1?'card_top-4 font_size_20px':'card_top-4'">
+ <div :class="(activeName==1||activeName == 3)?'card_top-4 font_size_20px':'card_top-4'">
<div>宸ヨ壓缂栧彿锛�<div >{{ list.number }}</div></div>
<!-- <div
style="
@@ -330,7 +360,9 @@
></p>
<div class="right-small-btn bottom-box-btn">
<el-button type="primary"> 鎵撳嵃</el-button>
+ <el-button v-if="taskData.Procedure.Status==3" type="primary" class="huise"> 瀹屾垚</el-button>
<el-popover
+ v-else
placement="top-end"
width="160"
class="button-finish"
@@ -382,13 +414,27 @@
>
<div class="card">
<div class="card_content">
- <div class="card_contentLeft">
- {{ list.materialId }}
+ <div class="card_contentLeft font_dian">
+ <el-popover
+ width="200"
+ :content="list.materialId"
+ placement="top-start"
+ trigger="click"
+ >
+ <span slot="reference">{{ list.materialId }}</span>
+ </el-popover>
</div>
</div>
<div class="card-top-input-out-l">
- <div>
- {{ list.materialName }}
+ <div class="font_dian">
+ <el-popover
+ width="200"
+ :content="list.materialName"
+ placement="top-start"
+ trigger="click"
+ >
+ <span slot="reference">{{ list.materialName }}</span>
+ </el-popover>
</div>
</div>
<div class="card-top-input-out-r">
@@ -410,9 +456,13 @@
<template
v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)"
>
+
<el-empty description="鏆傛棤浠诲姟..."></el-empty>
</template>
</div>
+ <template v-if="!Tasks||Tasks.length==0">
+ <el-empty description="鏆傛棤浠诲姟..."></el-empty>
+ </template>
</div>
<div class="right">
<div class="right_top">
@@ -432,12 +482,25 @@
<div class="right-top-m">
璁惧鐘舵��:
<!-- 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> -->
- {{ plcStatus==1?'鏂紑':(plcStatus==2?'鐢熶骇涓�':'寰呮満') }}
+ <span style="position: relative" v-if="plcStatus" >
+ <el-popover
+ v-if="plcStatus == 1&&plcNotConnected"
+ width="180"
+ :content="plcNotConnected"
+ placement="top-end"
+ trigger="click"
+ >
+ <span slot="reference">
+ <img src="../../public/duan.png" />
+ 鏂紑
+ </span>
+ </el-popover>
+ <span v-else>
+ <img v-if="plcStatus == 1&&!plcNotConnected" src="../../public/duan.png" />
+ <img v-else src="../../public/lian.png" />
+ <!-- <span class="yuandian"></span> -->
+ {{ plcStatus==1?'鏂紑':(plcStatus==2?'鐢熶骇涓�':'寰呮満') }}
+ </span>
</span>
</div>
<div class="right-top-m-btn">
@@ -497,7 +560,7 @@
</div>
</template>
<!-- -->
- <template v-else>
+ <!-- <template v-else>
<div class="home-img-box">
<div class="bg-title">
<img src="../../public/bg-title.png" />
@@ -527,13 +590,16 @@
</div>
</div>
</div>
- </template>
+
+ </template> -->
<!-- 鎺у埗鐨勫脊妗� -->
<AddControl ref="control" :Arr="Arr" />
<!-- 鎺у埗鐨勫脊妗� -->
<AddIssue
ref="control"
:Arr="Arr"
+ :ArrError="ArrError"
+ :safeProduce="safeProduce"
:taskData="taskData"
:Order="taskData.Order"
@getSetProductNumber="getTaskInfo"
@@ -551,6 +617,7 @@
startTask,
getProgress,
countdown,
+ getTaskUnStarted,
} from "@/api/home/index"; // 浜х嚎
import Card from "@/components/Card.vue";
import Knowledge from "../components/Knowledge.vue";
@@ -574,6 +641,7 @@
// 鍙充晶瀹屾垚
finishShow:{},
workers:[],
+ TasksCopy:[],
Tasks: [
{
Order: {
@@ -659,13 +727,18 @@
countDownHour: 0,
countDownMinute: 0,
Arr: [],
+ ArrError:'',
// 璁板綍瀹氭椂鍣ㄧ姸鎬�
procInfoTimer: null,
cutdownTimer: null,
TaskCount:0,
plcStatus:0,
isTipShow:false,
- isFinsh:0,
+ // isFinsh:0,
+ safeProduce:'',
+ // 璁惧鏂紑鐨勫師鍥�
+ plcNotConnected:'',
+ ChannelAmount:0,
};
},
mounted() {
@@ -683,18 +756,23 @@
this.getTaskInfo();
},
watch:{
- isFinsh(){
- if(this.isFinsh==this.Tasks.length){
- this.getStartArr()
- }
- }
+ // isFinsh(){
+ // if(this.isFinsh==this.Tasks.length){
+ // this.getStartArr()
+ // }
+ // }
},
methods: {
taskClick(){
if(this.TaskCount>0){
+ this.getStartArr()
this.$refs.control.islook=true
}else{
- this.$message.error('鐩墠娌℃湁浠诲姟锛�')
+ this.$message({
+ message:'鐩墠娌℃湁浠诲姟锛�',
+ type: 'error',
+ duration: 3 * 1000
+ })
}
},
isTip(val){
@@ -702,7 +780,16 @@
},
cutClick(val) {
this.activeName = val;
- this.getTaskInfo();
+ if(this.activeName==2){
+ this.Tasks=this.TasksCopy.slice(0,2)
+ if(this.Tasks.length<2){
+ this.Tasks.push(null)
+ }
+ }else if(this.activeName==1){
+ this.Tasks=this.TasksCopy.slice(0,1)
+ }else if(this.activeName==3){
+ this.Tasks=this.TasksCopy.slice(1)
+ }
},
reloadPage() {
// window.location.reload();
@@ -720,6 +807,9 @@
this.countDownMinute = res.data.CountDownMinute
? res.data.CountDownMinute
: 0;
+ if(this.countDownHour==0&& this.countDownMinute==0){
+ this.getTaskInfo();
+ }
}
});
},
@@ -756,7 +846,7 @@
formatDate(value) {
if (value) {
const now = value ? new Date(value * 1000) : new Date();
- let time = this.getDateObj(now, "yyyy-MM-dd hh:mm:ss");
+ let time = this.getDateObj(now, "MM-dd hh:mm");
return time;
} else {
return "";
@@ -799,15 +889,20 @@
return d;
},
setInterCard(value, name, i) {
- if (this.Tasks[i].Procedure.procedure[value]!=null) {
+ if (this.TasksCopy[i].Procedure.procedure[value]!=null) {
let height = 200;
- let num = 1;
- if (this.$refs[name]) {
- height = this.$refs[name].$el?this.$refs[name].$el.offsetHeight:200;
- num = Math.floor(height / 80);
+ let num = 3;
+ // if (this.$refs[name]) {
+ // height = this.$refs[name].$el?this.$refs[name].$el.offsetHeight:200;
+ // num = Math.floor(height / 80);
+ // }
+ height = this.$refs['homeRef']?(this.$refs['homeRef'].offsetHeight-470-90-20):200;
+ if(this.activeName==2){
+ height=height-610-90-20
}
+ num = Math.floor(height / 80);
let inputMaterials = JSON.parse(
- JSON.stringify(this.Tasks[i].Procedure.procedure[value])
+ JSON.stringify(this.TasksCopy[i].Procedure.procedure[value])
);
let newDataList = [];
let current = 0;
@@ -828,7 +923,7 @@
}
}
}
- this.Tasks[i][value] = [...newDataList];
+ this.TasksCopy[i][value] = [...newDataList];
}
},
@@ -859,60 +954,68 @@
],
};
this.Tasks = [];
- getTaskInfo({ page: 1, pageSize: this.activeName }).then((res) => {
+ this.TasksCopy=[]
+ getTaskInfo({taskMode:2}).then((res) => {
if (res.code == 200&&res.data) {
let arr=[]
if(res.data.Tasks){
arr.sort(function(a,b){
- return (a.Position - b.Position)
+ return (a.Channel - b.Channel)
})
}
- this.Tasks = res.data.Tasks ? res.data.Tasks : [];
-
+ this.activeName=1;
+ this.TasksCopy = res.data.Tasks ? res.data.Tasks : [];
+ this.safeProduce=res.data.Prompt.safeProduce?res.data.Prompt.safeProduce:''
+ this.plcNotConnected=res.data.Prompt.plcNotConnected?res.data.Prompt.plcNotConnected:''
+ this.ChannelAmount=res.data.ChannelAmount?res.data.ChannelAmount:1
+ // if(this.ChannelAmount>1 &&this.TasksCopy.length<2){
+ // this.TasksCopy.push(object)
+ // }
this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
- if (this.Tasks.length == 0&&this.TaskCount==0) {
- if (this.activeName == 1) {
- this.Tasks.push(object);
+
+ if (this.TasksCopy.length == 0&&this.TaskCount==0) {
+ if (this.activeName == 1||this.activeName == 3) {
+ this.TasksCopy.push(object);
} else {
- this.Tasks.push(object);
- this.Tasks.push(object);
+ this.TasksCopy.push(object);
+ this.TasksCopy.push(object);
}
}
this.workers=res.data.workers?res.data.workers:[]
- for (let i in this.Tasks) {
- this.Tasks[i].procedureList = [];
- this.Tasks[i].inputMaterials = [];
- this.Tasks[i].outputMaterials = [];
- this.Tasks[i].finishNumber = 0;
+ for (let i in this.TasksCopy) {
+ this.TasksCopy[i].procedureList = [];
+ this.TasksCopy[i].inputMaterials = [];
+ this.TasksCopy[i].outputMaterials = [];
+ this.TasksCopy[i].finishNumber = 0;
this.finishShow['finishShow&'+i]=false
- this.Tasks[i].Procedure.procedure.workers = this.Tasks[i].Procedure
+ this.TasksCopy[i].Procedure.procedure.workers = this.TasksCopy[i].Procedure
.procedure.workers
- ? this.Tasks[i].Procedure.procedure.workers
+ ? this.TasksCopy[i].Procedure.procedure.workers
: [];
- this.Tasks[i].procedureList.push([
+ this.TasksCopy[i].procedureList.push([
{
name: "宸ュ簭",
- ...this.Tasks[i].Procedure.procedure,
+ ...this.TasksCopy[i].Procedure.procedure,
},
]);
- if (this.Tasks[i].Procedure.ID) {
- startTask({ id: this.Tasks[i].Procedure.ID }).then((res) => {
+ if (this.TasksCopy[i].Procedure.ID) {
+ startTask({ id: this.TasksCopy[i].Procedure.ID }).then((res) => {
if (res.code == 200) {
// res.data.number
- this.Tasks[i].procedureList[0].push({
+ this.TasksCopy[i].procedureList[0].push({
number: res.data.Number,
});
- this.Tasks[i].Arr=res.data.Params ? res.data.Params : []
- this.isFinsh=Number(i)+1
+ // this.TasksCopy[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(() => {
@@ -920,38 +1023,53 @@
}, 3000);
}
}
- if (res.code != 200 || this.Tasks.length == 0) {
- this.getcountdown();
- // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
- if (!this.cutdownTimer) {
- this.cutdownTimer = setInterval(() => {
- this.getcountdown();
- }, 60000);
- }
- }
+ // if (res.code != 200 || this.TasksCopy.length == 0) {
+ // this.getcountdown();
+ // // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
+ // if (!this.cutdownTimer) {
+ // this.cutdownTimer = setInterval(() => {
+ // this.getcountdown();
+ // }, 60000);
+ // }
+ // }
+ this.cutClick(1)
});
-
- // this.Tasks.push(object)
- // this.Tasks.push(object)
+ // this.TasksCopy.push(object)
+ // this.TasksCopy.push(object)
},
getStartArr(){
- for (let i in this.Tasks) {
- if (this.Tasks[i].Procedure.Status==1) {
- this.Arr = this.Tasks[i].Arr ?this.Tasks[i].Arr: [];
- this.taskData=this.Tasks[i];
- break;
+ // for (let i in this.TasksCopy) {
+ // if (this.TasksCopy[i].Procedure.Status==1) {
+ // this.Arr = this.TasksCopy[i].Arr ?this.TasksCopy[i].Arr: [];
+ // // this.taskData=this.TasksCopy[i];
+ // break;
+ // }
+ // }
+ getTaskInfo({taskMode:1}).then(res=>{
+ if(res.code==200){
+ this.taskData=res.data.Tasks?res.data.Tasks[0]:{};
+ this.ArrError=''
+ if (this.taskData.Procedure.ID) {
+ startTask({ id: this.taskData.Procedure.ID }).then((res) => {
+ if (res.code == 200) {
+ this.Arr =res.data.Params ? res.data.Params : []
+ }else{
+ this.ArrError=res.msg;
+ }
+ });
+ }
}
- }
+ })
},
getProgressInfo() {
- for (let i in this.Tasks){
- if(this.Tasks[i].Procedure.ID){
+ for (let i in this.TasksCopy){
+ if(this.TasksCopy[i].Procedure.ID){
getProgress({
- position: Number(i),
- procedureId: this.Tasks[i].Procedure.ID,
+ channel: Number(i),
+ procedureId: this.TasksCopy[i].Procedure.ID,
}).then((res) => {
if (res.code == 200) {
- this.Tasks[i].finishNumber = res.data.finishNumber
+ this.TasksCopy[i].finishNumber = res.data.finishNumber
? res.data.finishNumber
: 0;
this.plcStatus=res.data.plcStatus?res.data.plcStatus:0
@@ -1029,7 +1147,7 @@
color:#318583;
}
.el-empty{
- height:100%;
+ height:calc(100% - 190px);
.el-empty__description p{
font-size:16px!important;
color:#fff!important;
@@ -1352,6 +1470,15 @@
border: 0;
}
}
+ .huise{
+ width: 46%;
+ float: right;
+ }
+ .huise.el-button--primary {
+ background: #CCE8E8;
+ color: #AAAAAA;
+ border: 0;
+ }
}
.home {
width: 100%;
@@ -1488,6 +1615,12 @@
margin-top: 10px;
color: #333;
position: relative;
+ .font_dian{
+ -webkit-box-orient:vertical;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ }
.card_top-2{
width:35%;
}
@@ -1609,12 +1742,7 @@
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 {
width: 100%;
--
Gitblit v1.8.0