Merge branch 'fix_8467' into debug

src/views/etaChart/components/ChartDetailPop.vue

@@ -11,7 +11,7 @@ const emits=defineEmits(['collectChange'])
 const props=defineProps({
   chartInfoId:{
     type:Number,
-    'default':0
+    default:0
   }
 })
 
@@ -97,7 +97,12 @@ async function handleCancelCollect(){
       <svg-icon v-else name="star" style="font-size:20px;cursor: pointer;" @click="showCollectChart=true"></svg-icon>
     </div>
     <div class="chart-render-wrap" v-loading="loading">
-      <div class="chart-box" id="chart-detail-pop-box"></div>
+      <div class="chart-wrap_content">
+        <div class="chart-box" id="chart-detail-pop-box"></div>
+        <!-- 图表水印 -->
+        <div class="chart-water-mark" :style="{backgroundImage:`url(${WaterMark})`}"></div>
+      </div>
+      
       <div style="text-align: center">
         <!-- 季节图 公历农历切换 -->
         <t-radio-group
@@ -107,7 +112,7 @@ async function handleCancelCollect(){
           v-if="chartInfo?.ChartType === 2"
         >
           <t-radio-button value="公历">公历</t-radio-button>
-          <t-radio-button value="农历">农历</t-radio-button>
+          <t-radio-button value="农历">春节对齐</t-radio-button>
         </t-radio-group>
       </div>
       <div class="chart-source" v-if="chartInfo">
@@ -122,8 +127,6 @@ async function handleCancelCollect(){
           >来源:{{ JSON.parse(chartInfo.SourcesFrom).text }}</span
         >
       </div>
-      <!-- 图表水印 -->
-      <div class="chart-water-mark" :style="{backgroundImage:`url(${WaterMark})`}"></div>
     </div>
   </t-dialog>
 
@@ -162,20 +165,24 @@ async function handleCancelCollect(){
     display: flex;
     flex-direction: column;
     position: relative;
-    .chart-water-mark{
-      position: absolute;
-      left: 10%;
-      top: 10%;
-      width: 80%;
-      height: 80%;
-      background-size: contain;
-      background-repeat: no-repeat;
-      background-position: center center;
-    }
-    .chart-box{
+    .chart-wrap_content{
       flex: 1;
       position: relative;
       z-index: 10;
+      .chart-box{
+        width: 100%;
+        height: 100%;
+      }
+      .chart-water-mark{
+        position: absolute;
+        left: 10%;
+        top: 10%;
+        width: 80%;
+        height: 80%;
+        background-size: contain;
+        background-repeat: no-repeat;
+        background-position: center center;
+      }
     }
   }
 }

src/views/etaChart/components/chartList/ChartBox.vue

@@ -118,7 +118,11 @@ async function handleCancelCollect(){
       <svg-icon name="full_screen" style="font-size:20px;margin-left:20px;cursor: pointer;" @click="showChartDetailPop=true"></svg-icon>
     </div>
     <div class="chart-render-wrap" v-loading="loading">
-      <div class="chart-box" :id="`chart-list-detail-box_${props.chartData.ChartInfoId}_${props.index}`"></div>
+      <div class="chart-wrap_content">
+        <div class="chart-box" :id="`chart-list-detail-box_${props.chartData.ChartInfoId}_${props.index}`"></div>
+        <!-- 图表水印 -->
+        <div class="chart-water-mark" :style="{backgroundImage:`url(${WaterMark})`}"></div>
+      </div>
       <div style="text-align: center">
         <!-- 季节图 公历农历切换 -->
         <t-radio-group
@@ -128,7 +132,7 @@ async function handleCancelCollect(){
           v-if="chartInfo?.ChartType === 2"
         >
           <t-radio-button value="公历">公历</t-radio-button>
-          <t-radio-button value="农历">农历</t-radio-button>
+          <t-radio-button value="农历">春节对齐</t-radio-button>
         </t-radio-group>
       </div>
       <div class="chart-source" v-if="chartInfo">
@@ -143,8 +147,7 @@ async function handleCancelCollect(){
           >来源:{{ JSON.parse(chartInfo.SourcesFrom).text }}</span
         >
       </div>
-      <!-- 图表水印 -->
-      <div class="chart-water-mark" :style="{backgroundImage:`url(${WaterMark})`}"></div>
+      
     </div>
   </div>
 
@@ -178,20 +181,24 @@ async function handleCancelCollect(){
     display: flex;
     flex-direction: column;
     position: relative;
-    .chart-water-mark{
-      position: absolute;
-      left: 10%;
-      top: 10%;
-      width: 80%;
-      height: 80%;
-      background-size: contain;
-      background-repeat: no-repeat;
-      background-position: center center;
-    }
-    .chart-box{
+    .chart-wrap_content{
       flex: 1;
       position: relative;
       z-index: 10;
+      .chart-box{
+        width: 100%;
+        height: 100%;
+      }
+      .chart-water-mark{
+        position: absolute;
+        left: 10%;
+        top: 10%;
+        width: 80%;
+        height: 80%;
+        background-size: contain;
+        background-repeat: no-repeat;
+        background-position: center center;
+      }
     }
   }
 }