页面调整

src/pages/eq/hall/page.vue

@@ -3,7 +3,7 @@
     <cardList cardListTitle="候车大厅控制">
       <div slot="content">
         <div>
-          <el-form :inline="true" :model="formData" label-width="100">
+          <el-form :inline="true" label-width="100">
             <el-row :gutter="10">
               <el-col :span="12">
                 <el-form-item label="模式选择：">
@@ -46,47 +46,88 @@
                     @click="timingControl"
                     >定时温控</el-button
                   >
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+
         <el-dialog
           title="定时温控"
           :visible.sync="timingControlDialogVisible"
           append-to-body
           width="40%"
         >
-                    <div v-if="isSaving == 1">
-                      <el-form :inline="true">
+          <el-form
+            :inline="true"
+            :model="formData"
+            label-width="100"
+            :rules="dataRule"
+            ref="dataForm"
+          >
             <el-row>
-                          <el-form-item label="温度设定(℃)：">
-                            <el-input size="mini" v-model="formData.temperature" clearable="" ></el-input>
+              <el-form-item label="温度设定(℃)：" prop="temperature">
+                <el-input
+                  size="mini"
+                  v-model="formData.temperature"
+                  clearable=""
+                ></el-input>
               </el-form-item>
               <el-form-item>
-                            <el-button type="primary" size="mini" @click="changeTemperature()">确定</el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="changeTemperature()"
+                  >确定</el-button
+                >
               </el-form-item>
             </el-row>
             <el-row>
-                          <el-form-item label="定时功能启止时间：">
-                            <el-time-select size="mini" placeholder="起始时间" v-model="formData.startTime"
-                              :picker-options="{ start: '00:00',step: '00:15',end: '24:00'}">
+              <el-form-item label="定时功能起止时间：">
+                <el-time-select
+                  size="mini"
+                  placeholder="起始时间"
+                  v-model="formData.startTime"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:15',
+                    end: '24:00'
+                  }"
+                >
                 </el-time-select>
                 <span style="padding: 0 10px">至</span>
-                            <el-time-select size="mini" placeholder="结束时间" v-model="formData.endTime"
-                              :picker-options="{ start: '00:00',step: '00:15',end: '24:00',minTime: formData.startTime}">
+                <el-time-select
+                  size="mini"
+                  placeholder="结束时间"
+                  v-model="formData.endTime"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '00:15',
+                    end: '24:00',
+                    minTime: formData.startTime
+                  }"
+                >
                 </el-time-select>
               </el-form-item>
               <el-form-item>
-                            <div class="switch-warp" style="transform: translateY(5px)" >
-                              <div :class="[isOpen == 1 ? 'on' : '']" @click="setSendTime(1)" > 开 </div>
-                              <div :class="[isOpen == 2 ? 'on' : '']" @click="setSendTime(2)" > 关 </div>
+                <div class="switch-warp" style="transform: translateY(5px)">
+                  <div
+                    :class="[isOpen == 1 ? 'on' : '']"
+                    @click="setSendTime(1)"
+                  >
+                    开
+                  </div>
+                  <div
+                    :class="[isOpen == 2 ? 'on' : '']"
+                    @click="setSendTime(2)"
+                  >
+                    关
                   </div>
-                          </el-form-item>
-                        </el-row>                      
-                      </el-form>
                 </div>
-                  </el-dialog>
               </el-form-item>
-              </el-col>
             </el-row>
           </el-form>
-        </div>
+        </el-dialog>
         <!-- tabs -->
         <div style="margin-bottom: 20px">
           <!-- <en-tabs :tabList="tabList"></en-tabs> -->
@@ -102,68 +143,13 @@
           </div>
         </div>
         <!-- table  -->
