From 6648559cda10b4d6f55eac5fe9f7a0110536d0b9 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sun, 10 Sep 2023 23:20:30 +0800
Subject: [PATCH] update code

---
 public/index.html                   |   1 +
 public/initApi.js                   |  81 ++++++++++++++++++
 public/js/mapmodle.js               |  11 +++
 public/maps/config.json             |   1 -
 public/maps/home.html               |   3 +-
 public/maps/index.html              |  41 ---------
 public/maps/map1.html               |  76 -----------------
 public/maps/map2.html               |  76 -----------------
 src/pages/detail/mapModle.vue       | 124 ++++++++++++++++++++++++++++
 src/pages/detail/projectInfoDlg.vue |  18 +++-
 src/pages/index/indexDlg2.vue       |  38 +++++++--
 src/pages/projectDetail.vue         |  16 ++--
 src/pages/style/index.less          |   1 +
 vue.config.js                       |   4 +-
 14 files changed, 279 insertions(+), 212 deletions(-)
 create mode 100644 public/initApi.js
 create mode 100644 public/js/mapmodle.js
 delete mode 100644 public/maps/config.json
 delete mode 100644 public/maps/index.html
 delete mode 100644 public/maps/map1.html
 delete mode 100644 public/maps/map2.html
 create mode 100644 src/pages/detail/mapModle.vue

diff --git a/public/index.html b/public/index.html
index e402382..cf2abd7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,6 +14,7 @@
     <script src="https://unpkg.com/element-ui@2.15.13/lib/index.js"></script>
     <script src="https://cdn.makalu.cc/js/jquery/3.5.1/jquery.min.js"></script>
     <script src="./js/echarts.min.js"></script>
+    <script src="./js//mapmodle.js"></script>
     <!--
     <script crossorigin="anonymous" integrity="sha384-gb8mitZ44MWVFB3GKzmtx1OCjOh3Cj4mgusyTvNzl1Nu31l0em1FrApJindwVAe0" 
     src="https://lib.baomitu.com/echarts/4.2.1/echarts.min.js"></script>
