bill 7 miesięcy temu
rodzic
commit
ad51265554

+ 1 - 1
src/api/instance.ts

@@ -37,7 +37,7 @@ const gotoLogin = () => {
       setTimeout(() => location.reload())
     });
   } else {
-    const loginHref = `/admin/#/login`
+    const loginHref = `/admin/#/statistics/scene`
     location.href = loginHref + '?redirect=' + escape(location.href)
   }
 };

+ 2 - 2
src/app.vue

@@ -25,14 +25,14 @@
         </router-view>
       </div>
 
-      <span
+      <!-- <span
         v-if="fuseModels.length > 0 || scenes.length === 0"
         class="taggle map-type"
         @click="isStandard = !isStandard"
         @touchend="isStandard = !isStandard"
       >
         <img :src="isStandard ? 'images/satellite.jpg' : 'images/standard.jpg'" />
-      </span>
+      </span> -->
     </ui-editor-layout>
 
     <PwdModel v-if="inputPwd" @close="inputPwd = false" />

+ 8 - 0
src/components/static-preview/sign.vue

@@ -26,3 +26,11 @@ watchEffect(() => {
 </script>
 
 <style scoped lang="scss" src="./style.scss"></style>
+
+<style scoped>
+.preview-layer,
+.pull-meta {
+  width: 100%;
+  height: 100%;
+}
+</style>

+ 31 - 16
src/model/app.vue

@@ -60,6 +60,7 @@ export const Model = defineComponent({
         return setUrl("");
       }
       const type = scene.value.type;
+      const sign = params.sign ? `&sign=${params.sign}` : "";
       const urls = offline
         ? {
             [SceneType.SWKK]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
@@ -72,28 +73,42 @@ export const Model = defineComponent({
             [SceneType.SWYDMX]: `${offlinePrev}swkk/${scene.value.num}/wwwroot/spg.html?m=${scene.value.num}&lang=zh`,
           }
         : {
-            [SceneType.SWKK]: `/swkk/spg.html?m=${scene.value.num}`,
-            [SceneType.DSFXJ]: `/swkk/spg.html?m=${scene.value.num}`,
-            [SceneType.SWKJ]: `/swkk/spg.html?m=${scene.value.num}`,
-            [SceneType.SWSS]: `/swss/index.html?m=${scene.value.num}`,
-            [SceneType.SWSSMX]: `/swkk/spg.html?m=${scene.value.num}`,
-            [SceneType.SWMX]: `index.html?caseId=${params.caseId}&modelId=${scene.value.num}#sign-model`,
-            [SceneType.SWYDSS]: `/swss/index.html?m=${scene.value.num}`,
-            [SceneType.SWYDMX]: `/swkk/spg.html?m=${scene.value.num}`,
+            [SceneType.SWKK]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
+            [SceneType.DSFXJ]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
+            [SceneType.SWKJ]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
+            [SceneType.SWSS]: `/swss/index.html?m=${scene.value.num}${sign}`,
+            [SceneType.SWSSMX]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
+            [SceneType.SWMX]: `index.html?caseId=${params.caseId}&modelId=${scene.value.num}${sign}#sign-model`,
+            [SceneType.SWYDSS]: `/swss/index.html?m=${scene.value.num}${sign}`,
+            [SceneType.SWYDMX]: `/swkk/spg.html?m=${scene.value.num}${sign}`,
           };
 
       if (import.meta.env.DEV && !offline) {
         Object.assign(urls, {
-          [SceneType.SWKK]: `/swkk/spg.html?m=${scene.value.num}&toen=${getToken()}`,
-          [SceneType.DSFXJ]: `/swkk/spg.html?m=${scene.value.num}&toen=${getToken()}`,
-          [SceneType.SWKJ]: `/swkk/spg.html?m=${scene.value.num}&toen=${getToken()}`,
-          [SceneType.SWSS]: `/swss/index.html?m=${scene.value.num}&toen=${getToken()}`,
-          [SceneType.SWSSMX]: `/swkk/spg.html?m=${scene.value.num}&toen=${getToken()}`,
+          [SceneType.SWKK]: `/swkk/spg.html?m=${
+            scene.value.num
+          }&toen=${getToken()}${sign}`,
+          [SceneType.DSFXJ]: `/swkk/spg.html?m=${
+            scene.value.num
+          }&toen=${getToken()}${sign}`,
+          [SceneType.SWKJ]: `/swkk/spg.html?m=${
+            scene.value.num
+          }&toen=${getToken()}${sign}`,
+          [SceneType.SWSS]: `/swss/index.html?m=${
+            scene.value.num
+          }&toen=${getToken()}${sign}`,
+          [SceneType.SWSSMX]: `/swkk/spg.html?m=${
+            scene.value.num
+          }&toen=${getToken()}${sign}`,
           [SceneType.SWMX]: `index.html?caseId=${params.caseId}&modelId=${
             scene.value.num
-          }&toen=${getToken()}#sign-model`,
-          [SceneType.SWYDSS]: `/swss/index.html?m=${scene.value.num}&toen=${getToken()}`,
-          [SceneType.SWYDMX]: `/swkk/spg.html?m=${scene.value.num}&toen=${getToken()}`,
+          }&toen=${getToken()}${sign}#sign-model`,
+          [SceneType.SWYDSS]: `/swss/index.html?m=${
+            scene.value.num
+          }${sign}&toen=${getToken()}`,
+          [SceneType.SWYDMX]: `/swkk/spg.html?m=${
+            scene.value.num
+          }${sign}&toen=${getToken()}`,
         });
       }
       setUrl(urls[type]);

+ 10 - 2
src/views/folder/modal-floder-view.vue

@@ -18,7 +18,13 @@
           :style="{ '--rawLen': samLen }"
         >
           <div class="img-item-content">
-            <img :src="floders[i].filesUrl" @click="clickHandler(floders[i])" />
+            <div>
+              <Sign
+                :media="{ url: floders[i].filesUrl }"
+                @click="clickHandler(floders[i])"
+              />
+            </div>
+            <!-- <img :src="floders[i].filesUrl"  /> -->
           </div>
         </div>
       </div>
@@ -50,6 +56,7 @@ import { Floder, FloderRoot, getFlatFloders } from "@/store";
 import { computed, ref } from "vue";
 import { TabPane, Tabs } from "ant-design-vue";
 import { DownOutlined, UpOutlined } from "@ant-design/icons-vue";
+import Sign from "@/components/static-preview/sign.vue";
 
 const props = defineProps<{ root: FloderRoot }>();
 const emit = defineEmits<{ (e: "preview", v: [Floder, FloderRoot]): void }>();
@@ -100,7 +107,8 @@ const canAll = computed(() => len.value > samLen);
     padding-top: 56.25%;
     position: relative;
     cursor: pointer;
-    img {
+    
+    > div {
       position: absolute;
       width: 100%;
       height: 100%;