Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

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']}

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']}

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,

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]
 
     }
   })

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={() => {