关联的温度测点

api/app/lib/controllers/service/report.js

@@ -258,6 +258,12 @@ async function postGenerateReport (ctx) {
             startTime: moment().format('YYYY-MM-DD HH:mm:ss'),
             reportType: data.reportType
          })
+
+         await models.ReportAutomatic.update({ time: moment().format('YYYY-MM-DD HH:mm:ss') }, {
+            where: {
+               id: data.id
+            }
+         })
          ctx.status = 200;
          ctx.body = res.outLink
       } else {

api/app/lib/models/report_automatic.js

@@ -125,7 +125,7 @@ module.exports = dc => {
       },
       time: {
          type: DataTypes.DATE,
-         allowNull: false,
+         allowNull: true,
          defaultValue: null,
          comment: "",
          primaryKey: false,

script/3.6/schema/2.create_report_automatic.sql

@@ -24,3 +24,5 @@ alter table report_automatic
 	add constraint report_automatic_pk
 		primary key (id);
 
+
+alter table report_automatic alter column time drop not null;

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

@@ -17,10 +17,12 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
    const [factorList, setFactorList] = useState([]);     //监测因素
    const [factorChech, setFactorChech] = useState([]);     //选中的监测因素
    const [activeKey, setActiveKey] = useState([]);     //
+   const [correlationId, setCorrelationId] = useState([]);     //
 
 
    useEffect(async () => {
       if (eidtData?.id) {
+         console.log(eidtData);
          setProjectId(eidtData?.projectId)
          setStructId(eidtData?.structId)
          setFactorId(eidtData?.factors?.map(s => s.codeName) || [])
@@ -68,7 +70,7 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                      projectOverview: v.projectOverview,
                      reportStartTime: moment(v.reportTime[0]).format('YYYY-MM-DD HH:mm:ss'),
                      reportEndTime: moment(v.reportTime[1]).format('YYYY-MM-DD HH:mm:ss'),
-                     time: moment().format('YYYY-MM-DD HH:mm:ss'),
+                     time: eidtData?.time && moment(eidtData?.time).format('YYYY-MM-DD HH:mm:ss') || null,
                      factors: []
                   }
 
@@ -115,7 +117,6 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                      factorData.tempStaName = factorData?.tempName?.find(s => s.index == 2)?.name || factorData?.tempName?.find(s => s.index == 1)?.name
                      data.factors?.push(factorData)
                   })
-                  console.log(111, data);
 
                   dispatch(service.postAutomaticReport(data)).then((res) => {
                      if (res.success) {
@@ -138,7 +139,7 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
             >
                <Form.Input field="reportName" label='报表名称' style={{ width: 300 }} placeholder="请输入报表名称" showClear
                   initValue={eidtData?.reportName || ""}
-                  rules={[{ required: true, message: "请输入报表名称" }]}
+                  rules={[{ required: true, message: "请输入报表名称,15字以内", max: 15 }]}
                />
                <Form.Select label="所属项目" field="projectId" placeholder="请选择项目" showClear style={{ width: 300 }} filter
                   initValue={eidtData?.projectId || ""}
@@ -159,7 +160,7 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                </Form.Select>
                <Form.Input field="projectName" label='项目名称' style={{ width: 300 }} placeholder="请输入项目名称" showClear
                   initValue={eidtData?.projectName || ""}
-                  rules={[{ required: true, message: "请输入项目名称" }]}
+                  rules={[{ required: true, message: "请输入项目名称,15字以内", max: 15 }]}
                />
                <Form.Select label="报表类型" field="reportType" placeholder="请选择报表类型" showClear style={{ width: 300 }}
                   rules={[{ required: true, message: "请选择报表类型" }]}
@@ -235,7 +236,7 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                >
                   {
                      factorChech?.map(s => {
-                        return <Collapse.Panel header={s.name} itemKey={s.proto}>
+                        return <Collapse.Panel header={s.proto + s.name} itemKey={s.proto} key={s.proto}>
                            <div style={{ background: "#FFF" }}>
                               <Form.TextArea field={s.proto + "pointDescrip"} label='布点描述' style={{ width: 400 }} autosize={{ minRows: 2, maxRows: 10 }} placeholder="请输入布点描述" showClear
                                  initValue={eidtData?.factors?.find(c => c.codeName == s.proto)?.pointDescrip || ""}
@@ -274,6 +275,7 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                               {
                                  ['2001', '4004', '4007', '4008'].includes(s.proto) &&
                                  <Form.DatePicker field={s.proto + 'initialTime'} label='数据初始时间' type='dateTime' showClear
+                                    rules={[{ required: true, message: "请选择数据初始时间" }]}
                                     initValue={eidtData?.factors?.find(c => c.codeName == s.proto)?.initialTime && moment(eidtData?.factors?.find(c => c.codeName == s.proto)?.initialTime).format('YYYY-MM-DD HH:mm:ss')}
                                  />
                               }
@@ -281,6 +283,10 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                                  ['4009', '3001', '4004', '4001', '4007'].includes(s.proto) && <>
                                     <Form.Select label="关联温度的测点" field={s.proto + "tempName1"} showClear placeholder="请选择关联的温度测点" style={{ width: 300 }} filter
                                        initValue={eidtData?.factors?.find(c => c.codeName == s.proto)?.tempName?.find(c => c.index == 1)?.id || ""}
+                                       onChange={v => {
+
+
+                                       }}
                                     >
                                        {s.sensor?.map((item) => {
                                           return <Form.Select.Option value={item.id} label={item.name}></Form.Select.Option>
@@ -295,6 +301,9 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
 
                                        })}
                                     </Form.Select>
+                                    <Form.DatePicker field={s.proto + 'releTime'} label='关联开始结束时间' type='dateTimeRange' showClear style={{ width: 360 }}
+                                       initValue={eidtData?.factors?.find(c => c.codeName == s.proto)?.releStartTime && [moment(eidtData?.factors?.find(c => c.codeName == s.proto)?.releStartTime).format('YYYY-MM-DD HH:mm:ss'), moment(eidtData?.factors?.find(c => c.codeName == s.proto)?.releEndTime).format('YYYY-MM-DD HH:mm:ss')] || null}
+                                    />
                                  </>
                               }
 
@@ -304,9 +313,7 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                               <Form.Input field={s.proto + "tempStaName"} label='关联温度名称' style={{ width: 300 }} placeholder="请输入关联温度名称" showClear
                                  initValue={eidtData?.factors?.find(c => c.codeName == s.proto)?.tempStaName || ""}
                               /> */}
-                              <Form.DatePicker field={s.proto + 'releTime'} label='关联开始结束时间' type='dateTimeRange' showClear style={{ width: 360 }}
+
-                                 initValue={eidtData?.factors?.find(c => c.codeName == s.proto)?.releStartTime && [moment(eidtData?.factors?.find(c => c.codeName == s.proto)?.releStartTime).format('YYYY-MM-DD HH:mm:ss'), moment(eidtData?.factors?.find(c => c.codeName == s.proto)?.releEndTime).format('YYYY-MM-DD HH:mm:ss')] || null}
-                              />
 
                            </div>
                         </Collapse.Panel>

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

@@ -23,6 +23,7 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, gener
    const [projectId, setProjectId] = useState()  //项目id
    const [projectSearch, setProjectSearch] = useState()  //项目搜索
    const [keyword, setKeyword] = useState()  //报表关键字
+   const [id, setId] = useState()
 
    const page = useRef(query.page);//哪一页
 
@@ -44,6 +45,7 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, gener
          if (res.success) {
             setTableData(res.payload.data?.rows)
             setLimits(res.payload.data?.count)
+            setId("")
          }
       })
    }
@@ -70,7 +72,7 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, gener
       dataIndex: "reportType",
       key: 'reportType',
    }, {
-      title: "最近生产时间",
+      title: "最近生成时间",
       dataIndex: "time",
       key: 'time',
       render: (txet, row) => txet && moment(txet).format('YYYY-MM-DD HH:mm:ss') || '--'
@@ -103,7 +105,8 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, gener
                >
                   <Button theme="borderless" type='danger'>删除</Button>
                </Popconfirm>
-               <Button theme="borderless" loading={generateloading} onClick={() => {
+               <Button theme="borderless" loading={id == row?.id && generateloading ? true : false} onClick={() => {
+                  setId(row?.id)
                   // WSDJC(温湿度监测) 1002
                   // FSFXJC(风速风向监测)  1001
                   // SSFJC(伸缩缝监测)  4009
@@ -135,7 +138,12 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, gener
                      d.codeName = dataList[d.codeName]
                   })
 
-                  dispatch(service.postGenerateReport(row))
+                  dispatch(service.postGenerateReport(row)).then((res) => {
+                     if (res.success) {
+                        setQuery({ limit: 10, page: 0 })
+                        getData({ limit: 10, page: 0, keyword: keyword })
+                     }
+                  })
                }}>
                   立即生成
                </Button>

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

@@ -68,10 +68,8 @@ const ReportFile = ({ dispatch, actions, user, clientHeight, loading, socket, qi
       render: (_, row) => {
          return (
             <div style={{ display: "flex" }}>
-               <Button theme="borderless" onClick={() => {
+               <Button theme="borderless">
-                  console.log(`/_file-server/${row?.url?.slice(qiniuUrl.length + 1) + '?filename=' + encodeURIComponent(row?.fileName)}`);
+                  <a href={`/_file-server/${row?.url?.slice(qiniuUrl.length + 1) + '?filename=' + encodeURIComponent(row?.fileName + '.' + row?.url.split('.')?.pop())}`}>
-               }}>
-                  <a href={`/_file-server/${row?.url?.slice(qiniuUrl.length + 1) + '?filename=' + encodeURIComponent(row?.fileName)}`}>
                      下载
                   </a>
                </Button>