DESKTOP-CRQ4N2U\jintian před 2 roky
rodič
revize
1414ed4c14

+ 2 - 2
.env.development

@@ -5,6 +5,6 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'development'
 
 # 金田基础框架/开发环境
-VITE_API_URL = 'http://218.59.194.82:13182/'
+VITE_API_URL = 'http://218.59.194.82:13292/'
 
-# 后台管理地址: http://218.59.194.82:13190/sdjt-admin/
+# 后台管理地址: http://218.59.194.82:13280/

+ 2 - 2
.env.production

@@ -5,9 +5,9 @@ VITE_APP_TITLE = 金田基础框架
 VITE_APP_ENV = 'production'
 
 # 金田基础框架/生产环境
-VITE_API_URL = 'http://218.59.194.82:13182/'
+VITE_API_URL = 'http://218.59.194.82:13292/'
 
-# 后台管理地址: http://218.59.194.82:13190/sdjt-admin/
+# 后台管理地址: http://218.59.194.82:13280/
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

+ 1 - 1
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;

binární
src/assets/images/header/header-1.png


binární
src/assets/images/header/header-1.webp


binární
src/assets/images/login/login-title.png


binární
src/assets/images/login/login-title.webp


+ 1 - 1
src/views/Login/Login.vue

@@ -167,7 +167,7 @@
 <style lang="scss" scoped>
 	$fontColor: #fff;
 	$fullsize: calc(100% - 0rem);
-	$header-title: url(@/assets/images/login/login-title.webp) 0rem no-repeat;
+	$header-title: url(@/assets/images/login/login-title.png) 0rem no-repeat;
 	$header-bg-color: linear-gradient(100deg,
 		rgb(16, 96, 210, 0.2) 30%,
 		rgb(16, 106, 250, 0.1) 70%);

+ 3 - 3
src/views/Main/components/header.vue

@@ -27,9 +27,9 @@
 				<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/SysAdmin">系统管理</router-link>
-				</el-menu-item>
+				</el-menu-item> -->
 <!-- 				<el-menu-item index="2">
 					<router-link to="/home/table">数据维护</router-link>
 				</el-menu-item>
@@ -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/header-1.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%,

+ 7 - 7
src/views/Map3d/components/analysis-space.vue

@@ -26,7 +26,7 @@
 					<el-button color="rgb(255 100 100)" @click="SunShine('remove')"><span style="color: #fff;">移除光照分析</span></el-button>
 				</div>
 			</el-collapse-item>
-			<el-collapse-item name="方量分析">
+			<!-- <el-collapse-item name="方量分析">
 				<template #title>
 					<i class='iconfont icon-svgfangliangfenxi' />方量分析
 				</template>
@@ -61,7 +61,7 @@
 						</el-form-item>
 					</el-form>
 				</div>
-			</el-collapse-item>
+			</el-collapse-item> -->
 			<el-collapse-item name="剖面分析">
 				<template #title>
 					<i class='iconfont icon-svgpoumianfenxi' />剖面分析
@@ -84,7 +84,7 @@
 					<el-button color="rgb(20 136 255)" @click="SightLine('activate')">添加通视分析</el-button>
 					<el-button color="rgb(255 100 100)" @click="SightLine('deactivate')"><span style="color: #fff;">清除通视分析</span></el-button>
 				</div>
-			</el-collapse-item>
+			</el-collapse-item> 
 			<el-collapse-item name="视域分析">
 				<template #title>
 					<i class='iconfont icon-svgshiyufenxi' />视域分析
@@ -97,7 +97,7 @@
 					<el-button color="rgb(255 100 100)" @click="ViewShed('deactivate')"><span style="color: #fff;">清除视域</span></el-button>
 				</div>
 			</el-collapse-item>
-			<el-collapse-item name="限高分析">
+			<!-- <el-collapse-item name="限高分析">
 				<template #title>
 					<i class='iconfont icon-svgxiangaofenxi' />限高分析
 				</template>
@@ -118,8 +118,8 @@
 						<el-button color="rgb(255 100 100)" @click="HeightLimit('deactivate')"><span style="color: #fff;">清除限高分析</span></el-button>
 					</div>
 				</div>
-			</el-collapse-item>
-			<el-collapse-item name="剖切展示">
+			</el-collapse-item> -->
+			<!-- <el-collapse-item name="剖切展示">
 				<template #title>
 					<i class='iconfont icon-svgpouqiezhanshi' />剖切展示
 				</template>
@@ -129,7 +129,7 @@
 					</div>
 					<el-button color="rgb(20 136 255)" @click="Cutting('activate')">添加剖切多边形</el-button>
 				</div>
-			</el-collapse-item>
+			</el-collapse-item> -->
 			<!-- <el-collapse-item name="视频融合">
 				<template #title>
 					<i class='iconfont icon-svgshipinronghe' />视频融合

+ 7 - 7
src/views/Map3d/components/map.vue

