فهرست منبع

预警分析时间改

mw_666 3 سال پیش
والد
کامیت
49d772ec23

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

@@ -399,7 +399,6 @@
 				}
 		  }
 	  }
-	   
   }
   .el-time-panel__btn.confirm {
     color: @deepblue;

+ 5 - 6
src/components/chart/bar/percent-bar.vue

@@ -103,17 +103,16 @@ export default {
             backgroundStyle: {
               color:
                 this.$store.state.themeName === "dark"
-                  ? partten.getColor(this.colors) + "30"
-                  : "#fff",
+                    ? partten.getColor(this.colors)
+                    : "rgb(57, 54, 143)",
             },
             data: [this.value],
             coordinateSystem: "polar",
             itemStyle: {
               normal: {
-                color:
-                  this.$store.state.themeName === "dark"
-                    ? partten.getColor(this.colors)
-                    : "rgb(57, 54, 143)",
+                color:this.$store.state.themeName === "dark"
+                  ? 'black'
+                  : "#fff",
                 //    new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                 //     {
                 //       offset: 0,

+ 7 - 6
src/views/NewPages/alarm-center-1.vue

@@ -15,7 +15,7 @@
 					<div class="query-item">
 						<div class="lable">开始日期:</div>
 						<div class="search-input">
-							<el-date-picker v-model="startdate" type="datetime" placeholder="选择日期"
+							<el-date-picker v-model="startdate" type="date" placeholder="选择日期"
 								popper-class="date-select">
 							</el-date-picker>
 						</div>
@@ -23,7 +23,7 @@
 					<div class="query-item">
 						<div class="lable">结束日期:</div>
 						<div class="search-input">
-							<el-date-picker v-model="enddate" type="datetime" placeholder="选择日期" popper-class="date-select">
+							<el-date-picker v-model="enddate" type="date" placeholder="选择日期" popper-class="date-select">
 							</el-date-picker>
 						</div>
 					</div>
@@ -215,8 +215,8 @@
 				],
 				startdate: new Date(
 					new Date(new Date().setDate(new Date().getDate() - 1))
-				).formatDate("yyyy-MM-dd hh:mm:ss"),
-				enddate: new Date(new Date()).formatDate("yyyy-MM-dd hh:mm:ss"),
+				).formatDate("yyyy-MM-dd"),
+				enddate: new Date(new Date()).formatDate("yyyy-MM-dd"),
 				tableData: {
 					column: [{
 							name: "风机编号",
@@ -518,6 +518,7 @@
 			},
 
 			async searchData() {
+				let enddate = new Date(Date.parse(new Date(this.enddate)) + (24*3600*1000)).formatDate("yyyy-MM-dd");
 				const {
 					data
 				} = await this.API.requestData({
@@ -526,8 +527,8 @@
 					subUrl: "alarm/count/query/new2",
 					data: {
 						stationid: this.wpvalue,
-						startdate: new Date(this.startdate).formatDate("yyyy-MM-dd hh:mm:ss"),
-						enddate: new Date(this.enddate).formatDate("yyyy-MM-dd hh:mm:ss"),
+						startdate: new Date(this.startdate).formatDate("yyyy-MM-dd"),
+						enddate: enddate,
 					},
 				});
 				////////

+ 7 - 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="datetime" placeholder="选择日期" popper-class="date-select">
+              <el-date-picker v-model="startdate" type="date" 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="datetime" placeholder="选择日期" popper-class="date-select">
+              <el-date-picker v-model="enddate" type="date" 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 hh:mm:ss"),
-      enddate: new Date(new Date()).formatDate("yyyy-MM-dd hh:mm:ss"),
+      ).formatDate("yyyy-MM-dd"),
+      enddate: new Date(new Date()).formatDate("yyyy-MM-dd"),
       tableData: {
         column: [
           {
@@ -195,14 +195,15 @@ export default {
       this.columnObj = columnObj;
     },
     async searchData () {
+		let enddate = new Date(Date.parse(new Date(this.enddate)) + (24*3600*1000)).formatDate("yyyy-MM-dd");
       const { data } = await this.API.requestData({
 		  showLoading:true,
         baseURL: "http://192.168.1.18:8075/",
         subUrl: "shutdown/list",
         data: {
           stId: this.wpvalue,
-          endDate: new Date(this.startdate).formatDate("yyyy-MM-dd hh:mm:ss"),
-          startDate: new Date(this.enddate).formatDate("yyyy-MM-dd hh:mm:ss"),
+          endDate: new Date(this.startdate).formatDate("yyyy-MM-dd"),
+          startDate: enddate,
         },
       });
       ////////