Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev

public/index.html

@@ -24,7 +24,7 @@
     <script src="/cesium/BIMGISEngine.js?v=20230920"></script>
     <script src="/cesium/initApi.js?v=20230920"></script>
     <!--<script src="./maps/initApi.js"></script>      -->
-    <script src="./js/mapmodle.js"></script>        
+    <script src="./js/mapmodle.js?v=2024032501"></script>        
     <!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=6zAD8CIavtzWnkGg0a7roush5maGMIPn"></script> -->
     <script src="/cdn/echarts/china.js"></script>
     <!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=6zAD8CIavtzWnkGg0a7roush5maGMIPn"></script> -->

public/js/mapmodle.js

@@ -16,10 +16,52 @@ window.mapModels=[{
     root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202308292209049711/root.glt',
     view:{"heading":0.0058949428144847715,"pitch":-0.45916450787257634,"position":[1.9014402668692727,0.596827472897058,319.1023937950138],"headingDegrees":0.3377553437409484,"pitchDegrees":-26.308188403300086,"positionWC":{"x":-1714602.6283823003,"y":4995280.479264514,"z":3564601.337643737}}
 },
+{
+    prjId:644,
+    prjName:'泾河新城智谷科创园（二期）-秦智汇',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543acc1',
+    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309091603390832/root.glt'    
+},
+{
+    prjId:696,
+    prjName:'泊湾中心',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543acc2',
+    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309091209227173/root.glt'
+},
+{
+    prjId:698,
+    prjName:'泊域人才中心',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543acc3',
+    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309091208536442/root.glt'
+},
+{
+    prjId:699,
+    prjName:'泊创中心',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543acc4',
+    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309091147450346/root.glt'
+},
+{
+    prjId:694,
+    prjName:'云如逸',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543acc5',
+    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309090900510987/root.glt'
+},
+{
+    prjId:693,
+    prjName:'云语间',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543acc6',
+    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309081513501831/root.glt'
+},
+{
+    prjId:651,
+    prjName:'崇德生态广场',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543acc7',
+    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202309052016364846/root.glt'
+},
 {
     prjId:736,
-    prjName:'体育中心',
-    modelId:'3a0d8941-4496-e475-c86a-799e8543aca3',
-    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202308292206163239/root.glt',
-    view:{"heading":6.283164707709002,"pitch":-0.5236819159300738,"position":[1.9008220777057336,0.5968572306888884,88.94262262738738],"headingDegrees":359.9988197372753,"pitchDegrees":-30.004763590118024,"positionWC":{"x":-1711418.132166834,"y":4996058.815156038,"z":3564628.415878788}}
-}];
+    prjName:'体育馆项目',
+    modelId:'3a0d8941-4496-e475-c86a-799e8543acc8',
+    root:'//szgc.jhncidg.com/mapmodel/tools/output/model/202308292206163239/root.glt'
+}
+];

src/pages/detail/mapModle.vue

@@ -13,7 +13,7 @@
                     </el-carousel-item>
                 </el-carousel>
             </template>
-            <img  v-else :src="'images/830.png'">
+            <img  v-else :src="'images/jhdetail.jpg'">
         </template>
     </div>
 </template>

src/pages/projectDetail.vue

@@ -879,9 +879,24 @@ export default {
         },
         loadFilshNode() {
             this.getProjectId(id => {
-                this.$api.buildNode.queryFinishProject(id).then(d => {
+                this.$api.buildNode.queryFinishProject(id).then(d => {                                        
                     this.finishBuildNode = d || [];
-                    let obj = (d || []).filter(it => it.nodeText == "方案设计");
+                    let findLvl='030101,030102,030103,030104,030105,030101,0302,030201,030202'.split(",");
+                    let tmps=(d||[]);
+                    let obj=null;                    
+                    for(let i=0;i<findLvl.length;i++){
+                        let objs=tmps.filter(it=>it.lvl==findLvl[i]);
+                        if(objs.length>0 && objs[0].files){
+                            let files = (objs[0].files || '[]')
+                            if(files.length>0){
+                                let fs=tryToJson(files,[]);
+                                if(fs.length>0){
+                                    obj=objs;
+                                    break;
+                                }
+                            }                            
+                        }
+                    }
                     if (obj && obj.length > 0) {
                         let files = (obj[0].files || '[]')
                         if (this.$refs.mapModle) {

vue.config.js

@@ -38,8 +38,8 @@ module.exports = defineConfig({
       },
       '/jhapi':{
         //target: `http://62.234.3.186/jhapi/`,
-        target: `http://127.0.0.1:8090/jhapi/`,
-        //target: `http://szgc.jhncidg.com/jhapi/`,
+        //target: `http://127.0.0.1:8090/jhapi/`,
+        target: `http://szgc.jhncidg.com/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'