Selaa lähdekoodia

预警分析时间改

mw_666 3 vuotta sitten
vanhempi
commit
a4ab101e95

+ 7 - 0
src/assets/styles/el-override/el-input.less

@@ -377,6 +377,13 @@ body {
       color: @green;
     }
   }
+  .el-time-panel__btn.confirm {
+    color: @green;
+  }
+  
+  .el-time-panel__btn.cancel {
+    color: @gray;
+  }
 }
 
 .el-popper__arrow::before {

+ 6 - 0
src/assets/styles/theme/light/zhjx.less

@@ -401,5 +401,11 @@
 	  }
 	   
   }
+  .el-time-panel__btn.confirm {
+    color: @deepblue;
+  }
   
+  // .el-time-panel__btn.cancel {
+  //   color: @gray;
+  // }
 }

+ 4 - 4
src/views/NewPages/alarm-center-1.vue

@@ -215,8 +215,8 @@
 				],
 				startdate: new Date(
 					new Date(new Date().setDate(new Date().getDate() - 1))
-				).formatDate("yyyy-MM-dd"),
-				enddate: new Date(new Date()).formatDate("yyyy-MM-dd"),
+				).formatDate("yyyy-MM-dd hh:mm:ss"),
+				enddate: new Date(new Date()).formatDate("yyyy-MM-dd hh:mm:ss"),
 				tableData: {
 					column: [{
 							name: "风机编号",
@@ -526,8 +526,8 @@
 					subUrl: "alarm/count/query/new2",
 					data: {
 						stationid: this.wpvalue,
-						startdate: new Date(this.startdate).formatDate("yyyy-MM-dd"),
-						enddate: new Date(this.enddate).formatDate("yyyy-MM-dd"),
+						startdate: new Date(this.startdate).formatDate("yyyy-MM-dd hh:mm:ss"),
+						enddate: new Date(this.enddate).formatDate("yyyy-MM-dd hh:mm:ss"),
 					},
 				});
 				////////

+ 6 - 6
src/views/NewPages/alarm-center-2.vue

@@ -15,14 +15,14 @@
           <div class="query-item">
             <div class="lable">开始日期:</div>
             <div class="search-input">
-              <el-date-picker v-model="startdate" type="date" placeholder="选择日期" popper-class="date-select">
+              <el-date-picker v-model="startdate" type="datetime" placeholder="选择日期" popper-class="date-select">
               </el-date-picker>
             </div>
           </div>
           <div class="query-item">
             <div class="lable">结束日期:</div>
             <div class="search-input">
-              <el-date-picker v-model="enddate" type="date" placeholder="选择日期" popper-class="date-select">
+              <el-date-picker v-model="enddate" type="datetime" placeholder="选择日期" popper-class="date-select">
               </el-date-picker>
             </div>
           </div>
@@ -115,8 +115,8 @@ export default {
       ],
       startdate: new Date(
         new Date(new Date().setDate(new Date().getDate() - 1))
-      ).formatDate("yyyy-MM-dd"),
-      enddate: new Date(new Date()).formatDate("yyyy-MM-dd"),
+      ).formatDate("yyyy-MM-dd hh:mm:ss"),
+      enddate: new Date(new Date()).formatDate("yyyy-MM-dd hh:mm:ss"),
       tableData: {
         column: [
           {
@@ -201,8 +201,8 @@ export default {
         subUrl: "shutdown/list",
         data: {
           stId: this.wpvalue,
-          endDate: new Date(this.startdate).formatDate("yyyy-MM-dd"),
-          startDate: new Date(this.enddate).formatDate("yyyy-MM-dd"),
+          endDate: new Date(this.startdate).formatDate("yyyy-MM-dd hh:mm:ss"),
+          startDate: new Date(this.enddate).formatDate("yyyy-MM-dd hh:mm:ss"),
         },
       });
       ////////