Parcourir la source

Merge branch 'dev' of http://192.168.0.115:3000/bill/traffic-laser into dev

xzw il y a 1 an
Parent
commit
879aa83ce6
4 fichiers modifiés avec 5 ajouts et 7 suppressions
  1. 3 3
      src/main.ts
  2. 1 0
      src/store/sync.ts
  3. 0 3
      src/views/graphic/header.vue
  4. 1 1
      src/views/scene/menus/menus.ts

+ 3 - 3
src/main.ts

@@ -1,9 +1,9 @@
 import VConsole from "vconsole";
 import { useParams } from "@/hook/useParams";
 
-if (useParams().console === "true") {
-  new VConsole();
-}
+// if (useParams().console === "true") {
+new VConsole();
+// }
 
 import "@/assets/theme.editor.scss";
 import "@/assets/public.scss";

+ 1 - 0
src/store/sync.ts

@@ -32,6 +32,7 @@ setInterval(() => {
         getFilesIng.filter((url) => !getFilesSuccess.includes(url))
     );
   }
+  // console.log(getFilesSuccess, getFilesIng);
 }, 1000);
 const normalImage = async (url: string) => {
   const getUrl = await api.getFile(url);

+ 0 - 3
src/views/graphic/header.vue

@@ -75,9 +75,6 @@ import { roadPhotos } from "@/store/roadPhotos";
 import { downloadImage, uploadImage } from "@/store/sync";
 import { genUseLoading } from "@/hook";
 import { loadData, bus } from "@/hook/useGraphic";
-
-import { dataService } from "@/graphic/Service/DataService";
-import { boxShadow } from "html2canvas/dist/types/css/property-descriptors/box-shadow";
 import { Message } from "@kankan/components/expose-common";
 
 const data = useData();

+ 1 - 1
src/views/scene/menus/menus.ts

@@ -161,7 +161,7 @@ export const menus: MenuRaw[] = [
         single: true,
         onClick() {
           sceneSeting.value = {
-            top: useSDK().scene.getSceneCropSetting().top.maxTop,
+            top: 100,
             scale: 100,
             rotate: 0,
           };