From 2250cbe6f084faae03d0c590faee7310ec24abc4 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期二, 12 十一月 2024 18:29:42 +0800
Subject: [PATCH] 1
---
src/views/mdc/components/speenBaseInfo.vue | 4 ++--
src/views/mdc/components/StationLiveSpeed.vue | 30 +++++++++++++++---------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/views/mdc/components/StationLiveSpeed.vue b/src/views/mdc/components/StationLiveSpeed.vue
index 02b2e04..38eb9d7 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 lzhe@example.com
- * @LastEditTime: 2024-11-10 19:30:59
+ * @LastEditTime: 2024-11-12 18:29:09
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/TimeAlarm.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;">
- <div v-if="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 != 'SpindleLoad' && item.dpName != 'SpindleRate' && item.dpName != 'FeedRate'">
+ <div>
<div class="inlineDiv">{{item.dpLabel}}</div>
<el-input v-model="item.codeName" :disabled="true" class="inlineInput" :title="item.codeName"></el-input>
</div>
@@ -114,18 +114,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 == "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);
},
showCharts(a,b,c) {
var myChartA = echarts.init(document.getElementById('c'));
diff --git a/src/views/mdc/components/speenBaseInfo.vue b/src/views/mdc/components/speenBaseInfo.vue
index 97b2e94..9e3265b 100644
--- a/src/views/mdc/components/speenBaseInfo.vue
+++ b/src/views/mdc/components/speenBaseInfo.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-10 18:34:55
+ * @LastEditTime: 2024-11-12 17:58:28
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/TimeAlarm.vue
-->
<template>
@@ -10,7 +10,7 @@
<el-col :span="24" class="stationFormData">宸ヤ綅缂栧彿: {{stationFormData.code}}</el-col>
<el-col :span="24" class="stationFormData">鏈哄櫒鍝佺墝: {{stationFormData.machineBrand}}</el-col>
<el-col :span="24" class="stationFormData">鏈哄櫒缂栧彿: {{stationFormData.machineCode}}</el-col>
- <el-col :span="24" class="stationFormData">鏈哄櫒鍚嶇О: {{stationFormData.machineName}}</el-col>
+ <el-col :span="24" class="stationFormData">鏈哄櫒鍚嶇О: {{stationFormData.name}}</el-col>
<el-col :span="24" class="stationFormData">瀹屽伐浠舵暟锛歿{stationFormData.Output}}</el-col>
<el-col :span="24" class="stationFormData">鏈哄簥鐘舵�侊細{{stationFormData.DeviceStatus}}</el-col>
</el-row>
--
Gitblit v1.9.3