From b4a3f1099b0464d6eb1b7d2620a66e632fc3c402 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 一月 2024 15:31:00 +0800
Subject: [PATCH] #

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

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 15ca418..e9ab206 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -233,15 +233,15 @@
 									display-multiple-items="3"
 									circular="true" :autoplay="true" :interval="3000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<view style="width: 20%;">{{i+1}}\5</view>
+											<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
 											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
 											<view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
-											<view style="width: 40%;">瀹㈡埛: {{item.info}}</view>
+											<view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
 											
 											
-											<view style="width: 20%;">鏁伴噺: {{item.count}}</view>
+											<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
 											<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
-											<view style="width: 40%;">澶囨敞: {{item.bz}}</view>
+											<view style="width: 30%;">澶囨敞: {{item.memo}}</view>
 											
 											
 										</swiper-item>
@@ -282,7 +282,7 @@
 				<!-- 寮瑰嚭title -->
 				<view class="eject-title">淇敼 / 閰嶇疆</view>
 				<!-- input -->
-				<view class="eject-input">
+				<scroll-view scroll-y class="eject-input">
 					<view class="item">
 						<view class="desc">ip锛�</view>
 						<view class="input">
@@ -313,7 +313,7 @@
 							<input type="text" v-model="baseUrl">
 						</view>
 					</view>
-				</view>
+				</scroll-view>
 				<!-- button -->
 				<view class="eject-button">
 					<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -572,6 +572,7 @@
 						that.timeOut = false
 						that.times = 0
 						var	res = result.data
+						console.log(res);
 						if (res.data && res.data !== "") {
 							var errorInfo = res.data
 							if (that.infoType == 1) {
@@ -1060,12 +1061,15 @@
 		text-align: center;
 	}
 	.eject-input {
-		
+		margin-top: 2vh;
+		height: 25vh;
+		/* background-color: #00163E; */
+		::-webkit-scrollbar{display:none}
 	}
 	.item {
 		display: flex;
 		align-items: center;
-		margin: 2vh 0 0 0;
+		margin: 1vh 0 0 0;
 		font-size: 1.5vw;
 		color: #363636;
 	}

--
Gitblit v1.9.1