From 443908dddb58734ebf876746ef919d44ee79ee2b Mon Sep 17 00:00:00 2001 From: chengdandan <2549057906@qq.com> Date: Tue, 21 Feb 2023 14:20:08 +0800 Subject: [PATCH 1/2] 2023022103 --- src/views/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/index.vue b/src/views/index.vue index be19c3e5..9b2cfee6 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -276,7 +276,7 @@ export default { componentType: '', typeFiltering: '', typeData: [], - flowType:'出流' + FlowType:'出流' }, // typeData: ['小汽车', '公交车', '卡车', '非机动车', '行人'], @@ -540,7 +540,7 @@ export default { const u8arr = new Uint8Array(message); const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串 const msg = JSON.parse(temp); //这一步报错则返回的是二进制流图片,不报错则返回的是JSON的错误提示数据 - console.log("msg",msg) + // console.log("msg",msg) // document.getElementById('mapModule').contentWindow.getDestination(JSON.stringify(msg)); if (msg.rate == 'high') { @@ -598,7 +598,7 @@ export default { const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串 var detId = []; const msgN = JSON.parse(temp); - // console.log("trigger_msgN",msgN) + console.log("trigger_msgN",msgN) this.triggerListData = msgN; } catch (error) {} break; @@ -695,7 +695,7 @@ export default { this.componentForm.componentParameterId = res.data.data.componentParameterId; this.componentForm.cycleInterval = res.data.data.cycleInterval; this.componentForm.startSectionIds = res.data.data.startSectionIds; - this.componentForm.flowType = res.data.data.flowType; + // this.componentForm.FlowType = res.data.data.flowType; this.componentForm.startSectionNames = res.data.data.startSectionNames; this.componentForm.endSectionIds = res.data.data.endSectionIds; this.componentForm.endSectionNames = res.data.data.endSectionNames; @@ -1075,7 +1075,7 @@ export default { formData.append('startValue', componentForm.startValue); formData.append('timeMode', componentForm.timeMode); formData.append('presentationForm', componentForm.presentationForm); - formData.append('FlowType', componentForm.flowType); + formData.append('flowType', componentForm.FlowType); } axios({ method: 'post', From ea3eb0d0cabacd1dd3da28a36a7e353b144f56e5 Mon Sep 17 00:00:00 2001 From: Hobart Date: Tue, 21 Feb 2023 15:06:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/management.js | 13 ++ src/components/chart/barChart.vue | 107 ++++++++------- src/components/chart/lineChart.vue | 4 +- src/components/chart/pieChart.vue | 121 ++++++++--------- src/views/IdManagement.vue | 203 ++++++++++++++--------------- src/views/bounced/dataBoard.vue | 135 +++++++++---------- 6 files changed, 285 insertions(+), 298 deletions(-) create mode 100644 src/api/management.js diff --git a/src/api/management.js b/src/api/management.js new file mode 100644 index 00000000..6be800b3 --- /dev/null +++ b/src/api/management.js @@ -0,0 +1,13 @@ +import axios from 'axios'; +import qs from 'qs'; +if (process.env.NODE_ENV === 'development') { + axios.defaults.baseURL = '/'; +} else if (process.env.NODE_ENV === 'production') { + axios.defaults.baseURL = '/'; +} +//获取所有账号数据接口 +export const getZhanghData = params => { + return axios.get('api/GetZhangh', { + params + }); +}; diff --git a/src/components/chart/barChart.vue b/src/components/chart/barChart.vue index c9b9398d..f65e9667 100644 --- a/src/components/chart/barChart.vue +++ b/src/components/chart/barChart.vue @@ -1,16 +1,14 @@ - + \ No newline at end of file +}; + diff --git a/src/components/chart/lineChart.vue b/src/components/chart/lineChart.vue index 55a3ef27..68b84b8d 100644 --- a/src/components/chart/lineChart.vue +++ b/src/components/chart/lineChart.vue @@ -72,7 +72,7 @@ export default { lineHeight: '30' } }, - legend:{}, + legend: {}, grid: { left: '2%', right: '4%', @@ -265,7 +265,7 @@ export default { } if (this.$refs.lineChart) { this.$nextTick(() => { - this.drawLine(); + // this.drawLine(); }); } } diff --git a/src/components/chart/pieChart.vue b/src/components/chart/pieChart.vue index 06ba3757..7fc2d8fc 100644 --- a/src/components/chart/pieChart.vue +++ b/src/components/chart/pieChart.vue @@ -1,15 +1,15 @@ - + - \ No newline at end of file + diff --git a/src/views/IdManagement.vue b/src/views/IdManagement.vue index 239d0471..bd89e5cd 100644 --- a/src/views/IdManagement.vue +++ b/src/views/IdManagement.vue @@ -1,118 +1,113 @@ \ No newline at end of file + diff --git a/src/views/bounced/dataBoard.vue b/src/views/bounced/dataBoard.vue index ec725325..bf705e56 100644 --- a/src/views/bounced/dataBoard.vue +++ b/src/views/bounced/dataBoard.vue @@ -3,11 +3,15 @@ -
+
-
+
- + @@ -506,7 +500,7 @@ export default { /deep/ .el-scrollbar__view { display: inline-block !important; - width: 100% + width: 100%; } /deep/ .el-scrollbar__wrap { @@ -520,7 +514,6 @@ export default { .dataBoard { height: 100%; } - } .dataBoard .region, @@ -610,4 +603,4 @@ export default { .active { transition: all 0.5s linear; } - \ No newline at end of file +