Skip to content

D
datax-cloud
Commit 241853c2 by yuwei
Options

2.0.0项目初始化

parent 3281f89e
Showing with 38 additions and 32 deletions
datax-ui/package-lock.json
......@@ -937,8 +937,8 @@
},
"@riophae/vue-treeselect": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
"integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==",
"resolved": "https://registry.npm.taobao.org/@riophae/vue-treeselect/download/@riophae/vue-treeselect-0.4.0.tgz",
"integrity": "sha1-C67Vp5TP/FgLY1kfNcEl5RwN8kE=",
"requires": {
"@babel/runtime": "^7.3.1",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
......@@ -4088,8 +4088,8 @@
},
"easings-css": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/easings-css/-/easings-css-1.0.0.tgz",
"integrity": "sha512-7Uq7NdazNfVtr0RNmPAys8it0zKCuaqxJStYKEl72D3j4gbvXhhaM7iWNbqhA4C94ygCye6VuyhzBRQC4szeBg=="
"resolved": "https://registry.npm.taobao.org/easings-css/download/easings-css-1.0.0.tgz",
"integrity": "sha1-3eVpADu3pKDAt3h49ds+C+VnnIE="
},
"easy-stack": {
"version": "1.0.0",
......@@ -7324,8 +7324,8 @@
},
"material-colors": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
"integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
"resolved": "https://registry.npm.taobao.org/material-colors/download/material-colors-1.2.6.tgz",
"integrity": "sha1-bRlYhxEmmSzuzHL0vMTY8BCGX0Y="
},
"md5.js": {
"version": "1.3.5",
......@@ -11672,8 +11672,8 @@
},
"watch-size": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/watch-size/-/watch-size-2.0.0.tgz",
"integrity": "sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ=="
"resolved": "https://registry.npm.taobao.org/watch-size/download/watch-size-2.0.0.tgz",
"integrity": "sha1-CW7ijQNlvX6gPZyL8fL1CnO+FHQ="
},
"watchpack": {
"version": "1.6.0",
......
datax-ui/src/views/system/dept/DeptDetail.vue
......@@ -9,7 +9,7 @@
</div>
<el-form ref="form" :model="form" label-width="80px" disabled>
<el-form-item label="上级部门" prop="parentId">
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" />
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" disabled/>
</el-form-item>
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" />
......
datax-ui/src/views/system/menu/MenuAdd.vue
......@@ -30,7 +30,7 @@
<el-form-item label="路由组件" prop="menuComponent" v-if="form.menuType !== '2'">
<el-input v-model="form.menuComponent" placeholder="请输入对应路由组件component" />
</el-form-item>
<el-form-item label="默认跳转地址" prop="menuRedirect" v-if="form.menuType === '0'">
<el-form-item label="跳转地址" prop="menuRedirect" v-if="form.menuType === '0'">
<el-input v-model="form.menuRedirect" placeholder="请输入对应路由默认跳转地址redirect" />
</el-form-item>
<el-form-item label="权限标识" prop="menuPerms" v-if="form.menuType === '2'">
......@@ -43,7 +43,7 @@
<el-input v-model="form.menuCode" placeholder="请输入资源编码" />
</el-form-item>
<el-form-item label="排序" prop="menuSort">
<el-input-number v-model="form.menuSort" controls-position="right" :min="0" />
<el-input-number v-model="form.menuSort" controls-position="right" :min="1" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
......
datax-ui/src/views/system/menu/MenuDetail.vue
......@@ -9,7 +9,7 @@
</div>
<el-form ref="form" :model="form" label-width="80px" disabled>
<el-form-item label="上级资源" prop="parentId">
<treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" />
<treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" disabled/>
</el-form-item>
<el-form-item label="资源名称" prop="menuName">
<el-input v-model="form.menuName" />
......@@ -29,7 +29,7 @@
<el-form-item label="路由组件" prop="menuComponent" v-if="form.menuType !== '2'">
<el-input v-model="form.menuComponent" />
</el-form-item>
<el-form-item label="默认跳转地址" prop="menuRedirect" v-if="form.menuType === '0'">
<el-form-item label="跳转地址" prop="menuRedirect" v-if="form.menuType === '0'">
<el-input v-model="form.menuRedirect" />
</el-form-item>
<el-form-item label="权限标识" prop="menuPerms" v-if="form.menuType === '2'">
......@@ -42,7 +42,7 @@
<el-input v-model="form.menuCode" />
</el-form-item>
<el-form-item label="排序" prop="menuSort">
<el-input-number v-model="form.menuSort" controls-position="right" :min="0" />
<el-input-number v-model="form.menuSort" controls-position="right" :min="1" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
......
datax-ui/src/views/system/menu/MenuEdit.vue
......@@ -30,7 +30,7 @@
<el-form-item label="路由组件" prop="menuComponent" v-if="form.menuType !== '2'">
<el-input v-model="form.menuComponent" placeholder="请输入对应路由组件component" />
</el-form-item>
<el-form-item label="默认跳转地址" prop="menuRedirect" v-if="form.menuType === '0'">
<el-form-item label="跳转地址" prop="menuRedirect" v-if="form.menuType === '0'">
<el-input v-model="form.menuRedirect" placeholder="请输入对应路由默认跳转地址redirect" />
</el-form-item>
<el-form-item label="权限标识" prop="menuPerms" v-if="form.menuType === '2'">
......@@ -43,7 +43,7 @@
<el-input v-model="form.menuCode" placeholder="请输入资源编码" />
</el-form-item>
<el-form-item label="排序" prop="menuSort">
<el-input-number v-model="form.menuSort" controls-position="right" :min="0" />
<el-input-number v-model="form.menuSort" controls-position="right" :min="1" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
......
datax-ui/src/views/system/user/UserAdd.vue
......@@ -16,7 +16,7 @@
<el-input v-model="form.nickname" placeholder="请输入用户昵称" />
</el-form-item>
<el-form-item label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" />
<el-input type="password" v-model="form.password" placeholder="请输入用户密码" />
</el-form-item>
<el-form-item label="电子邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入电子邮箱" />
......@@ -25,7 +25,11 @@
<el-input v-model="form.phone" placeholder="请输入手机号码" />
</el-form-item>
<el-form-item label="出生日期" prop="birthday">
<el-input v-model="form.birthday" placeholder="请输入出生日期" />
<el-date-picker
v-model="form.birthday"
type="date"
placeholder="请输入出生日期">
</el-date-picker>
</el-form-item>
<el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="请选择归属部门" />
......@@ -104,7 +108,7 @@ export default {
// 表单参数
form: {
status: '1',
deptId: '',
deptId: null,
roleList: [],
postList: []
},
......
datax-ui/src/views/system/user/UserDetail.vue
......@@ -14,9 +14,6 @@
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="form.nickname" placeholder="请输入用户昵称" />
</el-form-item>
<el-form-item label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" />
</el-form-item>
<el-form-item label="电子邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入电子邮箱" />
</el-form-item>
......@@ -24,10 +21,14 @@
<el-input v-model="form.phone" placeholder="请输入手机号码" />
</el-form-item>
<el-form-item label="出生日期" prop="birthday">
<el-input v-model="form.birthday" placeholder="请输入出生日期" />
<el-date-picker
v-model="form.birthday"
type="date"
placeholder="请输入出生日期">
</el-date-picker>
</el-form-item>
<el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="请选择归属部门" />
<treeselect v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" disabled placeholder="请选择归属部门" />
</el-form-item>
<el-form-item label="岗位">
<el-select v-model="form.roleList" multiple placeholder="请选择岗位">
......
datax-ui/src/views/system/user/UserEdit.vue
......@@ -15,9 +15,6 @@
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="form.nickname" placeholder="请输入用户昵称" />
</el-form-item>
<el-form-item label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" />
</el-form-item>
<el-form-item label="电子邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入电子邮箱" />
</el-form-item>
......@@ -25,13 +22,17 @@
<el-input v-model="form.phone" placeholder="请输入手机号码" />
</el-form-item>
<el-form-item label="出生日期" prop="birthday">
<el-input v-model="form.birthday" placeholder="请输入出生日期" />
<el-date-picker
v-model="form.birthday"
type="date"
placeholder="请输入出生日期">
</el-date-picker>
</el-form-item>
<el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="请选择归属部门" />
</el-form-item>
<el-form-item label="岗位">
<el-select v-model="form.roleList" multiple placeholder="请选择岗位">
<el-select v-model="form.roleList" filterable multiple placeholder="请选择岗位">
<el-option
v-for="item in postOptions"
:key="item.id"
......@@ -42,7 +43,7 @@
</el-select>
</el-form-item>
<el-form-item label="角色">
<el-select v-model="form.postList" multiple placeholder="请选择角色">
<el-select v-model="form.postList" filterable multiple placeholder="请选择角色">
<el-option
v-for="item in roleOptions"
:key="item.id"
......
datax-ui/src/views/system/user/UserList.vue
......@@ -197,7 +197,7 @@
</template>
<script>
import { listUser } from '@/api/system/user'
import { pageUser } from '@/api/system/user'
import { listDept } from '@/api/system/dept'
import { construct } from '@/utils/json-tree'
......@@ -289,7 +289,7 @@ export default {
/** 查询用户列表 */
getList () {
this.loading = true
listUser(this.queryParams).then(response => {
pageUser(this.queryParams).then(response => {
this.loading = false
if (response.success) {
const { data } = response
......
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