555

operationSupport/src/views/newWorkBench/components/index.js

@@ -60,8 +60,8 @@ export default {
         performanceInspectors: (resolve) => require([`@views/${comUrl}workbenchMent/performanceInspectors.vue`], resolve),
         patrolInspectionRate: (resolve) => require([`@views/${comUrl}workbenchMent/patrolInspectionRate.vue`], resolve),
         proportionIncomeMode: (resolve) => require([`@views/${comUrl}workbenchMent/proportionIncomeMode.vue`], resolve),
-        // paidAnalysis
-        paidAnalysis: (resolve) => require([`@views/${comUrl}workbenchMent/paidAnalysis.vue`], resolve)
+        paidAnalysis: (resolve) => require([`@views/${comUrl}workbenchMent/paidAnalysis.vue`], resolve),
+        householdDistribution: (resolve) => require([`@views/${comUrl}workbenchMent/householdDistribution.vue`], resolve)
     },
     data() {
         return {
@@ -100,7 +100,8 @@ export default {
                 30: 'performanceInspectors',
                 31: 'patrolInspectionRate',
                 32: 'proportionIncomeMode',
-                33: 'paidAnalysis'
+                33: 'paidAnalysis',
+                34: 'householdDistribution'
             }
         };
     },

operationSupport/src/views/newWorkBench/components/workbenchMent/householdDistribution.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="modelBlock">
+    <template v-if="permissionFiltering">
+      <div class="model-title">
+        <div class="model-title-text">住户年龄分布</div>
+      </div>
+      <div class="model-content">
+        <zz-echart
+          :option="clientOptions"
+          class="chart"
+        ></zz-echart>
+      </div>
+    </template>
+    <no-permission
+      v-else
+      tipsText="住户年龄分布"
+    ></no-permission>
+  </div>
+</template>
+<script>
+import { columnOptionsChartName } from '../indexOptionChart.js';
+import permissionComponent from '../permissionComponent';
+export default {
+  mixins: [permissionComponent],
+  data () {
+    return {
+      defaultModel: {
+        permissUrl: '12',
+        titleName: '住户管理'
+      },
+      mixins_query: {
+        communityId: ''
+      },
+      clientOptions: columnOptionsChartName(
+        '(人)',
+        ['name1', 'name2', 'name3'],
+        [
+          {
+            name: 'name1',
+            data: 0
+          },
+          {
+            name: 'name2',
+            data: 0
+          },
+          {
+            name: 'name3',
+            data: 0
+          }
+        ],
+        [],
+        10
+      )
+    };
+  },
+  created () {
+    this.getData();
+  },
+  mounted () { },
+  computed: {},
+  methods: {
+    getData () {
+      this.$http.get('/sc-community-web/statisticGeneration', this.mixins_query)
+        .then(({ status, data, msg }) => {
+          debugger
+          if (status == 0) {
+            let name = ['0-18岁', '19-30岁', '31-40岁', '41-50岁', '51-60岁', '60岁以上']
+            debugger
+            let date = []
+            let dateRes = [];
+            for (let a in data.datas) {
+              date.push(data.datas[a])
+            }
+            console.log('date', date);
+            for (let i = 0; i < name.length; i++) {
+              dateRes.push({
+                name: name[i],
+                data: date[i]
+              })
+            }
+            this.clientOptions = columnOptionsChartName('(人)', name, dateRes, [], 10);
+          }
+        })
+        .catch((err) => { });
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+@import '../style.scss';
+</style>

operationSupport/src/views/newWorkBench/components/workbenchMent/paidAnalysis.vue

@@ -44,7 +44,7 @@
   </div>
 </template>
 <script>
-import { discountedWave } from '../indexOptionChart';
+import { discountedChart } from '../indexOptionChart';
 import permissionComponent from '../permissionComponent';
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 let dataDay = [
@@ -69,12 +69,13 @@ export default {
         permissUrl: '16',
         titleName: '告警管理'
       },
-      clientOptions: discountedWave('(元)', dataDay, dataArr),
+      clientOptions: discountedChart('(元)', dataDay, dataArr),
       mixins_query: {
         communityId: '',
         date: '',
         chargeType: ''
       },
+      date: '',
       amountType: [
         {
           value: 1,
@@ -114,15 +115,27 @@ export default {
         .get('/sc-community-web/statisticActuallyReceived', this.mixins_query)
         .then(({ status, data, msg }) => {
           debugger
-          // if (status == 0) {
-          //   let dateTime = [],
-          //     valueArr = [];
-          //   data.map((item) => {
-          //     dateTime.push(item.date);
-          //     valueArr.push(item.data);
-          //   });
-          //   this.clientOptions = discountedWave('(次)', dateTime, valueArr);
-          // }
+          if (status == 0) {
+            let date = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+            let dateRes = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+            let dateTime = [];
+            let dateTimes = [];
+            for (let i = 0; i < data.length; i++) {
+              for (let k = i; k < date.length; k++) {
+                if ((data[i].date.substr(5, 1) == '0' ? data[i].date.substr(6) : data[i].date.substr(5)) == date[k]) {
+                  dateTime.push(date[k])
+                  dateRes[k] = data[i].receivedAmount
+                }
+                dateTime.push(date[k])
+              }
+            }
+            dateTime = Array.from(new Set(dateTime))
+            for (let j = 0; j < dateTime.length; j++) {
+              dateTimes.push(dateTime[j] + '月')
+            }
+            this.clientOptions = discountedChart('(元)', dateTimes, dateRes);
+
+          }
         })
         .catch((err) => { });
     },

operationSupport/src/views/newWorkBench/template/leftAssembly.vue

@@ -335,6 +335,13 @@ export default {
           imgPng: require('@assets/img/formulation/img_zhexiantu@2x.png'),
           imgIcon: require('@assets/img/formulation/tag_2x@2x.png')
         },
+        {
+          data_id: 34,
+          title: '住户年龄分布',
+          type: 2,
+          imgPng: require('@assets/img/formulation/img_zhuzhuangtu@2x.png'),
+          imgIcon: require('@assets/img/formulation/tag_2x@2x.png')
+        },
 
       ],
       componentsValue: 0

smart/src/views/vehicleInformation/setpPage/details.vue

@@ -257,7 +257,10 @@
             align="center"
           >
             <template slot-scope="scope">
-              <el-input-number v-model="tableData[scope.$index].num"></el-input-number>
+              <el-input-number
+                v-model="tableData[scope.$index].num"
+                @click="tableDataNum(tableData[scope.$index].num)"
+              ></el-input-number>
             </template>
 
           </el-table-column>
@@ -862,7 +865,8 @@ export default {
       this.tableData.push({
         parkingArea: '',
         positionInformation: '',
-        num: 1
+        num: 1,
+        parkingId: [],
       })
     },
     addTimes () {