From 86f41d42eebe1a4684b7bf658686ac0804e2e349 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 19 九月 2023 14:23:18 +0800
Subject: [PATCH] 工序的名字 样式修改
---
src/views/visualization.vue | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/visualization.vue b/src/views/visualization.vue
index 19d3b65..cda95d0 100644
--- a/src/views/visualization.vue
+++ b/src/views/visualization.vue
@@ -249,14 +249,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>
@@ -818,11 +818,11 @@
return d;
},
setInterCard(value, name, i) {
- if (this.Tasks[i].Procedure.procedure[value]) {
+ if (this.Tasks[i].Procedure.procedure[value]!=null) {
let height = 200;
let num = 1;
if (this.$refs[name]) {
- height = this.$refs[name].$el.offsetHeight;
+ height = this.$refs[name].$el?this.$refs[name].$el.offsetHeight:200;
num = Math.floor(height / 80);
}
let inputMaterials = JSON.parse(
@@ -881,14 +881,6 @@
this.TaskCount=res.data.TaskCount?res.data.TaskCount:0
this.workers=res.data.workers?res.data.workers:[]
- if (this.Tasks.length == 0) {
- if (this.activeName == 1) {
- this.Tasks.push(object);
- } else {
- this.Tasks.push(object);
- this.Tasks.push(object);
- }
- }
for (let i in this.Tasks) {
this.Tasks[i].procedureList = [];
this.Tasks[i].inputMaterials = [];
@@ -929,6 +921,14 @@
}, 9000);
}
}
+ 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) {
this.getcountdown();
// 鎺у埗閲嶆柊璇锋眰getTaskInfo, 鍙紑鍚竴涓畾鏃跺櫒
--
Gitblit v1.8.0