Merge branch 'dev_v1.0.1' into release_v1.0.1

src/views/report/dispatch-analysis/index.vue

@@ -85,7 +85,7 @@
                   color="#595959"
               /></div>
               <div class="chart-wrap">
-                <my-chart :options="options3" ref="chart3"></my-chart>
+                <my-chart :options="options3" @chartClick="chart3Click" ref="chart3"></my-chart>
               </div>
             </div>
           </div>
@@ -270,11 +270,11 @@ const chinaDataHandle = (result5, result8) => {
   if (!result5 || !result8) {
     return null;
   } else {
-    let arr5 = result5?.day.map((item) => {
+    let arr5 = result5?.map((item) => {
       item.value = Number(item.count);
       return item;
     });
-    let arr8 = result8?.day.map((item) => {
+    let arr8 = result8?.map((item) => {
       item.value = Number(item.count);
       return item;
     });
@@ -326,13 +326,14 @@ const tableDataHandle = (data) => {
   if (!data) {
     return [];
   } else {
-    let totalCount = data.day.reduce((num, item) => {
-      return num + item.count;
-    }, 0);
-    return data.day.map((item) => {
-      item.rate = ((item.count * 100) / totalCount).toFixed(2) + '%';
-      return item;
-    });
+    // let totalCount = data.day.reduce((num, item) => {
+    //   return num + item.count;
+    // }, 0);
+    // return data.day.map((item) => {
+    //   item.rate = ((item.count * 100) / totalCount).toFixed(2) + '%';
+    //   return item;
+    // });
+    return data;
   }
 };
 onMounted(() => {
@@ -389,22 +390,28 @@ const chart2Click = (params) => {
   monthDispatchDrillData.value.month = params.name.split('-')[1];
   showMonthDispatchDrill.value = true;
 };
+const chart3Click = (params) => {
+  monthDispatchDrillData.value.type = 'OFFICE';
+  monthDispatchDrillData.value.year = params.name.split('-')[0];
+  monthDispatchDrillData.value.month = params.name.split('-')[1];
+  showMonthDispatchDrill.value = true;
+};
 const chart4Click = (params) => {
-  regionDispatchDrillData.value.name = params.name;
-  regionDispatchDrillData.value.supplierId = params.data.id;
+  supplierDispatchDrillData.value.name = params.name;
+  supplierDispatchDrillData.value.supplierId = params.data.id;
   showSupplierDispatchDrill.value = true;
 };
 
 const tableRowClick5 = (item) => {
   regionDispatchDrillData.value.type = 'CLOUD_MARK';
-  regionDispatchDrillData.value.regionId = item.id;
+  // regionDispatchDrillData.value.regionId = item.id;
   regionDispatchDrillData.value.name = item.name;
   showRegionDispatchDrill.value = true;
 };
 
 const tableRowClick6 = (item) => {
   regionDispatchDrillData.value.type = 'OFFICE';
-  regionDispatchDrillData.value.regionId = item.id;
+  // regionDispatchDrillData.value.regionId = item.id;
   regionDispatchDrillData.value.name = item.name;
   showRegionDispatchDrill.value = true;
 };

src/views/report/dispatch-analysis/region-dispatch-drill-dialog.vue

@@ -84,7 +84,7 @@ watch(
 const transParams = computed(() => {
   return {
     type: props.data?.type,
-    regionId: props.data?.regionId,
+    province: props.data?.name,
     startTime: props.timeParams.startTime,
     endTime: props.timeParams.endTime,
   };

src/views/report/dispatch-analysis/supplier-dispatch-drill-dialog.vue

@@ -62,6 +62,8 @@ const tableColumns = [
   { colKey: 'custom', title: '客户名称' },
   { colKey: 'name', title: '项目名称' },
   { colKey: 'product', title: '实施产品' },
+  { colKey: 'regionCoordinator', title: '区域协调人' },
+  { colKey: 'supplier', title: '供应商' },
 ];
 const props = defineProps({
   visible: Boolean,