提交

src/views/report/Calendar/index.vue

@@ -23,11 +23,25 @@
         />
         <p class="headTitle" v-html="item.title"></p>
         <p class="subTitle" v-text="item.subTitle"></p>
-        <div v-if="item.data.length" class="monthlyCalendar" style="position: relative;">
-            <img src="../../../assets/image/C_bg.png" style="width: 100%;float: left;position: absolute;z-index: 0;top: 0;" alt="">
-          <div v-for="(v1, i1) in item.data" :key="i1" >
+        <div
+          v-if="item.data.length"
+          class="monthlyCalendar"
+          style="position: relative"
+        >
+          <img
+            src="../../../assets/image/C_bg.png"
+            style="
+              width: 100%;
+              float: left;
+              position: absolute;
+              z-index: 0;
+              top: 0;
+            "
+            alt=""
+          />
+          <div v-for="(v1, i1) in item.data" :key="i1">
             <!-- 月历主页 -->
-            <div style="margin-bottom: 1em;position: relative;z-index: 1;">
+            <div style="margin-bottom: 1em; position: relative; z-index: 1">
               <div style="display: flex">
                 <div class="title" style="flex: 1" v-text="v1.month"></div>
                 <div
@@ -79,9 +93,12 @@
                   :key="i"
                 >
                   <div v-for="(son, o) in v" :key="o" class="CalenCol">
-                    <div v-if="son" style="color: #000">
+                    <div v-if="son">
                       <div class="dayDate">
-                        <div class="dayDate_son">
+                        <div
+                          class="dayDate_son"
+                          :style="son.is_curr !== 0 ? 'color: #000' : ''"
+                        >
                           {{ son.day }}
                         </div>
                       </div>
@@ -89,6 +106,7 @@
                         v-if="son.value"
                         class="text"
                         v-html="son.value"
+                        :style="son.is_curr !== 0 ? 'color: #383636' : ''"
                       ></div>
                       <div v-if="!son.value" style="1em"></div>
                     </div>
@@ -98,7 +116,14 @@
             </div>
 
             <p
-              style="text-align: left; margin: 0 auto; width: 82.5%; max-width: 614px; padding: 3px; font-size: 0.8rem"
+              style="
+                text-align: left;
+                margin: 0 auto;
+                width: 82.5%;
+                max-width: 614px;
+                padding: 3px;
+                font-size: 0.8rem;
+              "
               v-html="item.buttomText"
             ></p>
           </div>
@@ -262,7 +287,7 @@ export default {
   background-color: #fff;
   width: 83.6%;
   height: calc((82.5% - 10px) * 1.5);
-  padding:  1.5em 1px 0 1px;
+  padding: 1.5em 1px 0 1px;
   max-width: 614px;
   margin: 0 auto;
   margin-top: 1.5em;
@@ -312,7 +337,7 @@ export default {
   line-height: 1.3em;
   font-size: 1.1rem;
   font-family: Adobe Heiti Std;
-  color: #000;
+  color: #84868c;
   background-color: #f4f4f4;
   transform: rotate(45deg);
   margin: 0 auto 0.3em auto;
@@ -334,7 +359,7 @@ export default {
   padding: 1px 0;
   font-size: 0.8rem;
   height: 1.3em;
-  color: #383636;
+  color: #84868c;
   line-height: 1.3em;
   overflow: hidden;
   white-space: nowrap;