页面调整

src/pages/eq/hall/page.vue

@@ -39,27 +39,33 @@
                     <!-- <img :src="item.src" alt="" /> -->
                     {{ item.name }}
                   </el-button>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24" v-if="isSaving == 1">
-                <el-form-item label="温度设定(℃)：">
-                  <el-input
-                    size="mini"
-                    v-model="formData.temperature"
-                    clearable=""
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="">
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click="changeTemperature()"
-                    >确定</el-button
+                  <el-button style="margin-left:30px" type="info" size="mini" @click="timingControl">定时温控</el-button>
+                  <el-dialog
+                    title="定时温控"
+                    :visible.sync="timingControlDialogVisible"
+                    append-to-body
+                    width="40%"
                   >
-                </el-form-item>
+                    <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-form-item label="定时功能启止时间：">
+                      <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"
@@ -72,6 +78,7 @@
                           </el-time-select>
                           <span style="padding: 0 10px">至</span>
                           <el-time-select
+                            style="width:40%"
                             size="mini"
                             placeholder="结束时间"
                             v-model="formData.endTime"
@@ -83,22 +90,16 @@
                             }"
                           >
                           </el-time-select>
-                </el-form-item>
-                <el-form-item>
+                        </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)"
-                    >
-                      关
+                            <div :class="[isOpen == 1 ? 'on' : '']" @click="setSendTime(1)" > 开 </div>
+                            <div :class="[isOpen == 2 ? 'on' : '']" @click="setSendTime(2)" > 关 </div>
                           </div>  
+                        </el-col>                    
+                      </el-row>    
                     </div>
+                  </el-dialog>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -280,7 +281,9 @@ export default {
           label: '电动排烟窗'
         }
       ],
-      hallModalVisible: false
+      hallModalVisible: false,
+      timingControlDialogVisible: false,
+
     }
   },
   computed: {
@@ -590,6 +593,10 @@ export default {
           this.getAllHcdt()
         }
       })
+    },
+    // 定时温控
+    timingControl(){
+      this.timingControlDialogVisible = true
     }
   }
 }
@@ -646,4 +653,7 @@ export default {
   background: #4cb527 !important;
   border: 1px solid transparent;
 }
+.el-table__body-wrapper{
+  height: 400px;
+}
 </style>

src/pages/eq/view/index.vue

@@ -61,7 +61,7 @@
           <div v-show="transformationSta==1">
             <el-row style="padding-bottom:15px;height:780px;background:#fff;" :span="24">
               <el-col class="resource-container" :style="obj" ref="drag">
-                <div id="map" class="map" ref='map'  style="width: 100%;height: 720px;position:relative;"></div>
+                <div id="map" class="map" ref='map'  style="width: 100%;height: 720px;position:relative;" ></div>
               </el-col>
             </el-row>
           </div>
@@ -72,7 +72,7 @@
           //- </div>
         </el-card>
       </el-main>
-      <query-detail v-if='queryDetailVisible' ref='queryDetail' @closeQ="closeQueryDetailVisible"></query-detail>
+      <query-detail v-if='queryDetailVisible' ref='queryDetail' @closeQ="closeQueryDetailVisible" @click.stop></query-detail>
     </el-container>
   </div>
 
@@ -188,6 +188,12 @@ export default {
     this.initTreeStationMap()
     this.initResourceTypeDicList()
   },
+  mounted(){
+    document.body.addEventListener('click',()=>{
+      console.log('触发');
+      this.queryDetailVisible = false;
+    },false);
+  },
   methods: {
     // 初始化地图
     initMap(url) {
@@ -382,12 +388,14 @@ export default {
         }),
         text: new Text({
           text: name, // 添加文字描述
-          font: '14px font-size', // 设置字体大小
+          font: 'bold 14px font-size', // 设置字体大小
           fill: new Fill({
             // 设置字体颜色
-            color: 'black'
+            color: 'black',
+            // font:'normal bold 18px sans-serif'
           }),
-          offsetY: 30 // 设置文字偏移量
+          offsetY: 30, // 设置文字偏移量
+          // offsetX: 10 // 设置文字偏移量
         })
       })
       return style

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

 <template lang="pug">
-.animation
+.animation(close-on-click-modal)
   .info-title
     | {{ dataForm.name }}
     //- | 空调

src/pages/sys/point/add-or-update.vue

@@ -49,7 +49,7 @@
                                 el-select(v-model="dataForm.region" placeholder="请选择所属区域" )
                                     el-option(v-for="(item,index) in regionList" :key="index" :label="item.name" :value="item.id" :code="item.id")
                             el-form-item(label='人工模式:' prop='modeTypes')
-                                el-checkbox-group(v-model="dataForm.modeTypes" placeholder="请选择人工模式" clearable)
+                                el-checkbox-group(v-model="dataForm.modeTypes" placeholder="请选择人工模式" @change="checkGroupChange($event)")
                                     el-checkbox(v-for="(item, index) in modeList" :key="index" :label="item.id") {{item.name}}
                             el-form-item(label='部署位置:' prop='deployLocation')
                                 el-input(v-model='dataForm.deployLocation' placeholder='请填写部署位置')
@@ -344,6 +344,8 @@ export default {
         if (this.dataForm.modeTypes) {
           console.log('111111:')
           this.dataForm.modeTypes = this.dataForm.modeTypes.split(',')
+        }else{
+          this.dataForm.modeTypes = []
         }
       }
       console.log('dataForm:', this.dataForm)
@@ -638,6 +640,10 @@ export default {
         })
       })
       return style
+    },
+    // 多选框组改变事件
+    checkGroupChange(val){
+      this.$set(this.dataForm,this.dataForm.modeTypes,val)
     }
   }
 }