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 | 121 ++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 29 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 90a30a7..7dc5a4a 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -1,6 +1,6 @@
<template>
- <div class="home">
+ <div class="home" ref="homeRef">
<!-- v-if="Tasks&&Tasks.length>0" -->
<template >
<div class="left">
@@ -25,9 +25,9 @@
style="float: left;"
@click="cutClick(3)"
>
- <img style="width:32px;" v-if="activeName == 3" src="../../public/one-blue.png" />
+ <img style="width:32px;" v-if="activeName == 3" src="../../public/right-blue.png" />
<span v-else>
- <img style="width:32px;" src="../../public/one.png" />
+ <img style="width:32px;" src="../../public/right.png" />
</span>
</span>
</template>
@@ -211,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">
@@ -398,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">
@@ -430,6 +460,9 @@
<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">
@@ -449,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">
@@ -552,6 +598,7 @@
<AddIssue
ref="control"
:Arr="Arr"
+ :ArrError="ArrError"
:safeProduce="safeProduce"
:taskData="taskData"
:Order="taskData.Order"
@@ -680,6 +727,7 @@
countDownHour: 0,
countDownMinute: 0,
Arr: [],
+ ArrError:'',
// 璁板綍瀹氭椂鍣ㄧ姸鎬�
procInfoTimer: null,
cutdownTimer: null,
@@ -688,6 +736,8 @@
isTipShow:false,
// isFinsh:0,
safeProduce:'',
+ // 璁惧鏂紑鐨勫師鍥�
+ plcNotConnected:'',
ChannelAmount:0,
};
},
@@ -732,6 +782,9 @@
this.activeName = val;
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){
@@ -838,11 +891,16 @@
setInterCard(value, name, i) {
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.TasksCopy[i].Procedure.procedure[value])
);
@@ -897,7 +955,7 @@
};
this.Tasks = [];
this.TasksCopy=[]
- getTaskInfo({ }).then((res) => {
+ getTaskInfo({taskMode:2}).then((res) => {
if (res.code == 200&&res.data) {
let arr=[]
if(res.data.Tasks){
@@ -908,6 +966,7 @@
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)
@@ -986,13 +1045,16 @@
// break;
// }
// }
- getTaskUnStarted({page:1,pageSize:1}).then(res=>{
+ 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;
}
});
}
@@ -1085,7 +1147,7 @@
color:#318583;
}
.el-empty{
- height:100%;
+ height:calc(100% - 190px);
.el-empty__description p{
font-size:16px!important;
color:#fff!important;
@@ -1553,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%;
}
@@ -1674,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