11/17/ 5:40

src/views/datav/SceneInsp.vue

@@ -51,16 +51,16 @@
               </el-row>
 
 
-                <el-scrollbar height="350px">
-                  <datav-chart-bar
-                      :data="data1"
-                      :color="colors"
-                      :size="small"
-                      title="整改率排名"
-                      sub-title="已整改/问题数"
-                      unit="%"
-                  />
-                </el-scrollbar>
+              <el-scrollbar height="350px">
+                <datav-chart-bar
+                    :data="data1"
+                    :color="colors"
+                    :size="small"
+                    title="整改率排名"
+                    sub-title="已整改/问题数"
+                    unit="%"
+                />
+              </el-scrollbar>
 
 
             </datav-card>
@@ -78,7 +78,7 @@
             <datav-date-picker v-model="time"/>
             <div class="flex gap-42">
               <datav-statistic
-                  :value="overview.supervisionNotifyTotal"
+                  :value="overview.supervisionNotifyPreTotal"
                   title="通报问题数"
                   style="width: 16.66%"
               />
@@ -146,6 +146,7 @@
                         size="large"
                         title="问题数排名"
                         sub-title="问题数"
+                        :color="colors"
                     />
                   </el-scrollbar>
                 </datav-tab-item>
@@ -209,16 +210,9 @@ import moment from "moment";
 import {getAllSupervisionNotifyCount, getChangedRank, getSupervisionTrend} from "@/api/data/supervisionNotify.ts";
 import {getGobalRecentlyTrendByMonth} from "@/api/data/basicScreen.ts";
 
-const data1= ref([]);
+const data1 = ref([]);
 const activeTabLeft = ref("3");
-const overview = ref({
-  supervisionNotifyTotal: 0,
-  supervisionNotifyOrgTotal: 0,
-  supervisionNotifyPreTotal: 0,
-  supervisionNotifyChangingTotal: 0,
-  supervisionNotifyChangedTotal: 0,
-  correctionRate: 0,
-});
+
 const rankOverview = ref({
   proTotal: 0,
   changing: 0,
@@ -227,7 +221,14 @@ const rankOverview = ref({
 });
 const wtlxList = ref([])
 const hddList = ref([])
-
+const overview = ref({
+  correctionRate: 0,
+  supervisionNotifyPreTotal: 0,
+  supervisionNotifyChangingTotal: 0,
+  supervisionNotifyChangedTotal: 0,
+  supervisionNotifyTotal: 0,
+  supervisionNotifyOrgTotal: 0,
+});
 echarts.registerMap("changsha", changshaMap);
 
 
@@ -437,7 +438,6 @@ const option = ref({
 // endregion
 
 
-
 // region  初始化数据
 
 const time = ref([
@@ -445,10 +445,17 @@ const time = ref([
   moment().format("YYYY-MM-DD"),
 ]);
 
-  // 地图临时测试数据
+// 地图临时测试数据
 function getData() {
   getAllSupervisionNotifyCount(time.value).then((res) => {
-    overview.value = res.overview;
+    Object.assign(overview.value, {
+      correctionRate: Number(res.overview.correctionRate),
+      supervisionNotifyPreTotal: Number(res.overview.supervisionNotifyPreTotal),
+      supervisionNotifyChangingTotal: Number(res.overview.supervisionNotifyChangingTotal),
+      supervisionNotifyChangedTotal: Number(res.overview.supervisionNotifyChangedTotal),
+      supervisionNotifyTotal: Number(res.overview.supervisionNotifyTotal),
+      supervisionNotifyOrgTotal: Number(res.overview.supervisionNotifyOrgTotal),
+    });
     wtlxList.value = res.wtlxList
     hddList.value = res.hddList;
     superviseTempMapVoList = res.superviseTempMapVoList;
@@ -504,7 +511,6 @@ const colors = [
 // endregion
 
 
-
 const data2 = [
   {
     name: "开福分局",