From f7cc97f27910c7d570f07df5d0dbd29d3f06049c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期六, 12 十月 2024 15:14:27 +0800
Subject: [PATCH] 1、调整导航栏为侧边模式时的项目标题 2、调整页面顶部栏颜色 3、解决设备报警页面由于缩放引起的组件遮挡文字问题 4、总控车间看板右侧图表调整为自动轮播 5、分控车间看板每日生产计划仅展示3项，完整表格在右上角查看更多中查看
---
src/views/mdc/base/SubControlWorkshopSignage.vue | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/src/views/mdc/base/SubControlWorkshopSignage.vue b/src/views/mdc/base/SubControlWorkshopSignage.vue
index abad12b..9d66565 100644
--- a/src/views/mdc/base/SubControlWorkshopSignage.vue
+++ b/src/views/mdc/base/SubControlWorkshopSignage.vue
@@ -6,6 +6,10 @@
<div>{{currentProductionInfo.productionName}}</div>
</div>
+ <div class="load-more">
+ <div @click="modalVisible=true">鐐瑰嚮鏌ョ湅鏇村>></div>
+ </div>
+
<table class="plan-table">
<thead>
<tr style="position: relative">
@@ -36,22 +40,24 @@
<tbody>
<tr v-for="(item,index) in todayProductionPlanList" :key="index">
- <td colspan="2">{{item.equipmentId}}</td>
- <td colspan="2">{{item.equipmentName}}</td>
- <a-tooltip :destroyTooltipOnHide="true" placement="topRight" @mouseenter="mouseEnterItem">
- <template slot="title">
- <span style="font-size: 1vw">{{item.productNo}}</span>
- </template>
- <td colspan="2">{{item.productNo}}</td>
- </a-tooltip>
- <td colspan="2">{{item.productName}}</td>
- <td>{{item.planCount}}</td>
- <td>{{item.completionCount}}</td>
- <td>{{item.qualifiedCount}}</td>
- <td>{{item.passRate+'%'}}</td>
- <td colspan="2">{{item.processRoute}}</td>
- <td colspan="2">{{item.orderId}}</td>
- <td>{{item.clazz}}</td>
+ <template v-if="index<3">
+ <td colspan="2">{{item.equipmentId}}</td>
+ <td colspan="2">{{item.equipmentName}}</td>
+ <a-tooltip :destroyTooltipOnHide="true" placement="topRight" @mouseenter="mouseEnterItem">
+ <template slot="title">
+ <span style="font-size: 1vw">{{item.productNo}}</span>
+ </template>
+ <td colspan="2">{{item.productNo}}</td>
+ </a-tooltip>
+ <td colspan="2">{{item.productName}}</td>
+ <td>{{item.planCount}}</td>
+ <td>{{item.completionCount}}</td>
+ <td>{{item.qualifiedCount}}</td>
+ <td>{{item.passRate+'%'}}</td>
+ <td colspan="2">{{item.processRoute}}</td>
+ <td colspan="2">{{item.orderId}}</td>
+ <td>{{item.clazz}}</td>
+ </template>
</tr>
</tbody>
</table>
@@ -121,16 +127,20 @@
</div>
</div>
</div>
+
+ <SignageModal :todayProductionPlanList="todayProductionPlanList" :modalVisible="modalVisible"
+ @closeModal="modalVisible=false"/>
</div>
</template>
<script>
import moment from 'moment'
import api from '@/api/mdc'
+ import SignageModal from './modules/SubControlWorkshopSignage/SignageModal'
export default {
name: 'SubControlWorkshopSignage',
- components: {},
+ components: { SignageModal },
data() {
return {
currentProductionInfo: {
@@ -352,7 +362,8 @@
brandList: [],
lifeList: []
},
- maxBrandToolLifeListLength: null
+ maxBrandToolLifeListLength: null,
+ modalVisible: false
}
},
created() {
@@ -384,12 +395,18 @@
if (res.success) this.todayProductionPlanList = res.result
})
},
+
+ clickToLoadMore() {
+
+ },
+
getEquipmentStatusByApi() {
api.getEquipmentStatusApi(this.currentProductionInfo.productionId)
.then(res => {
if (res.success) this.equipmentStatusList = res.result
})
},
+
getToolLifeListByApi() {
api.getToolLifeListApi(this.currentProductionInfo.productionId)
.then(res => {
@@ -414,6 +431,7 @@
}
})
},
+
getToolCurrentLifeDataBgColor(record) {
if (record.currentLife / record.ratedLife > 0.8) {
return '#FF9A10'
@@ -462,6 +480,20 @@
font-size: 2.5vw;
}
+ .load-more {
+ display: flex;
+ justify-content: flex-end;
+ -webkit-justify-content: flex-end;
+ font-size: 1vw;
+
+ div {
+ background-color: #83BF31;
+ margin: 0 0.5% 0.5% 0;
+ padding: 0 0.3%;
+ cursor: pointer;
+ }
+ }
+
table {
td {
border: 0.1vw solid #fff;
--
Gitblit v1.9.3