app通知公告查看增加来源显示

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($('<div></div>').html(data.F_NewsContent));
                     $("#newscontentframe").attr("src","/Utility/ListContentView?keyValue="+id);

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

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);

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{

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue

@@ -5,6 +5,7 @@
 	  <iframe v-if="ready&&contentType == 2" style="width: 100%;height: calc(100vh - 150px);" :src="CONFIG('webHost')+'/Utility/ListContentView?keyValue='+keyValue" frameborder="0"></iframe>
     </view>
     <view class="padding-sm text-grey notice-info">
+		 <view class="text-right">信息来源： {{ f_sourcename }}</view>
       <view class="text-right">本页内容发布于 {{ time }}</view>
       <view class="text-right">{{ date }}</view>
     </view>
@@ -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