diff --git a/attendance-performance-manager-ui/admin/src/assets/mixins/tree.js b/attendance-performance-manager-ui/admin/src/assets/mixins/tree.js
index 45b0440861d8252984485a808f4ed97d0c6971ae..660553798d55c1e48276fc3eef299463829d29dc 100644
--- a/attendance-performance-manager-ui/admin/src/assets/mixins/tree.js
+++ b/attendance-performance-manager-ui/admin/src/assets/mixins/tree.js
@@ -9,7 +9,7 @@ export default {
clearTimeout(this.loadingTimer);
},
methods: {
- beforeFecth() {
+ beforeFecth() {
return Promise.resolve();
},
// 琛ㄦ牸鎺ユ敹鏁版嵁鍓�
@@ -18,12 +18,12 @@ export default {
afterRender(data){},
// 榛樿鎷夊彇鏁版嵁
async getTreeData() {
-
+
},
-
+
handleNodeClick(node) {
-
+
},
renderContent: function (h, { node, data, store }) {
return (
@@ -54,16 +54,14 @@ export default {
node.expand(); // 涓诲姩璋冪敤灞曞紑鑺傜偣鏂规硶锛岄噸鏂版煡璇㈣鑺傜偣涓嬬殑鎵€鏈夊瓙鑺傜偣
this.toView(this.currentNode);
},
-
+
},
data() {
- return {
+ return {
treeProps: {
id: "id",
label: "label",
- areaCode:"areaCode",
- type: "type",
isLeaf: "isLeaf",
children: "children",
icon: "icon",
diff --git a/attendance-performance-manager-ui/admin/src/views/staff/list.vue b/attendance-performance-manager-ui/admin/src/views/staff/list.vue
index cde68f1fd61875b0bcdbc8f16d3d6107c47857fe..548c6522ec8438ff3de16414312901c225e6e214 100644
--- a/attendance-performance-manager-ui/admin/src/views/staff/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/staff/list.vue
@@ -1,8 +1,40 @@
<template>
<div class="page">
- <LayoutTable :data="tableData" :config="tableConfig">
- </LayoutTable>
+ <el-row :gutter="20">
+ <el-col :span="6" :xs="12" class="mytree">
+ <el-card>
+ <el-scrollbar style="height: 100%">
+ <el-tree
+ size="mini"
+ ref="siteTree"
+ :data="areaData"
+ id="el-tree"
+ node-key="id"
+ indent="4"
+ :props="treeProps"
+ :load="loadNode"
+ highlight-current
+ default-expand-all
+ :expand-on-click-node="false"
+ :render-content="renderContent"
+ @node-click="handleNodeClick"
+ >
+ </el-tree>
+ </el-scrollbar>
+ </el-card>
+ </el-col>
+
+ <el-col :span="18" :xs="12">
+ <el-card>
+ <el-row>
+ <LayoutTable notAdd
+ notDel :data="tableData" :config="tableConfig">
+ </LayoutTable>
+ </el-row>
+ </el-card>
+ </el-col>
+ </el-row>
<drawer-show ref="drawerform" @ok="getData" />
</div>
@@ -12,14 +44,18 @@
/** 琛ㄥ崟寮瑰嚭妗嗘ā寮忛渶寮曞叆 */
import drawerShow from "./drawershow";
import table from "@/assets/mixins/table";
+ import tree from "@/assets/mixins/tree";
export default {
name: "StaffList",
components: {
- drawerShow
+ drawerShow
},
- mixins: [table],
- created() {
- },
+ mixins: [table,tree],
+ created() {
+ this.$get("/dept/treeselect", {}).then(({ data }) => {
+ this.areaData = data.result;
+ });
+ },
methods: {
/** 閲嶅啓鏂板鏂规硶 */
toAdd(row) {
@@ -34,6 +70,12 @@
this.$refs.drawerform.view(row);
},
+ handleNodeClick(node) {
+ this.currentNode = node;
+ this.query = { deptId: node.id };
+ this.getData();
+ },
+
},
data() {
return {
@@ -99,4 +141,100 @@
};
}
};
-</script>
\ No newline at end of file
+</script>
+
+
+<style>
+.el-card__body {
+ padding: 10px;
+}
+.el-calendar-table .el-calendar-day {
+ height: 70px;
+}
+.is-selected {
+ color: #fa3b19;
+}
+</style>
+
+<style lang="scss" scoped>
+.cardTitle {
+ font-size: 16px;
+ color: rgb(20, 134, 248);
+ list-style-type: none;
+ border-bottom: 3px solid rgb(20, 134, 248);
+ padding-bottom: 2px;
+}
+.mytree ::v-deep {
+ .el-tree--highlight-current
+ ::v-deep
+ .el-tree-node.is-checked
+ > .el-tree-node__content {
+ background-color: rgb(255, 255, 255);
+ color: rgb(64, 158, 255);
+ }
+ .el-tree--highlight-current
+ ::v-deep
+ .el-tree-node.is-current
+ > .el-tree-node__content {
+ background-color: rgb(255, 255, 255);
+ color: rgb(64, 158, 255);
+ }
+ .el-tree > .el-tree-node:after {
+ border-top: none;
+ }
+ .el-tree-node {
+ position: relative;
+ padding-left: 16px;
+ }
+ //鑺傜偣鏈夐棿闅欙紝闅愯棌鎺夊睍寮€鎸夐挳灏卞ソ浜�,濡傛灉瑙夊緱绌洪殭娌′簨鍙互鍒犳帀
+ .el-tree-node__expand-icon.is-leaf {
+ display: none;
+ }
+ .el-tree-node__children {
+ padding-left: 16px;
+ }
+
+ .el-tree-node :last-child:before {
+ height: 38px;
+ }
+
+ .el-tree > .el-tree-node:before {
+ border-left: none;
+ }
+
+ .el-tree > .el-tree-node:after {
+ border-top: none;
+ }
+
+ .el-tree-node:before {
+ content: "";
+ left: -4px;
+ position: absolute;
+ right: auto;
+ border-width: 1px;
+ }
+
+ .el-tree-node:after {
+ content: "";
+ left: -4px;
+ position: absolute;
+ right: auto;
+ border-width: 1px;
+ }
+
+ .el-tree-node:before {
+ border-left: 1px dashed #4386c6;
+ bottom: 0px;
+ height: 100%;
+ top: -26px;
+ width: 1px;
+ }
+
+ .el-tree-node:after {
+ border-top: 1px dashed #4386c6;
+ height: 20px;
+ top: 12px;
+ width: 24px;
+ }
+}
+</style>
diff --git "a/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" "b/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx"
index 9945599f2b6d44e6c6c2963263f84df768051eb8..7aba01bf422b847e62db155a2f28d2c6c4fbc210 100644
Binary files "a/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" and "b/doc/\350\200\203\345\213\244\347\273\251\346\225\210\347\256\241\347\220\206\347\263\273\347\273\237.docx" differ