功能修改20250320-01

src/components/MapView.vue

@@ -25,11 +25,11 @@ export default {
 			}, 2500)
 			myBridge.bridgeContent = bridge = new CityGis.Bridge({
 				id: 'i_map',
-				//url: 'http://localhost:5173/map-tool-widget/',
+				url: 'http://localhost:5173/map-tool-widget/',
 				// url: 'http://10.1.163.210:5173/map-tool-widget/#/jk_map',
 				// url: 'http://58.34.215.19:8100/map-tool-widget/',
 				// url: 'https://cimweb.zjw.sh.cegn.cn:2007/map-tool-widget/#/',
-				url: 'http://58.34.215.19:8095/map-tool-widget/#/jk_map',
+				// url: 'http://172.16.8.41:9250/map-tool-widget/#/jk_map',
 				onReady: function () {
 					console.log('地图创建完成')
 				},

src/store/layout.js

@@ -18,7 +18,7 @@ const useLayoutStore = defineStore('layout', {
 		leftCollapse: false, // 左侧面板收缩状态
 		rightCollapse: false, // 左侧面板收缩状态
 		footerCollapse: false, // 底部收缩状态
-		sceneType: 'ue', // 场景类型 'ue' | 'gis'
+		sceneType: 'gis', // 场景类型 'ue' | 'gis'
 		mapScene: 'rs', // 底图类型 'light' | 'dark' | 'rs'
 		leftPanelType: 'default', // 左侧面板显示的内容
 		floatPanels: {

src/views/home/Home.vue

@@ -97,7 +97,7 @@
 				</TransitionGroup>
 			</table>
 
-			<div class="title-main rtl">各类违规类型占比次数</div>
+			<div class="title-main rtl">各类预警类型占比次数</div>
 			<div class="b-wgzb">
 				<video autoplay muted loop id="bg-wgzb">
 					<source src="@/assets/images/motion/bg-uav.webm" type="video/webm" />

src/views/home/cpns/PanelHxhs.vue

@@ -228,6 +228,7 @@ import useLayoutStore from '@/store/layout'
 import { useMapStore } from '@/store/map.js'
 import { riskTypes } from '@/utils/options'
 import { useDateFormat } from '@vueuse/core'
+import { getInspectionData } from '@/service/map.js'
 
 const currentStep = ref(0)
 let currentPath = [] // 当前规划路径
@@ -597,7 +598,6 @@ function handleInspect(level) {
 		radius: '10',
 		level,
 	}
-	layoutStore.toggleGlobalLoading(true)
 	getInspectionData(params, 'polyline')
 		.then((res) => {
 			const conflict = res.data?.data?.gridConflict
@@ -613,7 +613,6 @@ function handleInspect(level) {
 
 //查询网格
 function queryCube() {
-	layoutStore.toggleGlobalLoading(true)
 	getPathCube({
 		status: 'show',
 		paths: [currentPath],

src/views/home/cpns/PanelKyhs.vue

@@ -183,6 +183,7 @@ import { useMapStore } from '@/store/map'
 import { AddArea } from '@/service/http'
 import { riskTypes } from '@/utils/options'
 import useLayoutStore from '@/store/layout'
+import { getInspectionData } from '@/service/map.js'
 
 const mapStore = useMapStore()
 const layoutStore = useLayoutStore()

src/views/home/cpns/PanelQjchs.vue

@@ -196,6 +196,7 @@ import { uavList } from '@/utils/options'
 import { AddPlot } from '@/service/http'
 import { riskTypes } from '@/utils/options'
 import useLayoutStore from '@/store/layout'
+import { getInspectionData } from '@/service/map.js'
 
 const layoutStore = useLayoutStore()
 const mapStore = useMapStore()

vite.config.js

@@ -7,78 +7,78 @@ import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  server: {
-    cors: true,
-    proxy: {
-      // 代理所有 /api 的请求，该求情将被代理到 target 中
-      '/api': {
-        // 代理请求之后的请求地址（你的真实接口地址)
-        target: 'https://cimweb.zjw.sh.cegn.cn:2007/data-business-prod/',
-        //target: 'http://localhost:9250/',
-        secure: false,
-        ws: true,
-        // 跨域
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, '')
-      },
-      '/addressapi': {
-        // 代理请求之后的请求地址（你的真实接口地址)
-        target: 'https://cimweb.zjw.sh.cegn.cn:2008/',
-        //target: 'http://localhost:9250/',
-        secure: false,
-        ws: true,
-        // 跨域
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/addressapi/, '')
-      },
-      '/netapi': {
-        // 代理请求之后的请求地址（你的真实接口地址)
-        target: 'http://58.34.215.19:8095/low-altitude/',
-        //target: 'http://localhost:9250/',
-        secure: false,
-        ws: true,
-        // 跨域
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/netapi/, '')
-      },
-      '/zwapi': {
-        // 代理请求之后的请求地址（你的真实接口地址)
-        target: 'http://10.90.9.143:9252/',
-        //target: 'http://localhost:9250/',
-        secure: false,
-        ws: true,
-        // 跨域
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/zwapi/, '')
-      }
-    },
-  },
-  plugins: [
-    vue(),
-    AutoImport({
-      resolvers: [ElementPlusResolver()],
-    }),
-    Components({
-      resolvers: [ElementPlusResolver()],
-    }),
-  ],
-  build: {
-    outDir: 'low_altitude_web',
-  },
-  resolve: {
-    alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
-    }
-  },
-  esbuild: {
-    drop: ['console']
-  },
-  css: {
-    preprocessorOptions: {
-      scss: {
-        api: "modern-compiler" // or 'modern'
-      }
-    },
-  },
-  base: '/low_altitude/'
-})
+	server: {
+		cors: true,
+		proxy: {
+			// 代理所有 /api 的请求，该求情将被代理到 target 中
+			'/api': {
+				// 代理请求之后的请求地址（你的真实接口地址)
+				target: 'https://cimweb.zjw.sh.cegn.cn:2007/data-business-prod/',
+				//target: 'http://localhost:9250/',
+				secure: false,
+				ws: true,
+				// 跨域
+				changeOrigin: true,
+				rewrite: (path) => path.replace(/^\/api/, ''),
+			},
+			'/addressapi': {
+				// 代理请求之后的请求地址（你的真实接口地址)
+				target: 'https://cimweb.zjw.sh.cegn.cn:2008/',
+				//target: 'http://localhost:9250/',
+				secure: false,
+				ws: true,
+				// 跨域
+				changeOrigin: true,
+				rewrite: (path) => path.replace(/^\/addressapi/, ''),
+			},
+			'/netapi': {
+				// 代理请求之后的请求地址（你的真实接口地址)
+				target: 'http://172.16.8.41:9250/low-altitude/',
+				//target: 'http://localhost:9250/',
+				secure: false,
+				ws: true,
+				// 跨域
+				changeOrigin: true,
+				rewrite: (path) => path.replace(/^\/netapi/, ''),
+			},
+			'/zwapi': {
+				// 代理请求之后的请求地址（你的真实接口地址)
+				target: 'http://10.90.9.143:9252/',
+				//target: 'http://localhost:9250/',
+				secure: false,
+				ws: true,
+				// 跨域
+				changeOrigin: true,
+				rewrite: (path) => path.replace(/^\/zwapi/, ''),
+			},
+		},
+	},
+	plugins: [
+		vue(),
+		AutoImport({
+			resolvers: [ElementPlusResolver()],
+		}),
+		Components({
+			resolvers: [ElementPlusResolver()],
+		}),
+	],
+	build: {
+		outDir: 'low_altitude_web',
+	},
+	resolve: {
+		alias: {
+			'@': fileURLToPath(new URL('./src', import.meta.url)),
+		},
+	},
+	esbuild: {
+		drop: ['console'],
+	},
+	css: {
+		preprocessorOptions: {
+			scss: {
+				api: 'modern-compiler', // or 'modern'
+			},
+		},
+	},
+	base: '/low_altitude/',
+})