页面调整

src/pages/kb/power/page.vue

@@ -46,9 +46,10 @@
                 v-model="formData.status"
                 clearable
               >
-                <el-option label="在线" value="1"></el-option>
-                <el-option label="离线" value="2"></el-option>
-                <el-option label="故障" value="3"></el-option>
+                <el-option label="运行" value="1"></el-option>
+                <el-option label="停止" value="2"></el-option>
+                <el-option label="离线" value="3"></el-option>
+                <el-option label="故障" value="4"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>

src/pages/sys/point/add-or-update.vue

@@ -48,6 +48,9 @@
                             el-form-item(label='所属区域:' prop='region')
                                 el-select(v-model="dataForm.region" placeholder="请选择所属区域" )
                                     el-option(v-for="(item,index) in regionList" :key="index" :label="item.name" :value="item.id" :code="item.id")
+                            el-form-item(label='人工模式:' prop='modeTypes')
+                                el-checkbox-group(v-model="dataForm.modeTypes" placeholder="请选择人工模式" clearable)
+                                    el-checkbox(v-for="(item, index) in modeList" :key="index" :label="item.id") {{item.name}}
                             el-form-item(label='部署位置:' prop='deployLocation')
                                 el-input(v-model='dataForm.deployLocation' placeholder='请填写部署位置')
                     el-row( class='info-block' style="margin-top: 20px;")
@@ -107,6 +110,11 @@ export default {
         { id: 2, name: '办公区域' },
         { id: 3, name: '屋顶' }
       ],
+      modeList: [
+        { id: '1', name: '供暖模式' },
+        { id: '2', name: '机械通风' },
+        { id: '3', name: '自然通风' }
+      ],
       icon: {},
       list: [],
       typeList: [],
@@ -119,6 +127,7 @@ export default {
         name: '',
         code: '',
         type: '',
+        modeTypes: [],
         equipmentModel: '',
         maxPower: '',
         installDate: null,
@@ -296,12 +305,13 @@ export default {
         })
       })
       //点击事件
-      this.mapDialog.on('click', function(evt) {
-        let feature = evt.map.forEachFeatureAtPixel(evt.pixel, function(
-          feature
-        ) {
-          return feature
-        })
+      this.mapDialog.on('click', function (evt) {
+        let feature = evt.map.forEachFeatureAtPixel(
+          evt.pixel,
+          function (feature) {
+            return feature
+          }
+        )
         if (feature) {
           for (let i in that.list) {
             if (feature.getId() === that.list[i].id) {
@@ -331,8 +341,12 @@ export default {
       this.visible = true
       if (bean) {
         this.dataForm = JSON.parse(JSON.stringify(bean))
+        if (this.dataForm.modeTypes) {
+          console.log('111111:')
+          this.dataForm.modeTypes = this.dataForm.modeTypes.split(',')
+        }
       }
-
+      console.log('dataForm:', this.dataForm)
       this.dataForm.operatorName = this.info.name
       this.initResourceTypeDicList()
       this.initBrandDicList()
@@ -484,6 +498,9 @@ export default {
             this.$emit('addNotify', message)
             return
           }
+          if (this.dataForm.modeTypes) {
+            this.dataForm.modeTypes = this.dataForm.modeTypes.join(',')
+          }
           setTimeout(() => {
             this.$emit('refreshBean', this.dataForm)
             this.$emit('refreshdatalist', this.dataForm)

src/pages/sys/point/index.vue

@@ -737,6 +737,7 @@ export default {
         tierId: this.checkedData.tierId,
         tierName: this.checkedData.tierName,
         type: item.id,
+        modeTypes: '',
         equipmentModel: '',
         maxPower: '',
         installDate: null,
@@ -1150,7 +1151,7 @@ export default {
           return false
         }
       })
-      // console.log(this.list)
+      console.log('paramList:', paramList)
       this.submitlDisabled = true
       if (flag) {
         this.$http({