合并分支 'hotfix' 到 'develop'

Hotfix

查看合并请求 !3

src/views/dashboard/ColumnarChart.vue

@@ -8,9 +8,15 @@
         <el-radio-button label="报废数"></el-radio-button>
       </el-radio-group>
     </div>
-    <v-chart :forceFit="true" :height="300" :data="chartData" style="margin-left: -20px">
+    <!-- <v-chart :forceFit="true" :height="height" :data="chartData" :scale="scale">
       <v-tooltip />
       <v-axis />
+      <v-bar position="year*sales" />
+    </v-chart> -->
+    <v-chart :forceFit="true" :height="300" :data="chartData" style="margin-left: -50px">
+      <v-tooltip />
+      <v-axis data-key='维修次数' :line="line" :label="label" />
+      <v-axis data-key='报废次数' :line="line" :label="label" />
       <v-legend />
       <v-bar :position="position" color="parentName" :adjust="adjust" />
     </v-chart>
@@ -24,6 +30,16 @@ import { getBfPOrg } from '@/api/view'
 import DataSet from '@antv/data-set'
 export default {
   data() {
+    const label = {
+      offset: -620,
+      textStyle: {
+        textAlign: 'left',
+      }
+    }
+    const line = {
+      textAlign: 'left'
+
+    }
     return {
       orgId: this.$store.state.user.user.baseJpOrganization.id,
       radio: '使用次数',
@@ -33,6 +49,8 @@ export default {
         marginRatio: 1 / 32,
       }],
       chartData: [],
+      line,
+      label,
       position: '装备类型*使用量'
     }
   },
@@ -64,7 +82,7 @@ export default {
             key: '装备类型',
             value: '使用量',
           });
-          this.chartData = dv
+          this.chartData = dv.rows
           this.position = '装备类型*使用量'
         } else {
           this.$message.error(res.msg)
@@ -83,7 +101,7 @@ export default {
               key: '装备类型',
               value: '使用量',
             });
-            this.chartData = dv
+            this.chartData = dv.rows
             this.position = '装备类型*使用量'
           } else {
             this.$message.error(res.msg)
@@ -98,15 +116,16 @@ export default {
               type: 'fold',
               fields: ['近三个月维修次数', '近半年维修次数'],
               key: '装备类型',
-              value: '维修数',
+              value: '维修次数',
             });
-            this.chartData = dv
-            this.position = '装备类型*维修数'
+            this.chartData = dv.rows
+            this.position = '装备类型*维修次数'
           } else {
             this.$message.error(res.msg)
           }
         })
-      } else if (value == '报废数') {
+      } 
+      else if (value == '报废数') {
         getBfPOrg({orgId: this.orgId}).then(res => {
           if (res.code == "10000") {
             this.dataSource = res.data
@@ -115,10 +134,10 @@ export default {
               type: 'fold',
               fields: ['近三个月报废数', '近半年使报废数'],
               key: '装备类型',
-              value: '报废数',
+              value: '报废次数',
             });
-            this.chartData = dv
-            this.position = '装备类型*报废数'
+            this.chartData = dv.rows
+            this.position = '装备类型*报废次数'
           } else {
             this.$message.error(res.msg)
           }

src/views/dashboard/PieChart.vue

@@ -23,10 +23,12 @@
 <script>
 import { getGroupByCountOrg } from '@/api/view'
 import DataSet from '@antv/data-set'
+import { clone } from 'lodash'
 export default {
   data() {
     return {
       orgId: this.$store.state.user.user.baseJpOrganization.id,
+      code: this.$store.state.user.user.baseJpOrganization.code,
       radio: '库存状态',
       dataSource: [],
       pieList: [],
@@ -64,6 +66,7 @@ export default {
         stroke: '#fff',
         lineWidth: 2
       },
+      //左边统计图参数渲染
       labelConfig: ['percent', {
         formatter: (val, item) => {
             return item.point.item + ': ' + item.point.count + ' '     
@@ -93,6 +96,11 @@ export default {
       getGroupByCountOrg({orgId:this.orgId}).then(res => {
         if (res.code == "10000") {
           this.pieList = res.data
+          //对请求返回的数据进行处理，若为宁波市局则返回的数组中第三个字段item的内容应为销毁数，否则不做处理
+          if(this.$store.state.user.user.baseJpOrganization.code == '330200000000'){
+                this.item=res.data.tjList[2].item='销毁数'
+                //  console.log('---宁波市局----已做处理为：'+this.item)
+            }
           this.dataSource =  res.data.tjList
           this.guideOpts.content = '装备总数'
           this.guideOpts1.content =  this.dataSource.map(item => item.count).reduce((total, num) => total + num)

src/views/warehouse/equReserve/index.vue

@@ -62,7 +62,7 @@
     </div>
     
     <!--表格渲染-->
-    <el-table ref="table" v-loading="loading" row-key="rowNumber" :data="data" 
+    <el-table ref="table" v-loading="loading" show-summary :summary-method="getSummaries" row-key="rowNumber" :data="data" 
       :expand-row-keys="expandRowKeys" style="width: 100%;" stripe border max-height="620" :header-cell-style="{'text-align':'center'}">
       <el-table-column prop="rowNumber" label="编号" align="left" width="200"/>
       <el-table-column prop="name" label="品种名称" align="center"/>
@@ -248,6 +248,32 @@ export default {
         return lengths.indexOf(spell.indexOf(v)) !== -1;
       })
     },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '本页合计';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] += '';
+          } else {
+            sums[index] = '';
+          }
+      });
+
+      return sums;
+    },
     download() {
       this.downloadLoading = true
       var params = { orgId: this.orgId || this.$store.state.user.user.baseJpOrganization.id, page: 0, size: 999 }