From 47ad515964b18ed9b6bea66b7298be1e95ad4de5 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期四, 24 十月 2024 15:22:27 +0800 Subject: [PATCH] 1、新增设备综合效率分析以及报警分析页面 2、新增总控车间看板跳转第三方页面及外部应用功能 3、调整分控车间看板每日生产计划表格一直显示3条记录 --- src/views/mdc/base/MasterControlWorkshopSignage.vue | 46 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/views/mdc/base/MasterControlWorkshopSignage.vue b/src/views/mdc/base/MasterControlWorkshopSignage.vue index 69ef55e..ab55d40 100644 --- a/src/views/mdc/base/MasterControlWorkshopSignage.vue +++ b/src/views/mdc/base/MasterControlWorkshopSignage.vue @@ -30,7 +30,7 @@ </div> <div class="workshop-bg"> <div class="navigate-container" style="top:0;left: 5%;"> - <div @click="navigateTo(item)" v-for="item in productionLineList" :key="item.id" + <div @click="navigateToSubWorkshopSignage(item)" v-for="item in productionLineList" :key="item.id" class="navigate-item"> <template v-if="item.productionOrder<5"> <div :style="{backgroundColor:productionLineBackgroundColorList[item.productionOrder%4]}" @@ -45,7 +45,7 @@ </div> </div> <div class="navigate-container" style="bottom:0;right: 5%;"> - <div @click="navigateTo(item)" v-for="item in productionLineList" :key="item.id" + <div @click="navigateToSubWorkshopSignage(item)" v-for="item in productionLineList" :key="item.id" class="navigate-item"> <template v-if="item.productionOrder>=5"> <div :style="{backgroundColor:productionLineBackgroundColorList[item.productionOrder%4]}" @@ -61,7 +61,7 @@ </div> </div> <div class="switch-container"> - <div @click="activeIndex=index" class="switch-item" v-for="(item,index) in switchList" :key="index" + <div class="switch-item" v-for="(item,index) in switchList" :key="index" @click="navigateToOthers(item,index)" :style="{backgroundColor:activeIndex===index?'#848284':'#6B6D6B',color:activeIndex==index?'#27A2DB':'#000'}"> {{item.label}} </div> @@ -113,23 +113,38 @@ switchList: [ { label: 'MES', - index: 0 + index: 0, + isNavigateToWeb: true, + webUrl: 'http://172.16.52.71:8081', + batPath: '' }, { label: '鍒�鍏风鐞�', - index: 1 + index: 1, + isNavigateToWeb: true, + webUrl: 'http://172.16.52.99/tms', + batPath: '' }, { - label: '鏁呴殰', - index: 2 + label: '璁惧璇婃柇', + index: 2, + isNavigateToWeb: false, + webUrl: '', + batPath: 'yituoSBZD://' }, { - label: '3D', - index: 3 + label: '涓夌淮鐩戞帶', + index: 3, + isNavigateToWeb: false, + webUrl: '', + batPath: 'yituoVR://' }, { label: '瀹夐槻', - index: 4 + index: 4, + isNavigateToWeb: false, + webUrl: '', + batPath: 'yituoAF://' } ], rightColChart1: '', @@ -2148,7 +2163,7 @@ return s }, - navigateTo(record) { + navigateToSubWorkshopSignage(record) { const url = this.$router.resolve({ path: '/SubControlWorkshopSignage', query: { @@ -2160,6 +2175,15 @@ window.open(url, '_blank') }, + navigateToOthers(record, index) { + this.activeIndex = index + if (record.isNavigateToWeb && record.webUrl) { + window.open(record.webUrl, '_blank') + } else { + window.location.href = record.batPath + } + }, + /** * 绐楀彛灏哄鍙樺寲鏃惰Е鍙� * 璋冩暣鍥捐〃灏哄浠ラ�傚簲鍒嗚鲸鐜� -- Gitblit v1.9.3