From 1a747332e60ca2e7b8f69a16172b66cabf6c9625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com> Date: Tue, 11 Aug 2020 13:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B0=E5=AF=8C=E6=BC=94=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/data/organization.json | 66 ++++++++++++++------------------ admin/data/organizationtree.json | 14 +++---- index.html | 2 +- view/system/deptment.html | 9 ++++- 4 files changed, 43 insertions(+), 48 deletions(-) diff --git a/admin/data/organization.json b/admin/data/organization.json index be9acd0..dc40dbe 100644 --- a/admin/data/organization.json +++ b/admin/data/organization.json @@ -1,51 +1,41 @@ { - "createTime": null, - "createBy": null, - "updateTime": null, - "updateBy": null, - "remark": null, "code": 0, "msg": "...", "count": 3, "data": [{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" + "name": "软件部", + "userCount": 324, + "location": "二楼201", + "leader": "皮卡丘" },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" + "name": "美工部", + "userCount": 98, + "location": "二楼101", + "leader": "皮卡丘" },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" + "name": "设计部", + "userCount": 43, + "location": "六楼602", + "leader": "皮卡丘" },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" + "name": "销售部", + "userCount": 12, + "location": "一楼131", + "leader": "皮卡丘" },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" + "name": "产品部", + "userCount": 128, + "location": "四楼401", + "leader": "皮卡丘" },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" + "name": "财务部", + "userCount": 23, + "location": "三楼105", + "leader": "皮卡丘" },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" - },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" - },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" - },{ - "name": "就眠仪式", - "userCount": 1, - "location": "二楼101" + "name": "人事部", + "userCount": 67, + "location": "二楼201", + "leader": "皮卡丘" }] } diff --git a/admin/data/organizationtree.json b/admin/data/organizationtree.json index 259b9f7..262594f 100644 --- a/admin/data/organizationtree.json +++ b/admin/data/organizationtree.json @@ -5,41 +5,41 @@ }, "data": [{ "id": "0", - "title": "部门目录", + "title": "济南总部", "last": false, "parentId": "9527", "children": [{ "id": "001", - "title": "湖南省", + "title": "杭州市", "last": false, "parentId": "0", "children": [{ "id": "001001", - "title": "长沙市", + "title": "软件部", "last": true, "parentId": "001" }, { "id": "001002", - "title": "株洲市", + "title": "销售部", "last": true, "parentId": "001" }, { "id": "001003", - "title": "湘潭市", + "title": "财务部", "last": true, "parentId": "001" }, { "id": "001004", - "title": "衡阳市", + "title": "人事部", "last": true, "parentId": "001" }, { "id": "001005", - "title": "郴州市", + "title": "行政部", "last": true, "parentId": "001" } diff --git a/index.html b/index.html index f657c01..eaa46c2 100644 --- a/index.html +++ b/index.html @@ -75,4 +75,4 @@ }) - + \ No newline at end of file diff --git a/view/system/deptment.html b/view/system/deptment.html index 563280f..303cc6b 100644 --- a/view/system/deptment.html +++ b/view/system/deptment.html @@ -12,8 +12,8 @@ height: -webkit-calc(100vh - 130px); height: -moz-calc(100vh - 130px); height: calc(100vh - 130px); - } - + } +
@@ -117,6 +117,11 @@ field: 'location', align: 'center' }, + { + title: '负责人', + field: 'leader', + align: 'center' + }, { title: '操作', toolbar: '#organization-bar',