From a4a0ddef7658e6b7ae7cfb807af19f089f96acc8 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 28 九月 2023 14:53:39 +0800
Subject: [PATCH] 如果沒有任务前端需要是模拟后台数据结push空数据进去+2个任务的时候下发成功，跳转的不是当前选中的
---
src/views/visualization.vue | 98 ++++++++++++++------------------
src/components/AddIssue.vue | 26 +++++---
2 files changed, 60 insertions(+), 64 deletions(-)
diff --git a/src/components/AddIssue.vue b/src/components/AddIssue.vue
index 65a99df..223ce43 100644
--- a/src/components/AddIssue.vue
+++ b/src/components/AddIssue.vue
@@ -41,7 +41,7 @@
</div>
</template>
- <template v-else>
+ <template v-else-if="Object.keys(taskData).length > 0 ">
<div class="title-box margin_bottom_13">
<div class="title-item color_4efefa font_size_20 title-bng">
褰撳墠浠诲姟锛歿{ taskData.Procedure.procedure.procedureName || "" }}
@@ -240,7 +240,13 @@
default: () => {
return '';
},
- }
+ },
+ activeName:{
+ type: [String,Number],
+ default: () => {
+ return 1;
+ },
+ },
},
data() {
return {
@@ -314,16 +320,16 @@
getInfo() {
// 1 鏈敓浜� 2鐢熶骇涓� 3鐢熶骇瀹屾垚
if (
- Object.keys(this.taskData).length > 0 &&
- this.taskData.Procedure.ID &&
- this.taskData.Procedure.Status == 1
+ Object.keys(this.taskData).length > 0 && this.taskData.Procedure.ID &&
+ this.taskData.Procedure.Status == 1
) {
- this.num = 0;
- this.showBtn = 1;
- this.islook = true;
+ this.num = 0;
+ this.showBtn = 1;
+ this.islook = true;
} else {
this.islook = false;
- // this.islook = true;
+ // this.islook = true;
+
}
if(this.ArrError){
this.messageError=this.ArrError;
@@ -415,7 +421,7 @@
this.num = 0;
this.showBtn= 1
this.shutdown();
- this.$emit('getSetProductNumber')
+ this.$emit('getSetProductNumber',this.activeName)
// this.$message.success("涓嬪彂鐢熶骇鏁伴噺鎴愬姛锛�");
}
} else {
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 312e308..9f3acd5 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -104,7 +104,7 @@
style="font-size: 35px; font-weight: 600"
class="color_green"
>
- {{ taskData.finishNumber }}{{ taskData.Order.unit }}
+ {{ taskData.finishNumber || 0 }}{{ taskData.Order.unit }}
</dd>
</dl>
</div>
@@ -126,31 +126,31 @@
<div class="content_right">
<el-descriptions :column="(activeName == 1||activeName == 3) ? 2 : 1" :colon="true">
<el-descriptions-item label="浜у搧鍚嶇О">{{
- taskData.Order.productName || ""
+ taskData.Order.productName || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鏁伴噺"
>{{ taskData.Order.amount || 0
}}{{ taskData.Order.unit }}</el-descriptions-item
>
<el-descriptions-item label="浜よ揣鏃ユ湡">{{
- taskData.Order.deliverDate || ""
+ taskData.Order.deliverDate || "--"
}}</el-descriptions-item>
<el-descriptions-item label="宸ユ椂">
- {{ taskData.Procedure.procedure.workHours || "" }}
+ {{ taskData.Procedure.procedure.workHours || "--" }}
</el-descriptions-item>
<el-descriptions-item label="璁″垝鏃堕棿"
- >{{ formatDate(taskData.Order.startTime) || "" }}
+ >{{ formatDate(taskData.Order.startTime) || "--" }}
-
{{ formatDate(taskData.Order.endTime) }}</el-descriptions-item
>
<el-descriptions-item label="璐х墿鎻忚堪">{{
- taskData.Order.orderAttr || ""
+ taskData.Order.orderAttr || "--"
}}</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{
- taskData.Order.customer || ""
+ taskData.Order.customer || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍙傛暟瑕佹眰">{{
- taskData.Order.parameter || ""
+ taskData.Order.parameter || "--"
}}</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="1" :colon="true">
@@ -163,7 +163,7 @@
:text-inside="true"
:stroke-width="30"
:percentage="
- (taskData.Order && taskData.finishNumber != 0)
+ (taskData.Order && taskData.finishNumber != 0 && taskData.Order.amount)
? parseInt(
(taskData.finishNumber / taskData.Order.amount) *
100
@@ -293,7 +293,7 @@
<div class="card_top-3">
<span class="card-top-r-t"
>瀹屾垚杩涘害锛歿{
- taskData.Order && taskData.finishNumber != 0
+ (taskData.Order && taskData.finishNumber != 0 && taskData.Order.amount)
? parseInt(
(taskData.finishNumber /
taskData.Order.amount) *
@@ -460,9 +460,6 @@
<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">
@@ -598,11 +595,12 @@
<AddIssue
ref="control"
:Arr="Arr"
+ :activeName="activeName"
:ArrError="ArrError"
:safeProduce="safeProduce"
:taskData="taskData"
:Order="taskData.Order"
- @getSetProductNumber="getTaskInfo"
+ @getSetProductNumber="reloadPage"
@isTip="isTip"
/>
</div>
@@ -739,6 +737,15 @@
// 璁惧鏂紑鐨勫師鍥�
plcNotConnected:'',
ChannelAmount:0,
+ object:{
+ Order: {},
+ Procedure: {
+ procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
+ },
+ inputMaterials: [],
+ outputMaterials: [],
+ procedureList: [],
+ },
};
},
mounted() {
@@ -783,17 +790,26 @@
if(this.activeName==2){
this.Tasks=this.TasksCopy.slice(0,2)
if(this.Tasks.length<2){
- this.Tasks.push(null)
+ if(this.Tasks.length==0){
+ this.Tasks.push(this.object)
+ }
+ this.Tasks.push(this.object)
}
}else if(this.activeName==1){
this.Tasks=this.TasksCopy.slice(0,1)
+ if(this.Tasks.length<1){
+ this.Tasks.push(this.object)
+ }
}else if(this.activeName==3){
this.Tasks=this.TasksCopy.slice(1)
+ if(this.Tasks.length<1){
+ this.Tasks.push(this.object)
+ }
}
},
- reloadPage() {
+ reloadPage(val) {
// window.location.reload();
- this.getTaskInfo();
+ this.getTaskInfo(val);
},
getcountdown() {
countdown().then((res) => {
@@ -886,7 +902,7 @@
setInterval(() => {
d= getCha();
}, 6000);
- return d;
+ return date?d:'--';
},
setInterCard(value, name, i) {
if (this.TasksCopy[i].Procedure.procedure[value]!=null) {
@@ -927,32 +943,7 @@
}
},
- getTaskInfo() {
- let object = {
- Order: {},
- Procedure: {
- procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
- },
- inputMaterials: [],
- outputMaterials: [
- // [
- // {
- // materialId:11111,
- // materialName:'272澶у鍟婃斁鍋囦簡鍗¤壈鑻﹀鏂楀瀮鍦惧彂蹇�掑瀮鍦惧弽棣堟潵寰楀強鍏嬮殕',
- // amount:100,
- // unit:'浠�'
- // }
- // ]
- ],
- procedureList: [
- // [
- // {
- // name:"宸ュ簭",
- // deviceName:'1111dhafjdhajkhf jkdahjkf鎵撴硶鍗冲彲鎵撻枊閺堟帴鑲痉鍩哄晩鐪嬩締jdad澶ч浜笢鍗¤�佸徃鏈虹暘绐犲�掕嚰寮�浜嗘埧閲戦樋濂庣鍗佸叚灞婂弽棣堟媺寰锋柉鍩簁鎵撳崱鏈洪樋鐝傞檮浠舵墦寮�浜嗙偣鍑婚樋閲屽崱鍑忚偉鐨勫崱鎷夎兌寮�浜嗘埧澶ц涓婂厠闅唂k鍟﹀ぇ瀹堕槻绌洪浄閬旀暩鎿氱湅i'
- // },
- // ]
- ],
- };
+ getTaskInfo(val) {
this.Tasks = [];
this.TasksCopy=[]
getTaskInfo({taskMode:2}).then((res) => {
@@ -963,22 +954,21 @@
return (a.Channel - b.Channel)
})
}
- 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.TasksCopy.push(this.object)
// }
this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
- if (this.TasksCopy.length == 0&&this.TaskCount==0) {
+ if ((this.TasksCopy.length ==0 )||!this.TasksCopy) {
if (this.activeName == 1||this.activeName == 3) {
- this.TasksCopy.push(object);
+ this.TasksCopy.push(this.object);
} else {
- this.TasksCopy.push(object);
- this.TasksCopy.push(object);
+ this.TasksCopy.push(this.object);
+ this.TasksCopy.push(this.object);
}
}
this.workers=res.data.workers?res.data.workers:[]
@@ -1032,10 +1022,10 @@
// }, 60000);
// }
// }
- this.cutClick(1)
+ this.cutClick(val?val:1)
});
- // this.TasksCopy.push(object)
- // this.TasksCopy.push(object)
+ // this.TasksCopy.push(this.object)
+ // this.TasksCopy.push(this.object)
},
getStartArr(){
// for (let i in this.TasksCopy) {
@@ -1049,7 +1039,7 @@
if(res.code==200){
this.taskData=res.data.Tasks?res.data.Tasks[0]:{};
this.ArrError=''
- if (this.taskData.Procedure.ID) {
+ if (Object.keys(this.taskData).length > 0 &&this.taskData.Procedure.ID) {
startTask({ id: this.taskData.Procedure.ID }).then((res) => {
if (res.code == 200) {
this.Arr =res.data.Params ? res.data.Params : []
--
Gitblit v1.8.0