cfofpp 5 bulan lalu
induk
melakukan
a04c0f63a9

+ 2 - 0
src/views/home/components/TargetSituation/index.vue

@@ -279,6 +279,7 @@ export default {
             type: "bar",
             data: targetData,
             barMinHeight: 10,
+            barMaxWidth: 15,
             label: {
               show: true,
               position: "right",
@@ -291,6 +292,7 @@ export default {
             type: "bar",
             data: actualData,
             barMinHeight: 10,
+            barMaxWidth: 15,
             label: {
               show: true,
               position: "right",

+ 7 - 16
src/views/home/components/map/index.vue

@@ -58,9 +58,7 @@ export default {
         moment().endOf("day").format("YYYYMMDD"),
       ],
       loading: true,
-      itemData: [{ lable: "作业数量" }],
       currentMap: "衡阳市",
-      mapData: [],
       dataMap: {},
     };
   },
@@ -76,16 +74,11 @@ export default {
         startDate: this.dateRange[0],
         endDate: this.dateRange[1],
       };
-      this.mapData = [];
       const data = await getWorkNumStatistics(params);
       Object.keys(mapEnum).forEach((key) => {
         (data || []).map((ite) => {
           if (key.includes(ite.submitOrgNm)) {
             this.dataMap[key] = ite.workNum ?? 0;
-            this.mapData.push({
-              name: key,
-              value: ite.workNum ?? 0,
-            });
           }
         });
       });
@@ -103,10 +96,9 @@ export default {
         geoCoordMap[v.properties.name] = v.properties.center;
         data.push({
           name: v.properties.name,
-          value: this.dataMap[v.properties.name],
+          value: this.dataMap[v.properties.name] ?? 0,
         });
       });
-
       var convertData = function (data) {
         var res = [];
         for (var i = 0; i < data.length; i++) {
@@ -226,14 +218,13 @@ export default {
             type: "effectScatter",
             coordinateSystem: "geo",
             data: convertData(
-              data
-                .sort(function (a, b) {
-                  return b.value - a.value;
-                })
-                .slice(0, 10)
+              data.sort(function (a, b) {
+                return b.value - a.value;
+              })
+              // .slice(0, 10)
             ),
             symbolSize: function (val) {
-              return 10;
+              return 6;
             },
             showEffectOn: "render",
             rippleEffect: {
@@ -254,7 +245,7 @@ export default {
                   const [x, y, v] = params.value;
                   return v ? "#44936c" : "gray";
                 }, //标志颜色,
-                shadowBlur: 5,
+                shadowBlur: 2,
               },
             },
             zlevel: 1,