diff --git a/.env.dev b/.env.dev
index 36961860..6c794063 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-25 15:59:53
+ # @LastEditTime: 2024-04-01 08:31:57
# @LastEditors: zhp
# @Description:
###
@@ -13,14 +13,14 @@ VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://10.70.2.2:8080'
+# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index c750fc27..ece729de 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
@@ -40,6 +40,12 @@
-->
+
@@ -64,11 +70,11 @@
-->
-
+
-
+
@@ -166,25 +166,25 @@ export default {
bottom: "3%",
containLabel: true
},
- legend: {
- itemWidth: 10,
- itemHeight: 10,
- top: '5',
- right: '20px',
- data: [
- // { icon: 'rect', name: '直接访问' },
- { icon: 'roundRect', name: '产线产量' },
- {
- icon: 'circle', name: '产线良品率',
- itemWidth: 7,
- itemHeight: 7,
- },
- ],
- textStyle: {
- fontSize: 12 * this.beilv,
- color: '#ced1d5'
- }
- },
+ // legend: {
+ // itemWidth: 10,
+ // itemHeight: 10,
+ // top: '5',
+ // right: '20px',
+ // data: [
+ // // { icon: 'rect', name: '直接访问' },
+ // { icon: 'roundRect', name: '产线产量' },
+ // // {
+ // // icon: 'circle', name: '产线良品率',
+ // // itemWidth: 7,
+ // // itemHeight: 7,
+ // // },
+ // ],
+ // textStyle: {
+ // fontSize: 12 * this.beilv,
+ // color: '#ced1d5'
+ // }
+ // },
xAxis: {
axisTick: {
show: false
@@ -308,7 +308,8 @@ export default {
}
diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue
index f14131a5..fb2ca74b 100644
--- a/src/views/OperationalOverview/components/doubleYChart .vue
+++ b/src/views/OperationalOverview/components/doubleYChart .vue
@@ -173,7 +173,7 @@ export default {
itemHeight: 10,
top: '0%',
right: '20px',
- data: ['产线产量', '产线良品率'],
+ data: ['产线良品率', '产线产量'],
textStyle: {
fontSize: 12 * this.beilv,
color: '#ced1d5',
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index 8ba4049e..937fb62e 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,13 +1,13 @@
@@ -71,7 +71,10 @@ export default {
}
},
mounted() {
- console.log('mounted')
+ // console.log('mounted')
+ window.addEventListener('resize', () => {
+ this.resize()
+ })
// console.log('borderRadius: ', this.borderRadius)
// console.log('33333', this.dataList)
// let arr = []
@@ -91,6 +94,12 @@ export default {
this.chart = null
},
methods: {
+ resize() {
+ this.chart.resize({
+ width: 'auto',
+ height: 90
+ });;
+ },
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
let rawData = []
let colors = ['#0fdedb', '#2359ec']
@@ -239,10 +248,15 @@ export default {
},
series:series
})
- this.chart.resize({
- width: 'auto',
- height: 90
- });;
+ this.$nextTick(() => {
+ setTimeout(() => {
+ this.resize()
+ },1000);
+ })
+ // this.chart.resize({
+ // width: 'auto',
+ // height: 90
+ // });;
}
}
}