Merge

src/pages/eq/office/page.vue

@@ -3,18 +3,51 @@
     <cardList cardListTitle="办公区域控制">
       <div slot="content">
         <el-tabs class="en-tabs" v-model="activeTab">
-          <el-tab-pane :label="item.label" :name="item.id" v-for="(item, index) in officeTabList" :key="index"></el-tab-pane>
+          <el-tab-pane
+            :label="item.label"
+            :name="item.id"
+            v-for="(item, index) in officeTabList"
+            :key="index"
+          ></el-tab-pane>
         </el-tabs>
         <div style="margin-top: 20px"></div>
-        <table-list :tableColums="tableColums" :tableData="tableData" :showOpr="true" :opNum="3" :showStateColor="true" :currentMode="currentModel">
+        <table-list
+          :tableColums="tableColums"
+          :tableData="tableData"
+          :showOpr="true"
+          :opNum="3"
+          :showStateColor="true"
+          :currentMode="currentModel"
+        >
           <template v-slot:operation="scope">
-            <el-button type="text" @click="statusHandle(scope.scope,1)">开启</el-button>
-            <el-button type="text" @click="statusHandle(scope.scope,2)">关闭</el-button>
-            <el-button v-if="activeTab != 'b6af764f2a6e454490a6b1b3c9057e57'" type="text" @click="settingJfkt(scope.scope,3)">设置</el-button>
+            <el-button type="text" @click="statusHandle(scope.scope, 1)"
+              >开启</el-button
+            >
+            <el-button type="text" @click="statusHandle(scope.scope, 0)"
+              >关闭</el-button
+            >
+            <el-button
+              v-if="activeTab != 'b6af764f2a6e454490a6b1b3c9057e57'"
+              type="text"
+              @click="settingJfkt(scope.scope, 3)"
+              >设置</el-button
+            >
           </template>
         </table-list>
-        <el-dialog title="空调设置" :visible.sync="jfktDialogVisible" append-to-body width="28%">
-          <el-form label-position="" :inline="true" :model="formData" label-width="150px" :rules="dataRule" ref="dataForm">
+        <el-dialog
+          title="空调设置"
+          :visible.sync="jfktDialogVisible"
+          append-to-body
+          width="28%"
+        >
+          <el-form
+            label-position=""
+            :inline="true"
+            :model="formData"
+            label-width="100"
+            :rules="dataRule"
+            ref="dataForm"
+          >
             <!-- <el-row>
               <el-form-item label="启停控制：" prop="temperature">
                 <el-switch v-model="newObject.state" active-text="开" inactive-text="关"></el-switch>
@@ -22,37 +55,70 @@
             </el-row> -->
             <el-row>
               <el-form-item label="温度设定(℃)：" prop="temperature">
-                <el-input size="mini" v-model.number="formData.temperature" clearable=""></el-input>
+                <el-input
+                  size="mini"
+                  v-model.number="formData.temperature"
+                  clearable=""
+                ></el-input>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" size="mini" @click="changeTemperature2()" >确定</el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="changeTemperature2()"
+                  >确定</el-button
+                >
               </el-form-item>
             </el-row>
             <el-row>
               <el-form-item label="选择模式：" prop="xzms">
                 <el-select v-model="formData.xzms" placeholder="请选择" size="mini">
-                  <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                  <el-option
+                    v-for="item in options1"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" size="mini" @click="changeTemperature3()" >确定</el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="changeTemperature3()"
+                  >确定</el-button
+                >
               </el-form-item>
             </el-row>
             <el-row>
               <el-form-item label="选择风速：" prop="xzfs">
                 <el-select v-model="formData.xzfs" placeholder="请选择" size="mini">
-                  <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" size="mini" @click="changeTemperature4()" >确定</el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="changeTemperature4()"
+                  >确定</el-button
+                >
               </el-form-item>
             </el-row>
           </el-form>
         </el-dialog>
       </div>
     </cardList>
-    <table-pagination :pageSize="pageSize" :totalSize="totalSize" @parentMethod="getDataList"></table-pagination>
+    <table-pagination
+      :pageSize="pageSize"
+      :totalSize="totalSize"
+      @parentMethod="getDataList"
+    ></table-pagination>
   </div>
 </template>
 <script>
@@ -123,40 +189,20 @@ export default {
           { type: 'number', message: '温度必须为数字' },
           { validator: validateNumber, trigger: ['blur', 'change'] }
         ],
-        xzms: [
-          { required: true, message: '请选择模式' }
-        ],
-        xzfs: [
-          { required: true, message: '请选择风速' }
-        ]
+        xzms: [{ required: true, message: '请选择模式' }],
+        xzfs: [{ required: true, message: '请选择风速' }]
       },
       options1: [
-        { value: '1',
-          label: '自动模式'
-        },
-        { value: '2',
-          label: '制冷模式'
-        },
-        { value: '4',
-          label: '除湿模式'
-        },
-        { value: '8',
-          label: '送风模式'
-        },
-        { value: '16',
-          label: '制热模式'
-        }
+        { value: '1', label: '自动模式' },
+        { value: '2', label: '制冷模式' },
+        { value: '4', label: '除湿模式' },
+        { value: '8', label: '送风模式' },
+        { value: '16', label: '制热模式' }
       ],
       options2: [
-        { value: '2',
-          label: '高风'
-        },
-        { value: '4',
-          label: '中风'
-        },
-        { value: '8',
-          label: '低风'
-        }
+        { value: '2', label: '高风' },
+        { value: '4', label: '中风' },
+        { value: '8', label: '低风' }
       ]
     }
   },
@@ -358,7 +404,7 @@ export default {
         data: {
           id: row.id,
           status: status,
-          actionName: row.name + status == 1 ? '开启' : '关闭',
+          actionName: row.name + (status == 1 ? '开启' : '关闭'),
           actionType: 1
         }
       }).then((data) => {
@@ -405,7 +451,8 @@ export default {
         data: {
           id: this.newObject.id,
           status: this.formData.temperature,
-          actionName: this.newObject.name + '设定温度控制为:' + temperature,
+          actionName:
+            this.newObject.name + '设定温度控制为:' + this.formData.temperature,
           actionType: 2
         }
       }).then((data) => {
@@ -449,11 +496,11 @@ export default {
     },
     changeTemperature4() {
       let com = ''
-      if (this.formData.xzfs == 1) {
+      if (this.formData.xzfs == 2) {
         com = '设置风速为：高风'
-      } else if (this.formData.xzfs == 2) {
-        com = '设置风速为：中风'
       } else if (this.formData.xzfs == 4) {
+        com = '设置风速为：中风'
+      } else if (this.formData.xzfs == 8) {
         com = '设置风速为：低风'
       }
       this.$http({