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/station-live.vue | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index 16b79b6..04af844 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -1,8 +1,8 @@
<!--
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-10 19:35:08
+ * @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
+ * @LastEditTime: 2025-11-18 16:57:42
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -10,7 +10,7 @@
<div class="aposcope-main">
<div class="aposcope-left">
<!-- <div class="left-title">鏌ヨ鏉′欢</div> -->
- <MYTree v-model="treeChecked" @loaded="query"></MYTree>
+ <MYTree v-model="treeChecked" @loaded="query" :isSelectId="$route.query.code"></MYTree>
</div>
<div class="aposcope-right">
<div class="content-machine-box" style="min-height: 450px;">
@@ -30,29 +30,28 @@
<div class="dataHr"></div>
<div class="content-zhou-box">
<div class="zhou-one content-zhou-border">
- <div><div id="wcs-left" style="width: 100%;height:300px;"></div></div>
+ <div><div id="wcs-left" style="width: 100%;height:340px;"></div></div>
</div>
<div class="zhou-two content-zhou-border">
- <el-table :data="tableData2" style="width: 100%;height:300px;">
+ <el-table :data="tableData2" style="width: 100%;height:340px;">
<el-table-column prop="test" label="杞�"></el-table-column>
<el-table-column prop="test" label="鍧愭爣"></el-table-column>
<el-table-column prop="test" label="鎵煩"></el-table-column>
</el-table>
</div>
<div class="zhou-three content-zhou-border">
- <el-table :data="alarmtableData" style="width: 100%;height:260px;">
+ <el-table :data="alarmtableData" style="height:300px;">
<el-table-column prop="alarmCode" label="鎶ヨ鍙�"></el-table-column>
<el-table-column prop="alarmMsg" label="鎶ヨ鍐呭"></el-table-column>
<el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿"></el-table-column>
</el-table>
<el-pagination
- style="margin-top: 6px;padding-left: 6px;padding-right: 6px;"
+ style="margin-top: 6px;padding-left: 6px;padding-right: 6px;width: 450;position:absolute;right:0;"
@size-change="alarmSizeChange"
@current-change="alarmCurrentChange"
- :current-page="currentPage4"
- :page-sizes="[15, 50, 100]"
+ :current-page="alarmsearchData.current"
:page-size="15"
- layout="total, sizes, prev, pager, next, jumper"
+ layout="total, prev, pager, next"
:total="alarmtotal">
</el-pagination>
</div>
@@ -177,6 +176,7 @@
name: "state-feedback",
data(){
return {
+ currentPage4: 1,
getwcsRData: [],
tableData1: [],
tableData2: [],
@@ -341,7 +341,7 @@
},
watch: {
treeChecked() {
- this.query()
+ this.query();
}
},
mounted(){
@@ -719,19 +719,18 @@
}, 500);
this.$TOOL.socket.websocket.onmessage = function(event) {
var JSONData = JSON.parse(res.data.dpConfig);
- var SpindleLoad = JSONData.some(obj => obj.dpName === 'SpindleLoad'); //鍒ゆ柇鏄惁鏈変富杞磋礋杞�(SpindleLoad)锛�
- var SpindleRate = JSONData.some(obj => obj.dpName === 'SpindleRate'); //鍒ゆ柇鏄惁鏈変富杞村�嶇巼(SpindleRate)锛�
- var FeedRate = JSONData.some(obj => obj.dpName === 'FeedRate'); //鍒ゆ柇鏄惁鏈夎繘缁欏�嶇巼(FeedRate)锛�
- if(!SpindleLoad) JSONData.push({dpName: "SpindleLoad",dpLabel: "涓昏酱璐熻浇"});
- if(!SpindleRate) JSONData.push({dpName: "SpindleRate",dpLabel: "涓昏酱鍊嶇巼"});
- if(!FeedRate) JSONData.push({dpName: "FeedRate",dpLabel: "杩涚粰鍊嶇巼"});
+ var SpindleLoad = JSONData.some(obj => obj.dpName === 'spindleLoad'); //鍒ゆ柇鏄惁鏈変富杞磋礋杞�(SpindleLoad)锛�
+ var SpindleRate = JSONData.some(obj => obj.dpName === 'spindleRate'); //鍒ゆ柇鏄惁鏈変富杞村�嶇巼(SpindleRate)锛�
+ var FeedRate = JSONData.some(obj => obj.dpName === 'feedRate'); //鍒ゆ柇鏄惁鏈夎繘缁欏�嶇巼(FeedRate)锛�
+ if(!SpindleLoad) JSONData.push({dpName: "spindleLoad",dpLabel: "涓昏酱璐熻浇"});
+ if(!SpindleRate) JSONData.push({dpName: "spindleRate",dpLabel: "涓昏酱鍊嶇巼"});
+ if(!FeedRate) JSONData.push({dpName: "feedRate",dpLabel: "杩涚粰鍊嶇巼"});
var eventData = JSON.parse(event.data);
JSONData.forEach((item,index)=> { //绗竴姝ユ妸v鏀惧埌code閲�
if(item.dpName == "DeviceStatus") { //鏈哄櫒鐘舵��
if(eventData.data[item.dpName]) {
item.code = eventData.data[item.dpName].v;
}
-
setTimeout(()=> {
console.log(that.allwcs,888)
},5000)
@@ -749,7 +748,7 @@
if(eventData.data[item.dpName]) {
item.codeName = eventData.data[item.dpName].v;
}else { //ws娌℃湁鐨勬儏鍐�
- if(item.dpName == "SpindleLoad" || item.dpName == "SpindleRate" || item.dpName == "FeedRate") {
+ if(item.dpName == "spindleLoad" || item.dpName == "spindleRate" || item.dpName == "feedRate") {
item.codeName = 0;
}else {
item.codeName = "";
@@ -869,6 +868,7 @@
}
.content-two,.zhou-three {
flex: 1;
+ position: relative;
}
.content-two {
border-left: 1px solid #eee;
@@ -879,7 +879,7 @@
width: 25%;
}
.zhou-one {
- width: 28%;
+ width: 330px;
}
.zhou-two {
width:28%;
--
Gitblit v1.9.3