需求更新

src/pages/eq/hall/components/hallModal.vue

@@ -7,12 +7,14 @@
   >
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm">
       <el-form-item label="设置频率：" :label-width="formLabelWidth"  prop="set_frequency">
-        <el-input
+        <el-input-number
+          :controls='false'
+          :min="35"
+          :max="45"
           size="mini"
           autocomplete="off"
-          style="width: 300px"
           v-model="dataForm.set_frequency"
-        ></el-input>
+        ></el-input-number>
       </el-form-item>
     </el-form>
     <div slot="footer">

src/pages/eq/hall/components/settingFlrb.vue

@@ -53,9 +53,7 @@
       </el-row>
       <el-row>
         <el-form-item label="制热启动温度：" :label-width="formLabelWidth"  prop="heating_start_temperature">
-          <el-input
-            size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_start_temperature"
-          ></el-input>
+          <el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_start_temperature" :controls='false' :min='0' :max='100' ></el-input-number>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -68,9 +66,7 @@
       </el-row>
       <el-row>
         <el-form-item label="制热停止温度：" :label-width="formLabelWidth"  prop="heating_stop_temperature">
-          <el-input
-            size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_stop_temperature"
-          ></el-input>
+          <el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_stop_temperature" :controls='false' :min='0' :max='100' ></el-input-number>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -83,9 +79,7 @@
       </el-row>
       <el-row>
         <el-form-item label="热风启动温度：" :label-width="formLabelWidth"  prop="hot_air_start_temperature">
-          <el-input
-            size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_start_temperature"
-          ></el-input>
+          <el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_start_temperature" :controls='false' :min='0' :max='100' ></el-input-number>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -98,9 +92,7 @@
       </el-row>
       <el-row>
         <el-form-item label="热风停止温度：" :label-width="formLabelWidth"  prop="hot_air_stop_temperature">
-          <el-input
-            size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_stop_temperature"
-          ></el-input>
+          <el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_stop_temperature" :controls='false' :min='0' :max='100' ></el-input-number>
         </el-form-item>
         <el-form-item>
           <el-button

src/pages/eq/view/query-detail.vue

@@ -28,7 +28,7 @@
   .info-form(v-if='$store.state.d2admin.paramsList.list.syBean.type == 1' :style="{'border-bottom':(['b45827c068254695864ee3c1d42573cb','b6af764f2a6e454490a6b1b3c9057e57','173466a2cf9a42a6a17b2bdfbeae36d5'].includes(dataForm.type))&&$store.state.d2admin.paramsList.list.syBean.type == 1 ? '1px solid #c0c0c0': ''}" )
     //- | {{dataForm.status}}
     //- el-row.text-size(v-if="openOrClose.indexOf(dataForm.type)>-1")
-    el-row.text-size(v-if="dataForm.type=='b6af764f2a6e454490a6b1b3c9057e57'||dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'")
+    el-row.text-size(v-if="['b45827c068254695864ee3c1d42573cb','b6af764f2a6e454490a6b1b3c9057e57','173466a2cf9a42a6a17b2bdfbeae36d5'].includes(dataForm.type)")
       el-col(:span='10') 当前已
         span(v-if="dataForm.status == 1") 运行
         span(v-else-if="dataForm.status == 2") 停止
@@ -38,6 +38,8 @@
         .switch-warp
           div(:class="[dataForm.status == 1 ? 'on' : '']", @click="handleSwitch(1)" :style="{'pointer-events':( dataForm.status ==1) ? 'none':''}") 打开
           div(:class="[dataForm.status == 2 ? 'on' : '']", @click="handleSwitch(0)"  :style="{'pointer-events':( dataForm.status ==2) ? 'none':''}") 关闭
+      el-col(:span='10' v-else)
+        el-button(type='primary' size='mini' @click="failureReset") 故障复位
     el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'&&dataForm.status==1")
       el-col(:span="16" )
         span 温度设定：
@@ -63,24 +65,20 @@
           el-option(label="低风" value="8")
         el-button(type="primary", size="mini", style="margin-left: 3px" @click="handleSwitch2(3)") 设定
     //- 风热冷泵机组
