From 80e5db815a2cfe28ae5bfcc70d27e5d2c89a11fe Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 1 Nov 2022 12:10:25 +0800 Subject: [PATCH] =?UTF-8?q?app=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=BA=90=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Utility/ListContentIndex.js | 9 ++++++++- .../LearunApp-2.2.0/config.js | 8 ++++---- .../EducationalAdministration/EmpInfo/list.vue | 1 - .../LearunApp-2.2.0/pages/home.vue | 1 - .../LearunApp-2.2.0/pages/home/notice.vue | 13 ++++++++++++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js index e991f9dc9..e7f2af9d8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js @@ -25,7 +25,14 @@ var bootstrap = function ($, learun) { $("#F_FullHead").text(data.F_FullHead); $("#F_CreateDate").text(data.F_CreateDate); - $("#F_CreateUserName").text(data.F_SourceName == null ? "" : data.F_SourceName); + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', + key: data.F_SourceName, + keyId: 'id', + callback: function (_data) { + $("#F_CreateUserName").text(_data['name'] || data.F_SourceName); + } + }); $("#F_Category").text(data.F_Category); //$("#F_NewsContent").html($('
').html(data.F_NewsContent)); $("#newscontentframe").attr("src","/Utility/ListContentView?keyValue="+id); 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 4ae06eb55..1fef912cf 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -22,12 +22,12 @@ export default { // ], "apiHost": [ // "http://cyzjzx.gnway.cc:31218/"//测试地址接口 - // "http://cyzjzx.gnway.cc:29904/"//正式地址接口 - "http://192.168.10.58:8012/" + "http://cyzjzx.gnway.cc:29904/"//正式地址接口 + //"http://localhost:31173/" ], // "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址 - //"webHost":"http://wxd3f.cyzjzx.com/",//正式地址 - "webHost":"http://192.168.10.31:8087/", + "webHost":"http://wxd3f.cyzjzx.com/",//正式地址 + //"webHost":"http://localhost:20472/", // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026 420528200507261428 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue index 9a1823158..38017247c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue @@ -164,7 +164,6 @@ export default { this.id ); this.id=result.EmpInfo.EmpId; - console.log(result); this.origin = await this.formatFormData(result); } this.current = this.COPY(this.origin); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue index 03828c8f4..a76c5b99b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue @@ -572,7 +572,6 @@ export default { // 点击通知公告的标题 async noticeClick(item) { - console.log(item); if(item.f_category!==undefined){ this.NAV_TO("/pages/home/notice", item, true); }else{ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue index fe151502c..859e6537c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue @@ -5,6 +5,7 @@ + 信息来源： {{ f_sourcename }} 本页内容发布于 {{ time }} {{ date }} @@ -20,6 +21,8 @@ export default { ready: false, content: '', time: '', + classdata:new Array(), + f_sourcename:'', date: '', contentType:'', keyValue:'', @@ -40,10 +43,18 @@ export default { }else{ this.contentType = 1 } - console.log(noticeItem) this.content = this.CONVERT_HTML(noticeItem.f_content) this.time = moment(noticeItem.f_time).format('HH : mm') this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日') + this.FETCH_DATASOURCE('classdata').then(data => { + this.classdata = data.data.map(t => ({ + text: t.name, + value: t.id + })); + const obj=this.classdata.find(t=>t.value==noticeItem.f_sourcename); + this.f_sourcename=obj?obj.text:''; + }) + this.SET_TITLE(noticeItem.f_title) this.ready = true