From e8a1a8553943992a4113122db9dd2023c63ad037 Mon Sep 17 00:00:00 2001 From: liuwk <1834183435@qq.com> Date: Mon, 13 May 2019 19:26:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/orgManage.js | 57 +++ src/config.js | 5 +- src/router/modules/orgManage.js | 24 ++ src/store/modules/device/group/add.js | 10 +- src/store/modules/device/group/list.js | 1 - src/store/modules/device/list.js | 4 +- src/views/device/group/index.vue | 3 +- src/views/device/list/edit/index.vue | 2 +- src/views/device/list/index.vue | 27 +- src/views/errorPage/404.vue | 7 +- src/views/location/addDevice2localtion.vue | 1 - src/views/login/index.vue | 8 +- src/views/orgManage/orgManage/index.vue | 399 ++++++++++++++++++ .../privilegeManagement/account/form.vue | 49 +++ .../privilegeManagement/account/index.vue | 8 +- .../shelfs/list/putawayShelf/deviceform.vue | 1 - 16 files changed, 572 insertions(+), 34 deletions(-) create mode 100644 src/api/orgManage.js create mode 100644 src/router/modules/orgManage.js create mode 100644 src/views/orgManage/orgManage/index.vue create mode 100644 src/views/privilegeManagement/account/form.vue diff --git a/src/api/orgManage.js b/src/api/orgManage.js new file mode 100644 index 0000000..99f5e95 --- /dev/null +++ b/src/api/orgManage.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + + +/** + * 组织管理 -- 组织列表 + * @param params + * @returns {Q.Promise} + * @constructor + */ +export function GET_clients(params) { + return request({ + url: "/api/admin/clients", + method: 'get', + params + }).then(res => res.data.data) +} + +/** + * 组织管理 -- 新建组织 + * @param params + * @returns {Q.Promise} + * @constructor + */ +export function POST_clients(params) { + return request({ + url: "/api/admin/clients", + method: 'post', + data: params + }).then(res => res.data.data) +} + +/** + * 组织管理 -- 新建组织 + * @param params + * @returns {Q.Promise} + * @constructor + */ +export function PUT_clients(params) { + return request({ + url: "/api/admin/clients", + method: 'put', + data: params + }).then(res => res.data.data) +} + +/** + * 组织管理 -- 组织详情 + * @param params + * @returns {Q.Promise} + * @constructor + */ +export function DETAIL_clients(params) { + return request({ + url: "/api/admin/clients/detail?id=" + params, + method: 'get' + }).then(res => res.data.data) +} diff --git a/src/config.js b/src/config.js index 13dca24..b39d1c9 100644 --- a/src/config.js +++ b/src/config.js @@ -1,7 +1,8 @@ - export const BASE_API = "https://rapapi.renqilai.com/app/mock/39"; +// export const BASE_API = "https://rapapi.renqilai.com/app/mock/39"; export const client_id = 'test' export const client_secret = "test" -// export const BASE_API = "http://192.168.0.222:8080" +export const BASE_API = "http://192.168.0.222:8080" +// export const BASE_API = "https://quxiaapi.renqilai.com" export const pageSize = 20 diff --git a/src/router/modules/orgManage.js b/src/router/modules/orgManage.js new file mode 100644 index 0000000..85b5c1a --- /dev/null +++ b/src/router/modules/orgManage.js @@ -0,0 +1,24 @@ +import Layout from '@/views/layout/Layout' + +const order = { + path: '/orgManage', + component: Layout, + meta: {title: '组织管理', icon: 'dingdan', noCache: true, affix: false}, + children: [ + { + path: '/orgManage/index', + component: () => import('@/views/orgManage/orgManage/index'), + name: '组织管理', + meta: {title: '组织管理', noCache: false, affix: false} + }, + // { + // path: '/order/luckyFree', + // component: () => import('@/views/order/luckyFree/index'), + // name: '幸运免单', + // meta: {title: '幸运免单', noCache: false, affix: false}, + // + // } + ] +}; + +export default order diff --git a/src/store/modules/device/group/add.js b/src/store/modules/device/group/add.js index b0b26bd..6d5f57f 100644 --- a/src/store/modules/device/group/add.js +++ b/src/store/modules/device/group/add.js @@ -1,4 +1,4 @@ -import {ADD_DEVICE_GROUPS} from '@/api/devices'; +import { ADD_DEVICE_GROUPS } from '@/api/devices'; const Store = { @@ -6,11 +6,11 @@ const Store = { state: {}, mutations: {}, actions: { - addDeviceGroup: async ({commit, state}, {name}) => { - var result = await ADD_DEVICE_GROUPS({name}).catch(e => { - return {success: false, message: e} + addDeviceGroup: async ({ commit, state }, { name }) => { + var result = await ADD_DEVICE_GROUPS({ name }).catch(e => { + return { success: false, message: e } }) - return {success: true, message: result} + return { success: true, message: result } } }, } diff --git a/src/store/modules/device/group/list.js b/src/store/modules/device/group/list.js index a8a92e3..43bbe71 100644 --- a/src/store/modules/device/group/list.js +++ b/src/store/modules/device/group/list.js @@ -102,7 +102,6 @@ const Store = { return { success: false, message: e } }) //更新 list - debugger var _params = { ...state.params, ...state.page } dispatch("getDeviceGroups", _params) commit('RESET_ADD_MODAL_PARAMS') diff --git a/src/store/modules/device/list.js b/src/store/modules/device/list.js index d4df8e6..838a5e4 100644 --- a/src/store/modules/device/list.js +++ b/src/store/modules/device/list.js @@ -99,9 +99,7 @@ const store = { dispatch("getDeviceList", params) }, addDeivce: async ({ commit, state, dispatch }, params) => { - var data = await ADD_DEVICE(state.addParams).catch(e => { - return { success: false, message: e } - }) + var data = await ADD_DEVICE(state.addParams) //更新 list var _params = { ...state.params, ...state.page } dispatch("getDeviceList", _params) diff --git a/src/views/device/group/index.vue b/src/views/device/group/index.vue index b2ca11e..a0d4056 100644 --- a/src/views/device/group/index.vue +++ b/src/views/device/group/index.vue @@ -223,9 +223,11 @@ export default { sureAddModal() { var self = this; var $addmodal = this.$refs["addmodalContainer"].$refs["form"]; + $addmodal.validate(valid => { if (valid) { self.$data.addModal = false; + self.addDeviceGroup({ ...$addmodal.model }).then(res => { if (res.success) { myalert.success.call(self, "保存成功"); @@ -262,7 +264,6 @@ export default { }, go2addDevice(row) { var self = this; - var params = { // groupId: row.id, // group: row, diff --git a/src/views/device/list/edit/index.vue b/src/views/device/list/edit/index.vue index f863430..d84b061 100644 --- a/src/views/device/list/edit/index.vue +++ b/src/views/device/list/edit/index.vue @@ -10,7 +10,7 @@ >
- + @@ -143,14 +143,23 @@ export default { var $addmodal = this.$refs["addmodalContainer"].$refs["form"]; $addmodal.validate(valid => { if (valid) { - self.$data.addModal = false; - self.addDeivce().then(res => { - if (res.success) { - myalert.success.call(this, "保存成功"); - } else { - myalert.fail.call(this, res.message); - } - }); + self + .addDeivce() + .then(res => { + if (res.success) { + self.$data.addModal = false; + myalert.success("保存成功"); + } else { + self.$data.addModal = true; + // res.message.message + myalert.fail("设备id冲突，请填写其它id"); + } + }) + .catch(e => { + self.$data.addModal = true; + // res.message.message + myalert.fail("设备id冲突，请填写其它id"); + }); } else { self.$data.addModal = true; } diff --git a/src/views/errorPage/404.vue b/src/views/errorPage/404.vue index 94a2b07..13e5a9c 100644 --- a/src/views/errorPage/404.vue +++ b/src/views/errorPage/404.vue @@ -8,10 +8,9 @@ 404
-
OOPS!
+
- 版权所有 - 华尔街见闻 +
{{ message }}
请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
@@ -27,7 +26,7 @@ export default { name: 'Page404', computed: { message() { - return '网管说这个页面你不能进......' + return '莫名的高兴下，404都被你进来咯 (￣ε(#￣)☆╰╮(￣▽￣///)......' } } } diff --git a/src/views/location/addDevice2localtion.vue b/src/views/location/addDevice2localtion.vue index c97a7df..61984e4 100644 --- a/src/views/location/addDevice2localtion.vue +++ b/src/views/location/addDevice2localtion.vue @@ -129,7 +129,6 @@ export default { this.lists.map(item => { this.selectArray.map(item2 => { if (item2.id == item.id) { - debugger; item.checked = true; } }); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 0eeebe8..bfcdecc 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -78,8 +78,8 @@ export default { }; return { loginForm: { - username: "test", - password: "123456" + username: "", + password: "" }, loginRules: { username: [ @@ -133,13 +133,13 @@ export default { path: this.redirect || "/dashboard/index" }); } else { - myalert.fail("账号密码不对"); + myalert.fail("账号或密码不正确!"); } }) .catch(e => { setCookie("access_token", null); this.loading = false; - myalert.fail("账号密码不对"); + myalert.fail("账号或密码不正确!"); console.error(e); }); } else { diff --git a/src/views/orgManage/orgManage/index.vue b/src/views/orgManage/orgManage/index.vue new file mode 100644 index 0000000..e7a2f18 --- /dev/null +++ b/src/views/orgManage/orgManage/index.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/privilegeManagement/account/form.vue b/src/views/privilegeManagement/account/form.vue new file mode 100644 index 0000000..5fba937 --- /dev/null +++ b/src/views/privilegeManagement/account/form.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/views/privilegeManagement/account/index.vue b/src/views/privilegeManagement/account/index.vue index 7b9d276..a38af59 100644 --- a/src/views/privilegeManagement/account/index.vue +++ b/src/views/privilegeManagement/account/index.vue @@ -27,7 +27,11 @@ + label="联系方式"> + + import('../form.vue'); + const FormContainer = () => import('./form.vue'); export default { name: "productList", diff --git a/src/views/shelfs/list/putawayShelf/deviceform.vue b/src/views/shelfs/list/putawayShelf/deviceform.vue index 4422eb7..f4fe8c1 100644 --- a/src/views/shelfs/list/putawayShelf/deviceform.vue +++ b/src/views/shelfs/list/putawayShelf/deviceform.vue @@ -102,7 +102,6 @@ export default { async getDeviceList() { var { activeDevices, devices } = await GET_DEVICES_NUM(this.formData); var result2 = await GET_DEVICE_LISTS(this.formData); - debugger; }, applyPost() { var self = this;