diff --git a/mes-ui/mes-echarts/src/views/bottomRight.vue b/mes-ui/mes-echarts/src/views/bottomRight.vue
index 311cb7ec..2b589d4b 100644
--- a/mes-ui/mes-echarts/src/views/bottomRight.vue
+++ b/mes-ui/mes-echarts/src/views/bottomRight.vue
@@ -212,7 +212,12 @@ export default {
}
.item_span {
display: inline-block;
- padding: 5px 25px;
+ padding: 5px 0;
+ text-align: center;
+ width:100px;
+ overflow: hidden; /* 隐藏超出的内容 */
+ text-overflow: ellipsis; /* 添加省略号 */
+ white-space: nowrap; /* 防止内容换行 */
}
}
.ranking1 {
diff --git a/mes-ui/mes-echarts/src/views/center.vue b/mes-ui/mes-echarts/src/views/center.vue
index c5b1d921..d8794465 100644
--- a/mes-ui/mes-echarts/src/views/center.vue
+++ b/mes-ui/mes-echarts/src/views/center.vue
@@ -114,7 +114,7 @@ export default {
this.config = { ...this.config };
this.config1 = { ...this.config1 };
} else {
- this.datas = JSON.parse(item.data);
+ var datas = JSON.parse(item.data);
this.config.data = [datas[0] * 1];
this.config1.data = [datas[1] * 1];
this.config = { ...this.config };
diff --git a/mes-ui/mes-echarts/src/views/centerLeft1.vue b/mes-ui/mes-echarts/src/views/centerLeft1.vue
index 5a36a557..08bd2b01 100644
--- a/mes-ui/mes-echarts/src/views/centerLeft1.vue
+++ b/mes-ui/mes-echarts/src/views/centerLeft1.vue
@@ -122,12 +122,7 @@ export default {
formatter: "{value}%",
waveNum: 2,
waveHeight: 10,
- colors:
- item[5] == 0
- ? ["#00FFFF", "#00B2EE"]
- : item[5] == 2
- ? ["#ff6600", "#CD0100"]
- : ["#FFE57E", "#FF6715"],
+ colors:item[5] == 0? ["#00FFFF", "#00B2EE"]:(item[5] == 2?["#FFE57E", "#FF6715"]: ["#ff6600", "#CD0100"]),
// 根据条件做判断修改颜色
};
this.reqlist.push({
@@ -141,6 +136,7 @@ export default {
config: n,
});
}
+ this.lessL = 12 - this.reqlist.length;
} else {
var datalist = JSON.parse(item.data);
for (const item of datalist) {
@@ -151,11 +147,7 @@ export default {
waveNum: 2,
waveHeight: 10,
colors:
- item[5] == 0
- ? ["#00FFFF", "#00B2EE"]
- : item[5] == 2
- ? ["#ff6600", "#CD0100"]
- : ["#FFE57E", "#FF6715"],
+ item[5] == 0? ["#00FFFF", "#00B2EE"]:(item[5] == 2?["#FFE57E", "#FF6715"]: ["#ff6600", "#CD0100"]),
// 根据条件做判断修改颜色
};
this.reqlist.push({
@@ -169,6 +161,7 @@ export default {
config: n,
});
}
+ this.lessL = 12 - this.reqlist.length;
}
}
});
@@ -499,12 +492,7 @@ export default {
formatter: "{value}%",
waveNum: 2,
waveHeight: 10,
- colors:
- item.intraday_yield_rate > 97
- ? ["#00FFFF", "#00B2EE"]
- : item.intraday_yield_rate > 92
- ? ["#ff6600", "#CD0100"]
- : ["#FFE57E", "#FF6715"],
+ colors:item[5] == 0? ["#00FFFF", "#00B2EE"]:(item[5] == 2?["#FFE57E", "#FF6715"]: ["#ff6600", "#CD0100"]),
//根据条件做判断修改颜色
};
_this.reqlist.push({
diff --git a/mes-ui/mes-echarts/src/views/centerRight1.vue b/mes-ui/mes-echarts/src/views/centerRight1.vue
index d0857341..0bdd24db 100644
--- a/mes-ui/mes-echarts/src/views/centerRight1.vue
+++ b/mes-ui/mes-echarts/src/views/centerRight1.vue
@@ -15,138 +15,58 @@
-
-
-
- 工单号{{ moInfo.FBILL_NO }}
-
-
- 产线{{ moInfo.FWORK_SHOP }}
-
-
- 产品名称{{ moInfo.FMATERIAL_NAME }}
-
-
- 型号{{ moInfo.FSPECIFICATION }}
-
-
- 单位{{ moInfo.FUNIT_ID }}
-
-
- 计划数量{{ moInfo.FQTY_SHOW }}
-
-
- 合格品数量{{ moInfo.FREPQUAAUX_QTY_SHOW }}
-
-
- 不合格数量{{ moInfo.FREPFAILAUX_QTY_SHOW }}
-
-
- 开工{{ moInfo.FSTATUS }}
-
-
- 计划开工日期{{ moInfo.FPLAN_START_DATE_SHOW }}
-
-
- 预定完工日期{{ moInfo.FPLAN_FINISH_DATE_SHOW }}
-
-
- 实际开工时间{{ moInfo.FSTART_DATE_SHOW }}
-
-
- 实际完工时间{{ moInfo.FFINISH_DATE_SHOW }}
-
-
-
-