diff --git a/.env.development b/.env.development index 04e8238..bfa0ade 100644 --- a/.env.development +++ b/.env.development @@ -3,16 +3,16 @@ ENV = 'development' # 接口地址 #内网服务地址 -VUE_APP_BASE_API = 'http://192.168.99.107:7077' -VUE_APP_WS_API = 'ws://192.168.99.107:7077' -VUE_APP_CAMERA_API = '192.168.99.107:3000' +# VUE_APP_BASE_API = 'http://192.168.99.107:7077' +# VUE_APP_WS_API = 'ws://192.168.99.107:7077' +# VUE_APP_CAMERA_API = '192.168.99.107:3000' # 许镇-本地服地址 -#VUE_APP_BASE_API = 'http://192.168.99.84:7070' -#VUE_APP_WS_API = 'ws://192.168.99.84:7070' -#VUE_APP_BASE_API = 'http://192.168.99.84:11100' -#VUE_APP_WS_API = 'ws://192.168.99.84:11100' +# VUE_APP_BASE_API = 'http://192.168.99.84:7070' +# VUE_APP_WS_API = 'ws://192.168.99.84:7070' +VUE_APP_BASE_API = 'http://192.168.99.67:11100' +VUE_APP_WS_API = 'ws://192.168.99.67:11100' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/system/dept.js b/src/api/system/dept.js index f2e04db..2c0bb28 100644 --- a/src/api/system/dept.js +++ b/src/api/system/dept.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function getDepts(params) { return request({ - url: 'api/dept', + url: 'api/depts/initDeptsList', method: 'get', params }) @@ -27,7 +27,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/dept', + url: 'api/depts/editDepts', method: 'delete', data: ids }) @@ -35,7 +35,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/dept', + url: 'api/depts/editDepts', method: 'put', data }) diff --git a/src/api/system/fonds.js b/src/api/system/fonds.js new file mode 100644 index 0000000..659c6d1 --- /dev/null +++ b/src/api/system/fonds.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +export function FetchInitFondsList(params) { + return request({ + url: 'api/fonds/initFondsList', + method: 'get', + params + }) +} + +export function add(data) { + return request({ + url: 'api/fonds/editFonds', + method: 'post', + data + }) +} + +export function edit(data) { + return request({ + url: 'api/fonds/editFonds', + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: 'api/fonds/delFonds', + method: 'post', + data + }) +} + +export function FetchUpdateFondsStatus(data) { + return request({ + url: '/api/fonds/updateFondsStatus', + method: 'post', + data + }) +} + +export function FetchDownload(params) { + return request({ + url: '/api/fonds/download', + method: 'get', + params + }) +} + +export default { add, edit, del, FetchInitFondsList, FetchUpdateFondsStatus, FetchDownload } diff --git a/src/api/system/role.js b/src/api/system/role.js index 732675f..bde2228 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -3,44 +3,38 @@ import request from '@/utils/request' // 获取所有的Role export function getAll() { return request({ - url: 'api/roles/all', + url: 'api/role/initRoleList', method: 'get' }) } export function add(data) { return request({ - url: 'api/roles', + url: 'api/role/editRole', method: 'post', data }) } -export function get(id) { - return request({ - url: 'api/roles/' + id, - method: 'get' - }) -} - -export function getLevel() { +export function edit(data) { return request({ - url: 'api/roles/level', - method: 'get' + url: 'api/role/editRole', + method: 'post', + data }) } export function del(ids) { return request({ - url: 'api/roles', - method: 'delete', + url: 'api/role/delRole', + method: 'post', data: ids }) } -export function edit(data) { +export function editFonds(data) { return request({ - url: 'api/roles', + url: 'api/role/fonds', method: 'put', data }) @@ -48,10 +42,26 @@ export function edit(data) { export function editMenu(data) { return request({ - url: 'api/roles/menu', + url: 'api/role/menu', method: 'put', data }) } -export default { add, edit, del, get, editMenu, getLevel } +export function get(id) { + return request({ + url: 'api/role/' + id, + method: 'get' + }) +} + +// ---------------------------------------- + +export function getLevel() { + return request({ + url: 'api/roles/level', + method: 'get' + }) +} + +export default { add, edit, del, get, editMenu, editFonds } diff --git a/src/api/system/user.js b/src/api/system/user.js index af9f93f..a7afb62 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -4,7 +4,7 @@ import { getToken } from '@/utils/auth' export function add(data) { return request({ - url: 'api/users', + url: 'api/users/editUser', method: 'post', data }) @@ -12,16 +12,16 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/users', - method: 'delete', + url: 'api/users/delUsers', + method: 'post', data: ids }) } export function edit(data) { return request({ - url: 'api/users', - method: 'put', + url: 'api//users/editUser', + method: 'post', data }) } diff --git a/src/views/prearchiveLibrary/module/form.vue b/src/views/prearchiveLibrary/module/form.vue index 381ead6..057220a 100644 --- a/src/views/prearchiveLibrary/module/form.vue +++ b/src/views/prearchiveLibrary/module/form.vue @@ -29,6 +29,7 @@ export default { methods: { handleClose(done) { done() + this.formVisible = false }, save() { // this.loading = true @@ -69,11 +70,5 @@ export default { } - diff --git a/src/views/prearchiveLibrary/module/mergeFile.vue b/src/views/prearchiveLibrary/module/mergeFile.vue new file mode 100644 index 0000000..cd4dac7 --- /dev/null +++ b/src/views/prearchiveLibrary/module/mergeFile.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/views/system/groupManage/index.vue b/src/views/system/groupManage/index.vue index d9aae2a..b49d029 100644 --- a/src/views/system/groupManage/index.vue +++ b/src/views/system/groupManage/index.vue @@ -8,10 +8,27 @@
- + + + + +
- + + + +
@@ -23,47 +40,49 @@
- - + + - - + + - - + + - + - - - + + + 启用 + 停用 + - - + +
取消 - 确认 + 确定
- - - - - - + + + + + + @@ -112,7 +131,7 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 1be534d..9c7728c 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -19,8 +19,8 @@
- - + + @@ -114,19 +114,15 @@ - + - - - + @@ -173,7 +169,7 @@ export default { name: 'User', components: { Treeselect, crudOperation, rrOperation, pagination, DateRangePicker }, cruds() { - return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }}) + return CRUD({ title: '用户', url: 'api/users/initUserList', sort: 'update_time,asc', crudMethod: { ...crudUser }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 数据字典 @@ -201,6 +197,7 @@ export default { headers: { Authorization: getToken() }, + blurryTime: null, btnLoading: false, resetVisible: false, // delVisible: false, @@ -215,8 +212,8 @@ export default { del: ['admin', 'user:del'] }, enabledTypeOptions: [ - { key: 'true', display_name: '激活' }, - { key: 'false', display_name: '锁定' } + { key: '1', display_name: '激活' }, + { key: '0', display_name: '锁定' } ], rules: { username: [ @@ -263,8 +260,15 @@ export default { window.onresize = function temp() { that.height = document.documentElement.clientHeight - 180 + 'px;' } + console.log(this.user) }, methods: { + [CRUD.HOOK.beforeRefresh]() { + if (this.blurryTime) { + this.crud.query.startTime = this.blurryTime[0] + this.crud.query.endTime = this.blurryTime[1] + } + }, clickRowHandler(row) { // this.$refs.table.toggleRowSelection(row) // 单击选中 }, @@ -379,7 +383,7 @@ export default { }, // 获取左侧部门数据 getDeptDatas(node, resolve) { - const sort = 'id,desc' + const sort = 'update_time,desc' const params = { sort: sort } if (typeof node !== 'object') { if (node) { @@ -487,20 +491,8 @@ export default { }).catch(() => { }) }, checkboxT(row, rowIndex) { - return row.id !== this.user.id + return row.userId !== this.user.id } - // handleClose() { - // this.delVisible = false - // }, - // toDelete(data) { - // this.deleteData = data - // this.delVisible = true - // }, - // handleDelConfirm() { - // this.delVisible = false - // this.crud.delAllLoading = true - // this.crud.doDelete(this.deleteData) - // } } }