bill 2 vuotta sitten
vanhempi
commit
454b94a20f
51 muutettua tiedostoa jossa 11 lisäystä ja 15 poistoa
  1. 1 1
      server/test/a0k4xu045_202305311600080410/attach/sceneStore
  2. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685587793277544.jpg
  3. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685589711195763.jpg
  4. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685589795683256.jpg
  5. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685590041056517.jpg
  6. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685590356579647.jpg
  7. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/168559066367975.jpg
  8. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593251515943.jpg
  9. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593254192579.jpg
  10. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/168559325702443.jpg
  11. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593314970657.jpg
  12. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593316446240.jpg
  13. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593317794115.jpg
  14. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/16855933939793.jpg
  15. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593396240588.jpg
  16. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593397834792.jpg
  17. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593399414857.jpg
  18. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593400857651.jpg
  19. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593498896753.jpg
  20. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593500314853.jpg
  21. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593501674861.jpg
  22. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593502850333.jpg
  23. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593504144278.jpg
  24. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593513439637.jpg
  25. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/168559351835423.jpg
  26. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593522182822.jpg
  27. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685593525716987.jpg
  28. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/168559352940417.jpg
  29. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/168559954343738.jpg
  30. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685600163551445.jpg
  31. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602348610124.jpg
  32. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602799766148.jpg
  33. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602802269547.jpg
  34. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602810736910.jpg
  35. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602882119879.jpg
  36. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602888332532.jpg
  37. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602891631206.jpg
  38. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602900782815.jpg
  39. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/168560290513153.jpg
  40. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602955659923.jpg
  41. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685602960279566.jpg
  42. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685603002527819.jpg
  43. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685603037308487.jpg
  44. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685603201623234.jpg
  45. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685603204603222.jpg
  46. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685603207931317.jpg
  47. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/168560321159263.jpg
  48. BIN
      server/test/a0k4xu045_202305311600080410/attach/upload/1685603220663775.jpg
  49. 0 1
      src/graphic/Renderer/Draw.js
  50. 10 12
      src/views/roads/tabulation.vue
  51. 0 1
      src/views/scene/covers/measure.vue

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
server/test/a0k4xu045_202305311600080410/attach/sceneStore


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685587793277544.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685589711195763.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685589795683256.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685590041056517.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685590356579647.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/168559066367975.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593251515943.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593254192579.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/168559325702443.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593314970657.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593316446240.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593317794115.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/16855933939793.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593396240588.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593397834792.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593399414857.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593400857651.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593498896753.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593500314853.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593501674861.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593502850333.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593504144278.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593513439637.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/168559351835423.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593522182822.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685593525716987.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/168559352940417.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/168559954343738.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685600163551445.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602348610124.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602799766148.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602802269547.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602810736910.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602882119879.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602888332532.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602891631206.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602900782815.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/168560290513153.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602955659923.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685602960279566.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685603002527819.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685603037308487.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685603201623234.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685603204603222.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685603207931317.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/168560321159263.jpg


BIN
server/test/a0k4xu045_202305311600080410/attach/upload/1685603220663775.jpg


+ 0 - 1
src/graphic/Renderer/Draw.js

@@ -700,7 +700,6 @@ export default class Draw {
 
   // 文字
   drawText(vector) {
-    console.log(vector)
     help.setVectorStyle(this.context, vector);
     this.context.fillStyle = vector.color;
     const oldFont = this.context.font;

+ 10 - 12
src/views/roads/tabulation.vue

@@ -137,7 +137,7 @@ import UiInput from "@/components/base/components/input/index.vue";
 import {HandMode, useHand} from '@/hook/useHand'
 import Header from "@/components/photos/header.vue";
 import MainPanel from "@/components/main-panel/index.vue";
-import {uploadImage} from "@/store/sync";
+import {downloadImage, uploadImage} from "@/store/sync";
 import {Mode} from "@/views/graphic/menus";
 
 const roadPhoto = computed<RoadPhoto>(() => {
@@ -177,21 +177,18 @@ const { cssMatrix: photoCSSMatrix, matrix: photoMatrix } = useHand(
   history.value.value.imageTransform
 )
 
-const photoWidth = ref(0)
-watchEffect(() => {
-  if (photoRef.value) {
-    photoRef.value.onload = () => {
-      photoWidth.value = photoRef.value.naturalWidth
-    }
-  }
-})
 const proportion = ref(1)
 watchEffect(() => {
   if (!roadPhoto.value || !photoRef.value) {
     return;
   }
-  const prop = ((photoWidth.value / photoRef.value.width) * (roadPhoto.value.data.scale || 1)) / photoMatrix.value[0]
-  proportion.value = Math.ceil(prop * 100) / 100
+  const scale = roadPhoto.value.data.scale || 1
+  const martrixScale = photoMatrix.value[0]
+  photoRef.value.onload = () => {
+    const photoWidth = photoRef.value.naturalWidth
+    const prop = ((photoWidth / photoRef.value.offsetWidth) * scale) / martrixScale
+    proportion.value = Math.ceil(prop * 100) / 100
+  }
 })
 
 
@@ -210,6 +207,7 @@ const getLayoutImage = async () => {
   const canvas = await html2canvas(layoutRef.value)
   downMode.value = false
   const blob = await new Promise<Blob>(resolve => canvas.toBlob(resolve, "image/jpeg", 0.95))
+  await downloadImage(blob)
   return await uploadImage(blob)
 }
 const saveHandler = async () => {
@@ -236,7 +234,7 @@ const saveHandler = async () => {
 
 .content {
   box-sizing: content-box;
-  width: 980px;
+  width: 1066px;
   padding: 20px 20px 60px;
   margin: 0 auto;
 }

+ 0 - 1
src/views/scene/covers/measure.vue

@@ -43,7 +43,6 @@ const clickHandler = ev => {
   }
 }
 onMounted(() => {
-  console.error("????????")
   document.querySelector("#app").addEventListener("touchstart", clickHandler)
 })
 onUnmounted(() => {