Skip to content

G
govdna
Commit 39ff16ef authored by 刘弈臻's avatar 刘弈臻
Browse files
Options

111

parent 17be2716
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 54 deletions
src/main/resources/application-dev.yml
View file @ 39ff16ef
......@@ -6,7 +6,7 @@ spring:
govmade: #数据源(多源)
url: jdbc:mysql://115.233.227.46:13308/govmade?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: root
password: gov567
password: gov@20130528
initial-size: 10
max-active: 100
min-idle: 10
......
src/main/resources/static/page/system/department/index.html
View file @ 39ff16ef
......@@ -2,8 +2,8 @@
<html lang="zh-CN">
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="../../../js/lib/element-ui/index.css">
<link rel="stylesheet" href="../../../css/common.css">
<link rel="stylesheet" href="../../../public/js/lib/element-ui/index.css">
<link rel="stylesheet" href="../../../public/css/common.css">
<title>机构管理</title>
</head>
<body>
......@@ -111,19 +111,13 @@
</k-dialog>
</div>
</div>
<script src="../../../js/lib/jquery.min.js"></script>
<script src="../../../js/lib/vue.min.js"></script>
<script src="../../../js/lib/element-ui/index.js"></script>
<script src="../../../js/util/index.js"></script>
<script src="../../../public/js/lib/jquery.min.js"></script>
<script src="../../../public/js/lib/vue.min.js"></script>
<script src="../../../public/js/lib/element-ui/index.js"></script>
<script src="../../../public/js/util/index.js"></script>
<script src="../../../component/common/index.js"></script>
<script src="../../../js/mixin/common.js"></script>
<script src="../../../js/page/system/department/departmentDialog.js"></script>
<!-- 数据处理 -->
<script src="../../../js/lib/mock.js"></script>
<script src="../../../mock/index.js"></script>
<script src="../../../mock/system/department.js"></script>
<script src="../../../mock/system/compartment.js"></script>
<!-- 数据处理 -->
<script src="../../../public/js/mixin/common.js"></script>
<script src="../../../public/js/page/system/department/departmentDialog.js"></script>
<script>
var app = new Vue({
el: '#app',
......@@ -229,10 +223,10 @@
console.log(data)
this.table.loading = true
api({
url: '/sys/department/list',
url: '/system/depart/list',
type: 'get',
successFuc: function (res) {
self.table.data = res.data
self.table.data = res.page.list
self.table.pagination.total = res.count
self.table.loading = false
}
......@@ -242,7 +236,7 @@
getType: function(data) {
var self = this;
api({
url: '/sys/department/list',
url: '/system/depart/list',
type: 'get',
successFuc: function (res) {
if (res.code === 0) {
......
src/main/resources/static/page/system/menu/index.html
View file @ 39ff16ef
......@@ -2,9 +2,9 @@
<html lang="zh-CN">
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="../../../js/lib/element-ui/index.css">
<link rel="stylesheet" href="../../../css/common.css">
<link rel="stylesheet" href="../../../css/common/system.css">
<link rel="stylesheet" href="../../../public/js/lib/element-ui/index.css">
<link rel="stylesheet" href="../../../public/css/common.css">
<link rel="stylesheet" href="../../../public/css/common/system.css">
<title></title>
</head>
<body>
......@@ -82,19 +82,14 @@
</k-dialog>
<!-- 新增修改详情弹窗结束 -->
</div>
<script src="../../../js/lib/jquery.min.js"></script>
<script src="../../../js/lib/vue.min.js"></script>
<script src="../../../js/lib/element-ui/index.js"></script>
<script src="../../../public/js/lib/jquery.min.js"></script>
<script src="../../../public/js/lib/vue.min.js"></script>
<script src="../../../public/js/lib/element-ui/index.js"></script>
<script src="../../../component/common/index.js"></script>
<script src="../../../js/mixin/common.js"></script>
<script src="../../../js/util/index.js"></script>
<script src="../../../js/icon.js"></script>
<script src="../../../js/page/system/menu/menuDialog.js"></script>
<!-- 数据处理 -->
<script src="../../../js/lib/mock.js"></script>
<script src="../../../mock/index.js"></script>
<script src="../../../mock/system/menu.js"></script>
<!-- 数据处理 -->
<script src="../../../public/js/mixin/common.js"></script>
<script src="../../../public/js/util/index.js"></script>
<script src="../../../public/js/icon.js"></script>
<script src="../../../public/js/page/system/menu/menuDialog.js"></script>
<script>
var app = new Vue({
el: '#app',
......@@ -174,12 +169,12 @@
console.log(data)
this.tableTree.loading = true
api({
url: '/sys/menu/list',
url: '/system/menu/listTree?currPage=1&pageSize=25',
type: 'get',
successFuc: function (res) {
var expand = self.tableTree.tree && $.type(self.tableTree.tree.expand) === 'boolean' ? self.tableTree.tree.expand : false
self.tableTree.data = treeDataTranslate(res.data, expand)
self.tableTree.pagination.total = res.count
self.tableTree.data = treeDataTranslate(res.page.list, expand)
self.tableTree.pagination.total = res.page.totalCount
self.tableTree.loading = false
}
})
......
src/main/resources/static/page/system/user/index.html
View file @ 39ff16ef
......@@ -3,8 +3,8 @@
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="../../../js/lib/element-ui/index.css">
<link rel="stylesheet" href="../../../css/common.css">
<link rel="stylesheet" href="../../../public/js/lib/element-ui/index.css">
<link rel="stylesheet" href="../../../public/css/common.css">
<title></title>
</head>
......@@ -47,18 +47,13 @@
</k-dialog>
<!-- 新增修改详情弹窗结束 -->
</div>
<script src="../../../js/lib/jquery.min.js"></script>
<script src="../../../js/lib/vue.min.js"></script>
<script src="../../../js/lib/element-ui/index.js"></script>
<script src="../../../public/js/lib/jquery.min.js"></script>
<script src="../../../public/js/lib/vue.min.js"></script>
<script src="../../../public/js/lib/element-ui/index.js"></script>
<script src="../../../component/common/index.js"></script>
<script src="../../../js/mixin/common.js"></script>
<script src="../../../js/util/index.js"></script>
<script src="../../../js/page/system/user/userDialog.js"></script>
<!-- 数据处理 -->
<script src="../../../js/lib/mock.js"></script>
<script src="../../../mock/index.js"></script>
<script src="../../../mock/system/user.js"></script>
<!-- 数据处理 -->
<script src="../../../public/js/mixin/common.js"></script>
<script src="../../../public/js/util/index.js"></script>
<script src="../../../public/js/page/system/user/userDialog.js"></script>
<script>
var app = new Vue({
el: '#app',
......@@ -148,11 +143,11 @@
var self = this
data = data || {}
api({
url: '/sys/user/list',
url: '/system/user/list',
type: 'get',
successFuc: function (res) {
self.table.data = res.data
self.table.pagination.total = res.count
self.table.data = res.page.list
self.table.pagination.total = res.page.totalCount
self.table.loading = false
}
})
......
src/main/resources/static/public/js/util/index.js
View file @ 39ff16ef
......@@ -40,7 +40,7 @@ var api = function (obj) {
},
// crossDomain: true,
type: 'get' || obj.type,
url: 'http://123.com' + obj.url,
url: 'http://localhost:18080/govdna' + obj.url,
dataType: 'json' || obj.dataType,
data: (obj.type == null || obj.type === 'get') ? obj.data : JSON.stringify(obj.data),
contentType: obj.contentType || '',
......@@ -67,7 +67,7 @@ var api = function (obj) {
// 公共参数
var CONFIG = {
BASE_URL: 'http://localhost:18080/govdna/', // api路劲
BASE_URL: 'http://localhost:18080/govdna', // api路劲
SUCCESS: 0, // ajax成功 code: 0
ERROR: 1, // ajax失败 code: 1
DETAIL: '详情',
......
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