CzRger 4 天之前
父节点
当前提交
7d043ceb55
共有 4 个文件被更改,包括 15 次插入20 次删除
  1. 0 1
      src/stores/ship-map/ship-map.ts
  2. 10 17
      src/style/cus.scss
  3. 4 1
      src/views/web/index.vue
  4. 1 1
      src/views/web/track/index.vue

+ 0 - 1
src/stores/ship-map/ship-map.ts

@@ -446,7 +446,6 @@ export const useShipMapStore = defineStore('shipMap', () => {
       if (state.warningOpen) {
         try {
           const json = JSON.parse(e.data)
-          console.log(json)
           state.warningInfo = json
         } catch (e) {
         }

+ 10 - 17
src/style/cus.scss

@@ -651,26 +651,19 @@ em {
     font-size: 16px !important;
   }
 }
-.el-input {
-  .el-input__wrapper {
-    background-color: transparent !important;
-    box-shadow: none !important;
-    border: 1px solid rgba(174, 208, 255, 1) !important;
-    .el-input__inner {
-      color: #ffffff !important;
-    }
-  }
-  &.is-disabled {
-    .el-input__inner {
-      -webkit-text-fill-color: #ffffff !important;
-    }
-  }
-}
-.el-color-picker__panel {
+.link_input, .link_datetime, .link_number {
   .el-input {
     .el-input__wrapper {
+      background-color: transparent !important;
+      box-shadow: none !important;
+      border: 1px solid rgba(174, 208, 255, 1) !important;
+      .el-input__inner {
+        color: #ffffff !important;
+      }
+    }
+    &.is-disabled {
       .el-input__inner {
-        color: #606266 !important;
+        -webkit-text-fill-color: #ffffff !important;
       }
     }
   }

+ 4 - 1
src/views/web/index.vue

@@ -33,7 +33,7 @@
           content="搜索"
           placement="right"
         >
-          <div class="tools-item __hover">
+          <div class="tools-item __hover" @click="state.tools.showSearch = !state.tools.showSearch">
             <img src="@/assets/images/web/tools-search.png"/>
           </div>
         </el-tooltip>
@@ -70,6 +70,7 @@
       <warningCom v-model:show="state.tools.showWarning"/>
       <exampleCom v-if="state.mapFunc" v-model:show="state.tools.showExample" :mapHeight="state.mapFunc.mapHeight" :mapWidth="state.mapFunc.mapWidth"/>
       <trackCom v-model:show="state.tools.showTrack"/>
+      <searchCom v-model:show="state.tools.showSearch"/>
       <trackPointCom ref="ref_trackPoint"/>
       <trackArchiveCom/>
     </div>
@@ -84,6 +85,7 @@ import configCom from './config/index.vue'
 import archiveCom from './archive/index.vue'
 import warningCom from './warning/index.vue'
 import trackCom from './track/index.vue'
+import searchCom from './search/index.vue'
 import exampleCom from './example.vue'
 import trackArchiveCom from './track/archive.vue'
 import {useShipMapStore} from "@/stores";
@@ -100,6 +102,7 @@ const state: any = reactive({
     showArchive: false,
     showWarning: false,
     showExample: false,
+    showSearch: true,
   },
 })
 const ref_web = ref()

+ 1 - 1
src/views/web/track/index.vue

@@ -87,7 +87,7 @@ const handleColor = (value) => {
 <style lang="scss" scoped>
 $mapHeight: var(--easy-map-height);
 .swm-track-com {
-  max-height: calc($mapHeight - 40px - 20px);
+  max-height: calc($mapHeight - 250px);
   display: flex;
   flex-direction: column;
   padding: 16px 8px;