From e96f0d72e0a3f9c1359f3fb29bfd9c683777e670 Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Tue, 26 Mar 2024 13:46:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B1=95=E5=8E=85?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=86=85=E5=AE=B9=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/meeting/RoomContentList.vue | 1 + .../admin/meeting/modules/EquipmentModal.vue | 17 ++---- .../admin/meeting/modules/ShowroomModal.vue | 60 ++++++++++++++++--- .../admin/meeting/modules/TicketModal.vue | 16 ++--- 4 files changed, 68 insertions(+), 26 deletions(-) diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue index 10e0c85..7c593e6 100644 --- a/src/views/admin/meeting/RoomContentList.vue +++ b/src/views/admin/meeting/RoomContentList.vue @@ -171,6 +171,7 @@ :rowSelection='{ selectedRowKeys: selectedServeRowKeys, onChange: onServeSelectChange }' :columns='serveColumns' :data='serveLoadData' + :scroll="{ x: true }" > {{ text | serveTypeFilter }} diff --git a/src/views/admin/meeting/modules/EquipmentModal.vue b/src/views/admin/meeting/modules/EquipmentModal.vue index 986d22b..ea06035 100644 --- a/src/views/admin/meeting/modules/EquipmentModal.vue +++ b/src/views/admin/meeting/modules/EquipmentModal.vue @@ -34,10 +34,10 @@ - + 门禁 - + 开门控制器 @@ -75,13 +75,13 @@ - + 开启 - + 损坏 - + 离线 @@ -242,11 +242,6 @@ export default { if (record.id != 0){ get(record.id).then((res) => { this.form.setFieldsValue({ - ip: res.ip, - status: res.status.toString(), - type: res.type.toString(), - buildId: res.buildId, - roomId: res.roomName, }) }) recordByDeviceId(record.id).then(res =>{ @@ -262,7 +257,7 @@ export default { } this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.mdl, 'id', 'type', 'equipmentName', 'status', 'createDate', 'equipmentNum', 'pic', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime')) + this.form.setFieldsValue(pick(this.mdl, 'id', 'type', 'equipmentName', 'status', 'createDate', 'equipmentNum','buildId','ip','roomId', 'pic', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime')) }) }, handleSubmit(e) { diff --git a/src/views/admin/meeting/modules/ShowroomModal.vue b/src/views/admin/meeting/modules/ShowroomModal.vue index ce74616..fa0c39a 100644 --- a/src/views/admin/meeting/modules/ShowroomModal.vue +++ b/src/views/admin/meeting/modules/ShowroomModal.vue @@ -76,10 +76,10 @@ - + 是 - + 否 @@ -166,7 +166,7 @@ import { import pick from 'lodash.pick' import moment from 'moment' import storage from 'store' - +import { ACCESS_TOKEN } from '@/store/mutation-types' export default { name: 'ShowroomModal', props: {}, @@ -181,6 +181,11 @@ export default { xs: { span: 24 }, sm: { span: 5 }, }, + uploadUrl: process.env.VUE_APP_API_BASE_URL + '/api/dfs/upload', + imageUrl: '', + headers: { + Authorization: 'Bearer ' + storage.get(ACCESS_TOKEN) + }, wrapperCol: { xs: { span: 24 }, sm: { span: 16 }, @@ -199,6 +204,42 @@ export default { }, methods: { moment, + + beforeUpload (file) { + const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' + if (!isJpgOrPng) { + this.$message.error('You can only upload JPG file!') + } + const isLt2M = file.size / 1024 < 5000 + if (!isLt2M) { + this.$message.error('图片必须小于 5M!') + } + return isJpgOrPng && isLt2M + }, + handleChange (info) { + if (info.file.status === 'uploading') { + this.loading = true + return + } + if (info.file.status === 'done') { + const { form: { setFieldsValue } } = this + const result = info.file.response + // 设置值 + this.$nextTick(() => { + setFieldsValue({ + // 设置相对路径 + indoorPicUrl: result.fileName + }) + }) + // Get this url from response in real world. + getBase64(info.file.originFileObj, imageUrl => { + this.imageUrl = imageUrl + this.loading = false + }) + } + }, + + getArea(value) { let param = { 'id': value @@ -227,12 +268,15 @@ export default { this.form.resetFields() this.edit({ id: 0 }) }, + + + edit(record) { this.mdl = Object.assign(record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.mdl, 'id', 'showroomCode', 'meetingName', 'capacityNum', 'expandNum', 'indoorPicUrl', 'address', 'startTime', 'endDate', 'isShow', 'headName', 'headPhone', 'content', 'createBy', 'createTime', 'updateBy', 'updateTime', 'version', 'deleteFlag', 'roomId', 'area')) + this.form.setFieldsValue(pick(this.mdl, 'id', 'showroomCode', 'meetingName', 'capacityNum', 'expandNum','buildId', 'indoorPicUrl', 'address', 'startTime', 'endDate', 'isShow', 'headName', 'headPhone', 'content', 'createBy', 'createTime', 'updateBy', 'updateTime', 'version', 'deleteFlag', 'roomId', 'area')) }) get(record.id).then(res =>{ let param = { @@ -242,9 +286,6 @@ export default { this.roomList = res.data }) this.form.setFieldsValue({ - roomId:res.roomId, - buildId:res.buildingName.toString(), - isShow:res.isShow.toString() }) }) @@ -287,4 +328,9 @@ export default { */ } } +function getBase64 (img, callback) { + const reader = new FileReader() + reader.addEventListener('load', () => callback(reader.result)) + reader.readAsDataURL(img) +} diff --git a/src/views/admin/meeting/modules/TicketModal.vue b/src/views/admin/meeting/modules/TicketModal.vue index 4f19f28..fc4b664 100644 --- a/src/views/admin/meeting/modules/TicketModal.vue +++ b/src/views/admin/meeting/modules/TicketModal.vue @@ -17,23 +17,23 @@
| - 新增优惠卷 + 新增优惠券
- - + + - + - 抵用卷 - 优惠卷 + 抵用券 + 优惠券