Просмотр исходного кода

Merge branch 'feature_20260402_指标修改' into uat(dev)

zhujindu 1 неделя назад
Родитель
Сommit
e7afeaeefd
2 измененных файлов с 15 добавлено и 12 удалено
  1. 8 6
      src/views/home/HomeTarget.vue
  2. 7 6
      src/views/week/target.vue

+ 8 - 6
src/views/home/HomeTarget.vue

@@ -116,11 +116,10 @@
                     width: category.name ? '49%' : '100%',
                     width: category.name ? '49%' : '100%',
                     float: category.name ? 'left' : 'none',
                     float: category.name ? 'left' : 'none',
                   }">
                   }">
-                  <van-col
-                    span="20"
-                    :class="index % 2 === 0 ? 'leftTitle' : 'rightTitle'"
-                    v-if="category.name">
-                    <span>{{ category.name }}</span>
+                  <van-col span="20" v-if="category.name">
+                    <span :class="index % 2 === 0 ? 'leftTitle' : 'rightTitle'">{{
+                      category.name
+                    }}</span>
                   </van-col>
                   </van-col>
 
 
                   <!-- 内层循环:遍历各个统计项 -->
                   <!-- 内层循环:遍历各个统计项 -->
@@ -151,6 +150,7 @@
                 <!-- 内层循环:遍历各个统计项 -->
                 <!-- 内层循环:遍历各个统计项 -->
                 <div v-for="(item, idx) in category.children" :key="idx">
                 <div v-for="(item, idx) in category.children" :key="idx">
                   <van-col :span="24">
                   <van-col :span="24">
+                    <p v-if="item.indicatorDate" style="color: #999">{{ item.indicatorDate }}</p>
                     <p>
                     <p>
                       {{ item.name }}:<span
                       {{ item.name }}:<span
                         :style="labelStyle(item.clickable)"
                         :style="labelStyle(item.clickable)"
@@ -398,6 +398,7 @@ export default {
   display: inline-block;
   display: inline-block;
   padding: 0 4px;
   padding: 0 4px;
   border-radius: 2px;
   border-radius: 2px;
+  margin-top: 10px;
 }
 }
 
 
 .rightTitle {
 .rightTitle {
@@ -407,6 +408,7 @@ export default {
   padding: 0 4px;
   padding: 0 4px;
   border-radius: 2px;
   border-radius: 2px;
   white-space: nowrap;
   white-space: nowrap;
+  margin-top: 10px;
 }
 }
 </style>
 </style>
 <style lang="scss">
 <style lang="scss">
@@ -435,7 +437,7 @@ export default {
 
 
 .linep .van-cell__title {
 .linep .van-cell__title {
   color: #1e5398;
   color: #1e5398;
-  font-weight: 500;
+  font-weight: 600;
   font-size: 16px;
   font-size: 16px;
 }
 }
 
 

+ 7 - 6
src/views/week/target.vue

@@ -115,11 +115,10 @@
                     width: category.name ? '49%' : '100%',
                     width: category.name ? '49%' : '100%',
                     float: category.name ? 'left' : 'none',
                     float: category.name ? 'left' : 'none',
                   }">
                   }">
-                  <van-col
-                    span="20"
-                    :class="index % 2 === 0 ? 'leftTitle' : 'rightTitle'"
-                    v-if="category.name">
-                    <span>{{ category.name }}</span>
+                  <van-col span="20" v-if="category.name">
+                    <span :class="index % 2 === 0 ? 'leftTitle' : 'rightTitle'">{{
+                      category.name
+                    }}</span>
                   </van-col>
                   </van-col>
 
 
                   <!-- 内层循环:遍历各个统计项 -->
                   <!-- 内层循环:遍历各个统计项 -->
@@ -397,6 +396,7 @@ export default {
   display: inline-block;
   display: inline-block;
   padding: 0 4px;
   padding: 0 4px;
   border-radius: 2px;
   border-radius: 2px;
+  margin-top: 10px;
 }
 }
 
 
 .rightTitle {
 .rightTitle {
@@ -406,6 +406,7 @@ export default {
   padding: 0 4px;
   padding: 0 4px;
   border-radius: 2px;
   border-radius: 2px;
   white-space: nowrap;
   white-space: nowrap;
+  margin-top: 10px;
 }
 }
 </style>
 </style>
 <style lang="scss">
 <style lang="scss">
@@ -434,7 +435,7 @@ export default {
 
 
 .linep .van-cell__title {
 .linep .van-cell__title {
   color: #1e5398;
   color: #1e5398;
-  font-weight: 500;
+  font-weight: 600 !important;
   font-size: 16px;
   font-size: 16px;
 }
 }