diff --git a/common/http.api.js b/common/http.api.js index bdaf268..3abcef4 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -95,7 +95,8 @@ const install = (Vue, vm) => { // APP公共服务 upgradeCheck: () => vm.$u.post('/app/upgrade/check', {appCode: config.appCode, appVersion: config.appVersion}), commentSave: (params = {}) => vm.$u.post('/app/comment/save', params), - + //获取访客类型 + getType:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/system/type/'+params), // 个人信息修改 user: { saveUserInfo: (params = {}) => vm.$u.post(config.adminPath+'/mobile/user/saveUserInfo', params), @@ -118,6 +119,19 @@ const install = (Vue, vm) => { queryEmployeeById:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/person/'+ params.id), queryEmployee:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/person/list', params), updateEmployee:(params = {}) => vm.$u.put(config.adminPath+'/property/xcx/person', params), + }, + // 单位管理 + repair:{ + addRepair:(params = {}) => vm.$u.post(config.adminPath+'/property/xcx/workOrders', params), + getWorkOrdersType:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/workOrdersType/typeTree/'+ params.parentId), + getMyOrderList:(params = {})=>vm.$u.get(config.adminPath+'/property/xcx/workOrders/list',params), + updateOrder:(params = {})=>vm.$u.put(config.adminPath+'/property/xcx/workOrders',params), + }, + visitor:{ + //我的访客列表 + getMyVisitor:(params = {})=>vm.$u.get(config.adminPath+'/property/xcx/visitorManagement/list/'+params.type), + addVisitor:(params = {})=>vm.$u.post(config.adminPath+'/property/xcx/visitorManagement',params), + qrCodeVisitor:(params = {})=>vm.$u.get(config.adminPath+'/property/xcx/visitorManagement/qrCode/'+params.id), }, // 增删改查例子 testData: { diff --git a/pages/sys/home/home.vue b/pages/sys/home/home.vue index e042617..dbd7845 100644 --- a/pages/sys/home/home.vue +++ b/pages/sys/home/home.vue @@ -82,28 +82,28 @@ // } ], current: 0, - gridList: [ - { - icon: '/static/aaaa_gd.png', - text: '工单', - url:'/pages/sys/workbench/order/order' - }, - { - icon: '/static/aaaa_yjcl.png', - text: '预警处理', - url:'/pages/sys/workbench/earlyWarning/earlyWarning' - - }, - { - icon: '/static/aaaa_jk.png', - text: '监控', - url:'/pages/sys/workbench/monitor/monitors' - }, - { - icon: '/static/aaaa_bsbx.png', - text: '报事报修', - url:'/pages/sys/user/myRepair/myRepair' - }, + gridList: [ + { + icon: '/static/aaaa_gd.png', + text: '工单', + url:'/pages/sys/workbench/order/order' + }, + { + icon: '/static/aaaa_yjcl.png', + text: '预警处理', + url:'/pages/sys/workbench/earlyWarning/earlyWarning' + + }, + { + icon: '/static/aaaa_jk.png', + text: '监控', + url:'/pages/sys/workbench/monitor/monitors' + }, + { + icon: '/static/aaaa_bsbx.png', + text: '报事报修', + url:'/pages/sys/user/myRepair/myRepair' + }, // { // icon: '/static/aaa_bsbx.png', // text: '报事报修', diff --git a/pages/sys/user/mine.vue b/pages/sys/user/mine.vue index b30df5e..feba15d 100644 --- a/pages/sys/user/mine.vue +++ b/pages/sys/user/mine.vue @@ -54,7 +54,7 @@ }, { icon: '/static/ic_mine_visitor.png', - text: '我的访客1111' + text: '我的访客' }, { icon: '/static/ic_mine_check.png', diff --git a/pages/sys/user/myRepair/addRepair.vue b/pages/sys/user/myRepair/addRepair.vue index ba312f0..2931c38 100644 --- a/pages/sys/user/myRepair/addRepair.vue +++ b/pages/sys/user/myRepair/addRepair.vue @@ -41,10 +41,6 @@ diff --git a/pages/sys/user/myRepair/repairEvaluate.vue b/pages/sys/user/myRepair/repairEvaluate.vue index 82f528b..e3b5aed 100644 --- a/pages/sys/user/myRepair/repairEvaluate.vue +++ b/pages/sys/user/myRepair/repairEvaluate.vue @@ -8,7 +8,7 @@ + class="evaluate-star" @click.stop="setRating(i)" /> @@ -41,20 +41,27 @@ return { comment: '', selectedImages: [], // 存储已选图片 - detailItem: null // 接收传递的详情项 + detailItem: {} // 接收传递的详情项 + } + }, + onLoad(options) { + // 接收传递的detailItem参数 + if (options.detailItem) { + try { + this.detailItem.id = options.detailItem; + } catch (e) { + console.error('解析detailItem参数失败', e); + } } }, - // onLoad(options) { - // // 接收传递的detailItem参数 - // if (options.detailItem) { - // try { - // this.detailItem = JSON.parse(decodeURIComponent(options.detailItem)); - // } catch (e) { - // console.error('解析detailItem参数失败', e); - // } - // } - // }, methods: { + setRating(score) { + if (!this.detailItem) { + this.detailItem = {}; + } + this.$set(this.detailItem, 'serviceEvalua', score); + console.log('当前评分:', score); + }, // 删除图片 deletePic(event) { this.selectedImages.splice(event.index, 1); @@ -73,7 +80,7 @@ vm: this // 关键：用于注入 token 等 }); - if (result.code == '200') { + if (result.code == 200) { // 遍历result获取data.url加上,分割 const urls = result.map(item => item.data?.url || '').filter(url => url !== ''); this.detailItem.imgUrl = urls.join(','); @@ -82,7 +89,8 @@ }, async realSubmit() { - let res = await this.$u.api.updateOrder(this.detailItem); + console.log(this.detailItem); + let res = await this.$u.api.repair.updateOrder(this.detailItem); if (res.code == '200') { // 关闭页面前发送事件通知前页面刷新 uni.$emit('refreshData', ''); diff --git a/pages/sys/user/myVisitor/creatVisitor.vue b/pages/sys/user/myVisitor/creatVisitor.vue index 5d79b6c..e223683 100644 --- a/pages/sys/user/myVisitor/creatVisitor.vue +++ b/pages/sys/user/myVisitor/creatVisitor.vue @@ -1,481 +1,300 @@ \ No newline at end of file diff --git a/pages/sys/user/myVisitor/myVisitor.vue b/pages/sys/user/myVisitor/myVisitor.vue index 98b827d..6284e63 100644 --- a/pages/sys/user/myVisitor/myVisitor.vue +++ b/pages/sys/user/myVisitor/myVisitor.vue @@ -1,431 +1,516 @@ \ No newline at end of file diff --git a/pages/sys/workbench/unitManagement/employeeEdit.vue b/pages/sys/workbench/unitManagement/employeeEdit.vue index 5b6ef7e..63fd24e 100644 --- a/pages/sys/workbench/unitManagement/employeeEdit.vue +++ b/pages/sys/workbench/unitManagement/employeeEdit.vue @@ -6,23 +6,23 @@ 用户姓名： - {{employeeDetail.userName}} + {{ employeeDetail.userName }} 性别： - {{employeeDetail.gender === 1? '男' : '女'}} + {{ employeeDetail.gender === 1 ? '男' : '女' }} 证件号： - {{employeeDetail.idCard}} + {{ employeeDetail.idCard }} 联系电话： - {{employeeDetail.phone}} + {{ employeeDetail.phone }} 所属单位： - {{employeeDetail.unitName}} + {{ employeeDetail.unitName }} @@ -41,11 +41,11 @@ 邮箱： - {{employeeDetail.email}} + {{ employeeDetail.email }} 车牌号： - {{employeeDetail.carNumber}} + {{ employeeDetail.carNumber }} @@ -54,7 +54,7 @@ 入驻时间： - {{employeeDetail.updateTime}} + {{ employeeDetail.updateTime }} 在职状态： @@ -94,17 +94,7 @@ export default { this.queryEmployee(); } }, - // 原有方法保持不变... - handleApprove() { - console.log('approve'); - }, - handleReject() { - console.log('reject'); - }, - async submit(action) { - // 提交逻辑... - }, - queryEmployee(){ + queryEmployee() { this.$u.api.unit.queryEmployeeById(this.employeeDetail).then(res => { this.employeeDetail = res.data; }); @@ -113,15 +103,15 @@ export default { changeStatus(newState) { this.employeeDetail.state = newState; }, - saveInfo(){ - console.log( this.employeeDetail); - this.$u.api.unit.updateEmployee( this.employeeDetail).then(res => { + saveInfo() { + console.log(this.employeeDetail); + this.$u.api.unit.updateEmployee(this.employeeDetail).then(res => { if (res.code === 200) { uni.showToast({ title: '状态更新成功', icon: 'success' }); - }else { + } else { uni.showToast({ title: '状态更新失败', icon: 'none' @@ -206,6 +196,7 @@ export default { font-size: 32rpx; font-weight: 500; } + /* 状态选项容器 */ .status-options { display: flex; diff --git a/pages/sys/workbench/workbench.vue b/pages/sys/workbench/workbench.vue index 90b46cb..580256e 100644 --- a/pages/sys/workbench/workbench.vue +++ b/pages/sys/workbench/workbench.vue @@ -47,27 +47,27 @@ name: 'Workbench', data() { return { - commonApps: [ + commonApps: [ // { // icon: 'https://picsum.photos/80/80?random=3', - // text: '工作巡检', + // text: '工作巡检', // url:'/pages/sys/workbench/inspection/inspection' // }, // { // icon: 'https://picsum.photos/80/80?random=3', - // text: '假勤', - // url:'/pages/sys/workbench/camera' + // text: '假勤', + // url:'/pages/sys/workbench/camera' // }, { icon: '/static/aaaa_gd.png', - text: '工单', + text: '工单', url:'/pages/sys/workbench/order/order' }, { icon: '/static/aaaa_yjcl.png', - text: '预警处理', - url:'/pages/sys/workbench/earlyWarning/earlyWarning' + text: '预警处理', + url:'/pages/sys/workbench/earlyWarning/earlyWarning' }, // { @@ -76,19 +76,19 @@ // }, { icon: '/static/aaaa_jk.png', - text: '监控', + text: '监控', url:'/pages/sys/workbench/monitor/monitors' - }, - { - icon: '/static/aaaa_bsbx.png', - text: '报事报修', - url:'/pages/sys/user/myRepair/myRepair' - } - // { - // icon: 'https://picsum.photos/80/80?random=3', - // text: '会议', - // url:'/pages/sys/workbench/meet/meet' - // }, + }, + { + icon: '/static/aaaa_bsbx.png', + text: '报事报修', + url:'/pages/sys/user/myRepair/myRepair' + }, + { + icon: '/static/ic_unit.png', + text: '单位管理', + url:'/pages/sys/workbench/unitManagement/unitManagement' + }, // { // icon: 'https://picsum.photos/80/80?random=3', // text: '添加常用' diff --git a/static/ic_unit.png b/static/ic_unit.png new file mode 100644 index 0000000..871220e Binary files /dev/null and b/static/ic_unit.png differ