Merge branch 'ZHNY_DCF' into ZHNY_LHR

src/App.vue

@@ -19,351 +19,352 @@
 			url("@/assets/fonts/fonts/TTTGB-Medium.svg") format("svg");
 		font-weight: normal;
 		font-style: normal;
+	}
 
-		.ScriconList {
-			margin-top: 6rem;
-			height: 20rem;
-			width: 20rem;
-			background: url('@/assets/images/info.png') no-repeat;
-			background-size: 100% 100%;
+	.ScriconList {
+		margin-top: 6rem;
+		height: 20rem;
+		width: 20rem;
+		background: url('@/assets/images/info.png') no-repeat;
+		background-size: 100% 100%;
 
-		}
+	}
 
-		.lk-status-bar {
-			z-index: 15;
-		}
+	.lk-status-bar {
+		z-index: 15;
+	}
 
-		// .lk-status-bar{
-		// 	font-size:16rem !important;
-		// }
-		// ::-webkit-scrollbar {
-		// 	width: 5rem;
-		// }
-
-		// /*定义滚动条轨道 内阴影+圆角*/
-		// ::-webkit-scrollbar-track {
-		// 	border-radius: 10rem;
-		// 	background-color: rgba(0, 0, 0, 0.1);
-		// }
-
-		// /*定义滑块 内阴影+圆角*/
-		// ::-webkit-scrollbar-thumb {
-		// 	border-radius: 10rem;
-		// 	-webkit-box-shadow: inset 0 0 6rem rgba(0, 0, 0, .3);
-		// 	background-color: rgba(0, 0, 0, 0.1);
-		// }
-		//选取颜色组件
-		.el-color-svpanel {
-			width: 280rem !important;
-			height: 180rem !important;
-		}
+	// .lk-status-bar{
+	// 	font-size:16rem !important;
+	// }
+	// ::-webkit-scrollbar {
+	// 	width: 5rem;
+	// }
+
+	// /*定义滚动条轨道 内阴影+圆角*/
+	// ::-webkit-scrollbar-track {
+	// 	border-radius: 10rem;
+	// 	background-color: rgba(0, 0, 0, 0.1);
+	// }
+
+	// /*定义滑块 内阴影+圆角*/
+	// ::-webkit-scrollbar-thumb {
+	// 	border-radius: 10rem;
+	// 	-webkit-box-shadow: inset 0 0 6rem rgba(0, 0, 0, .3);
+	// 	background-color: rgba(0, 0, 0, 0.1);
+	// }
+	//选取颜色组件
+	.el-color-svpanel {
+		width: 280rem !important;
+		height: 180rem !important;
+	}
 
-		// .el-color-hue-slider.is-vertical{
-		// 	width: 280rem !important;
-		// 	height: 12rem !important;
-		// 	background-size: 12rem 12rem !important;
-		// }
-		.el-color-alpha-slider {
-			width: 280rem !important;
-			height: 12rem !important;
-			background-size: 12rem 12rem !important;
-			background-position: 0 0, 6rem 0, 6rem -6rem, 0 6rem !important;
-		}
+	// .el-color-hue-slider.is-vertical{
+	// 	width: 280rem !important;
+	// 	height: 12rem !important;
+	// 	background-size: 12rem 12rem !important;
+	// }
+	.el-color-alpha-slider {
+		width: 280rem !important;
+		height: 12rem !important;
+		background-size: 12rem 12rem !important;
+		background-position: 0 0, 6rem 0, 6rem -6rem, 0 6rem !important;
+	}
 
-		.el-button.is-text {
-			background-color: #fff !important;
-		}
+	.el-button.is-text {
+		background-color: #fff !important;
+	}
 
-		.el-color-predefine {
-			width: 320rem !important;
-			margin-top: 8rem !important;
-			font-size: 12rem !important;
-		}
+	.el-color-predefine {
+		width: 320rem !important;
+		margin-top: 8rem !important;
+		font-size: 12rem !important;
+	}
 
-		.el-color-dropdown__value {
-			width: 160rem !important;
-			height: 26rem !important;
-			font-size: 12rem !important;
-			line-height: 26rem !important;
-		}
+	.el-color-dropdown__value {
+		width: 160rem !important;
+		height: 26rem !important;
+		font-size: 12rem !important;
+		line-height: 26rem !important;
+	}
 
-		.el-color-dropdown__btns {
-			margin-top: 12rem !important;
-		}
+	.el-color-dropdown__btns {
+		margin-top: 12rem !important;
+	}
 
-		.el-input--small {
-			--el-input-height: 24rem !important;
-		}
+	.el-input--small {
+		--el-input-height: 24rem !important;
+	}
 
