update code

2024-06-22 00:53:10 +08:00 · 2024-06-22 00:53:10 +08:00 · 569a7cf21a
parent c2a369df52
commit 569a7cf21a
6 changed files with 131 additions and 29 deletions
--- a/public/js/BIMGISEngine.js
+++ b/public/js/BIMGISEngine.js
--- a/public/js/initApi.js
+++ b/public/js/initApi.js
@ -0,0 +1,72 @@
+window.initMap=()=>{
+delete window.mapDefault
+delete window.mapApi
+delete window.mapOptions
+delete window.mapNacCube
+window.mapDefault={
+    "container": "cesiumContainer",
+    "showfps": false,
+    "openterrain": true,
+    "imageryprovider": "tianditu_image",
+    "terrainProvider": "http://106.12.253.67:9304/",
+    "mapworldkey": "6215132e0336a3db28ce73f8c9ff6db6",
+    "openearth": false,
+    "maxspaceerror": 2000,
+    "loading": false,
+    "bgcolor": "#87CEFA",
+    "outlinecolor": "#000000",
+    "outlineScaleVal": 1.001,
+    "selectedcolor": "#ff0000",
+    "sceneMode": 3,
+    "TwoMapNavigationEnable": false,
+    "throughwall": true,
+    "searchbox": false,
+    "mapbox": true,
+    "sitepath": "/static/Cesium/",
+    //"secretkey": "80840d6054a373fa6493fe6a8cd7c0b8a01924bf58e825bfe1a1a67cb0a02263b5549ae0c4c04dde2e457c9132b600699a2f430fe4b7a52ae76d0bdd0633e4f1b1dd0395c04c1b00f41e1b0c3020a71600f1cc3bd764e4d130249ddd6e2916a73792839cb97ddb24f090343455f7834c356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f6152b6a2299e3e22c9450d7fc8c8452aa23013404ec41c18c92e7ff7e2a3fe238234fec9927bc4cd95b450c2cdae94df00da4c49c467adacd9ec7f7c00482028425ebbbee7ceb46deec08dc9751ee993a353012fbe2ebcf6e0f81b95abdf8d437c4965454914fcc7b07d28062bc2976948356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f6152b6a2299e3e22c9cc8c33b16ea71cc03013404ec41c18c9cc748e652ce16fe7061c32d550edfda330c1555e0c08e51f698f96b91615d8220acd9cb22f32e9757681487e0680adfbfacb9b5d2ce5a13b664d8466043270f9f3bde6ac6a05cf25ab0ccc0659a290c9669997be7ccc0086c3d61f7cf5f649cb25f0dbad9f7f66e3165cad25065145affac91bea061f4ff485af667dd7ebaf4baeea64611acbe5c74018be5a8b704fcd4f53d18504940411fac91bea061f4ff49a2f853c245297edc3d61f7cf5f649cb0f9b84173857a7b67c27928b58b4a6a65f517a43f106335e8b1d5c423a171723ffa04d0ac4e5c1a1853fcb2bc95ee8056cd5b4826fa55926733ef859a5f169e6afafd0506174e86864d53d967da98ab0b0e08d14be6d452c6c69755ac3a391993370a029761da893cfbf575da87c6b5ca602467b79c6c9532f438aaafb9ec915692f0287a8db979969e5635404d6fdfb753151533a277044afdd825f7197f2896c69755ac3a391993370a029761da893af24d88c02bccfae6cd5b4826fa55926f7722b78090b30b986f9287101582d8841187054ec673ebd2042f9836ea453c3afafd0506174e86800225b7f4102e3585b1923cb186fe0ceee54c6f17ab8555da26ecd334722494fc515b205e9624a4494c772ef4f023a606882e118fa6321c24ddee4821c840fb56aac929d6d0a052d5ff97d71e43811db939f7340826236af6f10316a04bf618d494a26e0fd06f7daa07177989e1680a4cf14829a5847f70377d6c12f1649400fcab44f4ff52989cf129aa6cca660be152a75b8e35648925dbce381b345d9e137c04a02a4c8252625f5625eed58fd34b7be4266e54212e88b23f012bead9abaef9e18aa308f0ecffaf3dda7d7b4efd2e0c4b8de161864620fc1f2af98bde031b29e0865381c96bbc10921b48a068558915ff023d18526f5d399e0893df43db7122415d52565dc982ea24fbd825734dbaefadc6df0f19d925c7f63d343a622134b1c934d130d662447add19064adbbb2fd24a82c0fbfcbc3175fc32761df099156daf4e86455740207eb4e4a5300d9c1a17ffd43703d476c36ef07df2206bd8d232b844ff3c1d7cf7c47ec502183af4e27b644d89a77efad286dee59796b124081510f8a6ea5c1dff9c3d61f7cf5f649cb25f0dbad9f7f66e3e0e7c3406ae4dd4eebc424f09f933d0eb1a881ed05ca8d5c70958237eb5b91d4e574440ea0c9179a582dc966bcfc1f21cf3630a2823a9a2d22bd09a00b213aae3866768ae2f24dde6784fbf292c2cba1ab3a1a0dac231941d2277e675309a46ea6fde1492ec9a29c4f53d18504940411e9520f8be669a95a8618879da1244784b88edb1244f5021a0991de19ea44c0dd",
+    "secretkey":"80840d6054a373fa6493fe6a8cd7c0b8a01924bf58e825bfe1a1a67cb0a02263b5549ae0c4c04dde2e457c9132b600699a2f430fe4b7a52ae76d0bdd0633e4f1b1dd0395c04c1b00f41e1b0c3020a71600f1cc3bd764e4d130249ddd6e2916a73792839cb97ddb24f090343455f7834c356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f6152b6a2299e3e22c9450d7fc8c8452aa23013404ec41c18c92e7ff7e2a3fe238234fec9927bc4cd95b450c2cdae94df00da4c49c467adacd9ec7f7c00482028425ebbbee7ceb46deec08dc9751ee993a353012fbe2ebcf6e0f81b95abdf8d437c4965454914fcc7b07d28062bc29769484f1e8c851c48f2f6dc0362e2b91959674965454914fcc7b07d28062bc297694837e40a524d2bbb8599a991777d21e7823e88c9264a91404ad3c355b1486472d2d33d2024825618177d6fdab307e075f86fd6ba535458df7b840efa284b50840eefc6d4ffdc9011ea24d736db704d8954950390941b9aaa80089e41bf1a87879de6cd674b6676107f3d4256820c37cd19030c6924517e4349f71e19f74e660313cf3630a2823a9a2d4ce0dce6f81f87eea1ccfaae84e9dbea030c6924517e4349b5024217bdf743a670fd5d571139e4f0e6cd674b6676107fc8b14b44ceeed441af4b194f05a956195b0d603c259172b75b1923cb186fe0ce5be04514c976edd0c12cc462769b2e685be04514c976edd04ca2ef020dc56bee8321afe91a1dcbb1afafd0506174e8680f18f43fcd13957e37bdb1221aa64295f230f78b7aa0c960753151533a2770446a6cb07b672285d204ba1ecd4a967f5dcb6b0c9432a8108f7d1f9f3c7343796941187054ec673ebdbd57ea3b34f9c6cc37bdb1221aa6429512b695fc8f5b4b6fc12cc462769b2e685be04514c976edd038d27dbe2e47e96b753151533a277044d80e0285b44b743f64d53d967da98ab0555e1e6d7d3c0468c8e6f7bb1e69ec27703c52805d982a9a7b7134e53eaa4f83b046182095e9d992f79b33aea9c3effb017d98bd95ced22c1d7f698eff812326cfff54e0f16a46a6df58986290a016ee80352734e97c0efea07177989e1680a4cf14829a5847f70377d6c12f1649400fcab44f4ff52989cf129aa6cca660be152a75b8e35648925dbce381b345d9e137c04a02a4c8252625f5625eed58fd34b7be4266e54212e88b23f012bead9abaef9e18aa308f0ecffaf3dda7d7b4efd2e0c4b8de161864620fc1f2af98bde031b29e0865381c96bbc10921b48a068558915ff023d18526f5d399e0893df43db7122415d52565dc982ea24fbd825734dbaefadc6df0f19d925c7f63d343a622134b1c934d130d662447add19064adbbb2fd24a82c0fbfcbc3175fc32761df099156daf4e86455740207eb4e4a5300d9c1a17ffd43703d476c36ef07df2206bd8d232b844ff3c1d7cf7c47ec502183af4e27b644d89a77efad286dee59796b124081510f8a6ea5c1dff9c3d61f7cf5f649cb25f0dbad9f7f66e3e0e7c3406ae4dd4eebc424f09f933d0eb1a881ed05ca8d5c70958237eb5b91d4e574440ea0c9179a582dc966bcfc1f21cf3630a2823a9a2d22bd09a00b213aae3866768ae2f24dde6784fbf292c2cba1ab3a1a0dac231941d2277e675309a46ea6fde1492ec9a29c4f53d18504940411e9520f8be669a95a8618879da1244784b88edb1244f5021a3b46c94014dbc1fa330426cfc4267280",
+    "editmode": false,
+    "cadmode": false,
+    "isRequestWebgl2": true,
+    "requestRenderMode": true,
+    "colorBlendMode": 2,
+    "loadAnimation": false,
+    "isStrictClip": true,
+    "isMsaaSamples": true,
+    "isOpenVR": false,
+    "language": "zh-CN"
+};
+window.mapApi = new SAPI(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 最简形式
+}
--- a/public/newmap/BIMGISEngine_UE.js
+++ b/public/newmap/BIMGISEngine_UE.js
--- a/src/api/project/index.js
+++ b/src/api/project/index.js
@ -92,9 +92,9 @@ const getInfo=()=>{
    method:'get'
  })
 }
-const listPhotography=id=>{
+const listPhotography=(id,deptId)=>{
  return request({
-    url: `bgscreen/photography/listPhotography?projectId=${id}`,
+    url: `bgscreen/photography/listPhotography?projectId=${id}&deptId=${deptId}`,
    method: 'get'
  });
 }
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@ -40,8 +40,11 @@
                        </module-one-1-1>
                    </el-col>
                    <el-col :span="12">
-                        <module-one-2-1 class="center-image" label="集团项目区域分布">                            
-                            <iframe src="#/map" style="width:100%;height:100%;border:none" v-if="!isLocalhost"></iframe>
+                        <module-one-2-1 class="center-image" label="集团项目区域分布">   
+                            <iframe src="newmap/index.html" style="width:100%;height:100%;border:none" ></iframe>                            
+                            <!--
+                                <iframe src="#/map" style="width:100%;height:100%;border:none" v-if="!isLocalhost"></iframe>
+                            -->                         
                        </module-one-2-1>
                        <el-row>
                            <el-col :span="12" style="position: relative;">                                
--- a/src/pages/photography.vue
+++ b/src/pages/photography.vue
@ -5,14 +5,13 @@
                <el-col :span="6">
                    <module-one-3-1 label="项目全景列表">
                        <div class="left-list scroll">
-                            <template v-if="dataList && dataList.length>0">
+                            <template v-if="showPrjs && showPrjs.length>0">
                        <el-collapse v-model="activeNames" >                           
-                            <el-collapse-item v-for="(it, idx) in dataList" :key="idx" :name="it.videoDate">
+                            <el-collapse-item v-for="(it, idx) in showPrjs" :key="idx" :name="it">
                                <template slot="title">
                                    <div style="position:relative;padding-left:20px;width: 100%;">
-                                        <span>{{ it.videoDate }}</span>
-                                        <i class="header-icon el-icon-camera-solid" @click.stop="playVideo(it)"
-                                            style="position: absolute;right: 30px;top: 10px;font-size: 30px;"></i>
+                                        <span>{{ it }}</span>
+                                        
                                    </div>
                                </template>
                                <div class="img-items">
@ -22,6 +21,11 @@
                                        <div class="div-date">{{ item.date }}</div>
                                    </div>
                                </div>
+                                <div v-for="(item,index) in infoList[it]" :key="index" class="video-item" @click.stop="playVideo(item)">
+                                    <span class="div-date">{{ item.videoDate }}</span>
+                                    <i class="header-icon el-icon-camera-solid" 
+                                            style="font-size: 24px;color: aqua;"></i>
+                                </div>
                            </el-collapse-item>
                        </el-collapse>
                    </template>
@ -68,15 +72,17 @@ export default {
            dataList: [],
            activeNames: [],
            info: null,
+            dept:null,
+            showPrjs:[],
+            infoList:{},
        };
    },

    mounted() {
-        this.$bus.$on("loadProjects", debounce(prjs => {
-            this.prjs = prjs;
-        }));
        this.$bus.$on("projectChange", debounce(res => {
            this.prj = res;
+            this.prjs=this.$root.projects||this.prjs;
+            this.dept=this.$root.dept||this.dept;
            this.loadData2();
        }));
        if (this.$root.hasInitHeader) {
@ -93,19 +99,30 @@ export default {
        },
        loadData2() {
            this.info=null;
-            this.getProjectId(id => {
-                this.$api.project.listPhotography(id).then(d => {
-                    this.dataList = (d.data || []).map(it => {
+            
+                this.$api.project.listPhotography(this.prj.id, this.dept.id || 0).then(d => {
+                    let tmps = (d.data || []).map(it => {
                        it.images = this.$tryToJson(it.imageUrl);
                        return it;
                    })
-                    if (this.dataList.length > 0) {
-                        this.activeNames = [this.dataList[0].videoDate];
-                        this.info = this.dataList[0];
+                    if (tmps.length > 0) {
+                        this.activeNames = [tmps[0].updateBy];
+                        this.info = tmps[0];
                    }
+                    let obj={};
+                    this.showPrjs=[];
+                    tmps.forEach(it=>{
+                        if(!obj[it.updateBy]){
+                            obj[it.updateBy]=[it]
+                            this.showPrjs.push(it.updateBy);
+                        }else{
+                            obj[it.updateBy].push(it);
+                        }
+                    });
+                    this.infoList=obj;
                })

-            });
+           
        },
        initMe() {
            this.prj = this.$root.project || {};
@ -189,7 +206,7 @@ export default {
            .el-collapse-item__header {
                background-color: #097fca2e;
                color: #089fff;
-                border: none;
+                border-bottom: dotted 1px #089fff77;
            }

            .el-collapse-item__content {
@ -207,16 +224,24 @@ export default {
                    flex-direction: column;
                    color: #fff;
                    position: relative;
-
-                    .div-date {
-                        width: calc(90% - 24px);
-                        text-align: left;
-                        position: absolute;
-                        bottom: 0px;
-                        background-color: #ffffff38;
-                        padding-left: 24px;
-                    }
+                    
                }
+                .video-item{
+                        position: relative;
+                        line-height: 30px;
+                        display: flex;
+                        align-items: center;
+                        cursor: pointer;
+                        border-bottom: solid 1px #089fff77;
+                        .div-date {
+                            width: calc(90% - 24px);
+                            text-align: left;                            
+                            bottom: 0px;
+                            color:#089fff;
+                            padding-left: 24px;
+                        }
+                    }
+                   
            }
        }
    }