From 3ed1e1db73f7462186188a3d75970b37170521c5 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期日, 08 十月 2023 17:39:10 +0800
Subject: [PATCH] Merge branch 'wn' into songshankun/tasks-pagination
---
src/views/visualization.vue | 518 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 366 insertions(+), 152 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 476ee6c..bb6eb01 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -1,8 +1,8 @@
<template>
- <div class="home">
- <!-- -->
- <template v-if="Tasks&&Tasks.length>0">
+ <div class="home" ref="homeRef">
+ <!-- v-if="Tasks&&Tasks.length>0" -->
+ <template >
<div class="left">
<p class="title">
<template v-if="Number(ChannelAmount)>1">
@@ -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>
@@ -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>
@@ -124,33 +124,37 @@
</div>
</div>
<div class="content_right">
+ <div class="gif" v-if="taskData.Procedure.ID" @click="processModelClick(taskData)">
+ <img v-if="isUpdateIcon" src="../../public/shan.gif" />
+ <span v-else class="yuandian"></span>
+ </div>
<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 || ""
+ <el-descriptions-item label="瀹㈡埛缂栫爜">{{
+ 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 +167,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
@@ -211,16 +215,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">
@@ -255,11 +275,12 @@
v-for="(item, index) in taskData.procedureList"
>
<div
- class="card"
:key="index2"
v-for="(list, index2) in item"
>
- <template v-if="list.name == '宸ュ簭'">
+ <div
+ class="card"
+ v-if="list.name == '宸ュ簭'">
<div class="card_content">
<div class="card_contentLeft color_blue font_dian">
<!-- {{ list.deviceName }} -->
@@ -277,7 +298,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) *
@@ -312,29 +333,39 @@
</div>
<div class="card_top-2">
<div style="line-height: 45px; text-align: center">
- 鐢熶骇涓�
+ {{ taskData.Procedure.Status==3?'鐢熶骇瀹屾垚':'鐢熶骇涓�' }}
</div>
<!-- <span class="card-top-r-t">瀹屾垚杩涘害锛�50%</span>
<span class="card-top-r-b">12鏈�28鏃� 08:24</span> -->
</div>
- </template>
- <template v-else>
- <!-- <div class="card_content">
-
- </div> -->
- <div :class="(activeName==1||activeName == 3)?'card_top-4 font_size_20px':'card_top-4'">
- <div>宸ヨ壓缂栧彿锛�<div >{{ list.number }}</div></div>
- <!-- <div
- style="
- font-size: 14px;
- color: #cfcfcf;
- line-height: 20px;
- "
+ </div>
+ <div v-else class="process-params">
+ <div class="process-params-title">
+ <el-popover
+ width="200"
+ :content="list.number"
+ placement="top-start"
+ trigger="click"
>
- 宸ヨ壓鐨勫叿浣撲俊鎭鐐瑰嚮鎺у埗鏌ョ湅锛�
- </div> -->
+ <span slot="reference">宸ヨ壓缂栧彿锛歿{ list.number }}</span>
+ </el-popover>
+
</div>
- </template>
+ <div class="process-params-value">
+ <!-- 宸ヨ壓鍙傛暟-->
+ {{mergeProcessParams(taskData.Arr)}}
+ </div>
+
+ <!-- <div
+ style="
+ font-size: 14px;
+ color: #cfcfcf;
+ line-height: 20px;
+ "
+ >
+ 宸ヨ壓鐨勫叿浣撲俊鎭鐐瑰嚮鎺у埗鏌ョ湅锛�
+ </div> -->
+ </div>
</div>
</el-carousel-item>
</el-carousel>
@@ -344,7 +375,9 @@
></p>
<div class="right-small-btn bottom-box-btn">
<el-button type="primary"> 鎵撳嵃</el-button>
+
<el-popover
+ v-if="taskData.Procedure.Status && taskData.Procedure.Status!==3"
placement="top-end"
width="160"
class="button-finish"
@@ -367,6 +400,7 @@
</div>
<el-button type="primary" slot="reference"> 瀹屾垚</el-button>
</el-popover>
+ <el-button v-else type="primary" class="huise"> 瀹屾垚</el-button>
</div>
</div>
<i class="el-icon-arrow-right font-arrow-20 color_318583"></i>
@@ -396,13 +430,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">
@@ -424,7 +472,7 @@
<template
v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)"
>
-
+
<el-empty description="鏆傛棤浠诲姟..."></el-empty>
</template>
</div>
@@ -447,12 +495,24 @@
<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" />
+ {{ plcStatus==1?'鏂紑':(plcStatus==2?'鐢熶骇涓�':'寰呮満') }}
+ </span>
</span>
</div>
<div class="right-top-m-btn">
@@ -484,9 +544,9 @@
<!-- <span>{{ item.phoneNum || "" }}</span> -->
<span class="color_yellow"><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /><i class="el-icon-star-on" /></span>
</dl>
-
+
</div>
-
+
<!-- <div
style="
width: 100%;
@@ -512,7 +572,7 @@
</div>
</template>
<!-- -->
- <template v-else>
+ <!-- <template v-else>
<div class="home-img-box">
<div class="bg-title">
<img src="../../public/bg-title.png" />
@@ -542,19 +602,21 @@
</div>
</div>
</div>
-
- </template>
+
+ </template> -->
<!-- 鎺у埗鐨勫脊妗� -->
<AddControl ref="control" :Arr="Arr" />
<!-- 鎺у埗鐨勫脊妗� -->
- <AddIssue
+ <TaskControlModal
ref="control"
- :Arr="Arr"
- :safeProduce="safeProduce"
- :taskData="taskData"
- :Order="taskData.Order"
- @getSetProductNumber="getTaskInfo"
+ :activeName="activeName"
+ @getSetProductNumber="reloadPage"
@isTip="isTip"
+ />
+ <!-- 宸ヨ壓妯″瀷 -->
+ <ProcessModel
+ ref="processModel"
+ :listData="listData"
/>
</div>
</template>
@@ -569,20 +631,26 @@
getProgress,
countdown,
getTaskUnStarted,
+ processModelList,
} from "@/api/home/index"; // 浜х嚎
import Card from "@/components/Card.vue";
import Knowledge from "../components/Knowledge.vue";
import AddControl from "../components/AddControl.vue";
import AddIssue from "../components/AddIssue.vue";
+import ProcessModel from "../components/ProcessModel.vue";
+import TaskControlModal from "@/components/TaskControlModal.vue";
export default {
components: {
+ TaskControlModal,
Card,
Knowledge,
AddControl,
AddIssue,
+ ProcessModel,
},
data() {
return {
+ pollingTaskCountTimer: null,
activeName: 1,
progress: 70, //杩涘害
passrate: 30, //鍚堟牸鐜�
@@ -678,15 +746,33 @@
countDownHour: 0,
countDownMinute: 0,
Arr: [],
+ ArrError:'',
// 璁板綍瀹氭椂鍣ㄧ姸鎬�
procInfoTimer: null,
cutdownTimer: null,
+ ProcessModelTimer: null,
TaskCount:0,
plcStatus:0,
isTipShow:false,
// isFinsh:0,
safeProduce:'',
+ // 璁惧鏂紑鐨勫師鍥�
+ plcNotConnected:'',
ChannelAmount:0,
+ object:{
+ Order: {},
+ Procedure: {
+ procedure: { inputMaterials: [], outputMaterials: [], workers: [] },
+ },
+ inputMaterials: [],
+ outputMaterials: [],
+ procedureList: [],
+ },
+ processList:[],
+ isUpdateIcon:false,
+ listData:[],
+ resResult:null,
+ resprocInfoTimer:null,
};
},
mounted() {
@@ -702,6 +788,12 @@
this.getDate2();
}, 5000);
this.getTaskInfo();
+ this.getTaskCountStatistics()
+ },
+ beforeDestroy() {
+ clearTimeout(this.pollingTaskCountTimer)
+ clearTimeout(this.procInfoTimer)
+ clearTimeout(this.ProcessModelTimer)
},
watch:{
// isFinsh(){
@@ -711,12 +803,69 @@
// }
},
methods: {
+
+ getModelList(){
+ this.resResult=null
+ for (let i in this.TasksCopy){
+ if(this.TasksCopy[i].Procedure.ID&&this.TasksCopy[i].number){
+ 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:[];
+ if(this.processList.length>0){
+ for(let i in this.processList){
+ if(this.processList[i].isUpdate){
+ this.isUpdateIcon=true;
+ break;
+ }
+ }
+ }
+ }
+ this.resResult=res;
+ })
+ }
+ }
+ },
+ processModelClick(list){
+ this.listData=list;
+ if( Object.keys(this.listData).length > 0){
+ if(this.listData.Procedure.ID&&this.listData.number){
+ this.$refs.processModel.islook=true
+ return true;
+ }
+ }
+ this.$message.error('褰撳墠宸ュ簭鏃犵紪鍙凤紝鏃犳硶鏌ョ湅宸ュ簭!')
+
+ },
+ getProcessModelList(){
+ this.getModelList()
+ if (!this.ProcessModelTimer&&!this.resResult) {
+ this.ProcessModelTimer = setInterval(() => {
+ this.getModelList();
+ }, 10000)
+ }
+ },
+ mergeProcessParams(params){
+ if (params?.length){
+ return params.map(ele=> `${ele.Key}: ${ele.Value}`).join(' ')
+ }else{
+ return ''
+ }
+ },
taskClick(){
if(this.TaskCount>0){
- this.getStartArr()
- this.$refs.control.islook=true
+ // this.getStartArr()
+ this.$refs.control.show=true
}else{
- this.$message.error('鐩墠娌℃湁浠诲姟锛�')
+ this.$message({
+ message:'鐩墠娌℃湁浠诲姟锛�',
+ type: 'error',
+ duration: 3 * 1000
+ })
}
},
isTip(val){
@@ -726,15 +875,27 @@
this.activeName = val;
if(this.activeName==2){
this.Tasks=this.TasksCopy.slice(0,2)
+ if(this.Tasks.length<2){
+ 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) => {
@@ -754,6 +915,8 @@
}
});
},
+
+
getDateObj(date, fmt) {
if (/(y+)/.test(fmt)) {
@@ -817,7 +980,7 @@
let String=now-date*1000;
let seconds=Math.floor(String/1000)
let minutes=Math.floor(seconds/60)
-
+
let days=Math.floor(String/1000/60/60/24)
let hours=Math.floor(minutes/60)-days*24
let m=minutes-days*24*60-hours*60
@@ -827,16 +990,21 @@
setInterval(() => {
d= getCha();
}, 6000);
- return d;
+ return date?d:'--';
},
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])
);
@@ -863,35 +1031,29 @@
}
},
- 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'
- // },
- // ]
- ],
- };
+ /**
+ * 杞鑾峰彇浠诲姟鏁伴噺
+ */
+ getTaskCountStatistics(){
+ getTaskInfo({taskMode:1}).then((res) => {
+ if (res.code === 200&&res.data) {
+ this.TaskCount=res.data?.TaskCount ?? 0
+ }
+ },err=>{
+ this.TaskCount = 0
+ console.error(err)
+ }).finally(()=>{
+ this.pollingTaskCountTimer = setTimeout(()=>{
+ this.getTaskCountStatistics()
+ // 20绉掍竴娆¤疆璇�
+ },20000)
+ });
+ },
+
+ getTaskInfo(val) {
this.Tasks = [];
this.TasksCopy=[]
- getTaskInfo({ }).then((res) => {
+ getTaskInfo({taskMode:2}).then((res) => {
if (res.code == 200&&res.data) {
let arr=[]
if(res.data.Tasks){
@@ -899,21 +1061,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.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:[]
@@ -922,6 +1084,7 @@
this.TasksCopy[i].inputMaterials = [];
this.TasksCopy[i].outputMaterials = [];
this.TasksCopy[i].finishNumber = 0;
+ this.TasksCopy[i].number=0;
this.finishShow['finishShow&'+i]=false
this.TasksCopy[i].Procedure.procedure.workers = this.TasksCopy[i].Procedure
.procedure.workers
@@ -934,15 +1097,16 @@
...this.TasksCopy[i].Procedure.procedure,
},
]);
-
+
if (this.TasksCopy[i].Procedure.ID) {
startTask({ id: this.TasksCopy[i].Procedure.ID }).then((res) => {
if (res.code == 200) {
+ this.TasksCopy[i].number=res.data.Number
// res.data.number
this.TasksCopy[i].procedureList[0].push({
number: res.data.Number,
});
- // this.TasksCopy[i].Arr=res.data.Params ? res.data.Params : []
+ this.TasksCopy[i].Arr=res.data.Params ? res.data.Params : []
// this.isFinsh=Number(i)+1
}
});
@@ -952,25 +1116,26 @@
}
this.getStartArr()
this.getProgressInfo();
- if (!this.procInfoTimer) {
+ if (!this.procInfoTimer&&!this.resprocInfoTimer) {
this.procInfoTimer = setInterval(() => {
this.getProgressInfo();
}, 3000);
- }
+ }
+ this.getProcessModelList();
}
- if (res.code != 200 || this.TasksCopy.length == 0) {
- this.getcountdown();
- // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
- if (!this.cutdownTimer) {
- this.cutdownTimer = setInterval(() => {
- this.getcountdown();
- }, 60000);
- }
- }
- this.cutClick(1)
+ // if (res.code != 200 || this.TasksCopy.length == 0) {
+ // this.getcountdown();
+ // // 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
+ // if (!this.cutdownTimer) {
+ // this.cutdownTimer = setInterval(() => {
+ // this.getcountdown();
+ // }, 60000);
+ // }
+ // }
+ 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) {
@@ -980,13 +1145,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]:{};
- if (this.taskData.Procedure.ID) {
+ this.ArrError=''
+ 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 : []
+ }else{
+ this.ArrError=res.msg?res.msg:'鑾峰彇宸ヨ壓鍙傛暟澶辫触锛�';
}
});
}
@@ -994,6 +1162,7 @@
})
},
getProgressInfo() {
+ this.resprocInfoTimer=null
for (let i in this.TasksCopy){
if(this.TasksCopy[i].Procedure.ID){
getProgress({
@@ -1006,10 +1175,10 @@
: 0;
this.plcStatus=res.data.plcStatus?res.data.plcStatus:0
}
+ this.resprocInfoTimer=res;
});
}
}
-
},
// 璁剧疆
setUrl() {
@@ -1040,7 +1209,7 @@
finishTask({ id: taskData.Procedure.ID }).then((res) => {
if (res.code == 200) {
this.finishShow['finishShow&'+i] = false;
- this.getTaskInfo();
+ this.reloadPage(this.activeName?this.activeName:1);
this.$message.success("鎿嶄綔鎴愬姛锛�");
}
});
@@ -1067,7 +1236,7 @@
background:#12234a!important;
color:#fff!important;
border-color: #09e5ed !important;
-
+
.popper__arrow::after{
border-top-color:#09e5ed !important;
}
@@ -1079,7 +1248,7 @@
color:#318583;
}
.el-empty{
- height:100%;
+ height:calc(100% - 190px);
.el-empty__description p{
font-size:16px!important;
color:#fff!important;
@@ -1116,7 +1285,7 @@
box-sizing: border-box;
border-right: 1px solid #eee;
}
-
+
.small_title {
margin-bottom: 30px;
}
@@ -1172,7 +1341,7 @@
font-size:14px;
}
}
-
+
.el-step{
.el-step__icon{
background:#00cc66;
@@ -1300,6 +1469,16 @@
background: #09e5ed !important;
color: #333 !important;
}
+.yuandian {
+ width: 35px;
+ height: 35px;
+ display:inline-block;
+ // background: #15d815;
+ background:red;
+ border-radius: 50%;
+ // margin-top:-5px;
+ vertical-align: middle;
+ }
.bottom_list {
position: relative;
padding: 10px;
@@ -1360,8 +1539,7 @@
overflow-y:auto;
}
.el-carousel__item{
- // height:auto;
- min-height:160px;
+ height:auto;
}
}
.bottom-box-btn{
@@ -1369,6 +1547,10 @@
position:absolute;
bottom:10px;
left:10px;
+ .el-button{
+ height: 40px;
+
+ }
}
}
@@ -1376,7 +1558,6 @@
font-size: 20px;
}
.right-small-btn {
- margin-top: 10px;
width: calc(100% - 20px);
margin: 0 auto;
position: absolute;
@@ -1402,6 +1583,15 @@
border: 0;
}
}
+ .huise{
+ width: 46%;
+ float: right;
+ }
+ .huise.el-button--primary {
+ background: #CCE8E8;
+ color: #AAAAAA;
+ border: 0;
+ }
}
.home {
width: 100%;
@@ -1495,6 +1685,18 @@
padding: 0 10px;
background: rgb(22 72 173);
border-radius: 6px;
+ position:relative;
+ .gif{
+ position:absolute;
+ right:15px;
+ top:10px;
+ width:35px;
+ vertical-align: middle;
+ cursor:pointer;
+ img{
+ width:100%;
+ }
+ }
// background: #233b9e;
.el-descriptions-row{
height:45px;
@@ -1538,6 +1740,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%;
}
@@ -1659,12 +1867,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%;
@@ -1734,18 +1937,6 @@
// float:left;
display:inline-block;
}
- }
-
- .yuandian {
- width: 25px;
- height: 25px;
- line-height: 40px;
- margin-top: 12.5px;
- display: inline-block;
- background: #15d815;
- display: block;
- border-radius: 50%;
- float: right;
}
}
.right-top-m-btn {
@@ -1818,7 +2009,7 @@
.right-base-btn {
width: 100%;
position: absolute;
- bottom: 0;
+ bottom: 24px;
left: 0;
.el-button--primary {
width: 100%;
@@ -1828,6 +2019,10 @@
color: #fff;
font-weight: 700;
font-size: 18px;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
}
// .call {
@@ -1853,4 +2048,23 @@
font-weight: 700 !important;
font-size: 16px;
}
+.process-params{
+ margin-top: 10px;
+ border-radius: 5px;
+ overflow: hidden;
+ color: #fff;
+ font-size: 12px;
+ &-title{
+ height: 25px;
+ padding: 0 5px;
+ background-color: #13235a;
+ line-height: 25px;
+ }
+ &-value{
+ background-color: #6b83ff;
+ min-height: 45px;
+ box-sizing: border-box;
+ padding: 12px;
+ }
+}
</style>
--
Gitblit v1.8.0