gcz преди 2 години
родител
ревизия
820dd733bc
променени са 3 файла, в които са добавени 16 реда и са изтрити 11 реда
  1. 1 1
      src/components/echarts.vue
  2. 12 7
      src/components/numerical.vue
  3. 3 3
      src/store/addr/index.js

+ 1 - 1
src/components/echarts.vue

@@ -5,7 +5,7 @@
 <template>
   <div ref="wrap">
     <!-- <div>{{mid}}</div> -->
-    <div class="ntitle">{{option.title.text}}</div>
+    <div class="ntitle">{{$store.state.addr.selectAddr}}{{option.title.text}}</div>
     <div class="addr">{{$store.state.addr.selectAddr}}</div>
     <div :id="mid" class="echarts" :style="style"></div>
   </div>

+ 12 - 7
src/components/numerical.vue

@@ -3,13 +3,15 @@
 -->
 <template>
     <div class="numerical">
-        <div class="ntitle">{{ntitle}}</div>
-        <div class="addr">{{$store.state.addr.selectAddr}}</div>
-        <div class="item-wrap u-flex u-flex-wrap">
-            <div class="numerical-item" v-for="(item,index) in data" :key="item.name+index">
-                <div class="cell name">{{item.name}}:</div>
-                <span class="cell number">{{item.number}}</span>
-                <span class="cell unit">{{item.unit}}</span>
+        <div class="ntitle">{{$store.state.addr.selectAddr}}{{ntitle}}</div>
+        <!-- <div class="addr">{{$store.state.addr.selectAddr}}</div> -->
+        <div class="item-wrap">
+            <div class="inner u-flex u-flex-wrap">
+                <div class="numerical-item" v-for="(item,index) in data" :key="item.name+index">
+                    <div class="cell name">{{item.name}}:</div>
+                    <span class="cell number">{{item.number}}</span>
+                    <span class="cell unit">{{item.unit}}</span>
+                </div>
             </div>
         </div>
     </div>
@@ -51,6 +53,9 @@
     // padding: 20px 24px;
     // border: 1px solid var(--main-color);
     .item-wrap{
+        height: calc( 100% - 48px );
+        display:flex;
+        align-items: center;
         .numerical-item{
             padding: 0 0 15px 15px;
             box-sizing: border-box;

+ 3 - 3
src/store/addr/index.js

@@ -71,15 +71,15 @@ const addr = {
           state.selectAddr = "贵州省";
           break;
         case "city":
-          state.selectAddr = `贵州省 · ${cityName || state.selectCity.label}`;
+          state.selectAddr = `${cityName || state.selectCity.label}`;
           break;
 
         case "district":
-          state.selectAddr = `贵州省 · ${cityName || state.selectCity.label} · ${state.selectDistrict.label}`;
+          state.selectAddr = `${state.selectDistrict.label}`;
           break;
 
         case "street":
-          state.selectAddr = `贵州省 · ${cityName || state.selectCity.label} · ${state.selectDistrict.label} · ${state.selectStreet.label}`;
+          state.selectAddr = `${state.selectStreet.label}`;
           break;
 
         default: