From fc5cf604c46e1a4a505b65d44cba3460db05a19d Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Fri, 4 Aug 2023 22:22:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weapp/src/packages/patrol/index.jsx  | 50 +++++++++++++++-------------
 weapp/src/packages/patrol/index.scss | 41 ++++++++++++++++++++---
 2 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx
index ab002782..088de738 100644
--- a/weapp/src/packages/patrol/index.jsx
+++ b/weapp/src/packages/patrol/index.jsx
@@ -1444,12 +1444,14 @@ const Index = () => {
             isSuperAdmin && (wait === 'wait' || kind === 'handle') && <View className='appoint'>
               {
                 handleState === '待处理' && <>
-                  <RadioGroup onChange={(e) => {
-                    setIsAppoint(e.detail.value === '指派' ? true : false)
-                  }}>
-                    <Radio value='指派' checked={isAppoint} color='#0080EE' className='radio'>指派</Radio>
-                    <Radio value='不处理' checked={!isAppoint} color='#0080EE' className='radio' style={{ marginLeft: 10 }}>不处理</Radio>
-                  </RadioGroup>
+                  <View className='appoint-radio'>
+                    <RadioGroup onChange={(e) => {
+                      setIsAppoint(e.detail.value === '指派' ? true : false)
+                    }}>
+                      <Radio value='指派' checked={isAppoint} color='#0080EE'>指派</Radio>
+                      <Radio value='不处理' checked={!isAppoint} color='#0080EE' style={{ marginLeft: 10 }}>不处理</Radio>
+                    </RadioGroup>
+                  </View>
                   {
                     isAppoint && <>
                       <View className='picker'>
@@ -1463,13 +1465,15 @@ const Index = () => {
                           <Image src={arrowIcon} className='arrow' />
                         </Picker>
                       </View>
-                      <Textarea
-                        placeholder='请输入处理意见'
-                        value={handleAdvice}
-                        onInput={e => setHandleAdvice(e.target.value)}
-                        disabled={isView && handleState !== '待处理'}
-                        maxlength={1024}
-                      />
+                      <View className='handle-advice'>
+                        <Textarea
+                          placeholder='请输入处理意见'
+                          value={handleAdvice}
+                          onInput={e => setHandleAdvice(e.target.value)}
+                          disabled={isView && handleState !== '待处理'}
+                          maxlength={1024}
+                        />
+                      </View>
                     </>
                   }
                 </>
@@ -1478,33 +1482,33 @@ const Index = () => {
           }
 
           {
-            handleState !== '待处理' && <View style={{ backgroundColor: '#fff', padding: 10 }}>
+            handleState !== '待处理' && <View >
               {
-                isSuperAdmin && handleState === '不处理' && <Text>
+                isSuperAdmin && handleState === '不处理' && <View className='general-cell'>
                   处理结果：暂不进行处理
-                </Text>
+                </View>
               }
               {
-                (!isSuperAdmin || (isSuperAdmin && (handleState === '已指派' || handleState === '已处理'))) && <>
+                (!isSuperAdmin || (isSuperAdmin && (handleState === '已指派' || handleState === '已处理'))) && <View className='general-cell' style={{ padding: '5px 10px' }}>
                   <View>处理意见：</View>
                   <View>{handleAdvice}</View>
-                </>
+                </View>
               }
               {
-                (isSuperAdmin && (handleState === '已指派' || handleState === '已处理')) && <>
-                  <View style={{ marginTop: 10 }}>责任人：</View>
+                (isSuperAdmin && (handleState === '已指派' || handleState === '已处理')) && <View className='general-cell' >
+                  <View>责任人：</View>
                   <View>
                     {appointUser !== null ? allDepUsers.find(d => d.depId === userList.find(u => u.id === appointUser)?.departmentId)?.depName : ''}
                     -
                     {appointUser !== null ? userList.find(u => u.id === appointUser)?.name : ''}
                   </View>
-                </>
+                </View>
               }
             </View>
           }
 
           {
-            ((isSuperAdmin && handleState == '已处理') || !isSuperAdmin) && <>
+            ((isSuperAdmin && handleState == '已处理') || !isSuperAdmin) && <View style={{ marginTop: 2 }}>
               <View className='patrol-img'><Text style={{ color: 'red' }}>*</Text>处理内容：</View>
               <AtTextarea
                 placeholder='请输入处理内容'
@@ -1532,7 +1536,7 @@ const Index = () => {
                       /> : ''
                 }
               </View>
-            </>
+            </View>
           }
 
           {handle != 'handle' && handleState != '已处理' ? <AtButton type='primary' className='sub-btn' onClick={handleOk}>提交</AtButton> : ''}
diff --git a/weapp/src/packages/patrol/index.scss b/weapp/src/packages/patrol/index.scss
index be62fcb9..5281f66a 100644
--- a/weapp/src/packages/patrol/index.scss
+++ b/weapp/src/packages/patrol/index.scss
@@ -283,14 +283,28 @@ page {
   }
 
   .appoint {
-    margin-top: 10px;
-    padding: 10px 20px;
-    background-color: #fff;
+    // margin-top: 10px;
+    // padding: 10px 20px;
+    // background-color: #fff;
+
+    .appoint-radio {
+      height: 96px;
+      background-color: #fff;
+      margin-top: 5px;
+      padding: 0 20px;
+      display: flex;
+      justify-content: start;
+      align-items: center;
+    }
 
     .picker {
-      margin: 10px 0;
+      height: 96px;
+      background-color: #fff;
+      margin-top: 5px;
+      padding: 0 20px;
       display: flex;
-      justify-content: flex-start;
+      justify-content: space-between;
+      align-items: center;
 
       .arrow {
         width: 24px;
@@ -298,5 +312,22 @@ page {
         margin: 0 10px;
       }
     }
+
+    .handle-advice {
+      background-color: #fff;
+      margin-top: 5px;
+      padding: 10px 20px;
+    }
+  }
+
+  .general-cell {
+    min-height: 96px;
+    background-color: #fff;
+    margin-top: 5px;
+    padding: 0px 20px;
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    flex-wrap: wrap;
   }
 }
\ No newline at end of file

From e7d1a624bfe751eea6381cc86f120392a7d7f85a Mon Sep 17 00:00:00 2001
From: iris_cx <cai.xiang1@free-sun.com.cn>
Date: Fri, 4 Aug 2023 14:27:20 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'scripts/1.3.1/data/1?=
 =?UTF-8?q?=5Finsert=5Freport=5Fdata/index.js'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/1.3.1/data/1_insert_report_data/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/1.3.1/data/1_insert_report_data/index.js b/scripts/1.3.1/data/1_insert_report_data/index.js
index 6f5303d4..af8c191a 100644
--- a/scripts/1.3.1/data/1_insert_report_data/index.js
+++ b/scripts/1.3.1/data/1_insert_report_data/index.js
@@ -6,13 +6,13 @@ try {
 
     // 测试环境
     const pool = new Pool({
-        user: 'postgres',
-        host: '10.8.30.32',
-        database: 'highways4good',
-        password: '123',
+        user: 'FashionAdmin',
+        host: '10.8.40.223',
+        database: 'sihaotest',
+        password: 'Fas123_',
         port: 5432,
     })
-    const userId = 5
+    const userId = 21
 
     // 商用环境
     // const pool = new Pool({