Browse Source

feat: 保存部分

gemercheung 1 year ago
parent
commit
885f6087e8

+ 4 - 0
change-mark.md

@@ -0,0 +1,4 @@
+https://docs.qq.com/sheet/DRE1CWXdoc2tTQ0NG?tab=mfvkva
+
+
+已改: 83, 95,96, 97(video),105,107,108(ex) 115(ex), 119

+ 1 - 1
package.json

@@ -6,7 +6,7 @@
     "serve": "vue-cli-service serve --mode dev",
     "build-test": "vue-cli-service build --mode mytest",
     "build-prod": "vue-cli-service build --mode prod",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint --fix"
   },
   "dependencies": {
     "@vueuse/core": "^10.4.1",

File diff suppressed because it is too large
+ 7539 - 0
pnpm-lock.yaml


+ 1 - 1
src/App.vue

@@ -9,7 +9,7 @@
             src="@/assets/images/tip-screen-rotate.png"
             alt=""
             draggable="false"
-          />
+          >
           <span>请横屏浏览</span>
         </div>
       </div>

BIN
src/assets/images/CameraContent-3-1-3-img-1.png


BIN
src/assets/images/CameraContent-3-1-3-img-2.png


BIN
src/assets/images/CameraContent-3-1-3-img-3.png


BIN
src/assets/images/CameraContent-3-1-3-img-4.png


BIN
src/assets/images/CameraContent-3-1-3-img-5.png


BIN
src/assets/images/CameraContent-3-1-3-img-6.png


+ 1 - 1
src/components/CameraContent-1-3-3.vue

@@ -51,7 +51,7 @@ const emit = defineEmits(['close'])
 const currentSwitchIdx = ref(0)
 const imgLists = [
   '@/assets/images/1331-min.png',
-  '@/assets/images/1332-min.jpeg',
+  // '@/assets/images/1332-min.jpeg',
 ]
 
 const previous = () => {

+ 13 - 1
src/components/CameraContent-2-2-2.vue

@@ -10,9 +10,21 @@
         <h2 class="one">
           磁县漕船
         </h2>
+        <p class=" text-indent">
+          船长108cm、船宽28cm、船高26cm
+        </p>
+        <p class=" text-indent">
+          隔舱板、肋骨:江西小叶樟
+        </p>
+        <p class=" text-indent">
+          甲板、船壳外板:柚木、梢木
+        </p>
         <p class="one text-indent">
-          元末运粮官船,1975年河北磁县漳河故道附近出土,共六艘,有的船的尾部还烫有“漳河分省粮船”等字。六条船都已残破,但仍可看出方头平底,分为数舱。其中最大的五号船,残长16.6米,十一舱,也是平衡舵。
+          船附件:菠萝格、龙眼木
         </p>
+        <!-- <p class="one text-indent">
+          元末运粮官船,1975年河北磁县漳河故道附近出土,共六艘,有的船的尾部还烫有“漳河分省粮船”等字。六条船都已残破,但仍可看出方头平底,分为数舱。其中最大的五号船,残长16.6米,十一舱,也是平衡舵。
+        </p> -->
       </div>
       <div class="right">
         <img

+ 17 - 6
src/components/CameraContent-2-2-3.vue

@@ -11,13 +11,16 @@
           聊城古船
         </h2>
         <p class="text-indent">
-          航行区域:山东(鲁运河流域)
+          船长126cm、船宽23cm、船高80cm
         </p>
         <p class="text-indent">
-          聊城古船于2002年出土于会通河聊城城区闸口北50米处,残船长17.5米,宽约4米,共11个舱,为元代官府督造的典型漕船。
+          隔舱板及肋骨:江西小叶樟
+        </p>
+        <p class="text-indent">
+          甲板、船壳外板:柚木、梢木
         </p>
         <p class="one text-indent">
-          古船已残,木料为杉木,但船底和结构基本保存,形状还是比较清楚,长条木板拼接成平底船底,两端另结档板,系平底船,具有元代运粮船的特征。
+          船附件:菠萝格、龙眼木
         </p>
       </div>
       <div class="right">
@@ -27,6 +30,7 @@
           alt=""
           draggable="false"
         >
+        <p> 图注:模型(依据史料定制复原)</p>
       </div>
     </div>
   </div>
@@ -127,15 +131,22 @@ const emit = defineEmits(['close'])
       width: calc(818 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
       height: calc(438 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
       >img{
-        position: absolute;
-        left: 0;
-        top: 0;
+        // position: absolute;
+        // left: 0;
+        // top: 0;
         width: 100%;
         height: 100%;
         background: rgba(145,129,117,0.25);
         border: 1px solid #FFE88B;
+        margin: 0;
+        padding: 0;
         padding: calc(25 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
       }
+      >p{
+        text-align: center;
+        line-height: 1.5;
+        // margin-top: 120%;
+      }
     }
   }
 }

File diff suppressed because it is too large
+ 3 - 1
src/components/CameraContent-3-1-1.vue


File diff suppressed because it is too large
+ 3 - 1
src/components/CameraContent-3-2-1.vue


File diff suppressed because it is too large
+ 3 - 1
src/components/CameraContent-3-2-3.vue


File diff suppressed because it is too large
+ 9 - 3
src/components/HotspotDialog-1.vue


+ 4 - 1
src/components/MsgContent.vue

@@ -10,7 +10,10 @@
       }
     }"
   >
