From b641eabb3f97ddfa777082ada9fd3d5f8d102f61 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 29 Mar 2024 10:57:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue index 5ff79f9e..dde7cacb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue @@ -25,7 +25,7 @@ - + 新增 - + @@ -35,6 +35,7 @@ 导出 - + @@ -23,6 +23,7 @@ 导出 - + @@ -22,7 +22,10 @@ + + 导出 - + @@ -23,6 +23,7 @@
- + @@ -10,6 +10,7 @@
- + @@ -212,10 +212,12 @@ export default { } }, onRefresh() { - this.data = []; - setTimeout(() => { - this.getData(); - }, 100); + this.searchData.pageNum = 1; + this.$refs.searchComp.handleResetForm(); + // this.data = []; + // setTimeout(() => { + // this.getData(); + // }, 100); }, onSizeChange(pageSize) { this.searchData.pageSize = pageSize; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue index cc963d44..838b2e1b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue @@ -17,7 +17,7 @@ 刷新 - @@ -119,7 +119,9 @@ export default { this.initData(); }, onRefresh() { - this.initData(); + this.searchData.pageNum = 1; + this.$refs.searchComp.handleResetForm(); + // this.initData(); }, onAdd() { this.detail = {} diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue index ac816b3e..a07a4b19 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue @@ -18,6 +18,7 @@ { @@ -147,13 +152,9 @@ export default { firstBtnClick(id) {}, handleSearch(data) { - console.log("data", data); - this.searchData = { - ...this.searchData, - warningType: data.warningType, - startTime: data.warningTime[0], - completeTime: data.warningTime[1], - }; + this.searchData.warningType = data.warningType; + this.searchData.startTime = data.warningTime && data.warningTime[0]; + this.searchData.completeTime = data.warningTime && data.warningTime[1]; this.initData(); }, }, From 8b24b5058520e2414fd342b370df0dbadea9875e Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Fri, 29 Mar 2024 11:30:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/perception/meteorologyCheck.js | 25 ++ .../components/DeviceControlDialog.vue | 2 +- .../components/DeviceControlDialog.vue | 2 +- .../components/ModifyDutyInformationTable.vue | 1 + .../event/event/EventDetailDialog/index.vue | 2 +- .../channelAnalytics/assets/charts.js | 24 +- .../components/channelAnalytics/index.vue | 252 ++++++++++++++-- .../eventTypeAnalysis/assets/charts.js | 33 ++- .../components/eventTypeAnalysis/index.vue | 252 ++++++++++++++-- .../components/Eventfiltering/index.vue | 24 +- .../trafficIncidentsChartsPie.js | 6 +- .../components/Sitefiltering/index.vue | 22 +- .../trafficIncidentsChartsPie.js | 6 +- .../components/weatherInfoQuery/index.vue | 279 +++++++++--------- .../auditAnalytics/assets/charts.js | 52 ++-- .../components/auditAnalytics/index.vue | 190 ++++++++++-- .../channelAnalytics/assets/charts.js | 54 ++-- .../components/channelAnalytics/index.vue | 194 ++++++++++-- .../eventTypeAnalysis/assets/charts.js | 52 ++-- .../components/eventTypeAnalysis/index.vue | 218 ++++++++++++-- ruoyi-ui/vue.config.js | 6 +- 21 files changed, 1321 insertions(+), 375 deletions(-) diff --git a/ruoyi-ui/src/api/perception/meteorologyCheck.js b/ruoyi-ui/src/api/perception/meteorologyCheck.js index f179d38f..3bc24c6f 100644 --- a/ruoyi-ui/src/api/perception/meteorologyCheck.js +++ b/ruoyi-ui/src/api/perception/meteorologyCheck.js @@ -23,6 +23,7 @@ export function getMeteorologicalEarlyWarning() { method: "post", }); } + // 查询气象预警数量 export function getQueryTheNumberOfMeteorologicalWarning() { return request({ @@ -30,3 +31,27 @@ export function getQueryTheNumberOfMeteorologicalWarning() { method: "post", }); } + +// 统计气象设备当天最新信息列表 +export function getListLatest() { + return request({ + url: "/dc/system/meteorologicalDetector/listLatest", + method: "get", + }); +} + +// 统计气象设备信息列表 +export function getDeviceNameListLatest(name) { + return request({ + url: "/dc/system/meteorologicalDetector/" + name, + method: "get", + }); +} + +// 根据物联产品id获取设备数据 +export function getIdDevices(id) { + return request({ + url: "/business/device/devices/" + id, + method: "get", + }); +} diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue index 889df8d3..5ebcd419 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue @@ -1,5 +1,5 @@ @@ -18,7 +33,9 @@ export default { WgtTitle, }, data() { - return {}; + return { + dataList: [], + }; }, created() {}, @@ -37,28 +54,36 @@ export default { total += response.data[i].num; } for (let i = 0; i < data.length; i++) { - // if (i % 2 === 0) { - // data.splice(i + 1, 0, newObj) - // } if (data[i].name != "") { nameData.push(data[i].name); + this.dataList.push({ + name: data[i].name, + value: data[i].value, + percert: + total == 0 ? 0 : ((data[i].value / total) * 100).toFixed(2), + }); } } - chartsStatistics.legend.data = nameData; - console.log( - "chartsStatistics.legend.data", - chartsStatistics.legend.data - ); - chartsStatistics.legend.formatter = function (name) { - let tarValue = 0; - for (let i = 0; i < response.data.length; i++) { - if (response.data[i].eventName === name) { - tarValue = response.data[i].num; - } - } - var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2); - return `{text|${name}} {number|${tarValue} 起 } {number|${percert}%}`; - }; + const list = this.dataList.reduce((acc, curr, index) => { + if (index % 4 === 0) acc.push([]); + acc[Math.floor(index / 4)].push(curr); + return acc; + }, []); + this.dataList = list; + /** + * echarts 自带翻页 勿删 + */ + // chartsStatistics.legend.data = nameData; + // chartsStatistics.legend.formatter = function (name) { + // let tarValue = 0; + // for (let i = 0; i < response.data.length; i++) { + // if (response.data[i].eventName === name) { + // tarValue = response.data[i].num; + // } + // } + // var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2); + // return `{text|${name}} {number|${tarValue} 起 } {number|${percert}%}`; + // }; chartsStatistics.title[0].text = total; chartsStatistics.series[2].data = data; }); @@ -97,14 +122,189 @@ export default { rgba(55, 231, 255, 0) ) 1 1; - display: flex; - justify-content: space-between; - align-items: center; + .charts { + height: 176px; + width: 100%; + } + .legend-box { + width: 60%; + margin: auto; + margin-top: 20px; + height: 125px; + overflow: hidden; + + .legend-item { + width: 100%; + /** + 单个动画循环样式 勿删 + */ + // height: 30px; + // display: flex; + // justify-content: space-between; + // align-items: center; + // animation: 5s infinite roll; + // position: relative; + + // &::before { + // // position: absolute; + // content: ""; + // width: 8px; + // height: 8px; + // left: 0px; + // border-radius: 50%; + // background: #37e7ff; + // } + .legend-items { + width: 100%; + height: 30px; + display: flex; + justify-content: space-between; + align-items: center; + &::before { + // position: absolute; + content: ""; + width: 8px; + height: 8px; + left: 0px; + border-radius: 50%; + background: #37e7ff; + } + } + .legend-name { + width: 100px; + margin-left: 10px; + font-size: 14px; + } + .legend-num, + .legend-percert { + width: 50px; + display: flex; + justify-content: center; + align-items: center; + font-size: 14px; + color: #37e7ff; + font-weight: bold; + } + } + .legend-item:nth-child(1) { + .legend-items:nth-child(1) { + &::before { + background: #4278f8; + } + } + .legend-items:nth-child(2) { + &::before { + background: #5372c4; + } + } + .legend-items:nth-child(3) { + &::before { + background: #0046ff; + } + } + .legend-items:nth-child(4) { + &::before { + background: #fb9434; + } + } + } + .legend-item:nth-child(2) { + .legend-items:nth-child(1) { + &::before { + background: #854101; + } + } + .legend-items:nth-child(2) { + &::before { + background: #05e599; + } + } + .legend-items:nth-child(3) { + &::before { + background: #219f73; + } + } + .legend-items:nth-child(4) { + &::before { + background: #7cedd5; + } + } + } + .legend-item:nth-child(3) { + .legend-items:nth-child(1) { + &::before { + background: #68f4dd; + } + } + .legend-items:nth-child(2) { + &::before { + background: #1785c0; + } + } + .legend-items:nth-child(3) { + &::before { + background: #476dbc; + } + } + .legend-items:nth-child(4) { + &::before { + background: #b55233; + } + } + } + /** + 单个动画循环样式 勿删 + */ + // .legend-item:nth-child(1) { + // &::before { + // background: #68f4dd; + // } + // } + // .legend-item:nth-child(2) { + // &::before { + // background: #1785c0; + // } + // } + // .legend-item:nth-child(3) { + // &::before { + // background: #476dbc; + // } + // } + // .legend-item:nth-child(4) { + // &::before { + // background: #b55233; + // } + // } + // .legend-item:nth-child(5) { + // &::before { + // background: #b0862c; + // } + // } + // .legend-item:nth-child(6) { + // &::before { + // background: #35ad6b; + // } + // } + // .legend-item:nth-child(7) { + // &::before { + // background: #219f73; + // } + // } + // .legend-item:nth-child(8) { + // &::before { + // background: #7cedd5; + // } + // } + + // .legend-item:nth-child(9) { + // &::before { + // background: #68f4dd; + // } + // } + } } } - -.charts { - height: 376px; - width: 100%; +::v-deep .el-carousel__indicators--vertical { + display: none; } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue index be56081a..d1f51a98 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue @@ -155,19 +155,19 @@ export default { gr.addColorStop(1, "rgba(92,197,255,0)"); gr.addColorStop(0, "rgba(92,197,255,0.5)"); context.lineWidth = 1; // 设置线段宽度 - drawRoundRect(context, 430, 134, 280, 24, 12, gr); - drawRoundRect(context, 430, 168, 280, 24, 10, gr); - drawRoundRect(context, 430, 202, 280, 24, 10, gr); - drawRoundRect(context, 430, 236, 280, 24, 10, gr); - drawRoundRect(context, 430, 270, 280, 24, 10, gr); - drawRoundRect(context, 430, 304, 280, 24, 10, gr); - drawRoundRect(context, 430, 338, 280, 24, 10, gr); - drawRoundRect(context, 430, 372, 280, 24, 10, gr); - drawRoundRect(context, 430, 406, 280, 24, 10, gr); - drawRoundRect(context, 430, 440, 280, 24, 10, gr); - drawRoundRect(context, 430, 474, 280, 24, 10, gr); + drawRoundRect(context, 410, 134, 380, 24, 12, gr); + drawRoundRect(context, 410, 168, 320, 24, 10, gr); + drawRoundRect(context, 410, 202, 320, 24, 10, gr); + drawRoundRect(context, 410, 236, 320, 24, 10, gr); + drawRoundRect(context, 410, 270, 320, 24, 10, gr); + drawRoundRect(context, 410, 304, 320, 24, 10, gr); + drawRoundRect(context, 410, 338, 320, 24, 10, gr); + drawRoundRect(context, 410, 372, 320, 24, 10, gr); + drawRoundRect(context, 410, 406, 320, 24, 10, gr); + drawRoundRect(context, 410, 440, 320, 24, 10, gr); + drawRoundRect(context, 410, 474, 320, 24, 10, gr); await this.getNonAutomaticWarningType(this.formData); - // drawRoundRect(context, 430, 508, 280, 24, 10, gr); + // drawRoundRect(context, 410, 508, 320, 24, 10, gr); }); }); }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsChartsPie.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsChartsPie.js index 1cf10bef..28df33e3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsChartsPie.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsChartsPie.js @@ -54,12 +54,12 @@ var options = { }, legend: { show: true, - width: "300px", + width: "380px", height: "520px", orient: "vertical", icon: "circle", top: "15%", - left: "70%", + left: "67%", itemWidth: 10, itemHeight: 10, textStyle: { @@ -69,7 +69,7 @@ var options = { rich: { text: { width: 50, - marginLeft: 32, + marginLeft: 0, fontSize: 14, }, number: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue index cd1b7a93..1f7d3ab9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue @@ -178,17 +178,17 @@ export default { gr.addColorStop(1, "rgba(92,197,255,0)"); gr.addColorStop(0, "rgba(92,197,255,0.5)"); context.lineWidth = 1; // 设置线段宽度 - drawRoundRect(context, 430, 134, 280, 24, 12, gr); - drawRoundRect(context, 430, 168, 280, 24, 10, gr); - drawRoundRect(context, 430, 202, 280, 24, 10, gr); - drawRoundRect(context, 430, 236, 280, 24, 10, gr); - drawRoundRect(context, 430, 270, 280, 24, 10, gr); - drawRoundRect(context, 430, 304, 280, 24, 10, gr); - drawRoundRect(context, 430, 338, 280, 24, 10, gr); - drawRoundRect(context, 430, 372, 280, 24, 10, gr); - drawRoundRect(context, 430, 406, 280, 24, 10, gr); - drawRoundRect(context, 430, 440, 280, 24, 10, gr); - // drawRoundRect(context, 430, 474, 280, 24, 10, gr); + drawRoundRect(context, 385, 134, 320, 24, 12, gr); + drawRoundRect(context, 385, 168, 320, 24, 10, gr); + drawRoundRect(context, 385, 202, 320, 24, 10, gr); + drawRoundRect(context, 385, 236, 320, 24, 10, gr); + drawRoundRect(context, 385, 270, 320, 24, 10, gr); + drawRoundRect(context, 385, 304, 320, 24, 10, gr); + drawRoundRect(context, 385, 338, 320, 24, 10, gr); + drawRoundRect(context, 385, 372, 320, 24, 10, gr); + drawRoundRect(context, 385, 406, 320, 24, 10, gr); + drawRoundRect(context, 385, 440, 320, 24, 10, gr); + // drawRoundRect(context, 385, 474, 320, 24, 10, gr); await this.getNonAutomaticWarningFacility(this.formData); }); }); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js index 43a2118d..0beee08d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js @@ -54,12 +54,12 @@ var options = { }, legend: { show: true, - width: "300px", + width: "380px", height: "520px", orient: "vertical", icon: "circle", top: "15%", - left: "70%", + left: "63%", itemWidth: 10, itemHeight: 10, textStyle: { @@ -69,7 +69,7 @@ var options = { rich: { text: { width: 100, - marginLeft: 32, + marginLeft: 0, fontSize: 14, }, number: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue index 6e3d3b1d..bdf9e1a5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue @@ -1,156 +1,161 @@ - - - - - \ No newline at end of file +} + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/assets/charts.js index dbbd2ccb..3ad20aa8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/assets/charts.js @@ -34,13 +34,15 @@ for (var i = 0; i < res.length; i++) { }); if (res[i].name != "") legendData.push(res[i].name); } -let decoDelta = 48; +// let decoDelta = 48; +let decoDelta = 10; var options = { color: ["#5CC5FF", "#54EFD5", "#FD9666", "#5C8CFE", "#51D5AD"], title: [ { text: "999", - top: "27%", + // top: "27%", + top: "33%", textAlign: "center", left: "49%", textStyle: { @@ -51,7 +53,8 @@ var options = { }, { text: "总数", - top: "38%", + // top: "38%", + top: "48%", textAlign: "center", left: "49%", textStyle: { @@ -75,6 +78,7 @@ var options = { }, }, legend: { + show: false, orient: "vertical", height: "80px", // left: "10%", @@ -131,8 +135,10 @@ var options = { /** 饼图上刻度 */ { type: "gauge", - center: ["50%", "35%"], - radius: "40%", // 错位调整此处 + // center: ["50%", "35%"], + // radius: "40%", // 错位调整此处 + center: ["50%", "45%"], + radius: "60%", // 错位调整此处 startAngle: 0, endAngle: 360, splitNumber: 52, @@ -155,7 +161,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7; return { type: "circle", shape: { @@ -182,7 +189,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7, startAngle: ((350 + -angle) * Math.PI) / 180, endAngle: ((120 + -angle) * Math.PI) / 180, }, @@ -202,7 +210,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7; return { type: "circle", shape: { @@ -229,7 +238,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7, startAngle: ((150 + -angle) * Math.PI) / 180, endAngle: ((-30 + -angle) * Math.PI) / 180, }, @@ -249,7 +259,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8; return { type: "circle", shape: { @@ -276,7 +287,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8, startAngle: ((590 + -angle) * Math.PI) / 180, endAngle: ((350 + -angle) * Math.PI) / 180, }, @@ -296,7 +308,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8; return { type: "circle", shape: { @@ -323,7 +336,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8, startAngle: ((90 + -angle) * Math.PI) / 180, endAngle: ((160 + -angle) * Math.PI) / 180, }, @@ -339,8 +353,10 @@ var options = { }, { type: "pie", - radius: ["45%", "39%"], - center: ["50%", "35%"], + // radius: ["45%", "39%"], + // center: ["50%", "35%"], + radius: ["60%", "52%"], + center: ["50%", "45%"], z: 10, label: { show: false, @@ -377,8 +393,10 @@ var options = { }, { type: "pie", - radius: ["25%", "39%"], - center: ["50%", "35%"], + // radius: ["25%", "39%"], + // center: ["50%", "35%"], + radius: ["37%", "60%"], + center: ["50%", "45%"], label: { show: false, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/index.vue index 66da064c..e6aeb2ec 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/index.vue @@ -1,48 +1,82 @@ - + - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/assets/charts.js index 41d65863..08d8e06b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/assets/charts.js @@ -36,13 +36,14 @@ for (var i = 0; i < res.length; i++) { if (res[i].name != "") legendData.push(res[i].name); } let angle = 0; //角度，用来做简单的动画效果的 -let decoDelta = 48; +let decoDelta = 10; var options = { color: ["#68F4DD", "#FFDD69", "#3CC3F0", "#5C8CFE", "#51D5AD"], title: [ { text: "999", - top: "27%", + // top: "27%", + top: "33%", textAlign: "center", left: "49%", textStyle: { @@ -53,7 +54,8 @@ var options = { }, { text: "总数", - top: "38%", + // top: "38%", + top: "48%", textAlign: "center", left: "49%", textStyle: { @@ -77,6 +79,7 @@ var options = { }, }, legend: { + show: false, orient: "vertical", // width: "350px", height: "80px", @@ -133,8 +136,10 @@ var options = { /** 饼图上刻度 */ { type: "gauge", - center: ["50%", "35%"], - radius: "46%", // 错位调整此处 + // center: ["50%", "35%"], + // radius: "46%", // 错位调整此处 + center: ["50%", "45%"], + radius: "60%", // 错位调整此处 startAngle: 0, endAngle: 360, splitNumber: 52, @@ -157,7 +162,9 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7; + return { type: "circle", shape: { @@ -184,7 +191,9 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7, + startAngle: ((350 + -angle) * Math.PI) / 180, endAngle: ((120 + -angle) * Math.PI) / 180, }, @@ -204,7 +213,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7; return { type: "circle", shape: { @@ -231,7 +241,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7, startAngle: ((150 + -angle) * Math.PI) / 180, endAngle: ((-30 + -angle) * Math.PI) / 180, }, @@ -251,7 +262,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8; return { type: "circle", shape: { @@ -278,7 +290,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8, startAngle: ((590 + -angle) * Math.PI) / 180, endAngle: ((350 + -angle) * Math.PI) / 180, }, @@ -298,7 +311,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8; return { type: "circle", shape: { @@ -325,7 +339,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8, startAngle: ((90 + -angle) * Math.PI) / 180, endAngle: ((160 + -angle) * Math.PI) / 180, }, @@ -341,9 +356,10 @@ var options = { }, { type: "pie", - radius: ["45%", "40%"], - center: ["50%", "35%"], - + // radius: ["45%", "40%"], + // center: ["50%", "35%"], + radius: ["60%", "52%"], + center: ["50%", "45%"], z: 10, label: { show: false, @@ -385,8 +401,10 @@ var options = { }, { type: "pie", - radius: ["29%", "40%"], - center: ["50%", "35%"], + // radius: ["29%", "40%"], + // center: ["50%", "35%"], + radius: ["37%", "60%"], + center: ["50%", "45%"], label: { show: false, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/index.vue index 3fbb0d13..eaaeddb6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/index.vue @@ -1,48 +1,84 @@ - + - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js index e9362558..a399fadf 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js @@ -51,7 +51,8 @@ for (var i = 0; i < res.length; i++) { }); if (res[i].name != "") legendData.push(res[i].name); } -let decoDelta = 48; +// let decoDelta = 48; +let decoDelta = 10; var options = { color: [ "#2867FF", @@ -67,7 +68,8 @@ var options = { title: [ { text: "999", - top: "27%", + // top: "27%", + top: "33%", textAlign: "center", left: "49%", textStyle: { @@ -78,7 +80,8 @@ var options = { }, { text: "总数", - top: "38%", + // top: "38%", + top: "48%", textAlign: "center", left: "49%", textStyle: { @@ -102,6 +105,7 @@ var options = { }, }, legend: { + show: false, orient: "vertical", height: "80px", // left: "0%", @@ -157,8 +161,10 @@ var options = { /** 饼图上刻度 */ { type: "gauge", - center: ["50%", "35%"], - radius: "46%", // 错位调整此处 + // center: ["50%", "35%"], + // radius: "46%", // 错位调整此处 + center: ["50%", "45%"], + radius: "60%", // 错位调整此处 startAngle: 0, endAngle: 360, splitNumber: 52, @@ -181,7 +187,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7; return { type: "circle", shape: { @@ -208,7 +215,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7, startAngle: ((350 + -angle) * Math.PI) / 180, endAngle: ((120 + -angle) * Math.PI) / 180, }, @@ -228,7 +236,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7; return { type: "circle", shape: { @@ -255,7 +264,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.5, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.7, startAngle: ((150 + -angle) * Math.PI) / 180, endAngle: ((-30 + -angle) * Math.PI) / 180, }, @@ -275,7 +285,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8; return { type: "circle", shape: { @@ -302,7 +313,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8, startAngle: ((590 + -angle) * Math.PI) / 180, endAngle: ((350 + -angle) * Math.PI) / 180, }, @@ -322,7 +334,8 @@ var options = { renderItem: (params, api) => { let x0 = api.getWidth() / 2; let y0 = api.getHeight() / 2 - decoDelta; - let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + // let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56; + let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8; return { type: "circle", shape: { @@ -349,7 +362,8 @@ var options = { shape: { cx: api.getWidth() / 2, cy: api.getHeight() / 2 - decoDelta, - r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + // r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.56, + r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8, startAngle: ((90 + -angle) * Math.PI) / 180, endAngle: ((160 + -angle) * Math.PI) / 180, }, @@ -365,8 +379,10 @@ var options = { }, { type: "pie", - radius: ["45%", "40%"], - center: ["50%", "35%"], + // radius: ["45%", "40%"], + // center: ["50%", "35%"], + radius: ["60%", "52%"], + center: ["50%", "45%"], z: 10, label: { show: false, @@ -403,8 +419,10 @@ var options = { }, { type: "pie", - radius: ["29%", "39%"], - center: ["50%", "35%"], + // radius: ["29%", "39%"], + // center: ["50%", "35%"], + radius: ["37%", "60%"], + center: ["50%", "45%"], label: { show: false, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/index.vue index 80c08cef..cc809ed3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/index.vue @@ -1,48 +1,84 @@ - + - - - \ No newline at end of file diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 7e817d36..12505ec7 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -52,12 +52,12 @@ module.exports = { // target: `http://10.0.81.204:8087`, //现场后台 刘文阁 // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 // target: `http://10.168.78.135:8087`, //王钦 - target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 - // target: `http://10.168.65.156:8087`, //王思祥 + // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 + target: `http://10.168.68.42:8087`, //王思祥 // target: `http://10.168.65.194:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟 // target: `http://10.168.56.165:8087`, //王家宝 - + // target: `http://10.168.77.128:8087`, //王兴琳 // target: `http://10.168.65.103:8097`, changeOrigin: true, pathRewrite: {