钉钉第三期2

src/views/subassembly/update_notice.vue

@@ -21,7 +21,7 @@
 				</div>
 			</el-col>
 			<el-col :span="17" class="contentRig RuleRight" style="height:700px;overflow-y:auto" v-loading="detailsLoad">
-				<div v-if="announcement.length!=0" v-html="aAtripOfDetails.update_msg" style="padding:15px 0 0 15px;"></div>
+				<div v-if="announcement.length!=0" v-html="aAtripOfDetails" style="padding:15px 0 0 15px;"></div>
 				<div v-else style="text-align:center;margin-top:100px;">
       				<img src="@/assets/image/nodata.png" style="width: 266px;height: 182px;margin: 30px auto;">
 					<div style="color:#909399;">暂无数据</div>
@@ -82,7 +82,8 @@ export default {
 			this.detailsLoad = true
 			this.$axios('get','/api/announcement/info',{announcement_id:this.articleOne.id}).then((res)=>{
 				if(res.data.code == 1){
-					this.aAtripOfDetails = res.data.data
+					this.aAtripOfDetails=res.data.data.focus+res.data.data.update_msg
+					
 				}
 			}).finally(()=>{
 				this.detailsLoad = false