-		.el-color-svpanel__cursor {
-			// left: 280rem !important;
-		}
+	.el-color-svpanel__cursor {
+		// left: 280rem !important;
+	}
 
-		.el-color-hue-slider.is-vertical {
-			height: 180rem !important;
-			width: 12rem !important;
-			padding: 2rem 0 !important;
-		}
+	.el-color-hue-slider.is-vertical {
+		height: 180rem !important;
+		width: 12rem !important;
+		padding: 2rem 0 !important;
+	}
 
-		.el-color-picker__panel {
-			padding: 5rem 11rem !important;
-			font-size: 12rem !important;
-			line-height: 20rem !important;
-			min-height: 10rem !important;
-			width: 322rem !important;
-			height: 311rem !important;
-			left: 15rem !important;
-			top: 250rem !important;
-			background-color: rgba(255, 255, 255, 0.9) !important;
-		}
+	.el-color-picker__panel {
+		padding: 5rem 11rem !important;
+		font-size: 12rem !important;
+		line-height: 20rem !important;
+		min-height: 10rem !important;
+		width: 322rem !important;
+		height: 311rem !important;
+		left: 15rem !important;
+		top: 250rem !important;
+		background-color: rgba(255, 255, 255, 0.9) !important;
+	}
 
-		.el-color-predefine__color-selector {
-			margin: 0 0 8rem 8rem !important;
-			height: 20rem !important;
-			width: 20rem !important;
-			border-radius: 4rem !important;
-		}
+	.el-color-predefine__color-selector {
+		margin: 0 0 8rem 8rem !important;
+		height: 20rem !important;
+		width: 20rem !important;
+		border-radius: 4rem !important;
+	}
 
 
-		::v-deep .el-color-dropdown {
-			width: 300rem !important;
-		}
+	::v-deep .el-color-dropdown {
+		width: 300rem !important;
+	}
 
-		/* el-button组件自适应大小 */
-		.el-input-group__append {
-			padding: 0 20rem !important;
-		}
+	/* el-button组件自适应大小 */
+	.el-input-group__append {
+		padding: 0 20rem !important;
+	}
 
-		.el-button {
-			height: 32rem !important;
-			padding: 8rem 15rem !important;
-			font-size: 14rem !important;
-		}
+	.el-button {
+		height: 32rem !important;
+		padding: 8rem 15rem !important;
+		font-size: 14rem !important;
+	}
 
-		.overflowtext {
-			padding: 0 5rem;
-			width: 150rem !important;
-			display: inline-block;
-			text-align: left;
-			/*作为弹性伸缩盒子模型显示*/
-			white-space: nowrap;
-			/*显示的行数；如果要设置2行加...则设置为2*/
-			overflow: hidden;
-			/*超出的文本隐藏*/
-			text-overflow: ellipsis;
-			/* 溢出用省略号*/
-		}
+	.overflowtext {
+		padding: 0 5rem;
+		width: 150rem !important;
+		display: inline-block;
+		text-align: left;
+		/*作为弹性伸缩盒子模型显示*/
+		white-space: nowrap;
+		/*显示的行数；如果要设置2行加...则设置为2*/
+		overflow: hidden;
+		/*超出的文本隐藏*/
+		text-overflow: ellipsis;
+		/* 溢出用省略号*/
+	}
 
-		.el-dropdown-menu__item {
-			line-height: 22rem !important;
-			padding: 5rem 16rem !important;
-			font-size: 14rem !important;
-		}
+	.el-dropdown-menu__item {
+		line-height: 22rem !important;
+		padding: 5rem 16rem !important;
+		font-size: 14rem !important;
+	}
 
-		.el-form-item__label {
-			height: 32rem !important;
-			line-height: 32rem !important;
-			padding: 0 12rem 0 0 !important;
-			font-size: 14rem !important;
-		}
+	.el-form-item__label {
+		height: 32rem !important;
+		line-height: 32rem !important;
+		padding: 0 12rem 0 0 !important;
+		font-size: 14rem !important;
+	}
 
-		.el-input__wrapper {
-			padding: 1rem 11rem !important;
-		}
+	.el-input__wrapper {
+		padding: 1rem 11rem !important;
+	}
 
-		.el-input__inner {
-			/* height: 32rem !important; */
-			font-size: 12rem !important;
-		}
+	.el-input__inner {
+		/* height: 32rem !important; */
+		font-size: 12rem !important;
+	}
 
-		.el-form-item__content {
-			line-height: 32rem !important;
-		}
+	.el-form-item__content {
+		line-height: 32rem !important;
+	}
 
-		.el-slider {
-			height: 32rem !important;
-		}
+	.el-slider {
+		height: 32rem !important;
+	}
 
