调整地图

src/store/client12345/index.js

@@ -1,13 +1,7 @@
 const client12345 = {
   state: {
     curArea: {
-      area: {
-        acceptCount: 0,
-        districtName: "南江县",
-        id: 1,
-        processCount: 0,
-        statDate: "2024",
-      }
+      area: 0
     },
     areaDataList: [
       {
@@ -49,21 +43,10 @@ const client12345 = {
   },
   mutations: {
     SET_AREA_DATA: (state, data) => {
-      const index = state.areaDataList.findIndex(
-        (item) => item.districtName === data.districtName
-      );
-      console.log(data,'setAreaData')
-      if (index !== -1) {
-        state.areaDataList.splice(index, 1, data);
-      } else {
-        state.areaDataList.push(data);
-      }
+      state.areaDataList = data;
     },
     SET_CUR_AREA: (state, data) => {
-      const areaData = state.areaDataList.find(item => item.districtName === data)
-      state.curArea.area = areaData;
-      console.log(state.areaDataList, "areaDataList")
-      console.log(state.curArea, "cuArea")
+      state.curArea.area = data;
     },
   },
   actions: {

src/view/client/12345/AcceptTickets/api.js

@@ -4,4 +4,8 @@ export class getAcceptTickets{
   static getList(){
     return server.connection('POST','/api/12345/getWorkOrderList')
   }
+
+  // static getList(data){
+  //   return server.connection('POST','/api/12345/getWorkOrder',data)
+  // }
 }

src/view/client/12345/CenterMap/index.vue

@@ -16,16 +16,13 @@ export default {
       yData: [],
       mapList: ["南江县", "通江县", "平昌县", "巴州区", "恩阳区"],
       curIndex: 0,
-      curArea: {},
       intervalId: null,
       time: 3000,
+      areaDataList: [],
     };
   },
   mounted() {
-    const { curArea } = store.getters;
-    this.curArea = curArea;
     this.getChartData();
-    this.initChart();
   },
   unmounted() {
     clearInterval(this.intervalId);
@@ -34,20 +31,25 @@ export default {
     getChartData() {
       const now = new Date();
       this.year = now.getFullYear();
-      this.mapList.forEach((item) => {
-        getAreaData
-          .getList({
-            districtName: item,
-            year: this.year,
-          })
-          .then((res) => {
-            const { code, result } = res.data;
-            if (code === 200) {
-              console.log(result, "data");
-              store.dispatch("SetAreaDataList", result);
-            }
-          });
-      });
+      getAreaData
+        .getList({
+          year: this.year,
+        })
+        .then((res) => {
+          const { code, result } = res.data;
+          if (code === 200) {
+            this.areaDataList = result.map((item) => {
+              return {
+                name: item.districtName,
+                value: this.mapList.indexOf(item.districtName),
+                acceptCount: item.acceptCount,
+                processCount: item.processCount,
+              };
+            });
+            this.areaDataList.push({ name: "市本级", value: 5 });
+            this.initChart();
+          }
+        });
     },
     initChart() {
       this.myChart = this.$echarts.init(document.getElementById("map"));
@@ -58,8 +60,8 @@ export default {
           trigger: "item",
           formatter(param) {
             console.log("param.data.name", param);
-            // return `${param.data.name}<br>受理量：${param.data.name}<br>交办量：${param.data.name}`;
-            return `${param.data.name}`;
+            return `${param.data.name}<br>受理量：${param.data.acceptCount}<br>交办量：${param.data.processCount}`;
+            // return `${param.data.name}`;
           },
         },
         series: [
@@ -98,14 +100,7 @@ export default {
                 },
               },
             },
-            data: [
-              { name: "南江县", value: 0 },
-              { name: "通江县", value: 1 },
-              { name: "平昌县", value: 2 },
-              { name: "巴州区", value: 3 },
-              { name: "恩阳区", value: 4 },
-              { name: "市本级", value: 5 },
-            ],
+            data: this.areaDataList,
             label: {
               // 高亮效果(hover)
               emphasis: {
@@ -196,7 +191,7 @@ export default {
         this.curIndex++;
         this.curIndex = this.curIndex % this.mapList.length;
 
-        store.dispatch("SetCurArea", this.mapList[this.curIndex]);
+        store.dispatch("SetCurArea", this.curIndex);
 
         if (this.curIndex == 0) {
           this.cancelHighlightRegion(this.mapList.lengt - 1);
@@ -205,13 +200,8 @@ export default {
         }
 
         this.highlightRegion(this.curIndex);
-
-        this.refreshData();
       }, this.time);
     },
-    refreshData() {
-      store.dispatch("SetNewData");
-    },
   },
 };
 </script>

src/view/client/12345/CenterTop/index.vue

@@ -2,7 +2,7 @@
   <div class="box">
     <div class="box-item">
       <div class="item-top">
-        {{ curArea.area.acceptCount }}
+        {{ areaDataList[curArea.area].acceptCount }}
         <span style="font-size: 0.75rem; font-family: 'Microsoft YaHei'"
           >个</span
         >
@@ -12,7 +12,7 @@
     </div>
     <div class="box-item">
       <div class="item-top">
-        {{ curArea.area.processCount }}
+        {{ areaDataList[curArea.area].processCount }}
         <span style="font-size: 0.75rem; font-family: 'Microsoft YaHei'"
           >个</span
         >
@@ -30,15 +30,39 @@ export default {
   data() {
     return {
       tableData: [],
-      curArea: "",
-      areaDataList: [],
+      curArea: 0,
+      areaDataList: [
+        {
+          acceptCount: 0,
+          districtName: "南江县",
+          id: 1,
+          processCount: 0,
+          statDate: "2024",
+        },
+      ],
     };
   },
   mounted() {
     const { curArea } = store.getters;
     this.curArea = curArea;
+    this.getChartData();
+  },
+  methods: {
+    getChartData() {
+      const now = new Date();
+      this.year = now.getFullYear();
+      getAreaData
+        .getList({
+          year: this.year,
+        })
+        .then((res) => {
+          const { code, result } = res.data;
+          if (code === 200) {
+            this.areaDataList = result;
+          }
+        });
+    },
   },
-  methods: {},
 };
 </script>
 

src/view/client/12345/CountySituation/index.vue

@@ -27,10 +27,15 @@
       <div id="countySituation"></div>
       <div class="bottom-right">
         <div class="right-item" v-for="(item, index) in yData" :key="item">
-          <span style="color: #008FCB;">{{ xData.x1[index] }}</span>
-          <span style="color: #6D5DEC;">{{ xData.x2[index] }}</span>
-          <span style="color: #0060E3;">{{ xData.x3[index] }}</span>
+          <span style="color: #008fcb">{{ x1Reverse[index] }}</span>
+          <span style="color: #6d5dec">{{ x2Reverse[index] }}</span>
+          <span style="color: #0060e3">{{ x3Reverse[index] }}</span>
         </div>
+        <!-- <div class="right-item" v-for="item in yData" :key="item">
+          <span style="color: #008fcb">{{ xData.x1[getIndex(item)] }}</span>
+          <span style="color: #6d5dec">{{ xData.x2[getIndex(item)] }}</span>
+          <span style="color: #0060e3">{{ xData.x3[getIndex(item)] }}</span>
+        </div> -->
       </div>
     </div>
   </div>
@@ -52,6 +57,17 @@ export default {
       },
     };
   },
+  computed: {
+    x1Reverse() {
+      return this.xData.x1.reverse();
+    },
+    x2Reverse() {
+      return this.xData.x2.reverse();
+    },
+    x3Reverse() {
+      return this.xData.x3.reverse();
+    },
+  },
   mounted() {
     this.getChartData();
     // this.initChart();
@@ -179,6 +195,9 @@ export default {
       };
       this.myChart.setOption(option);
     },
+    getIndex(item) {
+      return this.yData.reverse().indexOf(item);
+    },
   },
 };
 </script>

src/view/client/12345/TodayAcceptance/index.vue

@@ -96,7 +96,7 @@ export default {
     };
   },
   mounted() {
-    // this.getData();
+    this.getData();
   },
   methods: {
     getData() {