From 75b68e6680ac060c408753677e952d4f4547756c Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 08 十一月 2024 18:27:18 +0800
Subject: [PATCH] 1
---
src/views/mdc/station-live.vue | 88 ++++++++++++++++++++++---------------------
1 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index 9ece0d4..6aa3a6a 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,14 +2,14 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-08 15:55:24
+ * @LastEditTime: 2024-11-08 18:26:10
* @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
-->
<template>
<div class="aposcope-main">
<div class="aposcope-left">
- <el-row style="margin: 8px;font-size: 14px;">宸ヤ綅</el-row>
+ <!-- <div class="left-title">鏌ヨ鏉′欢</div> -->
<MYTree v-model="treeChecked" @loaded="query"></MYTree>
</div>
<div class="aposcope-right">
@@ -51,6 +51,7 @@
</div>
</div>
</div>
+
<el-tabs type="border-card" class="demo-tabs">
<el-tab-pane label="宸ヤ綅鏁版嵁">
<div style="text-align: right;margin-bottom: 14px;">
@@ -60,45 +61,7 @@
<div><div id="wcs-left" style="width: 100%;height:400px;"></div></div>
<div><div id="wcs-right" style="width: 100%;height:400px;"></div></div>
</div>
- <div class="bottom-panel content-panel">
- <div class="panel-title">鐝鐘舵�佽褰�</div>
- <div class="panel-content bottom-panel-chart">
- <div class="status">
- <div class="feed-button" @click="table_edit">鐘舵�佸弽棣�</div>
- <div class="status-wrap align-left">
- <div class="collect-status">閲囬泦鐘舵��</div>
- <div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
- </div>
- <div class="status-wrap">
- <el-checkbox v-model="humanFeedback" label="浜哄伐鍙嶉鐘舵��" size="large" />
- <div class="status-con">
- <div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
- </div>
- </div>
- </div>
- </div>
- <div style="padding: 8px;">
- <div id="wcs-log" style="width: 100%;height:200px;"></div>
- <el-table ref="multipleTableRef1" :data="recordData" border style="width: 100%;">
- <el-table-column prop="shiftIndexName" label="鐝"></el-table-column>
- <el-table-column prop="5" label="璋冭瘯"></el-table-column>
- <el-table-column prop="4" label="绂荤嚎"></el-table-column>
- <el-table-column prop="3" label="寰呮満"></el-table-column>
- <el-table-column prop="1" label="鎶ヨ"></el-table-column>
- <el-table-column prop="2" label="杩愯"></el-table-column>
- <el-table-column prop="oee" label="绋煎姩鐜�%">
- <template #default="scope">
- <span>{{(Number(scope.row.oee) * 100).toFixed(2)}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="perdata" label="鎶ヨ鐜�%">
- <template #default="scope">
- <span>{{(Number(scope.row.fault) * 100).toFixed(2)}}</span>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
+
</el-tab-pane>
<el-tab-pane label="鏈哄櫒灞ュ巻">
<div class="alarm-title">鎶ヨ淇℃伅灞ュ巻</div>
@@ -119,6 +82,46 @@
</el-pagination>
</el-tab-pane>
</el-tabs>
+
+ <div class="bottom-panel content-panel">
+ <div class="panel-title">鐝鐘舵�佽褰�</div>
+ <div class="panel-content bottom-panel-chart">
+ <div class="status">
+ <div class="feed-button" @click="table_edit">鐘舵�佸弽棣�</div>
+ <div class="status-wrap align-left">
+ <div class="collect-status">閲囬泦鐘舵��</div>
+ <div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
+ </div>
+ <div class="status-wrap">
+ <el-checkbox v-model="humanFeedback" label="浜哄伐鍙嶉鐘舵��" size="large" />
+ <div class="status-con">
+ <div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div style="padding: 8px;">
+ <div id="wcs-log" style="width: 100%;height:200px;"></div>
+ <el-table ref="multipleTableRef1" :data="recordData" border style="width: 100%;">
+ <el-table-column prop="shiftIndexName" label="鐝"></el-table-column>
+ <el-table-column prop="5" label="璋冭瘯"></el-table-column>
+ <el-table-column prop="4" label="绂荤嚎"></el-table-column>
+ <el-table-column prop="3" label="寰呮満"></el-table-column>
+ <el-table-column prop="1" label="鎶ヨ"></el-table-column>
+ <el-table-column prop="2" label="杩愯"></el-table-column>
+ <el-table-column prop="oee" label="绋煎姩鐜�%">
+ <template #default="scope">
+ <span>{{(Number(scope.row.oee) * 100).toFixed(2)}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="perdata" label="鎶ヨ鐜�%">
+ <template #default="scope">
+ <span>{{(Number(scope.row.fault) * 100).toFixed(2)}}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
</div>
</div>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="treeChecked.toString()" @closed="dialog.save=false"></save-dialog>
@@ -783,7 +786,7 @@
margin-right: 8px;
padding: 4px;
background-color: #fff;
- padding-top: 20px;
+ padding-top:20px;
}
.aposcope-right {
flex: 1;
@@ -943,7 +946,6 @@
}
.panel-content {
width: 100%;
- height: calc(100% - 45px);
}
.panel-content-gant, .panel-content-table {
width: 100%;
--
Gitblit v1.9.3