Merge branch 'new_web' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new_web

operationSupport/src/views/alarmManagement/details.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="main">
         <div class="handle-box search">
-            <el-input class="servertype-serch" v-model="mixins_query.condition" placeholder="告警名称"></el-input>
-            <el-select clearable class="servertype-serch" v-model="mixins_query.alarmType" placeholder="告警类型">
+            <el-input class="servertype-serch" v-model="mixins_query.alarmName" placeholder="告警名称"></el-input>
+            <el-select clearable class="servertype-serch" v-model="mixins_query.alarmCategory" placeholder="告警类型">
                 <el-option v-for="(item, index) in alarmTypeList" :key="index" :label="item.label" :value="item.value">{{
                     item.label
                 }}</el-option>
@@ -125,12 +125,12 @@ export default {
             ],
             alarmTypeList: [
                 {
-                    label: '参数告警',
-                    value: '参数告警'
+                    label: '告警',
+                    value: 1
                 },
                 {
-                    label: '状态告警',
-                    value: '状态告警'
+                    label: '离线',
+                    value: 2
                 }
             ],
             allServiceScene: [],

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

@@ -129,7 +129,8 @@ export default {
                 type: '',
                 value: '',
                 address: ''
-            }
+            },
+            communityId:""
         };
     },
     methods: {
@@ -144,6 +145,7 @@ export default {
                         data: this.chiData,
                         todo,
                         productOptions: this.productOptions,
+                        communityId:this.communityId,
                         callback: resolve
                     },
                     title: title
@@ -178,6 +180,7 @@ export default {
     watch: {
         currentId(newValue, oldValue) {
             if (newValue.type) {
+                this.communityId = newValue.communityId;
                 let newValueIds = newValue.id.split('-');
                 this.chiData.type = newValueIds.length;
                 if (newValue.type === 'community') {

operationSupport/src/views/payService/chargeSetting/stepPage/add.vue

@@ -69,7 +69,7 @@ export default {
                 });
         },
         getList() {
-            this.$http.get('/sc-charge/scChargeStrategy/list').then(({ data, status, msg }) => {
+            this.$http.get('/sc-charge/scChargeStrategy/list?communityId=' + this.params.communityId).then(({ data, status, msg }) => {
                 this.list = data;
             });
         }

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

@@ -235,6 +235,7 @@ export default {
                         selectRow: this.selectRow,
                         chiData: this.chiData,
                         tabList: todo,
+                        communityId: this.mixins_query.communityId,
                         callback: resolve
                     },
                     hideStar: hideStar,

operationSupport/src/views/payService/propertyFee/stepPage/temporary.vue

@@ -78,8 +78,7 @@ export default {
         },
         getSelect() {
             this.$http
-                // .get('/sc-charge/scChargeStrategy/page?pageNum=1&pageSize=100&chargeType=1')
-                .get('/sc-charge/scChargeStrategy/page?pageNum=1&pageSize=100')
+                .get('/sc-charge/scChargeStrategy/page?pageNum=1&pageSize=100&communityId='+this.params.communityId)
                 .then(({ data, status, msg }) => {
                     this.selectData = data.list;
                 })