修改统计分析

oa-ui/src/api/oa/car/car.js

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-02-27 13:47:55
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-27 13:48:00
+ * @LastEditTime: 2024-10-16 11:30:58
  */
 import request from '@/utils/request'
 
@@ -48,3 +48,11 @@ export function delCar(carId) {
     method: 'delete'
   })
 }
+
+// 查询cmc车辆信息列表
+export function getCarStatistic() {
+  return request({
+    url: '/oa/car/statistic',
+    method: 'get',
+  })
+}

oa-ui/src/api/oa/device/device.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wrh
  * @Date: 2024-03-05 17:18:12
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-16 17:50:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-16 11:31:43
  */
 import request from '@/utils/request'
 
@@ -65,3 +65,11 @@ export function delDevice(deviceId) {
     method: 'delete'
   })
 }
+
+// 设备统计
+export function getDeviceStatistic() {
+  return request({
+    url: '/oa/device/statistic',
+    method: 'get',
+  })
+}

oa-ui/src/components/preview/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-06-04 18:18:09
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-22 12:34:21
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-16 10:38:51
 -->
 <template>
   <div v-loading="loading">

oa-ui/src/views/flowable/form/projectProcess/inProgress.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:54
- * @LastEditors: wrh
- * @LastEditTime: 2024-10-09 09:57:41
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-10-16 14:37:52
 -->
 <template>
   <div>
@@ -34,8 +34,9 @@
         <el-form-item label="使用车辆：">
           <el-tooltip class="item" effect="dark" content="直接获取用车申请中的车辆,若无车辆,则需要先提交项目的用车申请" placement="top-end">
             <el-select v-model="form.cars" multiple disabled style="width:90%">
-              <el-option v-for="item in carList" :label="item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '')" :value="item.carId"
-                :key="item.carId">
+              <el-option v-for="item in carList"
+                :label="item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '')"
+                :value="item.carId" :key="item.carId">
               </el-option>
             </el-select>
           </el-tooltip>
@@ -44,7 +45,7 @@
           <el-tooltip class="item" effect="dark" content="直接获取设备申请中的设备,若无设备,则需要先提交项目的设备申请" placement="top-end">
             <el-select v-model="form.devices" multiple disabled style="width:90%">
               <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
-        + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+                + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
               </el-option>
             </el-select>
           </el-tooltip>
