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

src/pages/eq/hall/page.vue

@@ -30,6 +30,7 @@
                     size="mini"
                     @click="handleType(item.id)"
                     v-for="item in typeList"
+                    :disabled='item.id==3'
                     :key="item.id"
                     :class="[
                       item.id == currentId && active ? 'isActive' : '',

src/pages/eq/office/page.vue

@@ -353,6 +353,7 @@ export default {
     // },
     // 获取数据列表
     getDataList(page, size) {
+        this.pageIndex = page
       this.$http({
         url: this.$http.adornUrl('/liResource/list'),
         method: 'post',
@@ -449,7 +450,6 @@ export default {
       }
     },
     statusHandle(row, status) {
-      console.log('row:', row)
       this.$http({
         url: this.$http.adornUrl('/equipment/onOrOff'),
         method: 'post',
@@ -462,7 +462,7 @@ export default {
       }).then((data) => {
         if (data && data.code === 0) {
           this.$message.success(data.msg)
-          this.getDataList()
+          this.getDataList(this.pageIndex, this.pageSize)
         } else {
           this.$message.error(data.msg)
         }

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

@@ -38,13 +38,13 @@
         .switch-warp
           div(:class="[dataForm.status == 1 ? 'on' : '']", @click="handleSwitch(1)" ) 打开
           div(:class="[dataForm.status == 2 ? 'on' : '']", @click="handleSwitch(0)" ) 关闭
-    el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'")
+    el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'&&dataForm.status==1")
       el-col(:span="16" )
         span 温度设定：
         el-input(size="mini", style="width: 80px", v-model="temperature")
         span  (℃)
         el-button(type="primary", size="mini", style="margin-left: 3px",@click="handleSwitch2(1)") 设定
-    el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'")
+    el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'&&dataForm.status==1")
       el-col(:span="16" )
         span 选择模式：
         el-select(size="mini" v-model="models" placeholder="请选择模式类型" style="width: 106px")
@@ -54,7 +54,7 @@
           el-option(label="送风模式" value="8")
           el-option(label="制热模式" value="16")
         el-button(type="primary", size="mini", style="margin-left: 3px",@click="handleSwitch2(2)") 设定
-    el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'")
+    el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'&&dataForm.status==1")
       el-col(:span="16" )
         span 选择风速：
         el-select(size="mini" v-model="speed" placeholder="请选择风速类型" style="width: 106px")