Selaa lähdekoodia

fix 农历文案改为春节对齐

cxmo 8 kuukautta sitten
vanhempi
commit
684d5e7ab5

+ 4 - 0
src/lang/modules/EtaChart/commonLang.js

@@ -56,6 +56,10 @@ export default {
     zh: '农历',
     en: 'Lunar Calendar'
   },
+  calendar_lunar_text: {
+    zh: '春节对齐',
+    en: 'Lunar Calendar'
+  },
   chart_share_btn:{
     zh:'分享',
     en:'Share'

+ 1 - 1
src/views/dataEntry_manage/addChart.vue

@@ -607,7 +607,7 @@
 								@change="getPreviewSplineInfo"
 							>
 								<el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
-								<el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
+								<el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
 							</el-radio-group>
 
 							<!-- 图表说明 -->

+ 1 - 1
src/views/dataEntry_manage/chartSetting.vue

@@ -542,7 +542,7 @@
                         @change="getPreviewChartInfo"
                       >
                         <el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
-                        <el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
+                        <el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
                       </el-radio-group>
 
                       <!-- 图表说明 -->

+ 1 - 1
src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -52,7 +52,7 @@
                     <el-form-item :label="$t('EtaBasePage.label_calendar')"  style="width:180px">
                         <el-select v-model="formData.calendarType" style="width:120px">
                             <el-option :label="$t('Chart.calendar_gre')" value="公历"></el-option>
-                            <el-option :label="$t('Chart.calendar_lunar')" value="农历"></el-option>
+                            <el-option :label="$t('Chart.calendar_lunar_text')" value="农历"></el-option>
                         </el-select>
                     </el-form-item>
                     </template>

+ 1 - 1
src/views/dataEntry_manage/databaseComponents/chartTrendRender.vue

@@ -110,7 +110,7 @@
 							@change="getDataByPath"
 					>
 							<el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
-							<el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
+							<el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
 					</el-radio-group>
 				</div>
 			</div>

+ 1 - 1
src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -476,7 +476,7 @@ export default {
 		calendarOptions(){
 			return [
 				{label: this.$t('Chart.calendar_gre'),key: 1},
-				{label: this.$t('Chart.calendar_lunar'),key: 2},
+				{label: this.$t('Chart.calendar_lunar_text'),key: 2},
 			]
 		}
 	},

+ 1 - 1
src/views/dataEntry_manage/editChart.vue

@@ -611,7 +611,7 @@
 								@change="getPreviewSplineInfo"
 							>
 								<el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
-								<el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
+								<el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
 							</el-radio-group>
 
 							<!-- 图表说明 -->

+ 1 - 0
src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -559,6 +559,7 @@ export default {
       });
 			//标识线回显
 			this.chartInfo.MarkersLines = res.Data.ChartInfo.MarkersLines||''
+			this.$refs.markerSectionRef&&this.$refs.markerSectionRef.initData(res.Data.ChartInfo||{});
 		},
 
 		/* 年份改变 重新刷新图表接口  保存当前的图表配置和上下限 只改变图表 */

+ 1 - 1
src/views/datasheet_manage/components/BalanceAddChart.vue

@@ -360,7 +360,7 @@
               <!-- 公历 -->
               <el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
               <!-- 农历 -->
-              <el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
+              <el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
             </el-radio-group>
           </div>
           <!-- 季节图设置图例名称按钮 -->

+ 1 - 1
src/views/mychart_manage/components/chartDetailDia.vue

@@ -353,7 +353,7 @@
                   @change="getPreviewChartInfo"
                 >
                   <el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
-                  <el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
+                  <el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
                 </el-radio-group>
 
                 <!-- 图表说明 -->

+ 1 - 1
src/views/predictEdb_manage/components/chartInfo.vue

@@ -74,7 +74,7 @@
                 @change="seasonTypeChange2"
             >
                 <el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
-				<el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
+				<el-radio-button label="农历">{{$t('Chart.calendar_lunar_text')}}</el-radio-button>
             </el-radio-group>
 
             <div class="range-cont left">