1 老旧官网改造-供需平衡-第三方施工-重要风险点管控 界面优化。

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supplybalance/TSupBalUsgDayController.java

 package com.zehong.web.controller.supplybalance;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.zehong.common.core.domain.model.LoginUser;
 import com.zehong.common.utils.SecurityUtils;
-import com.zehong.system.domain.TSupBalGasSup;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.zehong.common.annotation.Log;

zh-baseversion-system/src/main/java/com/zehong/system/domain/TSupBalStopSup.java

@@ -87,8 +87,8 @@ public class TSupBalStopSup extends BaseEntity
     private String fGovUploadStatus;
 
     /** 政府端上报时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报省厅时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "上报省厅时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date fGovUploadTime;
 
     public void setfGasStopId(Long fGasStopId) 

zh-baseversion-system/src/main/java/com/zehong/system/domain/TSupBalUsgDay.java

@@ -107,6 +107,7 @@ public class TSupBalUsgDay extends BaseEntity
 
     /** 上报时间，日，格式:2023-09-01 */
     @Excel(name = "上报时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private String fReportTime;
 
     /** 创建时间 yyyy-MM-dd hh:mm:ss */

zh-baseversion-web/src/views/supplybalance/day/index.vue

@@ -113,7 +113,7 @@
         </el-table-column>
         <el-table-column label="上报省厅日期" align="center" prop="fGovUploadTime" width="180">
           <template slot-scope="scope">
-            <span v-if="scope.row.fGovUploadTime">{{ parseTime(scope.row.fGovUploadTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span v-if="scope.row.fGovUploadTime">{{ parseTime(scope.row.fGovUploadTime, '{y}-{m}-{d} {h}:{i}') }}</span>
             <span v-else>-</span>
           </template>
         </el-table-column>
@@ -683,9 +683,9 @@ export default {
       this.resetReportForm();
       this.getReportInfo();
       if(val == 0){
-        const startOfMonth = moment(this.reportDate).startOf('month').format('YYYY-MM-DD HH:mm:ss');
+        const startOfMonth = moment(this.reportDate).startOf('month').format('YYYY-MM-DD HH:mm');
         // 获取当月结束时间
-        const endOfMonth = moment(this.reportDate).endOf('month').format('YYYY-MM-DD HH:mm:ss');
+        const endOfMonth = moment(this.reportDate).endOf('month').format('YYYY-MM-DD HH:mm');
         this.currentMonthReportInfo(startOfMonth,endOfMonth);
       }
     },
@@ -699,7 +699,7 @@ export default {
               cancelButtonText: "取消",
               type: "warning"
             }).then(function() {
-              that.reportForm.fReportTime =  moment().format('YYYY-MM-DD HH:mm:ss');
+              that.reportForm.fReportTime =  moment().format('YYYY-MM-DD HH:mm');
               that.reportForm.calendarDate = that.reportDate;
               that.reportForm.fReportStatus = '1';
               return updateDay(that.reportForm);
@@ -708,7 +708,7 @@ export default {
               that.msgSuccess("上报成功");
             }).catch(() => {});
           } else {
-            this.reportForm.fReportTime =  moment().format('YYYY-MM-DD HH:mm:ss');
+            this.reportForm.fReportTime =  moment().format('YYYY-MM-DD HH:mm');
             this.reportForm.fCalendarDate = this.reportDate;
             this.reportForm.fReportStatus = '1';
             addDay(this.reportForm).then(response => {

zh-baseversion-web/src/views/supplybalance/stop/index.vue

@@ -123,7 +123,7 @@
       </el-table-column>
       <el-table-column label="上报时间" align="center" prop="entRepTime" width="150" v-if="this.$store.state.user.roleId == 5">
         <template slot-scope="scope">
-          <span v-if="scope.row.entRepTime">{{ parseTime(scope.row.entRepTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span v-if="scope.row.entRepTime">{{ parseTime(scope.row.entRepTime, '{y}-{m}-{d} {h}:{i}') }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
@@ -136,7 +136,7 @@
       </el-table-column>
       <el-table-column label="上报省厅时间" align="center" prop="fRecoveryGasTime" width="150" v-if="this.$store.state.user.roleId == 3">
         <template slot-scope="scope">
-          <span v-if="scope.row.fGovUploadTime">{{ parseTime(scope.row.fGovUploadTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span v-if="scope.row.fGovUploadTime">{{ parseTime(scope.row.fGovUploadTime, '{y}-{m}-{d} {h}:{i}') }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>