diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs index 2ae1eaad2..da8f02177 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs @@ -135,7 +135,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { try { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + var data = this.BaseRepository("CollegeMIS").FindEntity(keyValue); + if (data!=null) + { + data.ConferenceRoomName = this.BaseRepository("CollegeMIS").FindEntity(data.MeetingPlace).Name; + } + return data; } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue index 82b9b3148..348d4decc 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue @@ -89,19 +89,33 @@ export default { // #endif // #ifndef MP-DINGTALK - uni.chooseFile({ - count: Number(this.number), - sizeType: ['original', 'compressed'], - sourceType: ['album', 'camera'], - success: ({ tempFilePaths }) => { - const newList = JSON.parse(JSON.stringify(this.value || [])).concat( - tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) })) - ) - this.$emit('input', newList) - this.$emit('change', newList) - this.$emit('add') - } - }) + // uni.chooseFile({ + // count: Number(this.number), + // sizeType: ['original', 'compressed'], + // sourceType: ['album', 'camera'], + // success: ({ tempFilePaths }) => { + // const newList = JSON.parse(JSON.stringify(this.value || [])).concat( + // tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) })) + // ) + // this.$emit('input', newList) + // this.$emit('change', newList) + // this.$emit('add') + // } + // }) + + uni.chooseImage({ + count: Number(this.number), + sizeType: ['original', 'compressed'], + sourceType: ['album', 'camera'], + success: ({ tempFilePaths }) => { + const newList = JSON.parse(JSON.stringify(this.value || [])).concat( + tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) })) + ) + this.$emit('input', newList) + this.$emit('change', newList) + this.$emit('add') + } + }) // #endif }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 01eebb620..7612e8b03 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,10 +21,11 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - // "http://localhost:31173/" - "http://cyzjzx.gnway.cc:30626/" + "http://cyzjzx.gnway.cc:29615/" + // "http://cyzjzx.gnway.cc:30626/" ], - "webHost":"http://cyzjzx.gnway.cc:29618/", + // "webHost":"http://cyzjzx.gnway.cc:29618/", + "webHost":"http://wxd3f.cyzjzx.com/", // 开发环境下自动填充登录账号密码,与接口地址一一对应,只在开发环境下显示 "devAccount": [ // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026 420528200507261428