Commit 27de1d55 authored by 冷冷's avatar 冷冷

Merge branch 'master' of https://gitee.wang/pigx/pigx-ui

parents ba37ca46 51147d6c
This diff is collapsed.
{
"name": "avue-cli",
"version": "2.0.0",
"name": "pigx-ui",
"version": "1.8.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
......@@ -60,4 +60,4 @@
"git add"
]
}
}
\ No newline at end of file
}
......@@ -13,12 +13,12 @@
<link rel="stylesheet" href="<%= BASE_URL %>cdn/animate/3.5.2/animate.css">
<link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/1.0.0/index.css">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>Avue 通用管理 系统快速开发框架</title>
<title>PigX微服务快速开发框架</title>
</head>
<body>
<noscript>
<strong>We're sorry but avue2.0 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
<strong>很抱歉,如果没有 JavaScript 支持,网站将不能正常工作。请启用浏览器的 JavaScript 然后继续。</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
......@@ -34,4 +34,4 @@
<script src="<%= BASE_URL %>cdn/element-ui/2.4.6/index.js" charset="utf-8"></script>
</body>
</html>
\ No newline at end of file
</html>
export default {
title: "PigX",
logo: "P",
indexTitle: 'avue-cli By smallwei',
logo: "PigX",
indexTitle: 'PigX Pro 快速开发框架',
whiteList: ["/login", "/404", "/401", "/lock"], //配置无权限可以访问的页面
whiteTagList: ["/login", "/404", "/401", "/lock", ], //配置不添加tags页面 ('/advanced-router/mutative-detail/*'——*为通配符)
lockPage: '/lock',
......@@ -25,4 +25,4 @@ export default {
children: 'children'
}
}
}
\ No newline at end of file
}
This diff is collapsed.
......@@ -79,8 +79,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -86,8 +86,8 @@
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -89,8 +89,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -101,8 +101,8 @@
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})},
......
......@@ -79,8 +79,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -103,7 +103,7 @@
import { fetchTree, getObj, addObj, delObj, putObj } from '@/api/dept'
import { mapGetters } from 'vuex'
export default {
name: 'menu',
name: 'dept',
data () {
return {
list: null,
......@@ -146,15 +146,6 @@ export default {
deptManager_btn_del: false
}
},
filters: {
typeFilter (type) {
const typeMap = {
0: '菜单',
1: '按钮'
}
return typeMap[type]
}
},
created () {
this.getList()
this.deptManager_btn_add = this.permissions['sys_dept_add']
......@@ -170,7 +161,7 @@ export default {
methods: {
getList () {
fetchTree(this.listQuery).then(response => {
this.treeData = response.data
this.treeData = response.data.data
})
},
filterNode (value, data) {
......@@ -182,7 +173,7 @@ export default {
this.formStatus = 'update'
}
getObj(data.id).then(response => {
this.form = response.data
this.form = response.data.data
})
this.currentId = data.id
this.showElement = true
......@@ -252,16 +243,7 @@ export default {
},
resetForm () {
this.form = {
permission: undefined,
name: undefined,
menuId: undefined,
parentId: this.currentId,
url: undefined,
icon: undefined,
sort: undefined,
component: undefined,
type: undefined,
method: undefined
}
}
}
......
......@@ -79,8 +79,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -87,8 +87,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -74,8 +74,8 @@
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -209,7 +209,7 @@ export default {
methods: {
getList () {
fetchTree(this.listQuery).then(response => {
this.treeData = response.data
this.treeData = response.data.data
})
},
filterNode (value, data) {
......@@ -257,7 +257,7 @@ export default {
this.formStatus = 'update'
}
getObj(data.id).then(response => {
this.form = response.data
this.form = response.data.data
})
this.currentId = data.id
this.showElement = true
......
......@@ -142,8 +142,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.list = response.data.records
this.page.total = response.data.total
this.list = response.data.data.records
this.page.total = response.data.data.total
this.listLoading = false
})
},
......@@ -170,7 +170,7 @@ export default {
return fetchTree()
})
.then(response => {
this.treeData = response.data
this.form = response.data.data
// 解析出所有的太监节点
this.checkedKeys = this.resolveAllEunuchNodeId(this.treeData, this.checkedKeys, [])
this.dialogStatus = 'permission'
......@@ -251,7 +251,7 @@ export default {
this.dialogPermissionVisible = false
fetchTree()
.then(response => {
this.treeData = response.data
this.form = response.data.data
return fetchRoleTree(roleId)
})
.then(response => {
......
......@@ -87,8 +87,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -71,8 +71,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
......@@ -157,19 +157,19 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.list = response.data.records;
this.page.total = response.data.total
this.list = response.data.data.records;
this.page.total = response.data.data.total
this.listLoading = false;
});
},
getNodeData (data) {
deptRoleList().then(response => {
this.rolesOptions = response.data;
this.rolesOptions = response.data.data;
});
},
handleDept () {
fetchDeptTree().then(response => {
this.treeDeptData = response.data;
this.treeDeptData = response.data.data;
});
},
handleFilter (param) {
......
......@@ -74,8 +74,8 @@ export default {
page: page.currentPage,
limit: page.pageSize
}, params)).then(response => {
this.tableData = response.data.records
this.page.total = response.data.total
this.tableData = response.data.data.records
this.page.total = response.data.data.total
this.tableLoading = false
})
},
......
This diff is collapsed.
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