开始 > 分组 > 聚合 > 决策选项 聚合之后节点不会执行问题bugfix

bugs/note.txt

@@ -15,3 +15,11 @@ ALTER TABLE t_machine_learning_models MODIFY COLUMN model_field varchar(4096) NO
 优化点：
 数据中心 / 接口源 / 接口新建 修改 查看   请求地址 输入框加长 
 
+
+
+com.fibo.ddp.common.model.strategyx.decisiontable.DecisionTablesResult
+TODO 注意  添加决策表 时  实际对应的字段是 ro 和   colum ,待确认 ！！！
+
+
+
+

ddp/ddp-common/ddp-model/src/main/java/com/fibo/ddp/common/model/strategyx/decisiontable/DecisionTablesResult.java

@@ -30,10 +30,13 @@ public class DecisionTablesResult implements Serializable {
 
     private Long versionId;//决策表版本id
 
-    @TableField(value = "rowss")
+    //   注意  添加决策表 时  实际对应的字段是 ro 和   colum ,待确认 ！！！
+
+    // 先注释 ， 数据库表加字段 解决 
+    // @TableField(value = "rowss")
     private Integer ro;//行数
 
-    @TableField(value = "columnss")
+    // @TableField(value = "columnss")
     private Integer colum;//列数
 
     private String resultValue;//结果集二维数组

ddp/ddp-enginex/risk-engine/src/main/java/com/fibo/ddp/enginex/riskengine/runner/business/impl/RiskEngineBusinessImpl.java

@@ -223,7 +223,12 @@ public class RiskEngineBusinessImpl implements RiskEngineBusiness {
                 resultSet.setOutput(JSONObject.toJSONString(tmpJsonObject));
                 resultSetMapper.insertResultSet(resultSet);
                 Integer resultId = resultSet.getId();
-//                this.monitorDecisionFlow(inputParam, engine, engineVersion, engineNodeList, outMap, paramJson, resultId);
+                // 20250325  去掉注释 ，写入监控表
+                try {
+                    this.monitorDecisionFlow(inputParam, engine, engineVersion, engineNodeList, outMap, paramJson, resultId);
+                }catch(Exception e){
+                    logger.error("monitorDecisionFlow_error", e);
+                }
                 // 正常返回结果回调
                 decisionCallback(engine.getCallbackUrl(), paramJson, result);
             }
@@ -318,11 +323,16 @@ public class RiskEngineBusinessImpl implements RiskEngineBusiness {
                     nextEngineNode = engineNodeMap.get(outMap.get("nextNode"));
                     outMap.remove("nextNode");
                 }
-
+                // 会导致 开始 > 分组 > 聚合 > 决策选项  不会执行 ，先注释掉  20250427
-                if (nextEngineNode != null && nextEngineNode.getNodeType() == NodeTypeEnum.AGGREGATION.getValue()) {
+                // if (nextEngineNode != null && nextEngineNode.getNodeType() == NodeTypeEnum.AGGREGATION.getValue()) {
                     // 并行节点后面的分支为多线程执行，执行到聚合节点则结束
-                    resultNode = nextEngineNode;
+                    //resultNode = nextEngineNode;
-                } else {
+                //} else {
+                    // resultNode = recursionEngineNode(inputParam, nextEngineNode, engineNodeMap, outMap);
+                //}
+
+                //  20250427 之前的逻辑 会导致 开始 > 分组 > 聚合 > 决策选项  不会执行 ， 使用以下代码
+                if (nextEngineNode != null){
                     resultNode = recursionEngineNode(inputParam, nextEngineNode, engineNodeMap, outMap);
                 }
             }

ddp/ddp-monitor/src/main/java/com/fibo/ddp/monitor/controller/decisionflow/MonitorController.java

@@ -47,7 +47,9 @@ public class MonitorController {
         Integer pageNo = param.get("pageNo") == null ? 1 : Integer.valueOf(param.get("pageNo").toString());
         Integer pageSize = param.get("pageSize") == null ? 10 : Integer.valueOf(param.get("pageSize").toString());
         PageHelper.startPage(pageNo, pageSize);
-        List<EngineResultSet> resultSets = MonitorCenterFactory.getMonitorCenterServiceImp(MonitorStorageType.HBase).getEngineResultSetBySegment(param);
+        // MonitorStorageType.HBase
+        // 20250325 MonitorStorageType.Mysql
+        List<EngineResultSet> resultSets = MonitorCenterFactory.getMonitorCenterServiceImp(MonitorStorageType.Mysql).getEngineResultSetBySegment(param);
         PageInfo<EngineResultSet> pageInfo = new PageInfo<>(resultSets);
         HashMap<String, Object> modelMap = new HashMap<>();
         modelMap.put("pager", pageInfo);

h5-auth-manager/.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8

h5-auth-manager/.env.jia

@@ -0,0 +1,3 @@
+NODE_ENV = 'jia'
+VUE_CURRENTMODE = 'jia'
+VUE_PROXY = true

h5-auth-manager/.env.niu

@@ -0,0 +1,3 @@
+NODE_ENV = 'niu'
+VUE_CURRENTMODE = 'niu'
+VUE_PROXY = true

h5-auth-manager/.env.produce

@@ -0,0 +1,3 @@
+NODE_ENV = 'produce'
+VUE_CURRENTMODE = 'produce'
+VUE_PROXY = true

h5-auth-manager/.env.release

@@ -0,0 +1,3 @@
+NODE_ENV = 'release'
+VUE_CURRENTMODE = 'release'
+VUE_PROXY = true

h5-auth-manager/.env.test

@@ -0,0 +1,3 @@
+NODE_ENV = 'test'
+VUE_CURRENTMODE = 'test'
+VUE_PROXY = true

h5-auth-manager/.env.wang

@@ -0,0 +1,3 @@
+NODE_ENV = 'wang'
+VUE_CURRENTMODE = 'wang'
+VUE_PROXY = true

h5-auth-manager/.eslintrc.js

@@ -0,0 +1,12 @@
+// {
+//   "presets": [
+//     ["env", {
+//       "modules": false,
+//       "targets": {
+//         "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+//       }
+//     }],
+//     "stage-2"
+//   ],
+//   "plugins": ["transform-remove-strict-mode"]
+// }

h5-auth-manager/.gitignore

@@ -0,0 +1,22 @@
+.DS_Store
+node_modules
+/dist
+example.html
+favicon.ico
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*

h5-auth-manager/.prettierrc

@@ -0,0 +1,6 @@
+{
+	"tabWidth": 4,
+	"singleQuote": true,
+	"trailingComma": "none",
+	"printWidth": 140
+}

h5-auth-manager/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016-2019 vue-manage-system
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

h5-auth-manager/babel.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+	presets: [
+		'@vue/app'
+	],
+
+}

h5-auth-manager/baseUrl.js

@@ -0,0 +1,108 @@
+// console.log(process.env)
+var proxyObj = {}
+// console.log(process.env.VUE_PROXY)
+switch (process.env.NODE_ENV) {
+	case 'development': // 开发环境代理地址
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://127.0.0.1:8082', // 开发环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				},
+
+			},
+			'/trading': {
+				target: 'http://127.0.0.1:8083', // 开发环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/trading': '/trading'
+				},
+
+			},
+		}
+		break
+	case 'test': // 测试环境代理地址
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://localhost:8080', // 测试环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+		}
+		break
+	case 'release': // 军环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://192.168.3.155:8080', // 谭环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+		}
+		break
+	case 'niu': // 牛环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://192.168.50.3:8080', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+		}
+		break
+	case 'jia': // 贾环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://192.168.50.188:8080', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+			// '/list': {
+			// 	target: 'http://127.0.0.1:8888', // 生产环境
+			// 	changeOrigin: true, // 是否跨域
+			// 	pathRewrite: {
+			// 		'^/list': '/list'
+			// 	}
+			// },
+		}
+		break
+	case 'wang': // 汪环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://192.168.50.228:8080', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+		}
+		break
+	case 'produce': // 生产环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://47.99.93.74:8099', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			},
+			'/trading': {
+				target: 'http://47.99.93.74:8099', // 开发环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/trading': '/trading'
+				}
+
+			}
+		}
+		break
+}
+
+module.exports = proxyObj

h5-auth-manager/h5-enginex-manager.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

h5-auth-manager/index.html

@@ -0,0 +1,14 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite App</title>
+
+<body>
+<div id="app"></div>
+<script type="module" src="./src/main.js"></script>
+</body>
+</html>

h5-auth-manager/package.json

@@ -0,0 +1,57 @@
+{
+	"name": "vue-manage-system",
+	"version": "4.2.0",
+	"private": true,
+	"scripts": {
+		"serve": "vue-cli-service serve",
+		"serve:test": "vue-cli-service serve --mode test",
+		"serve:jia": "vue-cli-service serve --mode jia",
+		"serve:niu": "vue-cli-service serve --mode niu",
+		"serve:wang": "vue-cli-service serve --mode wang",
+		"serve:release": "vue-cli-service serve --mode release",
+		"serve:produce": "vue-cli-service serve --mode produce",
+		"build": "vue-cli-service build",
+		"lint": "vue-cli-service lint",
+		"eslint": "eslint --fix --ext .js,.vue src",
+		"stylelint": "stylelint **/*.{vue,css,scss,less} --fix",
+		"standard": "standard",
+		"standfix": "standard --fix",
+		"dev": "vite",
+		"start": "vite",
+		"preview": "vite preview",
+		"vite-build": "vite build"
+	},
+	"dependencies": {
+		"axios": "^0.18.1",
+		"babel-polyfill": "^6.26.0",
+		"echarts": "^5.1.2",
+		"element-ui": "^2.11.0",
+		"js-cookie": "^2.2.1",
+		"less": "^4.1.1",
+		"less-loader": "^5.0.0",
+		"mavon-editor": "^2.6.17",
+		"node-sass": "^4.14.1",
+		"vue": "^2.6.10",
+		"vue-codemirror": "^4.0.6",
+		"vue-cropperjs": "^3.0.0",
+		"vue-i18n": "^8.10.0",
+		"vue-quill-editor": "^3.0.6",
+		"vue-router": "^3.0.3",
+		"vuedraggable": "^2.17.0",
+		"vuex": "^3.6.2"
+	},
+	"devDependencies": {
+		"@vue/cli-plugin-babel": "^3.9.0",
+		"@vue/cli-service": "^3.9.0",
+		"babel-plugin-transform-remove-strict-mode": "0.0.2",
+		"mockjs": "^1.1.0",
+		"sass-loader": "^7.3.1",
+		"sass-resources-loader": "^2.1.1",
+		"style-loader": "^2.0.0",
+		"vue-template-compiler": "^2.6.10",
+		"vite": "2",
+		"@vitejs/plugin-legacy": "^1.4.4",
+		"vite-plugin-mock": "2",
+		"vite-plugin-vue2": "latest"
+	}
+}

h5-auth-manager/postcss.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: {
+    autoprefixer: {}
+  }
+}

h5-auth-manager/src/App.vue

@@ -0,0 +1,85 @@
+<template>
+	<div id="app">
+
+		<!-- <keep-alive include="history"> -->
+		<router-view></router-view>
+		<!-- </keep-alive> -->
+	</div>
+</template>
+<script>
+	// import {
+	// 	fieldusing
+	// } from '@/api/index.js'
+	import {
+		getByKey,
+		refreshCache
+	} from '@/api/index.js';
+	export default {
+		name: 'App',
+		created() {
+			if(localStorage.getItem('setsystemList')){
+				this.$store.commit('setsystemList',JSON.parse(localStorage.getItem('setsystemList')))
+			}
+			getByKey({
+				dictKey:'holdSystemList'
+			}).then(res=>{
+				if(res.status=='1'){
+					let arr = res.data.dictValue.split(',').map(value=>{
+						return {
+							value : value,
+							label : value,
+							data:null
+						}
+					})
+					localStorage.setItem('setsystemList',JSON.stringify(arr))
+					this.$store.commit('setsystemList',arr)
+					
+				}
+			})
+			// getV({page:2}).then(res=>{
+
+			// 	console.log(String(res))
+			// })
+		}
+	}
+</script>
+<style>
+	@import "./assets/css/main.css";
+	@import "./assets/css/color-dark.css";
+
+	/*深色主题*/
+	/*@import "./assets/css/theme-green/color-green.css";   浅绿色主题*/
+	.setting-wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.setting-wrapper .line {
+		margin: 0 10px;
+	}
+
+	.call-mode-wrapper,
+	.setting-wrapper {
+		width: 100%;
+		margin-top: 20px;
+	}
+
+	.conditions-wrapper {
+		/* display: flex;  */
+		margin: 15px 0;
+		/* align-items: center; */
+		transition: all 0.3s;
+	}
+
+	.type3_submit_home {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		left: 80%;
+		margin-top: 30px;
+		top: 74.5vh;
+		z-index: 999;
+	}
+</style>

h5-auth-manager/src/api/index.js

@@ -0,0 +1,80 @@
+import request from '../utils/request';
+// console.log(request)
+
+// export const getV = (params) => request.get(`${window.location.origin}/index.html?time=${new Date().getTime()}`)
+
+
+
+export const fetchData = (params) => request.get('./table.json',{params})
+// 登录接口
+export const getLogin = (params) => request.post('Riskmanage/v2/login/login',params)
+// 登出接口
+export const getLogout = (params) => request.post('Riskmanage/v2/login/logout',params)
+// 查询菜单权限接口
+export const getMenus = (params) => request.post('Riskmanage/v2/sysMenu/getMenus',params)
+// 查询首页统计信息
+export const getIndexInfo = (params) => request.post('Riskmanage/v2/engine/getIndexInfo',params)
+// 查询首页统计信息
+export const getByKey = (params) => request.post('Riskmanage/dictionary/getByKey',params)
+// 查询首页统计信息
+export const refreshCache = (params) => request.post('Riskmanage/dictionary/refreshCache',params)
+
+
+// ================================== 系统管理 ===================================
+// ---------------------用户管理
+// 获取用户列表
+export const getUserList = (params) => request.post('/Riskmanage/v2/sysUser/getUserList',params)
+// 创建用户  
+export const saveUser = (params) => request.post('/Riskmanage/v2/sysUser/save',params)
+// 编辑修改 
+export const updateUser = (params) => request.post('/Riskmanage/v2/sysUser/update',params)
+// 启用、停用、删除  
+export const userUpdateStatus = (params) => request.post('/Riskmanage/v2/sysUser/updateStatus',params)
+// 获取组织列表
+export const getOrganList = (params) => request.post('/Riskmanage/v2/sysOrganization/getOrganList',params)
+// 获取已启用的组织列表
+export const getAllValidOrgan = (params) => request.post('/Riskmanage/v2/sysOrganization/getAllValidOrgan',params)
+// 获取角色 
+export const getAllValidRole = (params) => request.post('/Riskmanage/v2/sysRole/getAllValidRole',params)
+// 修改密码 
+export const updateUserPassword = (params) => request.post('/Riskmanage/v2/sysUser/updatePassword',params)
+
+//----------------------- 角色管理
+// 获取角色列表
+export const getRoleList = (params) => request.post('/Riskmanage/v2/sysRole/getRoleList',params)
+// 修改批量操作  
+export const roleUpdateStatus = (params) => request.post('/Riskmanage/v2/sysRole/updateStatus',params)
+// 创建角色
+export const saveRole = (params) => request.post('/Riskmanage/v2/sysRole/save',params)
+// 修改角色
+export const updateRole = (params) => request.post('/Riskmanage/v2/sysRole/update',params)
+// 获取资源树  
+export const getFindtreeList = (params) => request.post('/Riskmanage/v2/sysMenu/findTreeList',params)
+// 获取引擎树  
+export const getEngineTree = (params) => request.post('/Riskmanage/v2/sysMenu/getEngineTree',params)
+// 权限分配资源树保存 
+export const insertRoleMenu = (params) => request.post('/Riskmanage/v2/sysMenu/insertRoleMenu',params)
+// 权限分配引擎树保存 
+export const insertRoleEngine = (params) => request.post('/Riskmanage/v2/sysMenu/insertRoleEngine',params)
+// -----------------------资源管理
+// 获取资源列表
+export const getRsourceMenuList = (params) => request.post('/Riskmanage/v2/sysMenu/getMenuList',params)
+// 删除资源 
+export const resourceUpdateStatus = (params) => request.post('/Riskmanage/v2/sysMenu/updateStatus',params)
+// 新增/修改资源获取的父节点树 
+export const getResourceTreeMenu = (params) => request.post('/Riskmanage/v2/sysMenu/getTreeMenu',params)
+// 编辑资源 
+export const resourceUpdate = (params) => request.post('/Riskmanage/v2/sysMenu/update',params)
+// 新增资源 
+export const resourceSave = (params) => request.post('/Riskmanage/v2/sysMenu/save',params)
+// -----------------------组织管理
+// 创建组织
+export const saveOrgan = (params) => request.post('/Riskmanage/v2/sysOrganization/save',params)
+// 修改组织  
+export const updateOrgan = (params) => request.post('/Riskmanage/v2/sysOrganization/update',params)
+// 更新状态  
+export const updateStatusOrgan = (params) => request.post('/Riskmanage/v2/sysOrganization/updateStatus',params)
+
+
+
+

h5-auth-manager/src/assets/css/ManageRedact.css

@@ -0,0 +1,159 @@
+.dataManageRedact {
+	overflow: hidden;
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	white-space: nowrap;
+}
+
+.MR_header {
+	display: flex;
+	justify-content: space-between;
+
+	padding:20px;
+	box-sizing: border-box;
+	border-bottom: 1px solid #ddd;
+	transition: all 0.2s; 
+}
+
+.MR_header>div:nth-of-type(1) {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	width: 12%;
+	font-size: 18px;
+}
+
+.MR_input {
+	
+	
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	border-bottom: 1px solid #ddd;
+	transition: all 0.2s; 
+	
+	padding: 20px 0 20px 0;
+	font-size: 16px;
+}
+
+.MR_input input {
+	
+	
+	transition: all 0.2s; 
+	
+	height: 40px;
+}
+
+.MR_scope {
+	border-bottom: 1px solid #ddd;
+	transition: all 0.2s; 
+	padding: 20px 0 20px 0;
+	font-size: 16px;
+	/* display: flex; */
+}
+
+.MR_scope input {
+	height: 40px;
+	transition: all 0.2s; 
+}
+
+
+
+.MR_headerSmall {
+	padding:8px 20px 8px 20px;
+
+}
+.MR_inputSmall {
+	padding: 0;
+	font-size: 14px;
+	height: 0;
+	overflow: hidden;
+}
+
+.MR_inputSmall input {
+	height: 25px;
+	height: 0;
+	overflow: hidden;
+}
+
+.MR_scopeSmall input {
+	height: 25px;
+	height: 0;
+	overflow: hidden;
+}
+
+.MR_scopeSmall {
+	padding:0;
+	font-size: 14px;
+	height: 0;
+	overflow: hidden;
+}
+
+
+
+
+.MR_input>div {
+	width: 30%;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	margin-left: 2%;
+}
+
+.MR_input>div>p {
+	width: 30%;
+}
+
+.MR_checkbox {
+	padding: 20px;
+	border-bottom: 1px solid #ddd;
+}
+
+.MR_scope>div {
+	display: flex;
+	align-items: center;
+	margin-left: 2%;
+}
+
+.MR_scope>div>p {
+	width: 7.6%;
+}
+
+.MR_derive {
+
+	margin: 0 40px 0 40px;
+
+}
+
+.MR_rule_home {
+	overflow: scroll;
+	overflow-x: hidden;
+	height: 350px;
+}
+
+.MR_rule_home::-webkit-scrollbar {
+	display: none;
+	/* Chrome Safari */
+}
+
+.MR_toolbar {
+	background-color: #F0F0F0;
+	height: 40px;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	font-weight: bold;
+	font-size: 18px;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+	-ms-user-select: none;
+	-khtml-user-select: none;
+	user-select: none;
+
+}
+
+.MR_toolbar>p:hover {
+	color: #fff;
+
+}