@@ -337,19 +338,27 @@ export default {
     },
     // 暂存数据
     preserve() {
-      if (this.oldProgressList.length != 0) {
-        delProjectProgress([this.taskForm.formId]).then(res => {
-          for (let progress of this.progressList) {
-            progress.projectId = this.taskForm.formId;
-            addProjectProgress(progress);
-          }
-        });
-      } else {
+      // if (this.oldProgressList.length != 0) {
+      //   delProjectProgress([this.taskForm.formId]).then(res => {
+      //     for (let progress of this.progressList) {
+      //       progress.projectId = this.taskForm.formId;
+      //       addProjectProgress(progress);
+      //     }
+      //   });
+      // } else {
+      //   delProjectProgress([this.taskForm.formId]).then(res => {
+      //     for (let progress of this.progressList) {
+      //       progress.projectId = this.taskForm.formId;
+      //       addProjectProgress(progress);
+      //     }
+      //   })
+      // }
+      delProjectProgress([this.taskForm.formId]).then(res => {
         for (let progress of this.progressList) {
           progress.projectId = this.taskForm.formId;
           addProjectProgress(progress);
         }
-      }
+      })
       this.updateActualWorkList();
       this.form.projectId = this.taskForm.formId;
       this.form.cars = this.form.cars.length != 0 ? this.form.cars.join(',') : null;

oa-ui/src/views/statistics/components/contractStatistics.vue

@@ -13,6 +13,10 @@
       <div class="middle" v-loading="subLoading">
         <!-- <div class="middle-top" id="subAmountBar"></div> -->
         <div class="middle-top" id="subYearLine"></div>
+        <div class="middle-bottom">
+          <div class="bottom-left" id="subCwAmountPie"></div>
+          <div class="bottom-right" id="subSourcePie"></div>
+        </div>
       </div>
       <div class="right">
 
@@ -25,7 +29,7 @@
 import { ehcartsInit } from '@/utils/echarts'
 import { getContractStatistic } from '@/api/oa/contract/contract';
 import { getSubContractStatistic } from '@/api/oa/contract/subContract';
-let amountChart, cwAmountChart, cwSourceChart, subAmountChart, subYearChart
+let amountChart, cwAmountChart, cwSourceChart, subAmountChart, subYearChart, subCwAmountChart, subSourceChart
 export default {
   props: {
     datas: {
@@ -43,6 +47,8 @@ export default {
       contractYear: {},
       subAmount: {},
       subYearNum: {},
+      subCwAmount: {},
+      subSource: {},
       subYear: 0,
       sumAomunt: 0,
       sumSubAomunt: 0,
@@ -56,6 +62,12 @@ export default {
     },
     contractSource() {
       this.initChartCwSource(this.activeYear);
+    },
+    subCwAmount() {
+      this.initChartSubCwAomunt(this.activeYear);
+    },
+    subSource() {
+      this.initChartSubCwSource(this.activeYear);
     }
   },
   mounted() {
@@ -77,12 +89,17 @@ export default {
       }
       this.subLoading = true;
       let subDatas = await getSubContractStatistic();
+      console.log(subDatas.data);
       this.subAmount = subDatas.data.amount[0];
       this.subYearNum = subDatas.data.year[0];
+      this.subCwAmount = subDatas.data.cwAmount[0];
+      this.subSource = subDatas.data.source[0];
       let sum = Object.values(this.subAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
       this.sumSubAomunt = (sum / 100000000).toFixed(4) + '亿元';
       this.initAmountBar();
       this.initChartSubYear();
+      this.initChartSubCwAomunt('');
+      this.initChartSubCwSource('');
       this.subLoading = false;
     },
     initAmountBar() {
@@ -101,9 +118,7 @@ export default {
           height: '60%',
           containLabel: true
         },
-        legend: {
-
-        },
+        legend: {},
         graphic: [
           {
             type: 'text',
@@ -169,7 +184,7 @@ export default {
                 var value = params.value;
                 if (value >= 10000) {
                   // 亿  
-                  return (value / 10000).toFixed(4) + '万元';
+                  return (value / 10000000).toFixed(4) + '千万元';
                 }
               }
             },
@@ -197,13 +212,17 @@ export default {
             that.contractSource = res.data.source[0];
             that.dataLoading = false
           })
+          getSubContractStatistic({ signDate: year }).then(res => {
+            that.subCwAmount = res.data.cwAmount[0];
+            that.subSource = res.data.source[0];
+          })
         }
       })
     },
     initChartCwAomunt(year) {
       let option = {
         title: {
-          text: year + '合同额分布情况',
+          text: year + '承接合同额分布情况',
         },
         tooltip: {
           trigger: 'item',
@@ -249,7 +268,7 @@ export default {
     initChartCwSource(year) {
       let option = {
         title: {
-          text: year + '合同来源分布',
+          text: year + '承接合同来源分布',
         },
         tooltip: {
           trigger: 'item',
@@ -418,6 +437,98 @@ export default {
       };
       ehcartsInit(subYearChart, 'subYearLine', option);
     },
+    initChartSubCwAomunt(year) {
+      let option = {
+        title: {
+          text: year + '分包合同额分布情况',
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          top: 'bottom'
+        },
+        series: [
+          {
+            name: '占比',
+            type: 'pie',
+            radius: '40%',
+            avoidLabelOverlap: false,
+            data: Object.entries(this.subCwAmount).map(([key, value]) => {
+              return { name: key, value: value }
+            }),
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            },
+            label: {
+              alignTo: 'none',
+              formatter: '{name|{b}}\n{value|{c}元}',
+              minMargin: 5,
+              edgeDistance: 8,
+              lineHeight: 15,
+              rich: {
+                time: {
+                  fontSize: 10,
+                  color: '#999'
+                }
+              }
+            },
+          }
+        ]
+      };
+      ehcartsInit(subCwAmountChart, 'subCwAmountPie', option);
+    },
+    initChartSubCwSource(year) {
+      let option = {
+        title: {
+          text: year + '分包合同来源分布',
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          top: 'bottom'
+        },
+        series: [
+          {
+            name: '占比',
+            type: 'pie',
+            radius: '40%',
+            avoidLabelOverlap: false,
+            data: Object.entries(this.subSource).map(([key, value]) => {
+              return { name: key, value: value }
+            }),
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            },
+            label: {
+              alignTo: 'none',
+              formatter: '{name|{b}}\n{value|{c}个}',
+              minMargin: 5,
+              edgeDistance: 8,
+              lineHeight: 15,
+              rich: {
+                time: {
+                  fontSize: 10,
+                  color: '#999'
+                }
+              }
+            },
+          }
+        ]
+      };
+      ehcartsInit(subSourceChart, 'subSourcePie', option);
+    },
   }
 }
 </script>
@@ -466,13 +577,31 @@ export default {
   }
 
   .middle {
-    flex: 1;
+    flex: 1.5;
 
     .middle-top {
       height: 300px;
       padding: 10px;
       border: 1px solid #ececec;
     }
+
+    .middle-bottom {
+      display: flex;
+
+      .bottom-left {
+        flex: 1.5;
+        height: 300px;
+        padding: 10px;
+        border: 1px solid #ececec;
+      }
+
+      .bottom-right {
+        flex: 1;
+        height: 300px;
+        padding: 10px;
+        border: 1px solid #ececec;
+      }
+    }
   }
 
   .right {

oa-ui/src/views/statistics/components/projectStatistics.vue

@@ -69,8 +69,6 @@ export default {
     datas: {
       handler(newVal) {
         if (newVal) {
-          console.log(newVal);
-          
           this.initDatas();
         }
       },

oa-ui/src/views/statistics/components/topHead.vue

@@ -231,8 +231,6 @@ export default {
           }
         ]
       };
-      console.log(1);
-
       ehcartsInit(contractYearChart, 'thisContract', option);
     },
     getProjectYearSub(year) {

oa-ui/src/views/statistics/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-10-11 09:23:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-14 10:48:03
+ * @LastEditTime: 2024-10-16 15:30:12
 -->
 <template>
   <div class="app-container bg">
@@ -19,6 +19,8 @@
 <script>
 import { getProjectStatistic } from '@/api/oa/project/project'
 import { getContractStatistic } from '@/api/oa/contract/contract';
+import { getCarStatistic } from '@/api/oa/car/car';
+import { getDeviceStatistic } from '@/api/oa/device/device';
 import ProjectStatistics from './components/projectStatistics.vue';
 import contractStatistics from './components/contractStatistics.vue';
 import topHead from './components/topHead.vue';
@@ -29,11 +31,15 @@ export default {
       isActive: 'project',
       contractInfo: {},
       projectInfo: {},
+      carInfo: {},
+      deviceInfo: {},
     }
   },
   created() {
     this.getProjectInfo();
     this.getContractInfo();
+    this.getCarInfo();
+    this.getDeviceInfo();
   },
   mounted() {
 
@@ -43,7 +49,6 @@ export default {
       let res1 = await getProjectStatistic();
       if (res1.data) {
         this.projectInfo = res1.data
-
       }
     },
     async getContractInfo() {
@@ -52,6 +57,16 @@ export default {
         this.contractInfo = res2.data;
       }
     },
+    async getCarInfo() {
+      let res = await getCarStatistic();
+      this.carInfo = res.data;
+      
+    },
+    async getDeviceInfo() {
+      let res = await getDeviceStatistic();
+      this.deviceInfo = res.data;
+      
+    },
     changeClick(val) {
       this.isActive = val
     }