From 269a02ebfd5deb83b6fec053c3a89c618214c877 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 04 四月 2023 08:00:55 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 5077a88..6ed6177 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -410,7 +410,8 @@
 				this.initlineChart()
 				this.initPieChart()
 				this.getOther()
-				this.getDate()
+				// this.getDate()
+				this.getDate2()
 				this.getInfo()
 				this.getError()
 				// this.getInfo2()
@@ -500,6 +501,12 @@
 								that.infoText.title = '妫�鏂欏嚭搴�'
 							} else if(res.data[0].ioType === 107) {
 								that.infoText.title = '鐩樼偣鍑哄簱'
+							} else if(res.data[0].ioType === 1) {
+								that.infoText.title = '鍏ュ簱'
+							} else if(res.data[0].ioType === 10) {
+								that.infoText.title = '绌烘墭鍏ュ簱'
+							} else if(res.data[0].ioType === 110) {
+								that.infoText.title = '绌烘墭鍑哄簱'
 							}
 							that.infoText.barcode = res.data[0].barcode
 							that.swiperList = res.data[0].matDtos
@@ -659,6 +666,19 @@
 				this.getUrl()
 				this.ejectShow = false
 			},
+			// 鏃ュ巻 鏈嶅姟鍣�
+			getDate2() {
+				let that = this
+				uni.request({
+					url: that.commonUrl + "/monitor/date",
+					method:"GET",
+					success(result) {
+						var res = result.data.data
+						that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+					}
+				})
+			},
+			
 			// 鏃ュ巻
 			getDate() {
 				var dt = new Date();

--
Gitblit v1.9.1