From bef19f2b6641f40ce21cadd72257600dec9e8019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= <li.jianhao@free-sun.com.cn>
Date: Thu, 28 Jul 2022 10:03:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=BB=E6=8A=A4=E9=81=93=E8=B7=AF?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=B0=E9=87=8F=E6=95=B0=E6=8D=AE=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../footer/conserve/right/right-center.js           |  3 ++-
 .../containers/footer/conserve/right/right-top.js   | 13 +++++++------
 .../src/sections/quanju/containers/heand/index.js   |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js
index 64147c84..5aad0bdd 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js
@@ -14,7 +14,8 @@ const RightCenter = (props) => {
   const style = { height: "31%", marginTop: "3%" }
   const textStyle = { fontSize: 14, color: '#E9F7FF' }
   const numStyle = { color: '#fff', fontSize: 21, fontFamily: 'YouSheBiaoTiHei', textShadow: '0px 0px 8px #1C60FE', marginTop: 8 }
-  const list = highwaysData?.slice(4, 8).map((h,index)=>{
+  let list = highwaysData?.sort((a, b) => a.id - b.id)
+  list = highwaysData?.slice(4, 8).map((h,index)=>{
     return {
       id:h.id,
       name:h.name,
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
index e264b79d..11ed88f3 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
@@ -16,13 +16,14 @@ const RightTop = (props) => {
   const style = { height: "31%", marginTop: "3%" }
   const textStyle = { fontSize: 14, color: '#E9F7FF' }
   const numStyle = { color: '#fff', fontSize: 21, fontFamily: 'YouSheBiaoTiHei', textShadow: '0px 0px 8px #1C60FE', marginTop: 8 }
-  const list = highwaysData?.slice(0, 4).map((h,index)=>{
+  let list = highwaysData?.sort((a, b) => a.id - b.id)
+  list = highwaysData?.slice(0, 4).map((h, index) => {
     return {
-      id:h.id,
-      name:h.name,
-      count:h.count,
-      unit:unit[index],
-      icon:iconSrc[index]
+      id: h.id,
+      name: h.name,
+      count: h.count,
+      unit: unit[index],
+      icon: iconSrc[index]
 
     }
   })
diff --git a/web/client/src/sections/quanju/containers/heand/index.js b/web/client/src/sections/quanju/containers/heand/index.js
index 92f01e00..e2c4a82a 100644
--- a/web/client/src/sections/quanju/containers/heand/index.js
+++ b/web/client/src/sections/quanju/containers/heand/index.js
@@ -21,7 +21,7 @@ const Header = (props) => {
             <div className={tabKey == "build" ? "tabKey-map" : "notabKey"} style={{ backgroundImage: "url(/assets/images/quanju/zuobeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {
                 onClick("build")
             }}><a>建设</a></div>
-            <div className={tabKey == "guanli" ? "tabKey-map" : "notabKey"} style={{ left: "11.5%", backgroundImage: "url(/assets/images/quanju/youbeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {
+            <div className={tabKey == "guanli" ? "tabKey-map" : "notabKey"} style={{ left: "11.5%", backgroundImage: "url(/assets/images/quanju/zuobeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {
                 onClick("guanli")
             }}><a>管理</a></div>
             <div className={tabKey == "leadership" ? "tabKey-map" : "notabKey"} style={{ left: "23%", backgroundImage: "url(/assets/images/quanju/zuobeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {

From 33210217dc31926d2e8de446e729047a90154cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= <li.jianhao@free-sun.com.cn>
Date: Thu, 28 Jul 2022 10:18:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/organization/components/depModal.js  | 2 +-
 web/client/src/sections/organization/components/userModal.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/client/src/sections/organization/components/depModal.js b/web/client/src/sections/organization/components/depModal.js
index 59f6ed5e..8f6d7471 100644
--- a/web/client/src/sections/organization/components/depModal.js
+++ b/web/client/src/sections/organization/components/depModal.js
@@ -30,7 +30,7 @@ const DepModal = (props) => {
         onFinish={onFinish}
         formRef={formRef}
         destroyOnClose
-        initialValues={data || null}
+        initialValues={depModalType === 'edit' ? data : null}
       >
         <ProFormText
           name={['name']}
diff --git a/web/client/src/sections/organization/components/userModal.js b/web/client/src/sections/organization/components/userModal.js
index 4b3c0207..29a91f9f 100644
--- a/web/client/src/sections/organization/components/userModal.js
+++ b/web/client/src/sections/organization/components/userModal.js
@@ -45,7 +45,7 @@ const UserModal = (props) => {
                         label="姓名"
                         required
                         placeholder="请输入姓名"
-                        rules={[{ required: true, message: '请输入姓名' },{ max: 10, message: '请输入10个字以内的名称' }]}
+                        rules={[{ required: true, message: '请输入姓名' },{ max: 5, message: '请输入5个字以内的名称' }]}
                     />
                     < ProFormText
                         name={['contract', 'phone']}