fix

config/routes.js

@@ -486,8 +486,9 @@ export default [
               },
             ],
           },
+         
           {
-            path: '/',
+            path: '/system',
             name: '系统管理',
             component: '../layouts/BlankLayout',
             routes: [
@@ -497,29 +498,29 @@ export default [
                 component: './system/intention',
               },
               {
-                path: '/staff/Staff/List',
+                path: '/system/Staff/List',
                 name: '员工列表',
                 component: './staff/Staff/List',
               },
               {
-                path: '/staff/Staff/Edit',
+                path: '/system/Staff/Edit',
                 name: '编辑员工',
                 hideInMenu: true,
                 component: './staff/Staff/Edit',
               },
               {
-                path: '/staff/Role/List',
+                path: '/system/Role/List',
                 name: '角色管理',
                 component: './staff/Role/List',
               },
               {
-                path: '/staff/Role/Edit',
+                path: '/system/Role/Edit',
                 name: '编辑角色',
                 hideInMenu: true,
                 component: './staff/Role/Edit',
               },
               {
-                path: '/staff/Organization/List',
+                path: '/system/Organization/List',
                 name: '组织架构',
                 component: './staff/Organization',
               },

src/pages/Live/LiveActivity/Edit/components/base.jsx

@@ -55,9 +55,7 @@ const header = props => {
   };
 
   const cancelPage = () => {
-    router.push({
-      pathname: '/activity/liveActivity/list/index',
-    });
+    router.go('-1')
   };
 
   //打开新页面
@@ -120,12 +118,13 @@ const header = props => {
         <Form.Item label="所属城市">
           {getFieldDecorator('cityId', {
             initialValue: liveActivityData.cityId,
-            rules: [{ required: true, message: ' 请输入所属城市' }],
+            rules: [{ required: true, message: ' 请选择所属城市' }],
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')} />)}
         </Form.Item>
         <Form.Item label="所属楼盘">
           {getFieldDecorator('buildingId', {
             initialValue: liveActivityData.buildingId,
+            rules: [{ required: true, message: ' 请选择所属楼盘' }],
           })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')} />)}
         </Form.Item>
         <Form.Item label="直播活动标题">

src/pages/Live/LiveActivity/add/index.jsx

@@ -81,11 +81,13 @@ const header = props => {
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="所属城市">
           {getFieldDecorator('cityId', {
-            rules: [{ required: true, message: ' 请输入所属城市' }],
+            rules: [{ required: true, message: ' 请选择所属城市' }],
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
         </Form.Item>
         <Form.Item label="所属楼盘">
-          {getFieldDecorator('buildingId')(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
+          {getFieldDecorator('buildingId', {
+            rules: [{ required: true, message: ' 请选择所属楼盘' }],
+          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
         </Form.Item>
         <Form.Item label="直播活动标题">
           {getFieldDecorator('liveActivityTitle', {

src/pages/building/Edit/Basic/index.jsx

@@ -130,7 +130,9 @@ const BuildingBasic = React.forwardRef((props, ref) => {
           {getFieldDecorator('buildingId')(<Input disabled />)}
         </Item>
         <Item label="城市公司">
-          {getFieldDecorator('institutionId')(
+          {getFieldDecorator('institutionId',{
+            rules: [{ required: true, message: '请选择城市公司号' }],
+          })(
             <InstitutionSelect />
           )}
         </Item>

src/pages/staff/Role/List/index.jsx

@@ -25,13 +25,13 @@ const header = props => {
 
   function addRole(roleId) {
     router.push({
-      pathname: '/staff/Role/Edit',
+      pathname: '/system/Role/Edit',
     });
   }
 
   function toEditRole(roleId) {
     router.push({
-      pathname: '/staff/Role/Edit',
+      pathname: '/system/Role/Edit',
       query: {
         id: roleId,
       },

src/pages/staff/staff/Edit/index.jsx

@@ -70,7 +70,9 @@ const StaffEdit = props => {
   }, []);
 
   const handleSubmit = val => {
-    val.institutionIdLis =  val.institutionIdLis?.split(',')
+    console.log(val,userId,'----------111------------')
+    // val.institutionIdLis =  val?.institutionIdLis?.split(',')
+    // console.log(val,userId,'----------------------')
     if (userId) {
       request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val })
         .then(data => {

src/pages/staff/staff/list/index.jsx

@@ -19,7 +19,7 @@ export default props => {
   const toEdit = useCallback(row => {
     //跳转到编辑商品
     router.push({
-      pathname: '/staff/Staff/Edit',
+      pathname: '/system/Staff/Edit',
       query: {
         userId: row?.userId || undefined,
       },

src/pages/statistics/activity/index.jsx

@@ -119,8 +119,8 @@ const DataReport = props => {
       <Table
         columns={columns}
         dataSource={data?.records}
-        key="ff87cf95ed63367168bcb081c15d9d5e"
-        pagination={{current:data?.current, pageSize: '10', total: data?.total }}
+        key="dynamicId"
+        pagination={{current:data?.current, pageSize: 10, total: data?.total }}
         onChange={handleTableChange}
       ></Table>
     </Card>