tangning 4 gün önce
ebeveyn
işleme
f1020c2769

+ 26 - 3
src/assets/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           <ul class="icon_lists dib-box">
           
           
             <li class="dib">
             <li class="dib">
+              <span class="icon iconfont">&#xe649;</span>
+                <div class="name">AI抓拍</div>
+                <div class="code-name">&amp;#xe649;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe740;</span>
               <span class="icon iconfont">&#xe740;</span>
                 <div class="name">new_left</div>
                 <div class="name">new_left</div>
                 <div class="code-name">&amp;#xe740;</div>
                 <div class="code-name">&amp;#xe740;</div>
@@ -342,9 +348,9 @@
 <pre><code class="language-css"
 <pre><code class="language-css"
 >@font-face {
 >@font-face {
   font-family: 'iconfont';
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1775094317776') format('woff2'),
-       url('iconfont.woff?t=1775094317776') format('woff'),
-       url('iconfont.ttf?t=1775094317776') format('truetype');
+  src: url('iconfont.woff2?t=1776255409821') format('woff2'),
+       url('iconfont.woff?t=1776255409821') format('woff'),
+       url('iconfont.ttf?t=1776255409821') format('truetype');
 }
 }
 </code></pre>
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -371,6 +377,15 @@
         <ul class="icon_lists dib-box">
         <ul class="icon_lists dib-box">
           
           
           <li class="dib">
           <li class="dib">
+            <span class="icon iconfont icon-AIzhuapai"></span>
+            <div class="name">
+              AI抓拍
+            </div>
+            <div class="code-name">.icon-AIzhuapai
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-new_left"></span>
             <span class="icon iconfont icon-new_left"></span>
             <div class="name">
             <div class="name">
               new_left
               new_left
@@ -804,6 +819,14 @@
           
           
             <li class="dib">
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-AIzhuapai"></use>
+                </svg>
+                <div class="name">AI抓拍</div>
+                <div class="code-name">#icon-AIzhuapai</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-new_left"></use>
                   <use xlink:href="#icon-new_left"></use>
                 </svg>
                 </svg>
                 <div class="name">new_left</div>
                 <div class="name">new_left</div>

+ 7 - 3
src/assets/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
 @font-face {
   font-family: "iconfont"; /* Project id 4789215 */
   font-family: "iconfont"; /* Project id 4789215 */
-  src: url('iconfont.woff2?t=1775094317776') format('woff2'),
-       url('iconfont.woff?t=1775094317776') format('woff'),
-       url('iconfont.ttf?t=1775094317776') format('truetype');
+  src: url('iconfont.woff2?t=1776255409821') format('woff2'),
+       url('iconfont.woff?t=1776255409821') format('woff'),
+       url('iconfont.ttf?t=1776255409821') format('truetype');
 }
 }
 
 
 .iconfont {
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }
 
 
+.icon-AIzhuapai:before {
+  content: "\e649";
+}
+
 .icon-new_left:before {
 .icon-new_left:before {
   content: "\e740";
   content: "\e740";
 }
 }

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/assets/font/iconfont.js


