Merge remote-tracking branch 'origin/master'

ems-ui/src/api/basecfg/elecAttr.js

@@ -42,3 +42,59 @@ export function delAttr(id) {
     method: 'delete'
   })
 }
+// 新增峰谷电价策略
+export function addStrategy(data) {
+  return request({
+    url: '/ems/basecfg/elecPrice/strategy',
+    method: 'post',
+    data: data
+  })
+}
+export function listStrategy(params) {
+  return request({
+    url: '/ems/basecfg/elecPrice/strategy/list',
+    method: 'get',
+    params
+  })
+}
+export function updateStrategy(data) {
+  return request({
+    url: '/ems/basecfg/elecPrice/strategy',
+    method: 'put',
+    data: data
+  })
+}
+export function delStrategy(id) {
+  return request({
+    url: '/ems/basecfg/elecPrice/strategy/' + id,
+    method: 'delete'
+  })
+}
+//商户计费配置
+export function addCharging(data) {
+  return request({
+    url: '/ems/basecfg/elecPrice/coCharging',
+    method: 'post',
+    data: data
+  })
+}
+export function listCharging(params) {
+  return request({
+    url: '/ems/basecfg/elecPrice/coCharging/list',
+    method: 'get',
+    params
+  })
+}
+export function updateCharging(data) {
+  return request({
+    url: '/ems/basecfg/elecPrice/coCharging',
+    method: 'put',
+    data: data
+  })
+}
+export function delCharging(id) {
+  return request({
+    url: '/ems/basecfg/elecPrice/coCharging/' + id,
+    method: 'delete'
+  })
+}

ems-ui/src/views/basecfg/facstype/index.vue

@@ -150,7 +150,7 @@ export default {
         parentCode: this.form.code
       })
     },
-    deleteSub(index){
+    deleteSub(index) {
       this.form.subtypeList.splice(index, 1)
     },
     /** 查询能源设施/系统分类列表 */
@@ -169,7 +169,7 @@ export default {
     },
     // 表单重置
     reset() {
-      this.form = this.$options.data().form;
+      this.form = this.$options.data().form
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
@@ -208,7 +208,7 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
-          this.form.subtypeList = this.form.subtypeList.filter(item=>item.name!==''&&item.value!=='')
+          this.form.subtypeList = this.form.subtypeList.filter(item => item.name !== '' && item.value !== '')
           if (this.form.id != null) {
             updateType(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')
@@ -253,16 +253,16 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.operateBtns {
-  cursor: pointer;
-  i {
-    color: #1990ff;
-    margin-left: 5px;
+.sub-table {
+  .el-icon-delete {
+    cursor: pointer;
   }
-}
-.sub-table{
-  .el-icon-delete{
+  .operateBtns {
     cursor: pointer;
+    i {
+      color: #1990ff;
+      margin-left: 5px;
+    }
   }
 }
 </style>

ems-ui/src/views/basecfg/zoning/index.vue

@@ -37,7 +37,7 @@
             />
           </el-form-item>
           <el-form-item label="分区标签" prop="tagCode">
-            <el-select v-model="queryParams.tagCode" >
+            <el-select v-model="queryParams.tagCodeList" placeholder="请选择下拉选择" multiple clearable :style="{width: '100%'}">
               <el-option v-for="item in emsTagOptions" :label="item.tagName" :value="item.tagCode" :key="item.tagCode" />
             </el-select>
           </el-form-item>
@@ -98,7 +98,7 @@
           <el-table-column label="分区名称" align="left" prop="zoningName" />
           <el-table-column label="分区编码" align="center" prop="zoningCode" width="200"/>
           <el-table-column label="所在建筑" align="left" prop="areaPath" />
-          <el-table-column label="区块标签" align="center" prop="tagName" />
+          <el-table-column label="区块标签" align="center" prop="tagNames" />
           <el-table-column label="使用详情" align="center" prop="usageDetail" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
@@ -143,8 +143,8 @@
             <el-form-item label="分区名称" prop="zoningName">
               <el-input v-model="form.zoningName" placeholder="请输入分区名称" />
             </el-form-item>
-            <el-form-item label="分区标签" prop="tagCode" >
-              <el-select v-model="form.tagCode" >
+            <el-form-item label="分区标签" prop="tagCodeList" >
+              <el-select v-model="form.tagCodeList" placeholder="请选择下拉选择" multiple clearable :style="{width: '100%'}">
                 <el-option v-for="item in emsTagOptions" :label="item.tagName" :value="item.tagCode" :key="item.tagCode" />
               </el-select>
             </el-form-item>
@@ -210,14 +210,10 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        areaCode: null,
         bldgCode: null,
-        zoningCode: null,
         zoningName: null,
-        tagCode: null,
-        floor: null,
-        roomNo: null,
-        bldgLdArea: null,
-        usageDetail: null
+        tagCodeList: null
       },
       // 表单参数
       form: {},
@@ -266,7 +262,14 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.queryParams.bldgCode = data.id;
+      if ('Area' === data.tier) {
+        this.queryParams.areaCode = data.id;
+        this.queryParams.bldgCode = null;
+      } else if ('Building' === data.tier) {
+        this.queryParams.areaCode = null;
+        this.queryParams.bldgCode = data.id;
+      }
+
       this.handleQuery();
     },
     // 取消按钮
@@ -284,7 +287,8 @@ export default {
         floor: null,
         roomNo: null,
         bldgLdArea: null,
-        usageDetail: null
+        usageDetail: null,
+        tagCodeList: null
       };
       this.resetForm("form");
     },