From b8d3ad18074c932b5bb2af7797fc71079d14c1b6 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期一, 28 十月 2024 15:20:42 +0800 Subject: [PATCH] 1、更换页面加载提示文字 2、调整总控车间看板车间立体图 --- src/views/mdc/base/SubControlWorkshopSignage.vue | 86 +++++++++++++++++++++++++++++++++--------- 1 files changed, 67 insertions(+), 19 deletions(-) diff --git a/src/views/mdc/base/SubControlWorkshopSignage.vue b/src/views/mdc/base/SubControlWorkshopSignage.vue index abad12b..10d2242 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,23 +40,41 @@ <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> + <template v-if="todayProductionPlanList.length<=3"> + <tr v-for="(item,index) in 3-todayProductionPlanList.length" + :key="index"> + <td colspan="2"></td> + <td colspan="2"></td> + <td colspan="2"></td> + <td colspan="2"></td> + <td></td> + <td></td> + <td></td> + <td></td> + <td colspan="2"></td> + <td colspan="2"></td> + <td></td> + </tr> + </template> </tbody> </table> @@ -96,7 +118,7 @@ <template v-for="(listItem,listIndex) in maxBrandToolLifeListLength"> <template> <tr> - <td style="width: 7vw">棰濆畾瀵垮懡</td> + <td style="width: 5vw;min-width: 5vw">棰濆畾瀵垮懡</td> <template v-for="(item,index) in toolLife.brandList"> <td rowspan="2" style="width: 2.5vw"> {{toolLife.lifeList[index][listIndex]?toolLife.lifeList[index][listIndex]?toolLife.lifeList[index][listIndex].tid:'':''}} @@ -121,16 +143,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 +378,8 @@ brandList: [], lifeList: [] }, - maxBrandToolLifeListLength: null + maxBrandToolLifeListLength: null, + modalVisible: false } }, created() { @@ -384,12 +411,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 +447,7 @@ } }) }, + getToolCurrentLifeDataBgColor(record) { if (record.currentLife / record.ratedLife > 0.8) { return '#FF9A10' @@ -462,6 +496,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