测试bug样式更改

cpp-ui/src/assets/styles/dark-element-ui.scss

@@ -138,3 +138,11 @@
   border-top: 1px solid rgba(29, 128, 218, 1) !important;
   background: rgba(30, 84, 128, 0.8) !important;
 }
+.el-month-table td .cell {
+  color: #C0C4CC !important;
+}
+
+.el-month-table td.disabled .cell {
+  background-color: transparent !important;
+  color: #606266 !important;
+}

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

@@ -153,6 +153,9 @@
     color: white;
     background: transparent;
   }
+  .vxe-table--render-default .vxe-table--body-wrapper, .vxe-table--render-default .vxe-table--footer-wrapper {
+    background-color: #083d5c !important;
+  }
 }
 
 

cpp-ui/src/views/cloudDataQuery/index.vue

@@ -866,17 +866,19 @@ export default {
           },
           selected: {}
         },
-        dataZoom: [{
-          show: true,
-          realtime: true,
-          start: 0,
-          end: 100,
-          left: "15%",
-          right: "15%",
-          // textStyle: {
-          // color: this.lineColor
-          // }
-        }, {
+        dataZoom: [
+        //   {
+        //   show: true,
+        //   realtime: true,
+        //   start: 0,
+        //   end: 100,
+        //   left: "15%",
+        //   right: "15%",
+        //   // textStyle: {
+        //   // color: this.lineColor
+        //   // }
+        // },
+          {
           type: 'inside'
         }],
         grid: {

cpp-ui/src/views/regulation/dqRegulation/index.vue

@@ -9,7 +9,8 @@
               type="date"
               :picker-options="expireDateOption"
               placeholder="选择生成日期"
-              popper-class="cpp-popper">
+              popper-class="cpp-popper"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="场站名称">
@@ -304,7 +305,7 @@ export default {
       },
       expireDateOption: {
         disabledDate(time) {
-          return time.getTime() < Date.now()
+          return time.getTime() > Date.now() + 8.64e7 *10
         }
       },
       loading: false,

cpp-ui/src/views/regulation/modelAccuracyStatistics/index.vue

@@ -297,8 +297,9 @@ export default {
           {
             // name: 'Direct',
             type: 'bar',
-            barWidth: '60%',
             data: this.yData,
+            barMaxWidth: 60,
+            itemStyle: {color: '#e098c7'},
             markLine:{
               data:[
                 {
@@ -307,11 +308,11 @@ export default {
                   label:{
                     position:'end',
                     formatter:'65',
-                    color:'#4d69da',
+                    color:'#ff8200',
                   },
                   lineStyle:{
                     type:'dashed',
-                    color:'#3c73ea',
+                    color:'#ff8200',
                     width:1
                   }
                 },

cpp-ui/src/views/stationDataQuery/historyforecastdata/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="场站名称">
@@ -95,6 +96,25 @@ export default {
       tableData: [],
       nameList: [],
       loading: false,
+      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;
+        }
+      },
       modId: '',//备用id
       itemStyle: [
         {

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

@@ -6,7 +6,9 @@
           <el-date-picker
             v-model="dateTime"
             type="date"
-            placeholder="选择生成日期" popper-class="cpp-popper">
+            placeholder="选择生成日期" popper-class="cpp-popper"
+            :picker-options="pickerOptions"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="场站名称">
@@ -102,6 +104,12 @@ export default {
       searchForm: {},
       tableData: [],
       loading: false,
+      // 日期使用
+      pickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now() + 8.64e7 *10
+        }
+      },
       modId: '',//备用id
       itemStyle: [
         {

cpp-ui/src/views/stationDataQuery/weatherstationstatusdata/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="场站名称">
@@ -46,16 +47,16 @@
             :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="globalR" title="总辐射(W/㎡)" width="180px"></vxe-table-column>
-            <vxe-table-column field="directR" title="直接辐射(W/㎡)" width="180px"></vxe-table-column>
-            <vxe-table-column field="diffuseR" title="散射辐射(W/㎡)" width="180px"></vxe-table-column>
-            <vxe-table-column field="airT" title="温度(℃)" width="180px"></vxe-table-column>
-            <vxe-table-column field="rh" title="湿度(%)" width="180px"></vxe-table-column>
-            <vxe-table-column field="p" title="气压(kPa)" width="180px"></vxe-table-column>
-            <vxe-table-column field="cellT" title="电池板温度(℃)" width="180px"></vxe-table-column>
-            <vxe-table-column field="ws" title="风速(m/s)" width="180px"></vxe-table-column>
-            <vxe-table-column field="wd" title="风向(°)" width="180px"></vxe-table-column>
+            <vxe-table-column field="time" title="时间" width="150px" fixed="left"></vxe-table-column>
+            <vxe-table-column field="globalR" title="总辐射(W/㎡)" ></vxe-table-column>
+            <vxe-table-column field="directR" title="直接辐射(W/㎡)" ></vxe-table-column>
+            <vxe-table-column field="diffuseR" title="散射辐射(W/㎡)" ></vxe-table-column>
+            <vxe-table-column field="airT" title="温度(℃)" ></vxe-table-column>
+            <vxe-table-column field="rh" title="湿度(%)" ></vxe-table-column>
+            <vxe-table-column field="p" title="气压(kPa)" ></vxe-table-column>
+            <vxe-table-column field="cellT" title="电池板温度(℃)" ></vxe-table-column>
+            <vxe-table-column field="ws" title="风速(m/s)" ></vxe-table-column>
+            <vxe-table-column field="wd" title="风向(°)" ></vxe-table-column>
           </vxe-table>
           <vxe-pager
             perfect
@@ -102,6 +103,25 @@ export default {
       loading: false,
       modId: '',//备用id
       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() {