From a8fc561ea18260ab36b19bd5c997bcccebb68c4f Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期一, 09 十月 2023 09:58:51 +0800
Subject: [PATCH] feat: 首页删除客户货物描述,增加通道号展示
---
src/views/visualization.vue | 241 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 181 insertions(+), 60 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 9d1679e..a6dd135 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -90,7 +90,7 @@
</span> -->
</div>
<div class="gongx">
- <el-steps v-if="taskData.AllProcedures" :active="taskData.CurrentProcedureIndex?taskData.CurrentProcedureIndex:0" finish-status="success" class="steps">
+ <el-steps v-if="taskData.AllProcedures" :active="taskData.CurrentProcedureIndex ?? 0" finish-status="success" class="steps">
<el-step icon="" :title="item" v-for="(item,index) in taskData.AllProcedures" :key="index"></el-step>
</el-steps>
</div>
@@ -147,10 +147,10 @@
-
{{ formatDate(taskData.Order.endTime) }}</el-descriptions-item
>
- <el-descriptions-item label="璐х墿鎻忚堪">{{
- taskData.Order.orderAttr || "--"
- }}</el-descriptions-item>
- <el-descriptions-item label="瀹㈡埛鍚嶇О">{{
+ <el-descriptions-item label="閫氶亾">
+ {{ channelNameConfig[taskData.Channel] || "--" }}
+ </el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛缂栫爜">{{
taskData.Order.customer || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍙傛暟瑕佹眰">{{
@@ -275,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 }} -->
@@ -337,24 +338,34 @@
<!-- <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>
@@ -461,7 +472,7 @@
<template
v-if="activeName == 2 &&(!taskData||Object.keys(taskData).length==0)"
>
-
+
<el-empty description="鏆傛棤浠诲姟..."></el-empty>
</template>
</div>
@@ -533,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%;
@@ -591,19 +602,14 @@
</div>
</div>
</div>
-
+
</template> -->
<!-- 鎺у埗鐨勫脊妗� -->
<AddControl ref="control" :Arr="Arr" />
<!-- 鎺у埗鐨勫脊妗� -->
- <AddIssue
+ <TaskControlModal
ref="control"
- :Arr="Arr"
:activeName="activeName"
- :ArrError="ArrError"
- :safeProduce="safeProduce"
- :taskData="taskData"
- :Order="taskData.Order"
@getSetProductNumber="reloadPage"
@isTip="isTip"
/>
@@ -632,8 +638,11 @@
import AddControl from "../components/AddControl.vue";
import AddIssue from "../components/AddIssue.vue";
import ProcessModel from "../components/ProcessModel.vue";
+import TaskControlModal from "@/components/TaskControlModal.vue";
+import {channelNameConfig} from "@/common/constants";
export default {
components: {
+ TaskControlModal,
Card,
Knowledge,
AddControl,
@@ -642,6 +651,7 @@
},
data() {
return {
+ pollingTaskCountTimer: null,
activeName: 1,
progress: 70, //杩涘害
passrate: 30, //鍚堟牸鐜�
@@ -764,6 +774,7 @@
listData:[],
resResult:null,
resprocInfoTimer:null,
+ channelNameConfig: channelNameConfig
};
},
mounted() {
@@ -778,7 +789,17 @@
this.getDate3();
this.getDate2();
}, 5000);
- this.getTaskInfo();
+
+ let channelType = this.getChannelTypeFromUrl()
+ channelType = channelType ?? 1
+ this.activeName = channelType
+ this.getTaskInfo(channelType);
+ this.getTaskCountStatistics()
+ },
+ beforeDestroy() {
+ clearTimeout(this.pollingTaskCountTimer)
+ clearTimeout(this.procInfoTimer)
+ clearTimeout(this.ProcessModelTimer)
},
watch:{
// isFinsh(){
@@ -806,10 +827,10 @@
this.isUpdateIcon=true;
break;
}
- }
+ }
}
}
- this.resResult=res;
+ this.resResult=res;
})
}
}
@@ -823,7 +844,6 @@
}
}
this.$message.error('褰撳墠宸ュ簭鏃犵紪鍙凤紝鏃犳硶鏌ョ湅宸ュ簭!')
-
},
getProcessModelList(){
this.getModelList()
@@ -833,10 +853,17 @@
}, 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({
message:'鐩墠娌℃湁浠诲姟锛�',
@@ -850,6 +877,7 @@
},
cutClick(val) {
this.activeName = val;
+ this.updateChannelTypeToUrl(val)
if(this.activeName==2){
this.Tasks=this.TasksCopy.slice(0,2)
if(this.Tasks.length<2){
@@ -892,7 +920,6 @@
}
});
},
-
getDateObj(date, fmt) {
if (/(y+)/.test(fmt)) {
fmt = fmt.replace(
@@ -955,7 +982,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
@@ -1006,6 +1033,25 @@
}
},
+ /**
+ * 杞鑾峰彇浠诲姟鏁伴噺
+ */
+ 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=[]
@@ -1018,14 +1064,14 @@
})
}
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(this.object)
// }
this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
-
+
if ((this.TasksCopy.length ==0 )||!this.TasksCopy) {
if (this.activeName == 1||this.activeName == 3) {
this.TasksCopy.push(this.object);
@@ -1053,7 +1099,7 @@
...this.TasksCopy[i].Procedure.procedure,
},
]);
-
+
if (this.TasksCopy[i].Procedure.ID) {
startTask({ id: this.TasksCopy[i].Procedure.ID }).then((res) => {
if (res.code == 200) {
@@ -1062,7 +1108,7 @@
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
}
});
@@ -1116,6 +1162,27 @@
}
}
})
+ },
+ /**
+ * 鍚慤RL涓缃綋鍓嶉�氶亾灞曠ず绫诲瀷
+ * @param {number} type 閫氶亾灞曠ず绫诲瀷
+ */
+ updateChannelTypeToUrl(type){
+ const activeName = this.getChannelTypeFromUrl();
+ if (activeName === type){
+ return
+ }
+ let path = this.$router.history.current.path
+ this.$router.push({path, query: {activeName: `${type ?? 1}`}})
+ },
+ /**
+ * 浠嶶RL鑾峰彇褰撳墠閫氶亾灞曠ず绫诲瀷
+ * @return {number}
+ */
+ getChannelTypeFromUrl(){
+ let activeName = new URLSearchParams(location.search).get('activeName')
+ activeName = activeName ? +activeName : undefined
+ return activeName
},
getProgressInfo() {
this.resprocInfoTimer=null
@@ -1192,7 +1259,7 @@
background:#12234a!important;
color:#fff!important;
border-color: #09e5ed !important;
-
+
.popper__arrow::after{
border-top-color:#09e5ed !important;
}
@@ -1241,7 +1308,7 @@
box-sizing: border-box;
border-right: 1px solid #eee;
}
-
+
.small_title {
margin-bottom: 30px;
}
@@ -1297,7 +1364,7 @@
font-size:14px;
}
}
-
+
.el-step{
.el-step__icon{
background:#00cc66;
@@ -1308,19 +1375,47 @@
}
}
}
- .el-step__head.is-process{
- color: #00cc66 !important;
- border-color:#00cc66;
- }
- .el-step__title.is-process{
- color: #00cc66 !important;
- }
.el-step__head.is-wait{
color:#fff;
border-color:#fff;
}
.el-step__title.is-wait{
color:#fff;
+ }
+
+ // 浣挎楠ゆ潯鑺傜偣鐘舵�佹垚鍔熸椂,鍓嶉潰鐨勭嚎鍚屾鏇存敼棰滆壊
+ .steps{
+ /* 杩涜涓姸鎬侊細鍦堢嚎 */
+ & .el-step__head.is-process {
+ color: #00cc66;
+ border-color: #00cc66;
+ }
+ /* 杩涜涓姸鎬侊細鍦堝唴 */
+ & .el-step__head.is-process > .el-step__icon {
+ background: #00cc66;
+ color: #00cc66;
+ }
+ /* 杩涜涓姸鎬侊細title锛堟枃瀛楋級 */
+ & .el-step__title.is-process {
+ color: #00cc66;
+ }
+
+ /* 瀹屾垚鐘舵�侊細鍦堢嚎 */
+ & .el-step__head.is-success {
+ color: #00cc66;
+ border-color: #00cc66;
+ }
+ /* 瀹屾垚鐘舵�侊細title锛堟枃瀛楋級 */
+ & .el-step__title.is-success {
+ color: #00cc66;
+ }
+ /* 瀹屾垚鐘舵�侊細line
+ * 鎻忚堪锛氱涓�姝ュ畬鎴愶紝绗簩姝ヨ繘琛屾椂锛屼箣闂寸殑杩涘害鏉℃湁棰滆壊
+ */
+ & .el-step__head.is-success > .el-step__line > .el-step__line-inner {
+ width: 100% !important;
+ border-width: 1px !important;
+ }
}
}
.set-title {
@@ -1495,8 +1590,7 @@
overflow-y:auto;
}
.el-carousel__item{
- // height:auto;
- min-height:160px;
+ height:auto;
}
}
.bottom-box-btn{
@@ -1504,6 +1598,10 @@
position:absolute;
bottom:10px;
left:10px;
+ .el-button{
+ height: 40px;
+
+ }
}
}
@@ -1511,7 +1609,6 @@
font-size: 20px;
}
.right-small-btn {
- margin-top: 10px;
width: calc(100% - 20px);
margin: 0 auto;
position: absolute;
@@ -1646,6 +1743,7 @@
top:10px;
width:35px;
vertical-align: middle;
+ cursor:pointer;
img{
width:100%;
}
@@ -1820,7 +1918,7 @@
border-radius: 5px 5px 0 0;
background: rgb(19, 35, 90);
}
-
+
.card_contentRight {
width: 100%;
@@ -1962,7 +2060,7 @@
.right-base-btn {
width: 100%;
position: absolute;
- bottom: 0;
+ bottom: 24px;
left: 0;
.el-button--primary {
width: 100%;
@@ -1972,6 +2070,10 @@
color: #fff;
font-weight: 700;
font-size: 18px;
+ height: 40px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
}
// .call {
@@ -1997,4 +2099,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