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 | 348 ++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 209 insertions(+), 139 deletions(-) diff --git a/src/views/visualization.vue b/src/views/visualization.vue index 1f22bf7..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> @@ -143,8 +157,8 @@ <el-descriptions-item label="瀹屾垚搴�" style="width: 100%"> <!--:text-format="format" --> <el-progress - define-back-color="#133EAF" - color="#09E5ED" + define-back-color="#132f6e" + color="#00cc66" text-color="#fff" :text-inside="true" :stroke-width="30" @@ -199,7 +213,7 @@ <div class="card_content"> <div class="card_contentLeft">{{ list.materialId }}</div> </div> - <div class="card_top"> + <div class="card-top-input-out-l"> <div> <!-- 璁惧12<i style="font-size: 14px" @@ -209,7 +223,7 @@ {{ list.materialName }} </div> </div> - <div class="card_top2"> + <div class="card-top-input-out-r"> <div style="line-height: 45px; text-align: center"> {{ list.amount }} {{ list.unit }} </div> @@ -219,11 +233,11 @@ </div> </el-carousel-item> </el-carousel> - <el-button type="primary" class="color_f70f83"> + <el-button type="primary" class="color_f70f83 bottom-box-btn"> <i class="el-icon-phone-outline" />鐗╂枡鍛煎彨</el-button > </div> - <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i> + <i class="el-icon-arrow-right font-arrow-20 color_318583"></i> <div class="bottom_list"> <div class="bottom-title"> 褰撳墠宸ュ簭:{{ taskData.Procedure.procedure.procedureName || "" }} @@ -249,14 +263,14 @@ <div class="card_content"> <div class="card_contentLeft color_blue font_dian"> <!-- {{ list.deviceName }} --> - <el-tooltip - effect="dark" - popper-class="tooltip-width-200" + <el-popover + width="200" :content="list.deviceName" placement="top-start" + trigger="click" > - <span>{{ list.deviceName }}</span> - </el-tooltip> + <span slot="reference">{{ list.deviceName }}</span> + </el-popover> <!-- <span style="float: right">6m/s</span> --> </div> </div> @@ -274,8 +288,8 @@ > <span class="card-top-r-b"> <el-progress - define-back-color="#133EAF" - color="#09E5ED" + define-back-color="#132f6e" + color="#00cc66" text-color="#fff" :text-inside="true" :stroke-width="10" @@ -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=" @@ -328,7 +342,7 @@ <p style="font-size: 22px; margin-left: 12px; margin-top: 50px" ></p> - <div class="right-small-btn"> + <div class="right-small-btn bottom-box-btn"> <el-button type="primary"> 鎵撳嵃</el-button> <el-popover placement="top-end" @@ -337,7 +351,7 @@ v-model="finishShow['finishShow&'+index]" trigger="click" > - <p>璇风‘璁ゆ槸鍚﹀凡瀹屾垚璇ョ敓浜т换鍔�?</p> + <p><i class="el-icon-error" style="color:red;margin-right:5px;"/>璇风‘璁ゆ槸鍚﹀凡瀹屾垚璇ョ敓浜т换鍔�?</p> <div style="text-align: right; margin: 0"> <el-button size="mini" @click="finishShow['finishShow&'+index] = false"> 鍙栨秷</el-button @@ -345,6 +359,7 @@ <el-button type="primary" size="mini" + class="color_f70f83" @click="finishClick(index, taskData)" > 纭畾</el-button @@ -354,7 +369,7 @@ </el-popover> </div> </div> - <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i> + <i class="el-icon-arrow-right font-arrow-20 color_318583"></i> <div class="bottom_list"> <div class="bottom-title"> <span>杈撳嚭璧勬簮</span> @@ -385,49 +400,21 @@ {{ list.materialId }} </div> </div> - <div class="card_top"> + <div class="card-top-input-out-l"> <div> {{ list.materialName }} - <!-- 璁惧12<i - style="font-size: 14px" - class="el-icon-right font-arrow-20" - ></i> - 璁惧13 --> </div> </div> - <div class="card_top2"> + <div class="card-top-input-out-r"> <div style="line-height: 45px; text-align: center"> {{ list.amount }} {{ list.unit }} </div> - <!-- <span class="card-top-r-t">鐢熶骇瀹屾垚</span> - <span class="card-top-r-b">12鏈�28鏃� 08:24</span> --> </div> - <!-- <div class="card-info-box">棰勮10鍒嗛挓閫佽揪</div> --> </div> - <!-- <div class="card"> - <div class="card_content"> - <div class="card_contentLeft color_green"> - 鍖呭彿:G22122304 100鍚� - </div> - </div> - <div class="card_top"> - <div> - 璁惧12<i - style="font-size: 14px" - class="el-icon-right font-arrow-20" - ></i> - 璁惧13 - </div> - </div> - <div class="card_top-2"> - <span class="card-top-r-t">鐢熶骇瀹屾垚</span> - <span class="card-top-r-b">12鏈�28鏃� 08:24</span> - </div> - </div> --> </div> </el-carousel-item> </el-carousel> - <el-button type="primary" class="color_f70f83"> + <el-button type="primary" class="color_f70f83 bottom-box-btn"> <i class="el-icon-phone-outline" />杩愯緭鍛煎彨</el-button > </div> @@ -437,6 +424,7 @@ <template v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)" > + <el-empty description="鏆傛棤浠诲姟..."></el-empty> </template> </div> @@ -460,7 +448,7 @@ 璁惧鐘舵��: <!-- 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> --> @@ -513,7 +501,7 @@ </div> --> </div> <div class="right_base"> - <div class="right-small-title" style="line-height: 40px">鐭ヨ瘑搴�</div> + <div class="right-small-title" style="line-height: 40px;margin-top:20px;">鐭ヨ瘑搴�</div> <Knowledge /> <div class="right-base-btn call"> <el-button type="primary" @@ -554,6 +542,7 @@ </div> </div> </div> + </template> <!-- 鎺у埗鐨勫脊妗� --> <AddControl ref="control" :Arr="Arr" /> @@ -561,6 +550,7 @@ <AddIssue ref="control" :Arr="Arr" + :safeProduce="safeProduce" :taskData="taskData" :Order="taskData.Order" @getSetProductNumber="getTaskInfo" @@ -578,6 +568,7 @@ startTask, getProgress, countdown, + getTaskUnStarted, } from "@/api/home/index"; // 浜х嚎 import Card from "@/components/Card.vue"; import Knowledge from "../components/Knowledge.vue"; @@ -601,6 +592,7 @@ // 鍙充晶瀹屾垚 finishShow:{}, workers:[], + TasksCopy:[], Tasks: [ { Order: { @@ -690,8 +682,11 @@ procInfoTimer: null, cutdownTimer: null, TaskCount:0, - plcStatus:1, + plcStatus:0, isTipShow:false, + // isFinsh:0, + safeProduce:'', + ChannelAmount:0, }; }, mounted() { @@ -708,18 +703,18 @@ }, 5000); this.getTaskInfo(); }, + watch:{ + // isFinsh(){ + // if(this.isFinsh==this.Tasks.length){ + // this.getStartArr() + // } + // } + }, methods: { taskClick(){ if(this.TaskCount>0){ - for(let i in this.Tasks){ - if(this.Tasks[i].Procedure.Status==1){ - this.isTipShow=false - break; - } - } - if(!this.isTipShow){ - this.$refs.control.islook=true - } + this.getStartArr() + this.$refs.control.islook=true }else{ this.$message.error('鐩墠娌℃湁浠诲姟锛�') } @@ -729,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(); @@ -783,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 ""; @@ -826,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]) { @@ -834,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; @@ -855,7 +856,7 @@ } } } - this.Tasks[i][value] = [...newDataList]; + this.TasksCopy[i][value] = [...newDataList]; } }, @@ -866,7 +867,16 @@ procedure: { inputMaterials: [], outputMaterials: [], workers: [] }, }, inputMaterials: [], - outputMaterials: [], + outputMaterials: [ + // [ + // { + // materialId:11111, + // materialName:'272澶у鍟婃斁鍋囦簡鍗¤壈鑻﹀鏂楀瀮鍦惧彂蹇�掑瀮鍦惧弽棣堟潵寰楀強鍏嬮殕', + // amount:100, + // unit:'浠�' + // } + // ] + ], procedureList: [ // [ // { @@ -877,44 +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.TasksCopy.length == 0&&this.TaskCount==0) { + if (this.activeName == 1||this.activeName == 3) { + this.TasksCopy.push(object); + } else { + 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 } }); } @@ -926,18 +952,10 @@ if (!this.procInfoTimer) { this.procInfoTimer = setInterval(() => { this.getProgressInfo(); - }, 9000); + }, 3000); } } - if (this.Tasks.length == 0) { - if (this.activeName == 1) { - this.Tasks.push(object); - } else { - this.Tasks.push(object); - this.Tasks.push(object); - } - } - if (res.code != 200 || this.Tasks.length == 0) { + if (res.code != 200 || this.TasksCopy.length == 0) { this.getcountdown(); // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒 if (!this.cutdownTimer) { @@ -946,32 +964,44 @@ }, 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:1 + this.plcStatus=res.data.plcStatus?res.data.plcStatus:0 } }); } @@ -1030,8 +1060,20 @@ width:200px; line-height:1.3!important; } +.el-popover{ + background:#12234a!important; + color:#fff!important; + border-color: #09e5ed !important; + + .popper__arrow::after{ + border-top-color:#09e5ed !important; + } +} .color_yellow{ color:yellow; +} +.color_318583{ + color:#318583; } .el-empty{ height:100%; @@ -1051,10 +1093,10 @@ margin-bottom: 20px; } .content { - height: 240px; + height: 300px; } .bottom { - height: calc(100% - 410px); + height: calc(100% - 470px); } .font_size_20px{ font-size:20px!important; @@ -1086,18 +1128,18 @@ line-height: 20px; } .content { - height: 370px; + height: 430px; .content-top { - height: calc(50% - 20px) !important; - padding-top: 10px !important; + height: calc(50% - 30px) !important; + padding-top: 20px !important; } .el-descriptions__body { font-size: 16px !important; } } .bottom { - height: calc(100% - 560px); + height: calc(100% - 610px); } .bottom_list .bottom-title { font-size: 16px; @@ -1309,7 +1351,7 @@ } .card-box { width: 100%; - height: calc(100% - 50px - 50px); + height: calc(100% - 50px - 40px); // height:300px; .el-carousel__container{ overflow-y:auto; @@ -1318,6 +1360,12 @@ // height:auto; min-height:160px; } + } + .bottom-box-btn{ + width:calc(100% - 20px); + position:absolute; + bottom:10px; + left:10px; } } @@ -1445,6 +1493,9 @@ background: rgb(22 72 173); border-radius: 6px; // background: #233b9e; + .el-descriptions-row{ + height:45px; + } .el-descriptions__body { background: transparent; font-size: 18px; @@ -1484,15 +1535,22 @@ margin-top: 10px; color: #333; position: relative; - .card_top-2, + .card_top-2{ + width:35%; + } + .card-top-input-out-r, .card_top-3 { - width: 50%; + width:65%; + } + .card_top-2,.card-top-input-out-r, + .card_top-3 { height: 45px; border-radius: 5px; background: #6b83ff; - font-size: 12px; + font-size: 13px; color: #fff; float: left; + font-weight: 700; .card-top-r-t { width: 100%; text-align: center; @@ -1526,7 +1584,7 @@ } } - .card_top, + .card_top,.card-top-input-out-l, .card_top-4 { width: 50%; height: 45px; @@ -1536,7 +1594,7 @@ font-size: 12px; line-height: 45px; > div { - margin-left: 12px; + padding-left: 12px; position: relative; p { position: absolute; @@ -1548,6 +1606,18 @@ } .card_top{ float: left; + } + .card-top-input-out-l{ + float:left; + width:65%; + line-height:20px; + vertical-align: middle; + display:flex; + justify-content:space-around; + align-items:center; + } + .card-top-input-out-r{ + width:35%; } .card_top-4 { width: calc(100% - 20px); @@ -1689,7 +1759,7 @@ .right_dutyLst { width: calc(106% - 20px); // height: 270px; - height: 310px; + height: 370px; border-radius: 4px; line-height: 30px; overflow: hidden; @@ -1708,7 +1778,7 @@ } .right-person-box { width: 100%; - height: calc(100% - 40px); + height: calc(100% - 60px); overflow: auto; margin-top: -10px; } @@ -1738,7 +1808,7 @@ } .right_base { width: 100%; - height: calc(100% - 520px); + height: calc(100% - 580px); min-height: 200px; // overflow-y:auto; position: relative; -- Gitblit v1.8.0