fix： 权限系统

h5-enginex-manager/baseUrl.js

@@ -5,7 +5,8 @@ switch (process.env.NODE_ENV) {
 	case 'development': // 开发环境代理地址
 		proxyObj = {
 			'/Riskmanage': {
-				target: 'http://127.0.0.1:8082', // 开发环境
+				// target: 'http://127.0.0.1:8082', // 开发环境
+        target: 'http://47.99.93.74:8099', // 开发环境
 				changeOrigin: true, // 是否跨域
 				pathRewrite: {
 					'^/Riskmanage': '/Riskmanage'
@@ -13,7 +14,8 @@ switch (process.env.NODE_ENV) {
 
 			},
 			'/trading': {
-				target: 'http://127.0.0.1:8083', // 开发环境
+				// target: 'http://127.0.0.1:8083', // 开发环境
+        target: 'http://47.99.93.74:8099', // 开发环境
 				changeOrigin: true, // 是否跨域
 				pathRewrite: {
 					'^/trading': '/trading'

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

@@ -7,11 +7,6 @@
 		</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;">
@@ -19,16 +14,10 @@
 					<div v-for="value in link.e" class="header_link" @click="go(value)">
 						{{value.title}}
 					</div>
-
-
-
 				</div>
 
-
 				<!--  -->
 				<div class="btn-fullscreen" @click="ReGetStorage">
-					<!-- {{fielduser}} -->
-					<!-- {{ruleList=='[]'}} -->
 					<el-tooltip effect="dark" content="刷新缓存" placement="bottom">
 
 						<i :class="Loading?'el-icon-loading':'el-icon-refresh'"></i>
@@ -148,25 +137,6 @@
 				})
 				if (is) return true
 
-				// if (this.$store.state.SCO == null) {
-				// 	return true
-				// }
-				// if (this.$store.state.Interface == null) {
-				// 	return true
-				// }
-				// if (this.$store.state.decisionTable == null) {
-				// 	return true
-				// }
-				// if (this.$store.state.decisionTree == null) {
-				// 	return true
-				// }
-				// if (this.$store.state.Sourcelist == null) {
-				// 	return true
-				// }
-				// if (this.$store.state.Engine == null) {
-				// 	return true
-				// }
-
 
 
 				return false

h5-enginex-manager/src/components/common/HeaderAuth.vue

@@ -0,0 +1,275 @@
+<template>
+	<div class="header">
+		<!-- 折叠按钮 -->
+		<div class="collapse-btn" @click="collapseChage">
+			<i v-if="!collapse" class="el-icon-s-fold"></i>
+			<i v-else class="el-icon-s-unfold"></i>
+		</div>
+		<div class="logo">权限系统</div>
+		<div class="header-right">
+			<div class="header-user-con">
+				<!--  -->
+				<div style="display: flex;font-size: 14px;">
+					
+					<div v-for="value in link.a" class="header_link" @click="go(value)">
+						{{value.title}}
+					</div>
+					
+					
+					
+				</div>
+
+				<!-- 全屏显示 -->
+				<div class="btn-fullscreen" @click="handleFullScreen">
+					<el-tooltip effect="dark" :content="fullscreen?`取消全屏`:`全屏`" placement="bottom">
+						<i class="el-icon-rank"></i>
+					</el-tooltip>
+				</div>
+				
+				<!-- 用户头像 -->
+				<div class="user-avator">
+					<img src="../../assets/img/img.jpg" />
+				</div>
+				<!-- 用户名下拉菜单 -->
+				<el-dropdown class="user-name" trigger="click" @command="handleCommand">
+					<span class="el-dropdown-link">
+						{{username}}
+						<i class="el-icon-caret-bottom"></i>
+					</span>
+					<el-dropdown-menu slot="dropdown">
+						<el-dropdown-item divided command="loginout">退出登录</el-dropdown-item>
+					</el-dropdown-menu>
+				</el-dropdown>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+	import bus from './bus';
+	import {
+		getLogout
+	} from '../../api/index';
+		import linkOr from '@/utils/link.js'
+	export default {
+		data() {
+			return {
+				collapse: false,
+				fullscreen: false,
+				name: '',
+				message: 2,
+				link:[]
+			};
+		},
+		created() {
+			this.link = linkOr
+			bus.$on('collapseHeader', res => {
+				this.busCollapseChage(res)
+			})
+			bus.$on('regetcache',res=>{
+				
+				this.$store.dispatch('regetcache',res)
+			})
+
+			
+
+			this.$store.commit('setbarShrink', this.collapse)
+		},
+		computed: {
+			username() {
+				if (localStorage.getItem('ms_username')) {
+					return localStorage.getItem('ms_username');
+				} else {
+					return "未命名"
+				}
+			},
+			fielduser() {
+				if (this.$store.state.FieldUser) {
+					return this.$store.state.FieldUser.data.fieldList
+				} else {
+
+					return null
+				}
+			},
+			ruleList() {
+				if (this.$store.state.RuleList) {
+					return this.$store.state.RuleList
+			
+				} else {
+
+					return null
+				}
+			}
+		},
+		methods: {
+			go(value) {
+				var url = window.location.href
+
+				if (value[url.split('#')[0]]) {
+					window.open(value[url.split('#')[0]])
+				} else {
+					this.$message.error('请检查跳转配置')
+				}
+			},
+			ReGetStorage() {
+
+				if (this.Loading) {
+					return
+				}
+
+				this.mixinReGetStorage()
+			},
+			// 用户名下拉菜单选择事件
+			handleCommand(command) {
+				if (command == 'loginout') {
+					// 调用退出登录接口
+					getLogout();
+					localStorage.removeItem("engineId");
+					// localStorage.removeItem("token");
+					localStorage.removeItem('ms_username');
+          this.$router.push('/loginAuth');
+				}
+			},
+			// Bus侧边栏折叠
+			busCollapseChage(res) {
+				this.collapse = res;
+				this.$store.commit('setbarShrink', this.collapse)
+				bus.$emit('collapse', this.collapse);
+			},
+			// 侧边栏折叠
+			collapseChage() {
+				this.collapse = !this.collapse;
+				this.$store.commit('setbarShrink', this.collapse)
+				bus.$emit('collapse', this.collapse);
+			},
+			// 全屏事件
+			handleFullScreen() {
+				let element = document.documentElement;
+				if (this.fullscreen) {
+					if (document.exitFullscreen) {
+						document.exitFullscreen();
+					} else if (document.webkitCancelFullScreen) {
+						document.webkitCancelFullScreen();
+					} else if (document.mozCancelFullScreen) {
+						document.mozCancelFullScreen();
+					} else if (document.msExitFullscreen) {
+						document.msExitFullscreen();
+					}
+				} else {
+					if (element.requestFullscreen) {
+						element.requestFullscreen();
+					} else if (element.webkitRequestFullScreen) {
+						element.webkitRequestFullScreen();
+					} else if (element.mozRequestFullScreen) {
+						element.mozRequestFullScreen();
+					} else if (element.msRequestFullscreen) {
+						// IE11
+						element.msRequestFullscreen();
+					}
+				}
+				this.fullscreen = !this.fullscreen;
+			}
+		},
+		mounted() {
+			if (document.body.clientWidth < 1500) {
+				this.collapseChage();
+			}
+		}
+	};
+</script>
+<style scoped>
+	.header {
+		position: relative;
+		box-sizing: border-box;
+		width: 100%;
+		height: 70px;
+		font-size: 22px;
+		color: #fff;
+	}
+
+	.collapse-btn {
+		float: left;
+		padding: 0 21px;
+		cursor: pointer;
+		line-height: 70px;
+	}
+	.header_link {
+		padding: 4px;
+		margin-right: 20px;
+		color: #fff;
+	}
+	
+	.header_link:hover {
+		cursor: pointer;
+	}
+	.header .logo {
+		float: left;
+		width: 250px;
+		line-height: 70px;
+	}
+
+	.header-right {
+		float: right;
+		padding-right: 50px;
+	}
+
+	.header-user-con {
+		display: flex;
+		height: 70px;
+		align-items: center;
+	}
+
+	.btn-fullscreen {
+		transform: rotate(45deg);
+		margin-right: 5px;
+		font-size: 24px;
+	}
+
+	.btn-bell,
+	.btn-fullscreen {
+		position: relative;
+		width: 30px;
+		height: 30px;
+		text-align: center;
+		border-radius: 15px;
+		cursor: pointer;
+	}
+
+	.btn-bell-badge {
+		position: absolute;
+		right: 0;
+		top: -2px;
+		width: 8px;
+		height: 8px;
+		border-radius: 4px;
+		background: #f56c6c;
+		color: #fff;
+	}
+
+	.btn-bell .el-icon-bell {
+		color: #fff;
+	}
+
+	.user-name {
+		margin-left: 10px;
+	}
+
+	.user-avator {
+		margin-left: 20px;
+	}
+
+	.user-avator img {
+		display: block;
+		width: 40px;
+		height: 40px;
+		border-radius: 50%;
+	}
+
+	.el-dropdown-link {
+		color: #fff;
+		cursor: pointer;
+	}
+
+	.el-dropdown-menu__item {
+		text-align: center;
+	}
+</style>

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

@@ -1,6 +1,8 @@
 <template>
   <div class="wrapper"> 
-        <v-head></v-head>
+    <!-- 权限系统 -->
+    <headerAuth v-if="headerShowAuth"/>
+        <v-head v-else></v-head>
         <v-sidebar></v-sidebar>
         <div class="content-box" :class="{'content-collapse':collapse}">
             <v-tags></v-tags>
@@ -18,6 +20,7 @@
 
 <script>
 import vHead from './Header.vue';
+import headerAuth from './HeaderAuth.vue'
 import vSidebar from './Sidebar.vue';
 import vTags from './Tags.vue';
 import bus from './bus';
@@ -30,6 +33,7 @@ export default {
     },
     components: {
         vHead,
+        headerAuth,  // 权限系统化header
         vSidebar,
         vTags
     },
@@ -47,5 +51,14 @@ export default {
             this.tagsList = arr;
         });
     },
+    methods: {
+      headerShowAuth() {
+        if (localStorage.getItem('platform') === 'Auth') {
+          return true
+        } else {
+          return false
+        }
+      }
+    }
 };
 </script>

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

@@ -60,7 +60,8 @@
 
 		methods: {
 			async getMenus() {
-				const data = await getMenus({entity:{resourceSystem:'EngineX'}});
+
+				const data = await getMenus({entity:{resourceSystem:localStorage.getItem('platform')}});
 			    // console.log('菜单接口返回的数据',data);
 				if (data.status === "0") {
 					this.$message.error(data.msg);

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

@@ -47,7 +47,10 @@
             // 关闭全部标签
             closeAll(){
                 this.tagsList = [];
-                this.$router.push('/');
+                if (localStorage.getItem('platform') === 'Auth') {
+                  // 权限系统
+                  this.$router.push('/userManagement');
+                }
             },
             // 关闭其他标签
             closeOther(){

h5-enginex-manager/src/components/page/LoginAuth.vue

@@ -0,0 +1,125 @@
+<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 {
+  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 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);
+        // 权限系统
+        localStorage.setItem('platform', 'Auth');
+        this.$router.push('/userManagement');
+      } 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-enginex-manager/src/components/page/LoginDatax.vue

@@ -0,0 +1,134 @@
+<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('/');
+      this.mixinReGetStorage()
+    }
+    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-enginex-manager/src/router/index.js

@@ -1,4 +1,4 @@
-import Vue from 'vue';
+import Vue, { KeepAlive } from 'vue';
 import Router from 'vue-router';
 
 Vue.use(Router);
@@ -13,11 +13,30 @@ export default new Router({
       path: '/',
       redirect: '/dashboard'
     },
+
+    /**
+     * 登录
+     */
+    // 决策引擎系统 - 登录
 		{
-		    path: '/login',
+      path: '/loginEnginex',
-		    component: () => import('../components/page/Login.vue'),
+      component: () => import('../components/page/LoginEnginex.vue'),
       meta: { title: '登录' }
 		},
+    // 权限系统 - 登录
+    {
+      path: '/loginAuth',
+      component: () => import('../components/page/LoginAuth.vue'),
+      meta: { title: '登录', KeepAlive: true }
+		},
+    // 数据中心 - 登录
+    {
+      path: '/loginDatax',
+      component: () => import('../components/page/LoginDatax.vue'),
+      meta: { title: '登录' }
+		},
+
+
     {
       path: '/',
       component: () => import('../components/common/Home.vue'),
@@ -42,7 +61,8 @@ export default new Router({
           path: '/dataFlowEngine',
           component: () => import('../components/page/dataFlowEngine.vue'),
           meta: { title: '数据流引擎列表' }
-                },{
+        },
+        {
           path: '/dataFlowEngineCont',
 					name:'dataFlowEngineCont',
           component: () => import('../components/page/dataFlowEngineCont.vue'),
@@ -57,7 +77,8 @@ export default new Router({
           path: '/listOperation',
           component: () => import('../components/page/listOperation.vue'),
           meta: { title: '集合规则' }
-				},{
+				},
+        {
           path: '/dataRinse',
           component: () => import('../components/page/dataRinse.vue'),
           meta: { title: '数据清洗' }
@@ -71,22 +92,22 @@ export default new Router({
           path: '/groovyRule',
           component: () => import('../components/page/groovyRule.vue'),
           meta: { title: '脚本规则集' }
-                },{
+        },
+        {
           path: '/decisionTable',
           component: () => import('../components/page/decisionTable.vue'),
           meta: { title: '决策表' }
-                },{
+        },
+        {
           path: '/decisionTree',
           component: () => import('../components/page/decisionTree.vue'),
           meta: { title: '决策树' }
         },
-
         {
           path:'/blackWihiteData',
           component: () => import('../components/page/blackWhiteManage/blackWihiteData.vue'),
           meta: { title: '名单库管理' }
         },
- 
         {
           path:'/logManagement',
           component: () => import('../components/page/systemManagement/logManagement.vue'),
@@ -110,7 +131,8 @@ export default new Router({
           path:'/examineCurrent',
           component: () => import('../components/page/examineCurrent.vue'),
           meta: { title: '审批流' }
-				},{
+				},
+        {
           path:'/examineSet',
           component: () => import('../components/page/examineSet.vue'),
           meta: { title: '审批设置' }
@@ -119,22 +141,22 @@ export default new Router({
           path: '/indexModels',
           component: () => import('@/components/models/index.vue'),
           meta: {title: '模型管理'}
-                },{
+        },
+        {
           path: '/engine_result',
           component: () => import('@/components/page/Engine_watch.vue'),
           meta: {title: '决策流监控列表'}
-                },{
+          },
+          {
             path: '/engine_result_cont/:id',
             component: () => import('@/components/page/Engine_watch_cont.vue'),
             meta: {title: '决策流监控'}
           }, 
-
           {
             path: '/businessRuleRel',
             component: () => import('@/components/page/businessRuleRel.vue'),
             meta: {title: '业务类型'}
           },
-
           {
             path: '/tendencyAnalyse',
             component: () => import('@/components/page/tendencyAnalyse.vue'),
@@ -155,12 +177,11 @@ export default new Router({
             component: () => import('../components/page/403.vue'),
             meta: { title: '403' }
           },
-
+          // 权限系统
-                // --- 
           {
             path:'/userManagement',
             component: () => import('../components/page/systemManagement/userManagement.vue'),
-                  meta: { title: '用户管理' }
+            meta: { title: '用户管理', KeepAlive: true }
           },
           {
             path:'/roleManagement',
@@ -177,7 +198,6 @@ export default new Router({
             component: () => import('../components/page/systemManagement/organizationManagement.vue'),
             meta: { title: '组织管理' }
           },
-
           // 
           {
             path: '/dataManage',
@@ -193,7 +213,8 @@ export default new Router({
             path: '/SQLmanage',
             component: () => import('../components/page/SQLManage.vue'),
             meta: { title: '数据库指标' }
-                },{
+          },
+          {
             path: '/realTimeManage',
             component: () => import('../components/page/realTimeManage.vue'),
             meta: { title: '实时指标' }
@@ -228,10 +249,8 @@ export default new Router({
             component: () => import('@/components/page/FieldStatistics.vue'),
             meta: {title: '指标统计'}
           },
-
         ]
       },
-        
       {
         path: '*',
         redirect: '/404'