From e43528753b71b00d6a751f449e1becaabf2968de Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 21 十一月 2023 10:46:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/SchedulingDashboard into dev
---
src/views/visualization.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 8f94cce..f13323b 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -914,12 +914,12 @@
getModelList(){
for (let i in this.TasksCopy){
this.TasksCopy[i].isUpdateIcon=false;
- if(this.TasksCopy[i].Procedure.ID&&this.TasksCopy[i].number){
+ // number:this.TasksCopy[i].number
+ if(this.TasksCopy[i].Procedure.ID){
processModelList({
procedureId: this.TasksCopy[i].Procedure.ID,
page: 1,
pageSize:6,
- number:this.TasksCopy[i].number
}).then(res=>{
if(res.code==200){
this.processList=res.data?res.data:[];
@@ -943,12 +943,11 @@
this.listData=list;
this.index=index
if( Object.keys(this.listData).length > 0){
- if(this.listData.Procedure.ID&&this.listData.number){
+ if(this.listData.Procedure.ID){
this.$refs.processModel.islook=true
return true;
}
}
- this.$message.error('褰撳墠宸ュ簭鏃犵紪鍙凤紝鏃犳硶鏌ョ湅宸ュ簭!')
},
getProcessModelList(){
this.getModelList()
@@ -1290,7 +1289,12 @@
}
this.getProcessModelList();
this.getStartArr()
- this.cutClick(val?val:1)
+ if(this.ChannelAmount===1){
+ this.cutClick(1)
+ }else{
+ this.cutClick(val?val:1)
+ }
+
if(info=='new'){
return true;
}
@@ -1301,6 +1305,11 @@
this.getProgressInfo();
}, 3000);
}
+ }else{
+ const allChannels = [0,1];
+ allChannels.forEach(channel => this.TasksCopy.push(this.newTaskPlaceholder(channel)))
+ this.TasksCopy.sort((a,b)=>a.Channel - b.Channel)
+ this.cutClick(1)
}
// if (res.code != 200 || this.TasksCopy.length == 0) {
// this.getcountdown();
@@ -1312,6 +1321,12 @@
// }
// }
+ },err=>{
+ console.error(err)
+ const allChannels = [0,1];
+ allChannels.forEach(channel => this.TasksCopy.push(this.newTaskPlaceholder(channel)))
+ this.TasksCopy.sort((a,b)=>a.Channel - b.Channel)
+ this.cutClick(1)
});
// this.TasksCopy.push(this.object)
// this.TasksCopy.push(this.object)
--
Gitblit v1.8.0