烟台平台更新

.env.development

@@ -5,4 +5,4 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'development'
 
 # 金田基础框架/开发环境
-VITE_API_URL = 'http://218.59.194.82:13092/'
+VITE_API_URL = 'http://10.88.77.132:8092/'

.env.production

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'production'
 
 # 金田基础框架/生产环境
-VITE_API_URL = 'http://218.59.194.82:13092/'
+VITE_API_URL = 'http://10.88.77.132:8092'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

index.html

@@ -4,7 +4,7 @@
 		<meta charset="UTF-8" />
 		<link rel="icon" href="/favicon.ico" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>金田CIM三维基础平台</title>
+		<title>烟台市自然资源三维立体一张图系统</title>
 		<style>
 			#app {
 				height: 100vh;

src/views/Login/Login.vue

@@ -91,7 +91,7 @@
 				//需要修改，像数据库发送账号密码，根据返回值判断
 				let password = this.$md5(this.loginForm.password)
 				this.$http.get('/getTableList', {
-					tableName: 'sys_user',
+					tableName: 'base_sys_user',
 					sqlWhere: "username = '" + this.loginForm.username + "' and password = '" + password + "'",
 					orderByField: ''
 				}).then(res => {
@@ -109,13 +109,14 @@
 			storageAndgoTo() {
 				//存储用户权限id
 				this.$http.get('/getTableList', {
-					tableName: 'sys_user_role', //
-					sqlWhere: "userId = " + this.loginForm.id, //+ this.loginForm.id
+					tableName: 'base_sys_user_role', //
+					sqlWhere: '"userId"' + " = " + this.loginForm.id, //+ this.loginForm.id
 					orderByField: ''
 				}).then(res => {
 					//存储用户ID
 					let _this = this
-					store.roleId = res.data[0].roleId
+					console.log(res)
+					store.roleId = res.data[0].roleid
 					console.log(store.roleId)
 					if (
 						window.navigator.userAgent.match(
@@ -242,7 +243,7 @@
 		width: calc(100% - 0rem);
 		height: 70rem;
 		line-height: 70rem;
-		background: url(@/assets/images/login/login-title.webp) 0rem no-repeat, linear-gradient(100deg, rgba(16, 96, 210, .2) 30%, rgba(16, 106, 250, .1) 70%);
+		background: url(@/assets/images/login/login-title.png) 0rem no-repeat, linear-gradient(100deg, rgba(16, 96, 210, .2) 30%, rgba(16, 106, 250, .1) 70%);
 		background-size: 510rem 70rem, 100% 70rem;
 		background-repeat: no-repeat;
 		user-select: none;

src/views/Main/components/header.vue

@@ -27,7 +27,7 @@
 				<el-menu-item index="0">
 					<router-link to="/home/Map3d">三维地图</router-link>
 				</el-menu-item>
-				<el-menu-item index="1">
+				<!-- <el-menu-item index="1">
 					<router-link to="/home/table">数据维护</router-link>
 				</el-menu-item>
 				<el-menu-item index="2">
@@ -35,7 +35,7 @@
 				</el-menu-item>
 				<el-menu-item index="3">
 					<router-link to="/home/test">嵌套页面</router-link>
-				</el-menu-item>
+				</el-menu-item> -->
 			</el-menu>
 		</div>
 		<!-- 用户信息 -->
@@ -137,7 +137,7 @@
 	$fontColor: #fff;
 	$fullsize: calc(100% - 0rem);
 	$header-title-bg: url(@/assets/images/header/header-title-bg.png) 0rem no-repeat;
-	$header-title: url(@/assets/images/header/login-title.webp) 0rem no-repeat;
+	$header-title: url(@/assets/images/header/header-1.png) 0rem no-repeat;
 	$header-bg: url(@/assets/images/header/header-bg.png) 0rem no-repeat;
 	$header-bg-color: linear-gradient(100deg,
 		rgb(16, 96, 210) 30%,

src/views/Main/components/modifyPassword.vue

@@ -75,7 +75,7 @@
 					password: this.$md5(this.user.newpassword)
 				}
 				this.$http.post('/postSubmit', {
-					tableName: 'sys_user',
+					tableName: 'base_sys_user',
 					keyValue: this.id,
 					formData: data
 				}).then(res => {

src/views/Map3d/Map3DMain.vue

@@ -140,7 +140,7 @@
 			</jt-popup>
 
 			<!-- 跟踪漫游组件 -->
-			<jt-popup minWidth="294px" title="跟踪漫游" ref="refTrackRoam">
+			<jt-popup minWidth="294rem" title="跟踪漫游" ref="refTrackRoam">
 				<TrackRoam />
 			</jt-popup>
 

src/views/Map3d/components/ImageLayerSplit.vue

@@ -695,12 +695,12 @@
 
 			//获取地图图集id
 			let roleId = store.roleId
-			atlasLayersSqlWhere = "roleid = " + roleId + " and atlasType='图层'"
+			atlasLayersSqlWhere = '"roleId"' + " = " + roleId + " and " + '"atlasType"' + "='图层'"
 
 			//Promise回调
 			function init() {
 				return new Promise((resolve, reject) => {
-					_self.initData.forEach(res => {
+					_self.initData.forEach((res,index) => {
 						let num = Number(res.layerorder)
 						if (num < 10) {
 							res.layerorder = '0' + res.layerorder
@@ -709,10 +709,10 @@
 						res.value = res;
 						res.label = res.layername;
 
-						if (res.layername === "牟平中心城") {
+						if (index == 0) {
 							_self.leftValue = res;
 						}
-						if (res.layername === "牟平区") {
+						if (index == 1) {
 							_self.rightValue = res;
 						}
 

src/views/Map3d/components/ViewerSplitScreen.vue

@@ -969,7 +969,7 @@
 
 				//获取地图图集id
 				let roleId = store.roleId
-				atlasLayersSqlWhere = "roleid = " + roleId + " "
+				atlasLayersSqlWhere = '"roleid"' + " = " + roleId + " "
 
 				//Promise回调
 				function init(data) {

src/views/Map3d/components/basicLayer.vue

@@ -273,11 +273,11 @@
 			//获取地图图集id
 			let roleId = store.roleId
 			_self.$http.get('/getTableList', {
-				tableName: 'sys_role_atlas',
-				sqlWhere: "roleid = '" + roleId + "'",
+				tableName: 'base_sys_role_atlas',
+				sqlWhere: '"roleId"' + " = '" + roleId + "'",
 				orderByField: ''
 			}).then(res => {
-				_self.roleName = "atlastype = '底图' and roleId ='" + roleId + "'"
+				_self.roleName = '"atlasType"' + "= '底图'" +" and "+ '"roleId"' + " ='" + roleId + "'"
 				_self.addBaseLayer();
 			})
 		}

src/views/Map3d/components/layer.vue

@@ -23,12 +23,17 @@
 
 <template>
 	<div class="jt-layer">
-		<el-tree :data="treeData" :default-expanded-keys="expandedKeys" node-key="id" class="tree-line" :expand-on-click-node="false" ref="treeRef" @check-change="handleCheckChange" @node-click="handleClick">
+		<el-tree :data="treeData" :default-expanded-keys="expandedKeys" :default-checked-keys="checkedkeys"
+			node-key="id" class="tree-line" :expand-on-click-node="false" ref="treeRef"
+			@check-change="handleCheckChange" @node-click="handleClick">
 			<template #default="{ node, data }">
 				<!-- 复选框 -->
-				<el-checkbox v-if="data.ischeck === '1' && store.userport == 'PC'" v-model="node.checked" :indeterminate="node.indeterminate" :disabled="!!node.disabled" @change="handleCheckBoxChange($event, data, node)">
+				<el-checkbox v-if="data.ischeck == '1' && store.userport == 'PC'" v-model="node.checked"
+					:indeterminate="node.indeterminate" :disabled="!!node.disabled"
+					@change="handleCheckBoxChange($event, data, node)">
 				</el-checkbox>
-				<el-switch  v-else-if="data.ischeck == 1 && store.userport == 'APP'" width="30rem" size="small" v-model="node.checked" @change="handleCheckBoxChange($event, data, node)" />
+				<el-switch v-else-if="data.ischeck == 1 && store.userport == 'APP'" width="30rem" size="small"
+					v-model="node.checked" @change="handleCheckBoxChange($event, data, node)" />
 				<span class="custom-tree-node">
 					<!-- 字体、图标 -->
 					<!-- <span>
@@ -51,7 +56,8 @@
 				<!-- 透明度 -->
 				<template v-if="node.checked && data.opacity >0">
 					<div style="width: 80rem; padding: 0 20rem; position: absolute; right: 0">
-						<el-slider v-model="data.opacity" @input="handleSliderChange($event, data)" :max="1" :min="0.1" :step="0.1" />
+						<el-slider v-model="data.opacity" @input="handleSliderChange($event, data)" :max="1" :min="0.1"
+							:step="0.1" />
 					</div>
 				</template>
 			</template>
@@ -70,6 +76,8 @@
 				treeData: [],
 				inittree: [], //初始化图层数组
 				expandedKeys: [], //对应要展开的节点id
+				currentKey: [], //默认打开节点的id
+				checkedkeys: []
 			}
 		},
 
@@ -158,7 +166,13 @@
 
 								break;
 							case "Cesium3DTileset": //加载3DTileset地图服务--实景
-
+								jt3d._viewer.flyTo(window[_serviceId], {
+									offset: {
+										heading: Cesium.Math.toRadians(20.0), //方向
+										pitch: Cesium.Math.toRadians(-90), //倾斜角度
+										range: 1000
+									}
+								});
 								break;
 							case "Cesium3DTileset_BM": //加载3DTileset地图服务--白膜
 
@@ -178,6 +192,7 @@
 			 * @param {Object} checked 节点本身是否被选中
 			 */
 			async handleCheckChange(data, checked) {
+				console.log('进入图层控制')
 				let _self = this;
 
 				let _serviceId = "service_" + data.layercode + data.layerorder;
@@ -283,10 +298,12 @@
 									if (parameterset.count) { //重复次数
 										_options.count = parameterset.count;
 									}
-									if (parameterset.direction) { //direction=vertical 纵，order='-'(由下到上) , '+"(由上到下)
+									if (parameterset
+										.direction) { //direction=vertical 纵，order='-'(由下到上) , '+"(由上到下)
 										_options.direction = parameterset.direction;
 									}
-									if (parameterset.order) { //direction=horizontal 横，order='-'(顺时针) , '+'(逆时针)
+									if (parameterset
+										.order) { //direction=horizontal 横，order='-'(顺时针) , '+'(逆时针)
 										_options.order = parameterset.order;
 									}
 								}
@@ -592,37 +609,34 @@
 							}
 							break;
 						case "Cesium3DTileset": //加载3DTileset地图服务--实景
+							if (data.datasource == '#') return
 							let datasource = data.datasource.split("#")
 							console.log('datasource', datasource)
 							if (checked) {
 								//加载实景
-								datasource.forEach((res, index) => {
-									//设置参数
-									let _options = {
-										id: _serviceId + index,
-										url: res,
+								//设置参数
+								let _options = {
+									id: _serviceId,
+									url: datasource[0],
+								}
+								if (parameterset) {
+									if (parameterset.height) {
+										_options.height = parameterset.height;
 									}
-									if (parameterset) {
-										if (parameterset.height) {
-											_options.height = parameterset.height;
-										}
-										if (parameterset.alpha) {
-											_options.alpha = parameterset.alpha;
-										}
+									if (parameterset.alpha) {
+										_options.alpha = parameterset.alpha;
 									}
+								}
+								jt3d.layer.addCesium3DTileset(_options, function(serviceId) {
+									console.log('添加')
+									window[_serviceId] = window[serviceId];
+								});
 
-									jt3d.layer.addCesium3DTileset(_options, function(serviceId) {
-
-										window[_serviceId + index] = window[serviceId];
 
-									});
-								})
 							} else {
-								datasource.forEach((res, index) => {
-									jt3d.layer.removeScenePrimitives({
-										serviceId: _serviceId + index
-									});
-								})
+								jt3d.layer.removeScenePrimitives({
+									serviceId: _serviceId
+								});
 							}
 
 							break;
@@ -731,23 +745,31 @@
 			 */
 			setNodesChecked(datas) {
 				let _self = this;
+				console.log('datas', datas)
 				datas.forEach((data, index) => {
-					_self.$nextTick(() => {
-						var node = _self.$refs.treeRef.getNode(data);
-						//node.isLeaf是否是叶子节点
-						if (node.isLeaf) {
-							let checked = false;
-							if (data.isinit === '1') {
-								checked = true;
-							}
-							data.opacity = Number(data.opacity)
-							_self.$refs.treeRef.setChecked(node, checked);
+					var node = _self.$refs.treeRef.getNode(data);
+					//node.isLeaf是否是叶子节点
+					if (node.isLeaf) {
+						let checked = false;
+						if (data.isinit === '1') {
+							checked = true;
+							_self.checkedkeys.push(data.id)
+							console.log('默认勾选', _self.checkedkeys)
 						}
-					});
-					if (data.children != undefined) {
+						data.opacity = Number(data.opacity)
+						// _self.$refs.treeRef.setChecked(node, checked);
+						// _self.handleCheckChange(data,checked)
+						// _self.childNodesChange(node, checked);
+						// _self.$refs.treeRef.setCurrentKey(data.id)
+					}
+					
+					if (data.children) {
 						_self.setNodesChecked(data.children);
 					}
 				});
+				_self.$nextTick(() => {
+					_self.$refs.treeRef.setCheckedKeys(_self.checkedkeys,true)
+				});
 			},
 
 			/**
@@ -793,7 +815,7 @@
 
 			//获取地图图集id
 			let roleId = store.roleId
-			atlasLayersSqlWhere = "roleid = " + roleId + " and atlasType='图层'"
+			atlasLayersSqlWhere = '"roleId"' + " = " + roleId + " and " + '"atlasType"' + "='图层'"
 
 			//Promise回调
 			function init(data) {
@@ -826,7 +848,7 @@
 				sqlWhere: atlasLayersSqlWhere, //
 				orderByField: ''
 			}).then(res => {
-				console.log('所有图层', res.data)
+				console.log('所有图层', res)
 				//初始图层列表
 				this.inittree = res.data
 				init(res.data).then(item => {
@@ -841,32 +863,36 @@
 </script>
 
 <style lang="scss">
-	.el-switch--small .el-switch__core .el-switch__action{
+	.el-switch--small .el-switch__core .el-switch__action {
 		width: 12rem;
 		height: 12rem;
 	}
-	.el-switch--small.is-checked .el-switch__core .el-switch__action{
+
+	.el-switch--small.is-checked .el-switch__core .el-switch__action {
 		margin-left: calc(-1rem - 12rem);
 	}
-	.el-switch__core .el-switch__action{
-		top:0;
+
+	.el-switch__core .el-switch__action {
+		top: 0;
 	}
-	.el-slider__button{
+
+	.el-slider__button {
 		width: 20rem;
 		height: 20rem;
 	}
-	.el-tree-node__content{
+
+	.el-tree-node__content {
 		height: 26rem;
 	}
-	
-	.el-switch--small .el-switch__core{
+
+	.el-switch--small .el-switch__core {
 		height: 16rem;
 	}
-	
-	.el-switch--small{
+
+	.el-switch--small {
 		padding: 0 5rem;
 	}
-	
+
 	.jt-layer {
 		padding-left: 10rem;
 

src/views/Map3d/components/map.vue

@@ -115,7 +115,7 @@
 				// this.clickEntity(jt3d);
 
 				//添加镇街边界线——精灵线
-				this.addBoundaryLine(jt3d);
+				// this.addBoundaryLine(jt3d);
 
 			},
 			/**

src/views/Map3d/components/mapNavigate.vue

@@ -156,6 +156,7 @@
 						sqlWhere: "dj = 2 and regioncode like '" + id + "%'",
 						orderByField: ''
 					}).then(res => {
+						if(res.data.length == 0) return
 						this.dj = 2
 						this.ALLlist = []
 						res.data.forEach(
@@ -258,6 +259,7 @@
 					sqlWhere: 'dj = 1',
 					orderByField: ''
 				}).then(res => {
+					if(res.data.length == 0) return
 					res.data.forEach(
 						item => {
 							console.log('城镇信息', item)

src/views/Map3d/components/printmap.vue

@@ -29,7 +29,7 @@
 			</div>
 		</div>
 		<div class="viewerbottom">
-			<el-button color="rgb(20 136 255)" v-print="printObj"><span style="color: #fff;font-size: 16rem;">打 印</span></el-button>
+			<!-- <el-button color="rgb(20 136 255)" v-print="printObj"><span style="color: #fff;font-size: 16rem;">打 印</span></el-button> -->
 			<el-button color="rgb(255 100 100)" @click="download"><span style="color: #fff;font-size: 16rem;">下 载</span></el-button>
 		</div>
 	</div>

src/views/Map3d/components/query-keyword.vue

@@ -179,7 +179,7 @@
 			getSearchData(queryString) {
 				let _self = this;
 				_self.$http.get('/getTableList', {
-					tableName: 'sys_role',
+					tableName: 'base_sys_role',
 					sqlWhere: " label like '%" + queryString + "%'",
 					orderByField: ''
 				}).then(res => {
@@ -196,7 +196,7 @@
 			this.initNavigation(jt3d);
 			let _self = this;
 			_self.$http.get('/getTableList', {
-				tableName: 'sys_role',
+				tableName: 'base_sys_role',
 				sqlWhere: '',
 				orderByField: ''
 			}).then(res => {

src/views/Map3d/components/toolbars.vue

@@ -24,7 +24,7 @@
 
 <template>
 	<div class="toolbars fadein-right">
-		<div class="toolbar-item" @click="PolylineObject()">
+		<!-- <div class="toolbar-item" @click="PolylineObject()">
 			<i class="iconfont icon-winfo-icon-tucengkongzhi"></i>
 			<span class="title">
 				测试动态线
@@ -35,7 +35,7 @@
 			<span class="title">
 				绕点旋转
 			</span>
-		</div>
+		</div> -->
 		<div class="toolbar-item" @click="showWidget('fullMap')">
 			<i class="iconfont icon-chaxunzuobiaozhi" />
 			<span class="title">
@@ -79,8 +79,8 @@
 					<el-dropdown-item command="special-effects"><i class="iconfont icon-yu"></i>特效效果</el-dropdown-item>
 					<el-dropdown-item command="coordsTool"><i class="iconfont icon-zuobiao"></i>坐标定位</el-dropdown-item>
 					<el-dropdown-item command="TrackRoam"><i class="iconfont maxsize icon-jurassic_jiankong"></i>路径漫游</el-dropdown-item>
-					<el-dropdown-item command="ImageLayerSplit"><i class="iconfont maxsize icon-juanlian"></i>卷帘对比</el-dropdown-item>
-					<el-dropdown-item command="ViewerSplitScreen"><i class="iconfont minsize icon-fenping"></i>分屏对比</el-dropdown-item>
+					<!-- <el-dropdown-item command="ImageLayerSplit"><i class="iconfont maxsize icon-juanlian"></i>卷帘对比</el-dropdown-item>
+					<el-dropdown-item command="ViewerSplitScreen"><i class="iconfont minsize icon-fenping"></i>分屏对比</el-dropdown-item> -->
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
@@ -344,8 +344,8 @@
 	.toolbars {
 		position: absolute;
 		top: 80rem;
-		// width: 340rem;
-		width: 580rem;
+		width: 340rem;
+		// width: 580rem;
 		right: 20rem;
 		cursor: pointer !important;
 		padding: 0rem !important;

src/views/Map3d/components/viewerlabel.vue

@@ -184,6 +184,7 @@
 				orderByField: ''
 			}).then(res => {
 				console.log('获取图片', res.data)
+				if(res.data.length == 0) return
 				res.data.forEach(item => {
 					let info = {
 						latitude: item.x,