fix

virgo.wzfrontend/console/src/views/work/staging/project.vue

@@ -222,7 +222,6 @@
 					<div class="title">
 						<div class="title-icon"><i></i></div>
 						<span class="label">事件提醒</span>
-						<div class="more">查看更多>></div>
 					</div>
 					<div class="people-list box-background">
 						<div class="people-item">
@@ -357,26 +356,12 @@
 						<div class="more" @click="$router.push('/work/operation/week/work')">查看更多>></div>
 					</div>
 					<div class="client-list box-background">
-						<div class="record-item"
-							@click="$router.push('/work/operation/week/detail?id=U2FsdGVkX18gMsWVAvzOE8YoA53iuS%2FkMJHksfWIz1o%3D')">
-							<div class="number">01</div>
+						<div class="record-item" v-for="(item,index) in weekWorkList" :key="item.id">
+							<div class="number">{{index+1}}</div>
 							<div class="value">
-								<div class="hui-ellipsis">项目名称第4周周报</div>
-							</div>
-						</div>
-						<div class="record-item"
-							@click="$router.push('/work/operation/week/detail?id=U2FsdGVkX18gMsWVAvzOE8YoA53iuS%2FkMJHksfWIz1o%3D')">
-							<div class="number">02</div>
-							<div class="value">
-								<div class="hui-ellipsis">项目名称第3周周报</div>
-							</div>
-						</div>
-						<div class="record-item"
-							@click="$router.push('/work/operation/week/detail?id=U2FsdGVkX18gMsWVAvzOE8YoA53iuS%2FkMJHksfWIz1o%3D')">
-							<div class="number">03</div>
-							<div class="value">
-								<div class="hui-ellipsis">项目名称第2周周报</div>
+								<div class="hui-ellipsis">{{item.name}}</div>
 							</div>
+							<div class="state color-blue">第{{item.number}}期</div>
 						</div>
 					</div>
 				</div>
@@ -387,22 +372,10 @@
 						<div class="more" @click="$router.push('/work/operation/log/person')">查看更多>></div>
 					</div>
 					<div class="client-list box-background">
-						<div class="record-item" @click="$router.push('/work/operation/log/person')">
-							<div class="number">01</div>
-							<div class="value">
-								<div class="hui-ellipsis">xxx在xxx时间新增工单</div>
-							</div>
-						</div>
-						<div class="record-item" @click="$router.push('/work/operation/log/person')">
-							<div class="number">02</div>
-							<div class="value">
-								<div class="hui-ellipsis">xxx在xxx时间处理工单</div>
-							</div>
-						</div>
-						<div class="record-item" @click="$router.push('/work/operation/log/person')">
-							<div class="number">03</div>
+						<div class="record-item" v-for="(item,index) in logList" :key="item.id">
+							<div class="number">{{index+1}}</div>
 							<div class="value">
-								<div class="hui-ellipsis">xxx在xxx时间新增资产</div>
+								<div class="hui-ellipsis">{{item.message}}</div>
 							</div>
 						</div>
 					</div>
@@ -458,6 +431,12 @@
 	import {
 		getDevicePartListByQuery
 	} from '@/httpApi/property'
+	import {
+		getWeekList
+	} from '@/httpApi/operation'
+	import {
+		getMessagePageListByQuery
+	} from '@/httpApi/message'
 	import playVideo from '@/components/common/playVideo.vue'
 	export default {
 		data() {
@@ -562,13 +541,9 @@
 						offLineNumber: 0
 					}
 				},
-				workList: [{
-					id: 1,
-					name: '周报'
-				}, {
-					id: 2,
-					name: '月报'
-				}],
+				weekWorkList: [],
+				logList: [],
+				workList: [],
 				nowWorkId: 1,
 				title: '',
 				visible: false,
@@ -591,10 +566,12 @@
 				this.initClientData();
 				this.initWeather();
 				this.initProject();
-				this.initMonitor();
+				// this.initMonitor();
 				this.initRemind();
 				this.initOrder();
 				this.initDevice();
+				this.initWeekWork();
+				this.initLog();
 			},
 			initHouseData() {
 				houseManagement(this.project.id).then(res => {
@@ -691,6 +668,40 @@
 					}
 				})
 			},
+			initRemind() {
+				eventManagement(this.project.id).then(res => {
+					if (res.state) this.remindData = res.data;
+				})
+			},
+			initOrder() {
+				orderManagement(this.project.id).then(res => {
+					if (res.state) this.orderData = res.data;
+				})
+			},
+			initDevice() {
+				deviceManagement(this.project.id).then(res => {
+					if (res.state) this.deviceData = res.data;
+				})
+			},
+			initWeekWork() {
+				getWeekList(this.$store.getters.project.id).then(res => {
+					if (res.state) {
+						this.weekWorkList = res.data;
+					}
+				})
+			},
+			initLog() {
+				getMessagePageListByQuery(1, 20, {
+					projectId: this.$store.getters.project.id,
+					organizationId: this.$store.getters.organization.id
+				}).then(res => {
+					if (res.state) {
+						this.logList = res.data.dataList.map(node => {
+							return Object.assign(node, JSON.parse(node.json));
+						});
+					}
+				})
+			},
 			sortDeviceList(data) {
 				for (var i = 0; i < data.length; i++) {
 					this.monitorDeviceList = this.monitorDeviceList.concat(data[i].deviceList);
@@ -712,21 +723,6 @@
 				this.nowBill = item;
 				this.nowPaymentData = this.paymentData[this.nowBill.type];
 			},
-			initRemind() {
-				eventManagement(this.project.id).then(res => {
-					if (res.state) this.remindData = res.data;
-				})
-			},
-			initOrder() {
-				orderManagement(this.project.id).then(res => {
-					if (res.state) this.orderData = res.data;
-				})
-			},
-			initDevice() {
-				deviceManagement(this.project.id).then(res => {
-					if (res.state) this.deviceData = res.data;
-				})
-			},
 			returnPercent(data) {
 				let num = 0
 				if (data.totalNumber) {
@@ -1287,6 +1283,10 @@
 
 			.work-log {
 				margin-top: 10px;
+				flex: 1;
+				height: 0;
+				display: flex;
+				flex-direction: column;
 
 				.client-list {
 					height: 128px;