jinx 9 months ago
parent
commit
ce8d51437a

+ 1 - 1
public/js/10.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[10],{471:function(n,p,w){n.exports=w.p+"img/dianwei.a4f6219e.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[10],{473:function(n,p,w){n.exports=w.p+"img/dianwei.a4f6219e.svg"}}]);

+ 1 - 1
public/js/11.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[11],{472:function(p,n,o){p.exports=o.p+"img/m-r.471aa7f5.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[11],{474:function(p,n,o){p.exports=o.p+"img/m-r.471aa7f5.svg"}}]);

+ 1 - 1
public/js/12.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[12],{473:function(p,n,o){p.exports=o.p+"img/point-s.69e5b4b6.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[12],{475:function(p,n,o){p.exports=o.p+"img/point-s.69e5b4b6.svg"}}]);

+ 1 - 1
public/js/13.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[13],{474:function(p,s,n){p.exports=n.p+"img/state_gps.cc832e05.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[13],{476:function(p,s,n){p.exports=n.p+"img/state_gps.cc832e05.svg"}}]);

+ 1 - 1
public/js/14.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[14],{475:function(o,p,w){o.exports=w.p+"img/weitiao.f217d1d9.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[14],{477:function(o,p,w){o.exports=w.p+"img/weitiao.f217d1d9.svg"}}]);

+ 1 - 1
public/js/15.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[15],{476:function(o,n,p){o.exports=p.p+"img/zoom_n.33ea3c1f.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[15],{478:function(o,n,p){o.exports=p.p+"img/zoom_n.33ea3c1f.svg"}}]);

File diff suppressed because it is too large
+ 1 - 1
public/js/16.js


+ 1 - 1
public/js/17.js

@@ -1,4 +1,4 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[17],{467:function(module,exports,__webpack_require__){(function(global){
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[17],{469:function(module,exports,__webpack_require__){(function(global){
 /*!
  * vConsole v3.15.1 (https://github.com/Tencent/vConsole)
  *

File diff suppressed because it is too large
+ 2 - 2
public/js/2.js


File diff suppressed because it is too large
+ 1 - 1
public/js/3.js


File diff suppressed because it is too large
+ 1 - 1
public/js/4.js


File diff suppressed because it is too large
+ 1 - 1
public/js/5.js


File diff suppressed because it is too large
+ 1 - 1
public/js/6.js


+ 1 - 1
public/js/7.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[7],{468:function(n,o,p){n.exports=p.p+"img/a-connect-dis.27190505.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[7],{470:function(n,o,p){n.exports=p.p+"img/a-connect-dis.27190505.svg"}}]);

+ 1 - 1
public/js/8.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[8],{469:function(n,o,p){n.exports=p.p+"img/a-connect.6b6a01e1.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[8],{471:function(n,o,p){n.exports=p.p+"img/a-connect.6b6a01e1.svg"}}]);

+ 1 - 1
public/js/9.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[9],{470:function(n,p,o){n.exports=o.p+"img/data_revise_n.fbcdb99b.svg"}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([[9],{472:function(n,p,o){n.exports=o.p+"img/data_revise_n.fbcdb99b.svg"}}]);

File diff suppressed because it is too large
+ 2 - 2
public/js/smart.js


File diff suppressed because it is too large
+ 521 - 92
public/static/lib/potree/potree.js


File diff suppressed because it is too large
+ 1 - 1
public/static/lib/potree/potree.js.map


+ 16 - 5
src/components/calendar/mobile.vue

@@ -1,8 +1,11 @@
 <template>
     <div class="calendar" v-show="!showCalendar">
-        <span class="prev" @click="emits('prev')"><i class="iconfont icon-arrows_left"></i></span>
-        <span class="cale" @click="onPickDate()">{{ date }}<i style="display: none" class="iconfont icon-date"></i></span>
-        <span class="next" @click="emits('next')"><i class="iconfont icon-arrows_right"></i></span>
+        <div>
+            <span class="prev" @click="emits('prev')"><i class="iconfont icon-arrows_left"></i></span>
+            <span class="cale" @click="onPickDate()">{{ date }}<i style="display: none" class="iconfont icon-date"></i></span>
+            <span class="next" @click="emits('next')"><i class="iconfont icon-arrows_right"></i></span>
+        </div>
+        <div class="name">{{ sceneName }}</div>
     </div>
     <div class="calendar-list" v-if="showCalendar" @click="showCalendar = false">
         <div @click.stop>
@@ -26,6 +29,7 @@ const { t } = useI18n({ useScope: 'global' })
 const props = defineProps({
     value: Date,
     highlighted: Array,
+    sceneName: String,
 })
 const emits = defineEmits(['prev', 'selected', 'next'])
 const date = computed(() => {
@@ -75,7 +79,7 @@ const onConfirm = payload => {
 </script>
 <style lang="scss" scoped>
 .calendar {
-    height: 50px;
+    min-height: 50px;
     background: rgba(27, 27, 28, 0.8);
     box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
     border-radius: 47px 47px 47px 47px;
@@ -86,7 +90,14 @@ const onConfirm = payload => {
     margin-left: 10px;
     margin-right: 10px;
     font-size: 16px;
-    padding: 0 16px;
+    padding: 10px 16px;
+    flex-direction: column;
+    .name {
+        font-size: 12px;
+        color: #ffffffb3;
+        line-height: 14px;
+        margin-top: 10px;
+    }
     span {
         cursor: pointer;
     }

+ 7 - 5
src/pages/SViewer.vue

@@ -1,17 +1,17 @@
 <template>
     <main>
         <iframe ref="sourceFrame" v-if="sourceURL" :src="sourceURL" frameborder="0" @load="onLoadSource"></iframe>
-        <div class="model" v-show="!showAdjust">
+        <!-- <div class="model" v-show="!showAdjust">
             <div class="bim" :class="{ active: bimChecked, disable: project && !project.bimData }">
                 <div @click="onBimChecked">
                     <i class="iconfont icon-BIM"></i>
                 </div>
                 <span v-show="showBimTips">BIM</span>
             </div>
-        </div>
+        </div> -->
         <div class="tools" v-if="source" v-show="!bimChecked">
             <div class="item-date">
-                <Calendar :value="sourceDate" :highlighted="sourceDays" @selected="onSelected" @prev="onPrevDate" @next="onNextDate" />
+                <Calendar   :sceneName="source.name" :value="sourceDate" :highlighted="sourceDays" @selected="onSelected" @prev="onPrevDate" @next="onNextDate" />
             </div>
             <div class="item-mode" v-if="source.type == 2 || source.type == 3">
                 <div class="iconfont icon-show_roaming" :class="{ active: mode == 0 }" @click="onModeChange(0)"></div>
@@ -76,6 +76,7 @@ const scenes = computed(() => {
             num: item.num,
             type: item.type,
             createTime: item.createTime,
+            name: item.name,
         }
     })
 })
@@ -94,7 +95,7 @@ const sourceURL = computed(() => {
     if (source.value.type < 2) {
         return `smart-kankan.html?m=${source.value.num}`
     } else {
-        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&serve_link=${process.env.VUE_APP_LASER_URL}&panoResourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&resourceBasePath  =${process.env.VUE_APP_LASER_RESOURCE_URL}`
+        return `smart-laser.html?m=${source.value.num}${isDev ? '&dev' : ''}&serve_link=${'/'}&panoResourceBasePath=${process.env.VUE_APP_RESOURCE_URL}&resourceBasePath=${process.env.VUE_APP_LASER_RESOURCE_URL}`
     }
 })
 
@@ -252,7 +253,8 @@ const onBimChecked = () => {
 onMounted(() => {
     const num = browser.valueFromUrl('m') || ''
     const projectId = browser.valueFromUrl('projectId') || 1
-    http.get(`smart-site/project/info?projectId=${projectId}&sceneOrder=asc`)
+    // http.get(`smart-site/project/info?projectId=${projectId}&sceneOrder=asc`)
+       http.get(`relics/artifact/getInfo/${projectId}`)
         .then(response => {
             if (response.success) {
                 project.value = response.data