Browse Source

feat: 修复热点bug

rindy 2 năm trước cách đây
mục cha
commit
b0b8fd6d9e

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kankan/smart-bim",
   "private": true,
-  "version": "4.9.1",
+  "version": "4.9.1-apl",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

+ 2 - 2
public/smart-kankan.html

@@ -36,8 +36,8 @@
         </div>
         <script src="<%= BASE_URL %><%= VUE_APP_SDK_DIR %>kankan-sdk-deps.js?v=<%= VUE_APP_VERSION %>"></script>
         <script src="<%= BASE_URL %><%= VUE_APP_SDK_DIR %>kankan-sdk.js?v=<%= VUE_APP_VERSION %>"></script>
-<!-- 
-        <script src="http://127.0.0.1:3099/dist/sdk/kankan-sdk-deps.js"></script>
+
+        <!-- <script src="http://127.0.0.1:3099/dist/sdk/kankan-sdk-deps.js"></script>
         <script src="http://127.0.0.1:3099/dist/sdk/kankan-sdk.js"></script> -->
         <script>
             window.onload = function () {

+ 2 - 0
src/components/files/index.vue

@@ -188,6 +188,8 @@ const onAddConfirm = () => {
                 // tags.value.push(tag)
                 notify.value = tag
                 isEdit.value = true
+            } else {
+                onAddCancel()
             }
         })
     } else {

+ 8 - 2
src/components/header/Login.vue

@@ -45,7 +45,9 @@
 import { ref, onMounted } from 'vue'
 import { http } from '@/utils/request'
 import common from '@/utils/common'
+import browser from '@/utils/browser'
 import { useI18n, getLocale } from '@/i18n'
+const projectId = browser.valueFromUrl('projectId') || ''
 const { t } = useI18n({ useScope: 'global' })
 const emits = defineEmits(['close', 'user'])
 const showpass = ref(false)
@@ -68,7 +70,7 @@ const onLogin = () => {
         return
     }
 
-    http.post(`smart-site/fdLogin`, {
+    http.post(`smart-site/fdLogin/${projectId}`, {
         password: common.encodeStr(Base64.encode(password.value)),
         phoneNum: username.value,
         rememberMe: remember.value,
@@ -94,7 +96,11 @@ const onLogin = () => {
                 })
                 emits('close')
             } else {
-                errors.value.message = response.message
+                if (response.code == 4002) {
+                    errors.value.message = '该账号下未检测到当前场景,请更换账号重新登录'
+                } else {
+                    errors.value.message = response.message
+                }
             }
         })
         .catch(() => {

+ 16 - 0
src/pages/Viewer.vue

@@ -575,6 +575,22 @@ const onRuleChecked = () => {
 }
 
 onMounted(() => {
+    // document.addEventListener('fullscreenchange', () => {
+    //     if (document.fullscreenElement) {
+    //         if (!fscChecked.value) {
+    //             fscChecked.value = true
+    //         }
+    //     } else {
+    //         if (fscChecked.value) {
+    //             fscChecked.value = false
+    //         }
+    //     }
+    // });
+
+    // window.addEventListener('keydown',(e)=>{
+    //     console.log(e.which)
+    // },false)
+
     const num = browser.valueFromUrl('m') || ''
     const projectId = browser.valueFromUrl('projectId') || 1
     http.get(`smart-site/project/info?projectId=${projectId}&sceneOrder=asc`)

+ 1 - 1
vue.config.js

@@ -20,7 +20,7 @@ const devServer = {
             changeOrigin: true
         },
         '/smart-site': {
-            target: 'https://test.4dkankan.com/',//'http://192.168.0.152:8111', //
+            target: 'http://192.168.0.152:8111',//'https://test.4dkankan.com/',//'http://192.168.0.152:8111', //
             changeOrigin: true
         }
     }