Merge pull request 'pc-master' (#279) from pc-master into portal

Reviewed-on: #279

src/assets/css/main.css

@@ -31,6 +31,42 @@
   /*滚动条边角*/
 }
 
+.flex-title {
+  padding-top: 0;
+  justify-content: space-between;
+  border-bottom: 1px solid transparent;
+}
+
+.flex-title > div {
+  display: flex;
+  align-items: center;
+  font-size: 28px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+
+.flex-title > div > img {
+  width: 60px;
+  height: 60px;
+  margin-right: 15px;
+}
+
+.flex-title .table-title-btn {
+  font-size: 16px;
+}
+
+.flex-title .table-title-btn > img {
+  width: 14px;
+  height: 14px;
+  margin-right: 9px;
+}
+
+.flex-title .table-right {
+  font-size: 20px;
+  font-weight: boldflex-title;
+}
+
 .amap-marker .p_title {
   height: 44px;
   background: rgba(1, 12, 28, 0.7);
@@ -4524,12 +4560,6 @@ textarea {
   margin-top: 0;
 }
 
-.videoManage .flex-title {
-  padding-top: 0;
-  justify-content: space-between;
-  border-bottom: 1px solid transparent;
-}
-
 .el-table .el-table__body-wrapper::-webkit-scrollbar {
   /*滚动条整体*/
   width: 17px;

src/assets/css/main.scss

@@ -33,6 +33,38 @@
     }
 
 } 
+.flex-title {
+    padding-top: 0;
+    justify-content: space-between;
+    border-bottom: 1px solid transparent;
+    >div{
+        display: flex;
+        align-items: center;
+        font-size: 28px;
+    font-family: Microsoft YaHei;
+    font-weight: bold;
+    color: #FFFFFF;
+        >img{
+            width: 60px;
+            height: 60px;
+            margin-right: 15px;
+        }
+    }
+
+    .table-title-btn{
+        font-size: 16px;
+        >img{
+            width: 14px;
+            height: 14px;
+            margin-right: 9px;
+        }
+    }
+
+    .table-right{
+        font-size: 20px;
+        font-weight: boldflex-title;
+    }
+}
 .amap-marker{
     .p_title {
         // width:50px;
@@ -4798,11 +4830,6 @@ textarea {
         margin-top: 0;
     }
 
-    .flex-title {
-        padding-top: 0;
-        justify-content: space-between;
-        border-bottom: 1px solid transparent;
-    }
 
     // >.flex-view {
     //     justify-content: space-between;

src/views/index.vue

@@ -260,7 +260,7 @@ export default {
          initLeftList() {
                  this.leftList = [
                 { name: this.$t('index.home'), img: require('../assets/image/index-icon.png'), list: [], router: 'realTime', isRouter: true, },
-                { name: this.$t('index.greenhouse'), routerList: ['realTime', 'dataAnalysis', 'historyData','air-conditioning', 'exitSettings', 'videoMonitoring','imageData', 'skylight', 'control', 'systemSet-con', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img0.png'), list: [] },
+                { name: this.$t('index.greenhouse'), routerList: ['realTime', 'dataAnalysis', 'historyData','air-conditioning', 'exitSettings','heatFan', 'videoMonitoring','imageData', 'skylight', 'control', 'systemSet-con', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img0.png'), list: [] },
                 // { name: '二号温室', img: require('../assets/image/left-img1.png'), list: [] },
                 { name: this.$t('index.fertigation'), routerList: ['status-soil','formula', 'dataAnalysis', 'historyData', 'irrigateSet', 'videoMonitoring','imageData', 'PIDSet', 'systemSet', 'upload', 'sensorSet', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/left-img2.png'), list: [] },
                 { name:this.$t('index.smartIrrigation') , routerList: ['realTime', 'dataAnalysis', 'historyData','irrigateSet-soil', 'videoMonitoring','imageData','PIDSet-soil', 'systemSet-soil', 'upload-soil', 'sensorSet-soil', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/irrigateSet-icon1-act.png'), list: [] },

src/views/manage/deviceInfoManage.vue

@@ -1,7 +1,22 @@
 <template>
   <div class="deviceSet manage-page">
-    <div class="table-title">
+        <div class="flex-view flex-title">
-      <img src="../../assets/manageImg/deviceInfoManage.png" alt="">{{$t('deviceManagement.title')}}
+      <div class="table-title">
+      <img
+        src="../../assets/manageImg/deviceInfoManage.png"
+        alt=""
+      />设备信息管理
+    </div>
+        <el-tooltip  placement="bottom-end">
+           <div slot="content">设备信息管理：<br>
+            1.施肥机编辑修改得名称对应得是本页面实时数据，历史数据等...得名称，<br>对应小程序实时环境名称，温室设备名称，若需要修改摄像头请联系力禾<br>工作人员。修改更多名称修改得是对应施肥机设定值参数界面得名称。<br>
+            2.控制器编辑界面对应得和施肥机一样，权限编辑控制当前界面内《设定<br>值参数》界面，点击可显示或隐藏对应权限。<br>
+            3.智能控制器同理，编辑界面修改名称，修改更多名称对应《设定值参数》<br>界面，修改名称对应得是本页得设定值参数界面和小程序得设定值参数页<br>，生态气象站和数据采集器同理，主要得功能是修改名称
+           </div>
+     <div class="table-title-btn blue">
+       提示
+      </div>
+    </el-tooltip>
     </div>
     <div class="flex-view">
       <div class="manage-btn" @click="active = 0" :class="active == 0 ? 'active' : ''">

src/views/manage/deviceSet.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="deviceStatusSet manage-page">
-    <div class="table-title">
+    <div class="flex-view flex-title">
-      <img src="../../assets/manageImg/deviceSet.png" alt="">{{$t('deviceStatus.title')}}
+       <div class="table-title">
+      <img src="../../assets/manageImg/deviceSet.png" alt="" />设备状态设备
+    </div>
+        <el-tooltip  placement="bottom-end">
+           <div slot="content">控制器设备设备值设置：<br>
+            此处编辑别名和排序对应得是当前页面下《设定值参数》界面
+           </div>
+     <div class="table-title-btn blue">
+       提示
+      </div>
+    </el-tooltip>
     </div>
     <div class="flex-view scroll">
       <div class="manage-btn" v-for="item, index in topList" :key="index" @click="topChange(item, index)"

src/views/manage/deviceStatusSet.vue

@@ -1,7 +1,18 @@
 <template>
   <div class="deviceStatusSet manage-page">
-    <div class="table-title">
+       <div class="flex-view flex-title">
-      <img src="../../assets/manageImg/deviceStatusSet.png" alt="">{{$t('deviceStatus.title1')}}
+        <div class="table-title">
+      <img src="../../assets/manageImg/deviceStatusSet.png" alt="">设备状态设备
+    </div>
+        <el-tooltip  placement="bottom-end">
+           <div slot="content">控制器设备状态值设置：<br>
+            此处编辑名称对应：<br>
+            1.当前实时数据界面下控制器下方得状态值名称<br>
+            2.该账号下小程序内进入温室设备界面对应得各个名称</div>
+     <div class="table-title-btn blue">
+       提示
+      </div>
+    </el-tooltip>
     </div>
     <div class="flex-view scroll">
       <div class="manage-btn" v-for="item,index in topList" :key="index" @click="topChange(item,index)" :class="active == index ? 'active' : ''">

src/views/manage/weatherData.vue

@@ -1,11 +1,23 @@
 <template>
   <div class="videoManage manage-page ">
-    <div class="flex-view flex-title">
+   
+       <div class="flex-view flex-title">
       <div class="table-title">
-        <img src="../../assets/manageImg/deviceManage.png" alt="">  {{ $t('deviceBinding.title') }}
+        <img src="../../assets/manageImg/deviceManage.png" alt="">设备绑定气象站数据
+      </div>
+     
+      <div class="flex-view border-none padding-none">
+          <el-tooltip  placement="bottom-end">
+           <div slot="content">设备绑定气象站数据：<br>
+            对应当前页面和小程序实时数据界面下单独将某个设备得<br>气象站拉出来，可选择该账户下得设备
+           </div>
+     <div class="table-title-btn blue">
+       提示
+      </div>
+    </el-tooltip>
+     <div class="table-title-btn blue" style="margin-left:10px" @click="openModel({}, 0)">
+        <img src="../../assets/manageImg/add-btn.png" alt="">添加
       </div>
-      <div class="table-title-btn blue" @click="openModel({}, 0)">
-        <img src="../../assets/manageImg/add-btn.png" alt="">{{$t('text.add')}}
       </div>
     </div>
     <div class="table-view">

src/views/page/heatFan.vue

@@ -200,6 +200,7 @@ export default {
         return {
             inputData: [],
             typeList1: [
+                //  { label:this.$t('heatFan.gear2',{index:0}), value: 0 },
                   { label:this.$t('heatFan.gear2',{index:1}), value: 1 },
                   { label:this.$t('heatFan.gear2',{index:2}), value: 2 },
                   { label:this.$t('heatFan.gear2',{index:3}), value: 3 },