Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue

@@ -166,7 +166,7 @@ export default {
           }
         },
         grid:{
-          left:'1',
+          left:'1%',
           top:'8%',
           right:'5%',
           bottom:'8%',

dsk-operate-ui/src/views/detail/party-a/overview/execuinfo.vue

@@ -10,6 +10,7 @@
     <tables
       :tableLoading="tableLoading"
       :tableData="tableData"
+      :tableDataTotal="tableDataTotal"
       :forData="forData"
       :isIndex="false"
       :queryParams="queryParams"

dsk-operate-ui/src/views/radar/components/Bidding/index.vue

@@ -359,28 +359,20 @@ export default {
 	      value: "今天",
 	    },
 	    {
-	      label: "近3日",
-	      value: "近3日",
-	    },
-	    {
-	      label: "近7日",
-	      value: "近7日",
-	    },
-	    {
-	      label: "近1个月",
-	      value: "近1个月",
+	      label: "未来3天",
+	      value: "未来3天",
 	    },
 	    {
-	      label: "近3个月",
-	      value: "近3个月",
+	      label: "未来7天",
+	      value: "未来7天",
 	    },
 	    {
-	      label: "近半年",
-	      value: "近半年",
+	      label: "未来1个月",
+	      value: "未来1个月",
 	    },
 	    {
-	      label: "近1年",
-	      value: "近1年",
+	      label: "未来3个月",
+	      value: "未来3个月",
 	    },
 	  ],
 	  PlanTenderDateValue: "",
@@ -746,58 +738,30 @@ export default {
 	        startTime = Year + "-" + Month +"-" + Day;
 	        endTime = Year + "-" + Month + "-" + Day;
 	        break;
-	      case "近3日":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Day > 3) {
-	          startTime = Year + "-" + Month  + "-" +(Day-3);
-	        } else {
-	          let newTime = datetime.getTime()-3*24*60*60*1000
-	          Year = new Date(newTime).getFullYear();
-	          Month = new Date(newTime).getMonth() + 1;
-	          Day = new Date(newTime).getDate();
-	          startTime = Year + "-" + Month +"-" + Day;
-	        }
+	      case "未来3天":
+		  	startTime = Year + "-" + Month + "-" + Day;
+			endTime = this.getDate(3)
 	        break;
-	      case "近7日":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Day > 7) {
-	          startTime = Year + "-" + Month  + "-" +(Day-7);
-	        } else {
-	          let newTime = datetime.getTime()-7*24*60*60*1000
-	          Year = new Date(newTime).getFullYear();
-	          Month = new Date(newTime).getMonth() + 1;
-	          Day = new Date(newTime).getDate();
-	          startTime = Year + "-" + Month +"-" + Day;
-	        }
-	        break;
-	      case "近1个月":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Month > 1) {
-	          startTime = Year + "-" + (Month - 1) + "-1";
-	        } else {
-	          startTime = Year - 1 + "-" + (12 + Month - 1) + "-1";
-	        }
+	      case "未来7天":
+			startTime = Year + "-" + Month + "-" + Day;
+			endTime = this.getDate(7)
 	        break;
-	      case "近3个月":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Month > 3) {
-	          startTime = Year + "-" + (Month - 3) + "-1";
+	      case "未来1个月":
+		  	startTime = Year + "-" + Month + "-" + Day;
+	        if (Month == 12) {
+				endTime = Year+1 + "-01-" +  + Day;
 	        } else {
-	          startTime = Year - 1 + "-" + (12 + Month - 3) + "-1";
+				endTime = Year + "-" + (Month + 1) + "-" + Day;
 	        }
 	        break;
-	      case "近半年":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Month > 6) {
-	          startTime = Year + "-" + (Month - 6) + "-1";
+	      case "未来3个月":
+			startTime = Year + "-" + Month + "-" + Day;
+	        if (Month >9) {
+				endTime = Year+1 + "-" + Month-9 + "-" +  + Day;
 	        } else {
-	          startTime = Year - 1 + "-" + (12 + Month - 6) + "-1";
+				endTime = Year + "-" + (Month + 3) + "-" + Day;
 	        }
 	        break;
-	      case "近1年":
-	        startTime = Year - 1 + "-" + Month + "-" + Day;
-	        endTime = Year + "-" + Month + "-" + Day;
-	        break;
 	      case "自定义":
 	        if (!this.PlanTenderDate) {
 	          this.PlanTenderDateValue = "";
@@ -839,6 +803,13 @@ export default {
 	  }
 	  this.jskBidPlanDto = obj;
 	},
+	getDate(n){
+		let date1 = new Date();
+		let date2 = new Date(date1);
+		date2.setDate(date1.getDate() + n);
+		let time2 = date2.getFullYear() + "-" + ("0" + (date2.getMonth() + 1)).slice(-2) + "-" + ("0" + date2.getDate()).slice(-2);
+		return time2
+	},
 	changeIssueTime(type) {
 	  if(type=='bid'&&this.tenderDate){
 	    this.tenderDateValue = "自定义";