提交

src/assets/style/public.scss

@@ -115,7 +115,7 @@ $el-bg-color-4: #F2F6FC;
 //  表格大概样式
 .hall,.office-area-control,.use-electro-data {
   .el-table__row > td {
-    border: none;
+    // border: none;
   }
   th{
     background: rgba(0, 151, 255, 0.08);

src/pages/eq/hall/page.vue

@@ -53,79 +53,33 @@
                     width="40%"
                   >
                     <div v-if="isSaving == 1">
-                      <el-row :gutter="5">
-                        <el-col :span="5">
-                          <el-form-item label="温度设定(℃)："></el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                          <el-input
-                            size="mini"
-                            v-model="formData.temperature"
-                            clearable=""
-                          ></el-input>
-                        </el-col>
-                        <el-col :span="4">
-                          <el-button
-                            type="primary"
-                            size="mini"
-                            @click="changeTemperature()"
-                            >确定</el-button
-                          >
-                        </el-col>
-                      </el-row>
-
-                      <el-row :gutter="5">
-                        <el-col :span="5">
-                          <el-form-item label="定时功能启止时间：" />
-                        </el-col>
-                        <el-col :span="10">
-                          <el-time-select
-                            style="width: 40%"
-                            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
-                            style="width: 40%"
-                            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-col>
-                        <el-col :span="4">
-                          <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)"
-                            >
-                              关
+                      <el-form :inline="true">
+                        <el-row>
+                          <el-form-item label="温度设定(℃)：">
+                            <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-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-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>
+                          </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>
-                          </div>
-                        </el-col>
-                      </el-row>
+                          </el-form-item>
+                        </el-row>                      
+                      </el-form>
                     </div>
                   </el-dialog>
                 </el-form-item>
@@ -148,7 +102,7 @@
           </div>
         </div>
         <!-- table  -->
-        <table-list :tableColums='tableColums' :tableData='tableData'  :showOpr='true'  :opNum='3' :showStateColor='true' :currentMode='currentId && active ? currentId :null'>
+        <table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentId && active ? currentId : null'>
           <template v-slot:operation="scope">
             <el-button
               type="text"
@@ -751,7 +705,10 @@ export default {
   background: #4cb527 !important;
   border: 1px solid transparent;
 }
-// .el-table__body-wrapper {
-//   height: 400px;
-// }
+.el-table__body-wrapper {
+  min-height: 400px;
+}
+.el-input.el-date-editor{
+  width: 110px;
+}
 </style>

src/pages/eq/view/index.vue

@@ -189,10 +189,7 @@ export default {
     this.initResourceTypeDicList()
   },
   mounted(){
-    document.body.addEventListener('click',()=>{
-      console.log('触发');
-      this.queryDetailVisible = false;
-    },false);
+    
   },
   methods: {
     // 初始化地图
@@ -957,6 +954,10 @@ export default {
       this.$nextTick(() => {
         this.$refs.queryDetail.init(id, this.checkedData.sId)
       })
+      document.querySelector('canvas').addEventListener('click',()=>{
+        console.log('触发');
+        this.queryDetailVisible = false;
+      },false);
     },
 
     closeQueryDetailVisible() {

src/pages/kb/power/page.vue

@@ -86,11 +86,10 @@
         </enTable> -->
       </div>
     </cardList>
-    <tablePagination
-      :pageSize="pageSize"
-      :totalSize="totalSize"
-      @parentMethod="getDataList"
-    ></tablePagination>
+    <el-footer class="box_footer">
+      <tablePagination :pageSize="pageSize" :totalSize="totalSize" @parentMethod="getDataList">
+    </tablePagination></el-footer>
+
     <history-data-modal
       :historyDataModalVisible="historyDataModalVisible"
       ref="historyDataModal"
@@ -342,12 +341,4 @@ export default {
     margin-top: 15px;
   }
 }
-.box_main
-  /deep/.el-table
-  .el-table--fit
-  .el-table--striped
-  .el-table--enable-row-hover
-  .el-table--enable-row-transition {
-  border: 1px solid !important;
-}
 </style>