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

src/pages/components/enTable.vue

 <template>
   <div class="en-table">
     <el-table
-      border
       stripe
       :data="tableData"
       style="width: 100%"
@@ -29,6 +28,7 @@
         v-if="isShowOp"
         align="center"
         label="操作"
+        fixed='right'
         :width="opNum * 65"
       >
         <template slot-scope="scope">

src/pages/eq/hall/config.js

@@ -2,7 +2,8 @@
     {
       align: 'center',
       prop: 'name',
-      label: '设备名称'
+      label: '设备名称',
+      width: 180
     },
     {
       align: 'center',
@@ -37,17 +38,22 @@
     {
       align: 'center',
       prop: 'heating_start_temperature',
-      label: '制热启动温度'
+      label: '制热启动温度',
+      width: 120
     },
     {
       align: 'center',
       prop: 'heating_stop_temperature',
-      label: '制热停止温度'
+      label: '制热停止温度',
+      width: 120
+
     },
     {
       align: 'center',
       prop: 'indoor_ambient_temperature',
-      label: '室内环境温度'
+      label: '室内环境温度',
+      width: 120
+
     },
     {
       align: 'center',
@@ -62,12 +68,16 @@
     {
       align: 'center',
       prop: 'hot_air_start_temperature',
-      label: '热风启动温度'
+      label: '热风启动温度',
+      width: 120
+
     },
     {
       align: 'center',
       prop: 'hot_air_stop_temperature',
-      label: '热风停止温度'
+      label: '热风停止温度',
+      width: 120
+
     },
     {
       align: 'center',

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

@@ -59,34 +59,34 @@
       span.value {{params[0].hot_water_mode}}
     div(v-if='this.params.length&&this.params[0].water_supply_temperature')
       span.type 供水温度：
-      span.value {{params[0].water_supply_temperature}}
+      span.value {{params[0].water_supply_temperature}}℃
     div(v-if='this.params.length&&this.params[0].return_water_temperature')
       span.type 回水温度：
-      span.value {{params[0].return_water_temperature}}
+      span.value {{params[0].return_water_temperature}}℃
     div(v-if='this.params.length&&this.params[0].heating_start_temperature')
       span.type 制热启动温度：
-      span.value {{params[0].heating_start_temperature}}
+      span.value {{params[0].heating_start_temperature}}℃
     div(v-if='this.params.length&&this.params[0].heating_stop_temperature')
       span.type 制热停止温度：
-      span.value {{params[0].heating_stop_temperature}}
+      span.value {{params[0].heating_stop_temperature}}℃
     div(v-if='this.params.length&&this.params[0].indoor_ambient_temperature')
       span.type 室内环境温度：
-      span.value {{params[0].indoor_ambient_temperature}}
+      span.value {{params[0].indoor_ambient_temperature}}℃
     div(v-if='this.params.length&&this.params[0].outlet_temperature')
       span.type 出风温度：
-      span.value {{params[0].outlet_temperature}}
+      span.value {{params[0].outlet_temperature}}℃
     div(v-if='this.params.length&&this.params[0].return_air_temperature')
       span.type 回风温度：
-      span.value {{params[0].return_air_temperature}}
+      span.value {{params[0].return_air_temperature}}℃
     div(v-if='this.params.length&&this.params[0].hot_air_start_temperature')
       span.type 热风启动温度：
-      span.value {{params[0].hot_air_start_temperature}}
+      span.value {{params[0].hot_air_start_temperature}}℃
     div(v-if='this.params.length&&this.params[0].hot_air_stop_temperature')
       span.type 热风停止温度：
-      span.value {{params[0].hot_air_stop_temperature}}
+      span.value {{params[0].hot_air_stop_temperature}}℃
     div(v-if='this.params.length&&this.params[0].temperature')
       span.type 温度：
-      span.value {{params[0].temperature}}
+      span.value {{params[0].temperature}}℃
     div(v-if='this.params.length&&this.params[0].humidity')
       span.type 湿度：
       span.value {{params[0].humidity}}
@@ -110,7 +110,7 @@
       span.value {{params[0].radiation}}
     div(v-if='this.params.length&&this.params[0].setting_temperature')
       span.type 设定温度：
-      span.value {{params[0].setting_temperature}}
+      span.value {{params[0].setting_temperature}}℃
     div(v-if='this.params.length&&this.params[0].setting_mode')
       span.type 设定模式：
       span.value {{params[0].setting_mode}}
@@ -245,7 +245,7 @@ export default {
     font-size: 14px;
     margin: 5px 0 0 10px;
     display: inline-block;
-    width: 85px;
+    width: 105px;
   }
   .value {
     color: #47b320;

src/pages/kb/indoor/index.vue

@@ -15,19 +15,19 @@ card-warp(title="室内气象数据", height="45px", showBackground)
     .data-warp
       .data-item
         .type 温度
-        .color-blue
+        .color-blue(v-if='hcdtSnqx')
           span.num(v-if="activeName == 1") {{ hcdtSnqx.temperature }}
           span.num(v-else) {{ bgqySnqx.temperature }}
           span.unit ℃
       .data-item
         .type 湿度
-        .color-cyan
+        .color-cyan(v-if='hcdtSnqx')
           span.num(v-if="activeName == 1") {{ hcdtSnqx.humidity }}
           span.num(v-else) {{ bgqySnqx.humidity }}
           span.unit %RH
       .data-item
         .type CO2
-        .color-green
+        .color-green(v-if='hcdtSnqx')
           span.num(v-if="activeName == 1") {{ hcdtSnqx.carbon_dioxide }}
           span.num(v-else) {{ bgqySnqx.carbon_dioxide }}
           span.unit PPM

src/pages/sys/point/index.vue

 <template lang="pug">
     //div(onselectstart="return false;"  @mousedown="regionMousedown" @mousemove="regionMousemove" @mouseup="regionMouseup")
     div(onselectstart="return false;")
-        div(class="top_button" style="width:100%;height:40px; padding-top:3px")
+        div(class="top_button" style="width:100%;height:40px; padding-top:3px;overflow:hidden;")
             div(style="float:left;margin-left:16px;")
                 div(:class="[item.value,iconId==item.id?item.value+'2':'']" name="iconListNow" :title="item.name" :style="{cursor:editable?'pointer':''}" :id="item.id" @click="changeIcon(item)" v-for="item in typeList")
             div(style="float:right; margin-top:6px;")