报表时间格式修改

web/client/src/sections/service/components/automatic-Modal.jsx

@@ -72,7 +72,7 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                      framer: v.framer,   //制定者
                      auditor: v.auditor,  //审核者
                      ratifier: v.ratifier,   //批准者
-                     coverTime: v.coverTime && moment(v.coverTime).format('YYYY-MM-DD'),
+                     coverTime: v.coverTime && moment(v.coverTime),
                      structId: v.structId,    //结构物id
                      structList: []
                   }
@@ -92,8 +92,8 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                            if (key?.slice(structNameIndex) == 'conclusion') structData.conclusion = v[key]
                            //开始结束时间
                            if (key?.slice(structNameIndex) == 'reportTime') {
-                              structData.reportStartTime = v[key] && v[key][0] && moment(v[key][0]).format('YYYY-MM-DD HH:mm:ss')
+                              structData.reportStartTime = v[key] && v[key][0] && moment(v[key][0])
-                              structData.reportEndTime = v[key] && v[key][1] && moment(v[key][1]).format('YYYY-MM-DD HH:mm:ss')
+                              structData.reportEndTime = v[key] && v[key][1] && moment(v[key][1])
                            }
                            //包含的监测因素
                            structData.factors = []
@@ -121,8 +121,8 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                               if (key?.slice(index) == 'sensorNames') factorData.sensorNames = factorChech[p]?.find(p => p.id == d)?.sensor?.filter(f => v[key]?.includes(f.id))?.map(c => ({ id: c.id, name: c.name })) || []
                               //开始结束时间
                               if (key?.slice(index) == 'startEndTime') {
-                                 factorData.startTime = v[key] && v[key][0] && moment(v[key][0]).format('YYYY-MM-DD HH:mm:ss')
+                                 factorData.startTime = v[key] && v[key][0] && moment(v[key][0])
-                                 factorData.endTime = v[key] && v[key][1] && moment(v[key][1]).format('YYYY-MM-DD HH:mm:ss')
+                                 factorData.endTime = v[key] && v[key][1] && moment(v[key][1])
                               }
                               //关联温度的测点
                               if (key?.slice(index) == 'tempName1') {
@@ -141,11 +141,11 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                                  })
                               }
                               //数据初始时间
-                              if (key?.slice(index) == 'initialTime') factorData.initialTime = v[key] && moment(v[key]).format('YYYY-MM-DD HH:mm:ss')
+                              if (key?.slice(index) == 'initialTime') factorData.initialTime = v[key] && moment(v[key])
                               //关联开始结束时间
                               if (key?.slice(index) == 'releTime') {
-                                 factorData.releStartTime = v[key] && v[key][0] && moment(v[key][0]).format('YYYY-MM-DD HH:mm:ss')
+                                 factorData.releStartTime = v[key] && v[key][0] && moment(v[key][0])
-                                 factorData.releEndTime = v[key] && v[key][1] && moment(v[key][1]).format('YYYY-MM-DD HH:mm:ss')
+                                 factorData.releEndTime = v[key] && v[key][1] && moment(v[key][1])
                               }
                            }
                         }

web/client/src/sections/service/containers/automaticReport.jsx

@@ -137,7 +137,7 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, gener
                   // row?.factors?.forEach(d => {
                   //    d.codeName = dataList[d.codeName]
                   // })
-
+                  // console.log(1212, row);
                   dispatch(service.postGenerateReport({ ...row, structId: "" })).then((res) => {
                      if (res.success) {
                         setQuery({ limit: 10, page: 0 })