瀏覽代碼

样式调整

Hwf 8 月之前
父節點
當前提交
4f20103d75

二進制
src/assets/images/emergencyCommandMap/disasterInfo/durationBg.png


二進制
src/assets/images/map/bg-active.png


二進制
src/assets/images/map/bg-default.png


+ 0 - 0
src/assets/images/map/preview1.png → src/assets/images/map/logical.png


二進制
src/assets/images/map/satellite.png


二進制
src/assets/images/map/satellite2.png


二進制
src/assets/images/map/satellite3.png


二進制
src/assets/images/map/switchBox.png


二進制
src/assets/images/map/vectorgraph.png


+ 18 - 19
src/components/DictTag/index.vue

@@ -3,31 +3,30 @@
     <template v-for="(item, index) in options">
       <template v-if="values.includes(item.value)">
         <span
-          v-if="(item.elTagType === 'default' || item.elTagType === '') && (item.elTagClass === '' || item.elTagClass == null)"
           :key="item.value"
           :index="index"
           :class="item.elTagClass"
         >
           {{ item.label + ' ' }}
         </span>
-        <el-tag
-          v-else
-          :key="item.value + ''"
-          :disable-transitions="true"
-          :index="index"
-          :type="
-            item.elTagType === 'primary' ||
-            item.elTagType === 'success' ||
-            item.elTagType === 'info' ||
-            item.elTagType === 'warning' ||
-            item.elTagType === 'danger'
-              ? item.elTagType
-              : 'primary'
-          "
-          :class="item.elTagClass"
-        >
-          {{ item.label + ' ' }}
-        </el-tag>
+<!--        <el-tag-->
+<!--          v-else-->
+<!--          :key="item.value + ''"-->
+<!--          :disable-transitions="true"-->
+<!--          :index="index"-->
+<!--          :type="-->
+<!--            item.elTagType === 'primary' ||-->
+<!--            item.elTagType === 'success' ||-->
+<!--            item.elTagType === 'info' ||-->
+<!--            item.elTagType === 'warning' ||-->
+<!--            item.elTagType === 'danger'-->
+<!--              ? item.elTagType-->
+<!--              : 'primary'-->
+<!--          "-->
+<!--          :class="item.elTagClass"-->
+<!--        >-->
+<!--          {{ item.label + ' ' }}-->
+<!--        </el-tag>-->
       </template>
     </template>
     <template v-if="unmatch && showValue">

+ 6 - 4
src/views/emergencyCommandMap/LeftSection/index.vue

@@ -423,10 +423,12 @@ onUnmounted(() => {
           margin-top: 35px;
           .text1 {
             font-size: 32px;
+            line-height: 32px;
             color: #a7ccdf;
           }
           .text2 {
             font-size: 36px;
+            line-height: 36px;
             color: #ffffff;
           }
         }
@@ -434,8 +436,8 @@ onUnmounted(() => {
     }
   }
   .duration-box {
-    width: 893px;
-    height: 224px;
+    width: 662px;
+    height: 140px;
     margin-top: 160px;
     margin-left: 22px;
     background: url('@/assets/images/emergencyCommandMap/disasterInfo/durationBg.png');
@@ -464,10 +466,10 @@ onUnmounted(() => {
         display: inline-block;
         font-family: 'BEBAS-1';
         font-size: 50px;
-        width: 150px;
+        width: 100px;
         text-align: center;
         &:first-child {
-          width: 70px;
+          width: 50px;
           text-align: left;
         }
       }

+ 1 - 0
src/views/emergencyCommandMap/MiddleSection.vue

@@ -23,6 +23,7 @@ const handleQuery1 = () => {
   flex: 1;
   height: 2140px;
   animation: slideAndFade 1.5s;
+  position: relative;
 }
 .btn-box {
   position: absolute;

+ 1 - 1
src/views/emergencyCommandMap/RightSection/index.vue

@@ -194,7 +194,7 @@ const updatePlan = (data: { eventId: string }) => {
         background: url('@/assets/images/emergencyCommandMap/icon5.png') no-repeat 100% 100%;
       }
       .task-text gradient-text {
-        font-size: 60px !important;
+        font-size: 48px !important;
       }
     }
   }

+ 18 - 6
src/views/globalMap/SwitchMapTool.vue

@@ -10,8 +10,8 @@
           class="switch-item"
           @click="selectItem(item.key)"
         >
-          <div class="item-bg1">
-            <div :class="activeMap === 'logical' ? 'item-text bg-active' : 'item-text'">{{ item.name }}</div>
+          <div :class="'item-bg1 ' + item.key">
+            <div :class="activeMap === item.key ? 'item-text bg-active' : 'item-text'">{{ item.name }}</div>
           </div>
         </div>
       </div>
@@ -32,7 +32,7 @@ const mapData = ref([
   { name: '矢量地图', key: 'vectorgraph' },
   { name: '卫星地图', key: 'satellite' },
   { name: '粤政图', key: 'satellite2' },
-  { name: '粤政图2', key: 'satellite3' },
+  { name: '粤政图2', key: 'satellite3' }
 ]);
 let open = ref(false);
 const selectItem = (key) => {
@@ -84,7 +84,6 @@ const handleExpand = () => {
     font-size: 32px;
     font-weight: 700;
     text-wrap: wrap;
-    font-family: 'SourceHanSansCN';
     word-wrap: break-word;
     word-break: break-all;
   }
@@ -113,11 +112,24 @@ const handleExpand = () => {
     position: relative;
     width: 323px;
     height: 222px;
-    background-size: cover;
     cursor: pointer;
-    background: url('@/assets/images/map/preview1.png') no-repeat;
     background-size: 100% 100%;
   }
+  .logical {
+    background: url('@/assets/images/map/logical.png') no-repeat;
+  }
+  .vectorgraph {
+    background: url('@/assets/images/map/vectorgraph.png') no-repeat;
+  }
+  .satellite {
+    background: url('@/assets/images/map/satellite.png') no-repeat;
+  }
+  .satellite2 {
+    background: url('@/assets/images/map/satellite2.png') no-repeat;
+  }
+  .satellite3 {
+    background: url('@/assets/images/map/satellite3.png') no-repeat;
+  }
   .item-text {
     position: absolute;
     right: 0;