Página Principal Explorar Ajuda
Registe-se Iniciar Sessão
sharedExchange
/
space-application
5
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

zzy ++ 分屏对比修改、自定义剖切添加高度

zhiyuan-007 há 1 dia atrás
pai
ed3d5ac28e
commit
384104baa0
5 ficheiros alterados com 17 adições e 13 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 1 1
      space-share-exchange/index.html
  2. 10 6
      src/unit/map/AddLayer.js
  3. 2 2
      src/views/c-views/right-tool/geologyTheme/boreholeAnalysis/BoreholeAnalysis.vue
  4. 2 2
      src/views/c-views/right-tool/more-screen/MoreScreenUse.vue
  5. 2 2
      vite.config.js

+ 1 - 1
space-share-exchange/index.html
Ver Ficheiro 

@@ -4,7 +4,7 @@
 
     <meta charset="UTF-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <title>上海市管理综合信息共享交换平台</title>
 
-    <script type="module" crossorigin src="./assets/index-56920382.js"></script>
 
+    <script type="module" crossorigin src="./assets/index-46290723.js"></script>
 
     <link rel="stylesheet" href="./assets/index-85628e62.css">
 
   </head>
 
   <body>

+ 10 - 6
src/unit/map/AddLayer.js
Ver Ficheiro 

@@ -544,17 +544,21 @@ export function AddWhiteMoldLayer(visible){
 
     })
 
 }
 
 export async function AddSinglePreviewLayer(params) {
 
-    if (params.token) {
 
+    if(params.token && Object3DLayerList.indexOf(params.title) < 0){
 
         params.url = "https://cimweb.zjw.sh.cegn.cn:2008/MapServiceProxy/" + params.token;
 
-    }
 
-    if (params.url) {
 
-        params.url = await returnProxyUrl(params.url);
 
+        if(undergroundBuildingLayerList.indexOf(params.title) > -1){
 
+            params.url =  params.url + "/SceneServer";
 
+            console.log(params.url)
 
+        }
 
     }
 
     let wkid = "0"  // 0 代表上海城建 1：代表3857
 
-    if (params.wkid) {
 
-        if (params.type == "动态地图" && params.wkid == "1") {
 
+    if(params.wkid){
 
+        if(params.type == "动态地图" && params.wkid =="1"){
 
             params.type = "dynamic"
 
         }
 
+        if(params.type == "切片地图" && params.wkid =="1"){
 
+            params.type = "tile"
 
+        }
 
     }
 
 
     if (params.type == "scene" || params.type == '3DObject') {

+ 2 - 2
src/views/c-views/right-tool/geologyTheme/boreholeAnalysis/BoreholeAnalysis.vue
Ver Ficheiro 

@@ -58,8 +58,8 @@ export default {
 
       let rings = [];
 
       if(holePointArr.length > 0){
 
         holePointArr.forEach((item)=>{
 
-          positions.push([item.x,item.y])
 
-          rings.push([item.x,item.y])
 
+          positions.push([item.x,item.y,item.z])
 
+          rings.push([item.x,item.y,item.z])
 
         })
 
       }
 
       rings.push([holePointArr[0].x,holePointArr[0].y]);

+ 2 - 2
src/views/c-views/right-tool/more-screen/MoreScreenUse.vue
Ver Ficheiro 

@@ -101,8 +101,8 @@ export default {
 
     onMounted(() => {
 
       previewMapBridge.bridgeContent = bridge1 = new CityGis.Bridge({
 
         id: "i_map_more_screen",
 
-        //url:'http://localhost:8081/#/jk_map?theme=dark&type=3D',
 
-        url: 'https://cimweb.zjw.sh.cegn.cn:2007/VUE-Map-Tool-Widget/#/jk_map?theme=dark&type=3D', //建科发布
 
+        url:'http://localhost:8081/#/jk_map?theme=dark&type=3D',
 
+        //url: 'https://cimweb.zjw.sh.cegn.cn:2007/VUE-Map-Tool-Widget/#/jk_map?theme=dark&type=3D', //建科发布
 
         onReady: function () {
 
           console.log(previewMapBridge)
 
         }

+ 2 - 2
vite.config.js
Ver Ficheiro 

@@ -15,8 +15,8 @@ export default defineConfig({
 
     proxy: {
 
       '^/api-v2': {
 
         // 代理请求之后的请求地址（你的真实接口地址)
 
-        //target: 'https://cimweb.zjw.sh.cegn.cn:2007/data-business-prod-2/',
 
-        target: 'http://192.168.3.32:9250/',
 
+        target: 'https://cimweb.zjw.sh.cegn.cn:2007/data-business-prod-2/',
 
+        //target: 'http://192.168.3.32:9250/',
 
         secure: false,
 
         ws: true,
 
         // 跨域