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

src/graphic/CanvasStyle/focus.js

@@ -129,6 +129,7 @@ export default {
   CurveRoad,
   MeasureLine,
   TestPoint,
+  PositionLine: MeasureLine,
   FreeMeasureLine: MeasureLine,
   Circle,
   CurveLine,

src/graphic/Renderer/Draw.js

@@ -26,6 +26,7 @@ const help = {
     ];
     let currentAttr;
 
+    console.log(itemsEntry)
     return [
       itemsEntry.reduce((prev, [item, attr]) => {
         if (!item) return prev;
@@ -811,7 +812,16 @@ export default class Draw {
       let img, imgBound;
       if (vector.photoImage) {
         img = vector.photoImage;
-        imgBound = [0, 0, img.width, img.height];
+        let top = 0, left = 0, size = 0
+        if (img.width > img.height) {
+          size = img.height
+          left = (img.width - size) / 2
+        } else {
+          size = img.width
+          top = (img.height - size) / 2
+        }
+
+        imgBound = [left, top, size, size];
       } else {
         const size = help.getReal(style.target.realRadius);
         const backImg = dataService.getBackgroundImg();

src/store/SVGLabel.ts

@@ -1,6 +1,6 @@
 import {ref} from "vue";
 
-type Use = {count: number, key: string}
+type Use = {count: number, key: string, lastUpdateTime?: number}
 
 export const defaultUses: Use[] = [
   { count: 0, key: "keche_p.svg" },

src/store/sync.ts

@@ -52,7 +52,7 @@ export const api =
           ]
           const notBase64 = notBase64BaseTypes.some(type => paths[paths.length - 1].includes(type))
           if (notBase64) {
-            await new Promise(resolve => setTimeout(resolve, 2000))
+            // await new Promise(resolve => setTimeout(resolve, 2000))
             return baseURL + url
           } else {
             const data = await axios.get(url, { responseType: "blob" });

src/views/accidents/print.vue

@@ -1,7 +1,7 @@
 <template>
   <MainPanel>
     <template v-slot:header>
-      <Header  title="生成A4">
+      <Header  title="生成A4" type="return">
         <ui-button
             type="primary"
             @click="saveHandler"
@@ -42,7 +42,7 @@ const genAccidentPhotos = computed<AccidentPhoto[]>(() => {
   let route, params
   if (((route = router.currentRoute.value).name === writeRouteName.gena4)
     && (params = route.params)
-    && params.id1 
+    && params.id1
     && params.id2) {
     return accidentPhotos.value?.filter(data => [params.id1, params.id2].includes(data.id))
   }
@@ -100,4 +100,4 @@ const saveHandler = async () => {
     object-fit: cover;
   }
 }
-</style>
+</style>

src/views/graphic/imageLabel.vue

@@ -60,7 +60,7 @@ const typeMenus = computed(() => {
     {
       title: "常用",
       children: uses.value
-        .sort((item1, item2) => item2.count - item1.count).slice(0, 10)
+        .sort((item1, item2) => (item2.count || 0) - (item1.count || 0)).slice(0, 10)
         .map(item => {
           for (let menu of typeMenusRaw) {
             const findItem = menu.children.find(menuItem => menuItem.key === item.key);
@@ -86,10 +86,12 @@ watch(
 
 const clickHandler = (key) => {
   const findUse = uses.value.find(use => use.key === key);
+  const lastUpdateTime = new Date().getTime()
   if (findUse) {
     findUse.count++
+    findUse.lastUpdateTime = lastUpdateTime
   } else {
-    uses.value.push({ key, count: 1 })
+    uses.value.push({ key, count: 1, lastUpdateTime })
   }
   uiType.change(key as any)
 }

src/views/graphic/index.vue

@@ -1,7 +1,9 @@
 <template>
-  <MainPanel :menus="graphicState.continuedMode ? null : store.menus as any" :active-menu-key="store.activeMenuKey.value">
+  <MainPanel
+      :menus="graphicState.continuedMode ? null : store.menus as any"
+      :active-menu-key="store.activeMenuKey.value">
     <template v-slot:header>
-      <Header />
+      <Header :class="{disabled: graphicState.continuedMode}" />
     </template>
     <Container />
     <ChildMenus

src/views/roads/tabulation.vue

@@ -1,7 +1,7 @@
 <template>
   <MainPanel>
     <template v-slot:header>
-      <Header title="现场绘图 | 制表" :on-back="onBack">
+      <Header title="现场绘图 | 制表" :on-back="onBack" type="return">
         <ui-button
             type="primary"
             @click="saveHandler"