修改统计分析

oa-ui/src/api/oa/contract/subContract.js

@@ -42,3 +42,13 @@ export function delSubContract(subContractId) {
     method: 'delete'
   })
 }
+
+
+// 查询分包合同统计
+export function getSubContractStatistic(query) {
+  return request({
+    url: '/oa/subContract/statistic',
+    method: 'get',
+    params: query
+  })
+}

oa-ui/src/views/flowable/form/components/flowBtn/returnBtn.vue

@@ -2,18 +2,18 @@
  * @Author: ysh
  * @Date: 2024-09-27 15:19:36
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-27 15:59:43
+ * @LastEditTime: 2024-10-15 15:30:48
 -->
 <template>
   <div>
-    <el-form ref="taskForm" :model="taskForm" label-width="80px">
+    <el-form ref="taskForm" :model="taskForm" :rules="rules" label-width="80px">
       <el-form-item label="退回节点" prop="targetKey">
         <el-radio-group v-model="taskForm.targetKey">
           <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
           </el-radio-button>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
+      <el-form-item label="退回意见" prop="comment">
         <el-input  type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
       </el-form-item>
     </el-form>
@@ -36,7 +36,11 @@ export default {
   data() {
     return {
       form: {},
-      returnTaskList: []
+      returnTaskList: [],
+      rules:{
+        targetKey:[{ required: true, message: '请选择退回节点', trigger: 'change' }],
+        comment:[{ required: true, message: '请输入意见', trigger: 'blur' }],
+      }
     }
   },
   created() {

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

@@ -10,8 +10,9 @@
           <div class="pie2" id="cwSourcePie"></div>
         </div>
       </div>
-      <div class="middle">
-
+      <div class="middle" v-loading="subLoading">
+        <!-- <div class="middle-top" id="subAmountBar"></div> -->
+        <div class="middle-top" id="subYearLine"></div>
       </div>
       <div class="right">
 
@@ -22,7 +23,9 @@
 
 <script>
 import { ehcartsInit } from '@/utils/echarts'
-let amountChart, cwAmountChart, cwSourceChart
+import { getContractStatistic } from '@/api/oa/contract/contract';
+import { getSubContractStatistic } from '@/api/oa/contract/subContract';
+let amountChart, cwAmountChart, cwSourceChart, subAmountChart, subYearChart
 export default {
   props: {
     datas: {
@@ -38,35 +41,58 @@ export default {
       contractCwAmount: {},
       contractSource: {},
       contractYear: {},
+      subAmount: {},
+      subYearNum: {},
       subYear: 0,
-      sumAomunt: 0
+      sumAomunt: 0,
+      sumSubAomunt: 0,
+      activeYear: '',
+      subLoading: true,
+    }
+  },
+  watch: {
+    contractCwAmount() {
+      this.initChartCwAomunt(this.activeYear);
+    },
+    contractSource() {
+      this.initChartCwSource(this.activeYear);
     }
   },
   mounted() {
     this.initDatas();
-    this.initAmountBar();
+    // this.initAmountBar();
     this.initChartCwAomunt('');
     this.initChartCwSource('');
   },
   methods: {
     async initDatas() {
-      console.log(this.datas);
       if (Object.keys(this.datas).length !== 0) {
         this.contractAmount = this.datas.amount[0];
-        this.contractCwAmount = this.datas.cwAmount[0]
-        this.contractSource = this.datas.source[0]
-        this.contractYear = this.datas.year[0]
-        this.loading = false
-        let sum = Object.values(this.contractAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0)
+        this.contractCwAmount = this.datas.cwAmount[0];
+        this.contractSource = this.datas.source[0];
+        this.contractYear = this.datas.year[0];
+        this.loading = false;
+        let sum = Object.values(this.contractAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
         this.sumAomunt = (sum / 100000000).toFixed(4) + '亿元';
       }
+      this.subLoading = true;
+      let subDatas = await getSubContractStatistic();
+      this.subAmount = subDatas.data.amount[0];
+      this.subYearNum = subDatas.data.year[0];
+      let sum = Object.values(this.subAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
+      this.sumSubAomunt = (sum / 100000000).toFixed(4) + '亿元';
+      this.initAmountBar();
+      this.initChartSubYear();
+      this.subLoading = false;
     },
     initAmountBar() {
       let option = {
         title: {
           text: '各年合同额统计',
-          subtext: '共计合同额：' + Object.values(this.contractAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '元'
-            + '(约: ' + this.sumAomunt + ')'
+          subtext: '承接合同总额：' + Object.values(this.contractAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '元'
+            + '(约: ' + this.sumAomunt + ')\n' +
+            '分包合同总额：' + Object.values(this.subAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '元'
+            + '(约: ' + this.sumSubAomunt + ')'
         },
         grid: {
           left: '1%',
@@ -74,6 +100,9 @@ export default {
           bottom: '0%',
           height: '60%',
           containLabel: true
+        },
+        legend: {
+
         },
         graphic: [
           {
@@ -109,6 +138,7 @@ export default {
         },
         series: [
           {
+            name: '承接合同',
             data: Object.values(this.contractAmount),
             type: 'bar',
             smooth: true,
@@ -125,22 +155,50 @@ export default {
                   return (value / 10000000).toFixed(4) + '千万元';
                 }
               }
-            },
-            itemStyle: {
-              color: '#1C3F95'
             }
           },
           {
-            type: 'line',
-            data: Object.values(this.contractAmount),
+            name: '分包合同',
+            data: Object.values(this.subAmount),
+            type: 'bar',
             smooth: true,
+            label: {
+              show: true,
+              position: 'top',
+              formatter: function (params) {
+                var value = params.value;
+                if (value >= 10000) {
+                  // 亿  
+                  return (value / 10000).toFixed(4) + '万元';
+                }
+              }
+            },
             itemStyle: {
-              color: '#F89B30'
+
             }
           }
         ]
       };
       let charts = ehcartsInit(amountChart, 'amountBar', option);
+      this.clickYear(charts)
+    },
+    clickYear(charts) {
+      let that = this;
+      charts.on('click', function (event) {
+        if (event) {
+          that.activeYear = event.name;
+          let year = event.name + '-01-01'
+          if (event.name == "") {
+            year = ''
+          }
+          that.dataLoading = true
+          getContractStatistic({ signDate: year }).then(res => {
+            that.contractCwAmount = res.data.cwAmount[0];
+            that.contractSource = res.data.source[0];
+            that.dataLoading = false
+          })
+        }
+      })
     },
     initChartCwAomunt(year) {
       let option = {
@@ -234,6 +292,132 @@ export default {
       };
       ehcartsInit(cwSourceChart, 'cwSourcePie', option);
     },
+    initChartSubAmount() {
+      let option = {
+        title: {
+          text: '各年分包合同额统计',
+          subtext: '共计合同额：' + Object.values(this.subAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '元'
+            + '(约: ' + this.sumSubAomunt + ')'
+        },
+        grid: {
+          left: '1%',
+          right: '1%',
+          bottom: '0%',
+          height: '60%',
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'none',
+            label: {
+              backgroundColor: '#6a7985'
+            }
+          }
+        },
+        xAxis: {
+          name: '年',
+          type: 'category',
+          data: Object.keys(this.subAmount),
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位：元'
+        },
+        series: [
+          {
+            data: Object.values(this.subAmount),
+            type: 'bar',
+            smooth: true,
+            label: {
+              show: true,
+              position: 'top',
+              formatter: function (params) {
+                var value = params.value;
+                if (value >= 10000) {
+                  // 亿  
+                  return (value / 10000).toFixed(4) + '万元';
+                }
+              }
+            },
+            itemStyle: {
+
+            }
+          },
+          {
+            type: 'line',
+            data: Object.values(this.subAmount),
+            smooth: true,
+            itemStyle: {
+
+            }
+          }
+        ]
+      };
+      ehcartsInit(subAmountChart, 'subAmountBar', option);
+    },
+    initChartSubYear() {
+      let option = {
+        title: {
+          text: '各年合同数统计',
+          subtext: '承接合同总数：' + Object.values(this.contractYear).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '个' + '\n' +
+            '分包合同总数：' + Object.values(this.subYearNum).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '个'
+        },
+        legend: {
+          right: 0
+        },
+        grid: {
+          left: '1%',
+          right: '1%',
+          bottom: '0%',
+          height: '60%',
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            label: {
+              backgroundColor: '#6a7985'
+            }
+          }
+        },
+        xAxis: {
+          name: '年',
+          type: 'category',
+          data: Object.keys(this.subYearNum),
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位：元'
+        },
+        series: [
+          {
+            name: '承接合同',
+            data: Object.values(this.contractYear),
+            type: 'line',
+            areaStyle: {},
+            smooth: true,
+            label: {
+              show: true,
+              position: 'top',
+            },
+          },
+          {
+            name: '分包合同',
+            data: Object.values(this.subYearNum),
+            type: 'line',
+            areaStyle: {},
+            smooth: true,
+            label: {
+              show: true,
+              position: 'top',
+            },
+          }
+        ]
+      };
+      ehcartsInit(subYearChart, 'subYearLine', option);
+    },
   }
 }
 </script>
@@ -263,7 +447,6 @@ export default {
     .left-bottom {
       width: 100%;
       height: 300px;
-      padding: 10px;
       display: flex;
 
       .pie1 {
@@ -284,6 +467,12 @@ export default {
 
   .middle {
     flex: 1;
+
+    .middle-top {
+      height: 300px;
+      padding: 10px;
+      border: 1px solid #ececec;
+    }
   }
 
   .right {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-10-11 16:41:17
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-14 15:16:36
+ * @LastEditTime: 2024-10-15 17:15:47
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
@@ -45,6 +45,9 @@ export default {
       type: {},
       source: {},
       dept: {},
+      archive:{},
+      complete:{},
+      settle:{},
       loading: true,
       activeYear: '',
       dataLoading: false,
@@ -66,6 +69,8 @@ export default {
     datas: {
       handler(newVal) {
         if (newVal) {
+          console.log(newVal);
+          
           this.initDatas();
         }
       },
@@ -87,6 +92,9 @@ export default {
         this.type = this.datas.type[0];
         this.source = this.datas.source[0];
         this.dept = this.datas.dept[0];
+        this.archive = this.datas.archive[0];
+        this.complete = this.datas.complete[0];
+        this.settle = this.datas.settle[0];
         this.loading = false;
       }
 
@@ -104,6 +112,7 @@ export default {
           height: '60%',
           containLabel: true
         },
+        legend:{},
         graphic: [
           {
             type: 'text',
@@ -137,26 +146,63 @@ export default {
           name: '单位：个'
         },
         series: [
+          // {
+          //   data: Object.values(this.year),
+          //   type: 'bar',
+          //   smooth: true,
+          //   label: {
+          //     show: true,
+          //     position: 'top'
+          //   }
+          // },
           {
-            data: Object.values(this.year),
-            type: 'bar',
+            name:'已归档',
+            type: 'line',
+            data: Object.values(this.archive),
             smooth: true,
+            areaStyle: {},
             label: {
               show: true,
-              position: 'top'
+              position: 'top',
             },
-            itemStyle: {
-              color: '#1C3F95'
-            }
+            z:4
           },
           {
+            name:'已完成',
+            type: 'line',
+            data: Object.values(this.complete),
+            smooth: true,
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'top',
+            },
+            z:2
+          },
+          {
+            name:'已结算',
+            type: 'line',
+            data: Object.values(this.settle),
+            smooth: true,
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'top',
+            },
+            z:3
+          },
+          {
+            name:'总数',
             type: 'line',
             data: Object.values(this.year),
             smooth: true,
-            itemStyle: {
-              color: '#F89B30'
-            }
-          }
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'top',
+            },
+            z:1
+          },
         ]
       };
       let charts = ehcartsInit(barYearChart, 'yearNumber', option);
@@ -165,8 +211,6 @@ export default {
     clickYear(charts) {
       let that = this;
       charts.on('click', function (event) {
-        console.log(event);
-
         if (event) {
           that.activeYear = event.name;
           let projectNumber = event.name

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

@@ -18,7 +18,7 @@
       </div>
       <div class="two item-box" @click="$emit('handleClick', 'contract')">
         <div class="data-left">
-          <div class="data-title">{{ thisYear }}年合同总数</div>
+          <div class="data-title">{{ thisYear }}年承接合同总数</div>
           <div class="number">{{ contractNum.toLocaleString('en-US') }}</div>
           <div>
             <span class="text-1">较去年</span>
@@ -317,7 +317,7 @@ export default {
   }
 
   .chart-box {
-    flex: 2;
+    flex: 1;
 
     div {
       width: 100%;