tj

src/pages/eq/hall/page.vue

@@ -733,6 +733,7 @@ export default {
     },
     // 设置定时任务
     setSendTime(type) {
+      if(type == this.isOpen) return
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           if (!this.formData.startTime || !this.formData.endTime) {

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

@@ -25,23 +25,24 @@
       p.leftP 设备型号：   {{ dataForm.equipmentModel }}
     .quDetailM
       p.leftP 安装日期：   {{ dataForm.installDate }}
-  .info-form(v-if='$store.state.d2admin.paramsList.list.syBean.type == 1' :style="{'border-bottom':(['b45827c068254695864ee3c1d42573cb','b6af764f2a6e454490a6b1b3c9057e57','173466a2cf9a42a6a17b2bdfbeae36d5','f4c840711eae4bcb9536a890cdfda493'].includes(dataForm.type))&&$store.state.d2admin.paramsList.list.syBean.type == 1 ? '1px solid #c0c0c0': ''}" )
+  .info-form(style="border-bottom: 1px solid #c0c0c0" )
     //- | {{dataForm.status}}
     //- el-row.text-size(v-if="openOrClose.indexOf(dataForm.type)>-1")
-    //- 室外气象站、（室内气象站）传感器、卷帘门不需要开启关闭选项
-    el-row.text-size(v-if="!['9a570e608d0840499551eca89d76449d','507ba9ae22174e4dbbf32dbf34dd7139','c788ce98c1f248f590434394da485ce4'].includes(dataForm.type)")
+    el-row.text-size
       el-col(:span='10') 当前已
         span(v-if="dataForm.status == 1") 运行
         span(v-else-if="dataForm.status == 2") 停止
         span(v-else-if="dataForm.status == 3") 离线
         span(v-else-if="dataForm.status == 4") 故障
-      el-col(:span='10' v-if="dataForm.status == 1 || dataForm.status ==2")
-        .switch-warp
+      //- 人工模式，风冷热泵机组、水泵、排风机、多联新风室内机  才需要开关按钮
+      el-col(:span='10' v-if="isManual && (['b45827c068254695864ee3c1d42573cb','f4c840711eae4bcb9536a890cdfda493','b6af764f2a6e454490a6b1b3c9057e57','8f0787103561423887324f8ac3c36b89'].includes(dataForm.type)) ")
+        .switch-warp(v-if='dataForm.status == 1 || dataForm.status ==2')
           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-if="dataForm.status ==4")
-        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-button(v-if='dataForm.status ==4' type='primary' size='mini' @click="failureReset") 故障复位
+    //- 控制区域  只有人工模式才需要显示
+    div(v-if='isManual')
+      el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5' && dataForm.status==1 ")
         el-col(:span="16" )
           span 温度设定(℃)：
           el-input-number(v-model="temperature" size="mini" :controls='false' :precision='0' style="width: 90px")
@@ -105,7 +106,7 @@
               el-button(type="primary", size="mini", style="margin-left: 10px" disabled) 停止
 
   .info-state(v-if="this.params && this.params.length > 0")
-    p(style="font-weight: bold") 设备运行状态
+    p(style="font-weight: bold; margin: 10px 0") 设备运行状态
     div.stateWrap
       div(v-if="this.params.length && this.params[0].electric_energy")
         span.type 电量(kwh)：
@@ -193,7 +194,13 @@ import { mapState } from 'vuex'
 export default {
   computed: {
     ...mapState('d2admin/user', ['info']),
-    ...mapState('d2admin/paramsList', ['list'])
+    ...mapState('d2admin/paramsList', ['list']),
+    // 判断是否是人工模式，用来控制按钮是否显示
+    isManual(){
+      if(this.$store.state.d2admin.paramsList.list.syBean.type ==1){
+        return true
+      }
+    }
   },
 watch: {
     list: {
@@ -245,6 +252,7 @@ watch: {
       hotWindStart: null,
       hotWindEnd: null,
       frequency: null,
+      // isManual: true
     }
   },
 
@@ -656,10 +664,9 @@ watch: {
 }
 .animation {
   animation: myfirst 1s;
-  position: absolute;
-  // top: 15px;
-  top: 50%;
-  transform: translate(0, -50%);
+  position: fixed;
+  bottom: calc(50% + 65px);
+  transform: translateY(50%);
   right: 0;
   width: 420px;
   background-color: #f4f4f4;