fix: fix

src/components/Upload/context.js

@@ -31,15 +31,9 @@ const PictureWallProvider = props => {
   const updateDicName = () => {
     getSysConfigurate().then(res => {
       if (res.getMe && (res.getMe[0] === 1 || res.getMe[0] === '1')) {
-        window.DicNameSERVICE = {
-          CITY_SERVICE: '/Publish/GateWay/OMS',
-          PUBLISH_SERVICE: '/Publish/GateWay/CityServer',
-        };
+        window.DicNameSERVICE = 'publish';
       } else {
-        window.DicNameSERVICE = {
-          CITY_SERVICE: '/Cityinterface/rest/services',
-          PUBLISH_SERVICE: '/Publish/OMS',
-        };
+        window.DicNameSERVICE = '';
       }
     });
   };

src/pages/mobileConfig/menuconfig/AddForm.jsx

@@ -49,19 +49,19 @@ const AddForm = props => {
           onFinish={finish}
         >
           <Item
-            label="分组名称"
+            label="菜单组名称"
             name="menuName"
             rules={[
               {
                 required: true,
-                message: '请输入分组名称',
+                message: '请输入菜单组名称',
               },
             ]}
           >
-            <Input />
+            <Input placeholder="请输入菜单组名称" />
           </Item>
-          <Item label="分组别名" name="shortName">
-            <Input />
+          <Item label="菜单组别名" name="shortName">
+            <Input placeholder="请输入菜单组别名" />
           </Item>
           {addType === 1 && (
             <Item
@@ -94,12 +94,12 @@ const AddForm = props => {
 
           {addType === 2 && (
             <Item
-              label="分组图标"
+              label="菜单组图标"
               name="imageUrl"
               rules={[
                 {
                   required: true,
-                  message: '请选择分组图标',
+                  message: '请选择菜单组图标',
                 },
               ]}
             >

src/pages/mobileConfig/menuconfig/addForm.less

 .formStyle{
-  margin-bottom: 20px;
+  margin-bottom: 40px;
   // height: 100%;
   // overflow-y: scroll;
 }

src/pages/mobileConfig/menuconfig/checkBox.jsx

@@ -43,28 +43,33 @@ const CheckList = props => {
   return (
     <div>
       {nodeType === 3 || nodeType === 4 ? (
-        <div className={styles.box}>
-          {/* <Checkbox>全选/反选</Checkbox> */}
+        <>
+          <div className={styles.boxtitle}>
+            <span className={styles.boxspan}>关联角色</span>
+          </div>
+          <div className={styles.box}>
+            {/* <Checkbox>全选/反选</Checkbox> */}
 
-          {list &&
-            list.length > 0 &&
-            list.map(item => (
-              <div
-                key={item.relatedRoleCode}
-                className={styles.check}
-                title={item.relatedRoleName}
-              >
-                <Checkbox
-                  checked={item.related}
-                  onChange={e => {
-                    handleSelect(e, item.relatedRoleCode);
-                  }}
+            {list &&
+              list.length > 0 &&
+              list.map(item => (
+                <div
+                  key={item.relatedRoleCode}
+                  className={styles.check}
+                  title={item.relatedRoleName}
                 >
-                  {item.relatedRoleName}
-                </Checkbox>
-              </div>
-            ))}
-        </div>
+                  <Checkbox
+                    checked={item.related}
+                    onChange={e => {
+                      handleSelect(e, item.relatedRoleCode);
+                    }}
+                  >
+                    {item.relatedRoleName}
+                  </Checkbox>
+                </div>
+              ))}
+          </div>
+        </>
       ) : (
         <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
       )}

src/pages/mobileConfig/menuconfig/checkBox.less

 .box{
   display: flex;
-  padding:  20px;
-  margin: 20px;
+  padding: 20px;
   flex-wrap: wrap;
-  border: 1px solid #bfbfbf;
+  border: 1px solid #d9d9d9;
+  width: 93%;
+  margin-left: 3%;
+  margin-bottom: 20px;
+}
+.boxtitle{
+  position: relative;
+  top: 10px;
+  margin-left: 5%;
+}
+.boxspan{
+  font-weight: bold;
+  background-color: #fff;
+  padding: 0 5px;
 }
 .check{
   flex-shrink: 0;

src/pages/mobileConfig/menuconfig/editForm.jsx

@@ -65,19 +65,19 @@ const EditForm = props => {
           onFinish={onFinish}
         >
           <Item
-            label="分组名称"
+            label="菜单组名称"
             name="menuName"
             rules={[
               {
                 required: true,
-                message: '请输入分组名称',
+                message: '请输入菜单组名称',
               },
             ]}
           >
-            <Input />
+            <Input placeholder="请输入菜单组名称" />
           </Item>
-          <Item label="分组别名" name="shortName">
-            <Input />
+          <Item label="菜单组别名" name="shortName">
+            <Input placeholder="请输入菜单组别名" />
           </Item>
           {nodeType === 1 && (
             <Item
@@ -110,12 +110,12 @@ const EditForm = props => {
 
           {nodeType === 2 && (
             <Item
-              label="分组图标"
+              label="菜单组图标"
               name="imageUrl"
               rules={[
                 {
                   required: true,
-                  message: '请选择分组图标',
+                  message: '请选择菜单组图标',
                 },
               ]}
             >

src/pages/webConfig/menuconfig/AddForm.jsx

@@ -50,14 +50,14 @@ const AddForm = props => {
             rules={[
               {
                 required: true,
-                message: '请输入分组名称',
+                message: '请输入菜单名称',
               },
             ]}
           >
-            <Input />
+            <Input placeholder="请输入菜单名称" />
           </Item>
           <Item label="菜单别名" name="shortName">
-            <Input />
+            <Input placeholder="请输入菜单别名" />
           </Item>
           <Item
             label="菜单图标"
@@ -65,14 +65,23 @@ const AddForm = props => {
             rules={[
               {
                 required: true,
-                message: '请选择在线图标',
+                message: '请选择菜单图标',
               },
             ]}
           >
             <PicturesWall />
           </Item>
-          <Item label="功能路径" name="pageUrl">
-            <Input />
+          <Item
+            label="功能路径"
+            name="pageUrl"
+            rules={[
+              {
+                required: true,
+                message: '请输入功能路径',
+              },
+            ]}
+          >
+            <Input placeholder="请输入功能路径" />
           </Item>
           <Item label="配置文件" name="config">
             <EditeConfigWrapper>
@@ -109,27 +118,27 @@ const AddForm = props => {
           className={styles.formStyle}
         >
           <Item
-            label="菜单名称"
+            label="菜单组名称"
             name="menuName"
             rules={[
               {
                 required: true,
-                message: '请输入菜单名称',
+                message: '请输入菜单组名称',
               },
             ]}
           >
-            <Input />
+            <Input placeholder="请输入菜单组名称" />
           </Item>
-          <Item label="菜单别名" name="shortName">
-            <Input />
+          <Item label="菜单组别名" name="shortName">
+            <Input placeholder="请输入菜单组别名" />
           </Item>
           <Item
-            label="菜单图标"
+            label="菜单组图标"
             name="imageUrl"
             rules={[
               {
                 required: true,
-                message: '请选择菜单图标',
+                message: '请选择菜单组图标',
               },
             ]}
           >

src/pages/webConfig/menuconfig/addForm.less

 .formStyle{
   margin-bottom: 40px;
+}
+
+.rolebox{
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: nowrap;
 }
\ No newline at end of file

src/pages/webConfig/menuconfig/checkBox.jsx

@@ -5,7 +5,6 @@ const CheckList = props => {
   const { info, valueCallback, nodeType } = props;
   const [list, setList] = useState([]);
   const [flag, setFlag] = useState(false);
-  console.log(info, 'info');
   useEffect(() => {
     if (info.pageUrl) {
       let arr = [...info.relatedRoleList];
@@ -36,28 +35,31 @@ const CheckList = props => {
   return (
     <div>
       {nodeType === 1 ? (
-        <div className={styles.box}>
-          {/* <Checkbox>全选/反选</Checkbox> */}
-
-          {list &&
-            list.length > 0 &&
-            list.map(item => (
-              <div
-                key={item.relatedRoleCode}
-                className={styles.check}
-                title={item.relatedRoleName}
-              >
-                <Checkbox
-                  checked={item.related}
-                  onChange={e => {
-                    handleSelect(e, item.relatedRoleCode);
-                  }}
+        <>
+          <div className={styles.boxtitle}>
+            <span className={styles.boxspan}>关联角色</span>
+          </div>
+          <div className={styles.box}>
+            {list &&
+              list.length > 0 &&
+              list.map(item => (
+                <div
+                  key={item.relatedRoleCode}
+                  className={styles.check}
+                  title={item.relatedRoleName}
                 >
-                  {item.relatedRoleName}
-                </Checkbox>
-              </div>
-            ))}
-        </div>
+                  <Checkbox
+                    checked={item.related}
+                    onChange={e => {
+                      handleSelect(e, item.relatedRoleCode);
+                    }}
+                  >
+                    {item.relatedRoleName}
+                  </Checkbox>
+                </div>
+              ))}
+          </div>
+        </>
       ) : (
         <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
       )}

src/pages/webConfig/menuconfig/checkBox.less

 .box{
   display: flex;
   padding: 20px;
-  margin: 20px;
   flex-wrap: wrap;
-  border: 1px solid #bfbfbf;
+  border: 1px solid #d9d9d9;
+  width: 93%;
+  margin-left: 3%;
+}
+.boxtitle{
+  position: relative;
+  top: 10px;
+  margin-left: 5%;
+}
+.boxspan{
+  font-weight: bold;
+  background-color: #fff;
+  padding: 0 5px;
 }
 .check{
   flex-shrink: 0;

src/pages/webConfig/menuconfig/editForm.jsx

@@ -19,7 +19,7 @@ const EditForm = props => {
   const layout = {
     layout: 'horizontal',
     labelCol: { span: 2 },
-    wrapperCol: { span: 20, offset: 0 },
+    wrapperCol: { span: 21, offset: 0 },
   };
   // 回显表单
   useEffect(() => {
@@ -65,10 +65,10 @@ const EditForm = props => {
               },
             ]}
           >
-            <Input />
+            <Input placeholder="请输入菜单名称" />
           </Item>
           <Item label="菜单别名" name="shortName">
-            <Input />
+            <Input placeholder="请输入菜单别名" />
           </Item>
           <Item
             label="菜单图标"
@@ -82,8 +82,17 @@ const EditForm = props => {
           >
             <PicturesWall />
           </Item>
-          <Item label="功能路径" name="pageUrl">
-            <Input />
+          <Item
+            label="功能路径"
+            name="pageUrl"
+            rules={[
+              {
+                required: true,
+                message: '请输入功能路径',
+              },
+            ]}
+          >
+            <Input placeholder="请输入功能路径" />
           </Item>
           <Item label="配置文件" name="config">
             <EditeConfigWrapper>
@@ -108,7 +117,7 @@ const EditForm = props => {
             nodeType={nodeType}
             valueCallback={valueCallback}
           />
-          <Item wrapperCol={{ offset: 10 }} style={{ marginTop: '40px' }}>
+          <Item wrapperCol={{ offset: 10 }} style={{ marginTop: '20px' }}>
             <Button type="primary" htmlType="submit">
               提交
             </Button>
@@ -125,27 +134,27 @@ const EditForm = props => {
           className={styles.formStyle}
         >
           <Item
-            label="菜单名称"
+            label="菜单组名称"
             name="menuName"
             rules={[
               {
                 required: true,
-                message: '请输入菜单名称',
+                message: '请输入菜单组名称',
               },
             ]}
           >
             <Input />
           </Item>
-          <Item label="菜单别名" name="shortName">
-            <Input />
+          <Item label="菜单组别名" name="shortName">
+            <Input placeholder="请输入菜单组别名" />
           </Item>
           <Item
-            label="菜单图标"
+            label="菜单组图标"
             name="imageUrl"
             rules={[
               {
                 required: true,
-                message: '请选择菜单图标',
+                message: '请选择菜单组图标',
               },
             ]}
           >

src/services/index.js

 import { request } from '../utils/request';
 
+console.log(window, 'window');
+// export const CITY_SERVICE =
+//   window.DicNameSERVICE !== 'publish'
+//     ? '/Publish/GateWay/CityServer'
+//     : '/Cityinterface/rest/services';
 export const CITY_SERVICE = '/Cityinterface/rest/services';
 export const PUBLISH_SERVICE = '/Publish/OMS';
 // export const PUBLISH_SERVICE = '/Publish/GateWay/OMS';