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

src/assets/public.scss

@@ -144,7 +144,7 @@ samp {
     --editor-men-color        : rgb(0, 0, 0);
 
     .photo-select {
-      box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+      // box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
     }
 
     .ui-menu-item.active {
@@ -263,17 +263,25 @@ samp {
 
     .photo-select {
       i {
-        color: #000;
+        // color: #000;
       }
     }
 
     .fill-slide {
+      .header {
+        border-bottom: 1px solid #B3B3B3;
+      }
+
+      .foot {
+        border-top: 1px solid #B3B3B3;
+      }
 
       .foot,
       .header {
         background-color: #fff;
         color           : rgb(22, 24, 26);
 
+
         .top-right {
           color: rgb(22, 24, 26);
         }
@@ -353,18 +361,18 @@ samp {
       background: #fff;
 
       .info-bottom>div {
-        background: #E6E9F0;
+        background   : #E6E9F0;
         // border    : 1px solid #CCCCCC;
-        color     : #000;
+        color        : #000;
       }
 
       .info-top .info-top-right {
         color: rgba(0, 0, 0, 0.8);
 
         .right-btn {
-          background: rgba(0, 0, 0, 0);
+          background   : rgba(0, 0, 0, 0);
           // border    : 1px solid #CCCCCC;
-          background: #E6E9F0;
+          background   : #E6E9F0;
 
         }
 
@@ -380,17 +388,22 @@ samp {
 
     .download-btn {
       // border    : 1px solid #3a3d3d !important;
-      color     : #000 !important;
+      color        : #000 !important;
       // background: none !important;
 
       // background: rgba(0, 0, 0, 0);
 
-      background: #E6E9F0 !important;;
+      background: #E6E9F0 !important;
+      ;
     }
   }
 }
 
 :root.dark {
+  .menu.range {
+    border-color: rgba(0, 0, 0, 0);
+  }
+
   body {
     --editor-menu-back   : #161A1A;
     --editor-head-back   : #252828;
@@ -454,5 +467,11 @@ samp {
     .menu.active {
       background-color: rgba(255, 255, 255, 0.1);
     }
+    .info-layout {
+      // background: #fff;
+      .info-bottom>div {   
+        background:rgba(255,255,255,0.1);
+      }
+    }
   }
 }

src/components/button-pane/index.vue

@@ -33,7 +33,7 @@ const style = computed(() => {
 
   return {
     padding: isRow ? `4px ${psize}` : `${psize} 4px`,
-    borderRadius: props.type === 1 ? `${props.size / 2}px` : `4px`,
+    borderRadius: props.type === 1 ? `${props.size / 2}px` : `8px`,
     ...bound,
     flexDirection: props.dire,
   };

src/components/photos/undata.vue

@@ -1,11 +1,19 @@
 <template>
   <div class="undata">
     <div>
-      <img src="./undata.png" />
+      <img src="./undata.png" v-if="params.theme === 'light'" />
+      <img src="./undata-hei.png" v-else />
+
       <p>{{ undataMsg }}</p>
     </div>
   </div>
 </template>
+<script lang="ts" setup>
+import { useParams } from "@/hook";
+
+defineProps<{ undataMsg: string }>();
+const params = useParams();
+</script>
 
 <style lang="scss" scoped>
 .undata {
@@ -31,7 +39,3 @@
   }
 }
 </style>
-
-<script setup lang="ts">
-defineProps<{ undataMsg?: string }>();
-</script>

src/main.ts

@@ -5,9 +5,10 @@ if (import.meta.env.VITE_APP_SDK === "true") {
   import("./openSDK");
 }
 
-// if (useParams().console === "true") {
-/* new VConsole(); */
-// }
+if (useParams().console === "true") {
+  new VConsole();
+}
+console.log(window.innerWidth, window.innerHeight);
 
 import "@/assets/theme.editor.scss";
 import "@/assets/public.scss";

src/views/graphic/confirm.vue

@@ -36,7 +36,7 @@ withDefaults(
     disOk: false,
     disCancel: false,
     ok: () => drawRef.value.uiControl.confirmEntry(),
-    cancel: () => () => drawRef.value.uiControl.confirmCancel(),
+    cancel: () => drawRef.value.uiControl.confirmCancel(),
   }
 );
 </script>

src/views/graphic/imageLabel.vue

@@ -34,7 +34,8 @@
     </template>
     <div v-else class="empty-images">
       <div>
-        <img src="@/components/photos/undata.png" />
+        <img src="@/components/photos/undata.png" v-if="params.theme === 'light'" />
+        <img src="@/components/photos/undata-hei.png" v-else />
         <p>无结果</p>
       </div>
     </div>
@@ -53,6 +54,8 @@ import UiInput from "@/components/base/components/input/index.vue";
 import { uses } from "@/store/SVGLabel";
 import { UITypeExtend } from "./menus";
 
+import { useParams } from "@/hook";
+const params = useParams();
 const props = defineProps<{ type: string }>();
 const config = computed(() =>
   props.type === UITypeExtend.image

src/views/scene/container.vue

@@ -124,26 +124,29 @@ onMounted(async () => {
 
 <style lang="scss">
 .canvas-layout {
+  --size: 88px;
   #navCube {
+    width: var(--size) !important;
+    height: var(--size) !important;
     position: absolute !important;
-    right: var(--boundMargin) !important;
+    right: calc(var(--boundMargin) + (var(--photoSize) - var(--size)) / 2) !important;
     top: auto !important;
     bottom: var(--boundMargin) !important;
   }
 
   .meterPerPixel {
     position: absolute !important;
-    right: calc(var(--boundMargin) + 10px) !important;
-    bottom: calc(var(--boundMargin) + 100px) !important;
+    right: calc(var(--boundMargin) + (var(--photoSize) - var(--size)) / 2) !important;
+    bottom: calc(var(--boundMargin) + var(--size)) !important;
     // z-index: 1;
   }
   #home {
     position: absolute !important;
     // right: var(--boundMargin) !important;
     // top: var(--boundMargin) !important;
-    right: calc(var(--boundMargin) + 90px) !important;
+    right: calc(var(--boundMargin) + var(--size) - 10px) !important;
     top: auto !important;
-    bottom: calc(var(--boundMargin) + 90px) !important;
+    bottom: calc(var(--boundMargin) + var(--size) - 10px) !important;
 
     display: flex;
     align-items: center;
@@ -172,7 +175,8 @@ onMounted(async () => {
 
   .meterPerPixel {
     text-align: right;
-    width: 100px;
+    width: var(--size);
+    text-align: center;
     color: #fff;
     z-index: 999;
     pointer-events: none;

src/views/scene/covers/fixPoints.vue

@@ -79,9 +79,11 @@ activeFixPointStack.push(computed(() => selectMeasure.value || selectPoint.value
 
 const select = (point: FixPoint, onMeasure: boolean = false, onRaw: boolean = false) => {
   if (onMeasure) {
+    selectPoint.value = null;
     selectMeasure.value = point;
   } else {
     selectPoint.value = point;
+    selectMeasure.value = null;
   }
 
   if (!onRaw) {

src/views/scene/fixManage.ts

@@ -164,6 +164,7 @@ export const getFix3d = (data: FixPoint) => {
   }
 
   let sdk: SDK = useSDK();
+  console.log(sdk.scene.createFixPoint, args);
   const fix3d = sdk.scene.createFixPoint(args);
   if (drawstatus.value === DrawStatus.ing) {
     drawingFix3d.value.push(fix3d);

src/views/scene/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <MainPanel>
+  <MainPanel :style="{ '--photoSize': viewStatus ? '88px' : '64px' }">
     <template v-slot:header>
       <div class="photos-header">
         <div class="left">
@@ -21,6 +21,7 @@
           <Scene :view-status="viewStatus">
             <template v-slot="{ childPage }">
               <ButtonPane
+                box-shadow
                 class="back fun-ctrl"
                 :size="viewStatus ? 64 : 48"
                 @click="onScale"
@@ -359,7 +360,7 @@ onActivated(async () => {
       flex-direction: column;
       align-items: center;
       justify-content: center;
-      background: #E6E9F0;
+      background: #e6e9f0;
       font-size: 16px;
       border-radius: 4px;
       cursor: pointer;

src/views/scene/mode.vue

@@ -3,7 +3,7 @@
     class="scene-mode-tabs"
     :menus="menus"
     :size="size"
-    :style="{ width: `${size}px`, height: `${size}px` }"
+    :style="{ '--size': `${size}px`, width: `${size}px`, height: `${size}px` }"
     :active-key="customMap.mode"
     v-if="!disabledMap.mode"
   />
@@ -52,7 +52,7 @@ watch(
 
 <style lang="scss" scoped>
 .scene-mode-tabs {
-  right: var(--boundMargin);
+  right: calc(var(--boundMargin) + (var(--photoSize) - var(--size)) / 2);
   top: var(--boundMargin);
 }
 </style>
@@ -64,7 +64,7 @@ watch(
     min-width: 100%;
     padding: 0 !important;
     margin-right: 0 !important;
-    border-radius: 4px;
+    border-radius: 8px !important;
     display: none;
 
     &.active {