From 34d494e0997bf861700c428f93a5d6f75a14a362 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 11 五月 2022 22:27:03 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/index.vue |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index 9f6ab1d..739f7b4 100644
--- a/Monitor-APP/pages/index/index.vue
+++ b/Monitor-APP/pages/index/index.vue
@@ -17,7 +17,7 @@
 						<view class="box-border box-border3"></view>
 						<view class="box-border box-border4"></view>
 						<view style="">
-							<text>{{newspaper}}</text>
+							<text class="animate">{{newspaper}}</text>
 						</view>
 					</view>
 				</view>
@@ -185,7 +185,7 @@
 			<!-- 杈撳叆ledId -->
 			<uni-popup ref="ledId" type="dialog">
 				<uni-popup-dialog ref="inputClose" mode="input" title="閰嶇疆ledId" value=""
-					placeholder="绀轰緥:1" @confirm="ledIdConfirm"></uni-popup-dialog>
+					placeholder="绀轰緥:188" @confirm="ledIdConfirm"></uni-popup-dialog>
 			</uni-popup>
 		</view>
 	</view>
@@ -208,9 +208,9 @@
 				yDuration:0,
 				used:317,
 				usedPr: 90,
-				stockCount:null,
-				emptyCount:null,
-				noneCount:null,
+				stockCount:0,
+				emptyCount:0,
+				noneCount:0,
 				chartsData: {
 					"Line": {
 						"categories": [],
@@ -234,10 +234,10 @@
 				week:'鏄熸湡鍥�',
 				ani:'',
 				// move: 'upMove 1.5s 1;',
-				move:false,
+				move:true,
 				topMove:'topUp',
 				floorMove:'',
-				newspaper:'鎷f枡鍑哄簱锛�4426) 婧愬簱浣嶏細1200101 鐩爣绔欙細186\n1101842-10000-22047518501\n1101842-10000-22047518502\n1101842-10000-22047518503\n1101842-10000-22047518504\n1101842-10000-22047518505\n1101842-10000-22047518506\n1101842-10000-22047518507\n1101842-10000-22047518508\n1101842-10000-22047518509\n1101842-10000-22047518510\n1101842-10000-22047518511\n1101842-10000-22047518512\n1101842-10000-22047518513\n1101842-10000-22047518514\n1101842-10000-22047518515',
+				newspaper:'鎷f枡鍑哄簱锛�4426)\n婧愬簱浣嶏細1200101\n鐩爣绔欙細186\n1101842-10000-22047518501\n1101842-10000-22047518502\n1101842-10000-22047518503\n1101842-10000-22047518504\n1101842-10000-22047518505\n1101842-10000-22047518506\n1101842-10000-22047518507\n1101842-10000-22047518508\n1101842-10000-22047518509\n1101842-10000-22047518510\n1101842-10000-22047518511\n1101842-10000-22047518512\n1101842-10000-22047518513\n1101842-10000-22047518514\n1101842-10000-22047518515',
 			}
 		},
 		mounted() {
@@ -273,13 +273,12 @@
 			getPakin () {
 				let that = this
 				uni.request({
-					url: "http://10.10.0.222:9090/jkwcs/monitor/led",
+					url: "http://" + that.baseUrl + ":9090/jkwcs/monitor/led",
 					data: {
-						ledId:'186'
+						ledId:that.baseLedId
 					},
 					method:'GET',
 					success(result) {
-						console.log(result)
 						let res = result.data
 						if (res.data) {
 							that.newspaper = res.data
@@ -292,6 +291,7 @@
 				})
 			},
 			animation() {
+				// console.log(this.baseUrl,this.baseLedId)
 				if (this.move) {
 					this.topMove = 'topUp'
 					this.floorMove = 'floorUp'
@@ -413,6 +413,33 @@
 </script>
 
 <style>
+	 .animate {
+	            display: inline-block;
+	            /* white-space: nowrap; */
+	            animation: 25s wordsLoop linear infinite normal;
+	        }
+	 
+	        @keyframes wordsLoop {
+	            0% {
+	                transform: translateY(100px);
+	                -webkit-transform: translateY(100px);
+	            }
+	            100% {
+	                transform: translateY(-100%);
+	                -webkit-transform: translateY(-100%);
+	            }
+	        }
+	 
+	        @-webkit-keyframes wordsLoop {
+	            0% {
+	                transform: translateY(100px);
+	                -webkit-transform: translateY(100px);
+	            }
+	            100% {
+	                transform: translateY(-100%);
+	                -webkit-transform: translateY(-100%);
+	            }
+	        }
 	/* animation:upMove 1.5s 1; */
 	/* downMove */
 	/* 涓婂眰鍚戜笂 */
@@ -499,7 +526,9 @@
 		height: 1080px;
 		position: relative;
 		color: #FFFFFF;
-		font-size: 100rpx;
+		text-align: center;
+		font-size: 200rpx;
+		letter-spacing: 5rpx;
 		background-image: url(../../static/background.png);
 	}
 	.container {
@@ -579,6 +608,7 @@
 		width: 96%;
 		height: 30%;
 		border: 1px solid rgba(20, 80, 136, 1);
+		overflow: hidden;
 	}
 	.box-lg {
 		height: 94%;
@@ -651,7 +681,7 @@
 		font-size: 14px;
 	}
 	.introduce-content {
-		font-size: 14px;
+		font-size: 20px;
 		padding-top: 2em;
 		text-indent: 2em;
 		line-height: 2em;

--
Gitblit v1.9.1