+ 7 - 0
src/assets/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "description": "",
   "glyphs": [
   "glyphs": [
     {
     {
+      "icon_id": "37288684",
+      "name": "AI抓拍",
+      "font_class": "AIzhuapai",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
       "icon_id": "47237723",
       "icon_id": "47237723",
       "name": "new_left",
       "name": "new_left",
       "font_class": "new_left",
       "font_class": "new_left",

BIN
src/assets/font/iconfont.ttf


BIN
src/assets/font/iconfont.woff


BIN
src/assets/font/iconfont.woff2


+ 2 - 2
src/view/case/photos/canvas-photo-editor.js

@@ -16,8 +16,8 @@ export class CanvasPhotoEditor {
     this.canvas = canvas
     this.canvas = canvas
     this.ctx = canvas.getContext('2d')
     this.ctx = canvas.getContext('2d')
     this.ctxOld = null
     this.ctxOld = null
-    this.rqWidth = 370
-    this.rqHeight = 250
+    this.rqWidth = 362
+    this.rqHeight = 253
     this.pageWidth = options.pageWidth || 520
     this.pageWidth = options.pageWidth || 520
     this.pageHeight = options.pageHeight || 840
     this.pageHeight = options.pageHeight || 840
     this.pageMargin = options.pageMargin || 4
     this.pageMargin = options.pageMargin || 4

+ 28 - 9
src/view/material/sceneImg.vue

@@ -235,8 +235,13 @@
                   >下载</el-button
                   >下载</el-button
                 >
                 >
                 <!--  -->
                 <!--  -->
-                <el-button class="newbut" :icon="Edit" @click="openAIdrawCase"
-                  >AI制卷</el-button
+                <el-button class="newbut" @click="openAIdrawCase"
+                  ><i
+                    style="font-size: 14px; margin-right: 5px"
+                    class="iconfont icon-AIzhuapai"
+                  />
+
+                  AI制卷</el-button
                 >
                 >
               </div>
               </div>
               <div
               <div
@@ -572,14 +577,14 @@ const ImgsrcList = ref([]);
 const active1 = ref("现场图");
 const active1 = ref("现场图");
 const active = ref(true);
 const active = ref(true);
 const urlindex = ref(-1);
 const urlindex = ref(-1);
-const selectNum = ref(null)
+const selectNum = ref(null);
 const canvas = ref(null);
 const canvas = ref(null);
 const editor = ref(null);
 const editor = ref(null);
 
 
 const tabsRef = ref(null);
 const tabsRef = ref(null);
 const showText = ref(show.value ? false : true);
 const showText = ref(show.value ? false : true);
 const settype = ref(false);
 const settype = ref(false);
-const loadingAiPhone = ref()
+const loadingAiPhone = ref();
 const childrenList = ref({
 const childrenList = ref({
   list: [],
   list: [],
   value: "",
   value: "",
@@ -1157,7 +1162,7 @@ async function frameLoad(sdk, num) {
     const player = sdk.core.get("Player");
     const player = sdk.core.get("Player");
     sdk.Scene.on("loaded", () => {
     sdk.Scene.on("loaded", () => {
       // if (isTest) {
       // if (isTest) {
-        player.model.panos.list.forEach((pano) => pano.addLabel2());
+      player.model.panos.list.forEach((pano) => pano.addLabel2());
       // } else {
       // } else {
       //   sdk.core.get("SceneRenderer").suspend();
       //   sdk.core.get("SceneRenderer").suspend();
       // }
       // }
@@ -1166,14 +1171,20 @@ async function frameLoad(sdk, num) {
     const jsonContent = await sdk.Camera.routeSnapGenerate();
     const jsonContent = await sdk.Camera.routeSnapGenerate();
     console.log("返回数据", list);
     console.log("返回数据", list);
     const iframe = document.getElementById("iframe-outside");
     const iframe = document.getElementById("iframe-outside");
-    iframe?.classList.remove('show');
+    iframe?.classList.remove("show");
     let res = await casePhotoUpImage({
     let res = await casePhotoUpImage({
       caseId: caseId.value,
       caseId: caseId.value,
       num,
       num,
       jsonContent,
       jsonContent,
     });
     });
     console.log("返回数据1", res);
     console.log("返回数据1", res);
+    ElMessageBox.confirm(
+      `AI制卷将基于实景三维已有痕迹物证数据自动提取重点、
+概貌、方位照片,并制卷。需要一定时间。完成后可编辑调整。`,
+      "提示"
+    );
     loadingAiPhone.value.close();
     loadingAiPhone.value.close();
+    getList(true);
   } catch (error) {
   } catch (error) {
     console.log("捕获到错误", error);
     console.log("捕获到错误", error);
     loadingAiPhone.value.close();
     loadingAiPhone.value.close();
@@ -1183,7 +1194,6 @@ async function frameLoad(sdk, num) {
     });
     });
   }
   }
 
 
-  
   // sdk.Scene.whenLoaded(()=>{
   // sdk.Scene.whenLoaded(()=>{
   //     console.log("返回数据",sdk.Camera.getPose())
   //     console.log("返回数据",sdk.Camera.getPose())
   // })
   // })
@@ -1191,8 +1201,17 @@ async function frameLoad(sdk, num) {
 async function openAIdrawCase() {
 async function openAIdrawCase() {
   const { num } = await tableModelScene({ numList: [] });
   const { num } = await tableModelScene({ numList: [] });
   selectNum.value = num;
   selectNum.value = num;
-  handleAIdrawCasePhotos(num);
-  console.log("返回数据", num);
+  let item = casePhotoList.value.find((ele) => ele.num == num);
+  if (
+    item &&
+    item.num &&
+    (await ElMessageBox.confirm(
+      `当前现场已存在照片卷:${item.name},是否覆盖已有制卷结果?`,
+      "提示"
+    ))
+  ) {
+    handleAIdrawCasePhotos(num);
+  }
 }
 }
 function handleAIdrawCasePhotos(num) {
 function handleAIdrawCasePhotos(num) {
   const iframe = document.getElementById("iframe-outside");
   const iframe = document.getElementById("iframe-outside");