h5-auth-manager/src/assets/css/color-dark.css

@@ -0,0 +1,28 @@
+.header{
+    background-color: #242f42;
+}
+.login-wrap{
+    background: #324157;
+}
+.plugins-tips{
+    background: #eef1f6;
+}
+.plugins-tips a{
+    color: #20a0ff;
+}
+.el-upload--text em {
+    color: #20a0ff;
+}
+.pure-button{
+    background: #20a0ff;
+}
+.tags-li.active {
+    border: 1px solid #409EFF;
+    background-color: #409EFF;
+}
+.message-title{
+    color: #20a0ff;
+}
+.collapse-btn:hover{
+    background: rgb(40,52,70);
+}

h5-auth-manager/src/assets/css/cont.css

@@ -0,0 +1,124 @@
+	.cont_cont {
+		display: flex;
+		border-radius: 20px;
+		height: 85vh;
+	}
+
+	.cont_left {
+		width: 200px;
+		flex-shrink: 0;
+		background-color: #fff;
+		border-radius: 10px 0 0 10px;
+
+
+	}
+
+	.cont_list {
+		height: 70vh;
+		overflow: scroll;
+		scrollbar-width: none;
+		/* Firefox */
+		-ms-overflow-style: none;
+		/* IE 10+ */
+		overflow-x: hidden;
+		/* position: relative; */
+	}
+
+	.cont_list::-webkit-scrollbar {
+		display: none;
+		/* Chrome Safari */
+	}
+
+	.cont_left::-webkit-scrollbar-track {
+		-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+		border-radius: 10px;
+		background-color: #F5F5F5;
+	}
+
+	.cont_header {
+		margin-left: 20px;
+		margin-top: 20px;
+	}
+
+	.cont_header_title {
+		color: #444;
+		font-size: 18px;
+	}
+
+	.cont_header_subtitle {
+		color: #999;
+		font-size: 14px;
+		margin-top: 5px;
+	}
+
+	.cont_new_file {
+		align-items: center;
+		display: flex;
+		font-size: 16px;
+		border-top: 1px solid #ddd;
+		border-bottom: 1px solid #ddd;
+		padding: 10px 0 10px 15px;
+		box-sizing: border-box;
+		margin-top: 15px;
+		-moz-user-select: none;
+		-webkit-user-select: none;
+		-ms-user-select: none;
+		-khtml-user-select: none;
+		user-select: none;
+	}
+	.cont_new_file>div{
+		margin-left: 10px;
+	}
+	.file_select {
+		border: #409EFF 2px solid;
+		border-radius: 2px;
+		color: #409EFF;
+	}
+
+	.cont_right {
+		flex-grow: 1;
+		overflow: hidden;
+		background-color: #fafafa;
+		border-radius: 10px 10px 10px 10px;
+	}
+
+	.cont_right_hint {
+		font-size: 100px;
+		color: #00000011;
+		text-align: center;
+		line-height: 80vh;
+		-moz-user-select: none;
+		-webkit-user-select: none;
+		-ms-user-select: none;
+		-khtml-user-select: none;
+		user-select: none;
+	}
+
+	.cont_right_top {
+		padding: 21px;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 2px solid #eee;
+	}
+	.contText{
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: block;
+	}
+	.contText:hover{
+		white-space:inherit !important
+	}
+	.fileHint{
+		position: fixed;
+		background-color: #fafafa;
+		padding: 5px;
+		
+	}
+	.fileHint>p{
+		border-bottom: 1px solid #000;
+	}
+	.fileHint>p:hover{
+		color: #409EFF;
+	}

h5-auth-manager/src/assets/css/icon.css

@@ -0,0 +1,4 @@
+
+    [class*=" el-icon-lx"], [class^=el-icon-lx] {
+        font-family: lx-iconfont!important;
+    }

h5-auth-manager/src/assets/css/main.css

@@ -0,0 +1,185 @@
+* {
+    margin: 0;
+    padding: 0;
+}
+
+html,
+body,
+#app,
+.wrapper {
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+body {
+    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+}
+
+a {
+    text-decoration: none
+}
+
+
+.content-box {
+    position: absolute;
+    left: 250px;
+    right: 0;
+    top: 70px;
+    bottom: 0;
+    padding-bottom: 30px;
+    -webkit-transition: left .3s ease-in-out;
+    transition: left .3s ease-in-out;
+    background: #f0f0f0;
+}
+
+.content {
+    width: auto;
+    height: 100%;
+    padding: 10px;
+    /* overflow-y: scroll; */
+    box-sizing: border-box;
+}
+
+.content-collapse {
+    left: 65px;
+}
+
+.container {
+    padding: 30px;
+    background: #fff;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+}
+
+.crumbs {
+    margin: 10px 0;
+}
+
+.el-table th {
+    background-color: #f5f7fa !important;
+}
+
+.pagination {
+    margin: 20px 0;
+    text-align: right;
+}
+
+.plugins-tips {
+    padding: 20px 10px;
+    margin-bottom: 20px;
+}
+
+.el-button+.el-tooltip {
+    margin-left: 10px;
+}
+
+.el-table tr:hover {
+    background: #f6faff;
+}
+
+.mgb20 {
+    margin-bottom: 20px;
+}
+
+.move-enter-active,
+.move-leave-active {
+    transition: opacity .5s;
+}
+
+.move-enter,
+.move-leave {
+    opacity: 0;
+}
+
+/*BaseForm*/
+
+.form-box {
+    width: 600px;
+}
+
+.form-box .line {
+    text-align: center;
+}
+
+.el-time-panel__content::after,
+.el-time-panel__content::before {
+    margin-top: -7px;
+}
+
+.el-time-spinner__wrapper .el-scrollbar__wrap:not(.el-scrollbar__wrap--hidden-default) {
+    padding-bottom: 0;
+}
+
+/*Upload*/
+
+.pure-button {
+    width: 150px;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    color: #fff;
+    border-radius: 3px;
+}
+
+.g-core-image-corp-container .info-aside {
+    height: 45px;
+}
+
+.el-upload--text {
+    background-color: #fff;
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    box-sizing: border-box;
+    width: 360px;
+    height: 180px;
+    text-align: center;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+}
+
+.el-upload--text .el-icon-upload {
+    font-size: 67px;
+    color: #97a8be;
+    margin: 40px 0 16px;
+    line-height: 50px;
+}
+
+.el-upload--text {
+    color: #97a8be;
+    font-size: 14px;
+    text-align: center;
+}
+
+.el-upload--text em {
+    font-style: normal;
+}
+
+/*VueEditor*/
+
+.ql-container {
+    min-height: 400px;
+}
+
+.ql-snow .ql-tooltip {
+    transform: translateX(117.5px) translateY(10px) !important;
+}
+
+.editor-btn {
+    margin-top: 20px;
+}
+
+/*markdown*/
+
+.v-note-wrapper .v-note-panel {
+    min-height: 500px;
+}
+
+.content-wrapper{
+    width: 100%;
+    height: 100%;
+    background: #fff;
+    border-radius: 4px;
+    padding: 21px;
+}

h5-auth-manager/src/assets/css/theme-green/color-green.css

@@ -0,0 +1,29 @@
+.header{
+    background-color: #07c4a8;
+}
+.login-wrap{
+    background: rgba(56, 157, 170, 0.82);;
+}
+.plugins-tips{
+    background: #f2f2f2;
+}
+.plugins-tips a{
+    color: #00d1b2;
+}
+.el-upload--text em {
+    color: #00d1b2;
+}
+.pure-button{
+    background: #00d1b2;
+}
+.pagination > .active > a, .pagination > .active > a:hover, .pagination > .active > a:focus, .pagination > .active > span, .pagination > .active > span:hover, .pagination > .active > span:focus {
+    background-color: #00d1b2 !important;
+    border-color: #00d1b2 !important;
+}
+.tags-li.active {
+    border: 1px solid #00d1b2;
+    background-color: #00d1b2;
+}
+.collapse-btn:hover{
+    background: #00d1b2;
+}

h5-auth-manager/src/assets/utils.js

@@ -0,0 +1,24 @@
+
+export function formatDate (date, fmt) {
+    if (/(y+)/.test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+    let o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds()
+    };
+    for (let k in o) {
+      if (new RegExp(`(${k})`).test(fmt)) {
+        let str = o[k] + '';
+        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+      }
+    }
+    return fmt;
+  };
+   
+  function padLeftZero (str) {
+    return ('00' + str).substr(str.length);
+  };

h5-auth-manager/src/components/common/Header.vue

@@ -7,6 +7,11 @@
 		</div>
 		<div class="logo">权限系统</div>
 		<div class="header-right">
+			<!-- {{fielduser}} -->
+			<!-- {{ruleList}} -->
+
+			<!-- {{fielduser==''}} -->
+			<!-- {{ruleList==null}} -->
 			<div class="header-user-con">
 				<!--  -->
 				<div style="display: flex;font-size: 14px;">
@@ -45,7 +50,7 @@
 	</div>
 </template>
 <script>
-	import bus from './bus';
+	import bus from '../common/bus';
 	import {
 		getLogout
 	} from '../../api/index';
@@ -126,7 +131,7 @@
 					localStorage.removeItem("engineId");
 					// localStorage.removeItem("token");
 					localStorage.removeItem('ms_username');
-          this.$router.push('/loginAuth');
+					this.$router.push('/login');
 				}
 			},
 			// Bus侧边栏折叠

h5-auth-manager/src/components/common/Home.vue

@@ -0,0 +1,51 @@
+<template>
+    <div class="wrapper">
+        <v-head></v-head>
+        <v-sidebar></v-sidebar>
+        <div class="content-box" :class="{'content-collapse':collapse}">
+            <v-tags></v-tags>
+            <div class="content" >
+                <transition name="move" mode="out-in">
+                    <keep-alive :include="tagsList">
+                        <router-view></router-view>
+                    </keep-alive>
+                </transition>
+                <el-backtop target=".content"></el-backtop>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import vHead from './Header.vue';
+import vSidebar from './Sidebar.vue';
+import vTags from './Tags.vue';
+import bus from './bus';
+export default {
+    data() {
+        return {
+            tagsList: [],
+            collapse: false
+        };
+    },
+    components: {
+        vHead,
+        vSidebar,
+        vTags
+    },
+    created() {
+        bus.$on('collapse-content', msg => {
+            this.collapse = msg;
+        });
+
+        // 只有在标签页列表里的页面才使用keep-alive，即关闭标签之后就不保存到内存中了。
+        bus.$on('tags', msg => {
+            let arr = [];
+            for (let i = 0, len = msg.length; i < len; i++) {
+                msg[i].name && arr.push(msg[i].name);
+            }
+            this.tagsList = arr;
+        });
+    },
+};
+</script>

h5-auth-manager/src/components/common/Sidebar.vue

