bill 10 hodín pred
rodič
commit
c19a7847ac

+ 6 - 0
src/components/bill-ui/components/input/file.vue

@@ -13,6 +13,7 @@
       :accept="accept"
       :multiple="multiple"
       @change="selectFileHandler"
+      @click="focusHandler"
       v-if="!maxLen || maxLen > modelValue.length"
     />
     <template v-if="!$slots.replace">
@@ -230,6 +231,11 @@ const selectFileHandler = async (ev) => {
   fileEl.value = "";
 };
 
+const focusHandler = () => {
+  console.error("0.0", inputRef.value);
+  // inputRef.value.click();
+};
+
 defineExpose({
   input: inputRef,
 });

+ 1 - 1
src/components/materials/index.vue

@@ -17,7 +17,7 @@
           <span>( {{ rowSelection.selectedRowKeys.length }} )</span>
         </p>
         <div class="up-se">
-          <span class="upload fun-ctrls" v-if="!readonly">
+          <span class="upload fun-ctrls" v-if="!props.readonly">
             <ui-input
               width="200px"
               class="input"

+ 1 - 1
src/env/index.ts

@@ -133,7 +133,7 @@ if (offline) {
   } else {
     params.serviceUrl = "/fusion";
     params.root = ''
-    params.ossRoot = '/'
+    params.ossRoot =  location.origin + '/'
   }
   // params.root = ''
   params.static = '/'

+ 6 - 1
src/main.ts

@@ -104,4 +104,9 @@ watchEffect(
 export default app;
 
 document.documentElement.addEventListener('contextmenu', ev => ev.preventDefault())
-document.documentElement.addEventListener('click', ev => ev.preventDefault())
+document.documentElement.addEventListener('click', ev => {
+  const dom = ev.target as HTMLDivElement
+  if (dom.tagName.toUpperCase() === 'A') {
+    ev.preventDefault()
+  }
+})

+ 3 - 3
src/model/platform.ts

@@ -38,10 +38,10 @@ export async function modelSDKFactory(
   if (type === fuseModel) {
     if (!fuseInitialed) {
       await initialSDK({
-        laserRoot: offline ? offlinePrev : params.laserRoot,
-        // panoOSSRoot: offline ? offlinePrev : params.panoOSSRoot,
+        laserRoot: offline ? '' : params.laserRoot,
+        panoOSSRoot: offline ? '' : undefined,
         ossRoot: offline ? '.' : params.ossRoot,
-        // laserOSSRoot: offline ? offlinePrev : params.laserOSSRoot,
+        laserOSSRoot: offline ? '' : undefined,
         layout: dom,
         scenes: scenes.value,
         lonlat: center,

+ 7 - 9
vite.config.ts

@@ -3,8 +3,11 @@ import vue from "@vitejs/plugin-vue";
 
 import { resolve } from "path";
 
-const oss = `http://192.168.0.13:8080/`;
-const ip = `http://192.168.0.13:8080/`;
+
+// const offline = `http://192.168.0.13:8080/`
+
+const oss = `http://192.168.0.125:1804/`;
+const ip = `http://192.168.0.125:1804/`;
 const langProt = 7700;
 const proxy = {
   "/dev": {
@@ -33,11 +36,6 @@ const proxy = {
     changeOrigin: true,
     rewrite: (path) => path.replace(/^\/offlineResource/, ""),
   },
-  "/profile": {
-    target: ip,
-    changeOrigin: true,
-    rewrite: (path) => path.replace(/^\/profile/, "profile"),
-  },
   "/fusion": {
     target: ip,
     changeOrigin: true,
@@ -46,7 +44,7 @@ const proxy = {
   "/swkk": {
     target: `${oss}/`,
     changeOrigin: true,
-    rewrite: (path) => path.replace(/^\/swkk/, "/swkk"),
+    rewrite: (path) => path.replace(/^\/swkk/, ""),
   },
   "/oss": {
     target: `${oss}/`,
@@ -74,7 +72,7 @@ const proxy = {
     rewrite: (path) => path.replace(/^\/service/, "/service"),
   },
   "/swss": {
-    target: `${oss}/swss`,
+    target: `${oss}/mega`,
     changeOrigin: true,
     rewrite: (path) => path.replace(/^\/swss/, ""),
   },