BUG

operationSupport/src/views/assetManagement/housingManagement/saveEdits.vue

@@ -33,7 +33,7 @@
               class="width100"
             >
               <el-option
-                v-for="(item, index) in unitList"
+                v-for="(item, index) in resunitList"
                 :label="item.unitName"
                 :value="item.unitName"
                 :key="index"
@@ -164,10 +164,10 @@
               class="width100"
             >
               <el-option
-                v-for="(item, index) in floorNumberList"
-                :label="item.floorNumber"
-                :value="item.floorNumber"
-                :key="index"
+                v-for="(items, indexs) in floorNumberList"
+                :label="items.floorNumber"
+                :value="items.floorNumber"
+                :key="indexs"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -317,6 +317,8 @@ export default {
     return {
       buildingList: [], //楼栋下拉选择列表
       unitList: [], //单元下拉选择列表
+      floorNumberList: [],
+      resunitList: [],
       addEditState: '',
       housingType: {
         //房屋户型，roomNumber为室，officeNumber为厅，guardNumber为卫
@@ -371,10 +373,11 @@ export default {
       }
     },
     'ruleForm.buildingId' (newValue, oldValue) {
-      debugger
+
       if (newValue !== oldValue) {
-        debugger
+
         this.unitNameList();
+        this.unitChoice(newValue);
       }
     },
     'ruleForm.unitName' (newValue, oldValue) {
@@ -383,13 +386,14 @@ export default {
       }
     },
     unitList (val) {
-      debugger
       if (val.length !== 0) {
         this.unitChoice(this.ruleForm.unitName);
       }
     }
   },
   methods: {
+
+
     submitForm (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
@@ -433,13 +437,18 @@ export default {
     },
     unitNameList () {
       this.unitList = [];
+      this.resunitList = [];
       this.$http.get('/czc-community/assets/building/house/find', { id: this.ruleForm.buildingId }).then((res) => {
 
         if (res.status == 0) {
           if (res.data.buildingUnitList.length != 0) {
-            debugger
+
+            for (let i = 0; i < res.data.buildingUnitList.length; i++) {
+              if (res.data.buildingUnitList.unitName != null) {
+                this.resunitList.push(res.data.buildingUnitList[i])
+              }
+            }
             this.unitList = res.data.buildingUnitList;
-            console.log(this.unitList);
           }
         }
       });
@@ -449,9 +458,12 @@ export default {
 
       this.floorNumberList = [];
       this.unitList.map((item) => {
-        if (item.unitName == e) {
-          this.floorNumberList = item.unitFloorList;
-        }
+        // if (item.unitName == e) {
+
+        this.floorNumberList = item.unitFloorList;
+
+        // }
+        console.log(' this.unitList11', this.floorNumberList);
       });
     },
 

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

@@ -68,7 +68,8 @@ export default {
         enterpriseDistribution: (resolve) => require([`@views/${comUrl}workbenchMent/enterpriseDistribution.vue`], resolve),
         personnelSalesanalysis: (resolve) => require([`@views/${comUrl}workbenchMent/personnelSalesanalysis.vue`], resolve),
         distributionSuggestion: (resolve) => require([`@views/${comUrl}workbenchMent/distributionSuggestion.vue`], resolve),
-        scoringOperationPersonnel: (resolve) => require([`@views/${comUrl}workbenchMent/scoringOperationPersonnel.vue`], resolve)
+        scoringOperationPersonnel: (resolve) => require([`@views/${comUrl}workbenchMent/scoringOperationPersonnel.vue`], resolve),
+        quantitativeAnalysis: (resolve) => require([`@views/${comUrl}quantitativeAnalysis.vue`], resolve)
     },
     data() {
         return {
@@ -115,7 +116,8 @@ export default {
                 38: 'enterpriseDistribution',
                 39: 'personnelSalesanalysis',
                 40: 'distributionSuggestion',
-                41: 'scoringOperationPersonnel'
+                41: 'scoringOperationPersonnel',
+                42: 'quantitativeAnalysis'
             }
         };
     },

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

@@ -1,3 +1,5 @@
+import { red } from 'stylus/lib/functions';
+
 //从左往右颜色渐变
 export const GradualChange = (color1, color2) => {
     return new echarts.graphic.LinearGradient(1, 0, 0, 0, [
@@ -1235,3 +1237,86 @@ export const columnOptionsChartss = (name = '', xAxis = [], series = [], dataser
     };
     return option;
 };
+
+// 散点图
+export const quantitativeAnalysisProblems = (name = [], namexAxis = '', nameyAxis = '', xAxis = [], series = [], color = []) => {
+    let defaultColor = [
+        ['#22D8FF', '#00B2FF'],
+        ['#F0646C', '#F4994E'],
+        ['#5EEDCC', '#24C3F1'],
+        ['#7178FF', '#D2A4FF']
+    ];
+    let seriesConfiguration = () => {
+        let seriesData = [];
+        series.map((item, index) => {
+            seriesData.push({
+                name: item.name,
+                type: 'scatter',
+                data: item.data,
+                color: defaultColor[index][0],
+                symbolSize: function (data) {
+                    return data || 10;
+                }
+            });
+        });
+        debugger;
+        return seriesData;
+    };
+
+    let option = {
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'cross',
+                crossStyle: {
+                    color: '#999'
+                }
+            }
+        },
+        legend: {
+            data: name,
+            itemWidth: 20,
+            itemHeight: 10,
+            top: 5,
+            textStyle: {
+                color: '#9B9DA5'
+            }
+        },
+        grid: {
+            top: 60,
+            left: 5,
+            bottom: 0,
+            right: 5,
+            containLabel: true
+        },
+        xAxis: {
+            name: namexAxis,
+            type: 'category',
+            data: xAxis,
+            axisLabel: {
+                color: '#9B9DA5',
+                lineStyle: {
+                    color: '#9B9DA5'
+                }
+            }
+        },
+        yAxis: {
+            name: nameyAxis,
+            nameTextStyle: {
+                color: '#9B9DA5'
+            },
+            axisLabel: {
+                formatter: '{value}'
+            },
+            axisLabel: {
+                color: '#9B9DA5',
+                lineStyle: {
+                    color: '#9B9DA5'
+                }
+            }
+        },
+        series: seriesConfiguration() || defaultData
+    };
+    debugger;
+    return option;
+};

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

@@ -0,0 +1,95 @@
+<template>
+  <div class="modelBlock">
+    <template>
+      <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 tipsText="巡更问题数量分析"></no-permission> -->
+  </div>
+</template>
+
+
+
+<script>
+import { quantitativeAnalysisProblems } from './indexOptionChart';
+import permissionComponent from './permissionComponent';
+export default {
+  mixins: [permissionComponent],
+  data () {
+    return {
+      defaultModel: {
+        permissUrl: '19',
+        titleName: '安保巡更'
+      },
+      mixins_query: {
+        communityId: '',
+        date: ''
+      },
+      clientOptions: quantitativeAnalysisProblems(['市容市貌', '环境卫生', '公共秩序', '消防安全'], '日期', '问题数量',
+        ['1日', 2, 3, 4, 5, 6, 7, 8, 9, 10],
+        [
+          {
+            name: '市容市貌',
+            data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+          },
+          {
+            name: '环境卫生',
+            data: [11, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+          },
+          {
+            name: '公共秩序',
+            data: [15, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+          },
+          {
+            name: '消防安全',
+            data: [19, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+          },
+
+        ], []
+      )
+    }
+  },
+  methods: {
+    changeTime (v) {
+      this.mixins_query.date = v + '-01';
+      this.getData();
+    }
+  }
+
+}
+
+</script>
+
+
+
+<style scoped lang="scss">
+@import './style.scss';
+// .model-title {
+//     .model-title-right {
+//         .saveColumn-select {
+//             &:not(:first-child) {
+//                 margin-left: rem(20);
+//             }
+//         }
+//     }
+// }
+</style>

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

@@ -1,4 +1,4 @@
-<!-- 暂无数据 -->
+
 
 <template>
   <div class="modelBlock">

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

@@ -471,6 +471,15 @@ export default {
           isPosition: '1x1',
           compatible: true
         },
+        {
+          data_id: 42,
+          title: '巡更问题数量分析',
+          type: 8,
+          imgPng: require('@assets/img/formulation/img_zhuzhuangtu@2x.png'),
+          imgIcon: require('@assets/img/formulation/tag_2x@2x.png'),
+          isPosition: '1x1',
+          compatible: true
+        },
 
       ],
       componentsValue: 0

operationSupport/src/views/patrolManagement/patrolStandard.vue

@@ -74,7 +74,41 @@
         :pageset="mixins_pageset"
         @page-change="pageChange"
         @selection-change="selectionChange"
-      ></zz-table>
+      >
+
+        <template
+          slot-scope="scope"
+          slot="opt"
+        >
+          <div class="opt">
+            <el-tooltip
+              class="item"
+              effect="light"
+              placement="bottom"
+              content="编辑"
+            >
+              <i
+                class="zoniot_font zoniot-icon-bianji"
+                @click="collections(scope.row)"
+              ></i>
+            </el-tooltip>
+
+            <el-tooltip
+              class="item"
+              effect="light"
+              placement="bottom"
+              content="删除"
+            >
+              <i
+                class="zoniot_font zoniot-icon-shanchu"
+                @click="deletes(scope.row.id)"
+              ></i>
+            </el-tooltip>
+          </div>
+
+        </template>
+
+      </zz-table>
     </div>
   </div>
 </template>
@@ -206,6 +240,26 @@ export default {
         })
         .catch(() => { });
     },
+    collections (row) {
+      debugger;
+    },
+    deletes (id) {
+      this.$msgBox(`是否确定删除对应的记录`, '删除后将无法恢复，是否继续？')
+        .then(() => {
+          this.$http.get('/czc-community/patrol/standard/delete?id=' + id).then(({ status, data, msg }) => {
+            if (0 === status) {
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              });
+              this.mixins_search();
+            } else {
+              this.$message.error(msg);
+            }
+          });
+        })
+        .catch(() => { });
+    },
   },
   created () {
   }

operationSupport/src/views/patrolManagement/popups/patrolAdd.vue

@@ -153,42 +153,42 @@ export default {
       patrolTypeList: [
         {
           label: '市容市貌',
-          value: '1'
+          value: 1
         },
         {
           label: '环境卫生',
-          value: '2'
+          value: 2
         },
         {
           label: '公共秩序',
-          value: '3'
+          value: 3
         },
         {
           label: '设备实施',
-          value: '4'
+          value: 4
         },
         {
           label: '消防安全',
-          value: '5'
+          value: 5
         },
 
       ],
       optionComposition: [
         {
           label: '是、否',
-          value: '1'
+          value: 1
         },
         {
           label: '坏、好',
-          value: '2'
+          value: 2
         },
         {
           label: '有、无',
-          value: '3'
+          value: 3
         },
         {
           label: '差、好',
-          value: '4'
+          value: 4
         }
       ],
       rules: {
@@ -215,8 +215,10 @@ export default {
     submit () {
       this.$refs.formData.validate((valid) => {
         if (valid) {
-          this.$http.post('/czc-community/patrol/standard/add').then(({ status, data, msg }) => {
+          this.$http.post('/czc-community/patrol/standard/add', this.formData).then(({ status, data, msg }) => {
             debugger
+            this.params.callback();
+            this.$emit('close');
           })
         } else {
           return;

operationSupport/src/views/payService/landlordBill/index.vue

@@ -446,6 +446,7 @@ export default {
       });
     },
     collections (todo, row) {
+
       new Promise((resolve) => {
         let title = '',
           hideStar,
@@ -467,14 +468,15 @@ export default {
           }
           let tag = false;
           this.selectRow.map((item) => {
-            if (this.selectRow[0].houseId == item.houseId) {
+
+            if (this.selectRow[0].id == item.id) {
               tag = true;
             } else {
               tag = false;
             }
           });
           if (!tag) {
-            this.$message.error('选择同一房间后再操作批量');
+            this.$message.error('仅支持相同房东批量收款操作');
             return;
           }