From 5bebf8966bad2007cb032950d123ab64e0e40241 Mon Sep 17 00:00:00 2001 From: zx <604444282@qq.com> Date: Thu, 2 Jun 2022 17:08:42 +0800 Subject: [PATCH] zx --- src/api/public/login/index.js | 8 ++ src/components/alarmModal/index.vue | 4 +- src/permission.js | 2 +- src/router/index.js | 6 ++ src/utils/util.js | 6 ++ src/views/Basic/Employee/index.vue | 17 ++++ .../_buildingManage/depend/config.js | 22 ++-- .../_buildingManage/depend/form.vue | 14 ++- .../EstateInfo/_buildingManage/index.vue | 17 ++++ .../_houseHoldInfo/depend/config.js | 5 + .../Basic/EstateInfo/_houseHoldInfo/index.vue | 19 +++- .../EstateInfo/_houseManage/depend/config.js | 11 +- .../Basic/EstateInfo/_houseManage/index.vue | 30 +++++- src/views/Login/index.vue | 86 ++++++++++++++-- .../TaskManage/_taskList/depend/config.js | 6 +- .../BillManage/_payInfo/depend/config.js | 38 +++++++ .../Payment/BillManage/_payInfo/index.vue | 81 +++++++-------- src/views/Payment/PayPlan/autoBillDrawer.vue | 16 +-- .../Payment/PayPlan/autoBillPaymentDrawer.vue | 13 ++- .../GoodsManage/_goodsList/depend/config.js | 3 +- .../Shop/GoodsManage/_goodsList/index.vue | 60 ++++++++++- .../GoodsManage/_jcookList/depend/config.js | 3 +- .../Shop/GoodsManage/_jcookList/index.vue | 95 +++++++++++++++--- web.zip | Bin 10655422 -> 10661857 bytes 24 files changed, 458 insertions(+), 104 deletions(-) diff --git a/src/api/public/login/index.js b/src/api/public/login/index.js index 52ae713..d925d88 100644 --- a/src/api/public/login/index.js +++ b/src/api/public/login/index.js @@ -16,6 +16,14 @@ export function loginTel(params) { data: params, }) } +// 密码登录 +export function loginPWD(params) { + return httpService({ + url: `/loginPWD`, + method: 'post', + data: params, + }) +} // 退出登录 export function quit(params) { return httpService({ diff --git a/src/components/alarmModal/index.vue b/src/components/alarmModal/index.vue index 26ca649..7ce9412 100644 --- a/src/components/alarmModal/index.vue +++ b/src/components/alarmModal/index.vue @@ -59,8 +59,8 @@ export default { initWebSocket: function() { let communityCode = store.getters.getCommunityCode; let nickName = store.getters.getUserInfo.userName; - let url = 'wss://saas.kaidalai.cn/websocket/manage/'+ communityCode +'/'+ nickName; - + let userId = store.getters.getUserInfo.id; + let url = 'wss://saas.kaidalai.cn/websocket/manage/'+ communityCode +'/'+ nickName + '/' + userId; this.websock = new WebSocket(url) this.websock.onopen = this.websocketOnopen this.websock.onerror = this.websocketOnerror diff --git a/src/permission.js b/src/permission.js index b8c07c7..aa9a4d5 100644 --- a/src/permission.js +++ b/src/permission.js @@ -3,7 +3,7 @@ import "nprogress/nprogress.css" import router from "@/router" import store from '@/store' -const whitePath = [ '/login','/rule','/yszc'] +const whitePath = [ '/login','/rule','/yszc','/fromPlatform'] // 判断登录 router.beforeEach((to, from, next) => { NProgress.start() diff --git a/src/router/index.js b/src/router/index.js index a285d9f..ca727a5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -97,6 +97,12 @@ const router = [ title: "隐私政策", component: resolve => require(['@/views/Yszc'], resolve) }, + { + path: "/fromPlatform", + name: "fromPlatform", + title: "跳转登录", + component: resolve => require(['@/views/FromPlatform'], resolve) + }, { path: "/login", name: "Login", diff --git a/src/utils/util.js b/src/utils/util.js index 31872ab..363e5e8 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -8,6 +8,12 @@ export default { Vue.prototype.qs = qs // 上传 Vue.prototype.$upload = process.env.VUE_APP_URL + store.getters.getCommunityCode + '/manage/user/upload/uploadImg' + // 上传员工/房屋/住户/单元/楼栋EXCEL + Vue.prototype.$excelUpload = process.env.VUE_APP_URL + store.getters.getCommunityCode + '/manage/user/importExcel/importManageUserExcel' + Vue.prototype.$houseUpload = process.env.VUE_APP_URL + store.getters.getCommunityCode + '/manage/user/importExcel/importEstateExcel' + Vue.prototype.$residentUpload = process.env.VUE_APP_URL + store.getters.getCommunityCode + '/manage/user/importExcel/importResidentExcel' + Vue.prototype.$unitUpload = process.env.VUE_APP_URL + store.getters.getCommunityCode + '/manage/user/importExcel/importUnitExcel' + Vue.prototype.$buildingUpload = process.env.VUE_APP_URL + store.getters.getCommunityCode + '/manage/user/importExcel/importBuildingExcel' // 静态地址 Vue.prototype.$ImgUrl = (src) => { return process.env.VUE_APP_STATIC + store.getters.getCommunityCode + '/' + src diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue index 3da45e9..2ead3c9 100644 --- a/src/views/Basic/Employee/index.vue +++ b/src/views/Basic/Employee/index.vue @@ -61,6 +61,11 @@ 新增员工 + + 批量导入 + 批量操作 @@ -202,6 +207,7 @@ diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js index 9d81cc5..3f0fa9a 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js @@ -3,6 +3,11 @@ * 表格列 */ export const columns = [ + { + title: "导入编号", + dataIndex: "id", + width: 100 + }, { title: "住户姓名", dataIndex: "name", diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue index 397f549..5b5fa6b 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue @@ -27,6 +27,11 @@
@@ -238,6 +243,7 @@