diff --git a/public/initApi.js b/public/initApi.js
new file mode 100644
index 0000000..60ef166
--- /dev/null
+++ b/public/initApi.js
@@ -0,0 +1,81 @@
+window.initMap=()=>{
+delete window.mapDefault
+delete window.mapApi
+delete window.mapOptions
+delete window.mapNacCube
+window.mapDefault={
+    "container": "cesiumContainer",
+    "showfps": false,
+    "openterrain": false,
+    "imageryprovider": "tianditu_image",
+    "terrainProvider": "http://106.12.253.67:9304/",
+    "mapworldkey": "6215132e0336a3db28ce73f8c9ff6db6",
+    "openearth": false,
+    "maxspaceerror": 2000,
+    "loading": false,
+    "bgcolor": "#87CEFA",
+    "outlinecolor": {
+        "red": 0,
+        "green": 0,
+        "blue": 0,
+        "alpha": 1
+    },
+    "outlineScaleVal": 1.001,
+    "selectedcolor": {
+        "red": 1,
+        "green": 1,
+        "blue": 0,
+        "alpha": 1
+    },
+    "sceneMode": 3,
+    "TwoMapNavigationEnable": false,
+    "throughwall": true,
+    "searchbox": false,
+    "mapbox": false,
+    "sitepath": "/static/Cesium/",
+    "secretkey": "80840d6054a373fa6493fe6a8cd7c0b8a01924bf58e825bfe1a1a67cb0a02263b5549ae0c4c04dde2e457c9132b600699a2f430fe4b7a52ae76d0bdd0633e4f1b1dd0395c04c1b00f41e1b0c3020a71600f1cc3bd764e4d130249ddd6e2916a73792839cb97ddb24f090343455f7834c356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f6152b6a2299e3e22c9450d7fc8c8452aa23013404ec41c18c92e7ff7e2a3fe238234fec9927bc4cd95b450c2cdae94df00da4c49c467adacd9ec7f7c00482028425ebbbee7ceb46deec08dc9751ee993a353012fbe2ebcf6e0f81b95abdf8d437c4965454914fcc7b07d28062bc2976948356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f6152b6a2299e3e22c9cc8c33b16ea71cc03013404ec41c18c9cc748e652ce16fe7061c32d550edfda330c1555e0c08e51f698f96b91615d8220acd9cb22f32e9757681487e0680adfbfacb9b5d2ce5a13b664d8466043270f9f3bde6ac6a05cf25ab0ccc0659a290c9669997be7ccc0086c3d61f7cf5f649cb25f0dbad9f7f66e3165cad25065145affac91bea061f4ff485af667dd7ebaf4baeea64611acbe5c74018be5a8b704fcd4f53d18504940411fac91bea061f4ff49a2f853c245297edc3d61f7cf5f649cb0f9b84173857a7b67c27928b58b4a6a65f517a43f106335e8b1d5c423a171723ffa04d0ac4e5c1a1853fcb2bc95ee8056cd5b4826fa55926733ef859a5f169e6afafd0506174e86864d53d967da98ab0b0e08d14be6d452c6c69755ac3a391993370a029761da893cfbf575da87c6b5ca602467b79c6c9532f438aaafb9ec915692f0287a8db979969e5635404d6fdfb753151533a277044afdd825f7197f2896c69755ac3a391993370a029761da893af24d88c02bccfae6cd5b4826fa55926f7722b78090b30b986f9287101582d8841187054ec673ebd2042f9836ea453c3afafd0506174e86800225b7f4102e3585b1923cb186fe0ceee54c6f17ab8555da26ecd334722494fc515b205e9624a4494c772ef4f023a606882e118fa6321c24ddee4821c840fb56aac929d6d0a052d5ff97d71e43811db939f7340826236af6f10316a04bf618d494a26e0fd06f7daa07177989e1680a4cf14829a5847f70377d6c12f1649400fcab44f4ff52989cf129aa6cca660be152a75b8e35648925dbce381b345d9e137c04a02a4c8252625f5625eed58fd34b7be4266e54212e88b23f012bead9abaef9e18aa308f0ecffaf3dda7d7b4efd2e0c4b8de161864620fc1f2af98bde031b29e0865381c96bbc10921b48a068558915ff023d18526f5d399e0893df43db7122415d52565dc982ea24fbd825734dbaefadc6df0f19d925c7f63d343a622134b1c934d130d662447add19064adbbb2fd24a82c0fbfcbc3175fc32761df099156daf4e86455740207eb4e4a5300d9c1a17ffd43703d476c36ef07df2206bd8d232b844ff3c1d7cf7c47ec502183af4e27b644d89a77efad286dee59796b124081510f8a6ea5c1dff9c3d61f7cf5f649cb25f0dbad9f7f66e3e0e7c3406ae4dd4eebc424f09f933d0eb1a881ed05ca8d5c70958237eb5b91d4e574440ea0c9179a582dc966bcfc1f21cf3630a2823a9a2d22bd09a00b213aae3866768ae2f24dde6784fbf292c2cba1ab3a1a0dac231941d2277e675309a46ea6fde1492ec9a29c4f53d18504940411e9520f8be669a95a8618879da1244784b88edb1244f5021a0991de19ea44c0dd",
+    "editmode": true,
+    "cadmode": false,
+    "isRequestWebgl2": true,
+    "requestRenderMode": true,
+    "colorBlendMode": 2,
+    "loadAnimation": false,
+    "isStrictClip": true,
+    "isMsaaSamples": true,
+    "isOpenVR": false,
+    "language": "zh-CN"
+};
+window.mapApi = new API(window.mapDefault); //api对象后面调用接口要全程使用，控制好作用域
+
+//导航体
+window.mapOptions = {
+  imgs: { // 六面图片
+    top: '/cesium/Assets/Images/Navigation/bim/top.png',
+    bottom: '/cesium/Assets/Images/Navigation/bim/under.png',
+    east: '/cesium/Assets/Images/Navigation/bim/east.png',
+    south: '/cesium/Assets/Images/Navigation/bim/south.png',
+    west: '/cesium/Assets/Images/Navigation/bim/west.png',
+    north: '/cesium/Assets/Images/Navigation/bim/north.png',
+  },
+  offset: { // 屏幕坐标偏移
+    corner: GLENavigationCube.RightTop,
+    x: 25,
+    y: 20
+  },
+  cube: {
+    hoverColor: '#7193dc', // 立方导航快鼠标移过显示颜色
+    size: 75,// 导航立方尺寸
+    hotPointSize: 7,// 导航立方棱角热点区域尺寸        
+    cubeTextColor: "#4c4c4ccc",// cube 各个面文字颜色
+    cubeStrokeColor: "#374769cc",// cube 各个面边框颜色
+    cubeFillColor: "#374769cc",// cube 各个面填充颜色
+  },
+  zoomRatios: 1, // 缩放倍率
+  show: true, // 是否显示
+  showAxes: true, // 是否显示XYZ轴线
+};
+window.mapNacCube = window.mapApi.Plugin.initNavCube(window.mapOptions); // 实例化出来的对象可用于更新和设置可视状态
+
+window.mapApi.Public.setSunshineDuration("13:00");
+// OR 最简形式
+}
diff --git a/public/js/mapmodle.js b/public/js/mapmodle.js
new file mode 100644
index 0000000..75a0331
--- /dev/null
+++ b/public/js/mapmodle.js
@@ -0,0 +1,11 @@
+window.mapModels=[{
+    prjId:697,
+    prjName:'泊跃人工智能产业园项目',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543aca1',
+    root:'http://szgc.jhncidg.com:808/mapmodel/tools/output/model/202309090700533962/root.glt',
+},{
+    prjId:692,
+    prjName:'云和悦小区',
+    modelId:'3a0d876b-fcf5-56ff-0efb-89c065ffa637',
+    root:'http://szgc.jhncidg.com:808/mapmodel/tools/output/model/202309082236347836/root.glt',
+}];
diff --git a/public/maps/config.json b/public/maps/config.json
deleted file mode 100644
index 3ec1671..0000000
--- a/public/maps/config.json
+++ /dev/null
@@ -1 +0,0 @@
-{"apiUrl":"/mapapi","modelUrl":"/mapmodel","secretKey":"80840d6054a373fa6493fe6a8cd7c0b8a01924bf58e825bfe1a1a67cb0a02263b5549ae0c4c04dde2e457c9132b600699a2f430fe4b7a52ae76d0bdd0633e4f1b1dd0395c04c1b00f41e1b0c3020a71600f1cc3bd764e4d130249ddd6e2916a73792839cb97ddb24f090343455f7834c356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f6152b6a2299e3e22c9450d7fc8c8452aa23013404ec41c18c92e7ff7e2a3fe238234fec9927bc4cd95b450c2cdae94df00da4c49c467adacd9ec7f7c00482028425ebbbee7ceb46deec08dc9751ee993a353012fbe2ebcf6e0f81b95abdf8d437c4965454914fcc7b07d28062bc2976948356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f6152b6a2299e3e22c9cc8c33b16ea71cc03013404ec41c18c9cc748e652ce16fe7061c32d550edfda330c1555e0c08e51f698f96b91615d8220acd9cb22f32e9757681487e0680adfbfacb9b5d2ce5a13b664d8466043270f9f3bde6ac6a05cf25ab0ccc0659a290c9669997be7ccc0086c3d61f7cf5f649cb25f0dbad9f7f66e3165cad25065145affac91bea061f4ff485af667dd7ebaf4baeea64611acbe5c74018be5a8b704fcd4f53d18504940411fac91bea061f4ff49a2f853c245297edc3d61f7cf5f649cb0f9b84173857a7b67c27928b58b4a6a65f517a43f106335e8b1d5c423a171723ffa04d0ac4e5c1a1853fcb2bc95ee8056cd5b4826fa55926733ef859a5f169e6afafd0506174e86864d53d967da98ab0b0e08d14be6d452c6c69755ac3a391993370a029761da893cfbf575da87c6b5ca602467b79c6c9532f438aaafb9ec915692f0287a8db979969e5635404d6fdfb753151533a277044afdd825f7197f2896c69755ac3a391993370a029761da893af24d88c02bccfae6cd5b4826fa55926f7722b78090b30b986f9287101582d8841187054ec673ebd2042f9836ea453c3afafd0506174e86800225b7f4102e3585b1923cb186fe0ceee54c6f17ab8555da26ecd334722494fc515b205e9624a4494c772ef4f023a606882e118fa6321c24ddee4821c840fb56aac929d6d0a052d5ff97d71e43811db939f7340826236af6f10316a04bf618d494a26e0fd06f7daa07177989e1680a4cf14829a5847f70377d6c12f1649400fcab44f4ff52989cf129aa6cca660be152a75b8e35648925dbce381b345d9e137c04a02a4c8252625f5625eed58fd34b7be4266e54212e88b23f012bead9abaef9e18aa308f0ecffaf3dda7d7b4efd2e0c4b8de161864620fc1f2af98bde031b29e0865381c96bbc10921b48a068558915ff023d18526f5d399e0893df43db7122415d52565dc982ea24fbd825734dbaefadc6df0f19d925c7f63d343a622134b1c934d130d662447add19064adbbb2fd24a82c0fbfcbc3175fc32761df099156daf4e86455740207eb4e4a5300d9c1a17ffd43703d476c36ef07df2206bd8d232b844ff3c1d7cf7c47ec502183af4e27b644d89a77efad286dee59796b124081510f8a6ea5c1dff9c3d61f7cf5f649cb25f0dbad9f7f66e3e0e7c3406ae4dd4eebc424f09f933d0eb1a881ed05ca8d5c70958237eb5b91d4e574440ea0c9179a582dc966bcfc1f21cf3630a2823a9a2d22bd09a00b213aae3866768ae2f24dde6784fbf292c2cba1ab3a1a0dac231941d2277e675309a46ea6fde1492ec9a29c4f53d18504940411e9520f8be669a95a8618879da1244784b88edb1244f5021a0991de19ea44c0dd","modelInput":{"IsCAD":false,"IsMain":1,"ConfigJson":{"isMain":1,"style":1,"zGrid":1,"viewStyle":0,"drawing":1,"accuracy":3,"parametric":1,"familyName":"","writetype":0,"locationType":0,"vertexNormal":1,"isExportLines":0,"unitRatio":0.001,"type":4,"offsetX":0.0,"offsetY":0.0,"offsetZ":0.0,"isInstance":0,"maxCountInstance":0,"isLod":0,"engineType":2,"srs":"","srsOrigin":[],"longitude":1.90031448957143,"latitude":0.596902604182061,"transHeight":0,"edgeOn":0,"level":1,"xCount":5,"yCount":5,"draco":0,"flipY":0,"linePercent":0.0,"minDistance":0.0,"compatible":0,"faceNumLimit":300000,"textureLimit":10240,"textureSizePercent":50,"textureQuality":30,"combineTexture":1,"blockRender":1,"useGisCS":1,"materialType":0}},"cadInput":{"IsCAD":true,"ConfigJson":{"style":1,"zGrid":0,"viewStyle":0,"drawing":0,"accuracy":3,"parametric":0,"familyName":"","writetype":0,"locationType":0,"vertexNormal":0,"isExportLines":0,"unitRatio":0.001,"type":4,"offsetX":0.0,"offsetY":0.0,"offsetZ":0.0,"isInstance":0,"maxCountInstance":0,"isLod":0,"engineType":1,"srs":"","srsOrigin":[],"longitude":0.0,"latitude":0.0,"transHeight":0.0,"edgeOn":0,"level":1,"xCount":5,"yCount":5,"draco":0,"flipY":0,"linePercent":0.0,"minDistance":0.0,"compatible":0,"faceNumLimit":300000,"textureLimit":10240,"textureSizePercent":50,"textureQuality":30,"combineTexture":0,"blockRender":1,"useGisCS":1,"materialType":0}}}
\ No newline at end of file
diff --git a/public/maps/home.html b/public/maps/home.html
index 0b5536f..45b3a2a 100644
--- a/public/maps/home.html
+++ b/public/maps/home.html
@@ -52,7 +52,8 @@
   <script>
     $(function () {
       // 第五步:加载模型
-      api.Model.add(
+      window.initMap();
+      window.mapApi.Model.add(
          "http://szgc.jhncidg.com:808/mapmodel/Tools/output/model/202308292207450987/root.glt",
          //"/cesium/output/model/202308292207450987/root.glt",
         '3a0d53cc-ad56-688c-e38d-f907088c2882',
diff --git a/public/maps/index.html b/public/maps/index.html
deleted file mode 100644
index 5f0edd5..0000000
--- a/public/maps/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="1.0, initial-scale=1.0">
-    <title>地图</title>
-    <style type="text/css">
-        html,body,iframe,#main{
-            width:100%;
-            height:100%;
-            border: none;
-            padding: 0px;
-            margin: 0px;
-            overflow: hidden;
-        }
-        .nav{
-            position: absolute;
-            padding: 12px;
-        }
-        .nav .nav-item{
-            cursor: pointer;
-            color: #fff;
-        }
-    </style>
-</head>
-<body>
-<div class="nav">
-    <span class="nav-item"  onclick="doNav('home.html')">泾河路网</span>
-    <span class="nav-item"  onclick="doNav('map1.html')">医院</span>
-    <span class="nav-item" onclick="doNav('map2.html')">体育中心</span>
-</div>
-<div id="main">
-<iframe src="home.html" id="if1"></iframe>
-</div>
-<script>
-    function doNav(url){
-        document.getElementById("main").outerHTML=`<iframe src="${url}?time=${+new Date()}" id="if1"></iframe>`;        
-    }
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/public/maps/map1.html b/public/maps/map1.html
deleted file mode 100644
index 3bdc6c5..0000000
--- a/public/maps/map1.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>泾河路网</title>  
-  <!-- 第一步：先引入相关css及js文件 -->
-  <link rel="stylesheet" href="/cesium/Widgets/widgets.css">
-  <script src="/cesium/jquery-3.0.0.min.js"></script>
-  <script src="/cesium/Cesium.js"></script>
-  <script src="/cesium/BIMGISEngine.js"></script>
-  <style>
-    /* 第三步：容器样式，根据自身业务调整，这里只做参考  */
-    html,
-    body,
-    #cesiumContainer {
-      width: 100%;
-      height: 100%;
-      margin: 0;
-      padding: 0;
-      overflow: hidden;
-      position: relative;
-    }
-
-  </style>
-</head>
-
-<body>
-  <!-- 第二步：创建容器 -->
-  <div id="cesiumContainer"></div>
-
-  <!-- 视图列表 -->
-  <div class="panel">
-    <div class="panel-heading">模型视图列表</div>
-    <ul class="list-group layui-form">
-      <input type="radio" lay-filter="view" name="view" value="house_rvt3dview4708954" title="3D视图" />
-      <input type="radio" lay-filter="view" name="view" value="house_rvt" title="三维视图" checked />
-    </ul>
-  </div>
-
-  <!-- 加载logo及遮罩层 -->
-  <div id="box"></div>
-  <div class="loading-shadow" id="LoadingShadow">
-    <div class="loading-box mobile-loading-box">
-      加载中....
-    </div>
-  </div>
-  <!-- 第四步: 初始化Api -->
-  <script src="/cesium/initApi.js"></script>
-  <script>
-    $(function () {
-      // 第五步:加载模型
-      api.Model.add(
-         "http://szgc.jhncidg.com:808/mapmodel/Tools/output/model/202308292209049711/root.glt",
-         //"/cesium/output/model/202308292209049711/root.glt",
-        '3a0d53cd-8774-6b32-a056-d69e2e12260e',
-        null,
-        function (data) {
-        if (Cesium.defined(data)) {
-          if (Cesium.defined(data.obj) && data.obj instanceof Cesium.Cesium3DTileset) {
-            console.log(data);
-          }
-        }
-      },
-      function (data) {
-        $("#box,#LoadingShadow").hide()
-      });  
-    })
-
-  </script>
-  
-</body>
-
-</html>
diff --git a/public/maps/map2.html b/public/maps/map2.html
deleted file mode 100644
index b493fd9..0000000
--- a/public/maps/map2.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>泾河路网</title>  
-  <!-- 第一步：先引入相关css及js文件 -->
-  <link rel="stylesheet" href="/cesium/Widgets/widgets.css">
-  <script src="/cesium/jquery-3.0.0.min.js"></script>
-  <script src="/cesium/Cesium.js"></script>
-  <script src="/cesium/BIMGISEngine.js"></script>
-  <style>
-    /* 第三步：容器样式，根据自身业务调整，这里只做参考  */
-    html,
-    body,
-    #cesiumContainer {
-      width: 100%;
-      height: 100%;
-      margin: 0;
-      padding: 0;
-      overflow: hidden;
-      position: relative;
-    }
-
-  </style>
-</head>
-
-<body>
-  <!-- 第二步：创建容器 -->
-  <div id="cesiumContainer"></div>
-
-  <!-- 视图列表 -->
-  <div class="panel">
-    <div class="panel-heading">模型视图列表</div>
-    <ul class="list-group layui-form">
-      <input type="radio" lay-filter="view" name="view" value="house_rvt3dview4708954" title="3D视图" />
-      <input type="radio" lay-filter="view" name="view" value="house_rvt" title="三维视图" checked />
-    </ul>
-  </div>
-
-  <!-- 加载logo及遮罩层 -->
-  <div id="box"></div>
-  <div class="loading-shadow" id="LoadingShadow">
-    <div class="loading-box mobile-loading-box">
-      加载中....
-    </div>
-  </div>
-  <!-- 第四步: 初始化Api -->
-  <script src="/cesium/initApi.js"></script>
-  <script>
-    $(function () {
-      // 第五步:加载模型
-      api.Model.add(
-         "http://szgc.jhncidg.com:808/mapmodel/Tools/output/model/202308292206163239/root.glt",
-         //"/cesium/output/model/202308292206163239/root.glt",
-        '3a0d53cb-0258-5eb4-c66f-25f550cfbc02',
-        null,
-        function (data) {
-        if (Cesium.defined(data)) {
-          if (Cesium.defined(data.obj) && data.obj instanceof Cesium.Cesium3DTileset) {
-            console.log(data);
-          }
-        }
-      },
-      function (data) {
-        $("#box,#LoadingShadow").hide()
-      });  
-    })
-
-  </script>
-  
-</body>
-
-</html>
diff --git a/src/pages/detail/mapModle.vue b/src/pages/detail/mapModle.vue
new file mode 100644
index 0000000..badef17
--- /dev/null
+++ b/src/pages/detail/mapModle.vue
@@ -0,0 +1,124 @@
+<template>
+    <div style="height: 100%;">
+        <div v-if="showMap" style="height: 100%;" v-loading="loading">
+            <div id="cesiumContainer" style="height: 100%;"></div>
+        </div>
+
+        <img v-else :src="'images/830.png'">
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: 'JhbigscreenMapModle',
+
+    data() {
+        return {
+            loading:false,
+            showMap: false,
+            mapInfo: null,
+            project: null
+        };
+    },
+
+    mounted() {
+        window.mymap = this;
+        this.$bus.$on("projectChange", res => {            
+            this.project = res;
+            this.reloadMap();
+        });
+        this.initScript('CesiumJs', '/cesium/Cesium.js?v=20230910').then(d => {
+            this.initScript('BIMGISEngineJs', '/cesium/BIMGISEngine.js?v=20230910').then(d => {
+                this.initScript('initApiJs', '/cesium/initApi.js?v=202309104');
+            });
+        });
+        this.loadCss("cesium_Widgets_widgets","/cesium/Widgets/widgets.css?v=20230910");
+    },
+
+    methods: {
+        loadCss(id, href) {
+            if (document.getElementById(id)) {                   
+                return;
+            }
+            let node = document.createElement("link");
+            node.rel = "stylesheet";
+            node.type = "text/css";
+            node.href = href;
+            node.id=id;
+            document.getElementsByTagName("head")[0].appendChild(node);
+
+        },
+        initScript(id, url) {
+            return new Promise((resolve, reject) => {
+                if (document.getElementById(id)) {
+                    resolve();
+                    return;
+                }
+                let script = document.createElement('script');
+                script.type = "text/javascript";
+                id = id;
+                script.src = url;
+                document.body.appendChild(script);
+
+                script.onload = () => {
+                    resolve();
+                }
+                script.onerror = () => {
+                    reject();
+                }
+            })
+
+
+        },
+        reloadMap() {
+            let items = window.mapModels.filter(d => d.prjId == this.project.id);
+            if (items.length > 0) {
+                this.mapInfo = items[0];
+                this.showMap = true;
+                this.loading=true;
+                setTimeout(this.initMap, 200);
+            } else {
+                this.mapInfo = null;
+                this.showMap = false;
+            }
+        },
+        initMap() {
+            const func = () => {
+                if (!window.initMap) {
+                    setTimeout(func, 100);
+                    return;
+                }
+                this.loading=false;
+                window.initMap();
+                window.mapApi.Model.add(
+                    this.mapInfo.root,
+                    this.mapInfo.modelId,
+                    null,
+                    function (data) {
+                        if (Cesium.defined(data)) {
+                            if (Cesium.defined(data.obj) && data.obj instanceof Cesium.Cesium3DTileset) {
+                                console.log(data);
+                            }
+                        }
+                    },
+                    function (data) {
+                        $("#box,#LoadingShadow").hide()
+                    });
+            }
+            func();
+        }
+    },
+};
+</script>
+
+<style lang="less">
+#cesiumContainer {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    position: relative;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/detail/projectInfoDlg.vue b/src/pages/detail/projectInfoDlg.vue
index 40c78a1..b00c222 100644
--- a/src/pages/detail/projectInfoDlg.vue
+++ b/src/pages/detail/projectInfoDlg.vue
@@ -52,6 +52,10 @@
                         fill="#fff" p-id="3687"></path>
                 </svg>
             </i>
