Merge branch 'ZHNY_WW' into ZHNY_DCF

src/views/Table/components/dsnl.vue

@@ -30,8 +30,8 @@
 					</div>
 					<div class="shape4">
 						<img src="@/assets/images/dengji5.png" style="width: 46rem;vertical-align: -20%;"/>
-						<span style="margin-left: 20rem;font-weight: 400;font-size: 20rem;color: rgb(200, 250, 255);">3764</span>
-						<span style="font-size: 10rem;margin-left: 9rem;color: rgb(200, 250, 255);">公顷</span>
+						<span style="margin-left: 32rem;font-weight: 400;font-size: 20rem;color: rgb(200, 250, 255);">3764</span>
+						<span style="font-size: 10rem;color: rgb(200, 250, 255);">公顷</span>
 					</div>
 				</div>
 			</div>
@@ -76,7 +76,7 @@
 
 <style lang="scss" scoped>
 	.main {
-		width: 90%;
+		// width: 90%;
 		// height: 97%;
 		display: flex;
 		flex: 2;
@@ -85,7 +85,7 @@
 		align-items: center;
 		flex-direction: row;
 		// color: rgba(29,191,205,1);
-		margin-left: 20rem;
+		margin-left: 28rem;
 		margin-top: 10rem;
 
 		.shape {
@@ -105,7 +105,7 @@
 		}
 	}
 	.main2 {
-		width: 90%;
+		// width: 90%;
 		// height: 97%;
 		display: flex;
 		flex: 2;
@@ -114,11 +114,12 @@
 		align-items: center;
 		flex-direction: row;
 		// color: rgba(29,191,205,1);
-		margin-left: 30rem;
+		margin-left: 35rem;
 		margin-top: 20rem;
 	
 		.shape {
 			margin-top: 0rem;
+			margin-left: 11rem;
 	
 			.shape5 {
 				margin-top: 10rem;

src/views/Table/components/zksb.vue

@@ -5,39 +5,39 @@
 <template>
 	<div class="main">
 		<div class="shape">
-			<div class="number">23</div>
+			<div class="number" style="margin-left: -23rem;"><img src="@/assets/images/sfyt.png" style="height: 19rem;"/>&nbsp;&nbsp;23</div>
 			<div class="title">水肥一体</div>
 		</div>
 		<div class="shape">
-			<div class="number">2742</div>
+			<div class="number" style="margin-left: -10rem;"><img src="@/assets/images/ggsb.png" style="height: 19rem;"/>2742</div>
 			<div class="title">灌溉设备</div>
 		</div>
 		<div class="shape">
-			<div class="number">3</div>
+			<div class="number" style="margin-left: -36rem;"><img src="@/assets/images/hjjc.png" style="height: 19rem;"/>&nbsp;&nbsp;3</div>
 			<div class="title">环境监测</div>
 		</div>
 		<div class="shape">
-			<div class="number">40</div>
+			<div class="number" style="margin-left: -23rem;"><img src="@/assets/images/jdsk.png" style="height: 19rem;"/>&nbsp;&nbsp;40</div>
 			<div class="title">井电双控</div>
 		</div>
 		<div class="shape">
-			<div class="number">9</div>
+			<div class="number" style="margin-left: -36rem;"><img src="@/assets/images/cqjc.png" style="height: 19rem;"/>&nbsp;&nbsp;9</div>
 			<div class="title">虫情监测</div>
 		</div>
 		<div class="shape">
-			<div class="number">10</div>
+			<div class="number" style="margin-left: -23rem;"><img src="@/assets/images/qxjc.png" style="height: 19rem;"/>&nbsp;&nbsp;10</div>
 			<div class="title">气象监测</div>
 		</div>
 		<div class="shape">
-			<div class="number">2</div>
+			<div class="number" style="margin-left: -36rem;"><img src="@/assets/images/trsq.png" style="height: 19rem;"/>&nbsp;&nbsp;2</div>
 			<div class="title">土壤墒情</div>
 		</div>
 		<div class="shape">
-			<div class="number">15</div>
+			<div class="number" style="margin-left: -23rem;"><img src="@/assets/images/spjk.png" style="height: 19rem;"/>&nbsp;&nbsp;15</div>
 			<div class="title">视频监控</div>
 		</div>
 		<div class="shape">
-			<div class="number">5</div>
+			<div class="number" style="margin-left: -36rem;"><img src="@/assets/images/swjc.png" style="height: 19rem;"/>&nbsp;&nbsp;5</div>
 			<div class="title">水位监测</div>
 		</div>
 	</div>
@@ -64,7 +64,7 @@
 		color: rgb(200, 250, 255);
 		font-weight: 400;
 		margin-top: 11rem;
-		font-size: 25rem;
+		font-size: 23rem;
 		margin-left: -8rem;
 	}
 	.title{

src/views/test/components/cqjcyj.vue

@@ -13,7 +13,8 @@
 		</el-carousel>
 	</div>
 	<div class="main">
-		<div>设备名称：13号地1区太阳能测报灯</div>
+		<span>设备名称：13号地1区太阳能测报灯&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+		<span><button class="dwbutton" @click="sbdw">定位</button></span>
 		<div>检测区域：13号地东区</div>
 		<div>识别数量：7</div>
 		<div>识别种类：5</div>
@@ -22,6 +23,10 @@
 </template>
 
 <script>
+	import {
+		Store
+	} from '@/store/index'
+	let store = Store();
 	export default {
 		data() {
 			return {
@@ -38,6 +43,54 @@
 				],
 			};
 		},
+		methods: {
+			sbdw() {
+				let that = this
+				let PointObject = new this.jt3dSDK.PointObject(window.viewer);
+				var LocateUtil = new this.jt3dSDK.LocateUtil(window["viewer"]);
+				let Drawtools = new this.jt3dSDK.DrawTools(window.viewer)
+				//_createCircle
+				PointObject.addBillboard([120.624, 36.9158, 0], {
+					billboard: {
+						imgUrl: 'jt3dSDK/imgs/jijing1.png',
+						scale: 0.2,
+					}
+				}).then(res1 => {
+					var LocateUtil = new this.jt3dSDK.LocateUtil(window["viewer"]);
+					LocateUtil.flyToEntity(res1).then(res2 => {
+						let html = "";
+						html +=
+							"<div style='text-align: left;backfround-color:rgba(61, 198, 205, 0.6);width:300rem;height:150rem;font-family: TTTGB-Medium, sans-serif !important;'>";
+						html +=
+							"<div style='background-color: rgba(61, 198, 255, 0.4);line-height:30rem;height:30rem;margin:0;'>" +
+							"<span style='width:100rem'>设备名称：</span>" + "<span>13号地1区太阳能测报灯</span>" +
+							"</div>";
+						html +=
+							"<div style='background-color: rgba(0, 37, 98, 0.4);line-height:30rem;height:30rem;margin:0'>" +
+							"<span style='width:100rem'>设备编号：</span>" + "<span>01</span>" +
+							"</div>";
+						html +=
+							"<div style='background-color: rgba(61, 198, 255, 0.4);line-height:30rem;height:30rem;margin:0'>" +
+							"<span style='width:100rem'>电流：</span>" + "<span>10A</span>" +
+							"</div>";
+						html +=
+							"<div style='background-color: rgba(0, 37, 98, 0.4);line-height:30rem;height:30rem;margin:0'>" +
+							"<span style='width:100rem'>压力：</span>" + "<span>20Kpa</span>" +
+							"</div>";
+						html +=
+							"<div style='background-color: rgba(61, 198, 255, 0.4);line-height:30rem;height:30rem;margin:0'>" +
+							"<span style='width:100rem'>流量：</span>" + "<span>80m³/h</span>" +
+							"</div>";
+						html += "</div>";
+						let popup = new that.jt3dSDK.PopupWindow.HtmlWindow(window["viewer"], [120.624,
+							36.9158
+						], "设备信息", html, 50);
+						// this.createCircle()
+						// Drawtools._createCircle( Cesium.Cartesian3.fromDegrees(120.623, 36.9157),'dynamicCircle')
+					})
+				})
+			}
+		}
 	};
 </script>
 <style scoped>
@@ -73,4 +126,28 @@
 		font-size: 16rem;
 		text-align: left;
 	}
-</style>
+
+	.dwbutton {
+		display: inline-block;
+		font-size: 14rem;
+		cursor: pointer;
+		text-align: center;
+		text-decoration: none;
+		outline: none;
+		color: #fff;
+		background-color: rgba(29,191,205,1);
+		border: none;
+		border-radius: 15rem;
+		box-shadow: 0 4rem #ffff00;
+	}
+
+	.dwbutton:hover {
+		background-color: rgb(255, 0, 0);
+	}
+
+	.dwbutton:active {
+		background-color: rgb(255, 0, 0);
+		box-shadow: 0 4rem #666;
+		transform: translateY(4rem);
+	}
+</style>

src/views/test/components/cqzrqs.vue

@@ -20,7 +20,7 @@
 			// let _this = this
 			// var t1=setTimeout(function() {
 			// 	_this.option.series = [{
-   //                      data: [23, 84, 101, 74, 87]
+			//                      data: [23, 84, 101, 74, 87]
 			// 		},
 			// 		{
 			// 			data: [13, 54, 71, 24, 57]
@@ -30,182 +30,195 @@
 			// }, 1000);
 			var chartDom = document.getElementById('main2');
 			var myChart = this.$echarts.init(chartDom);
-		
-		
-			
-				let option = {
-					// backgroundColor: '#031d33',
-					legend: {
-						top: "5",
-						x: "center",
+
+
+
+			let option = {
+				// backgroundColor: '#031d33',
+				legend: {
+					top: "5",
+					x: "center",
+					textStyle: {
+						fontSize: 12,
+						color: "rgba(255,225,255,1)"
+					},
+					icon: "path://M512 881.777778 512 881.777778C716.222629 881.777778 881.777778 716.222629 881.777778 512 881.777778 307.777371 716.222629 142.222222 512 142.222222 307.777373 142.222222 142.222222 307.777371 142.222222 512 142.222222 716.222629 307.777373 881.777778 512 881.777778L512 881.777778ZM512 1024 512 1024C229.230208 1024 0 794.769789 0 512 0 229.230211 229.230208 0 512 0 794.769789 0 1024 229.230211 1024 512 1024 794.769789 794.769789 1024 512 1024L512 1024Z",
+					itemWidth: 16, // 设置宽度
+					itemHeight: 16, // 设置高度、
+					itemGap: 24 // 设置间距
+				},
+				// tooltip: {
+				// 	show: true,
+				// 	trigger: "axis", //axis , item
+				// 	backgroundColor: "RGBA(0, 49, 85, 1)",
+				// 	borderColor: "rgba(0, 151, 251, 1)",
+				// 	borderWidth: 1,
+				// 	borderRadius: 0,
+				// 	axisPointer: {
+				// 		type: 'cross',
+				// 		label: {
+				// 			backgroundColor: '#6a7985'
+				// 		}
+				// 	},
+				// 	textStyle: {
+				// 		color: "#BCE9FC",
+				// 		fontSize: 16,
+				// 		align: "left"
+				// 	}
+				// },
+				tooltip: {
+					trigger: 'axis',
+					backgroundColor: "rgba(255,255,255,0.6)",
+					borderColor: "rgba(255,255,255,0.6)", //设置边框颜色
+					textStyle: {
+						color: "rgba(0,0,0,0.8)" //设置文字颜色
+					},
+					axisPointer: {
+						type: 'cross',
+						label: {
+							backgroundColor: '#6a7985'
+						}
+					}
+				},
+				grid: {
+					right: "5%",
+					top: "20%",
+					left: "5%",
+					bottom: "5%",
+					containLabel: true
+				},
+				xAxis: {
+					type: "category",
+					boundaryGap: true,
+					data: ["天牛", "布甲", '黑翅蛾', '美国白蛾', '隐翅虫'],
+					axisLabel: {
+						//坐标轴刻度标签的相关设置。
+						interval: 0, //设置为 1，表示『隔一个标签显示一个标签』
+						//	margin:15,
 						textStyle: {
-							fontSize: 12,
+							color: "rgba(255,225,255,1)",
+							fontStyle: "normal",
+							fontSize: 12
+						}
+					},
+					axisTick: {
+						//坐标轴刻度相关设置。
+						show: true
+					},
+					axisLine: {
+						//坐标轴轴线相关设置
+						lineStyle: {
 							color: "rgba(255,225,255,1)"
-						},
-						icon: "path://M512 881.777778 512 881.777778C716.222629 881.777778 881.777778 716.222629 881.777778 512 881.777778 307.777371 716.222629 142.222222 512 142.222222 307.777373 142.222222 142.222222 307.777371 142.222222 512 142.222222 716.222629 307.777373 881.777778 512 881.777778L512 881.777778ZM512 1024 512 1024C229.230208 1024 0 794.769789 0 512 0 229.230211 229.230208 0 512 0 794.769789 0 1024 229.230211 1024 512 1024 794.769789 794.769789 1024 512 1024L512 1024Z",
-						itemWidth: 16, // 设置宽度
-						itemHeight: 16, // 设置高度、
-						itemGap: 24 // 设置间距
+						}
 					},
-					tooltip: {
-						show: true,
-						trigger: "axis", //axis , item
-						backgroundColor: "RGBA(0, 49, 85, 1)",
-						borderColor: "rgba(0, 151, 251, 1)",
-						borderWidth: 1,
-						borderRadius: 0,
-						axisPointer: {
-							type: 'cross',
-							label: {
-								backgroundColor: '#6a7985'
-							}
-						},
+					splitLine: {
+						//坐标轴在 grid 区域中的分隔线。
+						show: false,
+						lineStyle: {
+							color: "rgba(77, 128, 254, 0.2)"
+						}
+					}
+				},
+				yAxis: [{
+					type: "value",
+					splitNumber: 3,
+					axisLabel: {
 						textStyle: {
-							color: "#BCE9FC",
-							fontSize: 16,
-							align: "left"
+							color: "rgba(255,225,255,1)",
+							fontStyle: "normal",
+							fontSize: 12
+						}
+					},
+					axisLine: {
+						show: true,
+						lineStyle: {
+							color: "rgba(255,225,255,1)"
 						}
 					},
-					grid: {
-						right: "5%",
-						top: "20%",
-						left: "5%",
-						bottom: "5%",
-						containLabel: true
+					axisTick: {
+						show: true
 					},
-					xAxis: {
-						type: "category",
-						boundaryGap: true,
-						data: ["天牛", "布甲", '黑翅蛾', '美国白蛾', '隐翅虫'],
-						axisLabel: {
-							//坐标轴刻度标签的相关设置。
-							interval: 0, //设置为 1，表示『隔一个标签显示一个标签』
-							//	margin:15,
-							textStyle: {
-								color: "rgba(255,225,255,1)",
-								fontStyle: "normal",
-								fontSize: 12
-							}
-						},
-						axisTick: {
-							//坐标轴刻度相关设置。
-							show: true
-						},
-						axisLine: {
-							//坐标轴轴线相关设置
-							lineStyle: {
-								color: "rgba(255,225,255,1)"
-							}
-						},
-						splitLine: {
-							//坐标轴在 grid 区域中的分隔线。
-							show: false,
-							lineStyle: {
-								color: "rgba(77, 128, 254, 0.2)"
-							}
+					splitLine: {
+						show: false,
+						lineStyle: {
+							color: "rgba(77, 128, 254, 0.2)"
+						}
+					}
+				}],
+				series: [{
+					name: '上月',
+					type: "pictorialBar",
+					barWidth: "60%",
+					stack: "总量",
+					label: {
+						normal: {
+							show: false
 						}
 					},
-					yAxis: [{
-						type: "value",
-						splitNumber: 3,
-						axisLabel: {
-							textStyle: {
-								color: "rgba(255,225,255,1)",
-								fontStyle: "normal",
-								fontSize: 12
-							}
-						},
-						axisLine: {
-							show: true,
-							lineStyle: {
-								color: "rgba(255,225,255,1)"
-							}
-						},
-						axisTick: {
-							show: true
-						},
-						splitLine: {
-							show: false,
-							lineStyle: {
-								color: "rgba(77, 128, 254, 0.2)"
-							}
+					itemStyle: {
+						normal: {
+							color: {
+								type: "linear",
+								x: 0,
+								y: 0,
+								x2: 0,
+								y2: 1,
+								colorStops: [{
+										offset: 0,
+										color: "rgba(85, 255, 0, 1.0)" // 0% 处的颜色
+									},
+									{
+										offset: 1,
+										color: "rgba(85, 255, 127, 0.2)" // 100% 处的颜色
+									}
+								],
+								globalCoord: false // 缺省为 false
+							} //渐变颜色
 						}
-					}],
-					series: [{
-						name: '上月',
-						type: "pictorialBar",
-						barWidth: "60%",
-						stack: "总量",
-						label: {
-							normal: {
-								show: false
-							}
-						},
-						itemStyle: {
-							normal: {
-								color: {
-									type: "linear",
-									x: 0,
-									y: 0,
-									x2: 0,
-									y2: 1,
-									colorStops: [{
-											offset: 0,
-											color: "rgba(85, 255, 0, 1.0)" // 0% 处的颜色
-										},
-										{
-											offset: 1,
-											color: "rgba(85, 170, 255, 0.2)" // 100% 处的颜色
-										}
-									],
-									globalCoord: false // 缺省为 false
-								} //渐变颜色
-							}
-						},
-						symbol: "path://M12.000,-0.000 C12.000,-0.000 16.074,60.121 22.731,60.121 C26.173,60.121 -3.234,60.121 0.511,60.121 C7.072,60.121 12.000,-0.000 12.000,-0.000 Z",
+					},
+					symbol: "path://M12.000,-0.000 C12.000,-0.000 16.074,60.121 22.731,60.121 C26.173,60.121 -3.234,60.121 0.511,60.121 C7.072,60.121 12.000,-0.000 12.000,-0.000 Z",
 
-						data: [23, 84, 101, 74, 87]
-					}, {
-						name: '本月',
-						type: "pictorialBar",
-						barWidth: "60%",
-						stack: "总量",
-						label: {
-							normal: {
-								show: false
-							}
-						},
-						itemStyle: {
-							normal: {
-								color: {
-									type: "linear",
-									x: 0,
-									y: 0,
-									x2: 0,
-									y2: 1,
-									colorStops: [{
-											offset: 0,
-											color: "rgba(255, 255, 0, 1.0)" // 0% 处的颜色
-										},
-										{
-											offset: 1,
-											color: "rgba(255, 85, 255, 0.2)" // 100% 处的颜色
-										}
-									],
-									globalCoord: false // 缺省为 false
-								} //渐变颜色
-							}
-						},
-						symbol: "path://M12.000,-0.000 C12.000,-0.000 16.074,60.121 22.731,60.121 C26.173,60.121 -3.234,60.121 0.511,60.121 C7.072,60.121 12.000,-0.000 12.000,-0.000 Z",
+					data: [33, 114, 177, 108, 123]
+				}, {
+					name: '本月',
+					type: "pictorialBar",
+					barWidth: "60%",
+					stack: "总量",
+					label: {
+						normal: {
+							show: false
+						}
+					},
+					itemStyle: {
+						normal: {
+							color: {
+								type: "linear",
+								x: 0,
+								y: 0,
+								x2: 0,
+								y2: 1,
+								colorStops: [{
+										offset: 0,
+										color: "rgba(255, 0, 0, 1.0)" // 0% 处的颜色
+									},
+									{
+										offset: 1,
+										color: "rgba(255, 0, 127, 0.2)" // 100% 处的颜色
+									}
+								],
+								globalCoord: false // 缺省为 false
+							} //渐变颜色
+						}
+					},
+					symbol: "path://M12.000,-0.000 C12.000,-0.000 16.074,60.121 22.731,60.121 C26.173,60.121 -3.234,60.121 0.511,60.121 C7.072,60.121 12.000,-0.000 12.000,-0.000 Z",
 
-						data: [13, 54, 71, 24, 57]
-					}],
-				};
-				myChart.setOption(option);
-			},
-		
-		}
-	
+					data: [13, 54, 71, 69, 77]
+				}],
+			};
+			myChart.setOption(option);
+		},
+
+	}
 </script>
 
 <style scoped>