Commit 87b0d223 authored by zhangyichen's avatar zhangyichen

提交

parent e1c55f4a
# just a flag
ENV = 'development'
# base api
VUE_APP_BASE_API = '/dev-api'
# workFlow链接地址
# VUE_APP_WORKFLOW = 'http://106.2.17.219:10180'
VUE_APP_WORKFLOW = '/workFlow'
# internal链接地址
VUE_APP_INTERNAL = '/internal'
# login地址
VUE_APP_LOGIN = 'http://login.court.com/#/login'
# 中台地址
VUE_APP_ZT = 'http://main.court.com'
# 内勤地址
VUE_APP_NQ = 'http://nq.court.com'
# 根域名
VUE_APP_ROOT = 'court.com'
# 模板地址
VUE_APP_TEMPLATE = 'http://192.168.1.17:8072/'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
# It only does one thing by converting all import() to require().
# This configuration can significantly increase the speed of hot updates,
# when you have a large number of pages.
# Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
VUE_CLI_BABEL_TRANSPILE_MODULES = true
# just a flag
ENV = 'production'
# 私有环境
# base api
#VUE_APP_BASE_API = 'http://zt.51newsoftware.com:10184'
# workFlow链接地址
#VUE_APP_WORKFLOW = 'http://zt.51newsoftware.com:10184/workFlow'
# internal链接地址
#VUE_APP_INTERNAL = 'http://zt.51newsoftware.com:10184/internal'
# login地址
#VUE_APP_LOGIN = 'http://login.51newsoftware.com:10181/#/login'
# 中台地址
#VUE_APP_ZT = 'http://zt.51newsoftware.com:10181'
# 内勤地址
#VUE_APP_NQ = 'http://nq.51newsoftware.com:10181'
# 根域名
#VUE_APP_ROOT = '51newsoftware.com'
# 模板地址
#VUE_APP_TEMPLATE = 'http://zt.51newsoftware.com:10191/'
# 生产环境
# base api
VUE_APP_BASE_API = 'http://zt.cebitic.com:10184'
# workFlow链接地址
VUE_APP_WORKFLOW = 'http://zt.cebitic.com:10184/workFlow'
# internal链接地址
VUE_APP_INTERNAL = 'http://zt.cebitic.com:10184/internal'
# login地址
VUE_APP_LOGIN = 'http://login.cebitic.com:10181/#/login'
# 中台地址
VUE_APP_ZT = 'http://zt.cebitic.com:10181'
# 内勤地址
VUE_APP_NQ = 'http://nq.cebitic.com:10181'
# 根域名
VUE_APP_ROOT = 'cebitic.com'
# 模板地址
VUE_APP_TEMPLATE = 'http://zt.cebitic.com:10191/'
VUE_APP_BASE_API = 'http://117.122.212.91:33012/'
......@@ -20,20 +20,6 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="code">
<el-input
v-model="loginForm.code"
auto-complete="off"
placeholder="验证码"
style="width: 63%"
@keyup.enter.native="handleLogin"
>
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
</el-input>
<!--<div class="login-code">
<img :src="codeUrl" @click="getCode">
</div>-->
</el-form-item>
<el-form-item style="width:80%;margin-bottom: 20px">
<el-button
class="blue-btn"
......@@ -50,12 +36,6 @@
class="buttons-content"
>
<el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住密码</el-checkbox>
<el-link
:underline="false"
@click="goDetail('/forgetPwd')"
>
<router-link to="/forgetPwd">忘记密码</router-link>
</el-link>
</div>
</div>
</el-form>
......
......@@ -133,7 +133,6 @@
:limit.sync="queryParams.rows"
@pagination="getList"
/>
<!-- 添加或修改角色配置对话框 -->
<el-dialog title="角色信息" :visible.sync="open" width="550px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
......@@ -196,8 +195,7 @@
:show-checkbox="false"
node-key="id"
empty-text="加载中,请稍后"
:props="{defaultProps, disabled: () => true}"
:default-checked-keys="[]"
:default-expanded-keys="menuOptionDataIdList"
:current-node-key="toString()"
:expand-on-click-node="false"
:check-strictly="false"
......@@ -213,12 +211,12 @@
</div>
</el-col>
<el-col style="width: 49%">
<el-form :model="form" label-width="80px">
<el-form :model="formDeptData" label-width="80px">
<el-form-item label="菜单名称" prop="menuId" >
<el-input v-model="form.menuId" placeholder="未选择菜单名称" disabled/>
<el-input v-model="formDeptData.menuId" placeholder="未选择菜单名称" disabled/>
</el-form-item>
<el-form-item label="权限范围">
<el-select v-model="form.dataScope" >
<el-select v-model="formDeptData.dataScope" >
<el-option
v-for="item in dataScopeOptions"
:key="item.value"
......@@ -227,20 +225,21 @@
/>
</el-select>
</el-form-item>
<el-form-item v-show="form.dataScope == 2" label="数据权限">
<el-form-item v-show="formDeptData.dataScope == 2" label="数据权限">
<el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
<el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
<el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
<el-checkbox v-model="formDeptData.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
<el-tree
ref="dept"
class="tree-border"
:data="deptOptions"
:expand-on-click-node="false"
:check-strictly="!formDeptData.menuCheckStrictly"
show-checkbox
:filter-node-method="filterNode"
default-expand-all
node-key="id"
:check-strictly="!form.deptCheckStrictly"
empty-text="加载中,请稍后"
:props="defaultProps"
highlight-current
@node-click="handleNodeClick"
/>
</el-form-item>
</el-form>
......@@ -257,7 +256,7 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from '@/api/system/role'
import { roleMenuTreeselectMC, treeselect as menuTreeselect, roleMenuTreeselect } from '@/api/system/menu'
import { treeselect as deptTreeselect, roleDeptTreeselect } from '@/api/system/dept'
import { treeselect as deptTreeselect, roleDeptTreeselect, treeselect } from '@/api/system/dept'
export default {
name: 'Role',
data() {
......@@ -328,6 +327,8 @@ export default {
menuOptions: [],
// 数据权限菜单列表
menuOptionData: [],
// 默认展开
menuOptionDataIdList: [],
// 已选择id list集合
selectListId: [],
// 部门列表
......@@ -347,6 +348,12 @@ export default {
deptIds: '',
businessId: ''
},
formDeptData: {
menuId: '',
dataScope: '',
deptCheckStrictly: undefined,
menuCheckStrictly: undefined
},
defaultProps: {
children: 'children',
label: 'label'
......@@ -383,6 +390,7 @@ export default {
this.queryParams = { ...param }
}
this.getList()
this.getDeptTreeselect()
// this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
// this.statusOptions = response.data;
// });
......@@ -463,7 +471,13 @@ export default {
} else if (type === 2) {
roleMenuTreeselect(roleId).then(response => {
this.selectListId = response.data.checkedKeys
this.menuOptionDataIdList = []
this.menuOptionData = response.data.checkedKeyList
if (this.menuOptionData.length > 1) {
this.menuOptionData.forEach(item => {
this.menuOptionDataIdList.push(item.id)
})
}
})
}
},
......@@ -551,7 +565,7 @@ export default {
if (type === 'menu') {
this.form.menuCheckStrictly = !!value
} else if (type === 'dept') {
this.form.deptCheckStrictly = !!value
this.formDeptData.deptCheckStrictly = !!value
}
},
// 树权限(全选/全不选)
......@@ -719,7 +733,22 @@ export default {
// this.download(response.msg);
})
})
}
},
getTreeSelect() {
treeselect().then(response => {
if (response.data && response.data.length > 0) {
this.deptOptions = response.data
}
})
},
// 筛选节点
filterNode(value, data) {
if (!value) return true
return data.label.indexOf(value) !== -1
},
// 节点单击事件
handleNodeClick(data) {
},
}
}
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment