From edc8494de36373d8d67c69201c4eeed0b0f96f08 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 16 十二月 2023 13:10:39 +0800
Subject: [PATCH] #

---
 Monitor-APP/mockdata/demodata.json |  376 ++++++++++++++--------
 Monitor-APP/pages/index/data.json  |  466 ++++++++++++++++-----------
 Monitor-APP/pages/home/home.vue    |  150 +++++---
 3 files changed, 599 insertions(+), 393 deletions(-)

diff --git a/Monitor-APP/mockdata/demodata.json b/Monitor-APP/mockdata/demodata.json
index 587603f..ab2ec4a 100644
--- a/Monitor-APP/mockdata/demodata.json
+++ b/Monitor-APP/mockdata/demodata.json
@@ -1,76 +1,165 @@
 {
-	"localdata": [
-    {"value":35, "text":"2016", "group":"鐩爣鍊�"},
-    {"value":18, "text":"2016", "group":"瀹屾垚閲�"},
-    {"value":36, "text":"2017", "group":"鐩爣鍊�"},
-    {"value":27, "text":"2017", "group":"瀹屾垚閲�"},
-    {"value":31, "text":"2018", "group":"鐩爣鍊�"},
-    {"value":21, "text":"2018", "group":"瀹屾垚閲�"},
-    {"value":33, "text":"2019", "group":"鐩爣鍊�"},
-    {"value":24, "text":"2019", "group":"瀹屾垚閲�"},
-    {"value":13, "text":"2020", "group":"鐩爣鍊�"},
-    {"value":6, "text":"2020", "group":"瀹屾垚閲�"},
-    {"value":34, "text":"2021", "group":"鐩爣鍊�"},
-    {"value":28, "text":"2021", "group":"瀹屾垚閲�"}
-  ],
-  "localdataB": [
-    {"value":50, "text":"涓�鐝�"},
-    {"value":30, "text":"浜岀彮"},
-    {"value":20, "text":"涓夌彮"},
-    {"value":18, "text":"鍥涚彮"},
-    {"value":8, "text":"浜旂彮"}
-  ],
-  "TLine": {
-  	"series": [{
-  		"name": "鏃堕棿杞�1",
-  		"data": [[10000,55],[30000,25],[50000,55],[70000,25],[90000,55]]
-  	}, {
-  		"name": "鏃堕棿杞�2",
-  		"data": [[0,25],[20000,55],[40000,25],[60000,55],[80000,25]]
-  	}, {
-  		"name": "鏃堕棿杞�3",
-  		"data": [[0,55],[15000,25],[30000,55],[45000,25],[60000,55]]
-  	}]
-  },
-  "Scatter": {
-  	"series": [{
-  		"name": "鏁g偣涓�",
-  		"data": [[10.0, 8.04],
-            [8.07, 6.95],
-            [13.0, 7.58],
-            [9.05, 8.81],
-            [11.0, 8.33],
-            [14.0, 7.66],
-            [13.4, 6.81],
-            [10.0, 6.33],
-            [14.0, 8.96],
-            [12.5, 6.82]]
-  	}, {
-  		"name": "鏁g偣浜�",
-  		"data": [[9.15, 7.20],
-            [11.5, 7.20],
-            [3.03, 4.23],
-            [12.2, 7.83],
-            [2.02, 4.47],
-            [1.05, 3.33],
-            [4.05, 4.96],
-            [6.03, 7.24],
-            [12.0, 6.26],
-            [12.0, 8.84],
-            [7.08, 5.82],
-            [5.02, 5.68]]
-  	}]
-  },
-  "Bubble": {
-  	"series": [{
-  		"name": "姘旀场涓�",
-  		"data": [[95,95,23,"鏍囬1"],[30,55,33,"鏍囬2"]]
-  	}, {
-  		"name": "姘旀场浜�",
-  		"data": [[130,30,30,"鏍囬3"],[200,90,40,"鏍囬4"]]
-  	}]
-  },
-  "Column": {
+	"localdata": [{
+			"value": 35,
+			"text": "2016",
+			"group": "鐩爣鍊�"
+		},
+		{
+			"value": 18,
+			"text": "2016",
+			"group": "瀹屾垚閲�"
+		},
+		{
+			"value": 36,
+			"text": "2017",
+			"group": "鐩爣鍊�"
+		},
+		{
+			"value": 27,
+			"text": "2017",
+			"group": "瀹屾垚閲�"
+		},
+		{
+			"value": 31,
+			"text": "2018",
+			"group": "鐩爣鍊�"
+		},
+		{
+			"value": 21,
+			"text": "2018",
+			"group": "瀹屾垚閲�"
+		},
+		{
+			"value": 33,
+			"text": "2019",
+			"group": "鐩爣鍊�"
+		},
+		{
+			"value": 24,
+			"text": "2019",
+			"group": "瀹屾垚閲�"
+		},
+		{
+			"value": 13,
+			"text": "2020",
+			"group": "鐩爣鍊�"
+		},
+		{
+			"value": 6,
+			"text": "2020",
+			"group": "瀹屾垚閲�"
+		},
+		{
+			"value": 34,
+			"text": "2021",
+			"group": "鐩爣鍊�"
+		},
+		{
+			"value": 28,
+			"text": "2021",
+			"group": "瀹屾垚閲�"
+		}
+	],
+	"localdataB": [{
+			"value": 50,
+			"text": "涓�鐝�"
+		},
+		{
+			"value": 30,
+			"text": "浜岀彮"
+		},
+		{
+			"value": 20,
+			"text": "涓夌彮"
+		},
+		{
+			"value": 18,
+			"text": "鍥涚彮"
+		},
+		{
+			"value": 8,
+			"text": "浜旂彮"
+		}
+	],
+	"TLine": {
+		"series": [{
+			"name": "鏃堕棿杞�1",
+			"data": [
+				[10000, 55],
+				[30000, 25],
+				[50000, 55],
+				[70000, 25],
+				[90000, 55]
+			]
+		}, {
+			"name": "鏃堕棿杞�2",
+			"data": [
+				[0, 25],
+				[20000, 55],
+				[40000, 25],
+				[60000, 55],
+				[80000, 25]
+			]
+		}, {
+			"name": "鏃堕棿杞�3",
+			"data": [
+				[0, 55],
+				[15000, 25],
+				[30000, 55],
+				[45000, 25],
+				[60000, 55]
+			]
+		}]
+	},
+	"Scatter": {
+		"series": [{
+			"name": "鏁g偣涓�",
+			"data": [
+				[10.0, 8.04],
+				[8.07, 6.95],
+				[13.0, 7.58],
+				[9.05, 8.81],
+				[11.0, 8.33],
+				[14.0, 7.66],
+				[13.4, 6.81],
+				[10.0, 6.33],
+				[14.0, 8.96],
+				[12.5, 6.82]
+			]
+		}, {
+			"name": "鏁g偣浜�",
+			"data": [
+				[9.15, 7.20],
+				[11.5, 7.20],
+				[3.03, 4.23],
+				[12.2, 7.83],
+				[2.02, 4.47],
+				[1.05, 3.33],
+				[4.05, 4.96],
+				[6.03, 7.24],
+				[12.0, 6.26],
+				[12.0, 8.84],
+				[7.08, 5.82],
+				[5.02, 5.68]
+			]
+		}]
+	},
+	"Bubble": {
+		"series": [{
+			"name": "姘旀场涓�",
+			"data": [
+				[95, 95, 23, "鏍囬1"],
+				[30, 55, 33, "鏍囬2"]
+			]
+		}, {
+			"name": "姘旀场浜�",
+			"data": [
+				[130, 30, 30, "鏍囬3"],
+				[200, 90, 40, "鏍囬4"]
+			]
+		}]
+	},
+	"Column": {
 		"categories": ["2016", "2017", "2018", "2019", "2020", "2021"],
 		"series": [{
 			"name": "鐩爣鍊�",
@@ -84,10 +173,16 @@
 		"categories": ["2016", "2017", "2018", "2019", "2020", "2021"],
 		"series": [{
 			"name": "鎴愪氦閲�1",
-			"data": [15, {"value": 20,"color": "#f04864"}, 45, 37, 43, 34]
+			"data": [15, {
+				"value": 20,
+				"color": "#f04864"
+			}, 45, 37, 43, 34]
 		}, {
 			"name": "鎴愪氦閲�2",
-			"data": [30, {"value": 40,"color": "#facc14"}, 25, 14, 34, 18]
+			"data": [30, {
+				"value": 40,
+				"color": "#facc14"
+			}, 25, 14, 34, 18]
 		}]
 	},
 	"Mix": {
@@ -99,12 +194,15 @@
 			"style": "curve"
 		}, {
 			"name": "鏌�1",
-      "index":1,
-			"data": [40, {"value": 30,"color": "#f04864"}, 55, 110, 24, 58],
+			"index": 1,
+			"data": [40, {
+				"value": 30,
+				"color": "#f04864"
+			}, 55, 110, 24, 58],
 			"type": "column"
 		}, {
 			"name": "鏌�2",
-      "index":1,
+			"index": 1,
 			"data": [50, 20, 75, 60, 34, 38],
 			"type": "column"
 		}, {
@@ -121,7 +219,7 @@
 			"color": "#2fc25b"
 		}, {
 			"name": "鐐�",
-      "index":2,
+			"index": 2,
 			"data": [100, 80, 125, 150, 112, 132],
 			"type": "point",
 			"color": "#f04864"
@@ -137,40 +235,38 @@
 			"data": [70, 40, 65, 100, 44, 68]
 		}]
 	},
-  "Pie": {
-    "series": [{
-      "name": "涓�鐝�",
-      "data": 50
-    }, {
-      "name": "浜岀彮",
-      "data": 30
-    }, {
-      "name": "涓夌彮",
-      "data": 20
-    }, {
-      "name": "鍥涚彮",
-      "data": 18
-    }, {
-      "name": "浜旂彮",
-      "data": 8
-    }]
-  },
-  "PieA": {
-  	"series": [{
-  		"data": [
-        {
-        	"name": "鍦ㄥ簱",
-        	"value": 314
-        }, {
-        	"name": "绌�",
-        	"value": 1175
-        }, {
-        	"name": "绂佺敤",
-        	"value": 96
-        }
-      ]
-  	}]
-  },
+	"Pie": {
+		"series": [{
+			"name": "涓�鐝�",
+			"data": 50
+		}, {
+			"name": "浜岀彮",
+			"data": 30
+		}, {
+			"name": "涓夌彮",
+			"data": 20
+		}, {
+			"name": "鍥涚彮",
+			"data": 18
+		}, {
+			"name": "浜旂彮",
+			"data": 8
+		}]
+	},
+	"PieA": {
+		"series": [{
+			"data": [{
+				"name": "鍦ㄥ簱",
+				"value": 314
+			}, {
+				"name": "绌�",
+				"value": 1175
+			}, {
+				"name": "绂佺敤",
+				"value": 96
+			}]
+		}]
+	},
 	"Radar": {
 		"categories": ["缁村害1", "缁村害2", "缁村害3", "缁村害4", "缁村害5", "缁村害6"],
 		"series": [{
@@ -360,58 +456,62 @@
 		],
 		"series": [{
 			"name": "鎴愪氦閲�1",
-			"data": [15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45]
+			"data": [15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45,
+				37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15,
+				20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37,
+				43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45, 37, 43, 15, 20, 45
+			]
 		}]
 	},
-	"Word":{
+	"Word": {
 		"series": [{
 			"name": "璺ㄥ叏绔浘琛�",
 			"textSize": 25
-			}, {
+		}, {
 			"name": "寰俊灏忕▼搴�",
 			"textSize": 20
-			},{
+		}, {
 			"name": "鏀粯瀹濆皬绋嬪簭",
-			"textSize":20
-			},{
+			"textSize": 20
+		}, {
 			"name": "鐧惧害灏忕▼搴�",
-			"textSize":20
-			}, {
+			"textSize": 20
+		}, {
 			"name": "QQ灏忕▼搴�",
 			"textSize": 20
-			}, {
+		}, {
 			"name": "澶存潯灏忕▼搴�",
 			"textSize": 20
-			},{
+		}, {
 			"name": "鎶栭煶灏忕▼搴�",
-			"textSize":20
-			}, {
+			"textSize": 20
+		}, {
 			"name": "360灏忕▼搴�",
 			"textSize": 20
-			}, {
+		}, {
 			"name": "璺ㄥ叏绔�",
 			"textSize": 10
-			},{
+		}, {
 			"name": "璺ㄥ叏绔�",
-			"textSize":12
-			}, {
+			"textSize": 12
+		}, {
 			"name": "璺ㄥ叏绔�",
 			"textSize": 10
-			},{
+		}, {
 			"name": "璺ㄥ叏绔�",
-			"textSize":12
-			}, {
+			"textSize": 12
+		}, {
 			"name": "璺ㄥ叏绔�",
 			"textSize": 10
-			},{
+		}, {
 			"name": "璺ㄥ叏绔�",
-			"textSize":12
-			}, {
+			"textSize": 12
+		}, {
 			"name": "璺ㄥ叏绔�",
 			"textSize": 10
-			},{
+		}, {
 			"name": "璺ㄥ叏绔�",
-			"textSize":12
-			}]
+			"textSize": 12
+		}]
 	}
-}
+}
\ No newline at end of file
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 00e6de4..a283896 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -15,59 +15,19 @@
 						<view class="mian-item-box">
 							<y-box>
 								<view class="box-item">
-									<text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
-									<text class="item-subTitle">Automatic Storageand Retrieval System</text>
-									<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁$畻鏈哄強鏉″舰鐮佹妧鏈��</text>
+									<text class="item-title">鎻愬崌鏈鸿繍琛屾暟鎹�</text>
+									<text class="item-subTitle">Hoist operating data</text>
+									<view style="width: 100%;height: 25vh;">
+										<qiun-data-charts type="column" :chartData="chartsDataLine2" :opts="opts" :echartsH5="true" :echartsApp="true"/>
+									</view>
 								</view>
 								<view class="box-item">
-									<text class="item-title">浠撳簱鏁版嵁</text>
-									<text class="item-subTitle">warehouse data</text>
+									<text class="item-title">绌挎杞﹁繍琛屾暟鎹�</text>
+									<text class="item-subTitle">Shuttle operation data</text>
 									<view class="img-box">
-										
-										<view class="item-img">
-											<image src="../../static/a1.png" mode="aspectFit"></image>
-											<view class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
-												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(鍗冪背)</view>
-											</view>
+										<view style="width: 100%;height: 25vh;">
+											 <qiun-data-charts  type="ring" :chartData="chartsDataPie3" />
 										</view>
-										
-										<view class="item-img">
-											<image src="../../static/b1.png" mode="aspectFit"></image>
-											<view class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
-												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(鍗冪背)</view>
-											</view>
-										</view>
-										
-										<view class="item-img">
-											<image src="../../static/c1.png" mode="aspectFit"></image>
-											<view class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
-												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(灏忔椂)</view>
-											</view>
-										</view>
-										
-										<view class="item-img">
-											<image src="../../static/d1.png" mode="aspectFit"></image>
-											<view class="flex-col" style="width: calc(100% - 5vw);">
-												<view class="flex-row" style="position: relative;" >
-													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
-													<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
-												</view>
-												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(灏忔椂)</view>
-											</view>
-										</view>
-										
 									</view>
 								</view>
 								<view class="box-item">
