From 79ac246f184bc1a11d7e166742d738623074981d Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Wed, 23 Oct 2024 16:02:12 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                   | 12 ++++++------
 src/views/gcaqjc/gcaqyj/yjgzpz/form.js |  2 +-
 src/views/rcgl/aqgl/fxgkqd/index.js    |  2 +-
 src/views/rcgl/xcxj/xjrw/form.js       |  4 +++-
 src/views/sq/qzq/gcdsj/index.js        |  2 +-
 src/views/sq/qzq/gcdsj/index.less      |  2 +-
 src/views/sz/pxjlgl/index.js           |  4 ++--
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 85be348c9..3c6ea73f3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -40,12 +40,12 @@ async function send(url, options) {
         }
 
         const { code } = res.data;
-        // if (code === 401) {
-        //     // debugger;
-        //     //window.location.href = '/mgr/home';// /mgr/home    /login
-        //     window.location.href = '/tsg/#/login';
-        //     // window.location.hash = '#/login';
-        // }
+        if (code === 405) {
+            // debugger;
+            //window.location.href = '/mgr/home';// /mgr/home    /login
+            window.location.href = '/tsg/#/login';
+            // window.location.hash = '#/login';
+        }
         return res.data;
     } catch (e) {
         //message.error(e);
diff --git a/src/views/gcaqjc/gcaqyj/yjgzpz/form.js b/src/views/gcaqjc/gcaqyj/yjgzpz/form.js
index 18bbcf262..32a93410a 100644
--- a/src/views/gcaqjc/gcaqyj/yjgzpz/form.js
+++ b/src/views/gcaqjc/gcaqyj/yjgzpz/form.js
@@ -137,7 +137,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => {
   useEffect(()=>{
     if (mode !== "save" ) {
         // getFileInfo(record)
-      // setCondition("1")
+      setCondition(record?.condition)
       setTypes(record.type)
     }
   }, [record, mode])
diff --git a/src/views/rcgl/aqgl/fxgkqd/index.js b/src/views/rcgl/aqgl/fxgkqd/index.js
index c5287ea72..ceaa0720e 100644
--- a/src/views/rcgl/aqgl/fxgkqd/index.js
+++ b/src/views/rcgl/aqgl/fxgkqd/index.js
@@ -49,7 +49,7 @@ const Page = () => {
       title: '可能导致的后果', key: 'result', dataIndex: 'result', width: 250, ellipsis: true,align: 'center',
       render: (value) => <span>{value ? value.map(item => item.dictNm).join():''}</span>
     },
-    {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 200,align: 'center',},
+    {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 300,ellipsis: true,align: 'center',},
     {title: '创建日期', key: 'createDate', dataIndex: 'createDate', width: 200,align: 'center',},
     {
       title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center',
diff --git a/src/views/rcgl/xcxj/xjrw/form.js b/src/views/rcgl/xcxj/xjrw/form.js
index bafed5bd2..3b6aa3b07 100644
--- a/src/views/rcgl/xcxj/xjrw/form.js
+++ b/src/views/rcgl/xcxj/xjrw/form.js
@@ -59,10 +59,12 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
   } 
  
   const onfinish = (values) => {
-    const userId =  localStorage.getItem('userId')
+    const userId = localStorage.getItem('userId')
+    const userName = localStorage.getItem('userName')
     values.startDate = values.startDate?moment(values.startDate).format("YYYY-MM-DD 00:00:00"):''
     values.endDate = values.endDate ? moment(values.endDate).format("YYYY-MM-DD 00:00:00") : ''
     values.createUserId = userId
+    values.createUserName = userName;
     values.inspectUserName = deptUserList?.find(item => item.userId == values.inspectUserId)?.nickName
     values.items = itemParams;
     if (mode === 'save') {
diff --git a/src/views/sq/qzq/gcdsj/index.js b/src/views/sq/qzq/gcdsj/index.js
index 40f07e735..5eb10cbc0 100644
--- a/src/views/sq/qzq/gcdsj/index.js
+++ b/src/views/sq/qzq/gcdsj/index.js
@@ -120,7 +120,7 @@ const viewPdf = (params) => {
                       <Timeline.Item key={index}>
                         <div className='time-line-item'>
                         <span style={{width:100}}>{item.eventsDate}</span>
-                          <div className='item-right'>
+                          <div className='dsj-item-right'>
                             <span>{item.eventsDesc}</span>
                             <div style={{ display: "flex"}}>
                               <span>附件：</span>
diff --git a/src/views/sq/qzq/gcdsj/index.less b/src/views/sq/qzq/gcdsj/index.less
index e0bd72879..4f76f2278 100644
--- a/src/views/sq/qzq/gcdsj/index.less
+++ b/src/views/sq/qzq/gcdsj/index.less
@@ -23,7 +23,7 @@
         display: flex;
         // align-items: center;
         column-gap: 20px;
-        .item-right{
+        .dsj-item-right{
             flex:1
         }
     }
diff --git a/src/views/sz/pxjlgl/index.js b/src/views/sz/pxjlgl/index.js
index 0e9e7f5ae..9650fe25e 100644
--- a/src/views/sz/pxjlgl/index.js
+++ b/src/views/sz/pxjlgl/index.js
@@ -166,8 +166,8 @@ const Page = () => {
               callback={refresh}
             />
           </Card>
-          <div className="ant-card-body" style={{padding:"20px 0 0 0"}}>
-            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 400px )"}}/>
+          <div className="ant-card-body" style={{padding:"20px 20px 0 0"}}>
+            <Table columns={columns} rowKey="inx" {...tableProps} scroll={{ x: width , y: "calc( 100vh - 680px )"}}/>
           </div>
         </div>