From b9a764be15ef6ecc13caf85e7556282c4cb3d16a Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 12 五月 2022 20:58:49 +0800
Subject: [PATCH] #

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

diff --git a/Monitor-APP/pages/index/index.vue b/Monitor-APP/pages/index/index.vue
index e2a51d6..23606d6 100644
--- a/Monitor-APP/pages/index/index.vue
+++ b/Monitor-APP/pages/index/index.vue
@@ -1,6 +1,34 @@
 <template>
 	<!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":"鎷f枡鍑哄簱锛�4426)\n婧愬簱浣嶏細1200101\n鐩爣绔欙細186\n1101842-10000-22047518517\n\n"} -->
 	<!-- "鎷f枡鍑哄簱锛�4426)\n婧愬簱浣嶏細1200101\n鐩爣绔欙細186\n1101842-10000-22047518517\n\n" -->
+	<!-- {"msg":"鎿嶄綔鎴愬姛",
+	"code":200,
+	"data":[{
+		"title":"鍏ㄦ澘鍑哄簱",
+		"workNo":7016,
+		"ioType":101, 101 鍏ㄦ澘鍑哄簱  103 妫�鏂欏嚭搴�
+		"staNo":181,
+		"sourceStaNo":null,
+		"locNo":null,
+		"sourceLocNo":"0900107",
+		"matDtos":[
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037502300","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505146","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504801","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507729","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507727","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507731","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504807","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504805","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504797","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504794","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504791","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504793","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505141","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027507728","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22027504810","count":1.0},
+			{"matnr":"1100349-10000","maknx":"C5S-4-M03/333/KS","batch":"22037505148","count":1.0}],
+			"emptyMk":false}]} -->
 	<view class="container">
 		<view class="floor-screen" :class="floorMove" >
 			<view class="head">
@@ -16,8 +44,14 @@
 						<view class="box-border box-border2"></view>
 						<view class="box-border box-border3"></view>
 						<view class="box-border box-border4"></view>
-						<view style="">
+						<view style="width: 10%;height: 100%;background-color: #007AFF;display: inline-block;float: left;">
+							<text>鍏ㄦ澘鍑哄簱</text>
+						</view>
+						<view style="width: 80%;height: 100%;background-color: #063A7B;display: inline-block;float: left;">
 							<text class="animate">{{newspaper}}</text>
+						</view>
+						<view style="width: 10%;height: 100%;background-color: #00428a;display: inline-block;float: right;">
+							<text>186</text>
 						</view>
 					</view>
 				</view>
@@ -201,7 +235,7 @@
 				show: true,
 				modeClass: 'fade',
 				styles: {},
-				baseUrl:'192.168.2.20',
+				baseUrl:'10.10.0.200',
 				baseLedId:'',
 				value: '',
 				xDistance: 0,
@@ -289,9 +323,11 @@
 					},
 					method:'GET',
 					success(result) {
+						console.log(result)
+						var newsData = ''
 						let res = result.data
-						if (res.data) {
-							that.newspaper = res.data
+						if (res.data[0]) {
+							that.newspaper = res.data[0].matDtos
 							that.move = false
 						} else {
 							that.newspaper = ''
@@ -423,8 +459,8 @@
 </script>
 
 <style>
-	 .animate {
-	            display: inline-block;
+	.animate {
+		display: inline-block;
 	            /* white-space: nowrap; */
 	            animation: 25s wordsLoop linear infinite normal;
 	        }

--
Gitblit v1.9.1