-		.el-form-item {
-			--font-size: 14rem !important;
-		}
+	.el-form-item {
+		--font-size: 14rem !important;
+	}
 
-		// .el-scrollbar{
-		// 	background-color: gainsboro !important;
-		// }
-
-
-		.overflowtext {
-			padding: 0 5rem;
-			width: 150rem !important;
-			display: inline-block;
-			text-align: left;
-			/*作为弹性伸缩盒子模型显示*/
-			white-space: nowrap;
-			/*显示的行数；如果要设置2行加...则设置为2*/
-			overflow: hidden;
-			/*超出的文本隐藏*/
-			text-overflow: ellipsis;
-			/* 溢出用省略号*/
-		}
+	// .el-scrollbar{
+	// 	background-color: gainsboro !important;
+	// }
+
+
+	.overflowtext {
+		padding: 0 5rem;
+		width: 150rem !important;
+		display: inline-block;
+		text-align: left;
+		/*作为弹性伸缩盒子模型显示*/
+		white-space: nowrap;
+		/*显示的行数；如果要设置2行加...则设置为2*/
+		overflow: hidden;
+		/*超出的文本隐藏*/
+		text-overflow: ellipsis;
+		/* 溢出用省略号*/
+	}
 
-		//取消边框剪切
-		.el-scrollbar {
-			// background-color: gainsboro !important;
-			color: #fff !important;
-			/* background-color: rgba(5, 45, 115, 1) !important; */
-			overflow: visible !important;
-		}
+	//取消边框剪切
+	.el-scrollbar {
+		// background-color: gainsboro !important;
+		color: #fff !important;
+		/* background-color: rgba(5, 45, 115, 1) !important; */
+		overflow: visible !important;
+	}
 
-		//图层树间距
-		.el-tree-node__content {
-			margin: 2rem 0rem !important;
-		}
+	//图层树间距
+	.el-tree-node__content {
+		margin: 2rem 0rem !important;
+	}
 
-		//dropdown行样式
-		.el-popper.is-light,
-		.el-dropdown__popper.el-popper {
-			background: rgba(0, 0, 0, 0);
-			border: 0 !important;
-		}
+	//dropdown行样式
+	.el-popper.is-light,
+	.el-dropdown__popper.el-popper {
+		background: rgba(0, 0, 0, 0);
+		border: 0 !important;
+	}
 
-		//三角边框样式
-		.el-popper__arrow::before {
-			border: 0 !important;
-		}
+	//三角边框样式
+	.el-popper__arrow::before {
+		border: 0 !important;
+	}
 
-		//三角背景样式
-		.el-popper.is-light .el-popper__arrow::before {
-			background: rgba(0, 0, 0, 0) !important;
-			z-index: -10;
-		}
+	//三角背景样式
+	.el-popper.is-light .el-popper__arrow::before {
+		background: rgba(0, 0, 0, 0) !important;
+		z-index: -10;
+	}
 
-		#app {
-			font-family: Avenir, Helvetica, Arial, sans-serif;
-			-webkit-font-smoothing: antialiased;
-			-moz-osx-font-smoothing: grayscale;
-			text-align: center;
-			color: rgb(255, 0, 0);
-		}
+	#app {
+		font-family: Avenir, Helvetica, Arial, sans-serif;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+		text-align: center;
+		color: rgb(255, 0, 0);
+	}
 
-		.maxsize {
-			font-size: 18rem !important;
-		}
+	.maxsize {
+		font-size: 18rem !important;
+	}
 
-		.minsize {
-			font-size: 14rem !important;
-		}
+	.minsize {
+		font-size: 14rem !important;
+	}
 