+            <i class="set-fullscreen set-font-size" style="margin-left: 16px;" @click="toggleFullScreen">
+                <svg class="icon" v-if="!isFullScreen" style="width: 24px; vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3304"><path d="M145.066667 85.333333h153.6c25.6 0 42.666667-17.066667 42.666666-42.666666S324.266667 0 298.666667 0H34.133333C25.6 0 17.066667 8.533333 8.533333 17.066667 0 25.6 0 34.133333 0 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666666s42.666667-17.066667 42.666666-42.666666V145.066667l230.4 230.4c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733334L145.066667 85.333333z m170.666666 563.2L162.133333 802.133333l-76.8 76.8V725.333333C85.333333 699.733333 68.266667 682.666667 42.666667 682.666667s-42.666667 17.066667-42.666667 42.666666v256c0 25.6 17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666666-42.666667s-17.066667-42.666667-42.666666-42.666666H145.066667l76.8-76.8 153.6-153.6c17.066667-17.066667 17.066667-42.666667 0-59.733334-17.066667-17.066667-42.666667-17.066667-59.733334 0z m665.6 34.133334c-25.6 0-42.666667 17.066667-42.666666 42.666666v153.6l-76.8-76.8-153.6-153.6c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733334l153.6 153.6 76.8 76.8H725.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666s17.066667 42.666667 42.666666 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666666z m0-682.666667h-256c-25.6 0-42.666667 17.066667-42.666666 42.666667s17.066667 42.666667 42.666666 42.666666h153.6l-76.8 76.8-153.6 153.6c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733334 0l153.6-153.6 76.8-76.8v153.6c0 25.6 17.066667 42.666667 42.666666 42.666666s42.666667-17.066667 42.666667-42.666666v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z" fill="" p-id="3305"></path></svg>
+                <svg class="icon" v-else style="width: 24px; vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3952"><path d="M384 597.333333h-256c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h153.6L17.066667 947.2c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0L341.333333 742.4v153.6c0 25.6 17.066667 42.666667 42.666667 42.666667s42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z m358.4 85.333334h153.6c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667h-256c-25.6 0-42.666667 17.066667-42.666667 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666667s42.666667-17.066667 42.666667-42.666667V742.4l264.533333 264.533333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333L742.4 682.666667zM640 426.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667H742.4L1006.933333 76.8c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0L682.666667 281.6V128c0-25.6-17.066667-42.666667-42.666667-42.666667s-42.666667 17.066667-42.666667 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666667z m-256-341.333334c-25.6 0-42.666667 17.066667-42.666667 42.666667v153.6L76.8 8.533333C59.733333 0 25.6 0 8.533333 8.533333 0 25.6 0 59.733333 8.533333 76.8L281.6 341.333333H128c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z" p-id="3953"></path></svg>
+            </i>
         </div>
         <div class="modify-btn btn-left" v-if="1 == 2">
             <svg class="my-svg-icon-aaa" @click="modifyLeftBtn"
