From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/mdc/components/StationLiveSpeed.vue | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/mdc/components/StationLiveSpeed.vue b/src/views/mdc/components/StationLiveSpeed.vue
index 9069130..291f1ea 100644
--- a/src/views/mdc/components/StationLiveSpeed.vue
+++ b/src/views/mdc/components/StationLiveSpeed.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
- * @LastEditTime: 2025-03-14 09:31:16
+ * @LastEditTime: 2025-11-18 16:54:41
* @FilePath: /cps-web/src/views/mdc/components/StationLiveSpeed.vue
-->
<template>
@@ -13,8 +13,8 @@
<div class="dataHr">鍔犲伐鏁版嵁</div>
<el-row :gutter="20" style="padding-right: 12px;padding-left: 12px;">
<!-- 涓昏酱璐熻浇(SpindleLoad),涓昏酱鍊嶇巼(SpindleRate),杩涚粰鍊嶇巼(FeedRate) 涓嶅湪杩欓噷灞曠ず -->
- <el-col :span="12" v-for="item in dmpList" style="margin-bottom: 12px;"
- v-show="item.dpName != 'SpindleLoad' && item.dpName != 'SpindleRate' && item.dpName != 'FeedRate'">
+ <el-col :span="12" v-for="item in dmpList" style="margin-bottom: 12px;">
+ <!-- v-show="item.dpName.toLowerCase() != 'spindleload' && item.dpName.toLowerCase() != 'spindlerate' && item.dpName.toLowerCase() != 'feedrate'" -->
<div>
<div class="inlineDiv">{{ item.dpLabel }}</div>
<el-input v-model="item.codeName" :disabled="true" class="inlineInput"
@@ -117,18 +117,18 @@
},
methods: {
query() {
- // if(this.dmpList.length == 0) return;
- // var a,b,c;
- // this.dmpList.forEach(item=> {
- // if(item.dpName == "SpindleLoad") {
- // a = item.codeName;
- // }else if(item.dpName == "SpindleRate") {
- // b = item.codeName;
- // }else if(item.dpName == "FeedRate") {
- // c = item.codeName;
- // }
- // })
- // this.showCharts(a,b,c);
+ if(this.dmpList.length == 0) return;
+ var a,b,c;
+ this.dmpList.forEach(item=> {
+ if(item.dpName.toLowerCase() == "spindleload") {
+ a = item.codeName;
+ }else if(item.dpName.toLowerCase() == "spindlerate") {
+ b = item.codeName;
+ }else if(item.dpName.toLowerCase() == "feedrate") {
+ c = item.codeName;
+ }
+ })
+ this.showCharts(a,b,c);
},
showCharts(a, b, c) {
var myChartA = echarts.init(this.$refs.c);
--
Gitblit v1.9.3