-        <table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentModel'>
-          <template v-slot:operation="scope">
-            <el-button
-              type="text"
-              v-if="activeTab != 'c788ce98c1f248f590434394da485ce4'"
-              @click="statusHandle"
-              >开启</el-button
-            >
-            <el-button
-              type="text"
-              v-if="activeTab != 'c788ce98c1f248f590434394da485ce4'"
-              @click="statusHandle"
-              >关闭</el-button
-            >
-            <el-button
-              type="text"
-              @click="statusHandle"
-              v-if="activeTab == 'b45827c068254695864ee3c1d42573cb'"
-              >故障复位</el-button
-            >
-            <el-button
-              type="text"
-              @click="handleBtnClick(scope.scope.row)"
-              v-if="
-                activeTab == '303310efddb34a2e9bf269bdff8a7dc5' ||
-                activeTab == 'f4c840711eae4bcb9536a890cdfda493'
-              "
-              >设置频率</el-button
-            >
-            <el-button
-              type="text"
-              @click="statusHandle"
-              v-if="activeTab == 'c788ce98c1f248f590434394da485ce4'"
-              >上升</el-button
-            >
-            <el-button
-              type="text"
-              @click="statusHandle"
-              v-if="activeTab == 'c788ce98c1f248f590434394da485ce4'"
-              >下降</el-button
-            >
-            <el-button
-              type="text"
-              @click="statusHandle"
-              v-if="activeTab == 'c788ce98c1f248f590434394da485ce4'"
-              >停止</el-button
-            >
-            <el-button
-              type="text"
-              @click="handleUpAndDownBtnClick"
-              v-if="activeTab == 'c788ce98c1f248f590434394da485ce4'"
-              >定时升降</el-button
-            >
-          </template>
-        </table-list>
-        <!-- <enTable
-          :tableData="tableData"
+        <table-list
           :tableColums="tableColums"
-          :isShowOp="true"
-          isShowPage="true"
-          :showStateColor='true'
-          :currentMode='currentId && active ? currentId :null'
+          :tableData="tableData"
+          :showOpr="true"
+          :opNum="3"
+          :showStateColor="true"
+          :currentMode="currentModel"
         >
           <template v-slot:operation="scope">
             <el-button
@@ -218,7 +204,7 @@
               >定时升降</el-button
             >
           </template>
-        </enTable> -->
+        </table-list>
       </div>
     </cardList>
     <table-pagination
@@ -254,7 +240,7 @@ export default {
     hallModal,
     tablePagination,
     setUpAndDown,
-    tableList,
+    tableList
   },
   data() {
     return {
@@ -322,6 +308,15 @@ export default {
           label: '电动排烟窗'
         }
       ],
+      dataRule: {
+        temperature: [
+          {
+            required: true,
+            pattern: /^[0-9]+([.][0-9]{1}){0,1}$/,
+            message: '温度必须是数字或者一位小数，'
+          }
+        ]
+      },
       hallModalVisible: false,
       timingControlDialogVisible: false
     }
@@ -604,6 +599,8 @@ export default {
     },
     // 设置定时任务
     setSendTime(type) {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
           if (!this.formData.startTime || !this.formData.endTime) {
             this.$message.error('定时功能启止时间不能为空！')
             return
@@ -629,12 +626,12 @@ export default {
               this.getAllDswk()
             }
           })
+        }
+      })
     },
     changeTemperature() {
-      if (!this.formData.temperature) {
-        this.$message.error('温度不能为空！')
-        return
-      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
           this.$http({
             url: this.$http.adornUrl('/equipment/changeTemperature'),
             method: 'post',
@@ -647,6 +644,8 @@ export default {
               this.getAllDswk()
             }
           })
+        }
+      })
     },
     // 定时温控
     timingControl() {
@@ -711,7 +710,7 @@ export default {
 .el-table__body-wrapper {
   min-height: 400px;
 }
-.el-dialog .el-form .el-input.el-date-editor{
+.el-dialog .el-form .el-input.el-date-editor {
   width: 110px;
 }
 </style>

src/pages/sys/commandlog/index.vue

@@ -4,7 +4,7 @@
         div(slot='content')
           div.tableCard()
               el-form( :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()" )
-                  el-form-item( label="关键词:")
+                  el-form-item( label="指令内容:")
                       el-input(  v-model="dataForm.comMark" placeholder="" clearable)
                   el-form-item( label="指令类型:")
                       el-select( v-model="dataForm.comType" placeholder="请选择" clearable)
@@ -22,7 +22,7 @@
               font(v-if='data.scope.comSource == 2') 人工
             template(#comType='data' )
               font(v-if='data.scope.comType == 1') 自动
-              font(v-if='data.scope.comType == 2') 手动
+              font(v-if='data.scope.comType == 2') 人工
             template(#operation="data")
               el-button(type="text"  size="mini" @click="queryHandle(data.scope.id)") 详情
       el-footer.box_footer

src/pages/sys/commandlog/query-detail.vue

@@ -37,7 +37,7 @@
             </el-form-item>
             <el-form-item label='指令类型:' prop='comType'>
               <el-input v-if="dataForm.comType==1" value="自动" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.comType==2" value="手动" size="medium" readonly></el-input>
+              <el-input v-if="dataForm.comType==2" value="人工" size="medium" readonly></el-input>
             </el-form-item>
             <el-form-item label='指令来源:' prop='comSource'>
               <el-input v-if="dataForm.comSource==1" value="算法" size="medium" readonly></el-input>