Procházet zdrojové kódy

测试bug问题调整

zy před 7 měsíci
rodič
revize
e840d49d10

binární
cpp-ui/src/assets/logo/default_male.png


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

@@ -1,6 +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;
+    max-height: 36vh !important;
     overflow-y: auto;
   }
 }

+ 1 - 1
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="../../assets/logo/jiayuelogo.png" class="user-avatar">
+          <img src="../../assets/logo/default_male.png" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">

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

@@ -305,7 +305,7 @@ export default {
       },
       expireDateOption: {
         disabledDate(time) {
-          return time.getTime() > Date.now() + 8.64e7 *10
+          return (time.getTime() > Date.now() + 8.64e7 *10) ||  (time.getTime() < Date.now())
         }
       },
       loading: false,

+ 2 - 2
cpp-ui/src/views/stationDataQuery/historyforecastdata/index.vue

@@ -111,9 +111,9 @@ export default {
         },
         disabledDate: (time) => {
           if (this.pickerMinDate) {
-            return (time.getTime() > (this.pickerMinDate + this.day30)) || (time.getTime() < (this.pickerMinDate - this.day30));
+            return (time.getTime() < (this.pickerMinDate - this.day30));
           }
-          return false;
+          return time.getTime() > new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000  - 1;
         }
       },
       modId: '',//备用id

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

@@ -115,9 +115,9 @@ export default {
         },
         disabledDate: (time) => {
           if (this.pickerMinDate) {
-            return (time.getTime() > (this.pickerMinDate + this.day30)) || (time.getTime() < (this.pickerMinDate - this.day30));
+            return (time.getTime() < (this.pickerMinDate - this.day30));
           }
-          return false;
+          return time.getTime() > new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000  - 1;
         }
       },
     }

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

@@ -106,7 +106,7 @@ export default {
       // 日期使用
       pickerOptions: {
         disabledDate: (time) => {
-          return time.getTime() > Date.now() + 8.64e7 *10
+          return time.getTime() > Date.now()
         }
       },
       modId: '',//备用id

+ 2 - 2
cpp-ui/src/views/stationDataQuery/weatherstationstatusdata/index.vue

@@ -112,9 +112,9 @@ export default {
         },
         disabledDate: (time) => {
           if (this.pickerMinDate) {
-            return (time.getTime() > (this.pickerMinDate + this.day30)) || (time.getTime() < (this.pickerMinDate - this.day30));
+            return (time.getTime() < (this.pickerMinDate - this.day30));
           }
-          return false;
+          return time.getTime() > new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000  - 1;
         }
       },
     }

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

@@ -81,7 +81,7 @@
           :current-page.sync="currentPage"
           :page-size.sync="pageSize"
           :total="total"
-          :page-sizes=[10,50,100]
+          :page-sizes=[7,10,50,100]
           :layouts="['PrevJump', 'PrevPage','JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']"
           @page-change="handlePageChange"
         >
@@ -692,9 +692,9 @@ export default {
         },
         disabledDate: (time) => {
           if (this.pickerMinDate) {
-            return (time.getTime() > (this.pickerMinDate + this.day30)) || (time.getTime() < (this.pickerMinDate - this.day30));
+            return (time.getTime() < (this.pickerMinDate - this.day30));
           }
-          return false;
+          return time.getTime() > new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000  - 1;
         }
       },
     }

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

@@ -116,9 +116,9 @@ export default {
         },
         disabledDate: (time) => {
           if (this.pickerMinDate) {
-            return (time.getTime() > (this.pickerMinDate + this.day30)) || (time.getTime() < (this.pickerMinDate - this.day30));
+            return (time.getTime() < (this.pickerMinDate - this.day30));
           }
-          return false;
+          return time.getTime() > new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000  - 1;
         }
       },
     }