From 6bbb67d65a2b66a9c3f747650ab78f37efe10b3c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 09 三月 2024 10:13:39 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 8381f0a..c03a935 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -4,11 +4,15 @@
         <uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
             <view class="home-view">
                 <view class="head">
-					<view class="head-left" @click="ejected()"></view>
+					<view class="head-left" @click="ejected()">
+						<view class="logo"></view>
+					</view>
 					<view class="head-mid">
 						<text style="z-index: 999;">琛ヨ揣鍗曞垪琛�</text>
 					</view>
-					<view class="head-right"></view>
+					<view class="head-right">
+						<view class="time-tools">{{calendar}}</view>
+					</view>
                 </view>
                 <!-- 鏃ュ巻 -->
                 <!-- <view class="time-tools">{{calendar}}</view> -->
@@ -22,8 +26,8 @@
                             <view class="text-content">
                                 <!-- head -->
                                 <view class="swiper-head">
-                                    <view class="item-box1" style="width: 5%;">搴忓彿</view>
-                                    <view class="item-box1" style="width: 20%;">鍝佺暘</view>
+                                    <view class="item-box1" style="width: 10%;">宸ュ崟缂栧彿</view>
+                                    <view class="item-box1" style="width: 15%;">鍝佺暘</view>
                                     <view class="item-box1" style="width: 15%;">寰呰ˉ璐ф暟閲�</view>
 									<view class="item-box1" style="width: 15%;">宸茶ˉ璐ф暟閲�</view>
 									<view class="item-box1" style="width: 15%;">琛ヨ揣鐘舵��</view>
@@ -41,8 +45,8 @@
                                     display-multiple-items="10"
                                     circular="true" :autoplay="true" :interval="3000" :duration="1000" disable-touch='true'>
                                         <swiper-item :class="item.inspectSts" class="swiper-item"  v-for="(item,i) in swiperList" :key="i">
-                                            <view class="item-box" style="width: 5%;" >{{i+1}}</view>
-                                            <view class="item-box" style="width: 20%;">{{item.maktx}}</view>
+                                            <view class="item-box" style="width: 10%;" >{{item.suppCode ? item.suppCode : '--'}}</view>
+                                            <view class="item-box" style="width: 15%;">{{item.maktx}}</view>
                                             <view class="item-box" style="width: 15%;">{{item.storeReplenishment}}</view>
                                             <view class="item-box" style="width: 15%;">
 												
@@ -261,12 +265,12 @@
         onLoad() {
 			setInterval(()=>{
 				// this.getServerData()
-				// this.getDate2()
 				// this.getUrl()
 				// this.getInfo()
 				// this.getError()
 				// this.getInfo2()
 				// this.getError2()
+				this.getDate2()
 				this.getInfo3()
 				// this.getInfo4()
 				// this.controller()
@@ -291,12 +295,12 @@
 					return
 				}
 				uni.request({
-					url: that.commonUrl + "/monitor/date",
+					url: that.commonUrl + "/mobile/date",
 					method:"GET",
 					success(result) {
 						// console.log(result);
 						var res = result.data.data
-						that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+						that.calendar = res.hour + ":" + res.minute + ":" + res.second + " " + res.year + "-" + res.month + "-" + res.day
 						that.currDate = res.year + "/" + res.month + "/" + res.day
 					},
 					fail(res) {
@@ -776,11 +780,23 @@
 		background-image: url(../../static/headleft.png);
 		background-size: 110% 100%;
 	}
+	.logo {
+		position: absolute;
+		left: 30%;
+		top: 90%;
+		width: 60%;
+		height: 110%;
+		background-image: url(../../static/DENSO_logo.png);
+		background-size: 60% 60%;
+		/* background-color: #55ff7f; */
+		background-repeat: no-repeat;
+		transform: scaleX(-1);
+	}
     .time-tools {
         position: absolute;
-        right: 2%;
-        top: 2%;
-        font-size:1vw;
+        right: 4%;
+        top: 6%;
+        font-size:1.2vw;
         transform: scale(0.8);
     }
     .button-left {

--
Gitblit v1.9.1