From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/dashboard/BranchFactorySignage.vue | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/views/dashboard/BranchFactorySignage.vue b/src/views/dashboard/BranchFactorySignage.vue
index 077d329..4de1dc3 100644
--- a/src/views/dashboard/BranchFactorySignage.vue
+++ b/src/views/dashboard/BranchFactorySignage.vue
@@ -8,6 +8,9 @@
<!--</div>-->
<div class="content-container">
<div style="width: 25%" class="left-col">
+ <div class="back-nav" @click="$emit('backToLastSignage','Index')" v-if="userType===4">
+ <dv-decoration-7>涓婁竴绾�</dv-decoration-7>
+ </div>
<dv-border-box-9 style="padding: 40px 20px 0">
<!--<div class="first-title">M D C 鍏� 缃� 鎬� 鏁� : 6 0 3 鍙�</div>-->
<div id="running_state_chart" style="width:100%;height: 400px;"></div>
@@ -78,6 +81,9 @@
productionCode: {
type: String,
default: ''
+ },
+ userType: {
+ type: Number
}
},
data() {
@@ -550,7 +556,7 @@
} else {
console.log('yAxisParams===========', params)
- this.$emit('switchToBranchFactory', params.value)
+ this.$emit('switchToNextSignage', { signageName: 'WorkshopSection', productionCode: params.value })
}
})
},
@@ -752,7 +758,7 @@
xAxis: [{
name: 'OEE杞﹂棿',
nameLocation: 'middle',
- nameGap: 30, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
+ nameGap: 40, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
type: 'category',
data: this.barChartData.map(item => item.name),
axisLine: {
@@ -761,11 +767,11 @@
}
},
axisLabel: {
- margin: 10,
- color: '#e2e9ff',
- textStyle: {
- fontSize: 12
- }
+ show: true, // 鏄惁鏄剧ず鍒诲害鏍囩锛岄粯璁ゆ樉绀�
+ interval: 0, // 鍧愭爣杞村埢搴︽爣绛剧殑鏄剧ず闂撮殧锛屽湪绫荤洰杞翠腑鏈夋晥锛涢粯璁や細閲囩敤鏍囩涓嶉噸鍙犵殑绛栫暐闂撮殧鏄剧ず鏍囩锛涘彲浠ヨ缃垚0寮哄埗鏄剧ず鎵�鏈夋爣绛撅紱濡傛灉璁剧疆涓�1锛岃〃绀恒�庨殧涓�涓爣绛炬樉绀轰竴涓爣绛俱�忥紝濡傛灉鍊间负2锛岃〃绀洪殧涓や釜鏍囩鏄剧ず涓�涓爣绛撅紝浠ユ绫绘帹銆�
+ rotate: this.barChartData.length >= 5 ? -30 : 0, // 鍒诲害鏍囩鏃嬭浆鐨勮搴︼紝鍦ㄧ被鐩酱鐨勭被鐩爣绛炬樉绀轰笉涓嬬殑鏃跺�欏彲浠ラ�氳繃鏃嬭浆闃叉鏍囩涔嬮棿閲嶅彔锛涙棆杞殑瑙掑害浠�-90搴﹀埌90搴�
+ inside: false, // 鍒诲害鏍囩鏄惁鏈濆唴锛岄粯璁ゆ湞澶�
+ margin: 6 // 鍒诲害鏍囩涓庤酱绾夸箣闂寸殑璺濈
},
axisTick: {
show: false
@@ -971,20 +977,9 @@
headerBGC: '#83B883',
oddRowBGC: '#556955',
evenRowBGC: '#556955',
- data: [
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂']
- ],
+ data: [],
index: true,
- columnWidth: [100],
+ columnWidth: [100, 300, 300],
align: ['center']
}
},
@@ -1028,6 +1023,17 @@
justify-content: space-between;
.left-col {
+ .back-nav {
+ width: 100px;
+ height: 30px;
+ color: #eee;
+ position: absolute;
+ top: 25px;
+ left: 25px;
+ cursor: pointer;
+ z-index: 9999
+ }
+
.first-title {
color: #00A8AC;
font-size: 20px;
--
Gitblit v1.9.3