Hwf 7 місяців тому
батько
коміт
cac340db84

BIN
src/assets/images/map/rightMenu/ironTower/boxBg.png


+ 1 - 1
src/components/Map/index.vue

@@ -413,7 +413,7 @@ onUnmounted(() => {
   }
   .right-tool {
     position: absolute;
-    bottom: 110px;
+    bottom: 100px;
     right: 175px;
     z-index: 2;
   }

+ 1 - 1
src/components/TimeAxis/index.vue

@@ -191,7 +191,7 @@ const dialogClose = () => {
 
 // 拖拽的参数
 const dragState = reactive({
-  bottom: 110,
+  bottom: 100,
   left: 200,
   dragging: false,
   startX: 20,

+ 1 - 4
src/types/components.d.ts

@@ -23,8 +23,6 @@ declare module 'vue' {
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -51,8 +49,6 @@ declare module 'vue' {
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -104,6 +100,7 @@ declare module 'vue' {
     VideoContainer: typeof import('./../components/HKVideo/video-container.vue')['default']
     VideoContainer2: typeof import('./../components/HKVideo/video-container2.vue')['default']
     YMap: typeof import('./../components/Map/YMap.vue')['default']
+    YMapold: typeof import('./../components/Map/YMapold.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
   export interface ComponentCustomProperties {

+ 2 - 2
src/views/emergencyCommandMap/index.vue

@@ -86,7 +86,7 @@ onUnmounted(() => {
 }
 .left-icon {
   position: absolute;
-  bottom: 110px;
+  bottom: 100px;
   left: 0;
   z-index: 9;
   width: 152px;
@@ -98,7 +98,7 @@ onUnmounted(() => {
 
 .right-icon {
   position: absolute;
-  bottom: 110px;
+  bottom: 100px;
   right: 0;
   z-index: 9;
   width: 152px;

+ 2 - 2
src/views/globalMap/RightMenu/DrawTools.vue

@@ -345,8 +345,8 @@ const analysisSpatial = (data) => {
 <style lang="scss" scoped>
 .draw-tools-container {
   position: absolute;
-  right: 255px;
-  bottom: 390px;
+  right: 340px;
+  bottom: 370px;
   background-color: #304468;
   border-radius: 5px;
   display: flex;

+ 13 - 12
src/views/globalMap/RightMenu/SpatialAnalysis.vue

@@ -23,7 +23,7 @@
         <div class="item-value">{{ validateNum(analysisData.GDP) }}</div>
       </div>
       <div class="flex" style="margin: 20px 0; width: 100%">
-        <el-input v-model="keyword" size="large" style="flex: 1" />
+        <el-input v-model="keyword" class="custom-input2" placeholder="请输入" size="large" style="flex: 1" />
       </div>
       <div class="flex">
         <div v-for="(item, index) in filteredList" :key="index" class="item2">{{ item.name + '(' + item.list.length + ')' }}</div>
@@ -133,24 +133,25 @@ watch(
   padding: 15px;
   display: flex;
   flex-wrap: wrap;
+  margin-top: 20px;
   .item {
-    width: calc(33.333333%);
-    height: 100px;
-    background-color: #fff;
-    border-left: 1px solid #000;
-    border-top: 1px solid #000;
+    //width: calc(33.333333%);
+    width: 342px;
+    height: 160px;
+    background: url('@/assets/images/map/rightMenu/ironTower/boxBg.png') no-repeat;
+    background-size: 100% 100%;
+    color: #fff;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    font-size: 36px;
-    &:nth-child(3),
-    &:nth-child(4),
-    &:nth-child(5) {
-      border-bottom: 1px solid #000;
+    font-size: 38px;
+    margin-right: 47px;
+    &:nth-child(4) {
+      margin-right: 0;
     }
     &:nth-child(5) {
-      border-right: 1px solid #000;
+      margin-top: 20px;
     }
     .item-label {
       margin-bottom: 18px;

+ 2 - 2
src/views/globalMap/index.vue

@@ -194,8 +194,8 @@ provide('getDrawTool', getDrawTool);
   //overflow: hidden;
   .tool-box {
     position: absolute;
-    right: 270px;
-    bottom: 110px;
+    right: 340px;
+    bottom: 100px;
     z-index: 10;
     color: #fff;
   }

+ 2 - 2
src/views/routineCommandMap/index.vue

@@ -86,7 +86,7 @@ onUnmounted(() => {
 }
 .left-icon {
   position: absolute;
-  bottom: 110px;
+  bottom: 100px;
   left: 0;
   z-index: 9;
   width: 152px;
@@ -98,7 +98,7 @@ onUnmounted(() => {
 
 .right-icon {
   position: absolute;
-  bottom: 110px;
+  bottom: 100px;
   right: 0;
   z-index: 9;
   width: 152px;