basicAction({
-// type: 'get',
-// dispatch: dispatch,
-// actionType: 'GET_MEMBERS',
-// url: `${ApiTable.getEnterprisesMembers.replace('{enterpriseId}', orgId)}`,
-// msg: { error: '获取用户列表失败' },
-// reducer: { name: 'members' }
-// });
-// }
diff --git a/web/client/src/sections/example1/actions/index.js b/web/client/src/sections/example1/actions/index.js
deleted file mode 100644
index 090c73f..0000000
--- a/web/client/src/sections/example1/actions/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-import * as example from './example'
-
-export default {
- ...example
-}
\ No newline at end of file
diff --git a/web/client/src/sections/example1/containers/example.jsx b/web/client/src/sections/example1/containers/example.jsx
deleted file mode 100644
index 47fbace..0000000
--- a/web/client/src/sections/example1/containers/example.jsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { useEffect } from 'react';
-import { connect } from 'react-redux';
-import { Spin, Card } from '@douyinfe/semi-ui';
-import '../style.less'
-const { Meta } = Card;
-
-const Example = (props) => {
- const { dispatch, actions, user, loading, socket } = props
-
- useEffect(() => {
- // ACTION 示例
- // dispatch(actions.example.getMembers(user.orgId))
- }, [])
-
- // websocket 使用测试
-// useEffect(() => {
-// console.log(socket)
-// if (socket) {
-// socket.on('TEST', function (msg) {
-// console.info(msg);
-// });
-// return () => {
-// socket.off("TEST");
-// }
-// }
-
-// }, [socket])
-
- return (
-
-
- )
-}
-
-function mapStateToProps (state) {
- const { auth, global, members, webSocket } = state;
- return {
- // loading: members.isRequesting,
- // user: auth.user,
- // actions: global.actions,
- // members: members.data,
- // socket: webSocket.socket
- };
-}
-
-export default connect(mapStateToProps)(Example);
diff --git a/web/client/src/sections/example1/containers/index.js b/web/client/src/sections/example1/containers/index.js
deleted file mode 100644
index 19e6695..0000000
--- a/web/client/src/sections/example1/containers/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-import Example from './example';
-
-export { Example };
\ No newline at end of file
diff --git a/web/client/src/sections/example1/nav-item.jsx b/web/client/src/sections/example1/nav-item.jsx
deleted file mode 100644
index e48fafb..0000000
--- a/web/client/src/sections/example1/nav-item.jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import { IconCode } from '@douyinfe/semi-icons';
-
-export function getNavItem (user, dispatch) {
- return (
- [
- {
- itemKey: 'example1',
- text: '举个栗子1',
- icon:
+
+
+ );
+}
+function mapStateToProps (state) {
+ const { auth, global, members } = state;
+ return {
+ // loading: members.isRequesting,
+ user: auth.user,
+ actions: global.actions,
+ // members: members.data,
+ };
+}
+
+export default connect(mapStateToProps)(remarksModal);
diff --git a/web/client/src/sections/install/containers/index.js b/web/client/src/sections/install/containers/index.js
new file mode 100644
index 0000000..6f93c06
--- /dev/null
+++ b/web/client/src/sections/install/containers/index.js
@@ -0,0 +1,5 @@
+'use strict';
+
+import Roles from './roles';
+import System from './system';
+export { Roles,System };
\ No newline at end of file
diff --git a/web/client/src/sections/install/containers/roles.jsx b/web/client/src/sections/install/containers/roles.jsx
new file mode 100644
index 0000000..5db4d4b
--- /dev/null
+++ b/web/client/src/sections/install/containers/roles.jsx
@@ -0,0 +1,464 @@
+import React, { useEffect, useState, useRef } from 'react';
+import { connect } from 'react-redux';
+import { Skeleton, Table, RadioGroup, Radio, Button, Pagination, Popconfirm, Tooltip } from '@douyinfe/semi-ui';
+import { SkeletonScreen, } from "$components";
+import AdminModal from '../components/adminModal';
+import '../style.less'
+
+const Roles = (props) => {
+ const { dispatch, actions, user, loading, socket } = props
+ const { install } = actions;
+ const [roleAssignment, setRoleAssignment] = useState([])//角色分配
+ const [notCreated, setNotCreated] = useState([])//角色未分配
+ const [roleChoose, setRoleChoose] = useState('')//角色选择
+ const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
+ const [adminModal, setAdminModal] = useState(false);
+ const [columns, setColumns] = useState([
+ {
+ title: '成员',
+ render: (_, row) => {
+ return (
+ 'text'
+ )
+ }
+ },
+ {
+ title: '项目名称',
+ render: (_, row) => {
+ return (
+ 'name'
+ )
+ }
+ },
+ {
+ title: (
+ {
+ setAdminModal(false);
+ // equipmentGetCamera();
+ }} >
+ : ''
+ }
+
+ )
+}
+
+function mapStateToProps (state) {
+ const { auth, global, members } = state;
+ return {
+ // loading: members.isRequesting,
+ user: auth.user,
+ actions: global.actions,
+ // members: members.data,
+ };
+}
+export default connect(mapStateToProps)(Roles);
diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx
new file mode 100644
index 0000000..fc6618b
--- /dev/null
+++ b/web/client/src/sections/install/containers/system.jsx
@@ -0,0 +1,34 @@
+import React, { useEffect } from 'react';
+import { connect } from 'react-redux';
+import { Spin, Card } from '@douyinfe/semi-ui';
+import '../style.less'
+
+const Example = (props) => {
+ const { dispatch, actions, user, loading, socket } = props
+
+ useEffect(() => {
+ // dispatch(actions.example.getMembers(user.orgId))
+ }, [])
+
+
+ return (
+ <>
+
-
- {/* STYLE EXAMPLE
-
+
+
+
+ 数据分析师
+
+ 
+
+
+ ),
+ render: (_, row) => {
+ let rolearr = row.role
+ return (
+
+
+ {
+ rolearr.indexOf('data_analyst') != -1 ? (
+
+ );
+ }
+ }, {
+ title: (
+
+
+ ) : (
+
+ 
+
+
+ 有权限
+
+
+ )
+ }
+
+ 
+
+
+ 无权限
+
+ 售后运维
+
+
+
+
+ ),
+ render: (_, row) => {
+ let rolearr = row.role
+ return (
+
+
+ {
+ rolearr.indexOf('after_sale') != -1 ? (
+
+ );
+ }
+ }, {
+ title: (
+
+
+ ) : (
+
+
+
+
+ 有权限
+
+
+ )
+ }
+
+
+
+
+ 无权限
+
+ 资源管理员
+
+
+
+
+ ),
+ render: (_, row) => {
+ let rolearr = row.role
+ return (
+
+
+ {
+ rolearr.indexOf('resource_manage') != -1 ? (
+
+ );
+ }
+ }, {
+ title: (
+
+
+ ) : (
+
+
+
+
+ 有权限
+
+
+ )
+ }
+
+
+
+
+ 无权限
+
+ 客户服务
+
+
+
+
+ ),
+ render: (_, row) => {
+ let rolearr = row.role
+ return (
+
+
+ {
+ rolearr.indexOf('customer_service') != -1 ? (
+
+ );
+ }
+ },
+ {
+ title: "管理",
+ width: "20%",
+ dataIndex: "",
+ render: (_, row) => {
+ return (
+
+
+ ) : (
+
+
+
+
+ 有权限
+
+
+ )
+ }
+
+
+
+
+ 无权限
+
+ {row?.disabled ? (
+
+ ) : (
+ {
+ dispatch(install.putOrganizationUser({ pomsUserId: row?.id, disabled: !row?.disabled })).then(() => {
+ getUserList();
+ })
+ }}
+ >
+
+
+ )}
+
+ {
+ dispatch(install.putOrganizationUser({ pomsUserId: row?.id, disabled: !row?.disabled })).then(() => {
+ if (page.current > 0 && limits.current < 2) {
+ setQuery({ limit: 10, page: page.current - 1 })
+ } else {
+ setQuery({ limit: 10, page: page.current })
+ }
+ })
+ }}
+ >
+
+
+
+ );
+ },
+ },
+ ])
+ const [data, setdata] = useState([])
+ const page = useRef(query.page);
+ const limits = useRef(); //每页实际条数
+ useEffect(() => {
+ getUserList();
+ }, [query, roleChoose]);
+ useEffect(() => {
+ dispatch(install.getOrganizationDeps()).then((res)=>{//获取项企(PEP)全部部门及其下用户
+ console.log('resresres',res.payload.data);
+ })
+ getUserList()
+ }, [])
+ function getUserList () {
+ let searchData = { ...query, role: roleChoose }
+ dispatch(install.getOrganizationUser(searchData)).then((res) => {//获取成员列表
+ setdata(res.payload.data.users.rows);
+ setRoleAssignment(res.payload.data.admin)
+ let notCreatedArr = []
+ let notCreatedNum = 5 - res.payload.data.admin.length
+ for (let i = 0; i < notCreatedNum; i++) {
+ notCreatedArr.push('')
+ }
+ setNotCreated(notCreatedArr)
+ limits.current = res.payload.data.users.count
+ })
+ }
+ function handleRow (record, index) {//斑马条纹
+ // 给偶数行设置斑马纹
+ if (index % 2 === 0) {
+ return {
+ style: {
+ background: '#FAFCFF',
+ }
+ };
+ } else {
+ return {};
+ }
+ }
+ function roleOnChange (e) {//角色选择
+ setRoleChoose(e.target.value);
+ }
+ return (
+ <>
+
+
+
+
+
+ 管理员设置
+ ADMINISTRATOR SETTING
+
+
+
+ {
+ roleAssignment.map((item, index) => {
+ return (
+
+
+
+ )
+ })
+ }
+ {
+ notCreated.map((item, index) => {
+ return (
+ //
+ {'系统管理员0' + (index + 1)}
+
+
+
+
+
+
+
+ 行业服务部-刘昊然
+
+ 
+
+
+
+ 
+
+
+ 角色说明：拥有全平台的权限
+
+ 
+
+
+
+ //
+
+ // 
+ //
+ //
+ //
+ // 添加新的管理员
+ //
+ //
+
+ )
+ })
+ }
+
+ {'系统管理员0' + (index + 1)}
+
+
+
+
+
+
+
+ 虚席以待
+ {setAdminModal(true)}}>
+
+
+
+ 角色说明：拥有全平台的权限
+
+
+
+
+
+
+
+
+
+ {
+ adminModal ?
+
+
+
+ 成员管理
+ MANAGEMENT OF MEMBERS
+
+
+ 平台有4种类型的成员角色，分别是数据分析师、售后运维、资源管理者和客户服务，每名项目成员可拥有多种成员角色；
+
+
+
+
+ 全部
+ 数据分析师
+ 售后运维
+ 资源管理者
+ 客户服务
+
+
+
+
+
+
+
+ 共{limits.current}条信息
+
+ {
+ setQuery({ limit: pageSize, page: currentPage - 1 });
+ page.current = currentPage - 1
+ }}
+ />
+
+
+ 2222222222222
+
+
+ )
+}
+
+function mapStateToProps (state) {
+ const { auth, global, members, webSocket } = state;
+ return {
+ // loading: members.isRequesting,
+ // user: auth.user,
+ // actions: global.actions,
+ // members: members.data,
+ // socket: webSocket.socket
+ };
+}
+
+export default connect(mapStateToProps)(Example);
diff --git a/web/client/src/sections/example1/index.js b/web/client/src/sections/install/index.js
similarity index 84%
rename from web/client/src/sections/example1/index.js
rename to web/client/src/sections/install/index.js
index 92c4b45..37a6cb2 100644
--- a/web/client/src/sections/example1/index.js
+++ b/web/client/src/sections/install/index.js
@@ -6,8 +6,8 @@ import actions from './actions';
import { getNavItem } from './nav-item';
export default {
- key: 'example',
- name: '书写示例',
+ key: 'install',
+ name: '设置',
reducers: reducers,
routes: routes,
actions: actions,
diff --git a/web/client/src/sections/install/nav-item.jsx b/web/client/src/sections/install/nav-item.jsx
new file mode 100644
index 0000000..fc55919
--- /dev/null
+++ b/web/client/src/sections/install/nav-item.jsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { IconCode } from '@douyinfe/semi-icons';
+
+export function getNavItem (user, dispatch) {
+ return (
+ [
+ {
+ itemKey: 'install',
+ text: '设置',
+ icon: