From a6c049ce564fe10a83b6f1759035a8c2803c6e18 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 25 九月 2023 15:37:12 +0800
Subject: [PATCH] 看板的 获取任务接口变更， 新任务获取变更，计划时间格式修改
---
src/views/visualization.vue | 174 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 115 insertions(+), 59 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index aab6145..554b3db 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -5,18 +5,32 @@
<template v-if="Tasks&&Tasks.length>0">
<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/one-blue.png" />
+ <span v-else>
+ <img style="width:32px;" src="../../public/one.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>
@@ -308,7 +322,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="
@@ -410,6 +424,7 @@
<template
v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)"
>
+
<el-empty description="鏆傛棤浠诲姟..."></el-empty>
</template>
</div>
@@ -527,6 +542,7 @@
</div>
</div>
</div>
+
</template>
<!-- 鎺у埗鐨勫脊妗� -->
<AddControl ref="control" :Arr="Arr" />
@@ -534,6 +550,7 @@
<AddIssue
ref="control"
:Arr="Arr"
+ :safeProduce="safeProduce"
:taskData="taskData"
:Order="taskData.Order"
@getSetProductNumber="getTaskInfo"
@@ -551,6 +568,7 @@
startTask,
getProgress,
countdown,
+ getTaskUnStarted,
} from "@/api/home/index"; // 浜х嚎
import Card from "@/components/Card.vue";
import Knowledge from "../components/Knowledge.vue";
@@ -574,6 +592,7 @@
// 鍙充晶瀹屾垚
finishShow:{},
workers:[],
+ TasksCopy:[],
Tasks: [
{
Order: {
@@ -665,6 +684,9 @@
TaskCount:0,
plcStatus:0,
isTipShow:false,
+ // isFinsh:0,
+ safeProduce:'',
+ ChannelAmount:0,
};
},
mounted() {
@@ -681,9 +703,17 @@
}, 5000);
this.getTaskInfo();
},
+ watch:{
+ // 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('鐩墠娌℃湁浠诲姟锛�')
@@ -694,7 +724,13 @@
},
cutClick(val) {
this.activeName = val;
- this.getTaskInfo();
+ if(this.activeName==2){
+ this.Tasks=this.TasksCopy.slice(0,2)
+ }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();
@@ -748,7 +784,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 "";
@@ -791,7 +827,7 @@
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]) {
@@ -799,7 +835,7 @@
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;
@@ -820,7 +856,7 @@
}
}
}
- this.Tasks[i][value] = [...newDataList];
+ this.TasksCopy[i][value] = [...newDataList];
}
},
@@ -851,52 +887,60 @@
],
};
this.Tasks = [];
- getTaskInfo({ page: 1, pageSize: this.activeName }).then((res) => {
+ this.TasksCopy=[]
+ getTaskInfo({ }).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.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,
- name: "宸ヨ壓",
- Arr:res.data.Params ? res.data.Params : [],
});
+ // this.TasksCopy[i].Arr=res.data.Params ? res.data.Params : []
+ // this.isFinsh=Number(i)+1
}
});
}
@@ -911,7 +955,7 @@
}, 3000);
}
}
- if (res.code != 200 || this.Tasks.length == 0) {
+ if (res.code != 200 || this.TasksCopy.length == 0) {
this.getcountdown();
// 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
if (!this.cutdownTimer) {
@@ -920,29 +964,41 @@
}, 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].procedureList[0].Arr ?this.Tasks[i].procedureList[0].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;
+ // }
+ // }
+ getTaskUnStarted({page:1,pageSize:1}).then(res=>{
+ if(res.code==200){
+ this.taskData=res.data.Tasks?res.data.Tasks[0]:{};
+ 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 : []
+ }
+ });
+ }
}
- }
+ })
},
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
--
Gitblit v1.8.0