update code

2024-09-09 22:33:15 +08:00 · 2024-09-09 22:33:15 +08:00 · 0684f3588a
parent 6c4a3bd5c7
commit 0684f3588a
4 changed files with 92 additions and 38 deletions
--- a/public/newmap/Cesium/BIMGISEngine_5.20.js
+++ b/public/newmap/Cesium/BIMGISEngine_5.20.js
--- a/public/newmap/index.html
+++ b/public/newmap/index.html
@ -2,46 +2,70 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=1.0, initial-scale=1.0" />
-    <title>Document</title>
-    <script src="./BIMGISEngine.js"></script>
-    <style type="text/css">
-        body,html{
-            padding:0px;
-            margin: 0px;
-            overflow: hidden;
-        }
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script src="./Cesium/BIMGISEngine_5.20.js"></script>
+    <title>产发工程数字管理平台</title>
+    <style>
+      html,
+      body,
+      #gl_UEgineContainer {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        padding: 0;
+        overflow: hidden;
+        position: relative;
+      }
    </style>
  </head>
-  <body style="padding: 0px;">
-    <div id="gl_UEgineContainer" style="position: absolute;width:100%;height:100vh"></div>
+  <body>
+    <div id="gl_UEgineContainer"></div>
    <script>
-      //配置参数
-      //    第四步： 初始化Api
-      var filepath =
-        "http://192.168.126.200:81/Tools/output/model/5511735543582612394/root.glt"; //模型加载地址填写至此
-      //filepath="http://192.168.126.200:81/Tools/output/model/Examples/root.glt"
+      // 场景初始化
      var api = new SAPI(
        {
-          serverIP: `192.168.126.200`, //服务ip地址
+          serverIP: `124.115.118.227`, //服务ip地址
          port: 8000, //HTTP端口
+          useHttps: false, //使用Https
          container: `gl_UEgineContainer`, //[必须]容器id
          secretKey:
-            "cbe8c300dfb0280d71bf6546087c6d2fa49260085f53fca8c7985b43ea81b20dc358fbf858d10d7d3324f9ea70b0331d8dc2c9223128b097ca22b68a6474753f258c47f45b34485a2edb350010e2f42cd5b388af45c6b070850288d284cbbbcd3d9dece4fe3612ac3050ceb8c6f96167dacbb11feb139bdc581d2bb89c4c29963d94c9cac057787beefd6fdb7b7fcace76d20ae002407410817c63b8ada364828a94867b381ae88ecd6668e8ca6b6d286dce7e5d799b0a175d5afe5554a43322fe0821394937a5ec4e7b1a14ad027992dae362b7584e5908b9db97bf945b86ad9d102172b1f90bd23013404ec41c18c93282a8f0c4278b094aac2870036e9468918c6819c02334fbc0f8ac6323953580d32b1cdbecb9bf3a247a6ca71dc6cfdf5ff49ef171f53e3084d7cfa131fd75565dccbfab533a0fef277050951ab91fcb8da15cff8a0a81ef5d5afe5554a43322fe0821394937a5ec4e7b1a14ad027992dae362b7584e5908b9db97bf945b86ad385ce2c805b0590210a8d2386e4f0a467b61e5b39a0300e7184d8dbba49a8569a30af95bbcb8a935ccd8737a8d59b0cca4d53873574d062a3a6090d0f582280ba3a7aebc0a7081f10629576cd3e789641f913957c57308994fdc9df330134f94052efc320a8c1a143e939c0e3b1ad476cf3630a2823a9a2d90e800d9b0be613ba7550ed054853e32510f8a6ea5c1dff9c3d61f7cf5f649cb25f0dbad9f7f66e3b446946685cead0cfac91bea061f4ff49a2f853c245297edc3d61f7cf5f649cb0f9b84173857a7b67c27928b58b4a6a65f517a43f106335ecc43571d292f54baa4596f82cf86665b367e01045009c18a2b543696b93a5bd44ca8168b5252351564bd9c490f16c1dea9075f305b1a7def6c4ca2f14918862751c9e2d23ef0bdaf41a12aca7dc1e17d6d0dca7bbdc42edf9c6396ffcf10044da26ecd334722494fc515b205e9624a4468762f63f0143583d1eeaaa85ff95ee50d8f953f44140ab40f29957f914b2241b8b27d8339b99808ee5afe26e9586ab5d8af37e5c4ae79e6405163f66e9923582cb5306674c6b68b830e510037806b9875f87ee7f76c8bdb0accf57366c2592cfabfd8a259742c4425f74ed075c660e38156b326e2f4461369f266ad62ac2edf64d1767ac6ea3d83c9ba33a4517541406791c384c597539cc1ffcdbe8f3563a1b379ce7a4782c59d98e1a918296acf4d25cb6d36cd9ab509afd54a7169bd5ac9799b7f642ad3588d5af5d673a07f23ae31cca9890fec461948b71b5d3292dc1088d769b6cce52fe1da21a053b44a16e15e3f8253971ef20b10b7b200fbc7c3d3f71e19f74e660313cf3630a2823a9a2d0acd9cb22f32e975d8b70082aab5ddbcb644d89a77efad286dee59796b124081510f8a6ea5c1dff9cb0f31d9a93422d1de95a0001376b8d685af667dd7ebaf4bdfc4840ac1126277417910a2ed0df6e3ca2026459a491059689206d702832f51afafd0506174e868c12cc462769b2e685be04514c976edd04ca2ef020dc56bee8321afe91a1dcbb1afafd0506174e8680f18f43fcd13957eef440c21db889c81888bce192514399191b48af868eda487753151533a27704469e5635404d6fdfb753151533a277044afdd825f7197f289753151533a27704484b9cf9eccaf749638930dbe9049f2ae36689b286e75a81e016aa63061505f57a8c1113b833628e3a18dff8ae8ac8eaa7a4fba6045bc9b4b", // token.txt文件内容填写至此
-          openEarth: false, //[可选]开启场景
-          bgColor: "rgba(135 ,206 ,250,1)", //[可选]bim模式场景背景色
-          sceneTime: [8, 2022, 2, 14, 13, 0], //[可选]场景时间
+            "cbe8c300dfb0280d71bf6546087c6d2fa49260085f53fca86c69755ac3a39199e08cb605efce617acfa509d5f3ee4d7f67a84d7c36cc175589405fde5d995a24258c47f45b34485a2edb350010e2f42cd5b388af45c6b070850288d284cbbbcd51e36f41b756a25f38d27dbe2e47e96b9eb56a96b59d61e02a467e881f70b21989b1a50685b6fc0265f528fc20b876d425a89c4bf6b33f829177fda27027e65b8a94867b381ae88ecd6668e8ca6b6d286dce7e5d799b0a175d5afe5554a4332203e774bed8a045353e9bf5abfe83ffe0cca50ef6c618828a9d63dac2d06e44c19cc1e4d0220e60c6e82ecf81d1cced49bf42e57a167f6571a4f422a627b1b73db6c19a148ad18fb8598216e137795cc77fcba7ce8189fbc2d0c629f88d9f278b3184aa2270824a023f2079139c6c287bd77f874496e74a51416bfe5d69a9a221cc8c33b16ea71cc03013404ec41c18c9cc748e652ce16fe7061c32d550edfda330c1555e0c08e51f698f96b91615d8229cf32d2e110ec91f1211e23c769b5bbe1aa9a9191a2d3da09800e6efdee12ee04fdc9df330134f94052efc320a8c1a143e939c0e3b1ad476cf3630a2823a9a2dc2a17ec077fd21bfa7550ed054853e32510f8a6ea5c1dff9c3d61f7cf5f649cb25f0dbad9f7f66e3b446946685cead0cfac91bea061f4ff49a2f853c245297edc3d61f7cf5f649cb0f9b84173857a7b67c27928b58b4a6a65f517a43f106335ecc43571d292f54baa4596f82cf86665b367e01045009c18a2b543696b93a5bd44ca8168b525235150ffadf3f628aa7e8a20b9e74d76bd3a1e26b026e5297005a780f011db11ddb55fbabdc0f876c1cdfa5ef7db74bbc52e19c6396ffcf10044da26ecd334722494fc515b205e9624a4468762f63f0143583d1eeaaa85ff95ee50d8f953f44140ab40f29957f914b2241fd1309b7be0d5f9e55207069d393244a5be14de83e99956e957e025b859c7dd3cebcdd4589bf15942a17f162a5b95af68b416632dbf24db069995334a82a49d6060f7a5b770b6e18ecf8cb01c0e21b608156b326e2f4461369f266ad62ac2edf64d1767ac6ea3d83c9ba33a4517541406791c384c597539cc1ffcdbe8f3563a125da5d3905c7f92abef0fe8b967e5bc2832940bf4230fe93bdd44267922427c4db140fd5cb164da87f17f480c39e9c1c17bd48d031e3ce8ab3a49456b48f3b49549c2da3f62d2a8da7d5f36e39ce04af5e3f8253971ef20b10b7b200fbc7c3d3f71e19f74e660313cf3630a2823a9a2d0acd9cb22f32e975d8b70082aab5ddbcb644d89a77efad286dee59796b124081510f8a6ea5c1dff9cb0f31d9a93422d1de95a0001376b8d685af667dd7ebaf4bdfc4840ac1126277417910a2ed0df6e3ca2026459a491059689206d702832f51afafd0506174e868c12cc462769b2e685be04514c976edd04ca2ef020dc56bee8321afe91a1dcbb1afafd0506174e8680f18f43fcd13957eef440c21db889c81888bce192514399191b48af868eda487753151533a27704469e5635404d6fdfb753151533a277044afdd825f7197f289753151533a27704484b9cf9eccaf749638930dbe9049f2ae36689b286e75a81e016aa63061505f57a8c1113b833628e3a18dff8ae8ac8eaae0e7c3406ae4dd4e10880b34c16e1b7405884ca1d5603015a7b0730878fafb08", //token
+          openEarth: false, //[可选]开启Gis场景
+          bgColor: "rgba(135 ,206 ,250,1)", //[可选]bim场景背景色, 传值即为纯色天空盒
+          tintColor: "rgba(255,255,0,1)", //[可选]osgb单体化颜色
+          sceneTime: ["13:00", "6:00", "18:00"], //[可选]分别为当前时间、日出时间、日落时间
+          cadMode: false, // 是否是Cad图纸预览模式
        },
        () => {
-          console.log("初始化成功"); //初始化成功后在进行其他操作，如加载模型等;
-          api.Model.add(
-            filepath, //模型加载地址
-            "175",
-            () => {
-              console.log("模型加载成功");
-            },
+          // 加载UE工程模型
+          api.Pak.loadStreamPak(
            {
-              FlyTo: true,
+              PakPath:
+                "D:/GlendaleCloudMaster520/OtherFile/Pak/p49-Windows-4791406141253023479.pak",
+              MountPoint: "../../../",
+              PackageName: "p49",
+              MapName: "NewMap",
+            },
+            (data) => {
+              api.Camera.setViewPort({
+                world: {
+                  location: {
+                    x: 16715.322265625,
+                    y: -37990.8203125,
+                    z: 72746.296875,
+                  },
+                  rotation: {
+                    x: 1.867783271797263e-13,
+                    y: -38.43526840209961,
+                    z: 30.732223510742188,
+                  },
+                  origin: {
+                    x: 117.11827850341797,
+                    y: 40.60338592529297,
+                    z: -112560,
+                  },
+                },
+              });
            }
          );
        }
--- a/src/api/costOut/index.js
+++ b/src/api/costOut/index.js
@ -1,13 +1,30 @@
 import request from '@/utils/request'

-
+import {axios} from '@/utils/request'
 const selectYearAndMonth=(data)=> {
  return new Promise(reslove=>{
-    request({
+    let data2={...data};
+    let y=data2.year;
+    let m=data2.month-1;
+    if(m==0){
+        m=12;
+        y--;
+    }
+    data2.year=y;
+    data2.month=m;
+    var ajaxs=[request({
        url: `/bgscreen/costOut/selectYearAndMonth`,
        method: 'post',
        data:data
-      }).then(d=>{
+      }),
+      request({
+        url: `/bgscreen/costOut/selectYearAndMonth`,
+        method: 'post',
+        data:data2
+      })];
+    
+      axios.all(ajaxs).then(res=>{
+        let d=res[0]
        const getValue=(tmps,type)=>{
            let objs=tmps.filter(d=>d.costType==type);
            return objs.length>0?objs[0]:{};
@ -17,9 +34,18 @@ const selectYearAndMonth=(data)=> {
            return it;
        });
        let y=data.year;
-        let m=data.month;
-        let curM=tmps.filter(it=>it.costType==9 && it.year==y && it.month==m);
+        let m=data.month-1;
+        if(m==0){
+            m=12;
+            y--;
+        }
+        let tmps2=(res[1].data||[]).map(it=>{
+            it.money=it.money?it.money/10000.0:0;
+            return it;
+        });
+        let curM=tmps2.filter(it=>it.costType==9 && it.year==y && it.month==m);
        curM=curM.length>0?curM[0]:{};
+
        let totalObjs=tmps.filter(it=>it.costType==9);
        let total=0;
        totalObjs.forEach(it=>{
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@ -3,7 +3,10 @@
        <!--
        <iframe src="http://192.168.126.200:12020/#/model/3a1384b4-5d86-6070-dcc0-d13936634761?v=2000" style="position: absolute;top:0px;left:0px;width:100%;height:100%;"></iframe>
        -->
+        <!--
        <iframe src="#/map" style="position: absolute;top:0px;left:0px;width:100%;height:100%;"></iframe>
+        -->
+        <iframe src="newmap/index.html" style="position: absolute;top:0px;left:0px;width:100%;height:100%;"></iframe>
        <div class="toSafety-fixed-left-max">
            <transition name="left">
                <div class="toSafety-fixed-left" v-show="leftShow">
@ -660,8 +663,8 @@ export default {
                let postData = {
                    deptId: this.deptInfo?.id || 0,
                    roleType: 0,
-                    startDate:this.$dt(dt1).format("YYYY-MM-DD"),
-                    endDate:this.$dt(dt2).format("YYYY-MM-DD"),
+                    //startDate:this.$dt(dt1).format("YYYY-MM-DD"),
+                    //endDate:this.$dt(dt2).format("YYYY-MM-DD"),
                };       
                this.$api.problemmodify.safetySummary(postData).then(d => {
                   let tmps= (d || []).map(it => {
@ -685,8 +688,8 @@ export default {
                let postData = {
                    deptId: this.deptInfo?.id || 0,
                    roleType: 0,
-                    startDate:this.$dt(dt1).format("YYYY-MM-DD"),
-                    endDate:this.$dt(dt2).format("YYYY-MM-DD"),
+                    //startDate:this.$dt(dt1).format("YYYY-MM-DD"),
+                    //endDate:this.$dt(dt2).format("YYYY-MM-DD"),
                };
                this.qualityNavTitle = "质量隐患总数";
                this.$api.problemmodify.qualitySummary(postData).then(d => {