@@ -90,7 +50,7 @@
 									
 									<view class="flex-col" style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
 										<!-- 杩涘害鏉� -->
-										<view class="flex-row" style="width: 100%;position: relative;margin-top: 5%;">
+										<view class="flex-row" style="width: 100%;position: relative;">
 											<view class="progressBar" style="width: 80%;height: 2vw;">
 												<view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
 											</view>
@@ -346,8 +306,8 @@
 				errorBoardShow: false,
 				carInfo: [],
 				series: [],
-				homeViewShow: false,
-				infoViewShow: true	,
+				homeViewShow: true,
+				infoViewShow: false	,
 				errorInfoViewShow: false,
 				homeMode: [],
 				infoMode: [],
@@ -368,6 +328,10 @@
 						"categories": [],
 						"series": []
 					},
+					"Line2": {
+						"categories": [],
+						"series": []
+					},
 					"Pie": {
 						"series": [{
 							"data": []
@@ -378,6 +342,7 @@
 				calendar: '',
 				ringOpts:{},
 				chartsDataLine1: {},
+				chartsDataLine2: {},
 				chartsDataPie2: {},
 				fontSize: '',
 				height: '',
@@ -414,7 +379,42 @@
 				timeOut: false,
 				times: 0,
 				currDate: '',
-				textred: 'textred'
+				textred: 'textred',
+				opts: {
+					rotate: false,
+					rotateLock: false,
+					color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
+					padding: [5,5,5,5],
+					dataLabel: true,
+					enableScroll: false,
+					legend: {
+					  show: true,
+					  position: "right",
+					  lineHeight: 25
+					},
+					title: {
+					  name: "鏀剁泭鐜�",
+					  fontSize: 15,
+					  color: "#FFF"
+					},
+					subtitle: {
+					  name: "70%",
+					  fontSize: 25,
+					  // color: "#7cb5ec"
+					},
+					extra: {
+						ring: {
+							ringWidth: 60,
+							activeOpacity: 0.5,
+							activeRadius: 10,
+							offsetAngle: 0,
+							labelWidth: 15,
+							border: true,
+							// borderWidth: 3,
+							borderColor: "#FFFFFF"
+						}
+					}
+				}
 			}
 		},
 		onShow() {
@@ -440,12 +440,13 @@
 		
 			this.getDate2()
 			setTimeout(()=>{
-				// this.getServerData()
+				this.getServerData()
+				this.getShuttle()
 				// this.initlineChart()
 				// this.initPieChart()
 				// this.getOther()
 				setTimeout(()=>{
-					// this.getServerData()
+					this.getServerData()
 					// this.initlineChart()
 					// this.initPieChart()
 					// this.getOther()
@@ -460,15 +461,16 @@
 		},
 		onLoad() {
 			setInterval(()=>{
+				// this.getServerData()
 				this.getDate2()
 				this.getUrl()
-				this.getInfo()
-				this.getError()
-				this.getCarInfo()
+				// this.getInfo()
+				// this.getError()
+				// this.getCarInfo()
 				// this.getCarInfoTest()
 				// this.getInfo2()
 				// this.getError2()
-				this.controller2()
+				this.controller()
 			},1000)
 			
 			// setInterval(()=>{
@@ -483,6 +485,21 @@
 			},600000)
 		},
 		methods: {
+			getShuttle() {
+				let res = ycqdata.infoData2.data
+				this.shuttleInfoModel(res)
+			},
+			shuttleInfoModel(res) {
+				if (res.code == 200 && res.data != '') {
+					let arr = []
+					for (let k of res.data.shuttle) {
+						arr.push(k.count)
+					}
+					this.chartsData.Line2.series = arr
+				} else {
+					
+				}
+			},
 			changeErrorShow() {
 				this.errorBoardShow = !this.errorBoardShow
 			},
@@ -525,8 +542,13 @@
 				this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
 			},
 			getServerData() {
-				this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
-				this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
+				// this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
+				// this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
+				
+				this.chartsDataLine1=JSON.parse(JSON.stringify(demodata.Line))
+				this.chartsDataPie2=JSON.parse(JSON.stringify(demodata.Pie))
+				this.chartsDataLine2=JSON.parse(JSON.stringify(demodata.Line))
+				this.chartsDataPie3=JSON.parse(JSON.stringify(demodata.Pie))
 			},
 			// 鑾峰彇閿欒淇℃伅
 			getInfo2() {
@@ -596,7 +618,7 @@
 								return
 							}
 							that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
-							that.infoType = 1
+							that.infoType = 0
 						}
 					}
 				})