@@ -0,0 +1,107 @@
+<template>
+	<div class="sidebar">
+		<el-menu class="sidebar-el-menu" :default-active="onRoutes" :collapse="collapse" background-color="#324157"
+		 text-color="#bfcbd9" active-text-color="#20a0ff" unique-opened :router="true">
+			<template v-for="item in items">
+				<template v-if="item.subs">
+					<el-submenu :index="item.index" :key="item.index">
+						<template slot="title">
+							<i :class="item.icon"></i>
+							<span slot="title">{{ item.title }}</span>
+						</template>
+						<template v-for="subItem in item.subs">
+							<el-submenu v-if="subItem.subs" :index="subItem.index" :key="subItem.index">
+								<template slot="title">{{ subItem.title }}</template>
+								<el-menu-item v-for="(threeItem,i) in subItem.subs" :key="i" :index="threeItem.index">{{ threeItem.title }}</el-menu-item>
+							</el-submenu>
+							<el-menu-item v-else :index="subItem.index" :key="subItem.index">{{ subItem.title }}</el-menu-item>
+						</template>
+					</el-submenu>
+				</template>
+				<template v-else>
+					<el-menu-item :index="item.index" :key="item.index">
+						<i :class="item.icon"></i>
+						<span slot="title">{{ item.title }}</span>
+					</el-menu-item>
+				</template>
+			</template>
+		</el-menu>
+	</div>
+</template>
+
+<script>
+	import bus from './bus';
+	import {
+		getMenus,
+		
+	} from '../../api/index';
+	export default {
+		data() {
+			return {
+				collapse: false,
+				items: [],
+			};
+		},
+		computed: {
+			onRoutes() {
+				return this.$route.path
+			}
+		},
+		created() {
+			// 通过 Event Bus 进行组件间通信，来折叠侧边栏
+			bus.$on('collapse', msg => {
+				this.collapse = msg;
+				// bus.$emit('setcanvasn',msg)
+				bus.$emit('collapse-content', msg);
+			});
+
+			// 获取菜单接口
+			this.getMenus()
+			// refreshCache()
+			
+		},
+
+		methods: {
+			async getMenus() {
+				const data = await getMenus({entity:{resourceSystem:'Auth'}});
+			    // console.log('菜单接口返回的数据',data);
+				if (data.status === "0") {
+					this.$message.error(data.msg);
+					if (data.error === "01000103") {
+						this.$router.push('/login')
+					}
+				}
+				
+
+				this.items = data.data;
+				if(this.items.length == 0){
+					this.$message.error('您没有导航权限,请联系管理员');
+				}
+				// console.log("items", this.items);
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.sidebar {
+		display: block;
+		position: absolute;
+		left: 0;
+		top: 70px;
+		bottom: 0;
+		overflow-y: scroll;
+	}
+
+	.sidebar::-webkit-scrollbar {
+		width: 0;
+	}
+
+	.sidebar-el-menu:not(.el-menu--collapse) {
+		width: 250px;
+	}
+
+	.sidebar>ul {
+		height: 100%;
+	}
+</style>

h5-auth-manager/src/components/common/Tags.vue

@@ -0,0 +1,186 @@
+<template>
+    <div class="tags" v-if="showTags">
+        <ul>
+            <li class="tags-li" v-for="(item,index) in tagsList" :class="{'active': isActive(item.path)}" :key="index">
+                <router-link :to="item.path" class="tags-li-title">
+                    {{item.title}}
+                </router-link>
+                <span class="tags-li-icon" @click="closeTags(index)"><i class="el-icon-close"></i></span>
+            </li>
+        </ul>
+        <div class="tags-close-box">
+            <el-dropdown @command="handleTags">
+                <el-button size="mini" type="primary">
+                    标签选项<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu size="small" slot="dropdown">
+                    <el-dropdown-item command="other">关闭其他</el-dropdown-item>
+                    <el-dropdown-item command="all">关闭所有</el-dropdown-item>
+                </el-dropdown-menu>
+            </el-dropdown>
+        </div>
+    </div>
+</template>
+
+<script>
+    import bus from './bus';
+    export default {
+        data() {
+            return {
+                tagsList: []
+            }
+        },
+        methods: {
+            isActive(path) {
+                return path === this.$route.fullPath;
+            },
+            // 关闭单个标签
+            closeTags(index) {
+                const delItem = this.tagsList.splice(index, 1)[0];
+                const item = this.tagsList[index] ? this.tagsList[index] : this.tagsList[index - 1];
+                if (item) {
+                    delItem.path === this.$route.fullPath && this.$router.push(item.path);
+                }else{
+                    this.$router.push('/');
+                }
+            },
+            // 关闭全部标签
+            closeAll(){
+                this.tagsList = [];
+                this.$router.push('/');
+            },
+            // 关闭其他标签
+            closeOther(){
+                const curItem = this.tagsList.filter(item => {
+                    return item.path === this.$route.fullPath;
+                })
+                this.tagsList = curItem;
+            },
+            // 设置标签
+            setTags(route){
+                const isExist = this.tagsList.some(item => {
+                    return item.path === route.fullPath;
+                })
+                if(!isExist){
+                    if(this.tagsList.length >= 8){
+                        this.tagsList.shift();
+                    }
+                    this.tagsList.push({
+                        title: route.meta.title,
+                        path: route.fullPath,
+                        name: route.matched[1].components.default.name
+                    })
+                }
+                bus.$emit('tags', this.tagsList);
+            },
+            handleTags(command){
+                command === 'other' ? this.closeOther() : this.closeAll();
+            }
+        },
+        computed: {
+            showTags() {
+                return this.tagsList.length > 0;
+            }
+        },
+        watch:{
+            $route(newValue, oldValue){
+                this.setTags(newValue);
+            }
+        },
+        created(){
+            this.setTags(this.$route);
+            // 监听关闭当前页面的标签页
+            bus.$on('close_current_tags', () => {
+                for (let i = 0, len = this.tagsList.length; i < len; i++) {
+                    const item = this.tagsList[i];
+                    if(item.path === this.$route.fullPath){
+                        if(i < len - 1){
+                            this.$router.push(this.tagsList[i+1].path);
+                        }else if(i > 0){
+                            this.$router.push(this.tagsList[i-1].path);
+                        }else{
+                            this.$router.push('/');
+                        }
+                        this.tagsList.splice(i, 1);
+                        break;
+                    }
+                }
+            })
+        }
+    }
+
+</script>
+
+
+<style>
+    .tags {
+        position: relative;
+        height: 30px;
+        overflow: hidden;
+        background: #fff;
+        padding-right: 120px;
+        box-shadow: 0 5px 10px #ddd;
+    }
+
+    .tags ul {
+        box-sizing: border-box;
+        width: 100%;
+        height: 100%;
+    }
+
+    .tags-li {
+        float: left;
+        margin: 3px 5px 2px 3px;
+        border-radius: 3px;
+        font-size: 12px;
+        overflow: hidden;
+        cursor: pointer;
+        height: 23px;
+        line-height: 23px;
+        border: 1px solid #e9eaec;
+        background: #fff;
+        padding: 0 5px 0 12px;
+        vertical-align: middle;
+        color: #666;
+        -webkit-transition: all .3s ease-in;
+        -moz-transition: all .3s ease-in;
+        transition: all .3s ease-in;
+    }
+
+    .tags-li:not(.active):hover {
+        background: #f8f8f8;
+    }
+
+    .tags-li.active {
+        color: #fff;
+    }
+
+    .tags-li-title {
+        float: left;
+        max-width: 80px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        margin-right: 5px;
+        color: #666;
+    }
+
+    .tags-li.active .tags-li-title {
+        color: #fff;
+    }
+
+    .tags-close-box {
+        position: absolute;
+        right: 0;
+        top: 0;
+        box-sizing: border-box;
+        padding-top: 1px;
+        text-align: center;
+        width: 110px;
+        height: 30px;
+        background: #fff;
+        box-shadow: -3px 0 15px 3px rgba(0, 0, 0, .1);
+        z-index: 10;
+    }
+
+</style>

h5-auth-manager/src/components/common/bus.js

@@ -0,0 +1,6 @@
+import Vue from 'vue';
+
+// 使用 Event Bus
+const bus = new Vue();
+
+export default bus;

h5-auth-manager/src/components/common/charts.vue

@@ -0,0 +1,55 @@
+<template>
+	<div :id="sid" :style="{height: height,width:width}">
+		
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+	export default {
+		props: {
+			sid: {
+				type: String,
+				default: 'echartsId'
+			},
+			height: {
+				type: String,
+				default: '300px'
+			},
+			width: {
+				type: String,
+				default: '300px'
+			},
+			option: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				chartDom: null,
+				myChart: null
+			}
+		},
+		mounted() {
+			this.chartDom = document.getElementById(this.sid);
+			this.myChart = echarts.init(this.chartDom);
+			this.myChart.setOption(this.option);
+		},
+		watch: {
+			option: {
+				handler: function() {
+					this.myChart.clear()
+					this.myChart.setOption(this.option);
+				},
+				// 开启深度监听：只要obj中的任何一个属性发生改变，都会触发相应的代码
+				deep: true
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

h5-auth-manager/src/components/models/addResourceDialog.vue

@@ -0,0 +1,378 @@
+<template> 
+	<div class="user-edit-wrapper">
+		<el-dialog title="资源配置" :visible.sync="dialogVisible" width="50%" :before-close="handleClose">
+			<el-form ref="myform" :model="form" :rules="rules" label-width="80px" label-position="left">
+				<el-row>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="资源编号" prop="code">
+								<el-input v-model="form.code" autocomplete="off"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="资源名" prop="name">
+								<el-input v-model="form.name" autocomplete="off"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="icon" prop="icon">
+								<el-input v-model="form.icon" autocomplete="off"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="12">
+						<div class="grid-conten">
+							<el-form-item label="资源描述" prop="des">
+								<el-input v-model="form.des" autocomplete="off"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="12">
+						<div class="grid-conten">
+							<el-form-item label="访问路径" prop="url">
+								<el-input v-model="form.url" autocomplete="off"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+				</el-row>
+
+				<el-row>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="菜单排序" prop="sort">
+								<el-input v-model="form.sort" autocomplete="off" minlength="1" maxlength="3"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="系统分类" prop="sort">
+								
+								<el-select v-model="form.resourceSystem" placeholder="请选择" @change="gettreeList(parentId)">
+									<el-option :label="value.label" :value="value.value" v-for="value in systemList" :key="value.value"></el-option>
+								
+								</el-select>
+
+							</el-form-item>
+						</div>
+					</el-col>
+				</el-row>
+
+				<el-divider></el-divider>
+				<el-row>
+					<el-col :span="24">
+						<div class="grid-conten">
+							<h3 style="margin-bottom:30px">
+								父类资源：
+							</h3>
+						</div>
+					</el-col>
+				</el-row>
+
+				<el-row>
+					<el-col :span="24">
+						<div class="grid-conten">
+							<el-tree ref="tree" :props="props" node-key="resourceId" :data="systemList.find(x=>x.value==this.form.resourceSystem)?systemList.find(x=>x.value==this.form.resourceSystem).data:[]" :key="num"
+								:current-node-key="checkedKeys" :highlight-current="true" @node-click="handleNodeClick">
+							</el-tree>
+							<div style="padding: 20px;display: flex;justify-content: flex-end;">
+								<el-button type="primary" @click="stick" size="mini">置为顶层目录</el-button>
+							</div>
+						</div>
+					</el-col>
+				</el-row>
+
+				<el-form-item class="btn-group">
+					<el-button type="primary" @click="onSubmit('myform')">确认</el-button>
+					<el-button @click="handleClose()">取消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import {
+		getResourceTreeMenu,
+		resourceUpdate,
+		resourceSave
+	} from '@/api/index.js'
+	import mixin from '@/utils/mixin.js'
+	export default {
+		name: 'resourceDialog',
+		mixins:[mixin],
+		props: {
+			dialogVisible: {
+				type: Boolean,
+				default: false
+			},
+			dataItem: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		watch: {
+			dataItem(newVal) {
+				console.log(newVal)
+				
+			},
+			dialogVisible: function(val, oldVla) {
+				if (this.$refs['myform'] != undefined) {
+					this.$refs["myform"].resetFields();
+				}
+				
+			}
+		},
+		created() {
+			this.form.resourceSystem =this.systemList[0]?this.systemList[0].value:''
+			
+			if(this.dataItem.name){
+				// this.dataItem = newVal;
+				if (JSON.stringify(this.dataItem) !== '{}') {
+					this.form = {
+						"name": this.dataItem.name,
+						"code": this.dataItem.code,
+						"url":  this.dataItem.url,
+						"parentId":  this.dataItem.parentId,
+						"des":  this.dataItem.des,
+						"icon":  this.dataItem.icon,
+						"sort":  this.dataItem.sort,
+						"resourceSystem":  this.dataItem.resourceSystem,
+					}
+					this.parentId =  this.dataItem.parentId;
+					this.checkedKeys =  this.dataItem.parentId;
+					console.log(this.dataItem,this.form)
+					// this.resourceSystem = this.dataItem.resourceSystem
+				}
+			}
+			
+			
+			this.gettreeList(this.parentId);
+		},
+		
+		data() {
+			let checkSort = (rule, value, callback) => {
+				console.log(value)
+				if (value === 0) {
+					return callback(new Error('超出可选范围（1-100）'));
+				}
+				if (!value) {
+					return callback(new Error('菜单排序不能为空'));
+				} else {
+					if (value > 0 && value <= 100) {
+						callback();
+					} else {
+						return callback(new Error('超出可选范围（1-100）'));
+					}
+				}
+
+			};
+			return {
+				num:0,
+				form: {
+					name: "",
+					code: "",
+					url: "",
+					parentId: 0,
+					des: "",
+					icon: "",
+					sort: 1,
+					resourceSystem: ""
+				},
+				parentId: 0,
+				rules: {
+					name: [{
+						required: true,
+						message: '请输入资源名称',
+						trigger: 'blur'
+					}],
+					code: [{
+						required: true,
+						message: '请输入资源编号',
+						trigger: 'blur'
+					}],
+					des: [{
+						required: true,
+						message: '请输入资源描述',
+						trigger: 'blur'
+					}],
+					sort: [{
+						validator: checkSort,
+						required: true,
+						trigger: 'blur'
+					}],
+					resourceSystem: [{
+						required: true,
+						message: '请选择系统分类',
+						trigger: 'blur'
+					}],
+				},
+				props: {
+					label: 'name',
+					children: 'children'
+				},
+				
+				// 默认选中节点
+				checkedKeys: ""
+			}
+		},
+		methods: {
+			stick(){
+				this.parentId = 0
+				this.form.parentId = 0
+				this.checkedKeys = 0
+				this.num++
+				
+				console.log(this.parentId,this.form.parentId,this.checkedKeys)
+			},
+			handleNodeClick(data) {
+				this.form.parentId = data.resourceId;
+			},
+			getTreeData(data) {
+				let treeArr = data;
+				let result = []
+				for (let i = 0; i < treeArr.length; i++) {
+						let item = treeArr[i];
+						if (item.parentId === 0) {
+							result.push(item);
+						}
+				}
+				this.data2treeDG(treeArr, result);
+			},
+			data2treeDG(datas, dataArray, type) {
+				for (let j = 0; j < dataArray.length; j++) {
+					let dataArrayIndex = dataArray[j];
+					let childrenArray = [];
+					let Id = dataArrayIndex.resourceId;
+					if (dataArrayIndex.checked) {
+						this.checkedKeys = dataArrayIndex.resourceId
+					}
+					for (let i = 0; i < datas.length; i++) {
+						let data = datas[i];
+						let parentId = data.parentId;
+						if (parentId == Id) { //判断是否为儿子节点
+							childrenArray.push(data);
+						}
+					}
+					dataArrayIndex.children = childrenArray;
+					if (childrenArray.length > 0) { //有儿子节点则递归
+						this.data2treeDG(datas, childrenArray)
+					}
+				}
+				
+				this.systemList.find(x=>x.value==this.form.resourceSystem).data = dataArray;
+				// console.log(this.systemList)
+			},
+			// 新增或编辑
+			onSubmit(myForm) {
+				let form = this.form;
+				this.$refs[myForm].validate((valid) => {
+					if (valid) {
+						if (JSON.stringify(this.dataItem) == '{}') {
+							// 新增
+							this.saveResource(form);
+						} else {
+							// 编辑
+							form.resourceId = this.dataItem.resourceId
+							this.updateResource(form);
+						}
+					} else {
+						return false;
+					}
+				});
+			},
+			async updateResource(form) {
+				const data = await resourceUpdate(form)
+				if (data.status != "0") {
+					if (data.data) {
+						this.$message({
+							message: '修改成功！',
+							type: 'success'
+						});
+						this.handleClose();
+					}
+				}
+			},
+			async saveResource(form) {
+				const data = await resourceSave(form)
+				if (data.status != "0") {
+					if (data.data) {
+						this.$message({
+							message: '添加成功！',
+							type: 'success'
+						});
+						this.handleClose();
+					}
+				}
+			},
+			async gettreeList(id) {
+				if(this.systemList.find(x=>x.value==this.form.resourceSystem).data) return
+				const data = await getResourceTreeMenu({
+					"parentId": id,
+					entity:{
+						"resourceSystem":this.form.resourceSystem
+					}
+				})
+				if (data.status != "0") {
+					this.getTreeData(data.data);
+					this.$nextTick(() => {
+						if (this.parentId != 0) {
+							this.$refs.tree.setCurrentKey(this.checkedKeys)
+						}
+					})
+				}
+			},
+			handleClose() {
+				this.form = {
+					"name": "",
+					"code": "",
+					"url": "",
+					"parentId": null,
+					"des": "",
+					"icon": "",
+					"sort": 1,
+					"resourceSystem": "EngineX"
+				}
+				this.systemList.forEach(value=>{
+					value.data = null
+				})
+				
+					
+				this.$refs["myform"].resetFields();
+				this.$emit('closeEvent');
+			}
+		}
+	}
+</script>
+
+<style>
+	.el-dialog__body {
+		padding: 20px 40px;
+	}
+
+	.user-edit-wrapper .el-input {
+		width: 80%;
+	}
+
+	.user-edit-wrapper .btn-group {
+		margin-top: 30px;
+	}
+
+	.user-edit-wrapper .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
+		background: #409EFF;
+		color: #fff;
+	}
+
+	.user-edit-wrapper .is-checked {
+		background: #F5F7FA;
+	}
+</style>

h5-auth-manager/src/components/models/addUserDialog.vue

@@ -0,0 +1,275 @@
+<template> 
+	<div class="user-edit-wrapper">
+		<el-dialog title="配置账号" :visible.sync="dialogVisible" width="50%" @open="open" :before-close="handleClose">
+			<el-form ref="myform" :model="form" :rules="rules" label-width="80px" label-position="left">
+				<el-row>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="账号" prop="account">
+								<el-input v-model="form.account"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="组织" prop="organId">
+								<el-select v-model="form.organId" :disabled="listOrganArr.length==1?true:false" placeholder="" @change="organChange">
+									<el-option v-for="item in listOrganArr" :key="item.organId" :label="item.name" :value="item.organId"></el-option>
+								</el-select>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="角色">
+								<el-select v-model="form.sysRole" placeholder="">
+									<el-option v-for="item in validRoleArr" :key="item.roleId" :label="item.roleName" :value="item.roleId"></el-option>
+								</el-select>
+							</el-form-item>
+						</div>
+					</el-col>
+				</el-row>
+
+				<el-divider></el-divider>
+				<h3 style="margin-bottom:40px">
+					使用人信息：
+				</h3>
+
+				<el-row>
+					
+					<el-col :span="12">
+						<div class="grid-conten">
+							<el-form-item label="姓名" prop="nickName">
+								<el-input v-model="form.nickName"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="12">
+						<div class="grid-conten">
+							<el-form-item label="备注" prop="remark">
+								<el-input v-model="form.remark"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+				</el-row>
+				
+				<el-row>
+					<el-col :span="12">
+						<div class="grid-conten">
+							<el-form-item label="手机号" prop="cellphone">
+								<el-input v-model="form.cellphone"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="12">
+						<div class="grid-conten">
+							<el-form-item label="邮箱" prop="email">
+								<el-input v-model="form.email"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+				</el-row>
+
+
+				<el-form-item class="btn-group">
+					<el-button type="primary" @click="onSubmit('myform')">确认</el-button>
+					<el-button @click="handleClose()">取消</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import {
+		getAllValidRole,
+		saveUser,
+		updateUser
+	} from '@/api/index.js'
+	export default {
+		name: 'userDialog',
+		props: {
+			dialogVisible: {
+				type: Boolean,
+				default: false
+			},
+			dataItem: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			listOrganArr: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+		},
+		created() {
+
+		},
+		watch: {
+			dataItem(newVal) {
+				this.dataItem = newVal;
+				if (JSON.stringify(newVal) !== '{}') {
+					this.validRole(newVal.sysOrgan.organId);
+					this.disabled = true;
+					this.form = {
+						organId: newVal.organId,
+						remark: newVal.remark,
+						account: newVal.account,
+						nickName: newVal.nickName,
+						cellphone: newVal.cellphone,
+						email: newVal.email,
+						sysRole: newVal.sysRole.roleId
+					}
+				}else{
+					this.form = {
+						organId: '',
+						remark: '',
+						account: '',
+						nickName: '',
+						cellphone: '',
+						email: '',
+						sysRole: ''
+					}
+				}
+			},
+			dialogVisible: function(val, oldVla) {
+				console.log(1)
+				if (this.$refs['myform'] != undefined) {
+					this.$refs["myform"].resetFields();
+
+				}
+			}
+		},
+		data() {
+			
+			return {
+				text: "text",
+				form: {
+					organId: '',
+					remark: '',
+					account: '',
+					nickName: '',
+					cellphone: '',
+					email: '',
+					sysRole: ''
+				},
+				disabled: false,
+				validRoleArr: [],
+				rules: {
+					account: [{
+						required: true,
+						message: '请输入账号',
+						trigger: 'blur'
+					}],
+					nickName: [{
+						required: true,
+						message: '请输入姓名',
+						trigger: 'blur'
+					}],
+					
+					organId: [{
+						required: true,
+						message: '请选择组织',
+						trigger: 'change'
+					}]
+				}
+			}
+		},
+		methods: {
+			open() {
+				if (this.listOrganArr.length == 1) {
+					this.form.organId = this.listOrganArr[0].id
+					this.organChange(this.listOrganArr[0].id)
+				}
+			},
+			organChange(e) {
+				this.validRoleArr = [];
+				this.form.sysRole = "";
+				this.validRole(e);
+			},
+			// 新增或编辑名单库
+			onSubmit(myForm) {
+				let form = JSON.parse(JSON.stringify(this.form));
+				form.sysRole = {
+					roleId: form.sysRole
+				}
+				this.$refs[myForm].validate((valid) => {
+					if (valid) {
+						if (JSON.stringify(this.dataItem) == '{}') {
+							// 新增
+							this.save(form);
+						} else {
+							// 编辑
+							form.userId = this.dataItem.userId
+							this.update(form);
+						}
+					} else {
+						return false;
+					}
+				});
+			},
+			async save(form) {
+				const data = await saveUser(form)
+				if (data.status != "0") {
+					this.$message({
+						message: '添加成功！',
+						type: 'success'
+					});
+					this.handleClose();
+				}
+
+			},
+			async update(form) {
+				const data = await updateUser(form)
+				if (data.status != "0") {
+					if (data.data) {
+						this.$message({
+							message: '修改成功！',
+							type: 'success'
+						});
+						this.handleClose();
+					}
+				}
+			},
+			async validRole(id) {
+				const data = await getAllValidRole({
+					"organId": id
+				})
+				if (data.status != "0") {
+					this.validRoleArr = data.data
+				}
+			},
+			handleClose() {
+				this.form = {
+					organId: '',
+					remark: '',
+					account: '',
+					nickName: '',
+					cellphone: '',
+					email: '',
+					sysRole: ''
+				}
+				this.validRoleArr = [];
+				this.disabled = false;
+				this.$emit('closeEvent');
+			}
+		}
+	}
+</script>
+
+<style>
+	.el-dialog__body {
+		padding: 20px 40px;
+	}
+
+	.user-edit-wrapper .el-input {
+		width: 80%;
+	}
+
+	.user-edit-wrapper .btn-group {
+		margin-top: 30px;
+	}
+</style>

h5-auth-manager/src/components/models/authorityAssignmentDialog.vue

@@ -0,0 +1,365 @@
+<template> 
+	<div class="user-edit-wrapper">
+		<el-dialog title="角色配置" :visible.sync="dialogVisible" width="50%" :before-close="handleClose">
+			<el-form ref="myform" :model="form" label-width="80px" label-position="left">
+				<el-row>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="角色名">
+								<el-input v-model="form.roleName" autocomplete="off" :disabled="disabled"></el-input>
+							</el-form-item>
+						</div>
+					</el-col>
+					<el-col :span="8">
+						<div class="grid-conten">
+							<el-form-item label="所属组织">
+								<el-select v-model="form.organId" :disabled="disabled">
+									<el-option v-for="item in listOrganArr" :key="item.organId" :label="item.name" :value="item.organId"></el-option>
+								</el-select>
+							</el-form-item>
+						</div>
+					</el-col>
+				</el-row>
+
+				<el-divider></el-divider>
+				<el-row>
+					<el-col :span="12">
+						<div class="grid-conten">
+							<h3 style="margin-bottom:30px">
+								功能权限：
+							</h3>
+						</div>
+					</el-col>
+					<el-col :span="12">
+						<div class="grid-conten">
+							<!-- <h3 style="margin-bottom:30px">
+                                    搜索引擎子权限：
+                                </h3> -->
+						</div>
+					</el-col>
+				</el-row>
+
+				<el-row>
+					<el-col :span="12">
+						 <el-tabs v-model="tabs" >
+						    <el-tab-pane :label="value.value" :name="value.value" v-for="value in systemList"></el-tab-pane>
+						   
+						  </el-tabs>
+						
+						
+						<div class="grid-conten">
+							<el-tree ref="tree" :props="props" :data="treeList[tabs]" show-checkbox node-key="resourceId" :default-checked-keys="checkedKeys[tabs]"
+							 @check-change="findTreeChange">
+							</el-tree>
+						</div>
+						
+						
+						
+					</el-col>
+					<el-col :span="12">
+						<div class="grid-conten">
+							<!-- <el-tree
+                                    ref="engineTree"
+                                    :props="props"
+                                    :data="engineList"
+                                    show-checkbox
+                                    node-key="id"
+                                    :default-checked-keys="engineCheckedKeys"
+                                    @check-change="engineTreeChange"
+                                >
+                                </el-tree> -->
+						</div>
+					</el-col>
+
+				</el-row>
+
+				<el-form-item class="btn-group">
+
+					<el-button @click="handleClose()">取消</el-button>
+					<el-button type="primary" @click="onSubmit()">确认</el-button>
+				</el-form-item>
+			</el-form>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import {
+		getFindtreeList,
+		getEngineTree,
+		insertRoleMenu,
+		insertRoleEngine
+	} from '@/api/index.js'
+	import mixin from '@/utils/mixin.js'
+	export default {
+		name: 'authorityAssignmentDialog',
+		mixins:[mixin],
+		props: { 
+			dialogVisible: {
+				type: Boolean,
+				default: false
+			},
+			dataItem: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			listOrganArr: {
+				type: Array,
+				default () {
+					return []
+				}
+			}
+		},
+		watch: {
+			dataItem(newVal) {
+				this.dataItem = newVal;
+				if (JSON.stringify(newVal) !== '{}') {
+					
+					this.tabs = this.systemList[0].value
+					// console.log(this.systemList[0].value)
+					this.systemList.forEach(value=>{
+						
+						this.$set(this.treeList,value.value,null)
+						this.$set(this.checkedKeys,value.value,[])
+						
+						this.gettreeList(newVal.roleId,value.value);
+					})
+					// this.getEnginetreeList(newVal.id);
+					this.form = {
+						roleId: newVal.roleId,
+						organId: newVal.organId,
+						roleName: newVal.roleName
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				form: {
+					roleId: '',
+					organId: '',
+					roleName: ''
+				},
+				tabs:"",
+				disabled: true,
+				props: {
+					label: 'name',
+					children: 'children'
+				},
+				count: 1,
+				treeList: {
+					
+				},
+				engineList: [],
+				// 默认选中节点
+				checkedKeys: {
+					
+				},
+				engineCheckedKeys: []
+			}
+		},
+		methods: {
+			findTreeChange(data, checked, indeterminate) {
+				let nodes = this.$refs.tree.getCheckedNodes()
+				this.checkedKeys[this.tabs] = nodes.map(item => {
+					return item.resourceId
+				})
+
+			},
+			// 搜索引擎子权限：
+			// engineTreeChange(data,checked,indeterminate){
+			//     let nodes = this.$refs.engineTree.getCheckedNodes()
+			//     this.engineCheckedKeys = nodes.map(item => {
+			//         return item.id
+			//     })
+			// },
+			getTreeData(data, type,str) {
+
+				let treeArr = data;
+				let result = []
+				for (let i = 0; i < treeArr.length; i++) {
+					let item = treeArr[i];
+					if (item.parentId == 0) {
+						result.push(item);
+					}
+				}
+				this.data2treeDG(treeArr, result, type,str);
+			},
+			data2treeDG(datas, dataArray, type,str) {
+				// console.log(datas, dataArray, type)
+
+
+				for (let j = 0; j < dataArray.length; j++) {
+					let dataArrayIndex = dataArray[j];
+					let childrenArray = [];
+					let Id = dataArrayIndex.resourceId;
+					if (dataArrayIndex.checked) {
+						(type == 1) ? this.checkedKeys[str].push(dataArrayIndex.resourceId): this.engineCheckedKeys.push(dataArrayIndex.resourceId)
+					}
+					for (let i = 0; i < datas.length; i++) {
+						let data = datas[i];
+						let parentId = data.parentId;
+						if (parentId == Id) { //判断是否为儿子节点
+							childrenArray.push(data);
+							if (data.checked) {
+								(type == 1) ? this.checkedKeys[str].push(data.resourceId): this.engineCheckedKeys.push(data.resourceId)
+							}
+						}
+					}
+					dataArrayIndex.children = childrenArray;
+					if (childrenArray.length > 0) { //有儿子节点则递归
+						this.data2treeDG(datas, childrenArray)
+					}
+				}
+				if (type == 1) {
+					this.treeList[str] = dataArray;
+					console.log(this.treeList)
+				} else {
+					this.engineList = dataArray;
+				}
+			},
+			// 新增或编辑
+			onSubmit() {
+
+				console.log(this.checkedKeys)
+					
+				this.checkedKeys.EngineX.forEach(value => {
+					if (this.deepparentId(value,'EngineX')) {
+						this.checkedKeys.EngineX.push(this.deepparentId(value,'EngineX'))
+					}
+
+				})
+				this.checkedKeys.DataX.forEach(value => {
+					if (this.deepparentId(value,'DataX')) {
+						this.checkedKeys.DataX.push(this.deepparentId(value,'DataX'))
+					}
+				
+				})
+				
+				let arr = []
+				this.systemList.forEach(value=>{
+					arr.push(...this.checkedKeys[value.value]) 
+				})
+				console.log(arr)
+				arr = this.unique(arr)
+				this.updateInsertRoleMenu({
+					roleId: this.dataItem.roleId,
+					ids: arr.join(',')
+				})
+				// 搜索引擎子权限：
+				// this.updateInsertRoleEngine({
+				//     roleId:this.dataItem.id,
+				//     ids:this.engineCheckedKeys.join(',')
+				// })
+			},
+			unique(arr) {
+				return Array.from(new Set(arr))
+			},
+			deepparentId(id,str) {
+				let num
+				this.treeList[str].forEach(value => {
+					if (value.resourceId == id) {
+						num = value.parentId
+					}
+					if (value.children.length > 0) {
+						value.children.forEach(item => {
+							if (item.resourceId == id) {
+								num = item.parentId
+							}
+						})
+					}
+
+				})
+				return num
+
+
+
+			},
+			async updateInsertRoleMenu(form) {
+				const data = await insertRoleMenu(form)
+				if (data.status != "0") {
+					if (data.data) {
+						this.$message({
+							message: '修改成功！',
+							type: 'success'
+						});
+						this.handleClose();
+					}
+				}
+			},
+			async updateInsertRoleEngine(form) {
+				const data = await insertRoleEngine(form)
+				if (data.status != "0") {
+					if (data.data) {
+						this.$message({
+							message: '修改成功！',
+							type: 'success'
+						});
+						this.handleClose();
+					}
+				}
+			},
+			async gettreeList(id,str) {
+				if(this.treeList[str]) return
+				const data = await getFindtreeList({
+					"roleId": id,
+					"entity":{
+						"resourceSystem":str
+					}
+				})
+				if (data.status != "0") {
+					data.data.forEach(value=>{
+						if(!value.checked){
+							data.data.forEach(item=>{
+								if(item.resourceId==value.parentId){
+									item.checked = false
+								}
+							})
+						}
+					})
+					this.getTreeData(data.data, 1,str);
+				}
+			},
+			async getEnginetreeList(id) {
+				const data = await getEngineTree({
+					"roleId": id,
+					
+				})
+				if (data.status != "0") {
+
+					this.getTreeData(data.data, 2);
+				}
+			},
+			handleClose() {
+				this.form = {
+					roleId: '',
+					organId: '',
+					roleName: ''
+				}
+				this.checkedKeys.EngineX = []
+				this.checkedKeys.DataX = []
+			
+				this.treeList.EngineX=null
+				this.treeList.DataX=null
+				
+				this.tabs = 'EngineX'
+				this.$emit('closeEvent');
+			}
+		}
+	}
+</script>
+
+<style>
+	.el-dialog__body {
+		padding: 20px 40px;
+	}
+
+	.user-edit-wrapper .el-input {
+		width: 80%;
+	}
+
+	.user-edit-wrapper .btn-group {
+		margin-top: 30px;
+	}
+</style>

h5-auth-manager/src/components/page/403.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="error-page">
+      <div class="error-code">4<span>0</span>3</div>
+      <div class="error-desc">啊哦~ 你没有权限访问该页面哦</div>
+      <div class="error-handle">
+          <router-link to="/">
+            <el-button type="primary" size="large">返回首页</el-button>
+          </router-link>
+          <el-button class="error-btn" type="primary" size="large" @click="goBack">返回上一页</el-button>
+      </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+      goBack(){
+          this.$router.go(-1);
+      }
+  }
+}
+</script>
+
+
+<style scoped>
+    .error-page{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        width: 100%;
+        height: 100%;
+        background: #f3f3f3;
+        box-sizing: border-box;
+    }
+    .error-code{
+        line-height: 1;
+        font-size: 250px;
+        font-weight: bolder;
+        color: #f02d2d;
+    }
+    .error-code span{
+        color: #00a854;
+    }
+    .error-desc{
+        font-size: 30px;
+        color: #777;
+    }
+    .error-handle{
+        margin-top: 30px;
+        padding-bottom: 200px;
+    }
+    .error-btn{
+        margin-left: 100px;
+    }
+</style>

h5-auth-manager/src/components/page/404.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="error-page">
+      <div class="error-code">4<span>0</span>4</div>
+      <div class="error-desc">啊哦~ 你所访问的页面不存在</div>
+      <div class="error-handle">
+          <router-link to="/">
+            <el-button type="primary" size="large">返回首页</el-button>
+          </router-link>
+          <el-button class="error-btn" type="primary" size="large" @click="goBack">返回上一页</el-button>
+      </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+      goBack(){
+          this.$router.go(-1);
+      }
+  }
+}
+</script>
+
+
+<style scoped>
+    .error-page{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        width: 100%;
+        height: 100%;
+        background: #f3f3f3;
+        box-sizing: border-box;
+    }
+    .error-code{
+        line-height: 1;
+        font-size: 250px;
+        font-weight: bolder;
+        color: #2d8cf0;
+    }
+    .error-code span{
+        color: #00a854;
+    }
+    .error-desc{
+        font-size: 30px;
+        color: #777;
+    }
+    .error-handle{
+        margin-top: 30px;
+        padding-bottom: 200px;
+    }
+    .error-btn{
+        margin-left: 100px;
+    }
+</style>

h5-auth-manager/src/components/page/Dashboard.vue

@@ -0,0 +1,420 @@
+<template>
+	<div>
+		<el-row :gutter="20">
+			<el-col :span="8">
+				<el-card shadow="hover" class="mgb20" style="height:252px;">
+					<div class="user-info">
+						<img src="../../assets/img/img.jpg" class="user-avator" alt />
+						<div class="user-info-cont">
+							<div class="user-info-name">{{name}}</div>
+							<!-- <div>{{role}}</div> -->
+						</div>
+					</div>
+					<div class="user-info-list">
+						上次登录时间：
+						<span>{{lastLoginTime | formatDate}}</span>
+					</div>
+				</el-card>
+				<el-card shadow="hover" style="height:252px;">
+					<div slot="header" class="clearfix">
+						<span>引擎详情</span>
+					</div>
+					<span v-if="engineRatio1">{{engineRatio1.engineName}}
+						<el-progress :percentage="engineRatio1.useRatio" color="#42b983"></el-progress>
+					</span>
+					<span v-if="engineRatio2">{{engineRatio2.engineName}}
+						<el-progress :percentage="engineRatio2.useRatio" color="#f1e05a"></el-progress>
+					</span>
+					<span v-if="engineRatio3">{{engineRatio3.engineName}}
+						<el-progress :percentage="engineRatio3.useRatio"></el-progress>
+					</span>
+					<span v-if="engineRatio4">{{engineRatio4.engineName}}
+						<el-progress :percentage="engineRatio4.useRatio" color="#f56c6c"></el-progress>
+					</span>
+				</el-card>
+			</el-col>
+			<el-col :span="16">
+				<el-row :gutter="20" class="mgb20">
+					<el-col :span="8">
+						<el-card shadow="hover" :body-style="{padding: '0px'}">
+							<div class="grid-content grid-con-1">
+								<i class="el-icon-lx-people grid-con-icon"></i>
+								<div class="grid-cont-right">
+									<div class="grid-num">{{engineNum}}</div>
+									<div>引擎</div>
+								</div>
+							</div>
+						</el-card>
+					</el-col>
+					<el-col :span="8">
+						<el-card shadow="hover" :body-style="{padding: '0px'}">
+							<div class="grid-content grid-con-2">
+								<i class="el-icon-lx-notice grid-con-icon"></i>
+								<div class="grid-cont-right">
+									<div class="grid-num">{{engineNodeNum}}</div>
+									<div>决策节点</div>
+								</div>
+							</div>
+						</el-card>
+					</el-col>
+					<el-col :span="8">
+						<el-card shadow="hover" :body-style="{padding: '0px'}">
+							<div class="grid-content grid-con-3">
+								<i class="el-icon-lx-goods grid-con-icon"></i>
+								<div class="grid-cont-right">
+									<div class="grid-num">{{engineResultNum}}</div>
+									<div>决策结果</div>
+								</div>
+							</div>
+						</el-card>
+					</el-col>
+				</el-row>
+				<el-card shadow="hover" style="height:403px;">
+					<div slot="header" class="clearfix">
+						<span>活动日志</span>
+					</div>
+					<el-table :show-header="false" :data="todoList" style="width:100%;">
+						<el-table-column>
+							<template slot-scope="scope">
+								<div class="todo-item">{{scope.row.opUserName}} {{scope.row.ip}} 在{{scope.row.startTime | formatDate}}
+									{{scope.row.opName}}</div>
+							</template>
+						</el-table-column>
+					</el-table>
+				</el-card>
+			</el-col>
+		</el-row>
+		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-card shadow="hover">
+					<charts sid="dashboardLeft" height='250px' width='100%' :option="options"></charts>
+				</el-card>
+			</el-col>
+			<el-col :span="12">
+				<el-card shadow="hover">
+					<charts sid="dashboardRight" height='250px' width='100%' :option="options2"></charts>
+				</el-card>
+			</el-col>
+		</el-row>
+	</div>
+</template>
+
+<script>
+	import charts from '@/components/common/charts.vue'
+	import bus from '../common/bus';
+	import {
+		getIndexInfo
+	} from '../../api/index';
+	export default {
+		name: 'dashboard',
+		components: {
+			// Schart,
+			charts
+		},
+		data() {
+			return {
+				name: localStorage.getItem('ms_username'),
+				lastLoginTime: null,
+				engineNum: null,
+				engineNodeNum: null,
+				engineResultNum: null,
+				engineRatio1: {},
+				engineRatio2: {},
+				engineRatio3: {},
+				engineRatio4: {},
+
+				todoList: [],
+				options: {
+					title: {
+						text: '最近几天引擎使用情况',
+						left: 'center'
+					},
+					grid: {
+						bottom: '10% '
+					},
+					xAxis: [{
+						type: 'category',
+						axisTick: {
+							show: false
+						},
+						data: []
+					}],
+					yAxis: [{
+						type: 'value'
+					}],
+					tooltip: {
+						trigger: 'axis'
+					},
+					legend: {
+						orient: 'vertical',
+						left: 'left',
+					},
+					series: []
+
+				},
+				options2: {
+					title: {
+						text: '最近几个月引擎使用趋势图',
+						left: 'center'
+					},
+					grid: {
+						bottom: '10% '
+					},
+					xAxis: [{
+						type: 'category',
+						axisTick: {
+							show: false
+						},
+						data: []
+					}],
+					yAxis: [{
+						type: 'value'
+					}],
+					tooltip: {
+						trigger: 'item'
+					},
+					series: []
+				
+				},
+			};
+		},
+
+		computed: {
+			role() {
+				return this.name === 'admin' ? '超级管理员' : '普通用户';
+			}
+		},
+		// created() {
+		//     this.handleListener();
+		//     this.changeDate();
+		// },
+		// activated() {
+		//     this.handleListener();
+		// },
+		// deactivated() {
+		//     window.removeEventListener('resize', this.renderChart);
+		//     bus.$off('collapse', this.handleBus);
+		// },
+
+		created() {
+			// this.getIndexInfos();
+		},
+
+		methods: {
+			changeDate() {
+				const now = new Date().getTime();
+				this.data.forEach((item, index) => {
+					const date = new Date(now - (6 - index) * 86400000);
+					item.name = `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+				});
+			},
+
+			async getIndexInfos() {
+				const result = await getIndexInfo();
+				const data = result.data;
+
+
+				// 引擎基本信息
+				this.engineNum = data.engineBaseInfo.engineNum;
+				this.engineNodeNum = data.engineBaseInfo.engineNodeNum;
+				this.engineResultNum = data.engineBaseInfo.engineResultNum;
+
+				// 引擎使用占比
+				this.engineRatio1 = data.engineUseRatio[0];
+				this.engineRatio2 = data.engineUseRatio[1];
+				this.engineRatio3 = data.engineUseRatio[2];
+				this.engineRatio4 = data.engineUseRatio[3];
+
+				// 最近几天引擎使用情况
+
+
+
+				var labelOption = {
+					show: true,
+					position: 'insideBottomRight',
+					distance: 10,
+					align: 'left',
+					verticalAlign: 'middle',
+					rotate: 90,
+					// formatter: '{c}  {name|{a}}',
+					fontSize: 12,
+					rich: {
+						name: {}
+					}
+				};
+
+
+				this.options.xAxis[0].data = data.recentDayMap.labels;
+				let arr  = data.recentDayMap.datasets.map(value => {
+					return {
+						name: value.label,
+						type: 'bar',
+						barGap: 0,
+						label: labelOption,
+						emphasis: {
+							focus: 'series'
+						},
+						data: value.data
+					}
+				})
+				
+				
+				this.options.series = arr.filter((value,index)=>{
+					return index<5
+				})
+
+				// 最近几个月引擎使用情况
+				this.options2.xAxis[0].data = data.recentMonthMap.labels;
+				this.options2.series = data.recentMonthMap.datasets.map(value => {
+					return {
+						name: value.label,
+						type: 'line',
+						barGap: 0,
+						label: labelOption,
+						emphasis: {
+							focus: 'series'
+						},
+						data: value.data
+					}
+				})
+
+				// 上次登录时间
+				this.lastLoginTime = data.lastLoginTime;
+
+				// 活动日志
+				this.todoList = data.logList;
+			}
+		},
+
+		filters: {
+			formatDate: function(value) {
+				let date = new Date(value);
+				let y = date.getFullYear();
+				let MM = date.getMonth() + 1;
+				MM = MM < 10 ? ('0' + MM) : MM;
+				let d = date.getDate();
+				d = d < 10 ? ('0' + d) : d;
+				let h = date.getHours();
+				h = h < 10 ? ('0' + h) : h;
+				let m = date.getMinutes();
+				m = m < 10 ? ('0' + m) : m;
+				let s = date.getSeconds();
+				s = s < 10 ? ('0' + s) : s;
+				return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+			}
+		}
+
+	};
+</script>
+
+
+<style scoped>
+	.el-row {
+		margin-bottom: 20px;
+	}
+
+	.grid-content {
+		display: flex;
+		align-items: center;
+		height: 100px;
+	}
+
+	.grid-cont-right {
+		flex: 1;
+		text-align: center;
+		font-size: 14px;
+		color: #999;
+	}
+
+	.grid-num {
+		font-size: 30px;
+		font-weight: bold;
+	}
+
+	.grid-con-icon {
+		font-size: 50px;
+		width: 100px;
+		height: 100px;
+		text-align: center;
+		line-height: 100px;
+		color: #fff;
+	}
+
+	.grid-con-1 .grid-con-icon {
+		background: rgb(45, 140, 240);
+	}
+
+	.grid-con-1 .grid-num {
+		color: rgb(45, 140, 240);
+	}
+
+	.grid-con-2 .grid-con-icon {
+		background: rgb(100, 213, 114);
+	}
+
+	.grid-con-2 .grid-num {
+		color: rgb(45, 140, 240);
+	}
+
+	.grid-con-3 .grid-con-icon {
+		background: rgb(242, 94, 67);
+	}
+
+	.grid-con-3 .grid-num {
+		color: rgb(242, 94, 67);
+	}
+
+	.user-info {
+		display: flex;
+		align-items: center;
+		padding-bottom: 20px;
+		border-bottom: 2px solid #ccc;
+		margin-bottom: 20px;
+	}
+
+	.user-avator {
+		width: 120px;
+		height: 120px;
+		border-radius: 50%;
+	}
+
+	.user-info-cont {
+		padding-left: 50px;
+		flex: 1;
+		font-size: 14px;
+		color: #999;
+	}
+
+	.user-info-cont div:first-child {
+		font-size: 30px;
+		color: #222;
+	}
+
+	.user-info-list {
+		font-size: 14px;
+		color: #999;
+		line-height: 25px;
+	}
+
+	.user-info-list span {
+		margin-left: 70px;
+	}
+
+	.mgb20 {
+		margin-bottom: 20px;
+	}
+
+	.todo-item {
+		font-size: 14px;
+	}
+
+	.todo-item-del {
+		text-decoration: line-through;
+		color: #999;
+	}
+
+	.schart {
+		width: 100%;
+		height: 300px;
+	}
+</style>

h5-auth-manager/src/components/page/I18n.vue

@@ -0,0 +1,47 @@
+<template>
+    <section class="main">
+        <div class="crumbs">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item><i class="el-icon-lx-global"></i> {{$t('i18n.breadcrumb')}}</el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="container">
+            <span>{{$t('i18n.tips')}}</span>
+            <el-button type="primary" @click="$i18n.locale = $i18n.locale === 'zh'?'en':'zh';">{{$t('i18n.btn')}}</el-button>
+            <div class="list">
+            <h2>{{$t('i18n.title1')}}</h2>
+                <p>{{$t('i18n.p1')}}</p>
+                <p>{{$t('i18n.p2')}}</p>
+                <p>{{$t('i18n.p3')}}</p>
+            </div>
+            <h2>{{$t('i18n.title2')}}</h2>
+            <div>
+                <i18n path="i18n.info" tag="p">
+                    <a place="action" href="https://element.eleme.cn/2.0/#/zh-CN/component/i18n">{{ $t('i18n.value') }}</a>
+                </i18n>
+            </div>
+        </div>
+    </section>
+</template>
+
+<script>
+export default {
+	
+    data(){
+        return {
+        }
+    }
+}
+</script>
+
+<style scoped>
+.list{
+    padding: 30px 0;
+}
+.list p{
+    margin-bottom: 20px;
+}
+a{
+    color: #409eff;
+}
+</style>

h5-auth-manager/src/components/page/Icon.vue

@@ -0,0 +1,225 @@
+<template>
+    <div>
+        <div class="crumbs">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item><i class="el-icon-lx-emoji"></i> 自定义图标</el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="container">
+            <h2>使用方法</h2>
+            <p style="line-height: 50px;">
+                直接通过设置类名为 el-icon-lx-iconName 来使用即可。例如：（共{{iconList.length}}个图标）
+            </p>
+            <p class="example-p">
+                <i class="el-icon-lx-redpacket_fill" style="font-size: 30px;color: #ff5900"></i>
+                <span>&lt;i class=&quot;el-icon-lx-redpacket_fill&quot;&gt;&lt;/i&gt;</span>
+            </p>
+            <p class="example-p">
+                <i class="el-icon-lx-weibo" style="font-size: 30px;color:#fd5656"></i>
+                <span>&lt;i class=&quot;el-icon-lx-weibo&quot;&gt;&lt;/i&gt;</span>
+            </p>
+            <p class="example-p">
+                <i class="el-icon-lx-emojifill" style="font-size: 30px;color: #ffc300"></i>
+                <span>&lt;i class=&quot;el-icon-lx-emojifill&quot;&gt;&lt;/i&gt;</span>
+            </p>
+            <br>
+            <h2>图标</h2>
+            <div class="search-box">
+                <el-input class="search" size="large" v-model="keyword" clearable placeholder="请输入图标名称"></el-input>
+            </div>
+            <ul>
+                <li class="icon-li" v-for="(item,index) in list" :key="index">
+                    <div class="icon-li-content">
+                        <i :class="`el-icon-lx-${item}`"></i>
+                        <span>{{item}}</span>
+                    </div>
+                </li>
+            </ul>
+        </div>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        data: function(){
+            return {
+                keyword: '',
+                iconList: [
+                    'attentionforbid',
+                    'attentionforbidfill',
+                    'attention',
+                    'attentionfill',
+                    'tag',
+                    'tagfill',
+                    'people',
+                    'peoplefill',
+                    'notice',
+                    'noticefill',
+                    'mobile',
+                    'mobilefill',
+                    'voice',
+                    'voicefill',
+                    'unlock',
+                    'lock',
+                    'home',
+                    'homefill',
+                    'delete',
+                    'deletefill',
+                    'notification',
+                    'notificationfill',
+                    'notificationforbidfill',
+                    'like',
+                    'likefill',
+                    'comment',
+                    'commentfill',
+                    'camera',
+                    'camerafill',
+                    'warn',
+                    'warnfill',
+                    'time',
+                    'timefill',
+                    'location',
+                    'locationfill',
+                    'favor',
+                    'favorfill',
+                    'skin',
+                    'skinfill',
+                    'news',
+                    'newsfill',
+                    'record',
+                    'recordfill',
+                    'emoji',
+                    'emojifill',
+                    'message',
+                    'messagefill',
+                    'goods',
+                    'goodsfill',
+                    'crown',
+                    'crownfill',
+                    'move',
+                    'add',
+                    'hot',
+                    'hotfill',
+                    'service',
+                    'servicefill',
+                    'present',
+                    'presentfill',
+                    'pic',
+                    'picfill',
+                    'rank',
+                    'rankfill',
+                    'male',
+                    'female',
+                    'down',
+                    'top',
+                    'recharge',
+                    'rechargefill',
+                    'forward',
+                    'forwardfill',
+                    'info',
+                    'infofill',
+                    'redpacket',
+                    'redpacket_fill',
+                    'roundadd',
+                    'roundaddfill',
+                    'friendadd',
+                    'friendaddfill',
+                    'cart',
+                    'cartfill',
+                    'more',
+                    'moreandroid',
+                    'back',
+                    'right',
+                    'shop',
+                    'shopfill',
+                    'question',
+                    'questionfill',
+                    'roundclose',
+                    'roundclosefill',
+                    'roundcheck',
+                    'roundcheckfill',
+                    'global',
+                    'mail',
+                    'punch',
+                    'exit',
+                    'upload',
+                    'read',
+                    'file',
+                    'link',
+                    'full',
+                    'group',
+                    'friend',
+                    'profile',
+                    'addressbook',
+                    'calendar',
+                    'text',
+                    'copy',
+                    'share',
+                    'wifi',
+                    'vipcard',
+                    'weibo',
+                    'remind',
+                    'refresh',
+                    'filter',
+                    'settings',
+                    'scan',
+                    'qrcode',
+                    'cascades',
+                    'apps',
+                    'sort',
+                    'searchlist',
+                    'search',
+                    'edit'
+                ]
+            }
+        },
+        computed: {
+            list(){
+                return this.iconList.filter((item) => {
+                    return item.indexOf(this.keyword) !== -1;
+                })
+            }
+        }
+    }
+</script>
+
+<style scoped>
+.example-p{
+    height: 45px;
+    display: flex;
+    align-items: center;
+}
+.search-box{
+    text-align: center;
+    margin-top: 10px;
+}
+.search{
+    width: 300px;
+}
+ul,li{
+    list-style: none;
+}
+.icon-li{
+    display: inline-block;
+    padding: 10px;
+    width: 120px;
+    height: 120px;
+}
+.icon-li-content{
+    display: flex;
+    height: 100%;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+}
+.icon-li-content i{
+    font-size: 36px;
+    color: #606266;
+}
+.icon-li-content span{
+    margin-top: 10px;
+    color: #787878;
+}
+</style>

h5-auth-manager/src/components/page/Login.vue

@@ -0,0 +1,133 @@
+<template>
+    <div class="login-wrap">
+        <div class="ms-login">
+            <div class="ms-title">权限系统</div>
+            <el-form :model="param" :rules="rules" ref="login" label-width="0px" class="ms-content">
+                <el-form-item prop="username">
+                    <el-input v-model="param.username" placeholder="username">
+                        <el-button slot="prepend" icon="el-icon-lx-people"></el-button>
+                    </el-input>
+                </el-form-item>
+                <el-form-item prop="password">
+                    <el-input
+                        type="password"
+                        placeholder="password"
+                        v-model="param.password"
+                        @keyup.enter.native="submitForm()"
+                    >
+                        <el-button slot="prepend" icon="el-icon-lx-lock"></el-button>
+                    </el-input>
+                </el-form-item>
+                <div class="login-btn">
+                    <el-button type="primary" @click="submitForm()">登录</el-button>
+                </div>
+            </el-form>
+        </div>
+    </div>
+</template>
+
+<script>
+import { getLogin } from '../../api/index';
+export default {
+	created() {
+		// if(this.$route.query.type=="token"){
+		// 	this.$message.error('登陆授权码已过期')
+		// 	this.$route.query.type=""
+		// }
+	},
+    data: function() {
+        return {
+            param: {
+                username: '',
+                password: '',
+            },
+            rules: {
+                username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
+                password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+            },
+        };
+    },
+    methods: {
+        submitForm() {
+            this.$refs.login.validate(valid => {
+                if (valid) {
+                  // 调用登录接口
+                  this.getLogins();
+
+                } else {
+                    this.$message.error('请输入账号和密码');
+                    console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        async getLogins() {
+            // var formdata = new FormData();
+            // formdata.append('account', this.param.username);
+            // formdata.append('password', this.param.password);
+			var params ={
+				account:this.param.username,
+				password:this.param.password
+			}
+			
+            const data = await getLogin(params);
+            console.log('登录接口返回的数据',data);
+            const code = data.code;
+			
+			if(data.status==="1"){
+			    this.$message.success('登录成功，即将跳转');
+			    localStorage.setItem('ms_username', this.param.username);
+				localStorage.setItem('token', data.data.token);
+				this.$router.push('/');
+			}
+			else{
+                this.$message.error(data.msg);
+            }
+        }
+    },
+};
+</script>
+
+<style scoped>
+.login-wrap {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    background-image: url(../../assets/img/login-bg.jpg);
+    background-size: 100%;
+}
+.ms-title {
+    width: 100%;
+    line-height: 50px;
+    text-align: center;
+    font-size: 20px;
+    color: #fff;
+    border-bottom: 1px solid #ddd;
+}
+.ms-login {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 350px;
+    margin: -190px 0 0 -175px;
+    border-radius: 5px;
+    background: rgba(255, 255, 255, 0.3);
+    overflow: hidden;
+}
+.ms-content {
+    padding: 30px 30px;
+}
+.login-btn {
+    text-align: center;
+}
+.login-btn button {
+    width: 100%;
+    height: 36px;
+    margin-bottom: 10px;
+}
+.login-tips {
+    font-size: 12px;
+    line-height: 30px;
+    color: #fff;
+}
+</style>

h5-auth-manager/src/components/page/bus.js

@@ -0,0 +1,6 @@
+import Vue from 'vue';
+
+// 使用 Event Bus
+const bus = new Vue();
+
+export default bus;

h5-auth-manager/src/components/page/redirect/index.vue

@@ -0,0 +1,13 @@
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    console.log(params);
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>

h5-auth-manager/src/components/page/systemManagement/logManagement.vue

@@ -0,0 +1,166 @@
+<template>
+	<div class="content-wrapper">
+		<div>
+			<el-row>
+				<el-col :span="18">
+					<div >
+						当前时间：
+						<el-date-picker v-model="dateValue" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+						 value-format="yyyy-MM-dd" @change="getlist">
+						</el-date-picker>
+					</div>
+				</el-col>
+				<el-col :span="6">
+					<div >
+						<el-input placeholder="搜索" v-model="searchVal" class="input-with-select">
+							<el-button slot="append" icon="el-icon-search" @click="getlist"></el-button>
+						</el-input>
+					</div>
+				</el-col>
+			</el-row>
+		</div>
+		<div class="tab-wrapper">
+			<div>
+				<el-table border :data="dataList" style="width: 100%">
+
+					<el-table-column prop="id" width="200" label="ID">
+					</el-table-column>
+
+					<el-table-column prop="organName" label="组织名称" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="opName" label="操作名称" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="opUserName" label="操作人员名称" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="ip" label="IP" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="startTime" label="开始时间" width="" show-overflow-tooltip>
+						<template slot-scope="scope">
+							{{new Date(scope.row.startTime).format('yyyy-MM-dd hh:mm:ss')}}
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="endTime" label="结束时间" width="" show-overflow-tooltip>
+						<template slot-scope="scope">
+							{{new Date(scope.row.endTime).format('yyyy-MM-dd hh:mm:ss')}}
+						</template>
+					</el-table-column>
+
+					<el-table-column label="操作" align="center" size="s">
+						<template slot-scope="scope">
+							<el-tooltip content="查看" placement="left">
+								<el-button icon="el-icon-view" circle size="mini" @click="lockData(scope.row)"></el-button>
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<el-pagination class="pagination-wrapper" background hide-on-single-page :current-page="pager.pageNum" :page-count="pager.lastPage"
+				 layout="prev, pager, next" @current-change="surrentChange">
+				</el-pagination>
+			</div>
+		</div>
+
+		<!-- 查看 -->
+		<el-dialog title="日志详情" :visible.sync="dialogVisible" width="30%" center>
+			<div class="log-info-wrapper">
+				<p><strong>操作名称：</strong>{{currentItem.opName}}</p>
+				<p><strong>操作人员名称：</strong>{{currentItem.opUserName}}</p>
+				<p><strong>IP：</strong>{{currentItem.ip}}</p>
+				<p><strong>请求路径：</strong>{{currentItem.requestPath}}</p>
+				<p><strong>请求参数：</strong>{{currentItem.requestParam}}</p>
+				<p><strong>响应参数：</strong>{{currentItem.responseParam}}</p>
+			</div>
+			<span slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
+			</span>
+		</el-dialog>
+
+	</div>
+</template>
+<script>
+	import {
+		formatDate
+	} from '@/assets/utils.js'
+	import {
+		getLogList
+	} from '@/api/index.js'
+	export default {
+		//过滤
+		name:'logManagement',
+		filters: {
+			formatDate(time) {
+				let date = new Date(time)
+				return formatDate(date, 'yyyy-MM-dd')
+			}
+		},
+		data() {
+			return {
+				page: 1,
+				pageSize: 10,
+				pager: {},
+				dataList: [],
+				dateValue: [formatDate(new Date, 'yyyy-MM-dd'), formatDate(new Date, 'yyyy-MM-dd')],
+				searchVal: "",
+				dialogVisible: false,
+				currentItem: {}
+			};
+		},
+		created() {
+			this.getlist();
+		},
+		methods: {
+			lockData(e) {
+				this.currentItem = e;
+				this.dialogVisible = true;
+			},
+			surrentChange(e) {
+				this.page = e;
+				this.getlist();
+			},
+			async getlist() {
+				const data = await getLogList({
+					searchKey: this.searchVal,
+					startDate: this.dateValue[0],
+					endDate: this.dateValue[1],
+					pageNo: this.page,
+					pageSize: this.pageSize
+				})
+				if (data.status != "0") {
+					const listUser = data.data.logList;
+					const pager = data.data.pager;
+					this.pager = pager;
+					this.dataList = listUser
+				}
+			}
+		}
+	};
+</script>
+<style>
+	.tab-wrapper {
+		padding: 21px 0;
+	}
+
+	.pagination-wrapper {
+		margin-right: 40px;
+		margin-top: 40px;
+		text-align: right;
+	}
+
+	.content-wrapper .el-date-editor .el-range-separator {
+		width: 10%;
+	}
+
+	.el-dialog--center .el-dialog__body {
+		max-height: 500px;
+		overflow-y: scroll;
+	}
+
+	.log-info-wrapper p {
+		line-height: 2;
+		margin-bottom: 5px;
+	}
+</style>

h5-auth-manager/src/components/page/systemManagement/organizationManagement.vue

@@ -0,0 +1,247 @@
+<template>
+	<div class="content-wrapper">
+		<div>
+			<el-row :gutter="20">
+				<!-- <el-col :span="16"> -->
+				<div >
+					<el-button @click="add()" type="primary">新增</el-button>
+					<el-button @click="using(-1)" type="danger">删除</el-button>
+					<el-button @click="using(1)" type="success">启用</el-button>
+					<el-button @click="using(0)" type="warning">停用</el-button>
+				</div>
+				<!-- </el-col> -->
+			</el-row>
+		</div>
+		<div class="tab-wrapper">
+			<div>
+				<el-table border ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+					<el-table-column type="selection" width="55">
+					</el-table-column>
+
+					<el-table-column prop="organId" width="200" label="ID">
+					</el-table-column>
+
+					<el-table-column prop="name" label="组织名称" width="" show-overflow-tooltip>
+						<!-- <template slot-scope="scope">
+								{{scope.row.name}}
+							</template> -->
+					</el-table-column>
+
+					<el-table-column prop="code" label="组织编号" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="status" width="" label="状态">
+						<template slot-scope="scope">
+							{{scope.row.status===0?'停用':'启用'}}
+						</template>
+					</el-table-column>
+
+					
+
+					<el-table-column label="操作" align="center" size="s">
+						<template slot-scope="scope">
+							<el-tooltip content="编辑" placement="left">
+								<el-button icon="el-icon-edit" circle size="mini" @click="organEdit(scope.row)"></el-button>
+							</el-tooltip>
+							<el-tooltip content="删除" placement="right">
+								<el-button icon="el-icon-delete" circle size="mini" @click="setStatus(-1,scope.row.organId)"></el-button>
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<el-pagination class="pagination-wrapper" background hide-on-single-page :current-page="pager.pageNum" :page-count="pager.lastPage"
+				 layout="prev, pager, next" @current-change="surrentChange">
+				</el-pagination>
+			</div>
+		</div>
+		<!-- 添加编辑 -->
+		<el-dialog title="配置账号" :visible.sync="dialogFormVisible" width="30%" class="edit-password-dialog">
+			<el-form :model="form" ref="changeOrganForm" label-width="100px" label-position="left">
+				<el-form-item label="名称" prop="name" :rules="[
+                        { required: true, message: '不能为空！'}
+                    ]">
+					<el-input v-model="form.name" autocomplete="off"></el-input>
+				</el-form-item>
+				<el-form-item label="编号" prop="code" :rules="[
+                        { required: true, message: '不能为空！'}
+                    ]">
+					<el-input v-model="form.code" autocomplete="off"></el-input>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="changeOrgan('changeOrganForm')">确 定</el-button>
+				<el-button @click="cancel()">取 消</el-button>
+
+			</div>
+		</el-dialog>
+
+	</div>
+</template>
+<script>
+	import {
+		getOrganList,
+		updateStatusOrgan,
+		saveOrgan,
+		updateOrgan
+	} from '@/api/index.js'
+	export default {
+		name:'organizationManagement',
+		data() {
+			return {
+				page: 1,
+				pageSize: 10,
+				pager: {},
+				dataList: [],
+				multipleSelection: [],
+				dialogFormVisible: false,
+				form: {
+					name: "",
+					code: ""
+				},
+				currItem: {}
+			};
+		},
+		created() {
+			this.getlist();
+		},
+		methods: {
+			cancel() {
+				this.currItem = {};
+				this.dialogFormVisible = false;
+				this.form = {
+					name: "",
+					code: ""
+				}
+				this.$refs["changeOrganForm"].resetFields();
+			},
+			changeOrgan(myForm) {
+				let form = this.form;
+				this.$refs[myForm].validate((valid) => {
+					if (valid) {
+						if (JSON.stringify(this.currItem) == '{}') {
+							this.save(form);
+						} else {
+							form.organId = this.currItem.organId;
+							this.update(form);
+						}
+					} else {
+
+					}
+				});
+			},
+			organEdit(e) {
+				this.currItem = e;
+				this.form = {
+					name: e.name,
+					code: e.code
+				}
+				this.dialogFormVisible = true;
+			},
+			async update(form) {
+				const data = await updateOrgan(form)
+				if (data.status != "0") {
+					this.$message({
+						message: '操作成功！',
+						type: "success"
+					});
+					this.getlist();
+					this.cancel();
+				}
+			},
+			async save(form) {
+				const data = await saveOrgan(form)
+				if (data.status != "0") {
+					this.$message({
+						message: '操作成功！',
+						type: "success"
+					});
+					this.getlist();
+					this.cancel();
+				}
+			},
+			// 添加
+			add() {
+				this.dialogFormVisible = true;
+			},
+			setStatus(status, ids) {
+				let msg = "确认修改用户状态？"
+				if (status == -1) {
+					msg = "此操作将永久删除该文件, 是否继续?"
+				}
+				this.$confirm(msg, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.updateStatus(status, ids + '');
+				});
+			},
+			using(num) {
+				let selArr = [];
+				this.multipleSelection.forEach(value => {
+					selArr.push(value.organId);
+				})
+				if (selArr.length <= 0) {
+					this.$message({
+						message: '请选择！',
+						type: "warning"
+					});
+					return
+				}
+				this.setStatus(num, selArr.join(','));
+			},
+			selectChanged(e) {
+				this.page = 1;
+				this.value = e;
+				this.getlist();
+			},
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			surrentChange(e) {
+				this.page = e;
+				this.getlist();
+			},
+			async getlist() {
+				const data = await getOrganList({
+					pageNo: this.page,
+					pageSize: this.pageSize
+				})
+				if (data.status != "0") {
+					const listData = data.data.listOrgan;
+					const pager = data.data.pager;
+					this.pager = pager;
+					this.dataList = listData
+				}
+			},
+			async updateStatus(status, arrStr) {
+				const data = await updateStatusOrgan({
+					"ids": arrStr,
+					"status": status
+				})
+				if (data.status != "0") {
+					this.$message({
+						message: '操作成功！',
+						type: "success"
+					});
+					this.getlist();
+				}
+			}
+		}
+	};
+</script>
+<style>
+	.tab-wrapper {
+		padding: 21px 0;
+	}
+
+	.pagination-wrapper {
+		margin-right: 40px;
+		margin-top: 40px;
+		text-align: right;
+	}
+
+	.edit-password-dialog .el-input {
+		width: 70%;
+	}
+</style>

h5-auth-manager/src/components/page/systemManagement/resourceManagement.vue

@@ -0,0 +1,204 @@
+<template>
+	<div class="content-wrapper">
+		<div>
+			<el-row :gutter="20">
+				<div>
+					<el-button @click="add()" type="primary">新增</el-button>
+					<el-button @click="using(-1)" type="danger">删除</el-button>
+				</div>
+			</el-row>
+		</div>
+		<div class="tab-wrapper">
+
+			<el-tabs v-model="tabs" @tab-click="pager.pageNum=1;getlist()">
+				<el-tab-pane :label="value.label" :name="value.label" v-for="value in systemList" :key="value.value"></el-tab-pane>
+				
+			</el-tabs>
+
+			<div v-loading="loading">
+				<el-table border ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
+					@selection-change="handleSelectionChange">
+					<el-table-column type="selection" width="55">
+					</el-table-column>
+
+					<el-table-column prop="code" width="200" label="资源编号">
+					</el-table-column>
+
+					<el-table-column prop="name" label="名称" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="url" label="路径" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="icon" label="图标" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="sort" label="排序" width="" show-overflow-tooltip>
+					</el-table-column>
+
+					<el-table-column prop="birth" label="创建时间" width="" show-overflow-tooltip>
+						<template slot-scope="scope">
+							{{scope.row.birth|formatDate}}
+						</template>
+					</el-table-column>
+
+					<el-table-column label="操作" align="center" size="s">
+						<template slot-scope="scope">
+							<el-tooltip content="编辑" placement="left">
+								<el-button icon="el-icon-edit" circle size="mini" @click="editDiaglo(scope.row)">
+								</el-button>
+							</el-tooltip>
+							<el-tooltip content="删除" placement="right">
+								<el-button icon="el-icon-delete" circle size="mini" @click="setStatus(-1,scope.row.resourceId)">
+								</el-button>
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<el-pagination class="pagination-wrapper" background  :current-page="pager.pageNum"
+					:total="pager.total" layout="prev, pager, next" @current-change="surrentChange">
+				</el-pagination>
+			</div>
+		</div>
+		<add-resource-dialog v-if="dialogVisible" :dialogVisible="dialogVisible" @closeEvent="handleClose" :dataItem="dataItem">
+		</add-resource-dialog>
+	</div>
+</template>
+<script>
+	import {
+		formatDate
+	} from '@/assets/utils.js'
+	import {
+		getRsourceMenuList,
+		resourceUpdateStatus
+	} from '@/api/index.js'
+	import AddResourceDialog from '../../models/addResourceDialog.vue'
+	import mixin from '@/utils/mixin.js'
+	export default {
+		name: 'resourceManagement',
+		mixins:[mixin],
+		components: {
+			AddResourceDialog
+		},
+		//过滤
+		filters: {
+			formatDate(time) {
+				let date = new Date(time)
+				return formatDate(date, 'yyyy-MM-dd')
+			}
+		},
+		data() {
+			return {
+				page: 1,
+				pageSize: 10,
+				pager: {},
+				dataList: [],
+				multipleSelection: [],
+				dialogVisible: false,
+				dataItem: {},
+				dialogFormVisible: false,
+				tabs:'EngineX',
+				loading:false
+			};
+		},
+		created() {
+			this.getlist();
+		},
+		methods: {
+			handleClose() {
+				this.dataItem = {};
+				this.dialogVisible = false;
+				this.getlist();
+			},
+			// 添加
+			add() {
+				this.dataItem = {};
+				this.dialogVisible = true;
+			},
+			// 权限分配
+			editDiaglo(e) {
+				this.dataItem = e;
+				this.dialogVisible = true;
+			},
+			setStatus(status, ids) {
+				let msg = "确认修改用户状态？"
+				if (status == -1) {
+					msg = "此操作将永久删除该文件, 是否继续?"
+				}
+				this.$confirm(msg, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.updateStatus(status, ids + '');
+				});
+			},
+			using(num) {
+				let selArr = [];
+				this.multipleSelection.forEach(value => {
+					selArr.push(value.resourceId);
+				})
+				if (selArr.length <= 0) {
+					this.$message({
+						message: '请选择！',
+						type: "warning"
+					});
+					return
+				}
+				this.setStatus(num, selArr.join(','));
+			},
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			surrentChange(e) {
+				this.page = e;
+				this.getlist();
+			},
+			async getlist() {
+				this.loading = true
+				const data = await getRsourceMenuList({
+					pageNo: this.page,
+					pageSize: this.pageSize,
+					entity:{
+						resourceSystem:this.tabs
+					}
+				})
+				if (data.status != "0") {
+					const listUser = data.data.listMenu;
+					const pager = data.data.pager;
+					this.pager = pager;
+					this.dataList = listUser
+					this.loading = false
+				}
+			},
+			async updateStatus(status, arrStr) {
+				const data = await resourceUpdateStatus({
+					"ids": arrStr,
+					"status": status
+				})
+				if (data.status != "0") {
+					this.$message({
+						message: '操作成功！',
+						type: "success"
+					});
+					this.getlist();
+				}
+			}
+		}
+	};
+</script>
+<style>
+	.tab-wrapper {
+		padding: 21px 0;
+	}
+
+	.pagination-wrapper {
+		margin-right: 40px;
+		margin-top: 40px;
+		text-align: right;
+	}
+
+	.edit-password-dialog .el-input {
+		width: 70%;
+	}
+</style>

h5-auth-manager/src/components/page/systemManagement/roleManagement.vue

@@ -0,0 +1,287 @@
+<template>
+	<div class="content-wrapper">
+		<div>
+			<el-row :gutter="20">
+				<!-- <el-col :span="16"> -->
+				<div>
+					<el-button @click="add()" type="primary">新增</el-button>
+					<el-button @click="using(-1)" type="danger" :disabled="multipleSelection.length>0?false:'disabled'">删除</el-button>
+					<el-button @click="using(1)" type="success" :disabled="multipleSelection.length>0?false:'disabled'">启用</el-button>
+					<el-button @click="using(0)" type="warning" :disabled="multipleSelection.length>0?false:'disabled'">停用</el-button>
+				</div>
+				<!-- </el-col> --> 
+			</el-row>
+		</div>
+		<div class="tab-wrapper">
+			<div>
+				<el-table border ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+					<el-table-column type="selection" width="55">
+					</el-table-column>
+
+					<el-table-column prop="roleId" width="200" label="ID">
+					</el-table-column>
+
+					<el-table-column prop="roleName" label="角色名" width="" show-overflow-tooltip>
+						<!-- <template slot-scope="scope">
+								{{scope.row.name}}
+							</template> -->
+					</el-table-column>
+
+					<el-table-column prop="status" width="" label="状态">
+						<template slot-scope="scope">
+							{{scope.row.status===0?'禁用':'启用'}}
+						</template>
+					</el-table-column>
+
+
+					<el-table-column label="操作" align="center" size="s">
+						<template slot-scope="scope">
+							<el-tooltip content="编辑" placement="left">
+								<el-button icon="el-icon-edit" circle size="mini" @click="roleEdit(scope.row)"></el-button>
+							</el-tooltip>
+							<el-tooltip content="权限分配" placement="left">
+								<el-button icon="el-icon-edit-outline" circle size="mini" @click="editDiaglo(scope.row)"></el-button>
+							</el-tooltip>
+							<el-tooltip content="删除" placement="right">
+								<el-button icon="el-icon-delete" circle size="mini" @click="setStatus(-1,scope.row.roleId)"></el-button>
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<el-pagination class="pagination-wrapper" background hide-on-single-page :current-page="pager.pageNum" :page-count="pager.lastPage"
+				 layout="prev, pager, next" @current-change="surrentChange">
+				</el-pagination>
+			</div>
+		</div>
+		<!-- 权限分配 -->
+		<authority-assignment-dialog :dialogVisible="dialogVisible" @closeEvent="handleClose" :dataItem="dataItem"
+		 :listOrganArr="listOrganArr"></authority-assignment-dialog>
+		<!-- 添加编辑角色 -->
+		<el-dialog title="角色配置" :visible.sync="dialogFormVisible" width="30%" class="edit-password-dialog">
+			<el-form :model="form" ref="changeRoleForm" label-width="100px" label-position="left">
+				<el-form-item label="角色名" prop="roleName" :rules="[
+                        { required: true, message: '不能为空！'}
+                    ]">
+					<el-input v-model="form.roleName" autocomplete="off"></el-input>
+				</el-form-item>
+				<el-form-item label="所属组织" prop="organId" :rules="[
+                        { required: true, message: '请选择组织', trigger: 'change'}
+                    ]">
+					<el-select v-model="form.organId" placeholder="请选择所属组织" :disabled="listOrganArr.length<2?true:false">
+						<el-option v-for="item in listOrganArr" :key="item.organId" :label="item.name" :value="item.organId"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="changeRole('changeRoleForm')">确 定</el-button>
+				<el-button @click="cancel()">取 消</el-button>
+
+			</div>
+		</el-dialog>
+
+	</div>
+</template>
+<script>
+	import {
+		getRoleList,
+		roleUpdateStatus,
+		getAllValidOrgan,
+		saveRole,
+		updateRole
+	} from '@/api/index.js'
+	import AuthorityAssignmentDialog from '../../models/authorityAssignmentDialog.vue'
+	export default {
+		name:'roleManagement',
+		components: {
+			AuthorityAssignmentDialog
+		},
+		data() {
+			return {
+				page: 1,
+				pageSize: 10,
+				pager: {},
+				dataList: [],
+				multipleSelection: [],
+				dialogVisible: false,
+				dataItem: {},
+				listOrganArr: [],
+				dialogFormVisible: false,
+				form: {
+					roleName: "",
+					organId: ""
+				},
+				currItem: {},
+				disabled: false
+			};
+		},
+		created() {
+			this.getlist();
+			this.organList();
+		},
+		methods: {
+			cancel() {
+				this.currItem = {};
+				this.dialogFormVisible = false;
+				this.form = {
+					roleName: "",
+					organId: ""
+				}
+				this.$refs["changeRoleForm"].resetFields();
+			},
+			changeRole(myForm) {
+				let form = this.form;
+				this.$refs[myForm].validate((valid) => {
+					if (valid) {
+						if (JSON.stringify(this.currItem) == '{}') {
+							this.saveRole(form);
+						} else {
+							form.roleId = this.currItem.roleId;
+							this.updateRole(form);
+						}
+					} else {
+
+					}
+				});
+			},
+			roleEdit(e) {
+				this.disabled = true;
+				this.currItem = e;
+				console.log(e);
+				this.form = {
+					roleName: e.roleName,
+					organId: e.organId
+				}
+				this.dialogFormVisible = true;
+				if (this.listOrganArr.length == 1) {
+					this.form.organId = this.listOrganArr[0].organId
+				}
+			},
+			async updateRole(form) {
+				const data = await updateRole(form)
+				if (data.status != "0") {
+					this.$message({
+						message: '操作成功！',
+						type: "success"
+					});
+					this.getlist();
+					this.cancel();
+				}
+			},
+			async saveRole(form) {
+				const data = await saveRole(form)
+				if (data.status != "0") {
+					this.$message({
+						message: '操作成功！',
+						type: "success"
+					});
+					this.getlist();
+					this.cancel();
+				}
+			},
+			handleClose() {
+				this.dataItem = {};
+				this.dialogVisible = false;
+			},
+			// 添加
+			add() {
+				this.disabled = false;
+				this.dataItem = {};
+				this.dialogFormVisible = true;
+				if (this.listOrganArr.length == 1) {
+					this.form.organId = this.listOrganArr[0].organId
+				}
+			},
+			// 权限分配
+			editDiaglo(e) {
+				this.dataItem = e;
+				this.dialogVisible = true;
+			},
+			setStatus(status, ids) {
+				let msg = "确认修改用户状态？"
+				if (status == -1) {
+					msg = "此操作将永久删除该文件, 是否继续?"
+				}
+				this.$confirm(msg, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.updateStatus(status, ids + '');
+				});
+			},
+			using(num) {
+				let selArr = [];
+				this.multipleSelection.forEach(value => {
+					selArr.push(value.roldId);
+				})
+				if (selArr.length <= 0) {
+					this.$message({
+						message: '请选择！',
+						type: "warning"
+					});
+					return
+				}
+				this.setStatus(num, selArr.join(','));
+			},
+			selectChanged(e) {
+				this.page = 1;
+				this.value = e;
+				this.getlist();
+			},
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			surrentChange(e) {
+				this.page = e;
+				this.getlist();
+			},
+			async getlist() {
+				const data = await getRoleList({
+					pageNo: this.page,
+					pageSize: this.pageSize
+				})
+				if (data.status != "0") {
+					const listUser = data.data.listRole;
+					const pager = data.data.pager;
+					this.pager = pager;
+					this.dataList = listUser
+				}
+			},
+			async updateStatus(status, arrStr) {
+				const data = await roleUpdateStatus({
+					"ids": arrStr,
+					"status": status
+				})
+				if (data.status != "0") {
+					this.$message({
+						message: '操作成功！',
+						type: "success"
+					});
+					this.getlist();
+				}
+			},
+			async organList() {
+				const data = await getAllValidOrgan({})
+				if (data.status != "0") {
+					this.listOrganArr = data.data
+
+				}
+			}
+		}
+	};
+</script>
+<style>
+	.tab-wrapper {
+		padding: 21px 0;
+	}
+
+	.pagination-wrapper {
+		margin-right: 40px;
+		margin-top: 40px;
+		text-align: right;
+	}
+
+	.edit-password-dialog .el-input {
+		width: 70%;
+	}
+</style>

h5-auth-manager/src/components/page/systemManagement/userManagement.vue

@@ -0,0 +1,306 @@
+<template>
+	<div class="content-wrapper">
+		<div>
+			<el-row :gutter="20">
+				<!-- <el-col :span="16"> -->
+				<div>
+					<el-button @click="add" type="primary">新增</el-button>
+					<el-button @click="using(-1)" type="danger" :disabled="multipleSelection.length>0?false:'disabled'">删除</el-button>
+					<el-button @click="using(1)" type="success" :disabled="multipleSelection.length>0?false:'disabled'">启用</el-button>
+					<el-button @click="using(0)" type="warning" :disabled="multipleSelection.length>0?false:'disabled'">停用</el-button>
+				</div>
+				<!-- </el-col> -->
+			</el-row>
+		</div>
+		<div class="tab-wrapper">
+			<div>
+				<el-table border ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+					<el-table-column type="selection" width="55">
+					</el-table-column>
+
+					<el-table-column prop="account" width="" label="账号">
+					</el-table-column>
+					<el-table-column prop="sysOrgan.name" width="" label="组织名称">
+						<!-- <template slot-scope="scope">
+								{{scope.row.status==1?'启用':scope.row.status==0?'停用':'删除'}}
+							</template> -->
+					</el-table-column>
+
+					<el-table-column prop="sysRole.roleName" label="角色" width="" show-overflow-tooltip>
+						<!-- <template slot-scope="scope">
+								{{scope.row.name}}
+							</template> -->
+					</el-table-column>
+					<el-table-column prop="nickName" width="" label="姓名">
+					</el-table-column>
+					<el-table-column prop="remark" width="" label="备注">
+					</el-table-column>
+					
+
+					
+
+					<el-table-column prop="status" width="" label="状态">
+						<template slot-scope="scope">
+							{{scope.row.status===0?'停用':scope.row.status==1?'启用':'删除'}}
+						</template>
+					</el-table-column>
+
+					<el-table-column prop="birth" label="创建时间">
+						<template slot-scope="scope">
+							{{scope.row.birth|formatDate}}
+						</template>
+					</el-table-column>
+
+					<el-table-column label="操作" align="center" size="s">
+						<template slot-scope="scope">
+							<el-tooltip content="编辑" placement="left">
+								<el-button icon="el-icon-edit" circle size="mini" @click="editDiaglo(scope.row)"></el-button>
+							</el-tooltip>
+							<el-tooltip content="删除" placement="left">
+								<el-button icon="el-icon-delete" circle size="mini" @click="setStatus(-1,scope.row.userId)"></el-button>
+							</el-tooltip>
+							<el-tooltip content="修改密码" placement="right">
+								<el-button icon="el-icon-edit-outline" circle size="mini" @click="showDialogChangePassword(scope.row.userId)"></el-button>
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<el-pagination class="pagination-wrapper" background hide-on-single-page :current-page="pager.pageNum" :page-count="pager.lastPage"
+				 layout="prev, pager, next" @current-change="surrentChange">
+				</el-pagination>
+				<!-- :page-size="pager.size" -->
+				<!-- :total="pager.total" -->
+			</div>
+		</div>
+		<!-- 添加/编辑 -->
+		<!-- <add-block-white :dialogVisible="dialogVisible" @closeEvent="handleClose" :dataItem="dataItem"></add-block-white> -->
+		<add-user-dialog :dialogVisible="dialogVisible" @closeEvent="handleClose" :dataItem="dataItem" :listOrganArr="listOrganArr"></add-user-dialog>
+
+		<!-- 修改密码 -->
+		<el-dialog title="修改密码" :visible.sync="dialogFormVisible" width="30%" class="edit-password-dialog">
+			<el-form :model="form" ref="changePasswordForm">
+				<el-form-item label="新密码" label-width="100px" prop="password" :rules="[
+                        { required: true, message: '不能为空！'}
+                    ]">
+					<el-input v-model="form.password" autocomplete="off" type="password"></el-input>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="closeChangePasswordForm()">取 消</el-button>
+				<el-button type="primary" @click="changePassword('changePasswordForm')">确 定</el-button>
+			</div>
+		</el-dialog>
+
+	</div>
+</template>
+<script>
+	import {
+		formatDate
+	} from '@/assets/utils.js'
+	import {
+		getUserList,
+		userUpdateStatus,
+		getAllValidOrgan,
+		updateUserPassword
+	} from '@/api/index.js'
+	import AddUserDialog from '../../models/addUserDialog.vue'
+	export default {
+		name:'userManagement',
+		components: {
+			AddUserDialog
+		},
+		//过滤
+		filters: {
+			formatDate(time) {
+				let date = new Date(time)
+				return formatDate(date, 'yyyy-MM-dd')
+			}
+		},
+		data() {
+			return {
+				page: 1,
+				pageSize: 10,
+				pager: {},
+				dataList: [],
+				multipleSelection: [],
+				dialogVisible: false,
+				dataItem: {},
+				listOrganArr: [],
+				dialogFormVisible: false,
+				form: {
+					password: ""
+				},
+				currId: ""
+			};
+		},
+		created() {
+			this.getlist();
+			this.organList();
+		},
+		methods: {
+			closeChangePasswordForm() {
+				this.currId = "";
+				this.dialogFormVisible = false;
+				this.$refs["changePasswordForm"].resetFields();
+			},
+			changePassword(myForm) {
+				this.$refs[myForm].validate((valid) => {
+					if (valid) {
+						this.$confirm("确认修改", '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning'
+						}).then(() => {
+							this.updateUserPassword(this.currId, this.form.password);
+						});
+					} else {
+
+					}
+				});
+			},
+			showDialogChangePassword(id) {
+				this.currId = id;
+				this.dialogFormVisible = true;
+			},
+			async updateUserPassword(id, password) {
+				const data = await updateUserPassword({
+					id: id,
+					password: password
+				})
+				if (data.status === "0") {
+					this.$message.error(data.msg);
+					if (data.error === "01000103") {
+						this.$router.push('/login')
+					}
+					return
+				} else {
+					this.$message({
+						message: '修改成功！',
+						type: "success"
+					});
+					this.closeChangePasswordForm();
+				}
+			},
+			handleClose() {
+				this.dataItem = {};
+				this.dialogVisible = false;
+				this.getlist();
+			},
+			// 添加
+			add() {
+				this.dialogVisible = true;
+				// let e = "";
+				// this.$router.push({path:'/blackWhiteManage/addBlackWihite/$'})
+			},
+			// 编辑
+			editDiaglo(e) {
+				this.dataItem = e;
+				this.dialogVisible = true;
+				// this.$router.push({path:`/blackWhiteManage/addBlackWihite/${e.id}`})
+			},
+			setStatus(status, ids) {
+				let msg = "确认修改用户状态？"
+				if (status == -1) {
+					msg = "此操作将永久删除该文件, 是否继续?"
+				}
+				this.$confirm(msg, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.updateStatus(status, String(ids));
+				});
+			},
+			using(num) {
+				let selArr = [];
+				this.multipleSelection.forEach(value => {
+					selArr.push(value.userId);
+				})
+				if (selArr.length <= 0) {
+					this.$message({
+						message: '请选择！',
+						type: "warning"
+					});
+					return
+				}
+				this.setStatus(num, selArr.join(','));
+			},
+			selectChanged(e) {
+				this.page = 1;
+				this.value = e;
+				this.getlist();
+			},
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			surrentChange(e) {
+				this.page = e;
+				this.getlist();
+			},
+			async getlist(e) {
+				const data = await getUserList({
+					pageNo: this.page,
+					pageSize: this.pageSize
+				})
+				if (data.status === "0") {
+					this.$message.error(data.msg);
+					if (data.error === "01000103") {
+						this.$router.push('/login')
+					}
+					return
+				} else {
+					const listUser = data.data.listUser;
+					const pager = data.data.pager;
+					this.pager = pager;
+					this.dataList = listUser
+				}
+			},
+			async updateStatus(status, arrStr) {
+				const data = await userUpdateStatus({
+					"ids": arrStr,
+					"status": status
+				})
+				if (data.status === "0") {
+					this.$message.error(data.msg);
+					if (data.error === "01000103") {
+						this.$router.push('/login')
+					}
+					return
+				} else {
+					this.$message({
+						message: '操作成功！',
+						type: "success"
+					});
+					this.getlist();
+				}
+			},
+			async organList() {
+				const data = await getAllValidOrgan({})
+				if (data.status === "0") {
+					this.$message.error(data.msg);
+					if (data.error === "01000103") {
+						this.$router.push('/login')
+					}
+					return
+				} else {
+					this.listOrganArr = data.data
+				}
+			}
+		}
+	};
+</script>
+<style>
+	.tab-wrapper {
+		padding: 21px 0;
+	}
+
+	.pagination-wrapper {
+		margin-right: 40px;
+		margin-top: 40px;
+		text-align: right;
+	}
+
+	.edit-password-dialog .el-input {
+		width: 70%;
+	}
+</style>

h5-auth-manager/src/main.js

@@ -0,0 +1,86 @@
+import Vue from 'vue';
+import App from './App.vue';
+import router from './router';
+import ElementUI from 'element-ui';
+// import VueI18n from 'vue-i18n';
+// import { messages } from './components/common/i18n';
+import 'element-ui/lib/theme-chalk/index.css'; // 默认主题
+import './assets/css/icon.css';
+
+import 'babel-polyfill';
+
+import store from './store'
+
+import './styles/index.scss'; // global css
+
+Vue.config.productionTip = false;
+// Vue.use(VueI18n);
+// Vue.use(ElementUI, {
+//     size: 'small'
+// });
+Vue.use(ElementUI);
+
+// const i18n = new VueI18n({
+//     locale: 'zh',
+//     messages
+// });
+
+
+Date.prototype.format = function(fmt) {
+	var o = {
+		"M+": this.getMonth() + 1, //月份 
+		"d+": this.getDate(), //日 
+		"h+": this.getHours(), //小时 
+		"m+": this.getMinutes(), //分 
+		"s+": this.getSeconds(), //秒 
+		"q+": Math.floor((this.getMonth() + 3) / 3), //季度 
+		"S": this.getMilliseconds() //毫秒 
+	};
+	if (/(y+)/.test(fmt)) {
+		fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+	}
+	for (var k in o) {
+		if (new RegExp("(" + k + ")").test(fmt)) {
+			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+		}
+	}
+	return fmt;
+}
+
+Date.prototype.getTomorrow = function(num){
+	let Time = new Date(this.getTime()+(Number(num)*86400000))
+	Time.setHours(0)
+	Time.setMinutes(0)
+	Time.setSeconds(0)
+	return Time
+}
+
+
+//使用钩子函数对路由进行权限跳转
+router.beforeEach((to, from, next) => {
+    // document.title = `${to.meta.title} | vue-manage-system`;
+    document.title = `${to.meta.title}`;
+    const role = localStorage.getItem('token');
+    // const sid = Cookies.get("sid");
+    // if (!role && to.path !== '/login') {
+    // 老系统没登录，或者老系统登录了但是新系统没登录 都需要跳转到新系统去登录
+    if (!role && to.path !== '/login') {
+        next('/login');
+    } else {
+        // 简单的判断IE10及以下不进入富文本编辑器，该组件不兼容
+        if (navigator.userAgent.indexOf('MSIE') > -1 && to.path === '/editor') {
+            Vue.prototype.$alert('vue-quill-editor组件不兼容IE10及以下浏览器，请使用更高版本的浏览器查看', '浏览器不兼容通知', {
+                confirmButtonText: '确定'
+            });
+        } else {
+            next();
+        }
+    }
+});
+
+new Vue({
+    router,
+	store,
+    // i18n,
+    render: h => h(App)
+}).$mount('#app');

h5-auth-manager/src/router/index.js

@@ -0,0 +1,69 @@
+import Vue from 'vue';
+import Router from 'vue-router';
+
+Vue.use(Router);
+
+export default new Router({
+    routes: [
+        {
+		    path: '/redirect/:path(.*)',
+		    component: () => import('../components/page/redirect/index.vue'),
+		},
+        {
+            path: '/',
+            redirect: '/userManagement'
+        },
+		{
+		    path: '/login',
+		    component: () => import('../components/page/Login.vue'),
+		    meta: { title: '登录' }
+		},
+        {
+            path: '/',
+            component: () => import('../components/common/Home.vue'),
+            meta: { title: '自述文件' },
+            children: [
+                {
+                    path: '/dashboard',
+                    component: () => import('../components/page/Dashboard.vue'),
+                    meta: { title: '系统首页' }
+                },
+                {
+                    path:'/userManagement',
+                    component: () => import('../components/page/systemManagement/userManagement.vue'),
+                    meta: { title: '用户管理' }
+                },
+                {
+                    path:'/roleManagement',
+                    component: () => import('../components/page/systemManagement/roleManagement.vue'),
+                    meta: { title: '角色管理' }
+                },
+                {
+                    path:'/resourceManagement',
+                    component: () => import('../components/page/systemManagement/resourceManagement.vue'),
+                    meta: { title: '资源管理' }
+                },
+                {
+                    path:'/organizationManagement',
+                    component: () => import('../components/page/systemManagement/organizationManagement.vue'),
+                    meta: { title: '组织管理' }
+                },
+                {
+                    path: '/404',
+                    component: () => import('../components/page/404.vue'),
+                    meta: { title: '404' }
+                },
+                {
+                    path: '/403',
+                    component: () => import('../components/page/403.vue'),
+                    meta: { title: '403' }
+                }
+            ]
+        },
+        
+        {
+            path: '*',
+            redirect: '/404'
+        }
+    ]
+});

h5-auth-manager/src/store/index.js

@@ -0,0 +1,28 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+// import request from '../utils/request.js'
+
+
+Vue.use(Vuex)
+export default new Vuex.Store({
+	state: {
+		barShrink: false,
+		systemList:[]
+	},
+	mutations: {
+
+		setbarShrink(state, res) {
+			state.barShrink = res
+		},
+		setsystemList(state, res) {
+			state.systemList = res
+		},
+
+	},
+	actions: {},
+	modules: {},
+	getters: {
+
+
+	}
+})

h5-auth-manager/src/styles/element-ui.scss

@@ -0,0 +1,29 @@
+ //to reset element-ui default css
+.el-upload {
+  input[type="file"] {
+    display: none !important;
+  }
+}
+
+.el-upload__input {
+  display: none;
+}
+
+//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
+.el-dialog {
+  transform: none;
+  left: 0;
+  position: relative;
+  margin: 0 auto;
+}
+
+//element ui upload
+.upload-container {
+  .el-upload {
+    width: 100%;
+    .el-upload-dragger {
+      width: 100%;
+      height: 200px;
+    }
+  }
+}

h5-auth-manager/src/styles/index.scss

@@ -0,0 +1,158 @@
+@import './variables.scss';
+@import './mixin.scss';
+@import './transition.scss';
+@import './element-ui.scss';
+@import './sidebar.scss';
+
+body {
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+
+html {
+  box-sizing: border-box;
+}
+
+*,
+*:before,
+*:after {
+  box-sizing: inherit;
+}
+
+div:focus{
+  outline: none;
+}
+
+a:focus,
+a:active {
+  outline: none;
+}
+
+a,
+a:focus,
+a:hover {
+  cursor: pointer;
+  color: inherit;
+  text-decoration: none;
+}
+
+.clearfix {
+  &:after {
+    visibility: hidden;
+    display: block;
+    font-size: 0;
+    content: " ";
+    clear: both;
+    height: 0;
+  }
+}
+
+//main-container全局样式
+.app-main{
+  min-height: 100%
+}
+
+.app-container {
+  padding: 20px;
+}
+
+//搜索栏样式
+.filter-container {
+
+}
+
+//操作栏样式
+.operate-container {
+  margin-top: 20px;
+}
+
+.operate-container .btn-add {
+  float: right;
+}
+
+//表格栏样式
+.table-container {
+  margin-top: 20px;
+}
+
+//批量操作栏样式
+.batch-operate-container {
+  display: inline-block;
+  margin-top: 20px;
+}
+
+//分页栏样式
+.pagination-container {
+  display: inline-block;
+  float: right;
+  margin-top: 20px;
+}
+
+//添加、更新表单样式
+.form-container {
+  position: absolute;
+  left: 0;
+  right: 0;
+  width: 720px;
+  padding: 35px 35px 15px 35px;
+  margin: 20px auto;
+}
+
+//主标题
+.font-extra-large {
+  font-size: 20px;
+  color: #303133;
+}
+
+//标题
+.font-title-large {
+  font-size: 18px;
+  color: #303133;
+}
+
+//小标题
+.font-title-medium {
+  font-size: 16px;
+  color: #303133;
+}
+
+//正文
+.font-medium {
+  font-size: 16px;
+  color: #606266;
+}
+
+//正文
+.font-small {
+  font-size: 14px;
+  color: #606266;
+}
+
+//正文（小）
+.font-extra-small {
+  font-size: 13px;
+  color: #606266;
+}
+
+.color-main {
+  color: #409EFF;
+}
+
+.color-success {
+  color: #67C23A;
+}
+
+.color-warning {
+  color: #E6A23C;
+}
+
+.color-danger {
+  color: #F56C6C;
+}
+
+.color-info {
+  color: #909399;
+}
+

h5-auth-manager/src/styles/mixin.scss

@@ -0,0 +1,27 @@
+@mixin clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}
+
+@mixin scrollBar {
+  &::-webkit-scrollbar-track-piece {
+    background: #d3dce6;
+  }
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+  &::-webkit-scrollbar-thumb {
+    background: #99a9bf;
+    border-radius: 20px;
+  }
+}
+
+@mixin relative {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+

h5-auth-manager/src/styles/sidebar.scss

@@ -0,0 +1,105 @@
+#app {
+
+  // 主体区域
+  .main-container {
+    min-height: 100%;
+    transition: margin-left .28s;
+    margin-left: 180px;
+  }
+
+   // 侧边栏
+  .sidebar-container {
+    .horizontal-collapse-transition {
+      transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+    }
+    transition: width .28s;
+    width: 180px !important;
+    height: 100%;
+    position: fixed;
+    font-size: 0px;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1001;
+    overflow: hidden;
+    a {
+      display: inline-block;
+      width: 100%;
+    }
+    .svg-icon {
+      margin-right: 16px;
+    }
+    .el-menu {
+      border: none;
+      width: 100% !important;
+    }
+  }
+
+  .hideSidebar {
+    .sidebar-container {
+      width: 36px !important;
+    }
+    .main-container {
+      margin-left: 36px;
+    }
+    .submenu-title-noDropdown {
+      padding-left: 10px !important;
+      position: relative;
+      .el-tooltip {
+        padding: 0 10px !important;
+      }
+    }
+    .el-submenu {
+      &>.el-submenu__title {
+        padding-left: 10px !important;
+        &>span {
+          height: 0;
+          width: 0;
+          overflow: hidden;
+          visibility: hidden;
+          display: inline-block;
+        }
+        .el-submenu__icon-arrow {
+          display: none;
+        }
+      }
+    }
+  }
+
+  .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
+  .sidebar-container .el-submenu .el-menu-item {
+    min-width: 180px !important;
+    background-color: $subMenuBg !important;
+    &:hover {
+      background-color: $menuHover !important;
+    }
+  }
+  .el-menu--collapse .el-menu .el-submenu {
+    min-width: 180px !important;
+  }
+
+  //适配移动端
+  .mobile {
+    .main-container {
+      margin-left: 0px;
+    }
+    .sidebar-container {
+      top: 50px;
+      transition: transform .28s;
+      width: 180px !important;
+    }
+    &.hideSidebar {
+      .sidebar-container {
+        transition-duration: 0.3s;
+        transform: translate3d(-180px, 0, 0);
+      }
+    }
+  }
+
+  .withoutAnimation {
+    .main-container,
+    .sidebar-container {
+      transition: none;
+    }
+  }
+}

h5-auth-manager/src/styles/transition.scss

@@ -0,0 +1,32 @@
+//globl transition css
+
+/*fade*/
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.28s;
+}
+
+.fade-enter,
+.fade-leave-active {
+  opacity: 0;
+}
+
+/*fade*/
+.breadcrumb-enter-active,
+.breadcrumb-leave-active {
+  transition: all .5s;
+}
+
+.breadcrumb-enter,
+.breadcrumb-leave-active {
+  opacity: 0;
+  transform: translateX(20px);
+}
+
+.breadcrumb-move {
+  transition: all .5s;
+}
+
+.breadcrumb-leave-active {
+  position: absolute;
+}

h5-auth-manager/src/styles/variables.scss

@@ -0,0 +1,4 @@
+//sidebar
+$menuBg:#304156;
+$subMenuBg:#1f2d3d;
+$menuHover:#001528;

h5-auth-manager/src/utils/link.js

@@ -0,0 +1,43 @@
+export default {
+	e: [{
+			title: '数据中心',
+			'http://ex.fibo.cn/': 'http://dx.fibo.cn',
+			'http://ex.demo.fibo.cn/': 'http://dx.demo.fibo.cn',
+			'http://47.102.125.25/': 'http://47.102.125.25:81'
+		},
+		{
+			title: '权限系统',
+			'http://ex.fibo.cn/': 'http://ax.fibo.cn',
+			'http://ex.demo.fibo.cn/': 'http://ax.demo.fibo.cn',
+			'http://47.102.125.25/': 'http://47.102.125.25:82'
+		},
+	],
+
+	d: [{
+			title: '决策平台',
+			'http://dx.fibo.cn/': 'http://ex.fibo.cn',
+			'http://dx.demo.fibo.cn/': 'http://ex.demo.fibo.cn',
+			'http://47.102.125.25:81/': 'http://47.102.125.25'
+		},
+		{
+			title: '权限系统',
+			'http://dx.fibo.cn/': 'http://ax.fibo.cn',
+			'http://dx.demo.fibo.cn/': 'http://ax.demo.fibo.cn',
+			'http://47.102.125.25:81/': 'http://47.102.125.25:82'
+		},
+	],
+
+	a: [{
+			title: '决策平台',
+			'http://ax.fibo.cn/': 'http://ex.fibo.cn',
+			'http://ax.demo.fibo.cn/': 'http://ex.demo.fibo.cn',
+			'http://47.102.125.25:82/': 'http://47.102.125.25'
+		},{
+			title: '数据中心',
+			'http://ax.fibo.cn/': 'http://dx.fibo.cn',
+			'http://ax.demo.fibo.cn/': 'http://dx.demo.fibo.cn',
+			'http://47.102.125.25:82/': 'http://47.102.125.25:81'
+		},
+		
+	]
+}

h5-auth-manager/src/utils/mixin.js

@@ -0,0 +1,8 @@
+export default{
+	computed:{
+		systemList(){
+			return this.$store.state.systemList
+		}
+	}
+	
+}

h5-auth-manager/src/utils/request.js

@@ -0,0 +1,224 @@
+import axios from 'axios'
+import router from '../router';
+import ElementUI from 'element-ui';
+import bus from '@/components/common/bus.js'
+var url = window.location.origin || window.location.protocol + '//' + window.location.hostname + (window.location.port ?
+	':' + window.location.port : '')
+
+
+const storeUrl = [{
+		regetcache: 'decisionTable',
+		url: [
+			'/v3/decisionTables/addDecisionTables',
+			'/v3/decisionTables/updateDecisionTables',
+			'/v3/decisionTables/updateDecisionTablesStatus',
+			'/v3/decisionTables/version/addVersion',
+			'/v3/decisionTables/version/copyVersion',
+			'/v3/decisionTables/version/updateVersion',
+			'/v3/decisionTables/version/updateVersionStatus',
+		]
+	}, {
+		regetcache: 'Engine',
+		url: [
+			'/v2/engine/update'
+		]
+	}, {
+		regetcache: 'Interface',
+		url: [
+			'/v3/interface/addInterface',
+			'/v3/interface/updateInterface',
+			'/v3/interface/deleteInterface'
+		]
+	},
+	{
+		regetcache: 'SCO',
+		url: [
+			'/v3/scorecard/updateStatus',
+			'/v3/scorecard/add',
+			'/v3/scorecardVersion/addScorecardVersion',
+			'/v3/scorecardVersion/updateScorecardVersionStatus',
+			'/v3/scorecardVersion/copyScorecardVersion',
+			'/v3/scorecardVersion/updateScorecardVersion',
+			'/v3/scorecard/update'
+		]
+	},
+	{
+		regetcache: 'decisionTree',
+		url: [
+			'/v3/decisionTree/addDecisionTree',
+			'/v3/decisionTree/updateDecisionTree',
+			'/v3/decisionTree/updateDecisionTreeStatus',
+			'/v3/decisionTree/version/addVersion',
+			'/v3/decisionTree/version/copyVersion',
+			'/v3/decisionTree/version/updateVersion',
+			'/v3/decisionTree/version/updateVersionStatus',
+		]
+	},
+	{
+		regetcache: 'Sourcelist',
+		url: [
+			'/datasource/save',
+			'/datasource/',
+			'/datasource/update'
+		]
+	},
+	// {
+	// 	regetcache: 'listOperation',
+	// 	url: [
+	// 		'/v3/listOperation/addListOperation',
+	// 		'/v3/listOperation/updateListOperation',
+	// 		'/v3/listOperation/updateListOperationStatus',
+	// 		'/v3/listOperation/version/addVersion',
+	// 		'/v3/listOperation/version/copyVersion',
+	// 		'/v3/listOperation/version/updateVersion',
+	// 		'/v3/listOperation/version/updateVersionStatus',
+	// 	]
+	// },
+
+
+
+]
+
+
+
+
+
+
+
+
+const instance = axios.create({
+	baseURL: process.env.NODE_ENV.indexOf(['produce', 'release', 'test', 'development', 'jia', 'niu',
+		'wang']) != -1 ? '/' : url,
+	timeout: 500000,
+})
+
+
+
+instance.interceptors.request.use((config) => {
+	// config.headers['AAA'] = 'AAA';
+
+	// console.log(config)
+	deepTirm(config)
+
+	if (config.data) {
+		if (config.data.getexcel) {
+			config.headers['responseType'] = 'blob'
+		}
+	}
+	if (localStorage.getItem('token')) {
+		config.headers['token'] = localStorage.getItem('token');
+	}
+	return config
+})
+instance.interceptors.response.use((response) => {
+	const {
+		data,
+		config
+	} = response
+
+
+	let result = data
+
+	if (response.data.status === "0") {
+		if (response.data.error === "01000103") {
+			if (document.getElementsByClassName('el-message').length === 0) {
+				ElementUI.Message.error(response.data.msg);
+				router.push({
+					path: '/login',
+				})
+			}
+
+		} else {
+			ElementUI.Message.error(response.data.msg);
+		}
+	} else {
+
+		storeUrl.forEach(value => {
+
+			let is = false
+			value.url.forEach(item => {
+				let str = response.request.responseURL
+				if (item[item.length - 1] == '/') {
+					let arr = str.split('/')
+					if (!isNaN(Number(arr[arr.length - 1]))) {
+						arr.pop()
+						str = arr.join('/') + '/'
+					}
+				}
+
+				str = str.substring(str.length - item.length, str.length)
+				if (item == str) {
+
+					bus.$emit('regetcache', value.regetcache)
+				}
+
+
+			})
+		})
+
+
+
+
+	}
+
+
+	return result
+}, (error) => {
+	// console.log('error', error)
+	if (error.message.match(/timeout/)) {
+		ElementUI.Message.error('请求超时,请稍后再试！');
+	} else if (error.response.status === 500) {
+		ElementUI.Message.error('连接失败,请稍后再试！');
+	} else if (error.response.status === 502) {
+		ElementUI.Message.error('网关超时,请稍后再试！');
+	} else {
+		ElementUI.Message.error('连接失败,请稍后再试！');
+	}
+	return Promise.reject(error)
+});
+
+function deepTirm(e) {
+	Object.keys(e).forEach(value => {
+		if (typeof e[value] == 'string' && (e[value][0] === " " || e[value][e[value].length - 1] === " ")) {
+			e[value] = e[value].trim()
+		}
+		if (isJSON(e[value])) {
+			e[value] = JSON.stringify(deepTirm(JSON.parse(e[value])))
+		}
+		if (typeof e[value] === "object" && e[value] !== null) {
+			if (Array.isArray(e[value])) {
+				e[value].forEach(item => {
+					if (typeof item === 'string' && (item[0] === " " || item[item.length - 1] ===
+							" ")) {
+						item = item.trim()
+					}
+					if (typeof item === 'object') {
+						item = deepTirm(item)
+					}
+				})
+			} else {
+				deepTirm(e[value])
+			}
+		}
+	})
+	return e
+}
+
+function isJSON(str) {
+	if (typeof str == 'string') {
+		try {
+			var obj = JSON.parse(str);
+			if (typeof obj == 'object' && obj) {
+				return true;
+			} else {
+				return false;
+			}
+
+		} catch (e) {
+			return false;
+		}
+	}
+}
+
+
+export default instance

h5-auth-manager/vite.config.js

@@ -0,0 +1,74 @@
+/* eslint-disable */
+import legacyPlugin from '@vitejs/plugin-legacy';
+import {
+  viteMockServe
+} from 'vite-plugin-mock';
+import * as path from 'path';
+import {
+  createVuePlugin
+} from 'vite-plugin-vue2';
+// @see https://cn.vitejs.dev/config/
+export default ({
+  command,
+  mode
+}) => {
+  let rollupOptions = {};
+
+
+  let optimizeDeps = {};
+
+
+  let alias = {
+    '@': path.resolve(__dirname, '.\src'),
+    'vue$': 'vue/dist/vue.runtime.esm.js',
+    'assets': path.resolve(__dirname, '.\src\assets'),
+    'components': path.resolve(__dirname, '.\src\components'),
+  }
+
+  let proxy = {}
+
+  let define = {
+    'process.env.NODE_ENV': '"development"',
+  }
+
+  let esbuild = {}
+
+  return {
+    base: './', // index.html文件所在位置
+    root: './', // js导入的资源路径，src
+    resolve: {
+      alias,
+    },
+    define: define,
+    server: {
+      // 代理
+      proxy,
+    },
+    build: {
+      target: 'es2015',
+      minify: 'terser', // 是否进行压缩,boolean | 'terser' | 'esbuild',默认使用terser
+      manifest: false, // 是否产出maifest.json
+      sourcemap: false, // 是否产出soucemap.json
+      outDir: 'build', // 产出目录
+      rollupOptions,
+    },
+    esbuild,
+    optimizeDeps,
+    plugins: [
+      legacyPlugin({
+        targets: ['Android > 39', 'Chrome >= 60', 'Safari >= 10.1', 'iOS >= 10.3', 'Firefox >= 54', 'Edge >= 15'],
+      }), viteMockServe({
+        mockPath: 'mock',
+        localEnabled: command === 'serve',
+      }), createVuePlugin(),
+    ],
+    css: {
+      preprocessorOptions: {
+        less: {
+          // 支持内联 JavaScript
+          javascriptEnabled: true,
+        }
+      }
+    },
+  }
+}

h5-auth-manager/vue.config.js

@@ -0,0 +1,106 @@
+const path = require('path')
+const proxyObj = require('./baseUrl')
+// 依赖包分析工具
+const WebpackBundleAnalyzer = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+const TerserPlugin = require('terser-webpack-plugin')
+const isAnalyze = false // 是否启用bundleAnalyzer
+const resolve = dir => path.join(__dirname, dir)
+
+
+
+module.exports = {
+	publicPath: './',
+	assetsDir: 'assets',
+	productionSourceMap: false,
+	devServer: {
+		contentBase: path.join(__dirname, `../public/`),
+		host: '0.0.0.0', // 'lhl.zcsmart.com', // 'lhl.zcsmart.com',//'lhl.zcsmart.com',//'localhost',
+		port: 82,
+		open: false,
+		proxy: process.env.OPEN_PROXY === false ? {} : proxyObj, //线上环境
+		overlay: {
+			warnings: false,
+			errors: false
+		},
+		disableHostCheck: true
+	},
+	lintOnSave: false,
+	css: {
+		// 是否使用css分离插件 ExtractTextPlugin
+		extract: process.env.NODE_ENV === 'production',
+		// 启用 CSS modules for all css / pre-processor files.
+		modules: false,
+		// loaderOptions: {
+		// 	less: {
+		// 		globalVars: {
+		// 			hack: `true; @import '~@/assets/style/var.less';`
+		// 		}
+		// 	}
+		// }
+	},
+
+
+	pluginOptions: {
+		lintStyleOnBuild: process.env.NODE_ENV !== 'production', // 添加了插件(@ascendancyy/vue-cli-plugin-stylelint), 所以需要配置
+		stylelint: {
+			files: ['src/**/*.vue', 'src/assets/style/*.l?(e|c)ss']
+		},
+		'style-resources-loader': {
+			preProcessor: 'less',
+			patterns: [path.resolve(__dirname, './src/assets/style/css/treeNode.less')] // less所在文件路径
+		},
+	},
+	pwa: {
+		iconPaths: {
+			favicon32: 'logo.ico',
+			favicon16: 'logo.ico',
+			appleTouchIcon: 'logo.ico',
+			maskIcon: 'logo.ico',
+			msTileImage: 'logo.ico'
+		}
+	},
+	chainWebpack: config => {
+		if (isAnalyze) { // 设置bundle-analyzer
+			config
+				.plugin('bundle-analyzer')
+				.use(WebpackBundleAnalyzer)
+		}
+		// 多加几个别名，节省代码
+		config.resolve.alias
+			.set('@', resolve('src'))
+			.set('assets', resolve('src/assets'))
+			.set('components', resolve('src/components'))
+	},
+	configureWebpack: config => {
+		config.optimization = {
+			splitChunks: {
+				cacheGroups: {
+					theme: { // element包打包时拆分
+						name: 'chunk-theme',
+						test: /[\\/]node_modules[\\/]element-ui[\\/]/,
+						chunks: 'all',
+						priority: 1,
+						reuseExistingChunk: true,
+						enforce: true
+					}
+				}
+			}
+		}
+		if (process.env.NODE_ENV === 'production') {
+			config.plugins.push(
+				new TerserPlugin({
+					terserOptions: {
+						warnings: false,
+						compress: {
+							drop_debugger: true,
+							drop_console: true
+						}
+					},
+					sourceMap: false,
+					parallel: true
+				})
+			)
+		}
+	}
+}
+console.log(module.exports.devServer.proxy)

h5-datax-manager/.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not ie <= 8

h5-datax-manager/.env.jia

@@ -0,0 +1,3 @@
+NODE_ENV = 'jia'
+VUE_CURRENTMODE = 'jia'
+VUE_PROXY = true

h5-datax-manager/.env.niu

@@ -0,0 +1,3 @@
+NODE_ENV = 'niu'
+VUE_CURRENTMODE = 'niu'
+VUE_PROXY = true

h5-datax-manager/.env.produce

@@ -0,0 +1,3 @@
+NODE_ENV = 'produce'
+VUE_CURRENTMODE = 'produce'
+VUE_PROXY = true

h5-datax-manager/.env.release

@@ -0,0 +1,3 @@
+NODE_ENV = 'release'
+VUE_CURRENTMODE = 'release'
+VUE_PROXY = true

h5-datax-manager/.env.test

@@ -0,0 +1,3 @@
+NODE_ENV = 'test'
+VUE_CURRENTMODE = 'test'
+VUE_PROXY = true

h5-datax-manager/.env.wang

@@ -0,0 +1,3 @@
+NODE_ENV = 'wang'
+VUE_CURRENTMODE = 'wang'
+VUE_PROXY = true

h5-datax-manager/.eslintrc.js

@@ -0,0 +1,12 @@
+// {
+//   "presets": [
+//     ["env", {
+//       "modules": false,
+//       "targets": {
+//         "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+//       }
+//     }],
+//     "stage-2"
+//   ],
+//   "plugins": ["transform-remove-strict-mode"]
+// }

h5-datax-manager/.gitignore

@@ -0,0 +1,22 @@
+.DS_Store
+node_modules
+/dist
+example.html
+favicon.ico
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*

h5-datax-manager/.prettierrc

@@ -0,0 +1,6 @@
+{
+	"tabWidth": 4,
+	"singleQuote": true,
+	"trailingComma": "none",
+	"printWidth": 140
+}

h5-datax-manager/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016-2019 vue-manage-system
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

h5-datax-manager/babel.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+	presets: [
+		'@vue/app'
+	],
+
+}

h5-datax-manager/baseUrl.js

@@ -0,0 +1,108 @@
+// console.log(process.env)
+var proxyObj = {}
+// console.log(process.env.VUE_PROXY)
+switch (process.env.NODE_ENV) {
+	case 'development': // 开发环境代理地址
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://127.0.0.1:8082', // 开发环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				},
+
+			},
+			'/trading': {
+				target: 'http://127.0.0.1:8071', // 开发环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/trading': '/trading'
+				},
+
+			},
+		}
+		break
+	case 'test': // 测试环境代理地址
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://localhost:8080', // 测试环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+		}
+		break
+	case 'release': // 军环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://192.168.3.155:8080', // 谭环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+		}
+		break
+	case 'niu': // 牛环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://dx.fibo.cn:80', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+		}
+		break
+	case 'jia': // 贾环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://zhangzj.vip:8000', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+			// '/list': {
+			// 	target: 'http://127.0.0.1:8888', // 生产环境
+			// 	changeOrigin: true, // 是否跨域
+			// 	pathRewrite: {
+			// 		'^/list': '/list'
+			// 	}
+			// },
+		}
+		break
+	case 'wang': // 汪环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://192.168.50.223:8080', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			}
+		}
+		break
+	case 'produce': // 生产环境
+		proxyObj = {
+			'/Riskmanage': {
+				target: 'http://47.99.93.74:8099', // 生产环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/Riskmanage': '/Riskmanage'
+				}
+			},
+			'/trading': {
+				target: 'http://47.99.93.74:8099', // 开发环境
+				changeOrigin: true, // 是否跨域
+				pathRewrite: {
+					'^/trading': '/trading'
+				}
+
+			}
+		}
+		break
+}
+
+module.exports = proxyObj

h5-datax-manager/h5-enginex-manager.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

h5-datax-manager/index.html

@@ -0,0 +1,14 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite App</title>
+
+<body>
+<div id="app"></div>
+<script type="module" src="./src/main.js"></script>
+</body>
+</html>

h5-datax-manager/package.json

@@ -0,0 +1,57 @@
+{
+	"name": "vue-manage-system",
+	"version": "4.2.0",
+	"private": true,
+	"scripts": {
+		"serve": "vue-cli-service serve --mode development",
+		"serve:test": "vue-cli-service serve --mode test",
+		"serve:jia": "vue-cli-service serve --mode jia",
+		"serve:niu": "vue-cli-service serve --mode niu",
+		"serve:wang": "vue-cli-service serve --mode wang",
+		"serve:release": "vue-cli-service serve --mode release",
+		"serve:produce": "vue-cli-service serve --mode produce",
+		"build": "vue-cli-service build",
+		"lint": "vue-cli-service lint",
+		"eslint": "eslint --fix --ext .js,.vue src",
+		"stylelint": "stylelint **/*.{vue,css,scss,less} --fix",
+		"standard": "standard",
+		"standfix": "standard --fix",
+		"dev": "vite",
+		"start": "vite",
+		"preview": "vite preview",
+		"vite-build": "vite build"
+	},
+	"dependencies": {
+		"axios": "^0.18.1",
+		"babel-polyfill": "^6.26.0",
+		"echarts": "^5.1.2",
+		"element-ui": "^2.11.0",
+		"js-cookie": "^2.2.1",
+		"less": "^4.1.1",
+		"less-loader": "^5.0.0",
+		"mavon-editor": "^2.6.17",
+		"node-sass": "^4.14.1",
+		"vue": "^2.6.10",
+		"vue-codemirror": "^4.0.6",
+		"vue-cropperjs": "^3.0.0",
+		"vue-i18n": "^8.10.0",
+		"vue-quill-editor": "^3.0.6",
+		"vue-router": "^3.0.3",
+		"vuedraggable": "^2.17.0",
+		"vuex": "^3.6.2"
+	},
+	"devDependencies": {
+		"@vue/cli-plugin-babel": "^3.9.0",
+		"@vue/cli-service": "^3.9.0",
+		"babel-plugin-transform-remove-strict-mode": "0.0.2",
+		"mockjs": "^1.1.0",
+		"sass-loader": "^7.3.1",
+		"sass-resources-loader": "^2.1.1",
+		"style-loader": "^2.0.0",
+		"vue-template-compiler": "^2.6.10",
+		"vite": "2",
+		"@vitejs/plugin-legacy": "^1.4.4",
+		"vite-plugin-mock": "2",
+		"vite-plugin-vue2": "latest"
+	}
+}