Skip to content

Commit e78f77f

Browse files
committed
新增组织结构树页面
1 parent 5e345e0 commit e78f77f

File tree

16 files changed

+498
-5
lines changed

16 files changed

+498
-5
lines changed

.eslintrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ module.exports = {
99
'generator-star-spacing': 'off',
1010
// allow debugger during development
1111
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12-
'vue/no-parsing-error': [2, { 'x-invalid-end-tag': false }],
12+
'vue/no-parsing-error': [2, {
13+
'x-invalid-end-tag': false
14+
}],
1315
'no-undef': 'off',
1416
'camelcase': 'off'
1517
},

package-lock.json

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"simplemde": "^1.11.2",
2626
"sortablejs": "^1.7.0",
2727
"tree-table-vue": "^1.1.0",
28+
"v-org-tree": "^1.0.6",
2829
"vue": "^2.5.10",
2930
"vue-i18n": "^7.8.0",
3031
"vue-router": "^3.0.1",

src/api/data.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,10 @@ export const uploadImg = formData => {
3535
data: formData
3636
})
3737
}
38+
39+
export const getOrgData = () => {
40+
return axios.request({
41+
url: 'get_org_data',
42+
method: 'get'
43+
})
44+
}

src/locale/lang/en-US.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ export default {
3838
params: 'Params',
3939
cropper_page: 'Cropper',
4040
message_page: 'Message Center',
41-
tree_table_page: 'Tree Table'
41+
tree_table_page: 'Tree Table',
42+
org_tree_page: 'Org Tree'
4243
}

src/locale/lang/zh-CN.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ export default {
3838
params: '动态路由',
3939
cropper_page: '图片裁剪',
4040
message_page: '消息中心',
41-
tree_table_page: '树状表格'
41+
tree_table_page: '树状表格',
42+
org_tree_page: '组织结构树'
4243
}

src/locale/lang/zh-TW.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ export default {
3838
params: '動態路由',
3939
cropper_page: '圖片裁剪',
4040
message_page: '消息中心',
41-
tree_table_page: '樹狀表格'
41+
tree_table_page: '樹狀表格',
42+
org_tree_page: '組織結構樹'
4243
}

src/main.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ import iView from 'iview'
88
import i18n from '@/locale'
99
import config from '@/config'
1010
import importDirective from '@/directive'
11+
import { directive as clickOutside } from 'v-click-outside-x'
1112
import installPlugin from '@/plugin'
1213
import './index.less'
1314
import '@/assets/icons/iconfont.css'
1415
import TreeTable from 'tree-table-vue'
16+
import VOrgTree from 'v-org-tree'
17+
import 'v-org-tree/dist/v-org-tree.css'
1518
// 实际打包时应该不引入mock
1619
/* eslint-disable */
1720
if (process.env.NODE_ENV !== 'production') require('@/mock')
@@ -20,6 +23,7 @@ Vue.use(iView, {
2023
i18n: (key, value) => i18n.t(key, value)
2124
})
2225
Vue.use(TreeTable)
26+
Vue.use(VOrgTree)
2327
/**
2428
* @description 注册admin内置插件
2529
*/
@@ -36,6 +40,7 @@ Vue.prototype.$config = config
3640
* 注册指令
3741
*/
3842
importDirective(Vue)
43+
Vue.directive('clickOutside', clickOutside)
3944

4045
/* eslint-disable no-new */
4146
new Vue({

src/mock/data.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Mock from 'mockjs'
22
import { doCustomTimes } from '@/libs/util'
3+
import orgData from './data/org-data'
34
const Random = Mock.Random
45

56
export const getTableData = req => {
@@ -28,3 +29,7 @@ export const getDragList = req => {
2829
export const uploadImage = req => {
2930
return Promise.resolve()
3031
}
32+
33+
export const getOrgData = req => {
34+
return orgData
35+
}

src/mock/data/org-data.js

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
export default {
2+
id: 0,
3+
label: 'XXX科技有限公司',
4+
children: [
5+
{
6+
id: 2,
7+
label: '产品研发部',
8+
children: [
9+
{
10+
id: 5,
11+
label: '研发-前端'
12+
}, {
13+
id: 6,
14+
label: '研发-后端'
15+
}, {
16+
id: 9,
17+
label: 'UI设计'
18+
}, {
19+
id: 10,
20+
label: '产品经理'
21+
}
22+
]
23+
},
24+
{
25+
id: 3,
26+
label: '销售部',
27+
children: [
28+
{
29+
id: 7,
30+
label: '销售一部'
31+
}, {
32+
id: 8,
33+
label: '销售二部'
34+
}
35+
]
36+
},
37+
{
38+
id: 4,
39+
label: '财务部'
40+
}, {
41+
id: 11,
42+
label: 'HR人事'
43+
}
44+
]
45+
}

0 commit comments

Comments
 (0)