-    <div class="msg-content__inner" v-html="curMsg" />
+    <div
+      class="msg-content__inner"
+      v-html="curMsg"
+    />
     <img
       style="width: 100%"
       src="@/assets/images/Group-420.png"

+ 4 - 1
src/components/RelicDetailForHotspot.vue

@@ -41,7 +41,10 @@
       <h1 :title="relicInfo['名称']">
         {{ relicInfo['名称'] }}
       </h1>
-      <div v-if="relicInfo['年份']" class="age">
+      <div
+        v-if="relicInfo['年份']"
+        class="age"
+      >
         {{ relicInfo['年份'] }}
       </div>
       <div

+ 5 - 3
src/views/PanoView.vue

@@ -861,7 +861,7 @@ const currentVr = computed(() => {
 /**
  * iframe的逻辑
  */
-const iframeSrc = `${process.env.VUE_APP_CLI_MODE === 'dev' ? 'http://192.168.0.44:8081/' : 'https://houseoss.4dkankan.com/project/yzdyh-dadu/pano/'}show.html?id=WK1730428603763576832&lang=zh&vr=${currentVr.value}`
+const iframeSrc = `${process.env.VUE_APP_CLI_MODE === 'dev' ? 'https://houseoss.4dkankan.com/project/yzdyh-dadu/pano/' : 'https://houseoss.4dkankan.com/project/yzdyh-dadu/pano/'}show.html?id=WK1730428603763576832&lang=zh&vr=${currentVr.value}`
 const panoIframe = ref(null)
 
 watch(cameraIdx, (vNew) => {
@@ -1353,10 +1353,12 @@ onMounted(() => {
       overflow: auto;
       transform: translate(-50%, -50%);
       font-size: 23px;
-      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-family: SimSun;
+      // font-family: Source Han Sans CN, Source Han Sans CN;
       font-weight: 400;
       color: #FFFFFF;
-      line-height: 39px;
+      // line-height: 39px;
+      line-height: 1.5;
       letter-spacing: 7px;
       text-shadow: 0px 15px 25px rgba(0,0,0,0.59);
       padding-right: 10px;

+ 1 - 1
src/views/RelicDetail.vue

@@ -45,8 +45,8 @@
         {{ relicInfo['年份'] }}
       </div>
       <div
-        v-html="relicInfo['详细描述']"
         class="detail text-indent"
+        v-html="relicInfo['详细描述']"
       />
       <button
         class="show-hide"

File diff suppressed because it is too large
+ 2072 - 0
t.json