555

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

@@ -52,7 +52,8 @@ export default {
         houseClick: (resolve) => require([`@views/${comUrl}houseClick.vue`], resolve),
 
         patrolPersonnel: (resolve) => require([`@views/${comUrl}workbenchMent/patrolPersonnel.vue`], resolve),
-        patrolTaskRate: (resolve) => require([`@views/${comUrl}workbenchMent/patrolTaskRate.vue`], resolve)
+        patrolTaskRate: (resolve) => require([`@views/${comUrl}workbenchMent/patrolTaskRate.vue`], resolve),
+        patrolTaskDistribution: (resolve) => require([`@views/${comUrl}workbenchMent/patrolTaskDistribution.vue`], resolve)
     },
     data() {
         return {
@@ -83,7 +84,8 @@ export default {
                 23: 'houseClick',
 
                 24: 'patrolPersonnel',
-                25: 'patrolTaskRate'
+                25: 'patrolTaskRate',
+                26: 'patrolTaskDistribution'
             }
         };
     },

operationSupport/src/views/newWorkBench/components/patrolDuration.vue

@@ -1,72 +1,81 @@
+
+
+
 <template>
-    <div class="modelBlock">
-        <template v-if="permissionFiltering">
-            <div class="model-title">
-                <div class="model-title-text">巡更人员任务执行时长</div>
-                <div class="model-title-right">
-                    <el-date-picker
-                        value-format="yyyy-MM"
-                        v-model="date"
-                        type="month"
-                        placeholder="选择年"
-                        class="saveColumn-select"
-                        @change="changeTime"
-                        :clearable="false"
-                    >
-                    </el-date-picker>
-                </div>
-            </div>
-            <div class="model-content">
-                <zz-echart :option="clientOptions" class="chart"></zz-echart>
-            </div>
-        </template>
-        <no-permission v-else tipsText="巡更人员任务执行时长"></no-permission>
-    </div>
+  <div class="modelBlock">
+    <template v-if="permissionFiltering">
+      <div class="model-title">
+        <div class="model-title-text">巡更人员任务执行时长</div>
+        <div class="model-title-right">
+          <el-date-picker
+            value-format="yyyy-MM"
+            v-model="date"
+            type="month"
+            placeholder="选择年"
+            class="saveColumn-select"
+            @change="changeTime"
+            :clearable="false"
+          >
+          </el-date-picker>
+        </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 { columnOptionsChart } from './indexOptionChart';
 import permissionComponent from './permissionComponent';
 let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 export default {
-    mixins: [permissionComponent],
-    data() {
-        return {
-            defaultModel: {
-                permissUrl: '19',
-                titleName: '安保巡更'
-            },
-            mixins_query: {
-                communityId: '',
-                date: '',
-            },
-            date: '',
-            clientOptions: columnOptionsChart('(分)', [], [{ data: dataArr, name: '任务时长' }], [], 10)
-        };
-    },
-    methods: {
-        getData() {
-            this.$http.get('/sc-community/statisticPatrolPersonnelDuration', this.mixins_query).then(({ data, msg, status }) => {
-                if (status == 0 && !!data) {
-                    let timeDay = [],
-                        datas = [];
-                    data.map((item) => {
-                        timeDay.push(item.date);
-                        datas.push(item.data);
-                    });
-                    this.clientOptions = columnOptionsChart('(分)', timeDay, [{ data: datas, name: '任务时长' }], [], 10);
-                }
-            });
-        },
-        changeTime(v) {
-            this.mixins_query.date = v;
-            this.getData();
+  mixins: [permissionComponent],
+  data () {
+    return {
+      defaultModel: {
+        permissUrl: '19',
+        titleName: '安保巡更'
+      },
+      mixins_query: {
+        communityId: '',
+        date: '',
+      },
+      date: '',
+      clientOptions: columnOptionsChart('(分)', [], [{ data: dataArr, name: '任务时长' }], [], 10)
+    };
+  },
+  methods: {
+    getData () {
+      this.$http.get('/sc-community/statisticPatrolPersonnelDuration', this.mixins_query).then(({ data, msg, status }) => {
+        if (status == 0 && !!data) {
+          let timeDay = [],
+            datas = [];
+          data.map((item) => {
+            timeDay.push(item.date);
+            datas.push(item.data);
+          });
+          this.clientOptions = columnOptionsChart('(分)', timeDay, [{ data: datas, name: '任务时长' }], [], 10);
         }
+      });
     },
-    created() {
-        this.date = this.$moment().format('YYYY-MM');
-        this.mixins_query.date = this.$moment().format('YYYY-MM');
-        this.getData();
+    changeTime (v) {
+      this.mixins_query.date = v;
+      this.getData();
     }
+  },
+  created () {
+    this.date = this.$moment().format('YYYY-MM');
+    this.mixins_query.date = this.$moment().format('YYYY-MM');
+    this.getData();
+  }
 };
 </script>
 <style scoped lang="scss">

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

@@ -1,3 +1,5 @@
+
+<!-- 已完成 -->
 <template>
   <div class="modelBlock">
     <template v-if="permissionFiltering">
@@ -58,7 +60,6 @@ export default {
         [],
         10
       ),
-      permissionFiltering: '1'
     };
   },
   methods: {

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

@@ -0,0 +1,118 @@
+
+<template>
+  <div class="modelBlock">
+    <template v-if="permissionFiltering">
+      <div class="model-title">
+        <div class="model-title-text">巡更任务分布</div>
+        <div class="model-title-right">
+          <el-date-picker
+            value-format="yyyy-MM"
+            v-model="date"
+            type="month"
+            placeholder="选择月"
+            class="saveColumn-select"
+            @change="changeTime"
+            :clearable="false"
+          >
+          </el-date-picker>
+        </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 { discountedWave } from './indexOptionChart';
+import permissionComponent from './permissionComponent';
+let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+let dataDay = [
+  '01-01',
+  '01-02',
+  '01-03',
+  '01-04',
+  '01-05',
+  '01-06',
+  '01-07',
+  '01-08',
+  '01-09',
+  '01-10',
+  '01-11',
+  '01-12',
+  '01-13',
+  '01-14',
+  '01-15',
+  '01-16',
+  '01-17',
+  '01-18',
+  '01-19',
+  '01-20',
+  '01-21',
+  '01-22',
+  '01-23',
+  '01-24',
+  '01-25',
+  '01-26',
+  '01-27',
+  '01-28',
+  '01-29',
+  '01-30',
+  '01-31'
+];
+export default {
+  props: ['dataObj'],
+  mixins: [permissionComponent],
+  data () {
+    return {
+      defaultModel: {
+        permissUrl: 'propertyManagement/index',
+        titleName: '投诉建议'
+      },
+      mixins_query: {
+        communityId: '',
+        date: ''
+      },
+      date: '',
+      clientOptions: discountedWave('(个)', dataDay, dataArr)
+    };
+  },
+  created () {
+    this.mixins_query.date = this.$moment().format('YYYY-MM') + '-01';
+    this.date = this.$moment().format('YYYY-MM');
+    this.getData();
+  },
+  methods: {
+    getData () {
+      // this.$http
+      //   .get('/sc-community/statisticComplaintsTrend', this.mixins_query)
+      //   .then(({ status, data, msg }) => {
+      //     if (status == 0) {
+      //       let dateTime = [],
+      //         valueArr = [];
+      //       data.map((item) => {
+      //         dateTime.push(item.date);
+      //         valueArr.push(item.data);
+      //       });
+      //       this.clientOptions = discountedWave('(次)', dateTime, valueArr);
+      //     }
+      //   })
+      //   .catch((err) => { });
+    },
+    changeTime (v) {
+      this.mixins_query.date = v + '-01';
+      this.getData();
+    }
+  }
+};
+</script>
+<style scoped lang="scss">
+@import './style.scss';
+</style>

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

@@ -53,7 +53,8 @@ export default {
       },
       mixins_query: {
         communityId: '',
-        date: ''
+        date: '',
+        type: ''
       },
       date: '',
       total: 0,
@@ -73,24 +74,11 @@ export default {
   },
   methods: {
     getData () {
-      // this.$http.get('/sc-community/statisticInspectionTaskType', this.mixins_query).then(({ data, msg, status }) => {
-      //   if (status == 0 && !!data.datas) {
-      //     this.clientOptions = ringType(colors, this.eachartObj(data), {}, { type: 'number', total: data.total });
-      //   } else {
-      //     this.clientOptions = ringType(
-      //       colors,
-      //       [
-      //         { value: 0, name: '业主' },
-      //         { value: 0, name: '亲属' },
-      //         { value: 0, name: '租客' },
-      //         { value: 0, name: '租户管理员' },
-      //         { value: 0, name: '普通员工' }
-      //       ],
-      //       {},
-      //       { type: 'number', total: 0 }
-      //     );
-      //   }
-      // });
+      this.$http.get('/sc-community-web/statisticPatrolCompletionRate', this.mixins_query).then(({ data, msg, status }) => {
+        if (status == 0 && !!data.datas) {
+          this.clientOptions = ringType(colors, this.eachartObj(data), {}, { type: 'number', total: data.total });
+        }
+      })
     },
     changeTime (v) {
       this.mixins_query.date = v + '-01';
@@ -99,11 +87,11 @@ export default {
     eachartObj (data) {
       this.total = data.total || 0;
       let typeName = {
-        1: '业主',
-        2: '亲属',
-        3: '租客',
-        4: '租户管理员',
-        5: '普通员工'
+        1: '待执行',
+        2: '执行中',
+        3: '已完成',
+        4: '已完成（超时）',
+        5: '已逾期'
       };
       let newData = [];
       for (let a in data.datas) {

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

@@ -276,8 +276,8 @@ export default {
           data_id: 25,
           title: '巡更任务完成率',
           type: 8,
-          imgPng: require('@assets/img/formulation/img_tongji@2x.png'),
-          imgIcon: require('@assets/img/formulation/tag_4x@2x.png')
+          imgPng: require('@assets/img/formulation/img_bing+baifenbi@2x.png'),
+          imgIcon: require('@assets/img/formulation/tag_1x@2x.png')
         },
 
       ],

smart/src/views/rechargeRecord/index.vue

@@ -71,7 +71,7 @@
         scope="scope"
         slot="chargeNumbers"
       >
-        {{(scope.row.chargeNumber) + (scope.row.chargeUnit == 1 ? '月' :scope.row.chargeUnit == 2 ? '天':scope.row.chargeUnit == 3 ? '小时':'次' )}}
+        {{(scope.row.chargeNumber) + (scope.row.chargeUnit == 1 ? '月' :scope.row.chargeUnit == 2 ? '天':scope.row.chargeUnit == 3 ? '小时': scope.row.chargeUnit == 4 ?'次':'' )}}
 
       </template>
       <template

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

@@ -132,8 +132,8 @@ export default {
 
     debugger
     this.rechargeDetails[0].label = (this.params.row.amount / 100).toFixed(2);
-    this.rechargeDetails[1].label = (this.params.row.chargeNumber + ((this.params.row.chargeUnit == 1 ? '月' : this.params.row.chargeUnit == 2 ? '天' : this.params.row.chargeUnit == 3 ? '小时' : '次')));
-    this.rechargeDetails[2].label = (this.params.row.credit + ((this.params.row.donatedUnit == 1 ? '月' : this.params.row.donatedUnit == 2 ? '天' : this.params.row.donatedUnit == 3 ? '小时' : '次'))) || '-';
+    this.rechargeDetails[1].label = (this.params.row.chargeNumber + ((this.params.row.chargeUnit == 1 ? '月' : this.params.row.chargeUnit == 2 ? '天' : this.params.row.chargeUnit == 3 ? '小时' : this.params.row.chargeUnit == 4 ? '次' : '')));
+    this.rechargeDetails[2].label = (this.params.row.credit + ((this.params.row.donatedUnit == 1 ? '月' : this.params.row.donatedUnit == 2 ? '天' : this.params.row.donatedUnit == 3 ? '小时' : this.params.row.donatedUnit == 4 ? '次' : ''))) || '-';
 
     this.rechargeDetails[3].label = (this.params.row.startTime).substring(0, 10) + '~' + (this.params.row.endTime).substring(0, 10);