From 4cf137dcffbda7fabdcc816104e0956e55f1b665 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Wed, 17 Jan 2024 17:20:50 +0800
Subject: [PATCH] =?UTF-8?q?structId=20=20=E5=8F=82=E6=95=B0=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/service/components/automatic-Modal.jsx | 2 +-
 web/client/src/sections/service/containers/automaticReport.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/client/src/sections/service/components/automatic-Modal.jsx b/web/client/src/sections/service/components/automatic-Modal.jsx
index 33df7ba..66e1273 100644
--- a/web/client/src/sections/service/components/automatic-Modal.jsx
+++ b/web/client/src/sections/service/components/automatic-Modal.jsx
@@ -278,7 +278,7 @@ const AutomaticModal = ({ actions, dispatch, apiRoot, qiniuUrl, visible, eidtDat
                               />
                               <Form.TextArea field={s.strucId + "conclusion"} label='结论' style={{ width: 390 }} autosize={{ minRows: 2, maxRows: 10 }} placeholder="请输入结论" showClear
                                  initValue={eidtData?.structList?.find(d => d.structId == s.strucId)?.conclusion || ""}
-                                 rules={[{ required: true, message: "请输入结构物描述" }]}
+                                 // rules={[{ required: true, message: "请输入结论" }]}
                               />
                               <Form.DatePicker field={s.strucId + 'reportTime'} label='开始结束时间' type='dateTimeRange' showClear
                                  initValue={structFind?.reportStartTime && [moment(structFind?.reportStartTime).format('YYYY-MM-DD HH:mm:ss'), moment(structFind?.reportEndTime).format('YYYY-MM-DD HH:mm:ss')] || null} style={{ width: 390 }}
diff --git a/web/client/src/sections/service/containers/automaticReport.jsx b/web/client/src/sections/service/containers/automaticReport.jsx
index e4f7763..67029df 100644
--- a/web/client/src/sections/service/containers/automaticReport.jsx
+++ b/web/client/src/sections/service/containers/automaticReport.jsx
@@ -138,7 +138,7 @@ const AutomaticReport = ({ dispatch, actions, user, clientHeight, loading, gener
                      d.codeName = dataList[d.codeName]
                   })
 
-                  dispatch(service.postGenerateReport(row)).then((res) => {
+                  dispatch(service.postGenerateReport({ ...row, structId: "" })).then((res) => {
                      if (res.success) {
                         setQuery({ limit: 10, page: 0 })
                         getData({ limit: 10, page: 0, keyword: keyword })