diff --git a/src/assets/i18n/langs/cn/laborManage/laborDev.js b/src/assets/i18n/langs/cn/laborManage/laborDev.js index 475423eb..3d840885 100644 --- a/src/assets/i18n/langs/cn/laborManage/laborDev.js +++ b/src/assets/i18n/langs/cn/laborManage/laborDev.js @@ -57,7 +57,7 @@ export default { 'VR安全教育', '班前教育', '日常教育(日常违规教育)', - '每日交底(方案交底)', + '每日交底(专项方案交底)', '每日交底(安全技术交底)', '每日交底(大工程交底)', ], diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 8f0233b3..31f71790 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -44,6 +44,7 @@ if (process.env.NODE_ENV == 'development') { // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //杨意本地 http/1.1 + // axios.defaults.baseURL = 'http://sp36hf.natappfree.cc/'; //杨 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue index ed48d0b3..7dc9617b 100644 --- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue +++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue @@ -45,6 +45,7 @@ export default { data() { return { jBarChart: null } }, + methods: { createChart() { const { title, tooltip, grid, color, xData, yData, series } = this diff --git a/src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue b/src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue index ed48d0b3..f7b5e135 100644 --- a/src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue +++ b/src/views/projectAdmin/jlw/jChart/bar/JBarChart.vue @@ -45,6 +45,26 @@ export default { data() { return { jBarChart: null } }, + watch:{ + xData:{ + handler(newVal,oldVal){ + if(newVal != oldVal){ + this.createChart(); + } + }, + deep:true, + immediate:true, + }, + yData:{ + handler(newVal,oldVal){ + if(newVal != oldVal){ + this.createChart(); + } + }, + deep:true, + immediate:true, + } + }, methods: { createChart() { const { title, tooltip, grid, color, xData, yData, series } = this diff --git a/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue b/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue index d0e90317..353098fa 100644 --- a/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue +++ b/src/views/projectAdmin/jlw/jChart/bar/JProgressChart.vue @@ -28,6 +28,17 @@ export default { data() { return { JProgressChart: null } }, + watch:{ + seriesData:{ + handler(newVal,oldVal){ + if(newVal != oldVal){ + this.createChart(); + } + }, + deep:true, + immediate:true, + } + }, methods: { createChart() { const { grid, seriesData, yData } = this diff --git a/src/views/projectAdmin/jlw/qualityManage/leftBottom.vue b/src/views/projectAdmin/jlw/qualityManage/leftBottom.vue index 5eccb065..a9ad8903 100644 --- a/src/views/projectAdmin/jlw/qualityManage/leftBottom.vue +++ b/src/views/projectAdmin/jlw/qualityManage/leftBottom.vue @@ -9,49 +9,58 @@