rindy 2 tahun lalu
induk
melakukan
a3562f27d0
3 mengubah file dengan 15 tambahan dan 9 penghapusan
  1. 3 3
      src/components/calendar/index.vue
  2. 1 1
      src/pages/SViewer.vue
  3. 11 5
      src/pages/Viewer.vue

+ 3 - 3
src/components/calendar/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="calendar">
-        <span class="prev" @click="emits('prev', props.name)" v-show="props.count>1"><i class="iconfont icon-arrows_left"></i></span>
+        <span class="prev" @click="emits('prev', props.name)" v-show="controls"><i class="iconfont icon-arrows_left"></i></span>
         <span class="cale" @click="onPickDate()">{{ value.format('YYYY-mm-dd') }}<i class="iconfont icon-date"></i></span>
-        <span class="next" @click="emits('next', props.name)" v-show="props.count>1"><i class="iconfont icon-arrows_right"></i></span>
+        <span class="next" @click="emits('next', props.name)" v-show="controls"><i class="iconfont icon-arrows_right"></i></span>
         <div class="calendar-list" v-if="showCalendar" @click="showCalendar = false">
             <div @click.stop>
                 <datepicker language="zh" :inline="true" :value="value" :highlighted="highlighted" @selected="onSelected"></datepicker>
@@ -16,7 +16,7 @@ import Datepicker from '@/components/datepicker/Datepicker'
 const props = defineProps({
     name: String,
     value: Date,
-    count:Number,
+    controls:Boolean,
     highlighted: Object,
 })
 const emits = defineEmits(['prev', 'selected', 'next', 'pick'])

+ 1 - 1
src/pages/SViewer.vue

@@ -253,7 +253,7 @@ onMounted(() => {
                     onBimChecked()
                 }
                 if (project.value.sceneList.length) {
-                    source.value = project.value.sceneList[0]
+                    source.value = project.value.sceneList[project.value.sceneList.length-1]
                 }
                 if(response.data.panos){
                     response.data.panos = JSON.parse(response.data.panos)

+ 11 - 5
src/pages/Viewer.vue

@@ -6,7 +6,7 @@
                 <iframe ref="sourceFrame" v-if="sourceURL" :src="sourceURL" frameborder="0" @load="onLoadSource"></iframe>
                 <div class="tools" v-if="source" v-show="!showAdjust && !fscChecked && (dbsChecked || (!target && !bimChecked))">
                     <div class="item-date">
-                        <calendar name="source" :count="scenes.length" :value="sourceDate" :highlighted="sourceDays" @selected="onSelected" @pick="onPickDate" @prev="onPrevDate" @next="onNextDate"></calendar>
+                        <calendar name="source" :count="scenes.length" :controls="controls" :value="sourceDate" :highlighted="sourceDays" @selected="onSelected" @pick="onPickDate" @prev="onPrevDate" @next="onNextDate"></calendar>
                     </div>
                     <div class="item-mode" v-if="source.type == 2">
                         <div class="iconfont icon-show_roaming" :class="{ active: mode == 0 }" @click="onModeChange(0)"></div>
@@ -28,7 +28,7 @@
                 <iframe ref="targetFrame" :src="targetURL" frameborder="0" @load="onLoadTarget"></iframe>
                 <div class="tools" v-show="!fscChecked && !bimChecked">
                     <div class="item-date target">
-                        <calendar name="target" :count="scenes.length" :value="targetDate" :highlighted="targetDays" @selected="onSelected" @pick="onPickDate" @prev="onPrevDate" @next="onNextDate"></calendar>
+                        <calendar name="target" :count="scenes.length" :controls="controls" :value="targetDate" :highlighted="targetDays" @selected="onSelected" @pick="onPickDate" @prev="onPrevDate" @next="onNextDate"></calendar>
                     </div>
                 </div>
                 <div class="points" v-if="showAdjust">
@@ -109,6 +109,12 @@ const scenes = computed(() => {
         }
     })
 })
+const controls = computed(()=>{
+    if(bimChecked.value){
+        return scenes.value.length>1
+    }
+    return dbsChecked.value? scenes.value.length>2: scenes.value.length>1
+})
 const sourceURL = computed(() => {
 
     beforeChangeURL('source' ) 
@@ -274,7 +280,7 @@ const onPrevDate = name => {
         index = scenes.value.length - 1
     }
 
-    if (target.value) {
+    if (target.value && !bimChecked.value) {
         // 分屏模式判断
         if (name == 'source') {
             if (scenes.value[index].createTime == target.value.createTime) {
@@ -307,7 +313,7 @@ const onNextDate = name => {
         index = 0
     }
 
-    if (target.value) {
+    if (target.value && !bimChecked.value) {
         // 分屏模式判断
         if (name == 'source') {
             if (scenes.value[index].createTime == target.value.createTime) {
@@ -467,7 +473,7 @@ onMounted(() => {
                             source.value = project.value.sceneList.find(c => c.num == num)
                         }
                         if (!source.value) {
-                            source.value = project.value.sceneList[0]
+                            source.value = project.value.sceneList[project.value.sceneList.length-1]
                         }
                         if (showAdjust.value || showSplit.value) {
                             onBimChecked()