From ab01f1d0bc462bcc0fe22905b2a3163656ae260b Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Mon, 30 Sep 2024 13:46:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix():=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/rcgl/btbb/rjswnbb/index.js | 2 +- src/views/rcgl/btbb/rjynbb/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/rcgl/btbb/rjswnbb/index.js b/src/views/rcgl/btbb/rjswnbb/index.js index 50881c4be..cd442d71a 100644 --- a/src/views/rcgl/btbb/rjswnbb/index.js +++ b/src/views/rcgl/btbb/rjswnbb/index.js @@ -95,7 +95,7 @@ const Page = () => { ( <> -

小玉潭水库{searchVal?.year}年日平均水位年报表

+

檀树岗水库{searchVal?.year}年日平均水位年报表

单位：m
)} diff --git a/src/views/rcgl/btbb/rjynbb/index.js b/src/views/rcgl/btbb/rjynbb/index.js index 8e386c1e6..f3efd678d 100644 --- a/src/views/rcgl/btbb/rjynbb/index.js +++ b/src/views/rcgl/btbb/rjynbb/index.js @@ -94,7 +94,7 @@ const Page = () => {
( <> -

小玉潭水库{searchVal?.year}年日降雨年报表

+

檀树岗水库{searchVal?.year}年日降雨年报表

单位：mm
)} From 21994d4217f085247be8721ad1126ea3410007cd Mon Sep 17 00:00:00 2001 From: xielei Date: Mon, 30 Sep 2024 14:27:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sz/szzf/ajtj/barCharts.js | 10 ++-- src/views/sz/szzf/ajtj/bincharts.js | 9 ++-- src/views/sz/szzf/ajtj/ldCharts.js | 73 +++++++++++++++++++---------- 3 files changed, 57 insertions(+), 35 deletions(-) diff --git a/src/views/sz/szzf/ajtj/barCharts.js b/src/views/sz/szzf/ajtj/barCharts.js index 43905c6be..d61cf9158 100644 --- a/src/views/sz/szzf/ajtj/barCharts.js +++ b/src/views/sz/szzf/ajtj/barCharts.js @@ -43,12 +43,10 @@ const Page = ({ title = '标题' }) => { // hoverAnimation: true, data: plandata, label: { - normal: { - show: true, - position: 'outside', - formatter: '{c}', - - } + show:false, + }, + labelLine: { + show: false }, itemStyle:{ color: function (colors) { diff --git a/src/views/sz/szzf/ajtj/bincharts.js b/src/views/sz/szzf/ajtj/bincharts.js index 0f8aa640f..96a30dc59 100644 --- a/src/views/sz/szzf/ajtj/bincharts.js +++ b/src/views/sz/szzf/ajtj/bincharts.js @@ -56,12 +56,11 @@ const Page = ({ title = '标题' }) => { // hoverAnimation: true, data: plandata, label: { - normal: { - show: true, - position: 'outside', - formatter: '{c}', + show:false, + }, + labelLine: { + show: false }, - }, itemStyle:{ color: function (colors) { var colorList = [ diff --git a/src/views/sz/szzf/ajtj/ldCharts.js b/src/views/sz/szzf/ajtj/ldCharts.js index ff1f01c2d..313022288 100644 --- a/src/views/sz/szzf/ajtj/ldCharts.js +++ b/src/views/sz/szzf/ajtj/ldCharts.js @@ -18,38 +18,57 @@ let obj = const Page = ({ title = '标题' }) => { const [echart2, setEchart2] = useState(Object()) const [inspectordata, setInspectorData] = useState([{}]) - const [plandata, setPlanData] = useState(Object()) + const [plandata, setPlanData] = useState([]) const [problemdata, setProblemData] = useState(Object()) const [sumTotal, setSum] = useState(0) const getPlanOption = useMemo((name, data) => { return { legend: { - data: Object.values(obj), + show: true, + data: plandata?.map(item=>item.name), type: 'scroll' }, tooltip: {}, polar: { - radius: [0, '80%'] - }, - radiusAxis: { - min: 0, - max: Math.max.apply(null, Object.values(plandata)), - axisLine:{ - show:false - }, - + // radius: [0, '80%'] }, angleAxis: { type: 'category', - data: Object.values(obj), - // startAngle: 75, + data: plandata?.map(item=>item.name), + }, + radiusAxis: { + min: 0, + max: 20, + interval: 2, + // 刻度 + axisTick:{ + show:false + }, + //刻度数值 + axisLabel:{ + show:false + }, + // 线 + axisLine:{ + show:false + }, }, series: [ { name: '案件类型', - type: 'bar', - coordinateSystem: 'polar', + stack: 'a', + type: 'pie', + radius: [0, 140], + center: ['50%', '50%'], + roseType: 'area', + stillShowZeroSum:false, + label: { + show:false, + }, + labelLine: { + show: false + }, itemStyle: { normal: { color: function (colors) { @@ -64,13 +83,11 @@ const Page = ({ title = '标题' }) => { } }, }, - data: Object.values(plandata) + data: plandata } ] } }, [plandata]) - console.log(getPlanOption); - const onOk = (event, index) => { if (event !== null) { let params = { @@ -82,15 +99,23 @@ const Page = ({ title = '标题' }) => { } } const getInfo = (params) => { - let obj1 = [] let sum = 0 httppost(apiurl.szzf.ajtj.info + 1, params).then(res => { - res.data.map(item => { - obj1.push({ value: item.count, name: obj[item.type] }) - sum = sum + item.count + const arr = Object.values(obj).map(item1=>{ + let obj1=res.data.find(item => obj[item.type] == item1) + if(obj1?.count){ + sum =sum+1 + return { value: obj1?.count, name: item1 } + }else{ + return { value: 0, name: item1 } + } }) - // debugger; - setPlanData(obj1) + if(sum == 0){ + setPlanData([]) + }else{ + setPlanData(arr) + } + setSum(sum) }) From ec5bf12469c18db3560187ae7fdbb94c18f40cd4 Mon Sep 17 00:00:00 2001 From: xielei Date: Mon, 30 Sep 2024 14:44:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sz/szzf/ajtj/ldCharts.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/sz/szzf/ajtj/ldCharts.js b/src/views/sz/szzf/ajtj/ldCharts.js index 313022288..8d459b63e 100644 --- a/src/views/sz/szzf/ajtj/ldCharts.js +++ b/src/views/sz/szzf/ajtj/ldCharts.js @@ -36,6 +36,7 @@ const Page = ({ title = '标题' }) => { angleAxis: { type: 'category', data: plandata?.map(item=>item.name), + }, radiusAxis: { min: 0, @@ -67,7 +68,7 @@ const Page = ({ title = '标题' }) => { show:false, }, labelLine: { - show: false + show: true }, itemStyle: { normal: {