Browse Source

修改需求

bill 2 years ago
parent
commit
a88dd4ea4b

File diff suppressed because it is too large
+ 1 - 1
server/test/a0k4xu045_202305311600080410/attach/sceneStore


+ 1 - 6
src/views/scene/covers/cover.vue

@@ -61,12 +61,6 @@ const downHandler = (sev: MouseEvent | TouchEvent) => {
     const pos = getPostionByTarget(el, document.querySelector("#app") as HTMLElement);
     preset.x = preset.x - (sev.touches[0].pageX  - (pos.x - preset.x))
     preset.y = preset.y - (sev.touches[0].pageY  - (pos.y - preset.y))
-    console.log(
-      pos,
-      sev.touches[0].clientX,
-    sev.touches[0].clientY,
-      preset
-    )
   } else {
     preset.x -= sev.offsetX
     preset.y -= sev.offsetY
@@ -98,6 +92,7 @@ const downHandler = (sev: MouseEvent | TouchEvent) => {
   mountEl.addEventListener('mouseup', upHandler)
   mountEl.addEventListener('touchmove', moveHandler)
   mountEl.addEventListener('touchend', upHandler)
+  sev.preventDefault()
 }
 
 const clickHandler = ev => {

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

@@ -39,7 +39,7 @@ const clickHandler = ev => {
   const $canvas = document.querySelector(".scene-canvas > canvas")
   if (!$canvas || !$canvas.contains(ev.target)) {
     emit("blur")
-    // measure.value.selected(false)
+    measure.value.selected(false)
   }
 }
 onMounted(() => {

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

@@ -126,7 +126,7 @@ const menuActions = {
       (data) => baseLines.value.push(data),
       onComplete,
       "基准线",
-      "#e91e63"
+      "#ED1C24"
     )
   },
   [menuEnum.CLEAR]: (menu, onComplete) => {

+ 5 - 4
src/views/scene/menus/pane.vue

@@ -52,10 +52,11 @@ watchEffect((onCleanup) => {
   }
 })
 
-watchEffect(() => {
-  disabledMap.photo = !store.child.value
-})
-
+if (props.level === 1) {
+  watchEffect(() => {
+    disabledMap.photo = !store.child.value?.length
+  })
+}
 onUnmounted(joinActions(store.itemActiveKey));
 </script>
 <script lang="ts"> export default {name: 'scene-menus'}</script>

+ 3 - 3
src/views/scene/photo.vue

@@ -71,7 +71,7 @@ const photo = genUseLoading(async () => {
     //   item.show = false
     // })
     await nextTick()
-    await downloadImage(blob)
+    // await downloadImage(blob)
     const url = await upload
     photos.value.push({
       id: getId(),
@@ -87,10 +87,10 @@ const photo = genUseLoading(async () => {
             return null
           }
         })
-        .filter(poss => poss),
+        .filter(poss => poss?.pos.length === 2),
       baseLines: baseLines.value
         .map(data => getCurrentScreens(data.points))
-        .filter(poss => poss.length),
+        .filter(poss => poss.length === 2),
       fixPoints: fixPoints.value
         .map(data => ({ text: data.text, pos: getCurrentScreen(data.pos) }))
         .filter(data => !!data.pos),