飞行漫游

src/renderer/public/sdk/custom/css/index.css

@@ -3461,7 +3461,7 @@
 
 .YJ-custom-checkbox-left:checked::after,
 .YJ-custom-checkbox-right:checked::after {
-  content: "\2714";
+  content: "✔";
   background-color: rgba(var(--color-base1), 1);
   color: rgba(var(--color-sdk-auxiliary), 1);
   width: 25px;
@@ -3496,7 +3496,7 @@
 }
 
 .YJ-custom-base-dialog>.content input.YJ-custom-checkbox[type=checkbox]:checked::after {
-  content: "\2714";
+  content: "✔";
   background-color: rgba(var(--color-base1), 1);
   color: rgba(var(--color-sdk-auxiliary), 1);
   width: 12px;

src/renderer/public/sdk/custom/img/icon-delete.svg

@@ -1,8 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15.65869140625" height="16" viewBox="0 0 15.65869140625 16" fill="none"><path d="M14.9742 4.33334L0.682905 4.33334C0.308133 4.33334 0 4.03334 0 3.66666C0 3.3 0.308133 3 0.682905 3L14.9742 3C15.349 3 15.6571 3.3 15.6571 3.66666C15.6571 4.03334 15.349 4.33334 14.9742 4.33334Z"   fill="#FFFFFF" ></path><path d="M6.02972 3.48334C6.01307 3.38334 6.00474 3.275 6.00474 3.16666C6.00474 2.15834 6.82924 1.33334 7.83697 1.33334C8.84469 1.33334 9.66919 2.15834 9.66919 3.16666C9.66919 3.275 9.66086 3.375 9.64421 3.48334L10.9851 3.48334C10.9934 3.38334 11.0017 3.275 11.0017 3.16666C11.0017 1.41666 9.5859 0 7.83697 0C6.08803 0 4.67223 1.41666 4.67223 3.16666C4.67223 3.275 4.68054 3.375 4.68888 3.48334L6.02972 3.48334ZM12.4925 3.64166L12.4925 14.6667L3.16481 14.6667L3.16481 3.64166L1.83228 3.64166L1.83228 14.9583C1.83228 15.5333 2.29867 16 2.87332 16L12.784 16C13.3586 16 13.825 15.5333 13.825 14.9583L13.825 3.64166L12.4925 3.64166Z"   fill="#FFFFFF" ></path><path d="M5.50491 12.4834L5.48826 12.4834C5.12182 12.4834 4.83032 12.1917 4.83032 11.8251L4.83032 7.14172C4.83032 6.77506 5.12182 6.4834 5.48826 6.4834L5.50491 6.4834C5.87137 6.4834 6.16285 6.77506 6.16285 7.14172L6.16285 11.8334C6.16285 12.1917 5.87137 12.4834 5.50491 12.4834ZM7.83683 12.4834L7.82018 12.4834C7.45373 12.4834 7.16224 12.1917 7.16224 11.8251L7.16224 7.14172C7.16224 6.77506 7.45373 6.4834 7.82018 6.4834L7.83683 6.4834C8.20327 6.4834 8.49477 6.77506 8.49477 7.14172L8.49477 11.8334C8.49477 12.1917 8.20327 12.4834 7.83683 12.4834ZM10.1688 12.4834L10.1521 12.4834C9.78565 12.4834 9.49417 12.1917 9.49417 11.8251L9.49417 7.14172C9.49417 6.77506 9.78565 6.4834 10.1521 6.4834L10.1688 6.4834C10.5352 6.4834 10.8267 6.77506 10.8267 7.14172L10.8267 11.8334C10.8267 12.1917 10.5352 12.4834 10.1688 12.4834Z"   fill="#FFFFFF" ></path></svg>
-<path d="M11.3166 3.25L0.598117 3.25C0.317037 3.25 0.0859375 3.025 0.0859375 2.74999C0.0859375 2.475 0.317037 2.25 0.598117 2.25L11.3166 2.25C11.5977 2.25 11.8288 2.475 11.8288 2.74999C11.8288 3.025 11.5977 3.25 11.3166 3.25Z" >
-</path>
-<path d="M4.60805 2.6125C4.59556 2.5375 4.58931 2.45625 4.58931 2.37499C4.58931 1.61875 5.20768 1 5.96348 1C6.71927 1 7.33765 1.61875 7.33765 2.37499C7.33765 2.45625 7.3314 2.53125 7.31891 2.6125L8.32454 2.6125C8.3308 2.5375 8.33703 2.45625 8.33703 2.37499C8.33703 1.06249 7.27518 0 5.96348 0C4.65178 0 3.58993 1.06249 3.58993 2.37499C3.58993 2.45625 3.59616 2.53125 3.60241 2.6125L4.60805 2.6125ZM9.45511 2.73124L9.45511 11L2.45936 11L2.45936 2.73124L1.45996 2.73124L1.45996 11.2188C1.45996 11.65 1.80976 12 2.24075 12L9.67372 12C10.1047 12 10.4545 11.65 10.4545 11.2188L10.4545 2.73124L9.45511 2.73124Z" >
-</path>
-<path d="M4.21395 9.36328L4.20146 9.36328C3.92663 9.36328 3.70801 9.14452 3.70801 8.86952L3.70801 5.35702C3.70801 5.08203 3.92663 4.86328 4.20146 4.86328L4.21395 4.86328C4.48879 4.86328 4.70741 5.08203 4.70741 5.35702L4.70741 8.87578C4.70741 9.14452 4.48879 9.36328 4.21395 9.36328ZM5.96289 9.36328L5.9504 9.36328C5.67556 9.36328 5.45695 9.14452 5.45695 8.86952L5.45695 5.35702C5.45695 5.08203 5.67556 4.86328 5.9504 4.86328L5.96289 4.86328C6.23772 4.86328 6.45635 5.08203 6.45635 5.35702L6.45635 8.87578C6.45635 9.14452 6.23772 9.36328 5.96289 9.36328ZM7.71183 9.36328L7.69933 9.36328C7.4245 9.36328 7.20589 9.14452 7.20589 8.86952L7.20589 5.35702C7.20589 5.08203 7.4245 4.86328 7.69933 4.86328L7.71183 4.86328C7.98666 4.86328 8.20527 5.08203 8.20527 5.35702L8.20527 8.87578C8.20527 9.14452 7.98666 9.36328 7.71183 9.36328Z" >
-</path>
-</svg>

src/renderer/src/views/components/leftSide/leftSideSecond.vue

@@ -810,7 +810,7 @@ const methodMap = {
   //模型压平
   pressModel() {
     if ((window as any).checkAuthIsValid) {
-      let selectedNode = window.treeObj.getSelectedNodes()[0]
+      let selectedNode = window.treeObj?.getSelectedNodes()[0]
       if (selectedNode) {
         let isTileset = ['bim', 'tileset'].includes(selectedNode.sourceType)
         if (!isTileset) {

src/renderer/src/views/components/propertyBox/FlyRoam.vue

@@ -14,9 +14,9 @@
         <div class="row">
           <div class="col" style="flex: 0 0 205px">
             <span class="label">名称</span>
-            <input class="input" type="text" name="name" />
+            <input class="input" type="text" name="name" placeholder="请输入名称" />
           </div>
-          <div class="col">
+          <!-- <div class="col">
             <input
               type="checkbox"
               name="repeat"
@@ -30,7 +30,7 @@
               "
             />
             <span class="label">循环播放</span>
-          </div>
+          </div> -->
         </div>
       </div>
       <span class="custom-divider"></span>
@@ -95,14 +95,14 @@
               <svg class="icon-edit"><use xlink:href="#yj-icon-edit"></use></svg>调整视点
             </button>
           </div> -->
-          <div class="col">
+          <!-- <div class="col">
             <button class="afreshPlay">
               <svg class="icon-play"><use xlink:href="#yj-icon-play"></use></svg>全局播放
             </button>
             <button class="cease" style="margin-left: 10px">
               <svg-icon name="stop" :size="12" color="rgba(255, 255, 255, 1)"></svg-icon>结束播放
             </button>
-          </div>
+          </div> -->
           <!-- <div class="col">
             <button class="cease">
               <svg class="icon-pause"><use xlink:href="#yj-icon-pause"></use></svg>结束播放
@@ -110,8 +110,30 @@
           </div> -->
         </div>
         <div class="row">
-          <div class="col" style="flex: 0 0 200px">
+          <div class="col" style="flex: 0 0 300px">
+            <span class="label">默认时长</span>
+            <div class="input-number input-number-unit-3">
               <input
+                class="input total-time"
+                type="number"
+                title=""
+                min="0"
+                max="999999.99"
+                step="0.01"
+                name="defaultTime"
+                value="0"
+              />
+              <span class="unit" style="top: 6px">s</span>
+              <span class="arrow"></span>
+            </div>
+            <button class="add-point" style="margin-left: 10px">
+              <svg class="icon-add"><use xlink:href="#yj-icon-add"></use></svg>增加视点
+            </button>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col" style="flex: 0 0 300px">
+            <!-- <input
               type="checkbox"
               name="isTotalTime"
               style="
@@ -122,7 +144,7 @@
                 width: auto;
                 margin-right: 5px;
               "
-            />
+            /> -->
             <span class="label">设置总时长</span>
             <div class="input-number input-number-unit-3">
               <input
@@ -138,6 +160,14 @@
               <span class="unit" style="top: 6px">s</span>
               <span class="arrow"></span>
             </div>
+            <button class="isTotalTime" style="margin-left: 10px">应用</button>
+            <input
+              type="checkbox"
+              name="repeat"
+              class="YJ-custom-checkbox"
+              style="cursor: pointer; width: auto; margin-right: 5px; margin-left: 10px"
+            />
+            <span class="label">循环</span>
             <!-- <button style="margin-left: 10px" @click="apply">应用</button> -->
           </div>
         </div>
@@ -161,8 +191,11 @@
     </template>
     <template #footer>
       <div style="position: absolute; left: 24px; display: flex">
-        <button class="add-point">
+        <button class="afreshPlay">
-          <svg class="icon-add"><use xlink:href="#yj-icon-add"></use></svg>增加视点
+          <svg class="icon-play"><use xlink:href="#yj-icon-play"></use></svg>播放
+        </button>
+        <button class="cease" style="margin-left: 10px">
+          <svg-icon name="stop" :size="12" color="rgba(255, 255, 255, 1)"></svg-icon>结束
         </button>
       </div>
       <button class="saveRoam" @click="draw">保存</button>
@@ -236,8 +269,6 @@ const draw = (data) => {
       type: 'warning'
     })
   }
-
-  console.log(data)
 }
 
 const clangeViewPointHeight = () => {}
@@ -275,15 +306,28 @@ defineExpose({
     linear-gradient(0deg, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)),
     linear-gradient(180deg, rgba(27, 248, 195, 0.2) 0%, rgba(27, 248, 195, 0) 100%) !important;
   border: 1px solid rgba(27, 248, 195, 1) !important;
+  color: rgba(27, 248, 195, 1) !important;
+  svg {
+    fill: rgba(27, 248, 195, 1) !important;
+  }
 }
 .cease {
   background:
     linear-gradient(180deg, rgba(241, 108, 85, 0.2) 0%, rgba(241, 108, 85, 0) 100%),
     rgba(0, 0, 0, 0.5) !important;
   border: 1px solid rgba(241, 108, 85, 1) !important;
+  color: rgba(241, 108, 85, 1) !important;
+  svg {
+    fill: rgba(241, 108, 85, 1) !important;
+  }
 }
 ::v-deep .content input.YJ-custom-checkbox[type='checkbox'] {
   border: 1px solid rgba(var(--color-base1), 1) !important;
-  background-color: rgba(0, 0, 0, 0.5) !important;
+  background-color: unset !important;
+}
+::v-deep .iconBut {
+  background: unset !important;
+  border: unset !important;
+  padding: unset !important;
 }
 </style>

src/renderer/src/views/components/propertyBox/ProjConvert.vue

@@ -20,9 +20,26 @@
       </div>
       <div class="div-item item" data-type="0" v-show="isShowing">
         <span class="custom-divider"></span>
-        <p style="font-size: 16px; padding-bottom: 6px; margin-top: 10px; margin-bottom: 5px">
+        <p
+          style="
+            font-size: 16px;
+            padding-bottom: 6px;
+            margin-top: 10px;
+            margin-bottom: 5px;
+            display: flex;
+            justify-content: space-between;
+          "
+        >
+          <div>
             <span style="margin-right: 10px">度</span>
-          <span style="font-size: 12px; margin-bottom: 5px; color: #f16c55">例如116.6°, 39.9°</span>
+            <span style="font-size: 12px; margin-bottom: 5px; color: #f16c55"
+              >例如116.6°, 39.9°</span
+            >
+          </div>
+          <div style="display: flex; ">
+            <button class="pickUp">拾 取</button>
+            <button class="convert" style="margin-left: 10px">转 换</button>
+          </div>
         </p>
         <div class="row">
           <div class="col">
@@ -45,17 +62,23 @@
                 <use xlink:href="#yj-icon-copy"></use>
               </svg>
             </i>
-            <button class="convert" style="margin-left: 10px">转 换</button>
+            <!-- <button class="convert" style="margin-left: 10px">转 换</button> -->
           </div>
         </div>
       </div>
       <div class="div-item item" data-type="1" v-show="isShowing">
         <span class="custom-divider"></span>
-        <p style="font-size: 16px; padding-bottom: 6px; margin-top: 10px; margin-bottom: 5px">
+        <p style="font-size: 16px; padding-bottom: 6px; margin-top: 10px; margin-bottom: 5px;display: flex; justify-content: space-between;">
+          <div>
             <span style="margin-right: 10px">度分</span>
             <span style="font-size: 12px; margin-bottom: 5px; color: #f16c55"
               >例如95°10.1702', 49°12.4015'</span
             >
+          </div>
+          <div style="display: flex; ">
+            <button class="pickUp">拾 取</button>
+            <button class="convert" style="margin-left: 10px">转 换</button>
+          </div>
         </p>
         <div class="row">
           <div class="col" style="flex-direction: column">
@@ -120,17 +143,23 @@
                 <use xlink:href="#yj-icon-copy"></use>
               </svg>
             </i>
-            <button class="convert" style="margin-left: 10px">转 换</button>
+            <!-- <button class="convert" style="margin-left: 10px">转 换</button> -->
           </div>
         </div>
       </div>
       <div class="div-item item" data-type="2" v-show="isShowing">
         <span class="custom-divider"></span>
-        <p style="font-size: 16px; padding-bottom: 6px; margin-top: 10px; margin-bottom: 5px">
+        <p style="font-size: 16px; padding-bottom: 6px; margin-top: 10px; margin-bottom: 5px;display: flex; justify-content: space-between;">
+          <div>
             <span style="margin-right: 10px">度分秒</span>
             <span style="font-size: 12px; margin-bottom: 5px; color: #f16c55"
               >例如11°18'54.37", 39°13'46.57"</span
             >
+          </div>
+          <div style="display: flex; ">
+            <button class="pickUp">拾 取</button>
+            <button class="convert" style="margin-left: 10px">转 换</button>
+          </div>
         </p>
         <div class="row">
           <div class="col" style="flex-direction: column">
@@ -215,7 +244,7 @@
                 <use xlink:href="#yj-icon-copy"></use>
               </svg>
             </i>
-            <button class="convert" style="margin-left: 10px">转 换</button>
+            <!-- <button class="convert" style="margin-left: 10px">转 换</button> -->
           </div>
         </div>
       </div>

src/renderer/src/views/components/propertyBox/TerrainExcavation.vue

@@ -42,9 +42,9 @@
         </div>
       </div>
     </template>
-    <template #footer>
+    <!-- <template #footer>
       <button @click="close">关闭</button>
-    </template>
+    </template> -->
   </Dialog>
 </template>