@@ -119,13 +119,13 @@
 			 * 添加镇街边界线——精灵线
 			 */
 			addBoundaryLine(jt3d) {
-				jt3d.PolylineObject.drawPolylineByGeoJson(map_xzqh_zj, {
-					width: 5,
-					color: '#04FFFF',
-					isImageAlpha: true, //用图片自带颜色
-					duration: 3000,
-					imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
-				});
+				// jt3d.PolylineObject.drawPolylineByGeoJson(map_xzqh_zj, {
+				// 	width: 5,
+				// 	color: '#04FFFF',
+				// 	isImageAlpha: true, //用图片自带颜色
+				// 	duration: 3000,
+				// 	imgUrl: "jt3dSDK/imgs/polylinematerial/spriteline1.png"
+				// });
 			},
 
 			/**

+ 16 - 10
src/views/Map3d/components/toolbars.vue

@@ -32,12 +32,12 @@
 				测试动态线
 			</span>
 		</div> -->
-		<div class="toolbar-item" @click="showWidget('rotateCamera')">
+		<!-- <div class="toolbar-item" @click="showWidget('rotateCamera')">
 			<i class="iconfont icon-chaxunzuobiaozhi" />
 			<span class="title">
 				绕点旋转
 			</span>
-		</div>
+		</div> -->
 		<div class="toolbar-item" @click="showWidget('fullMap')">
 			<i class="iconfont icon-chaxunzuobiaozhi" />
 			<span class="title">
@@ -56,6 +56,12 @@
 				图层
 			</span>
 		</div>
+		<div class="toolbar-item" @click="showWidget('viewerlabel')">
+			<i class="iconfont minsize icon-fushi"></i>
+			<span class="title">
+				视角标签
+			</span>
+		</div>
 		<el-dropdown class="toolbar-item" :hide-on-click="false" @command="handleCommand">
 			<span class="el-dropdown-link">
 				<i class="iconfont icon-xitong1" />
@@ -70,19 +76,19 @@
 				<span slot="slot" class="text"></span>
 				<el-dropdown-menu>
 					<el-dropdown-item command="DialogEdit"><i class="iconfont minsize icon-dituhuizhi"></i>绘制功能</el-dropdown-item>
-					<el-dropdown-item command="navigate"><i class="iconfont icon-zhijiantou"></i>地区导航</el-dropdown-item>
-					<el-dropdown-item command="viewerlabel"><i class="iconfont minsize icon-fushi"></i>视角标签</el-dropdown-item>
+					<!-- <el-dropdown-item command="navigate"><i class="iconfont icon-zhijiantou"></i>地区导航</el-dropdown-item> -->
+					<!-- <el-dropdown-item command="viewerlabel"><i class="iconfont minsize icon-fushi"></i>视角标签</el-dropdown-item> -->
 					<el-dropdown-item v-if="store.userport=='PC'" command="printmap"><i class="iconfont maxsize icon-svgdayin"></i>打印地图</el-dropdown-item>
 					<el-dropdown-item command="measure"><i class="iconfont minsize icon-icon_measureTool"></i>图上量算</el-dropdown-item>
-					<el-dropdown-item command="query-graphics"><i class="iconfont icon-search"></i>图形查询</el-dropdown-item>
-					<el-dropdown-item command="analysis-data"><i class="iconfont maxsize icon-svgjiexiwenjian"></i>文件解析</el-dropdown-item>
+					<!-- <el-dropdown-item command="query-graphics"><i class="iconfont icon-search"></i>图形查询</el-dropdown-item> -->
+					<!-- <el-dropdown-item command="analysis-data"><i class="iconfont maxsize icon-svgjiexiwenjian"></i>文件解析</el-dropdown-item> -->
 					<el-dropdown-item command="analysis-space"><i class="iconfont icon-duodiankeshiyu"></i>空间分析</el-dropdown-item>
-					<el-dropdown-item command="analysis-terrain"><i class="iconfont icon-iconfonttubiao_dixing"></i>地形分析</el-dropdown-item>
+					<!-- <el-dropdown-item command="analysis-terrain"><i class="iconfont icon-iconfonttubiao_dixing"></i>地形分析</el-dropdown-item> -->
 					<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="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="ViewerSplitScreen"><i class="iconfont minsize icon-fenping"></i>分屏对比</el-dropdown-item> -->
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
@@ -359,7 +365,7 @@
 	.toolbars {
 		position: absolute;
 		top: 80rem;
-		width: 580rem;
+		width: 560rem;
 		right: 20rem;
 		cursor: pointer !important;
 		padding: 0rem !important;

+ 1 - 1
src/views/SysAdmin/SysAdmin.vue

@@ -3,7 +3,7 @@
 
 <template>
 	<view class="main">
-		<iframe src="http://218.59.194.82:13190/sdjt-admin/" scrolling="auto" frameborder="0" class="trend-container2" id="iframe"></iframe>
+		<iframe src="http://218.59.194.82:13280/" scrolling="auto" frameborder="0" class="trend-container2" id="iframe"></iframe>
 		<!-- <jt-popup :height="height" :title="title">
 			<h1>测试插槽</h1>
 		</jt-popup> -->

+ 1 - 1
vite.config.js

@@ -19,7 +19,7 @@ export default defineConfig({
 	// 默认情况下,vite 会假设你的应用是被部署在一个域名的根路径上,例如 https://www.ruoyi.vip/。
 	// 如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
 	// base: './',
-	base: process.env.NODE_ENV === 'production' ? './' : '/sdjt/',
+	base: process.env.NODE_ENV === 'production' ? './' : './',
 
 	resolve: {
 		alias: {