-		/*cesium-navigation-es6 比例尺、指南针 位置样式*/
-		.cesium-widget-cesiumNavigationContainer {
-			position: absolute;
-			bottom: 0rem;
-			left: 5rem;
-			width: 100rem;
+	/*cesium-navigation-es6 比例尺、指南针 位置样式*/
+	.cesium-widget-cesiumNavigationContainer {
+		position: absolute;
+		bottom: 0rem;
+		left: 5rem;
+		width: 100rem;
+		height: 320rem;
+		border: 0rem solid green;
+
+		/*导航栏*/
+		#navigationDiv {
 			height: 320rem;
-			border: 0rem solid green;
-
-			/*导航栏*/
-			#navigationDiv {
-				height: 320rem;
-				border: 0rem solid red;
-
-				/* 罗盘定位 */
-				.compass {
-					pointer-events: auto;
-					position: absolute;
-					right: 0rem;
-					top: 100rem;
-					width: 95rem;
-					height: 95rem;
-					overflow: hidden;
-				}
-
-				.navigation-control-icon-zoom-out {
-					font-size: 20rem;
-				}
-
-				.navigation-control-icon-zoom-in {
-					font-size: 20rem;
-				}
-
-				/*缩放定位*/
-				.navigation-controls {
-					position: absolute;
-					right: 30rem;
-					top: 200rem;
-					width: 30rem;
-					height: 30rem;
-					border: 1rem solid rgba(255, 255, 255, 0.1);
-					font-weight: 300;
-					-webkit-touch-callout: none;
-					-webkit-user-select: none;
-					-khtml-user-select: none;
-					-moz-user-select: none;
-					-ms-user-select: none;
-					user-select: none;
-				}
-
-				.navigation-controls>div:nth-child(2) {
-					display: none;
-				}
-
-				//放大按钮
-				.navigation-control-icon-zoom-in {
-					border: 1rem solid #ddd; //重点
-				}
-
-				//缩小按钮
-				.navigation-control-icon-zoom-out {
-					border: 1rem solid #ddd; //重点
-				}
-
-				.compass-outer-ring-background {
-					position: absolute;
-					top: 14rem;
-					left: 14rem;
-					width: 44rem;
-					height: 44rem;
-					border-radius: 44rem;
-					border: 12rem solid rgb(47 53 60); //重点
-					box-sizing: content-box;
-				}
-
-				.compass-outer-ring {
-					position: absolute;
-					top: 0;
-					width: 95rem;
-					height: 95rem;
-					fill: rgb(255 255 255); //重点
-				}
-
-				.compass-gyro-background {
-					position: absolute;
-					top: 30rem;
-					left: 30rem;
-					width: 33rem;
-					height: 33rem;
-					border-radius: 33rem;
-					background-color: rgb(47 53 60); //重点
-					border: 1rem solid rgb(255 255 255); //重点
-					box-sizing: content-box;
-				}
-
-				.compass-gyro {
-					pointer-events: none;
-					position: absolute;
-					top: 0;
-					width: 95rem;
-					height: 95rem;
-					fill: #fff; //重点
-				}
+			border: 0rem solid red;
+
+			/* 罗盘定位 */
+			.compass {
+				pointer-events: auto;
+				position: absolute;
+				right: 0rem;
+				top: 100rem;
+				width: 95rem;
+				height: 95rem;
+				overflow: hidden;
 			}
 
-			/*比例尺位置*/
-			.distance-legend {
-				left: -10rem;
-				bottom: 0rem;
-				border: 0rem solid darkred;
+			.navigation-control-icon-zoom-out {
+				font-size: 20rem;
+			}
+
+			.navigation-control-icon-zoom-in {
+				font-size: 20rem;
+			}
+
+			/*缩放定位*/
+			.navigation-controls {
+				position: absolute;
+				right: 30rem;
+				top: 200rem;
+				width: 30rem;
+				height: 30rem;
+				border: 1rem solid rgba(255, 255, 255, 0.1);
+				font-weight: 300;
+				-webkit-touch-callout: none;
+				-webkit-user-select: none;
+				-khtml-user-select: none;
+				-moz-user-select: none;
+				-ms-user-select: none;
+				user-select: none;
+			}
+
+			.navigation-controls>div:nth-child(2) {
+				display: none;
+			}
+
+			//放大按钮
+			.navigation-control-icon-zoom-in {
+				border: 1rem solid #ddd; //重点
+			}
+
+			//缩小按钮
+			.navigation-control-icon-zoom-out {
+				border: 1rem solid #ddd; //重点
+			}
+
+			.compass-outer-ring-background {
+				position: absolute;
+				top: 14rem;
+				left: 14rem;
+				width: 44rem;
+				height: 44rem;
+				border-radius: 44rem;
+				border: 12rem solid rgb(47 53 60); //重点
+				box-sizing: content-box;
+			}
+
+			.compass-outer-ring {
+				position: absolute;
+				top: 0;
+				width: 95rem;
+				height: 95rem;
+				fill: rgb(255 255 255); //重点
+			}
+
+			.compass-gyro-background {
+				position: absolute;
+				top: 30rem;
+				left: 30rem;
+				width: 33rem;
+				height: 33rem;
+				border-radius: 33rem;
+				background-color: rgb(47 53 60); //重点
+				border: 1rem solid rgb(255 255 255); //重点
+				box-sizing: content-box;
+			}
+
+			.compass-gyro {
+				pointer-events: none;
+				position: absolute;
+				top: 0;
+				width: 95rem;
+				height: 95rem;
+				fill: #fff; //重点
 			}
 		}
+
+		/*比例尺位置*/
+		.distance-legend {
+			left: -10rem;
+			bottom: 0rem;
+			border: 0rem solid darkred;
+		}
+	}
 </style>