Merge branch 'master' into 'master'

优化指标年度周期初始化

See merge request lighter/vue-intergration-platform!118

src/views/target-management/target-dict/TargetDictConfig.vue

@@ -355,12 +355,12 @@ const queryParam = reactive({
 
 onMounted(() => {
   nextTick(() => {
+    // 查询得分年度
+    queryScoreCycle()
     queryTargetDictTree()
     queryTargetZbReportId()
     deptMethod('')
     empMethod('')
-    // 查询得分年度
-    queryScoreCycle()
   })
 })
 
@@ -641,8 +641,8 @@ const editForm = (formEl: FormInstance | undefined) => {
 // ------  接收树页面传来的数据 -------
 const treeNodeClick = (data: any, node: any, obj: any) => {
   if (node.data) {
-    sqlForm.startTime = '2021'
-    sqlForm.endTime = '2024'
+    sqlForm.startTime = reportCycleList.value[0].startYear
+    sqlForm.endTime = reportCycleList.value[0].endYear
 
     cycle.value = 'Y1'
     let params = {

src/views/target-management/target-home/TargetHomePage.vue

@@ -144,10 +144,10 @@ const reportCycleList = ref([])
 // 年度周期
 const y = ref(4)
 // 开始年份
-const yearInfo = ref(2021)
+const yearInfo = ref()
 const queryData = ref({
-  startTime: '2021',
-  endTime: '2024',
+  startTime: '',
+  endTime: '',
   id: '21',
   pid: 'B11',
   bigId: 'B1',
@@ -192,7 +192,7 @@ const XNames = ref(['第一章', '第二章', '第三章', '第四章', '第五
 const TNames = ref(['总分', '得分'])
 const unit = ref('分')
 const titleName = ref('单位：分')
-const title = ref('2021-2024 指标得分情况统计')
+const title = ref('')
 const statusInfos = ref({
   zflag: true, // 柱子是否显示数据
   toolBoxFlag: false, // 是否显示下载，切换标签
@@ -201,8 +201,7 @@ const infoData = ref([])
 onMounted(() => {
   nextTick(async () => {
     queryTargetDictTree()
-    queryScoreCycle()
-    query()
+    await queryScoreCycle()
     await queryTargetTotalScoreInfo()
   })
   highBarsNiceUtils(pie)
@@ -212,6 +211,11 @@ const queryScoreCycle = () => {
   selectScoreCycle()
     .then((res) => {
       reportCycleList.value = res
+      queryData.value.startTime = reportCycleList.value[0].startYear
+      queryData.value.endTime = reportCycleList.value[0].endYear
+      yearInfo.value = Number.parseInt(reportCycleList.value[0].startYear)
+      title.value = reportCycleList.value[0].yearRange + ' 指标得分情况统计'
+      query()
     });
 }