修正测试bug

1.时间选项框到当前时间，最多选择不能超过1个月
2.设备选项多选显示标签不会撑大高度
3.头像更换嘉越logo

cpp-ui/src/assets/styles/index.scss

@@ -5,6 +5,7 @@
 @import './sidebar.scss';
 @import './btn.scss';
 @import './dark';
+@import "./vxe-table";
 body {
   height: 100%;
   -moz-osx-font-smoothing: grayscale;

cpp-ui/src/assets/styles/vxe-table.scss

@@ -0,0 +1,6 @@
+.vxe-max-height-65vh{
+  .vxe-table--render-default .vxe-table--body-wrapper, .vxe-table--render-default .vxe-table--footer-wrapper {
+    max-height: 65vh !important;
+    overflow-y: auto;
+  }
+}

cpp-ui/src/layout/components/Navbar.vue

@@ -27,7 +27,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img src="../../assets/logo/jiayuelogo.png" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -182,9 +182,10 @@ export default {
 
         .user-avatar {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
+          width: 30px;
+          height: 30px;
           border-radius: 10px;
+          margin-top: .5vh;
         }
 
         .el-icon-caret-bottom {

cpp-ui/src/views/stationDataQuery/inverterstatusdata/index.vue

@@ -11,6 +11,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             :default-time="['00:00:00', '23:45:00']" popper-class="cpp-popper"
+            :picker-options="pickerOptions"
           />
         </el-form-item>
         <el-form-item label="场站名称">
@@ -24,7 +25,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="逆变器设备">
-          <el-select v-model="equipmentId" multiple filterable popper-class="cpp-popper">
+          <el-select v-model="equipmentId" multiple filterable  collapse-tags popper-class="cpp-popper">
             <el-option
               v-for="item in equipmentOptions"
               :key="item.value"
@@ -55,7 +56,7 @@
         <vxe-table-column field="stationCode" title="所属场站" :formatter="stationCodeFormat"></vxe-table-column>
         <vxe-table-column field="equipmentId" title="设备名称" :formatter="nameFormat"></vxe-table-column>
         <vxe-table-column field="status" title="状态" :formatter="statusFormat"></vxe-table-column>
-        <vxe-table-column field="time" title="时间"></vxe-table-column>
+        <vxe-table-column field="time" title="时间" width="150"></vxe-table-column>
         <vxe-table-column field="activePower" title="有功(KW)"></vxe-table-column>
         <vxe-table-column field="reactivePower" title="无功(KVar)"></vxe-table-column>
         <vxe-table-column field="voltage" title="电压(V)"></vxe-table-column>
@@ -96,6 +97,26 @@ export default {
       nameList:[],
       loading: false,
       modId: '',//备用id
+
+      pickerMinDate: null,
+      pickerMaxDate: null,
+      day30: 30 * 24 * 3600 * 1000,
+      // 日期使用
+      pickerOptions: {
+        onPick: ({ maxDate, minDate }) => {
+          if (minDate && this.pickerMinDate) {
+            this.pickerMinDate = null;
+          } else if (minDate) {
+            this.pickerMinDate = minDate.getTime();
+          }
+        },
+        disabledDate: (time) => {
+          if (this.pickerMinDate) {
+            return (time.getTime() > (this.pickerMinDate + this.day30)) || (time.getTime() < (this.pickerMinDate - this.day30));
+          }
+          return false;
+        }
+      },
     }
   },
   created(){

cpp-ui/src/views/stationDataQuery/windtowerstatusdata/index.vue

@@ -11,6 +11,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             :default-time="['00:00:00', '23:45:00']" popper-class="cpp-popper"
+            :picker-options="pickerOptions"
           />
         </el-form-item>
         <el-form-item label="场站名称">
@@ -32,44 +33,45 @@
     <div style="padding-top: 10px">
       <el-tabs type="card" v-model="activeName" @tab-click="tabClick">
         <el-tab-pane label="列表" name="first">
-          <vxe-table
-            highlight-hover-row
-            :keep-source="true"
-            align="center"
-            :loading="loading"
-            ref="xTable"
-            auto-resize
-            highlight-current-row
-            border
-            resizable
-            show-overflow
-            max-height="500px"
-            :data="tableData.slice((currentPage-1) * pageSize,currentPage * pageSize)">
-            <vxe-table-column field="stationCode" title="场站名称" :formatter="stationCodeFormat" width="200px" fixed="left"></vxe-table-column>
-            <vxe-table-column field="time" title="时间" width="180px" fixed="left"></vxe-table-column>
-            <vxe-table-column field="t" title="温度(℃)" width="180px"></vxe-table-column>
-            <vxe-table-column field="rh" title="湿度(RH%)" width="180px"></vxe-table-column>
-            <vxe-table-column field="pa" title="气压(kPa)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wsHubHeight" title="轮毂风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wdHubHeight" title="轮毂风向(°)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws10" title="10米风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd10" title="10米风向(°)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws30" title="30米风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd30" title="30米风向(°)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws50" title="50米风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd50" title="50米风向(°)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws60" title="60米风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd60" title="60米风向(°)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws70" title="70米风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd70" title="70米风向(°)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws80" title="80米风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd80" title="80米风向(°)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws90" title="90米风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd90" title="90米风向(°)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws100" title="100米风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd100" title="100米风向(°)" width="180px"></vxe-table-column>
-          </vxe-table>
-          <vxe-pager
+          <div class="vxe-max-height-65vh">
+            <vxe-table
+              highlight-hover-row
+              :keep-source="true"
+              align="center"
+              :loading="loading"
+              ref="xTable"
+              auto-resize
+              highlight-current-row
+              border
+              resizable
+              show-overflow
+              :data="tableData.slice((currentPage-1) * pageSize,currentPage * pageSize)">
+              <vxe-table-column field="stationCode" title="场站名称" :formatter="stationCodeFormat" width="200px"
+                                fixed="left"></vxe-table-column>
+              <vxe-table-column field="time" title="时间" width="180px" fixed="left"></vxe-table-column>
+              <vxe-table-column field="t" title="温度(℃)" width="180px"></vxe-table-column>
+              <vxe-table-column field="rh" title="湿度(RH%)" width="180px"></vxe-table-column>
+              <vxe-table-column field="pa" title="气压(kPa)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wsHubHeight" title="轮毂风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wdHubHeight" title="轮毂风向(°)" width="180px"></vxe-table-column>
+              <vxe-table-column field="ws10" title="10米风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wd10" title="10米风向(°)" width="180px"></vxe-table-column>
+              <vxe-table-column field="ws30" title="30米风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wd30" title="30米风向(°)" width="180px"></vxe-table-column>
+              <vxe-table-column field="ws50" title="50米风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wd50" title="50米风向(°)" width="180px"></vxe-table-column>
+              <vxe-table-column field="ws60" title="60米风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wd60" title="60米风向(°)" width="180px"></vxe-table-column>
+              <vxe-table-column field="ws70" title="70米风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wd70" title="70米风向(°)" width="180px"></vxe-table-column>
+              <vxe-table-column field="ws80" title="80米风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wd80" title="80米风向(°)" width="180px"></vxe-table-column>
+              <vxe-table-column field="ws90" title="90米风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wd90" title="90米风向(°)" width="180px"></vxe-table-column>
+              <vxe-table-column field="ws100" title="100米风速(m/s)" width="180px"></vxe-table-column>
+              <vxe-table-column field="wd100" title="100米风向(°)" width="180px"></vxe-table-column>
+            </vxe-table>
+            <vxe-pager
               perfect
               :current-page.sync="currentPage"
               :page-size.sync="pageSize"
@@ -77,8 +79,11 @@
               :page-sizes=[10,50,100]
               :layouts="['PrevJump', 'PrevPage','JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']"
               @page-change="handlePageChange"
-          >
-          </vxe-pager>
+            >
+            </vxe-pager>
+          </div>
+
+
         </el-tab-pane>
         <el-tab-pane label="风速曲线图" name="second">
           <div style="float:left;width: 95%;height: 550px" id="wscharts"></div>
@@ -101,7 +106,7 @@ export default {
       wsChart: null,
       wdChart: null,
       activeName: 'first',
-      dateTime: [new Date(new Date().toLocaleDateString()).getTime(), new Date(new Date().toLocaleDateString()).getTime() + 60 * 60 * 24 * 1000-5*1000*60],
+      dateTime: [new Date(new Date().toLocaleDateString()).getTime(), new Date(new Date().toLocaleDateString()).getTime() + 60 * 60 * 24 * 1000 - 5 * 1000 * 60],
       total: 0,
       sortOrder: 'asc',
       pageSize: 10,
@@ -110,7 +115,7 @@ export default {
       stationCode: [],
       searchForm: {},
       tableData: [],
-      nameList:[],
+      nameList: [],
       loading: false,
       modId: '',//备用id
       itemStyle: [
@@ -440,7 +445,8 @@ export default {
         },
 
       ],
-      colorArr: [{
+      colorArr: [
+        {
         start: "rgba(155, 101, 229,",
         end: "rgba(219,44,44,0.5)"
       },
@@ -678,9 +684,28 @@ export default {
         }
       ],
       lineColor: '#3b3b3b',
+      pickerMinDate: null,
+      pickerMaxDate: null,
+      day30: 30 * 24 * 3600 * 1000,
+      // 日期使用
+      pickerOptions: {
+        onPick: ({ maxDate, minDate }) => {
+          if (minDate && this.pickerMinDate) {
+            this.pickerMinDate = null;
+          } else if (minDate) {
+            this.pickerMinDate = minDate.getTime();
+          }
+        },
+        disabledDate: (time) => {
+          if (this.pickerMinDate) {
+            return (time.getTime() > (this.pickerMinDate + this.day30)) || (time.getTime() < (this.pickerMinDate - this.day30));
+          }
+          return false;
+        }
+      },
     }
   },
-  created(){
+  created() {
     this.getStationCode()
   },
   mounted() {
@@ -700,14 +725,14 @@ export default {
   },
   computed: {},
   methods: {
-    tabClick(tab){
+    tabClick(tab) {
       if (this.activeName == 'second') {
-        this.$nextTick(function() {
+        this.$nextTick(function () {
           this.wsChart.resize();
         })
       }
       if (this.activeName == 'three') {
-        this.$nextTick(function() {
+        this.$nextTick(function () {
           this.wdChart.resize();
         })
       }
@@ -724,7 +749,7 @@ export default {
       this.currentPage = currentPage
       this.pageSize = pageSize
     },
-      async dataQuery() {
+    async dataQuery() {
       let startTime = Math.round(this.dateTime[0])
       let endTime = Math.round(this.dateTime[1])
       if (endTime <= startTime) {
@@ -745,7 +770,7 @@ export default {
         let wsMap = response.data.wsMap
         let wsTime = response.data.wsTime
         let wdMap = response.data.wdMap
-        this.wsDraw(wsTime,wsMap)
+        this.wsDraw(wsTime, wsMap)
         this.wdDraw(wdMap);
 
         this.loading = false
@@ -762,8 +787,8 @@ export default {
         }
       })
     },
-    wsDraw(wsTime,wsMap) {
-      this.wsChart = echarts.init(document.getElementById('wscharts'),'dark')
+    wsDraw(wsTime, wsMap) {
+      this.wsChart = echarts.init(document.getElementById('wscharts'), 'dark')
       let option = {
         backgroundColor: 'transparent',
         title: {
@@ -807,7 +832,7 @@ export default {
           left: "15%",
           right: "15%",
           // textStyle: {
-            // color: this.lineColor
+          // color: this.lineColor
           // }
         }, {
           type: 'inside'
@@ -824,8 +849,8 @@ export default {
           boundaryGap: false,
           // axisLine: {
           //   lineStyle: {
-              // color: this.lineColor
-            // }
+          // color: this.lineColor
+          // }
           // },
           data: []
         }],
@@ -837,8 +862,8 @@ export default {
           },
           // axisLine: {
           //   lineStyle: {
-              // color: this.lineColor
-            // }
+          // color: this.lineColor
+          // }
           // },
 
           axisLabel: {
@@ -861,11 +886,11 @@ export default {
       var index = 0;
 
       for (var key in wsMap) {
-        for (let i=0;i<wsMap[key].length;i++){
-          wsMap[key][i] = wsMap[key][i]==-99?null:wsMap[key][i]
+        for (let i = 0; i < wsMap[key].length; i++) {
+          wsMap[key][i] = wsMap[key][i] == -99 ? null : wsMap[key][i]
         }
         option.legend.data.push(key)
-        if (key=='轮毂风速') {
+        if (key == '轮毂风速') {
           option.legend.selected[key] = true
         } else {
           option.legend.selected[key] = false
@@ -899,7 +924,7 @@ export default {
       });
     },
     wdDraw(wdMap) {
-      this.wdChart = echarts.init(document.getElementById('wdcharts'),'dark')
+      this.wdChart = echarts.init(document.getElementById('wdcharts'), 'dark')
       const option = {
         backgroundColor: 'transparent',
         color: ['#4A99FF', '#4BFFFC', '#ff654a', '#edff4a', '#65ff4a', '#4affea', '#894aff', '#d84aff', '#ff4aae'],
@@ -988,7 +1013,7 @@ export default {
       var index = 0;
       for (var key in wdMap) {
         option.legend.data.push(key)
-        if (key=='轮毂风向') {
+        if (key == '轮毂风向') {
           option.legend.selected[key] = true
         } else {
           option.legend.selected[key] = false

cpp-ui/src/views/stationDataQuery/windturbinestatusdata/index.vue

@@ -11,6 +11,7 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             :default-time="['00:00:00', '23:45:00']" popper-class="cpp-popper"
+            :picker-options="pickerOptions"
           />
         </el-form-item>
         <el-form-item label="场站名称">
@@ -24,7 +25,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="风机设备">
-          <el-select v-model="equipmentId" multiple filterable popper-class="cpp-popper">
+          <el-select v-model="equipmentId" multiple filterable  collapse-tags  popper-class="cpp-popper">
             <el-option
               v-for="item in equipmentOptions"
               :key="item.value"
@@ -55,7 +56,7 @@
         <vxe-table-column field="stationCode" title="所属场站" :formatter="stationCodeFormat"></vxe-table-column>
         <vxe-table-column field="equipmentId" title="设备名称" :formatter="nameFormat"></vxe-table-column>
         <vxe-table-column field="status" title="状态" :formatter="statusFormat"></vxe-table-column>
-        <vxe-table-column field="time" title="时间"></vxe-table-column>
+        <vxe-table-column field="time" title="时间" width="150"></vxe-table-column>
         <vxe-table-column field="activePower" title="有功(KW)"></vxe-table-column>
         <vxe-table-column field="reactivePower" title="无功(KVar)"></vxe-table-column>
         <vxe-table-column field="voltage" title="电压(V)"></vxe-table-column>
@@ -98,6 +99,26 @@ export default {
       nameList: [],
       loading: false,
       modId: '',//备用id
+
+      pickerMinDate: null,
+      pickerMaxDate: null,
+      day30: 30 * 24 * 3600 * 1000,
+      // 日期使用
+      pickerOptions: {
+        onPick: ({ maxDate, minDate }) => {
+          if (minDate && this.pickerMinDate) {
+            this.pickerMinDate = null;
+          } else if (minDate) {
+            this.pickerMinDate = minDate.getTime();
+          }
+        },
+        disabledDate: (time) => {
+          if (this.pickerMinDate) {
+            return (time.getTime() > (this.pickerMinDate + this.day30)) || (time.getTime() < (this.pickerMinDate - this.day30));
+          }
+          return false;
+        }
+      },
     }
   },
   created() {