From 698bbdfcbbe4939b0427c022eea67e45f58fd253 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 15:51:21 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/home/widgets/components/mdcEquipmentRun.vue | 11 ++++++++---
src/views/mdc/components/StationLiveSpeed.vue | 26 +++++++++++++-------------
src/utils/tool.js | 6 +++---
3 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/utils/tool.js b/src/utils/tool.js
index 233d20d..8160191 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -1,8 +1,8 @@
/*
* @Descripttion: 宸ュ叿闆�
* @version: 1.2
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-12-18 15:11:50
+ * @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
+ * @LastEditTime: 2025-11-18 14:03:23
*/
import CryptoJS from 'crypto-js';
@@ -18,7 +18,7 @@
console.log(hostname,port,pathname)
if (process.env.NODE_ENV=='development') {
- //var path = "120.46.212.231:86"; //濡傛灉鏄湰鍦拌仈璋冿紝鍐欐垚120.46.212.231:86锛屽彂鐗堝啓鎴恏ostname+":"+port;
+ //var path = "120.46.212.231:85/"; //濡傛灉鏄湰鍦拌仈璋冿紝鍐欐垚120.46.212.231:86锛屽彂鐗堝啓鎴恏ostname+":"+port;
var path = hostname+":"+port;
} else {
var path = hostname+":"+port;
diff --git a/src/views/home/widgets/components/mdcEquipmentRun.vue b/src/views/home/widgets/components/mdcEquipmentRun.vue
index f75efbb..0cdf4a5 100644
--- a/src/views/home/widgets/components/mdcEquipmentRun.vue
+++ b/src/views/home/widgets/components/mdcEquipmentRun.vue
@@ -1,8 +1,8 @@
<!--
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-16 15:22:46
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-24 22:33:49
+ * @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
+ * @LastEditTime: 2025-11-18 12:36:09
* @FilePath: /CPSnew/smart-web/src/views/home/widgets/components/mdcDeviceStatus.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -199,6 +199,11 @@
this.data = this.formatData(data)
this.$nextTick(() => {
this.parentData = this.data;
+ var ids = this.extractLastLevelIds(this.parentData);
+ this.selectedIds = ids;
+ this.search.workStationIdList = ids;
+ this.search.top = 5; //24灏忔椂鍐呭墠5鍚�
+ this.search.timeLevel = 24; //24灏忔椂鍐呭墠5鍚�
this.getList();
})
}
@@ -230,7 +235,7 @@
top: 7,
workStationIdList: ids
}
- this.$HTTP.post(`/api/blade-visual/status/oee-top`,obj).then(res=> {
+ this.$HTTP.post(`/api/blade-visual/status/oee-top`,this.search).then(res=> {
if(res.code == 200) {
var recordDom = document.getElementById('equipment');
this.option.yAxis.data = res.data.categories;
diff --git a/src/views/mdc/components/StationLiveSpeed.vue b/src/views/mdc/components/StationLiveSpeed.vue
index 9069130..0991dd1 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 14:02:28
* @FilePath: /cps-web/src/views/mdc/components/StationLiveSpeed.vue
-->
<template>
@@ -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 == "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(this.$refs.c);
--
Gitblit v1.9.3