From 83ba8dd20cb82a12c3c355f0056112a8c383ad91 Mon Sep 17 00:00:00 2001 From: liuzhen Date: Fri, 25 Aug 2023 18:05:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/intelligent/money.vue | 3 +- .../faguan_com/yuanefaguan.vue | 5 +-- src/pages/politicalAndLaw/zhiyuanzhe.vue | 7 ++-- src/pages/population/huji.vue | 25 +------------- src/pages/population/shequxinxi.vue | 6 ++-- src/pages/population/xinfangrenyuan.vue | 21 +++++------- src/pages/publicSecurity/cxjhb/production.vue | 34 ++----------------- src/pages/publicSecurity/cxjhb/safety.vue | 5 +-- .../publicSecurity/intelligenceSubmission.vue | 4 +-- src/pages/publicSecurity/mdfx.vue | 3 +- src/pages/publicSecurity/organization.vue | 3 +- src/pages/publicSecurity/petition.vue | 7 ++-- 12 files changed, 23 insertions(+), 100 deletions(-) diff --git a/src/pages/intelligent/money.vue b/src/pages/intelligent/money.vue index 5676ad5..33c4f10 100644 --- a/src/pages/intelligent/money.vue +++ b/src/pages/intelligent/money.vue @@ -828,7 +828,6 @@ export default { color: ["#a76af3", "#2cb5f1"], //图例颜色 tooltip: { trigger: "item", - formatter: "{b}：{c}({d}%)", formatter: (param) => { return ( "涉案款项分析
" + @@ -1651,4 +1650,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/pages/politicalAndLaw/faguan_com/yuanefaguan.vue b/src/pages/politicalAndLaw/faguan_com/yuanefaguan.vue index 02543d4..4515f51 100644 --- a/src/pages/politicalAndLaw/faguan_com/yuanefaguan.vue +++ b/src/pages/politicalAndLaw/faguan_com/yuanefaguan.vue @@ -803,9 +803,6 @@ export default { } }, }, - components: { - Echarts, - }, }; \ No newline at end of file + diff --git a/src/pages/politicalAndLaw/zhiyuanzhe.vue b/src/pages/politicalAndLaw/zhiyuanzhe.vue index 04f81f6..7865d82 100644 --- a/src/pages/politicalAndLaw/zhiyuanzhe.vue +++ b/src/pages/politicalAndLaw/zhiyuanzhe.vue @@ -435,9 +435,6 @@ export default { showBackground: true, stack: "总量", data: [], - label: { - show: true, - }, label: { normal: { show: true, @@ -464,7 +461,7 @@ export default { }, ], }, - + // 志愿者数量趋势 echartObj7: { color: ["#1179ff", "#f3a858", "#20f292"], //图例颜色 @@ -805,4 +802,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/pages/population/huji.vue b/src/pages/population/huji.vue index d5c4805..b930534 100644 --- a/src/pages/population/huji.vue +++ b/src/pages/population/huji.vue @@ -352,16 +352,6 @@ export default { "#2fb47e", ]; return colors[parseInt(Math.random() * 10)]; - // 生成rgb随机颜色 - return ( - "rgb(" + - Math.round(Math.random() * 255) + - ", " + - Math.round(Math.random() * 255) + - ", " + - Math.round(Math.random() * 255) + - ")" - ); }, }, }, @@ -575,16 +565,6 @@ export default { "#2fb47e", ]; return colors[parseInt(Math.random() * 10)]; - // 生成rgb随机颜色 - return ( - "rgb(" + - Math.round(Math.random() * 255) + - ", " + - Math.round(Math.random() * 255) + - ", " + - Math.round(Math.random() * 255) + - ")" - ); }, }, }, @@ -593,7 +573,6 @@ export default { right: null, bottom: null, width: "90%", - height: "110%", height: "100%", data: [], }, @@ -716,8 +695,6 @@ export default { this.census["TOTAL"] = String(this.census["TOTAL"]).split(""); } if (this.census["GROW"]) { - this.census["GROW"] = this.census["GROW"]; - if (this.census["INCREMENTNUM"] > 0) { this.census["isUp"] = "up"; this.census["isUpText"] = "上升"; @@ -1000,4 +977,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/pages/population/shequxinxi.vue b/src/pages/population/shequxinxi.vue index 3516c9e..820618b 100644 --- a/src/pages/population/shequxinxi.vue +++ b/src/pages/population/shequxinxi.vue @@ -231,8 +231,6 @@ export default { lazy: true, lazyLoad: this.lazyLoad, }, - // 社区提示 - content: "", //社区选中值 content: "", // 社区人口 @@ -504,7 +502,7 @@ animationDuration: 2000, return { name: item["NAME"], value: item["NUM"] }; } ); - + this.echartObjKey = new Date().getTime() + 1; }) .catch((res) => { @@ -783,4 +781,4 @@ animationDuration: 2000, } } } - \ No newline at end of file + diff --git a/src/pages/population/xinfangrenyuan.vue b/src/pages/population/xinfangrenyuan.vue index 296f942..2899434 100644 --- a/src/pages/population/xinfangrenyuan.vue +++ b/src/pages/population/xinfangrenyuan.vue @@ -5,7 +5,7 @@ 查询 - +
    @@ -366,7 +366,7 @@ export default { formatter: '{b} : {c}人 ({d}%)' }, labelLine :{show:true} - } + } }, } ], @@ -404,7 +404,7 @@ export default { formatter: '{b} : {c}人 ({d}%)' }, labelLine :{show:true} - } + } }, } ], @@ -425,10 +425,6 @@ export default { // 随机颜色 var colors = ['#d3e352','#ff9367','#f3564e','#ea3dab','#ad2de2','#af7dff','#DC8AB5','#2d95ff','#2ec0f0','#34dbe0','#2fb47e',] return colors[parseInt(Math.random() * 10)]; - // 生成rgb随机颜色 - return 'rgb(' +Math.round(Math.random() * 255) + - ', ' + Math.round(Math.random() * 255) + - ', ' + Math.round(Math.random() * 255) + ')' } } }, @@ -437,7 +433,6 @@ export default { right: null, bottom: null, width: '90%', - height: '110%', height: '100%', data: [ { @@ -479,14 +474,14 @@ export default { tooltip: { trigger: 'item', formatter: "{b}
    人口数量: {c}万人", - + }, /*visualMap: { type: 'continuous', show: false, // 指定 visualMapContinuous 组件的允许的最小/大值 min/max 必须用户指定 // min: 0, - // max: 400, + // max: 400, textStyle: { fontSize: 14, color: '#fff' @@ -494,7 +489,7 @@ export default { realtime: false, calculable: true, inRange: { - // color: ['#9fb5ea', '#e6ac53', '#74e2ca', '#85daef', '#9feaa5', '#5475f5'] + // color: ['#9fb5ea', '#e6ac53', '#74e2ca', '#85daef', '#9feaa5', '#5475f5'] color: ['#3aa8bc', '#decc61', '#f96858', ] } },*/ @@ -740,7 +735,7 @@ export default { } } } - + .ageBubble{ height: 100%; flex: 1; @@ -771,4 +766,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/pages/publicSecurity/cxjhb/production.vue b/src/pages/publicSecurity/cxjhb/production.vue index 21e1368..b4ac5cc 100644 --- a/src/pages/publicSecurity/cxjhb/production.vue +++ b/src/pages/publicSecurity/cxjhb/production.vue @@ -331,12 +331,6 @@ export default { { // full data type: "pictorialBar", - itemStyle: { - normal: { - opacity: 0.2, - }, - }, - animationDuration: 2000, symbolRepeat: 9, symbolMargin: "5%", @@ -432,12 +426,6 @@ export default { { // full data type: "pictorialBar", - itemStyle: { - normal: { - opacity: 0.2, - }, - }, - animationDuration: 2000, symbolRepeat: 9, symbolMargin: "5%", @@ -533,12 +521,6 @@ export default { { // full data type: "pictorialBar", - itemStyle: { - normal: { - opacity: 0.2, - }, - }, - animationDuration: 2000, symbolRepeat: 9, symbolMargin: "5%", @@ -634,12 +616,6 @@ export default { { // full data type: "pictorialBar", - itemStyle: { - normal: { - opacity: 0.2, - }, - }, - animationDuration: 2000, symbolRepeat: 9, symbolMargin: "5%", @@ -735,12 +711,6 @@ export default { { // full data type: "pictorialBar", - itemStyle: { - normal: { - opacity: 0.2, - }, - }, - animationDuration: 2000, symbolRepeat: 9, symbolMargin: "5%", @@ -791,7 +761,7 @@ export default { > div { background: url("../../../assets/img/cxjh/pro.png") no-repeat; background-size: 100% 100%; - + div.showData { display: flex; flex-direction: column; @@ -985,4 +955,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/pages/publicSecurity/cxjhb/safety.vue b/src/pages/publicSecurity/cxjhb/safety.vue index 705dbeb..9f17e0c 100644 --- a/src/pages/publicSecurity/cxjhb/safety.vue +++ b/src/pages/publicSecurity/cxjhb/safety.vue @@ -372,9 +372,6 @@ export default { label: { show: true, position: "top", - formatter: (param) => { - return this.formatNum(param.value); - }, formatter: "{c} 处", fontSize: 14, color: "#fff", @@ -511,4 +508,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/pages/publicSecurity/intelligenceSubmission.vue b/src/pages/publicSecurity/intelligenceSubmission.vue index 779dbb8..b2d2460 100644 --- a/src/pages/publicSecurity/intelligenceSubmission.vue +++ b/src/pages/publicSecurity/intelligenceSubmission.vue @@ -293,7 +293,6 @@ export default { }, }, symbolSize: 10, - smooth: true, data: [], }, { @@ -457,7 +456,6 @@ export default { position: "inside", }, legend: { - icon: "circle", icon: "circle", top: "10", right: "20", @@ -1006,4 +1004,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/pages/publicSecurity/mdfx.vue b/src/pages/publicSecurity/mdfx.vue index 47a9e6d..fa709da 100644 --- a/src/pages/publicSecurity/mdfx.vue +++ b/src/pages/publicSecurity/mdfx.vue @@ -288,7 +288,6 @@ export default { trigger: "axis", }, legend: { - icon: "circle", top: "10", right: "20", icon: "circle", @@ -553,4 +552,4 @@ export default { color: #ff4a5c; } } - \ No newline at end of file + diff --git a/src/pages/publicSecurity/organization.vue b/src/pages/publicSecurity/organization.vue index 07d8d47..0dcd7d5 100644 --- a/src/pages/publicSecurity/organization.vue +++ b/src/pages/publicSecurity/organization.vue @@ -477,7 +477,6 @@ export default { }, }, symbolSize: 13, - smooth: true, data: [], }, ], @@ -1197,4 +1196,4 @@ export default { height: 100%; } } - \ No newline at end of file + diff --git a/src/pages/publicSecurity/petition.vue b/src/pages/publicSecurity/petition.vue index 945f9e4..2017739 100644 --- a/src/pages/publicSecurity/petition.vue +++ b/src/pages/publicSecurity/petition.vue @@ -467,7 +467,6 @@ export default { "#34dbe0", "#2fb47e", ]; - return colors[parseInt(Math.random() * 10)]; // 生成rgb随机颜色 return ( "rgb(" + @@ -486,7 +485,6 @@ export default { right: null, bottom: null, width: "90%", - height: "110%", height: "100%", data: [], }, @@ -508,7 +506,6 @@ export default { icon: "circle", top: "10", right: "20", - icon: "circle", //圆点 itemWidth: 20, //图例的宽度 // itemHeight: 20, textStyle: { @@ -701,7 +698,7 @@ export default { } }); this.sumNormal.total = String(this.sumNormal.total).split(""); - if (this.sumNormal[0].hasOwnProperty("ratio")) { + if (Object.hasOwnProperty.call(this.sumNormal[0], 'ratio')) { this.pseudoLeft = Number(this.sumNormal[0].ratio.split("%")[0]) + 1 + "%"; } else { @@ -957,4 +954,4 @@ export default { } } } - \ No newline at end of file +