diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue index 2593ba1..5c3e3f4 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue @@ -3,7 +3,7 @@ - + diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue index d0cb9e8..b7d0ebb 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue @@ -12,7 +12,7 @@ :contentStyle="{ minWidth: '350px' }" > - + {{ this.dikeName }} diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/statisticsOne.vue b/src/views/dike/safetyManage/safetyAppraisal/components/statisticsOne.vue index 93c9e8b..4acfc63 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/statisticsOne.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/statisticsOne.vue @@ -53,7 +53,11 @@ align="center" prop="rate" min-width="120" - /> + > + + @@ -87,7 +91,7 @@ export default { // console.log(11, response); this.statisticsList = response.data; this.barChartData.name = response.data?.map((res) => res.adcdName); - this.barChartData.value = response.data?.map((res) => res.rate); + this.barChartData.value = response.data?.map((res) => res.rate*100); this.loading = false; this.barInit(); }); @@ -148,7 +152,7 @@ export default { }, minInterval: 1, //设置成1保证坐标轴分割刻度显示成整数。 max: function (value) { - return value.max + Math.ceil(0.2 * value.max); + return 100; }, // boundaryGap: [0, 1], }, diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue b/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue index b239136..87a9f37 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue @@ -27,19 +27,19 @@ min-width="120" /> + + @@ -60,6 +67,7 @@ export default { value1: [], value2: [], value3: [], + value4:[] }, }; }, @@ -81,6 +89,7 @@ export default { this.barChartData.value1 = response.data?.map((res) => res.one); this.barChartData.value2 = response.data?.map((res) => res.two); this.barChartData.value3 = response.data?.map((res) => res.three); + this.barChartData.value4 = response.data?.map((res) => res.four); this.loading = false; this.barInit(); }); @@ -92,7 +101,7 @@ export default { title: { // text: "World Population", }, - color: ["#38A0FF", "#4CCA73", "#FBD437"], + color: ["#0f89ec", "#4CCA73", "#FBD437","#4E6B83FF"], tooltip: { trigger: "axis", axisPointer: { @@ -150,23 +159,29 @@ export default { series: [ { - name: "一级水闸", + name: "一类水闸", type: "bar", data: this.barChartData.value1, barMaxWidth: "10%", }, { - name: "二级水闸", + name: "二类水闸", type: "bar", data: this.barChartData.value2, barMaxWidth: "10%", }, { - name: "三级水闸", + name: "三类水闸", type: "bar", data: this.barChartData.value3, barMaxWidth: "10%", }, + { + name: "四类水闸", + type: "bar", + data: this.barChartData.value4, + barMaxWidth: "10%", + }, ], };