feat:update

.env.testdev

@@ -1,5 +1,5 @@
 VUE_APP_STATIC_DIR=showviewer
-VUE_APP_CDN=https://ossxiaoan.4dage.com/temp_test-offline-qj/data
+VUE_APP_CDN=/data
 VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
 VUE_APP_RESOURCE_URL='https://test.4dkankan.com/panorama/'
 VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'

src/components/assembly/Tags/metas/metas-article.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="articlecon">
+  <div class="articlecon" :class="[customClassName]">
     <div class="hotspot-pc-title">
       <i class="iconfont icon-material_text" />
-      {{ currentTag.hotspotTitle }}
+      {{ customClassName }} {{ currentTag.hotspotTitle }}
     </div>
 
     <div class="txtbody" v-html="currentTag.articleInfo.html"></div>
@@ -23,6 +23,7 @@ import {
 } from "vue";
 import { useStore } from "vuex";
 const store = useStore();
+const customClassName = computed(() => currentTag.value.customClassName ? currentTag.value.customClassName : '')
 
 const currentTag = computed(() => store.getters["tags/currentTag"]);
 </script>
@@ -38,6 +39,7 @@ const currentTag = computed(() => store.getters["tags/currentTag"]);
 
   .txtbody {
     width: 744px;
+    // width: 100%;
     background: rgba(0, 0, 0, 0.6);
     border-radius: 10px;
     font-size: 14px;
@@ -48,10 +50,12 @@ const currentTag = computed(() => store.getters["tags/currentTag"]);
     max-height: calc(100vh - 100px);
     overflow-y: auto;
     line-height: 1.5;
+
     :deep(p) {
       line-height: 24px;
     }
   }
+
   .title {
     position: absolute;
     left: 20px;
@@ -66,7 +70,8 @@ const currentTag = computed(() => store.getters["tags/currentTag"]);
     color: #fff;
     font-size: 14px;
     z-index: 999;
-    > i {
+
+    >i {
       margin-right: 4px;
     }
   }
@@ -74,6 +79,7 @@ const currentTag = computed(() => store.getters["tags/currentTag"]);
 </style>
 <style lang="scss">
 .articlecon {
+
   img,
   video {
     max-width: 100% !important;

src/components/guide/index.vue

@@ -2,15 +2,18 @@
     <Teleport to="body">
         <div class="guide-menu">
             <div class="guide-menu-item" @click="openlayer(0)">
-                方位图
+               室外消防栓平面位置图
             </div>
             <div class="guide-menu-item" @click="openlayer(1)">
-                总平面图
+                方位图
             </div>
             <div class="guide-menu-item" @click="openlayer(2)">
-                力量部署图
+                总平面图
             </div>
             <div class="guide-menu-item" @click="openlayer(3)">
+                力量部署图
+            </div>
+            <div class="guide-menu-item" @click="openlayer(4)">
                 基本情况
             </div>
         </div>
@@ -27,12 +30,20 @@ const currentType = ref(0)
 
 const imageTags0 = ref({
     hotspotType: "image",
+    hotspotTitle: "室外消防栓平面位置图",
+    image: [{
+        ossPath: require('@/assets/images/guide/0.jpg')
+    }]
+})
+
+const imageTags1 = ref({
+    hotspotType: "image",
     hotspotTitle: "方位图",
     image: [{
         ossPath: require('@/assets/images/guide/1.png')
     }]
 })
-const imageTags1 = ref({
+const imageTags2 = ref({
     hotspotType: "image",
     hotspotTitle: "总平面图",
     image: [{
@@ -40,19 +51,37 @@ const imageTags1 = ref({
     }]
 })
 
-const imageTags2 = ref({
-    hotspotType: "image",
+const imageTags3 = ref({
+    hotspotType: "article",
     hotspotTitle: "力量部署图",
+    customClassName: "power",
     image: [{
         ossPath: require('@/assets/images/guide/2.png')
-    }]
+    }],
+    articleInfo: {
+        html:
+            `<p style="text-align:center;"><img src="${require('@/assets/images/guide/2.jpg')}" /></p> 
+        <p style="text-align:center;font-size:16px;margin:10px 0;">力量部署图 </p>
+        <p style="text-align:center;"><img src="${require('@/assets/images/guide/4.jpg')}" /></p> 
+        <p style="text-align:center;font-size:16px;margin:10px 0;">力量调集表 </p>
+        `
+    }
 })
 
-const textTags3 = ref({
+const textTags4 = ref({
     hotspotTitle: "基本情况",
-    hotspotType: "textarea",
-    textarea: '<P style="font-size:16px;">南华大学附属第一医院位于湖南省衡阳市船山路69号，占地面积124.99亩，创建于1943年，是一所集医疗、教学、科研、预防、康复于一体的三级综合医院。院内拥有多栋中高层建筑物，其中院内室外消防栓共11个，水泵房3个，消防控制室1个。</p> ',
-
+    hotspotType: "article",
+    customClassName: "all",
+    articleInfo: {
+        html:
+            `<div style="display:inline-flex;overflow:hidden;flex-direction:row;flex-wrap:nowrap;width:100%;gap:10px;">
+            <div><img style="flex:1;display:block;" src="${require('@/assets/images/guide/txt/1.png')}" /></div>
+            <div><img style="flex:1;display:block;" src="${require('@/assets/images/guide/txt/1.png')}" /></div>
+            <div><img style="flex:1;display:block;" src="${require('@/assets/images/guide/txt/1.png')}" /></div>
+        </div>
+      
+        `
+    }
 })
 
 const isLayerOpen = ref(false);
@@ -72,7 +101,11 @@ const openlayer = (type) => {
             currentType.value = 0
             break;
         case 3:
-            store.commit("tags/setCurrentTag", textTags3.value);
+            store.commit("tags/setCurrentTag", imageTags3.value);
+            currentType.value = 0
+            break;
+        case 4:
+            store.commit("tags/setCurrentTag", textTags4.value);
             currentType.value = 1
             break;
         default:
@@ -94,7 +127,7 @@ const openlayer = (type) => {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    gap: 90px 0;
+    gap: 70px 0;
 
     .guide-menu-item {
         background: rgba(0, 0, 0, 0.8);
@@ -102,6 +135,8 @@ const openlayer = (type) => {
         height: 60px;
         border-radius: 10px;
         color: white;
+        padding: 0 10px;
+        text-align: center;
         display: flex;
         justify-content: center;
         align-items: center;
@@ -134,4 +169,12 @@ const openlayer = (type) => {
     }
 
 }
+
+.articlecon.power .txtbody {
+    width: 994px;
+}
+
+.articlecon.all .txtbody {
+    width: 100%;
+}
 </style>