diff --git a/src/api/api.js b/src/api/api.js index 9dcf31d..ef5d8df 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -118,3 +118,39 @@ export const getCameraHistory = (params) => { {params}, ) }; +//安全检查统计 +export const getCheckTotalCensus = (params) => { + return axios.get('api/ems-third-party-service/project/checkTotalCensus', + {params}, + ) +}; +//检查次数统计 +export const getCheckTimesCensus = (params) => { + return axios.get('api/ems-third-party-service/project/checkTimesCensus', + {params}, + ) +}; +//隐患检查统计 +export const getResolveTroubleCensus = (params) => { + return axios.get('api/ems-third-party-service/project/resolveTroubleCensus', + {params}, + ) +}; +// //高频问题项 +export const getMostTroubleCensus = (params) => { + return axios.get('api/ems-third-party-service/project/mostTroubleCensus', + {params}, + ) +}; +//安全告警统计 +export const getWarnSurveillance = (params) => { + return axios.get('api/ems-third-party-service/project/warnSurveillance', + {params}, + ) +}; +//隐患整改记录 +// export const getMostTroubleCensus = (params) => { +// return axios.get('api/ems-third-party-service/project/mostTroubleCensus', +// {params}, +// ) +// }; diff --git a/src/components/common/LineChart.vue b/src/components/common/LineChart.vue index d1dd371..35bef09 100644 --- a/src/components/common/LineChart.vue +++ b/src/components/common/LineChart.vue @@ -7,7 +7,7 @@ width="100%" height="100%" > -
+ + }, + // itemStyle: { // 此配置 + // normal: { + // borderWidth: 2, + // borderColor: 'rgba(255,255,255,0.7)' + // } + // }, + itemStyle: { + borderRadius: 2, + borderColor: "rgb(255,255,255)", + borderWidth: 2, + }, + data: arr[2], + }, + ], + }); + }, + }, +}; + + .name { + font-size: 14px; + font-weight: 500; + } +} + diff --git a/src/components/common/pieChart.vue b/src/components/common/pieChart.vue index c77da81..ad3e26f 100644 --- a/src/components/common/pieChart.vue +++ b/src/components/common/pieChart.vue @@ -105,27 +105,25 @@ export default { hoverAnimation: true, /// /设置饼图默认的展开样式 label: { show: true, - formatter: '{b}:{c}%', - padding:[0,10,0,50], + formatter: '{b|{b}}:{c|{c}}%', + padding:[0,0,0,0], itemStyle: { // 此配置 normal: { borderWidth: 2, borderColor: '#52FFC1' } }, - rich: { - d: { - color: '#fff', - fontSize: 20, - lineHeight: 24, - height: 24 + rich: { + b: { + fontSize: 15, + lineHeight: 33, }, c: { - color: "red", - fontSize: 20, - lineHeight: 20, - align: 'left', - } + fontSize: 18, + lineHeight: 22, + align: "center", + opacity: 0.1 + }, }, position: '', }, diff --git a/src/components/common/pieChartUnImg.vue b/src/components/common/pieChartUnImg.vue index c31f3b5..e79ea78 100644 --- a/src/components/common/pieChartUnImg.vue +++ b/src/components/common/pieChartUnImg.vue @@ -92,19 +92,17 @@ export default { borderColor: "#52FFC1", }, }, - formatter: "{b}{c}%", - rich: { - d: { - color: "#fff", - fontSize: 20, - lineHeight: 24, - height: 24, + formatter: "{b|{b}}{c|{c}}%", + rich: { + b: { + fontSize: 15, + lineHeight: 33, }, c: { - color: "red", - fontSize: 20, - lineHeight: 20, - align: "left", + fontSize: 18, + lineHeight: 22, + align: "center", + opacity: 0.1 }, }, position: "", diff --git a/src/components/common/threeBarChart.vue b/src/components/common/threeBarChart.vue index d71848b..552110e 100644 --- a/src/components/common/threeBarChart.vue +++ b/src/components/common/threeBarChart.vue @@ -1,266 +1,354 @@ diff --git a/src/utils/mqttConfig.js b/src/utils/mqttConfig.js index f7ffab1..9145f35 100644 --- a/src/utils/mqttConfig.js +++ b/src/utils/mqttConfig.js @@ -40,7 +40,11 @@ class mqttHandle { //配置链接 const { host, port, endpoint, ...options } = this.connect; console.log("this.connect.host",this.connect.host) +<<<<<<< HEAD const connectUrl = 'ws://175.27.191.156:10083/mqtt'; +======= + const connectUrl = 'ws://175.27.191.156:10083/mgtt'; +>>>>>>> 006ce36a7cef616fdc714ec5799317b9668c98bb // const connectUrl = `ws://${this.connect.host}:${this.connect.port}`; // if (!client.connected) { // client.on('connect', function () { diff --git a/src/views/managementComponents.vue b/src/views/managementComponents.vue index 5f0bb4d..6e87fea 100644 --- a/src/views/managementComponents.vue +++ b/src/views/managementComponents.vue @@ -1,7 +1,7 @@ diff --git a/src/views/swiper.vue b/src/views/swiper.vue index 24b6306..13abacf 100644 --- a/src/views/swiper.vue +++ b/src/views/swiper.vue @@ -71,6 +71,9 @@