隐藏黑暗模式

src/assets/styles/index.scss

@@ -55,10 +55,10 @@ html {
   box-sizing: border-box;
 }
 
-html.dark .svg-icon,
-html.dark svg {
-  fill: var(--el-text-color-regular);
-}
+//html.dark .svg-icon,
+//html.dark svg {
+//  fill: var(--el-text-color-regular);
+//}
 
 #app {
   height: 100%;
@@ -534,3 +534,12 @@ aside {
   left: 141px;
   font-size: 60px;
 }
+
+.amap-marker {
+  .amap-icon {
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}

src/assets/styles/variables.module.scss

@@ -22,46 +22,46 @@
   // ele
   --brder-color: #e8e8e8
 }
-html.dark {
-  --menuBg: #1d1e1f;
-  --menuColor: #bfcbd9;
-  --menuActiveText: #f4f4f5;
-  --menuHover: #171819;
-
-  --subMenuBg: #1d1e1f;
-  --subMenuActiveText: #1d1e1f;
-  --subMenuHover: #171819;
-  --subMenuTitleHover: #171819;
-
-  --fixedHeaderBg: #171819;
-  --tableHeaderBg: var(--el-bg-color);
-  --tableHeaderTextColor: var(--el-text-color);
-
-  // 覆盖ele 高亮当前行的标准暗色
-  .el-tree-node__content {
-    --el-color-primary-light-9: #262727;
-  }
-  // vxe-table 主题
-  --vxe-font-color: #98989E;
-  --vxe-primary-color: #2C7ECF;
-  --vxe-icon-background-color: #98989E;
-  --vxe-table-font-color: #98989E;
-  --vxe-table-resizable-color: #95969a;
-  --vxe-table-header-background-color: #28282A;
-  --vxe-table-body-background-color: #151518;
-  --vxe-table-background-color: #4a5663;
-  --vxe-table-border-width: 1px;
-  --vxe-table-border-color: #37373A;
-  --vxe-toolbar-background-color: #37373A;
-
-  // 工作流
-  --bpmn-panel-border: #37373A;
-  --bpmn-panel-box-shadow: #37373A;
-  --bpmn-panel-bar-background-color: #37373A;
-
-  // ele
-  --brder-color: #37373A
-}
+//html.dark {
+//  --menuBg: #1d1e1f;
+//  --menuColor: #bfcbd9;
+//  --menuActiveText: #f4f4f5;
+//  --menuHover: #171819;
+//
+//  --subMenuBg: #1d1e1f;
+//  --subMenuActiveText: #1d1e1f;
+//  --subMenuHover: #171819;
+//  --subMenuTitleHover: #171819;
+//
+//  --fixedHeaderBg: #171819;
+//  --tableHeaderBg: var(--el-bg-color);
+//  --tableHeaderTextColor: var(--el-text-color);
+//
+//  // 覆盖ele 高亮当前行的标准暗色
+//  .el-tree-node__content {
+//    --el-color-primary-light-9: #262727;
+//  }
+//  // vxe-table 主题
+//  --vxe-font-color: #98989E;
+//  --vxe-primary-color: #2C7ECF;
+//  --vxe-icon-background-color: #98989E;
+//  --vxe-table-font-color: #98989E;
+//  --vxe-table-resizable-color: #95969a;
+//  --vxe-table-header-background-color: #28282A;
+//  --vxe-table-body-background-color: #151518;
+//  --vxe-table-background-color: #4a5663;
+//  --vxe-table-border-width: 1px;
+//  --vxe-table-border-color: #37373A;
+//  --vxe-toolbar-background-color: #37373A;
+//
+//  // 工作流
+//  --bpmn-panel-border: #37373A;
+//  --bpmn-panel-box-shadow: #37373A;
+//  --bpmn-panel-bar-background-color: #37373A;
+//
+//  // ele
+//  --brder-color: #37373A
+//}
 
 // base color
 $blue: #324157;

src/components/LineWidthSelect/index.vue

@@ -18,7 +18,7 @@ interface Props {
   options: object[];
 }
 const props = withDefaults(defineProps<Props>(), {});