@@ -635,7 +657,7 @@
 						return;
 					}
 					that.infoText.title = '鑷姩浠撳簱WCS鐩戞帶骞冲彴'
-					that.infoType = 1
+					that.infoType = 0
 				}
 			},
 			controller2() {
@@ -1041,7 +1063,7 @@
 		width: 5vw;
 	}
 	.progressBar {
-		margin-top: 9%;
+		margin-top: 5%;
 		/* width: 100%; */
 		height: 20%;
 		background-color: #233751;
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 1478941..ff6f8c1 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -1,180 +1,265 @@
 {
-	"dataInfo2":
-		{"data":{"msg": "鎿嶄綔鎴愬姛","code": 200,"data": [{
-													"title":"鍏ㄦ澘鍑哄簱",
-																"workNo":8046,
-																"staNo":204,
-																"sourceStaNo":null,
-																"locNo":null,
-																"sourceLocNo":"1500502",
-																"barcode": "80009901",
-																"matDtos":[
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "23129502652,23129502651,23129502652,23129502652"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		},
-																		{
-																			"matNo":"230309103100005",
-																			"maknx":"瀹氬瓙绾垮湀",
-																			"batch":null,"count":40.0,
-																			"specs":"RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
-																			"total": 1055,
-																			"containerCode": 1000000268,
-																			"orderNo": "1699507854268"
-																		}
-																		
-																		
-																	],
-																"emptyMk":false,
-																"ioType":101
-												}]
-		}},
-	"dataError2":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":""}},
-	"carError": {"data": {
+	"dataInfo2": {
+		"data": {
 			"msg": "鎿嶄綔鎴愬姛",
 			"code": 200,
-			"data": [
-				{
-					"deviceNo": 1,
-					"errorMsg": "涓㈠け鎰熺煡鐗�",
-					"device": "鍥涘悜杞�"
-				}, {
-					"deviceNo": 2,
-					"errorMsg": "鍓嶈秴闄愯秴閲�",
-					"device": "鎻愬崌鏈�"
-				}
-			]
-	}},
-	"lineData":{
+			"data": [{
+				"title": "鍏ㄦ澘鍑哄簱",
+				"workNo": 8046,
+				"staNo": 204,
+				"sourceStaNo": null,
+				"locNo": null,
+				"sourceLocNo": "1500502",
+				"barcode": "80009901",
+				"matDtos": [{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "23129502652,23129502651,23129502652,23129502652"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					},
+					{
+						"matNo": "230309103100005",
+						"maknx": "瀹氬瓙绾垮湀",
+						"batch": null,
+						"count": 40.0,
+						"specs": "RV-E075/100-蠁22閿�8瀛旀繁46閿敭閿敭閿敭",
+						"total": 1055,
+						"containerCode": 1000000268,
+						"orderNo": "1699507854268"
+					}
+
+
+				],
+				"emptyMk": false,
+				"ioType": 101
+			}]
+		}
+	},
+	"dataError2": {
+		"data": {
+			"msg": "鎿嶄綔鎴愬姛",
+			"code": 200,
+			"data": ""
+		}
+	},
+	"infoData2": {
+		"data": {
+			"msg": "鎿嶄綔鎴愬姛",
+			"code": 200,
+			"data": {
+				"shuttle": [{
+						"count": 7513,
+						"shuttle_no": 1
+					},
+					{
+						"count": 7862,
+						"shuttle_no": 2
+					},
+					{
+						"count": 6013,
+						"shuttle_no": 3
+					},
+					{
+						"count": 4831,
+						"shuttle_no": 4
+					},
+					{
+						"count": 4598,
+						"shuttle_no": 5
+					},
+					{
+						"count": 4216,
+						"shuttle_no": 6
+					},
+					{
+						"count": 6661,
+						"shuttle_no": 7
+					},
+					{
+						"count": 6405,
+						"shuttle_no": 8
+					},
+					{
+						"count": 4385,
+						"shuttle_no": 9
+					},
+					{
+						"count": 3803,
+						"shuttle_no": 10
+					}
+				],
+				"lift": [{
+						"lift_no": 1,
+						"count": 2162
+					},
+					{
+						"lift_no": 2,
+						"count": 2422
+					},
+					{
+						"lift_no": 3,
+						"count": 1783
+					}
+				]
+			}
+		}
+	},
+	"carError": {
+		"data": {
+			"msg": "鎿嶄綔鎴愬姛",
+			"code": 200,
+			"data": [{
+				"deviceNo": 1,
+				"errorMsg": "涓㈠け鎰熺煡鐗�",
+				"device": "鍥涘悜杞�"
+			}, {
+				"deviceNo": 2,
+				"errorMsg": "鍓嶈秴闄愯秴閲�",
+				"device": "鎻愬崌鏈�"
+			}]
+		}
+	},
+	"lineData": {
 		"msg": "鎿嶄綔鎴愬姛",
 		"code": 200,
 		"data": {
-			"rows": [
-				{
+			"rows": [{
 					"name": "鍏ュ簱鏁伴噺",
-					"data": [0,0,0,0,1,1,0,0,4,4,0,4]
+					"data": [0, 0, 0, 0, 1, 1, 0, 0, 4, 4, 0, 4]
 				},
 				{
 					"name": "鍑哄簱鏁伴噺",
@@ -196,7 +281,8 @@
 			]
 		}
 	},
-	"pieData":{"msg": "鎿嶄綔鎴愬姛",
+	"pieData": {
+		"msg": "鎿嶄綔鎴愬姛",
 		"code": 200,
 		"data": {
 			"emptyCount": 3582,
@@ -205,8 +291,7 @@
 			"stockCunt": 2,
 			"usedPr": 0.1,
 			"used": 2,
-			"pie": [
-				{
+			"pie": [{
 					"name": "鍦ㄥ簱",
 					"value": 2
 				},
@@ -225,21 +310,20 @@
 			]
 		}
 	},
-	"other":{
-    "msg": "鎿嶄綔鎴愬姛",
-    "code": 200,
-    "data": {
-        "xDistance": 15651.0,
-        "xSpeed": 32704.0,
-        "zSpeed": 32704.0,
-        "yDistance": 15,
-        "yDuration": 0.0,
-        "ySpeed": 32704.0,
-        "xDuration": 0.0,
-        "content": "",
-        "forkPos": 1,
-        "isShow": false
-    }
-}
-}
-					
+	"other": {
+		"msg": "鎿嶄綔鎴愬姛",
+		"code": 200,
+		"data": {
+			"xDistance": 15651.0,
+			"xSpeed": 32704.0,
+			"zSpeed": 32704.0,
+			"yDistance": 15,
+			"yDuration": 0.0,
+			"ySpeed": 32704.0,
+			"xDuration": 0.0,
+			"content": "",
+			"forkPos": 1,
+			"isShow": false
+		}
+	}
+}
\ No newline at end of file

--
Gitblit v1.9.1