4444

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

@@ -1,149 +1,160 @@
 <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 saveColumn-select-time"
-                        @change="changeTime"
-                        :clearable="false"
-                    >
-                    </el-date-picker>
-                    <el-select
-                        v-model="mixins_query.chargeType"
-                        placeholder="所有费用"
-                        clearable
-                        class="saveColumn-select"
-                        @change="getData"
-                    >
-                        <el-option v-for="(item, index) in amountType" :label="item.name" :value="item.value" :key="index"></el-option>
-                    </el-select>
-                </div>
-            </div>
-            <div class="model-content">
-                <process-circle
-                    class="item"
-                    :strokeWidth="strokeWidth"
-                    :strokeColor="strokeColor"
-                    :trailWidth="trailWidth"
-                    :trailColor="trailColor"
-                    :percent="dataObj.receivedAmount"
-                >
-                    <span class="ashText" style="font-size: 14px">收款率</span>
-                    <span> {{ parseInt((dataObj.receivedAmount / dataObj.receivableAmount || 0).toFixed(2) * 100) }}%</span>
-                </process-circle>
-                <div class="textAmount">
-                    <div class="listAmount">
-                        <div class="listText">应收金额</div>
-                        <div class="listNumber">{{ dataObj.receivableAmount }}</div>
-                    </div>
-                    <div class="listAmount">
-                        <div class="listText">已收金额</div>
-                        <div class="listNumber">{{ dataObj.receivedAmount }}</div>
-                    </div>
-                    <div class="listAmount">
-                        <div class="listText">未收金额</div>
-                        <div class="listNumber">{{ dataObj.uncollected }}</div>
-                    </div>
-                </div>
-            </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 saveColumn-select-time"
+            @change="changeTime"
+            :clearable="false"
+          >
+          </el-date-picker>
+          <el-select
+            v-model="mixins_query.chargeType"
+            placeholder="所有费用"
+            clearable
+            class="saveColumn-select"
+            @change="getData"
+          >
+            <el-option
+              v-for="(item, index) in amountType"
+              :label="item.name"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </div>
+      </div>
+      <div class="model-content">
+        <process-circle
+          class="item"
+          :strokeWidth="strokeWidth"
+          :strokeColor="strokeColor"
+          :trailWidth="trailWidth"
+          :trailColor="trailColor"
+          :percent="dataObj.receivedAmount"
+        >
+          <span
+            class="ashText"
+            style="font-size: 14px"
+          >收款率</span>
+          <span> {{ parseInt((dataObj.receivedAmount / dataObj.receivableAmount || 0).toFixed(2) * 100) }}%</span>
+        </process-circle>
+        <div class="textAmount">
+          <div class="listAmount">
+            <div class="listText">应收金额</div>
+            <div class="listNumber">{{ dataObj.receivableAmount }}</div>
+          </div>
+          <div class="listAmount">
+            <div class="listText">已收金额</div>
+            <div class="listNumber">{{ dataObj.receivedAmount }}</div>
+          </div>
+          <div class="listAmount">
+            <div class="listText">未收金额</div>
+            <div class="listNumber">{{ dataObj.uncollected }}</div>
+          </div>
+        </div>
+      </div>
+    </template>
+    <no-permission
+      v-else
+      tipsText="收款率分析"
+    ></no-permission>
+  </div>
 </template>
 <script>
 import processCircle from './circle'; // 环形进度条
 import permissionComponent from './permissionComponent';
 export default {
-    mixins: [permissionComponent],
-    components: {
-        processCircle
-    },
-    data() {
-        return {
-            defaultModel: {
-                permissUrl: '14',
-                titleName: '收费管理'
-            },
-            strokeWidth: 15, // 线条宽度
-            trailWidth: 15, // 背景线条宽度
-            trailColor: '#2C3345', // 背景线条宽度
-            mixins_query: {
-                communityId: '',
-                chargeType: '',
-                date: ''
-            },
-            date: '',
-            amountType: [
-                {
-                    value: 1,
-                    name: '物业费'
-                },
-                {
-                    value: 2,
-                    name: '水费'
-                },
-                {
-                    value: 3,
-                    name: '电费'
-                },
-                {
-                    value: 4,
-                    name: '车位费'
-                },
-                {
-                    value: 6,
-                    name: '卫生费'
-                },
-                {
-                    value: 7,
-                    name: '其他费用'
-                }
-            ],
-            dataObj: {
-                receivedAmount: 0,
-                receivableAmount: 0,
-                uncollected: 0
-            }
-        };
-    },
-
-    methods: {
-        getData() {
-            this.$http.get('/sc-community/statisticsCollectionRate', this.mixins_query).then(({ data, msg, status }) => {
-                let rep = /[\.]/;
-                if (status == 0 && !!data) {
-                    this.dataObj = {
-                        receivableAmount: !!data.receivableAmount && data.receivableAmount !== 0 ? data.receivableAmount.toFixed(2) : 0,
-                        receivedAmount: !!data.receivedAmount && data.receivedAmount !== 0 ? data.receivedAmount.toFixed(2) : 0,
-                        uncollected: rep.test(data.receivableAmount - data.receivedAmount || 0)
-                            ? (data.receivableAmount - data.receivedAmount || 0).toFixed(2)
-                            : 0
-                    };
-                } else {
-                    this.dataObj = {
-                        receivableAmount: 0,
-                        receivedAmount: 0,
-                        uncollected: 0
-                    };
-                }
-            });
+  mixins: [permissionComponent],
+  components: {
+    processCircle
+  },
+  data () {
+    return {
+      defaultModel: {
+        permissUrl: '14',
+        titleName: '收费管理'
+      },
+      strokeWidth: 15, // 线条宽度
+      trailWidth: 15, // 背景线条宽度
+      trailColor: '#2C3345', // 背景线条宽度
+      mixins_query: {
+        communityId: '',
+        chargeType: '',
+        date: ''
+      },
+      date: '',
+      amountType: [
+        {
+          value: 1,
+          name: '物业费'
+        },
+        {
+          value: 2,
+          name: '水费'
         },
-        changeTime(v) {
-            this.mixins_query.date = v + '-01';
-            this.getData();
+        {
+          value: 3,
+          name: '电费'
+        },
+        {
+          value: 4,
+          name: '车位费'
+        },
+        {
+          value: 6,
+          name: '卫生费'
+        },
+        {
+          value: 7,
+          name: '其他费用'
+        }
+      ],
+      dataObj: {
+        receivedAmount: 0,
+        receivableAmount: 0,
+        uncollected: 0
+      }
+    };
+  },
+
+  methods: {
+    getData () {
+      this.$http.get('/sc-community/statisticsCollectionRate', this.mixins_query).then(({ data, msg, status }) => {
+        let rep = /[\.]/;
+        if (status == 0 && !!data) {
+          this.dataObj = {
+            receivableAmount: !!data.receivableAmount && data.receivableAmount !== 0 ? data.receivableAmount.toFixed(2) : 0,
+            receivedAmount: !!data.receivedAmount && data.receivedAmount !== 0 ? data.receivedAmount.toFixed(2) : 0,
+            uncollected: rep.test(data.receivableAmount - data.receivedAmount || 0)
+              ? (data.receivableAmount - data.receivedAmount || 0).toFixed(2)
+              : 0
+          };
+        } else {
+          this.dataObj = {
+            receivableAmount: 0,
+            receivedAmount: 0,
+            uncollected: 0
+          };
         }
+      });
     },
-    created() {
-        this.mixins_query.date = this.$moment().format('YYYY-MM') + '-01';
-        this.date = this.$moment().format('YYYY-MM');
-        this.getData();
+    changeTime (v) {
+      this.mixins_query.date = v + '-01';
+      this.getData();
     }
+  },
+  created () {
+    this.mixins_query.date = this.$moment().format('YYYY-MM') + '-01';
+    this.date = this.$moment().format('YYYY-MM');
+    this.getData();
+  }
 };
 </script>
 <style scoped lang="scss">

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

@@ -57,7 +57,11 @@ export default {
         operationMaintenancePersonnel: (resolve) => require([`@views/${comUrl}workbenchMent/operationMaintenancePersonnel.vue`], resolve),
         completionMaintenanceOrder: (resolve) => require([`@views/${comUrl}workbenchMent/completionMaintenanceOrder.vue`], resolve),
         orderClassification: (resolve) => require([`@views/${comUrl}workbenchMent/orderClassification.vue`], resolve),
-        performanceInspectors: (resolve) => require([`@views/${comUrl}workbenchMent/performanceInspectors.vue`], resolve)
+        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)
     },
     data() {
         return {
@@ -93,7 +97,10 @@ export default {
                 27: 'operationMaintenancePersonnel',
                 28: 'completionMaintenanceOrder',
                 29: 'orderClassification',
-                30: 'performanceInspectors'
+                30: 'performanceInspectors',
+                31: 'patrolInspectionRate',
+                32: 'proportionIncomeMode',
+                33: 'paidAnalysis'
             }
         };
     },

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

@@ -0,0 +1,138 @@
+<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>
+          <el-select
+            v-model="mixins_query.chargeType"
+            placeholder="所有费用"
+            clearable
+            class="saveColumn-select"
+            @change="getData"
+          >
+            <el-option
+              v-for="(item, index) in amountType"
+              :label="item.name"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </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 = [
+  '1月',
+  '2月',
+  '3月',
+  '4月',
+  '5月',
+  '6月',
+  '7月',
+  '8月',
+  '9月',
+  '10月',
+  '11月',
+  '12月',
+];
+export default {
+  mixins: [permissionComponent],
+  data () {
+    return {
+      defaultModel: {
+        permissUrl: '16',
+        titleName: '告警管理'
+      },
+      clientOptions: discountedWave('(元)', dataDay, dataArr),
+      mixins_query: {
+        communityId: '',
+        date: '',
+        chargeType: ''
+      },
+      amountType: [
+        {
+          value: 1,
+          name: '物业费'
+        },
+        {
+          value: 2,
+          name: '水费'
+        },
+        {
+          value: 3,
+          name: '电费'
+        },
+        {
+          value: 4,
+          name: '车位费'
+        },
+        {
+          value: 6,
+          name: '卫生费'
+        },
+        {
+          value: 7,
+          name: '其他费用'
+        }
+      ],
+    };
+  },
+  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-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);
+          // }
+        })
+        .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/patrolInspectionRate.vue

@@ -0,0 +1,163 @@
+<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 class="totals">
+          <span>{{ total }}</span>
+          <span class="numbers">任务总数</span>
+        </div>
+      </div>
+    </template>
+    <no-permission
+      v-else
+      tipsText="巡检任务完成率"
+    ></no-permission>
+  </div>
+</template>
+<script>
+import { GradualChange, ringType } from '../indexOptionChart';
+import permissionComponent from '../permissionComponent';
+const colors = [
+  GradualChange('#22D8FF', '#00B2FF'),
+  GradualChange('#F0646C', '#F4994E'),
+  GradualChange('#5EEDCC ', '#24C3F1'),
+  GradualChange('#7178FF', '#D2A4FF'),
+  GradualChange('#884DD2', '#DF63CC')
+];
+export default {
+  mixins: [permissionComponent],
+  data () {
+    return {
+      defaultModel: {
+        permissUrl: '18',
+        titleName: '设备巡检'
+      },
+      mixins_query: {
+        communityId: '',
+        date: '',
+      },
+      date: '',
+      total: 0,
+      clientOptions: ringType(
+        colors,
+        [
+          { value: 0, name: '待执行' },
+          { value: 0, name: '执行中' },
+          { value: 0, name: '已完成' },
+          { value: 0, name: '已完成（超时）' },
+          { value: 0, name: '已逾期' }
+        ],
+        {},
+        { type: 'number', total: 0 }
+      )
+    };
+  },
+  methods: {
+    getData () {
+      this.$http.get('/sc-community-web/statisticInspectionTaskCompletionRate', 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';
+      this.getData();
+    },
+    eachartObj (data) {
+      this.total = data.total || 0;
+      let typeName = {
+        1: '待执行',
+        2: '执行中',
+        3: '已完成',
+        4: '已完成（超时）',
+        5: '已逾期'
+      };
+      let newData = [];
+      for (let a in data.datas) {
+        newData.push({
+          value: data.datas[a],
+          name: typeName[a]
+        });
+      }
+      return newData;
+    }
+  },
+  created () {
+    this.mixins_query.date = this.$moment().format('YYYY-MM') + '-01';
+    this.date = this.$moment().format('YYYY-MM');
+    this.getData();
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import '@assets/css/public-style.scss';
+.modelBlock {
+    height: 100%;
+    padding: rem(15) rem(20) rem(20);
+    background: #171f32;
+    .model-title {
+        line-height: rem(30);
+        display: flex;
+        justify-content: space-between;
+        padding-bottom: rem(15);
+        border-bottom: 1px solid rgba(224, 225, 227, 0.2);
+        .saveColumn-select {
+            width: rem(120);
+            margin-left: rem(20);
+            /deep/ .el-input__inner {
+                background: transparent;
+                color: white;
+                border-color: rgba(255, 255, 255, 0.2);
+            }
+        }
+        .model-title-text {
+            color: white;
+        }
+    }
+    .model-content {
+        height: calc(100% - #{rem(45)});
+        display: flex;
+        justify-content: space-between;
+        font-size: 12px;
+        position: relative;
+        .totals {
+            position: absolute;
+            right: rem(10);
+            top: rem(26);
+            width: rem(120);
+            height: rem(40);
+            background: linear-gradient(90deg, rgba(14, 174, 255, 0.5) 0%, rgba(14, 174, 255, 0) 100%);
+            border-radius: 5px;
+            font-size: 20px;
+            padding: rem(8) rem(10);
+            display: flex;
+            justify-content: space-between;
+            .numbers {
+                font-size: 12px;
+                opacity: 0.5;
+                line-height: rem(32);
+            }
+        }
+    }
+}
+</style>

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

@@ -0,0 +1,173 @@
+<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>
+          <el-select
+            v-model="mixins_query.chargeType"
+            placeholder="所有费用"
+            clearable
+            class="saveColumn-select"
+            @change="getData"
+          >
+            <el-option
+              v-for="(item, index) in amountType"
+              :label="item.name"
+              :value="item.value"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </div>
+      </div>
+      <div class="model-content">
+        <zz-echart
+          :option="clientOptions"
+          class="chart"
+        ></zz-echart>
+        <div class="totals">
+          <span
+            style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;"
+            :title="total + '元'"
+          >{{ total }}元</span>
+          <span
+            class="numbers"
+            style="white-space: nowrap;"
+          >总收入</span>
+        </div>
+      </div>
+    </template>
+    <no-permission
+      v-else
+      tipsText="收入方式占比"
+    ></no-permission>
+  </div>
+</template>
+<script>
+import { GradualChange, ringType } from '../indexOptionChart';
+import permissionComponent from '../permissionComponent';
+const colors = [
+  GradualChange('#22D8FF', '#00B2FF'),
+  GradualChange('#F0646C', '#F4994E'),
+  GradualChange('#5EEDCC ', '#24C3F1'),
+  GradualChange('#7178FF', '#D2A4FF'),
+  GradualChange('#884DD2', '#DF63CC')
+];
+export default {
+  mixins: [permissionComponent],
+  data () {
+    return {
+      defaultModel: {
+        permissUrl: '14',
+        titleName: '收费管理'
+      },
+      mixins_query: {
+        communityId: '',
+        date: '',
+        chargeType: ''
+      },
+      date: '',
+      total: 0,
+      clientOptions: ringType(
+        colors,
+        [
+          { value: 0, name: '微信' },
+          { value: 0, name: '支付宝' },
+          { value: 0, name: '现金' },
+          { value: 0, name: '预存' },
+          { value: 0, name: '其他' }
+        ],
+        {},
+        { type: 'number', total: 0 }
+      ),
+      amountType: [
+        {
+          value: 1,
+          name: '物业费'
+        },
+        {
+          value: 2,
+          name: '水费'
+        },
+        {
+          value: 3,
+          name: '电费'
+        },
+        {
+          value: 4,
+          name: '车位费'
+        },
+        {
+          value: 6,
+          name: '卫生费'
+        },
+        {
+          value: 7,
+          name: '其他费用'
+        }
+      ],
+    };
+  },
+  methods: {
+    getData () {
+      this.$http.get('/sc-community-web/statisticIncomeMethod', this.mixins_query).then(({ data, msg, status }) => {
+        debugger
+        if (status == 0 && !!data.datas) {
+          this.clientOptions = ringType(colors, this.eachartObj(data), {}, { type: 'number', total: this.total });
+        }
+      })
+    },
+    changeTime (v) {
+      this.mixins_query.date = v + '-01';
+      this.getData();
+    },
+    eachartObj (data) {
+      this.total = data.total || 0;
+      let typeName = {
+        1: '微信',
+        2: '支付宝',
+        3: '现金',
+        4: '预存',
+        5: '其他'
+      };
+      let newData = [];
+      debugger
+      for (let a in data.datas) {
+        newData.push({
+          value: data.datas[a],
+          name: typeName[a]
+        });
+        this.total = this.total + data.datas[a];
+      }
+      return newData;
+    }
+  },
+  created () {
+    this.mixins_query.date = this.$moment().format('YYYY-MM') + '-01';
+    this.date = this.$moment().format('YYYY-MM');
+    this.getData();
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import '../style.scss';
+.model-title {
+    .model-title-right {
+        .saveColumn-select {
+            &:not(:first-child) {
+                margin-left: rem(10);
+            }
+        }
+    }
+}
+</style>

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

@@ -314,6 +314,27 @@ export default {
           imgPng: require('@assets/img/formulation/img_zhuzhuangtu@2x.png'),
           imgIcon: require('@assets/img/formulation/tag_2x@2x.png')
         },
+        {
+          data_id: 31,
+          title: '巡检人员任务执行情况',
+          type: 7,
+          imgPng: require('@assets/img/formulation/img_bing+baifenbi@2x.png'),
+          imgIcon: require('@assets/img/formulation/tag_1x@2x.png')
+        },
+        {
+          data_id: 32,
+          title: '收入方式占比',
+          type: 3,
+          imgPng: require('@assets/img/formulation/img_bing+baifenbi@2x.png'),
+          imgIcon: require('@assets/img/formulation/tag_1x@2x.png')
+        },
+        {
+          data_id: 33,
+          title: '实收分析',
+          type: 3,
+          imgPng: require('@assets/img/formulation/img_zhexiantu@2x.png'),
+          imgIcon: require('@assets/img/formulation/tag_2x@2x.png')
+        },
 
       ],
       componentsValue: 0

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

@@ -1163,7 +1163,7 @@ export default {
             areaName: carLotStr[i].areaName,
             num: carLotStr[i].lotCount,
             positionInformation: carLotStr[i].lotName,
-            parkingId: carLotStr[i].parkingId
+            parkingId: carLotStr[i].parkingIds
           })
           this.formDate.areaName = carLotStr[i].areaName;
           // this.tableData[i].areaName = carLotStr[i].areaName