-const emits = defineEmits('update:modelValue');
+const emits = defineEmits(['update:modelValue']);
 
 let show = ref();
 const handleShow = () => {

src/views/globalMap/RightMenu/OnlinePlotting/index.vue

@@ -69,14 +69,14 @@
       </div>
     </div>
     <div v-else-if="menuActive1 === 1" class="tab-content3">
-      <div class="box1">
-        <div class="box-item">
-          <div class="btn">
-            <div class="merge-icon"></div>
-            合并
-          </div>
-        </div>
-      </div>
+<!--      <div class="box1">-->
+<!--        <div class="box-item">-->
+<!--          <div class="btn">-->
+<!--            <div class="merge-icon"></div>-->
+<!--            合并-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
       <div class="params-box">
         <el-input v-model="queryParams.pattern_name" class="custom-input" placeholder="请输入" @input="handleQuery">
           <template #prefix>
@@ -103,11 +103,11 @@
               <div class="edit-icon"></div>
               编辑
             </div>
-            <div class="line2"></div>
-            <div class="btn">
-              <div class="share-icon"></div>
-              分享
-            </div>
+<!--            <div class="line2"></div>-->
+<!--            <div class="btn">-->
+<!--              <div class="share-icon"></div>-->
+<!--              分享-->
+<!--            </div>-->
           </div>
         </div>
         <div class="footer">
@@ -248,13 +248,13 @@ const menu = ref([
           { name: '细箭头', value: 'marker', image: getImageUrl('thinarrow'), icon: getImageUrl('thinarrow'), size: [166, 88] }
         ]
       },
-      {
-        name: '导航',
-        value: 'navigation',
-        children: [
-          { name: '导航', value: 'marker', image: getImageUrl('navigation'), icon: getImageUrl('navigation'), size: [166, 88] }
-        ]
-      },
+      // {
+      //   name: '导航',
+      //   value: 'navigation',
+      //   children: [
+      //     { name: '导航', value: 'marker', image: getImageUrl('navigation'), icon: getImageUrl('navigation'), size: [166, 88] }
+      //   ]
+      // },
       {
         name: '扑救队伍',
         value: 'firefightingTeam',
@@ -266,7 +266,7 @@ const menu = ref([
           { name: '武警', value: 'marker', image: getImageUrl('armedpolice'), icon: getImageUrl('armedpolice'), size: [166, 88] },
           { name: '森林警察', value: 'marker', image: getImageUrl('forestpoliceman'), icon: getImageUrl('forestpoliceman'), size: [166, 88] },
           { name: '扑火队伍', value: 'marker', image: getImageUrl('firefightingteam'), icon: getImageUrl('firefightingteam'), size: [166, 88] },
-          { name: '扑火队伍路线', value: 'marker', image: getImageUrl('Firefightingteamroute'), icon: getImageUrl('Firefightingteamroute'), size: [166, 88] }
+          // { name: '扑火队伍路线', value: 'marker', image: getImageUrl('Firefightingteamroute'), icon: getImageUrl('Firefightingteamroute'), size: [166, 88] }
         ]
       },
       {
@@ -293,20 +293,20 @@ const menu = ref([
 
         ]
       },
-      {
-        name: '其他',
-        value: 'other',
-        children: [
-          { name: '危险区域', value: 'marker', image: getImageUrl('dangerousarea'), icon: getImageUrl('dangerousarea'), size: [166, 88] },
-          { name: '隔离带开采', value: 'marker', image: getImageUrl('Isolationzonemining'), icon: getImageUrl('Isolationzonemining'), size: [166, 88] },
-          { name: '应急庇护场所', value: 'marker', image: getImageUrl('emergencyshelter'), icon: getImageUrl('emergencyshelter'), size: [166, 88] },
-          { name: '风力风向', value: 'marker', image: getImageUrl('windspeedanddirection'), icon: getImageUrl('windspeedanddirection'), size: [166, 88] },
-          { name: '测距', value: 'marker', image: getImageUrl('ranging'), icon: getImageUrl('ranging'), size: [166, 88] },
-          { name: '大风', value: 'marker', image: getImageUrl('strongwind'), icon: getImageUrl('strongwind'), size: [166, 88] },
-          { name: '人工降雨', value: 'marker', image: getImageUrl('artificialrainfall'), icon: getImageUrl('artificialrainfall'), size: [166, 88] },
-          { name: '台风', value: 'marker', image: getImageUrl('typhoon'), icon: getImageUrl('typhoon'), size: [166, 88] }
-        ]
-      }
+      // {
+      //   name: '其他',
+      //   value: 'other',
+      //   children: [
+      //     { name: '危险区域', value: 'marker', image: getImageUrl('dangerousarea'), icon: getImageUrl('dangerousarea'), size: [166, 88] },
+      //     { name: '隔离带开采', value: 'marker', image: getImageUrl('Isolationzonemining'), icon: getImageUrl('Isolationzonemining'), size: [166, 88] },
+      //     { name: '应急庇护场所', value: 'marker', image: getImageUrl('emergencyshelter'), icon: getImageUrl('emergencyshelter'), size: [166, 88] },
+      //     { name: '风力风向', value: 'marker', image: getImageUrl('windspeedanddirection'), icon: getImageUrl('windspeedanddirection'), size: [166, 88] },
+      //     { name: '测距', value: 'marker', image: getImageUrl('ranging'), icon: getImageUrl('ranging'), size: [166, 88] },
+      //     { name: '大风', value: 'marker', image: getImageUrl('strongwind'), icon: getImageUrl('strongwind'), size: [166, 88] },
+      //     { name: '人工降雨', value: 'marker', image: getImageUrl('artificialrainfall'), icon: getImageUrl('artificialrainfall'), size: [166, 88] },
+      //     { name: '台风', value: 'marker', image: getImageUrl('typhoon'), icon: getImageUrl('typhoon'), size: [166, 88] }
+      //   ]
+      // }
     ]
   },
   {