@@ -184,14 +188,26 @@ export default {
             projectLevel: [],
             projectBuildType: [],           
             users3: [],//分包单位
+            isFullScreen:false
         };
     },
 
     mounted() {
-
+        this.$bus.$on('fullscreen',b=>{
+           setTimeout(()=>{
+            this.isFullScreen=b;            
+           },400);
+        })
     },
 
     methods: {
+        toggleFullScreen(){
+            let el=this.$el.querySelector(".popup-project-introduction-min");            
+            this.$toggleFullScreen(el);
+            setTimeout(()=>{
+                this.isFullScreen=document.fullscreenElement==el;
+            },400);
+        },
         getPrjUser(t, deptType) {
             if (this.users && this.users.length > 0) {
                 if (deptType) {
diff --git a/src/pages/index/indexDlg2.vue b/src/pages/index/indexDlg2.vue
index e0f55ec..e2db897 100644
--- a/src/pages/index/indexDlg2.vue
+++ b/src/pages/index/indexDlg2.vue
@@ -37,9 +37,13 @@
                     fill="#fff" p-id="3687"></path>
             </svg>
             </i>
+            <i class="set-fullscreen set-font-size" style="margin-left: 16px;" @click="toggleFullScreen">
+                <svg class="icon" v-if="!isFullScreen" style="width: 24px; vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3304"><path d="M145.066667 85.333333h153.6c25.6 0 42.666667-17.066667 42.666666-42.666666S324.266667 0 298.666667 0H34.133333C25.6 0 17.066667 8.533333 8.533333 17.066667 0 25.6 0 34.133333 0 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666666s42.666667-17.066667 42.666666-42.666666V145.066667l230.4 230.4c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733334L145.066667 85.333333z m170.666666 563.2L162.133333 802.133333l-76.8 76.8V725.333333C85.333333 699.733333 68.266667 682.666667 42.666667 682.666667s-42.666667 17.066667-42.666667 42.666666v256c0 25.6 17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666666-42.666667s-17.066667-42.666667-42.666666-42.666666H145.066667l76.8-76.8 153.6-153.6c17.066667-17.066667 17.066667-42.666667 0-59.733334-17.066667-17.066667-42.666667-17.066667-59.733334 0z m665.6 34.133334c-25.6 0-42.666667 17.066667-42.666666 42.666666v153.6l-76.8-76.8-153.6-153.6c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733334l153.6 153.6 76.8 76.8H725.333333c-25.6 0-42.666667 17.066667-42.666666 42.666666s17.066667 42.666667 42.666666 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666666z m0-682.666667h-256c-25.6 0-42.666667 17.066667-42.666666 42.666667s17.066667 42.666667 42.666666 42.666666h153.6l-76.8 76.8-153.6 153.6c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733334 0l153.6-153.6 76.8-76.8v153.6c0 25.6 17.066667 42.666667 42.666666 42.666666s42.666667-17.066667 42.666667-42.666666v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z" fill="" p-id="3305"></path></svg>
+                <svg class="icon" v-else style="width: 24px; vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3952"><path d="M384 597.333333h-256c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h153.6L17.066667 947.2c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0L341.333333 742.4v153.6c0 25.6 17.066667 42.666667 42.666667 42.666667s42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z m358.4 85.333334h153.6c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667h-256c-25.6 0-42.666667 17.066667-42.666667 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666667s42.666667-17.066667 42.666667-42.666667V742.4l264.533333 264.533333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333L742.4 682.666667zM640 426.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667H742.4L1006.933333 76.8c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0L682.666667 281.6V128c0-25.6-17.066667-42.666667-42.666667-42.666667s-42.666667 17.066667-42.666667 42.666667v256c0 25.6 17.066667 42.666667 42.666667 42.666667z m-256-341.333334c-25.6 0-42.666667 17.066667-42.666667 42.666667v153.6L76.8 8.533333C59.733333 0 25.6 0 8.533333 8.533333 0 25.6 0 59.733333 8.533333 76.8L281.6 341.333333H128c-25.6 0-42.666667 17.066667-42.666667 42.666667s17.066667 42.666667 42.666667 42.666667h256c25.6 0 42.666667-17.066667 42.666667-42.666667v-256c0-25.6-17.066667-42.666667-42.666667-42.666667z" p-id="3953"></path></svg>
+            </i>
         </div>
 
-        <div class="col-2 scroll" style="max-height: 750px;overflow: auto;padding: 12px;">
+        <div class="col-2 scroll" style="max-height: 100%;overflow: auto;padding: 12px;">
             <div   v-for="(it, idx) in tableData" class="data-item">
                 <el-row class="data-row" >
                    
@@ -67,7 +71,7 @@
                 </div>      
                 <div class="data-row data-node scroll"  v-else style="display: block;overflow-y: auto;">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">目前进展:</span></div>
-                    <div class="div-text node-list" v-if="it.nodes && it.nodes.length>0" :style="fontSize==0?'display: flex;':''">
+                    <div class="div-text node-list" v-if="it.nodes && it.nodes.length>0" :style="(fontSize==0||(fontSize<2 && isFullScreen))?'display: flex;':''">
                        <template >
                             <table v-for="(d,idx) in it.nodes" :key="idx" class="table-lvl1">
                                 <tr>
@@ -144,16 +148,29 @@ export default {
             fontSize:0,
             cnts:[],
             tableData:[],
-            loading:false
+            loading:false,
+            isFullScreen:false
         };
     },
 
 
     mounted() {
-        window.dlg2 = this
+        window.dlg2 = this;
+        this.$bus.$on('fullscreen',b=>{
+           setTimeout(()=>{
+            this.isFullScreen=b;            
+           },400);
+        })
     },
 
     methods: {
+        toggleFullScreen(){
+            let el=this.$el.querySelector(".popup-project-introduction-min");            
+            this.$toggleFullScreen(el);
+            setTimeout(()=>{
+                this.isFullScreen=document.fullscreenElement==el;
+            },400);
+        },
         getState(s){
             return 'state-'+s;
         },
@@ -186,7 +203,7 @@ export default {
             this.$api.schedule.selectByProjectType(n,this.dept?.id||0)
             ];
             this.loading=true;
-            this.$api.http.all(ajaxs).then(res=>{debugger
+            this.$api.http.all(ajaxs).then(res=>{
                 this.loading=false;
                 let prjs=res[0].data||[];
                 let tmps=res[1].data||[];
@@ -396,7 +413,16 @@ export default {
         }
     }
     .popup-project-introduction-min {
-        transform: translateY(100px);
+        .popup-project-introduction-con{
+            height: 100%;
+            .popup-project-introduction-details{
+                height: calc(100% - 85px);
+                .quality-table.special-table{
+                    height: 100%;
+
+                }
+            }
+        }
     }
     .popup-project-introduction-details {
         padding: 0px !important;
diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue
index 89fa86c..f06e5a6 100644
--- a/src/pages/projectDetail.vue
+++ b/src/pages/projectDetail.vue
@@ -112,11 +112,11 @@
                                 <el-col :span="8" class="col-img">
                                     <template v-if="scheduleInfo && scheduleInfo.images && scheduleInfo.images.length > 0">
                                         <div class="data-img" style="margin-top: 0px;">
-                                            <el-image :src="scheduleInfo.images[0]"
+                                            <el-image :src="scheduleInfo.images[0]+'.min.jpg'"
                                                 :preview-src-list="scheduleInfo.images" />
                                         </div>
                                         <div class="data-img" v-if="scheduleInfo.images.length > 1">
-                                            <el-image :src="scheduleInfo.images[1]"
+                                            <el-image :src="scheduleInfo.images[1]+'.min.jpg'"
                                                 :preview-src-list="scheduleInfo.images" />
                                         </div>
                                     </template>
@@ -159,8 +159,8 @@
                             </el-row>
                         </module-one-1-1>
                     </el-col>
-                    <el-col :span="12" :key="'co' + elCostOut">
-                        <div class="modify-project-amount" @mouseout="costMouseout" @mouseover="costMouseover">
+                    <el-col :span="12">
+                        <div  :key="'co' + elCostOut" class="modify-project-amount" @mouseout="costMouseout" @mouseover="costMouseover">
                             <div class="modify-btn"><img src="images/foot_left.png" @click="modifyLeftBtn"></div>
                             <div class="modify-content" id="modifyContent">
                                 <div class="modify-content-overflow" style="width: 2520px;">
@@ -458,9 +458,7 @@
                         </div>
                         <div class="aerial-view-max">
                             <div class="aerial-view-min">
-                                <iframe v-if="mapName" :src="'maps/' + mapName" style="width:100%;height:100%;border:none;"
-                                    frameborder="0"></iframe>
-                                <img v-else :src="'images/830.png'">
+                                <mapModle></mapModle>                               
                             </div>
                         </div>
                         <module-one-1-2 label="项目节点计划预警">
@@ -625,11 +623,13 @@ import '../components/module/module-one-1-2'
 import '../components/background_video'
 import '../components/header'
 import '../components/staff-survey-chart'
+import mapModle from './detail/mapModle.vue'
 import MonitAndWarning from './components/MonitAndWarning.vue'
 import projectInfoDlg from './detail/projectInfoDlg.vue'
 export default {
     components: {
-        MonitAndWarning, projectInfoDlg
+        MonitAndWarning, projectInfoDlg,
+        mapModle
     },
     data() {
         return {
diff --git a/src/pages/style/index.less b/src/pages/style/index.less
index ca89379..d983714 100644
--- a/src/pages/style/index.less
+++ b/src/pages/style/index.less
@@ -101,6 +101,7 @@
 .el-loading-mask{
     background-color: rgba(255,255,255,.4);
     .el-loading-spinner{
+        height: 100px;
         .circular{
             right:unset;
             width: 100px;
diff --git a/vue.config.js b/vue.config.js
index d46c312..ea1f844 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,8 +23,8 @@ module.exports = defineConfig({
         }
       },
       '/jhapi':{
-        //target: `http://62.234.3.186/jhapi/`,
-        target: `http://127.0.0.1:8090/jhapi/`,
+        target: `http://62.234.3.186/jhapi/`,
+        //target: `http://127.0.0.1:8090/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'