Merge remote-tracking branch 'origin/master'

@@ -30,3 +30,14 @@ export function queryByBusinessId(businessId) {
         method: 'get',
         method: 'get',
     })
     })
 }
 }
+
+/**
+ * 通知公告
+ */
+export function getTzggList(data,params) {
+    return request({
+        url: `/system/tzgg/getTzggPageList?pageNo=${params.pageNo}&pageSize=${params.pageSize}`,
+        method: 'post',
+        data : data,
+    })
+}
\ No newline at end of file

@@ -55,10 +55,13 @@
 					<el-table-column prop="title" width="500" align="left" class="tr-title" label="标题">
 					<el-table-column prop="title" width="500" align="left" class="tr-title" label="标题">
 					</el-table-column>
 					</el-table-column>
 					<el-table-column
 					<el-table-column
-						prop="date"
-						align="center"
+						prop="createDate"
+						align="right"
 						label="发布时间"
 						label="发布时间"
 					>
 					>
+					<template slot-scope="scope">
+						{{changeDate(scope.row.createDate)}}
+					</template>
 					</el-table-column>
 					</el-table-column>
 				</el-table>
 				</el-table>
 			</el-card>
 			</el-card>
@@ -115,7 +118,7 @@
 
 
 <script>
 <script>
 import { Chart, registerShape } from '@antv/g2';
 import { Chart, registerShape } from '@antv/g2';
-import {getDbxList,getYbxList} from "@api/dbx";
+import {getDbxList,getYbxList,getTzggList} from "@api/dbx";
 export default {
 export default {
 	components:{},
 	components:{},
 	data() {
 	data() {
@@ -186,6 +189,7 @@ export default {
 		this.initG2qllx();
 		this.initG2qllx();
 		this.initG2tdfwtj();
 		this.initG2tdfwtj();
 		this.initG2xntjid();
 		this.initG2xntjid();
+		this.getTzggList();
 	},
 	},
 	methods: {
 	methods: {
     download(row,column,event){
     download(row,column,event){
@@ -238,7 +242,7 @@ export default {
 			let data = {
 			let data = {
 				pageSize:15,
 				pageSize:15,
 				pageNo:1
 				pageNo:1
-			}
+			};
 			getDbxList(data).then((res)=>{
 			getDbxList(data).then((res)=>{
 				if(res.code === 200){
 				if(res.code === 200){
 					this.workList.forEach((item,index)=>{
 					this.workList.forEach((item,index)=>{
@@ -266,6 +270,24 @@ export default {
 				})
 				})
 			})
 			})
 		},
 		},
+		getTzggList(){ //通知公告
+			let data={
+				status: "4",
+			};
+			let params={
+				pageNo:1,
+				pageSize:4
+			};
+			getTzggList(data,params).then(res=>{
+				if(res.code=200){
+					console.log(res.result,'通知公告')
+					this.tableData=res.result.list;
+				}
+			})
+		},
+		changeDate(date){
+			return date.substring(0,11)
+		},
 		initG2qllx(){
 		initG2qllx(){
 			const data = [
 			const data = [
 			{ item: '国有建设用地使用权', count: 40, percent: 0.4 },
 			{ item: '国有建设用地使用权', count: 40, percent: 0.4 },