-    el-row.text-size(v-if="dataForm.type=='b45827c068254695864ee3c1d42573cb'")
-      el-col(:span="16" )
+    div.text-size(v-if="dataForm.type=='b45827c068254695864ee3c1d42573cb'")
       el-row
-          el-col
-            span 模式：
+        span(style='width: 120px;display: inline-block;') 模式：
         el-switch(v-model="modelType" @change="changeHandle($event)" active-text="风水模式" inactive-text="热水模式" inactive-color="#ff4949" style="margin-bottom: 5px;")
       el-row
-          el-col
         span 制热启停温度(℃)：
-            el-input(v-model="params[0].heating_start_temperature" size="mini" style="width: 50px")
+        el-input-number(v-model="params[0].heating_start_temperature" size="mini" :controls='false' :min='0' :max='100' style="width: 65px")
         span(style="margin:0 10px") -
-            el-input(v-model="params[0].heating_stop_temperature" size="mini" style="width: 50px")
+        el-input-number(v-model="params[0].heating_stop_temperature" size="mini" :controls='false' :min='0' :max='100' style="width: 65px")
       el-row
-          el-col
         span 热风启停温度(℃)：
-            el-input(v-model="hotWindStart" size="mini" style="width: 50px")
+        el-input-number(v-model="hotWindStart" size="mini" :controls='false' :min='0' :max='100' style="width: 65px")
         span(style="margin:0 10px") -
-            el-input(v-model="hotWindEnd" size="mini" style="width: 50px")
+        el-input-number(v-model="hotWindEnd" size="mini" :controls='false' :min='0' :max='100' style="width: 65px")
     //- el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'||dataForm.type=='f4c840711eae4bcb9536a890cdfda493'")
     //-   el-col(:span="16" )
     //-     span 频率设置：
@@ -95,7 +93,8 @@
             el-button(type="primary", size="mini", style="margin-left: 10px" disabled) 停止
 
   .info-state(v-if="this.params && this.params.length > 0")
-    span(style="font-weight: bold") 设备运行状态
+    p(style="font-weight: bold") 设备运行状态
+    div.stateWrap
       div(v-if="this.params.length && this.params[0].electric_energy")
         span.type 电量(kwh)：
         span.value {{ params[0].electric_energy }}
@@ -284,6 +283,37 @@ watch: {
           break
       }
       console.log('params运行状态', this.params)
+      // 风冷热泵机组一行显示两个状态
+      this.$nextTick(()=>{
+        let ele = this.$el.querySelectorAll('.info-state .stateWrap > div')
+        ele.forEach(i=>{
+          if(this.params[0].resourceName.includes('热泵')){
+            i.style.width = '50%'
+          }else{
+            i.style.width = '100%'
+          }
+        })
+      })
+    },
+    // 故障复位
+    failureReset(){
+      this.$http({
+        url: this.$http.adornUrl('/equipment/onOrOff'),
+        method: 'post',
+        data: {
+          id: this.dataForm.id,
+          status: 1,
+          actionName: this.dataForm.name + "故障复位",
+          actionType: 12
+        }
+      }).then((data) => {
+        if (data && data.code === 0) {
+          this.$message.success(data.msg)
+          this.getDataList(this.pageIndex, this.pageSize)
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
     },
     setData() {
       this.dlsnjList = this.list.dlsnjList //多联室内机
@@ -430,14 +460,28 @@ watch: {
 }
 .info-state {
   padding: 0 10px 10px;
+  .stateWrap{
+    display: flex;
+    flex-wrap: wrap;
+    & > div{
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+      line-height: 24px;
+      .type{
+        line-height: 10px;
+      }
+    }
+  }
   .type {
     font-size: 14px;
     margin: 5px 0 0 10px;
     display: inline-block;
-    width: 135px;
+    // width: 135px;
   }
   .value {
     color: #47b320;
+    margin-right: 18%;
   }
 }
 .el-table__header {
@@ -478,7 +522,7 @@ watch: {
   position: absolute;
   top: 15px;
   right: 0;
-  width: 390px;
+  width: 400px;
   background-color: #f4f4f4;
   z-index: 11;
   border: 1px solid rgba(195, 195, 195, 1);