Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

src/pages/eq/hall/page.vue

@@ -31,8 +31,8 @@
                       v-for="item in typeList"
                       :key="item.id"
                       :class="[
-                        item.id == currentId&&active? 'isActive' : '',
-                        item.icon,
+                        item.id == currentId && active ? 'isActive' : '',
+                        item.icon
                       ]"
                     >
                       <!-- <img :src="item.src" alt="" /> -->
@@ -42,11 +42,19 @@
                 </span>
               </el-col>
               <el-col :span="24" v-if="isSaving == 1">
-                <el-form-item label="温度设定：">
-                  <el-input v-model="formData.temp" clearable=""></el-input>
+                <el-form-item label="温度设定(℃)：">
+                  <el-input
+                    v-model="formData.temperature"
+                    clearable=""
+                  ></el-input>
                 </el-form-item>
                 <el-form-item label="">
-                  <el-button type="primary" size="mini">确定</el-button>
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    @click="changeTemperature()"
+                    >确定</el-button
+                  >
                 </el-form-item>
 
                 <el-form-item label="定时功能启止时间：">
@@ -56,7 +64,7 @@
                     :picker-options="{
                       start: '00:00',
                       step: '00:15',
-                      end: '24:00',
+                      end: '24:00'
                     }"
                   >
                   </el-time-select>
@@ -68,7 +76,7 @@
                       start: '00:00',
                       step: '00:15',
                       end: '24:00',
-                      minTime: formData.startTime,
+                      minTime: formData.startTime
                     }"
                   >
                   </el-time-select>
@@ -181,7 +189,6 @@ export default {
           src: require('../../home/image/fan_icon.png'),
           icon: 'iconfont icon-feng2',
           status: null
-
         },
         {
           id: 3,
@@ -189,7 +196,6 @@ export default {
           src: require('../../home/image/fan_icon.png'),
           icon: 'iconfont icon-feng',
           status: null
-
         }
       ],
       currentId: null,
@@ -198,7 +204,12 @@ export default {
       tableColums: tableColumsOne,
       isSaving: 1, //节能
       isOpen: 1, //定时开关
-      formData: {},
+      formData: {
+        temperature: '',
+        taskId: '',
+        startTime: '',
+        endTime: ''
+      },
       tabList: [
         {
           value: '01',
@@ -332,11 +343,7 @@ export default {
                 'hot_air_stop_temperature',
                 e.hot_air_stop_temperature
               )
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
             }
           })
         } else if (
@@ -345,11 +352,7 @@ export default {
           //室内机风柜
           this.sljfgList.forEach((e) => {
             if (this.tableData[i].id === e.resource_id) {
-              this.$set(
-                this.tableData[i],
-                'electric_energy',
-                e.electric_energy
-              )
+              this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
               this.$set(
                 this.tableData[i],
                 'current_frequency',
@@ -384,13 +387,18 @@ export default {
           this.isSaving = data.sysSystemParams.type
           if (data.sysSystemParams.sun === 1) {
             this.currentId = 1
+            this.active = true
           } else if (data.sysSystemParams.fan === 1) {
             this.currentId = 2
+            this.active = true
           } else if (data.sysSystemParams.nan === 1) {
             this.currentId = 3
+            this.active = true
           } else {
             this.currentId = null
+            this.active = false
           }
+          this.formData.temperature = data.sysSystemParams.temperature
           if (data.timedTask) {
             this.formData.taskId = data.timedTask.id
             this.formData.startTime = data.timedTask.startTime
@@ -409,7 +417,12 @@ export default {
       this.hallModalVisible = true
     },
     handleType(id) {
+      if (id !== this.currentId) {
+        this.active = true
+      } else {
         this.active = !this.active
+      }
+
       console.log('id:', id)
       this.$http({
         url: this.$http.adornUrl('/equipment/checkModel'),
@@ -421,11 +434,23 @@ export default {
       }).then((data) => {
         if (data && data.code === 0) {
           if (id === 1) {
+            if (this.active === true) {
               this.$message.success('供暖模式开启成功')
+            } else {
+              this.$message.success('供暖模式关闭成功')
+            }
           } else if (id === 2) {
+            if (this.active === true) {
               this.$message.success('机械通风模式开启成功')
+            } else {
+              this.$message.success('机械通风模式关闭成功')
+            }
           } else if (id === 3) {
+            if (this.active === true) {
               this.$message.success('自然通风模式开启成功')
+            } else {
+              this.$message.success('自然通风模式关闭成功')
+            }
           }
           this.currentId = id
         }
@@ -454,6 +479,10 @@ export default {
     },
     // 设置定时任务
     setSendTime(type) {
+      if (!this.formData.startTime || !this.formData.endTime) {
+        this.$message.error('定时功能启止时间不能为空！')
+        return
+      }
       this.isOpen = type
 
       this.$http({
@@ -472,6 +501,25 @@ export default {
           } else {
             this.$message.success('关闭定时任务成功')
           }
+          this.getAllHcdt()
+        }
+      })
+    },
+    changeTemperature() {
+      if (!this.formData.temperature) {
+        this.$message.error('温度不能为空！')
+        return
+      }
+      this.$http({
+        url: this.$http.adornUrl('/equipment/changeTemperature'),
+        method: 'post',
+        params: this.$http.adornParams({
+          temperature: this.formData.temperature
+        })
+      }).then((data) => {
+        if (data && data.code === 0) {
+          this.$message.success('温度设定成功')
+          this.getAllHcdt()
         }
       })
     }

src/pages/home/page.vue

@@ -9,9 +9,13 @@
               <span>系统运行时间</span>
             </div>
             <div class="card-text" v-if="dataList.systemRunningTime">
-              <span style='color:#21ACFC;'>{{ dataList.systemRunningTime[0] }}</span
-              ><span class="date-color" style="font-size: 16px;">天</span
-              ><span style='color:#21ACFC;'>{{ dataList.systemRunningTime[1] }}</span
+              <span style="color: #21acfc">{{
+                dataList.systemRunningTime[0]
+              }}</span
+              ><span class="date-color" style="font-size: 16px">天</span
+              ><span style="color: #21acfc">{{
+                dataList.systemRunningTime[1]
+              }}</span
               ><span class="date-color">时 </span>
 
               <!-- {{dataList.systemRunningTime}} -->
@@ -23,7 +27,7 @@
               <span>报警总数</span>
             </div>
             <div class="card-text">
-              <span style='color:#F2637B;'>{{ dataList.faultAlarm }}</span
+              <span style="color: #f2637b">{{ dataList.faultAlarm }}</span
               ><span class="date-color">次 </span>
             </div>
           </div>
@@ -115,7 +119,7 @@
                 <el-col :span="6">
                   <div class="handle-mode-wrap">
                     <div class="font-style font_14">
-                      <span>手动模式</span>
+                      <span>人工模式</span>
                     </div>
                     <div class="flex-save-warp">
                       <div>
@@ -167,7 +171,7 @@
                 <chart
                   id="home"
                   :data="data"
-                  :title="activeIndex==0?'今日能耗统计':'本月能耗统计'"
+                  :title="activeIndex == 0 ? '今日能耗统计' : '本月能耗统计'"
                   color="#21ACFC"
                   ref="chart"
                 ></chart>