From a74ef209ab61b2725deaf467b8409448f0ed21ca Mon Sep 17 00:00:00 2001 From: bibi <541660090@qq.com> Date: Wed, 5 Jan 2022 17:53:02 +0800 Subject: [PATCH] 1 --- src/api/basic/index.js | 10 + src/components/drawer/index.vue | 39 ++ src/components/table/index.vue | 15 + src/request/index.js | 1 + src/router/basic.js | 74 ++- src/styles/index.less | 69 ++- .../Attendance/_attendanceteam}/index.vue | 2 +- .../Attendance/_record}/index.vue | 0 .../Attendance/_scheduling}/index.vue | 0 .../Basic/Attendance/application/index.vue | 14 + src/views/{ => Basic}/Attendance/index.vue | 2 +- .../{ => Basic}/Authority/_details/index.vue | 0 src/views/Basic/Authority/index.vue | 152 ++++++ src/views/{ => Basic}/Console/index.vue | 2 +- src/views/Basic/Employee/index.vue | 495 ++++++++++++++++++ .../EstateInfo/_buildingManage/index.vue | 229 ++++++++ .../EstateInfo/_houseHoldInfo}/index.vue | 0 .../EstateInfo/_houseManage}/index.vue | 96 ++-- src/views/Basic/EstateInfo/index.vue | 13 + src/views/Employee/index.vue | 278 ---------- 20 files changed, 1107 insertions(+), 384 deletions(-) create mode 100644 src/api/basic/index.js create mode 100644 src/components/drawer/index.vue rename src/views/{Attendance/_application => Basic/Attendance/_attendanceteam}/index.vue (75%) rename src/views/{Attendance/_attendanceteam => Basic/Attendance/_record}/index.vue (100%) rename src/views/{Attendance/_record => Basic/Attendance/_scheduling}/index.vue (100%) create mode 100644 src/views/Basic/Attendance/application/index.vue rename src/views/{ => Basic}/Attendance/index.vue (65%) rename src/views/{ => Basic}/Authority/_details/index.vue (100%) create mode 100644 src/views/Basic/Authority/index.vue rename src/views/{ => Basic}/Console/index.vue (97%) create mode 100644 src/views/Basic/Employee/index.vue create mode 100644 src/views/Basic/EstateInfo/_buildingManage/index.vue rename src/views/{Attendance/_scheduling => Basic/EstateInfo/_houseHoldInfo}/index.vue (100%) rename src/views/{Authority => Basic/EstateInfo/_houseManage}/index.vue (51%) create mode 100644 src/views/Basic/EstateInfo/index.vue delete mode 100644 src/views/Employee/index.vue diff --git a/src/api/basic/index.js b/src/api/basic/index.js new file mode 100644 index 0000000..98154c8 --- /dev/null +++ b/src/api/basic/index.js @@ -0,0 +1,10 @@ +import httpService from "@/request" + +// 获取预报列表 +export function forecastList(params) { + return httpService({ + url: `/order/forecast/lists`, + method: 'post', + data: params, + }) +} diff --git a/src/components/drawer/index.vue b/src/components/drawer/index.vue new file mode 100644 index 0000000..4700ef4 --- /dev/null +++ b/src/components/drawer/index.vue @@ -0,0 +1,39 @@ + + diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 94d5ba2..63303c7 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -4,6 +4,7 @@ { const rqParams = filterRequestData(config.params); const rqData = filterRequestData(config.data); // post 'Content-Type' === 'application/x-www-form-urlencoded' + // manage-login-token config.headers['Content-Type'] = 'application/x-www-form-urlencoded' if(config.method === 'post') { config.data = qs.stringify(rqData); diff --git a/src/router/basic.js b/src/router/basic.js index ed2da78..69a5f3a 100644 --- a/src/router/basic.js +++ b/src/router/basic.js @@ -1,11 +1,4 @@ -/* - * @Author: your name - * @Date: 2021-11-24 14:45:04 - * @LastEditTime: 2021-11-24 15:27:01 - * @LastEditors: Please set LastEditors - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: /LittleBeeSaas/src/router/basic.js - */ + export default [ { path: '/Console', @@ -13,82 +6,113 @@ export default [ title: "控制台", hide: false, icon: 'container', - component: resolve => require(['@/views/Console'], resolve), + component: resolve => require(['@/views/Basic/Console'], resolve), meta: {title: '控制台'} }, { path: '/Employee', name: "Employee", title: "员工管理", - icon: 'database', + icon: 'team', hide: false, - component: resolve => require(['@/views/Employee'], resolve), + component: resolve => require(['@/views/Basic/Employee'], resolve), meta: {title: '员工管理'} }, { path: '/authority', name: "Authority", title: "权限管理", - icon: 'profile', + icon: 'appstore', hide: false, - component: resolve => require(['@/views/Authority'], resolve), + component: resolve => require(['@/views/Basic/Authority'], resolve), meta: {title: '权限管理'}, children: [ { path: '/Authority/_details', name: "Authority_details", title: "账单管理-详情", - icon: 'profile', + icon: 'profile', hide: true, - component: resolve => require(['@/views/Authority/_details'], resolve), + component: resolve => require(['@/views/Basic/Authority/_details'], resolve), meta: {title: '账单管理-详情'}, } ] }, + { + path: '/EstateInfo', + name: "EstateInfo", + title: "小区信息", + icon: 'home', + hide: false, + component: resolve => require(['@/views/Basic/EstateInfo'], resolve), + meta: {title: '小区信息'}, + children: [ + { + path: '/EstateInfo/BuildingManage', + name: "BuildingManage", + title: "楼栋管理", + hide: false, + component: resolve => require(['@/views/Basic/EstateInfo/_buildingManage'], resolve), + meta: {title: '楼栋管理'}, + }, + { + path: '/EstateInfo/HouseManage', + name: "HouseManage", + title: "房屋管理", + hide: false, + component: resolve => require(['@/views/Basic/EstateInfo/_houseManage'], resolve), + meta: {title: '房屋管理'}, + }, + { + path: '/EstateInfo/HouseHoldInfo', + name: "HouseHoldInfo", + title: "住户信息", + hide: false, + component: resolve => require(['@/views/Basic/EstateInfo/_houseHoldInfo'], resolve), + meta: {title: '住户信息'}, + } + ] + }, { path: '/attendance', name: "Attendance", title: "考勤管理", - icon: 'profile', + icon: 'reconciliation', hide: false, redirect: '/attendance/record', - component: resolve => require(['@/views/Attendance'], resolve), + component: resolve => require(['@/views/Basic/Attendance'], resolve), meta: {title: '考勤管理'}, children: [ { path: '/attendance/record', name: "Attendance_record", title: "考勤记录", - icon: 'profile', hide: false, - component: resolve => require(['@/views/Attendance/_record'], resolve), + component: resolve => require(['@/views/Basic/Attendance/_record'], resolve), meta: {title: '考勤记录'}, }, { path: '/attendance/application', name: "Attendance_application", title: "申请记录", - icon: 'profile', hide: false, - component: resolve => require(['@/views/Attendance/_application'], resolve), + component: resolve => require(['@/views/Basic/Attendance/application'], resolve), meta: {title: '申请记录'}, }, { path: '/attendance/attendanceteam', name: "Attendance_attendanceteam", title: "考勤小组", - icon: 'profile', hide: false, - component: resolve => require(['@/views/Attendance/_attendanceteam'], resolve), + component: resolve => require(['@/views/Basic/Attendance/_attendanceteam'], resolve), meta: {title: '考勤小组'}, }, { path: '/attendance/scheduling', name: "Attendance_scheduling", title: "排班计划", - icon: 'profile', hide: false, - component: resolve => require(['@/views/Attendance/_scheduling'], resolve), + component: resolve => require(['@/views/Basic/Attendance/_scheduling'], resolve), meta: {title: '排班计划'}, }, diff --git a/src/styles/index.less b/src/styles/index.less index 41e39d7..19504ee 100644 --- a/src/styles/index.less +++ b/src/styles/index.less @@ -1,37 +1,66 @@ @import "./antd.less"; + // 公共样式 -#app{ +#app { background: #E5E5E5; } -.content{ + +.content { padding: 13px; } -.main{ - padding: 13px; + +.main { + padding : 13px; background: #fff; } -.cardTitle{ - border-left: 8px solid #205FBD; - padding-left:10px; - margin-left: 10px; + +.cardTitle { + border-left : 8px solid #205FBD; + padding-left : 10px; + margin-left : 10px; margin-bottom: 10px; } -#commonTable{ + +// 表格 +#commonTable { margin: 24px; } + .search-box { margin: 30px; } + +.add-btn{ + background-color: rgba(251, 101, 61, 1) !important; + color: rgba(255, 255, 255, 1) !important; +} .footer { - height: 84px; - width: 100%; - background: #fff; - position: fixed; - bottom: 0; - z-index: 999; - line-height: 84px; - box-shadow: 0px -2px 4px 0px rgba(0, 0, 0, 0.35); + height : 84px; + width : 100%; + background : #fff; + position : fixed; + bottom : 0; + z-index : 999; + line-height : 84px; + box-shadow : 0px -2px 4px 0px rgba(0, 0, 0, 0.35); border-radius: 4px 4px 0px 0px; - border: 1px solid #e8e8e8; - left: 200px; - } \ No newline at end of file + border : 1px solid #e8e8e8; + left : 200px; +} + +// 抽屉 +.drawer-content { + text-align: left; +} + +.drawer-footer { + position : absolute; + right : 0; + bottom : 0; + width : 100%; + border-top: 1px solid #e9e9e9; + padding : 10px 16px; + background: #fff; + text-align: right; + z-index : 1; +} \ No newline at end of file diff --git a/src/views/Attendance/_application/index.vue b/src/views/Basic/Attendance/_attendanceteam/index.vue similarity index 75% rename from src/views/Attendance/_application/index.vue rename to src/views/Basic/Attendance/_attendanceteam/index.vue index 3fc9fce..dd7092b 100644 --- a/src/views/Attendance/_application/index.vue +++ b/src/views/Basic/Attendance/_attendanceteam/index.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/src/views/Attendance/index.vue b/src/views/Basic/Attendance/index.vue similarity index 65% rename from src/views/Attendance/index.vue rename to src/views/Basic/Attendance/index.vue index ee638d2..b0561c2 100644 --- a/src/views/Attendance/index.vue +++ b/src/views/Basic/Attendance/index.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/src/views/Console/index.vue b/src/views/Basic/Console/index.vue similarity index 97% rename from src/views/Console/index.vue rename to src/views/Basic/Console/index.vue index 51caa14..82ae8f4 100644 --- a/src/views/Console/index.vue +++ b/src/views/Basic/Console/index.vue @@ -8,7 +8,7 @@ --> diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue new file mode 100644 index 0000000..88b8bd3 --- /dev/null +++ b/src/views/Basic/Employee/index.vue @@ -0,0 +1,495 @@ + + + \ No newline at end of file diff --git a/src/views/Basic/EstateInfo/_buildingManage/index.vue b/src/views/Basic/EstateInfo/_buildingManage/index.vue new file mode 100644 index 0000000..d6bef35 --- /dev/null +++ b/src/views/Basic/EstateInfo/_buildingManage/index.vue @@ -0,0 +1,229 @@ + + + + + \ No newline at end of file diff --git a/src/views/Attendance/_scheduling/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue similarity index 100% rename from src/views/Attendance/_scheduling/index.vue rename to src/views/Basic/EstateInfo/_houseHoldInfo/index.vue diff --git a/src/views/Authority/index.vue b/src/views/Basic/EstateInfo/_houseManage/index.vue similarity index 51% rename from src/views/Authority/index.vue rename to src/views/Basic/EstateInfo/_houseManage/index.vue index 338460d..e61f220 100644 --- a/src/views/Authority/index.vue +++ b/src/views/Basic/EstateInfo/_houseManage/index.vue @@ -1,19 +1,20 @@ @@ -31,56 +32,26 @@ export default { // 列 columns: [ { - title: "Name", - dataIndex: "name", + title: "真实姓名", + dataIndex: "actualName", width: "200", }, { - title: "Gender", - dataIndex: "gender", + title: "手机号", + dataIndex: "tel", width: "200", - customRender: function (gender) { - if (gender === 1) { - return "是"; - } else { - return "否"; - } - }, }, { - title: "Gender1", - dataIndex: "gender1", + title: "角色", + dataIndex: "roleNameList", width: "200", + customRender:function(roleNameList){ + return roleNameList.toString(); + } }, { - title: "Gender2", - dataIndex: "gender2", - width: "200", - }, - { - title: "Gender3", - dataIndex: "gender3", - width: "200", - }, - { - title: "Gender4", - dataIndex: "gender4", - width: "200", - }, - { - title: "Gender5", - dataIndex: "gender5", - width: "200", - }, - { - title: "Gender6", - dataIndex: "gender6", - width: "200", - }, - { - title: "status", - dataIndex: "status", - + title: "备注", + dataIndex: "remake", width: "200", }, { @@ -94,7 +65,7 @@ export default { ], // 数据 tableData: [ - { name: 1, gender: 1 }, + { name: 1, roleNameList: ['点点3','212','点点'] }, {}, {}, {}, @@ -145,11 +116,20 @@ export default { }, selectionChoosed(data) { console.log(data); - this.tableChoosed = data + this.tableChoosed = data; }, }, }; - \ No newline at end of file diff --git a/src/views/Basic/EstateInfo/index.vue b/src/views/Basic/EstateInfo/index.vue new file mode 100644 index 0000000..b0561c2 --- /dev/null +++ b/src/views/Basic/EstateInfo/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/Employee/index.vue b/src/views/Employee/index.vue deleted file mode 100644 index 75f9cd1..0000000 --- a/src/views/Employee/index.vue +++ /dev/null @@ -1,278 +0,0 @@ - - - \ No newline at end of file