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

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

# Conflicts:
#	src/views/week/weekly.vue
zhujindu 6 дней назад
Родитель
Сommit
23bb0b2a28

+ 3 - 0
src/views/week/doubleWeekly.vue

@@ -179,6 +179,7 @@ export default {
       temporaryShow: '',
       type: '-1',
       JZQuota: false,
+      homePageIndicatorList: null,
     };
   },
   created() {
@@ -245,6 +246,7 @@ export default {
                 window.location.replace(window.location.origin + '/mobile/home');
               });
           } else {
+            this.homePageIndicatorList = res.data.homePageIndicatorList || null;
             this.reportTargetAll = res.data.reportTargetAll;
             this.reportTarget = res.data;
             this.type = res.data.userType;
@@ -560,6 +562,7 @@ export default {
         this.reportTargetAll = res.data.reportTargetAll;
         this.reportTarget = res.data;
         this.type = res.data.userType;
+        this.homePageIndicatorList = res.data.homePageIndicatorList || null;
         var reportContentsList1 = [];
         var reportContentsList2 = [];
         var reportContentsList3 = [];

+ 2 - 0
src/views/week/doubleWeeklyApproval.vue

@@ -188,6 +188,7 @@ export default {
       type: '-1',
       JZQuota: false,
       reportTarget: {},
+      homePageIndicatorList: null,
     };
   },
   created() {
@@ -305,6 +306,7 @@ export default {
                 window.location.replace(window.location.origin + '/mobile/home');
               });
           } else {
+            this.homePageIndicatorList = res.data.homePageIndicatorList;
             this.reportTargetAll = res.data.reportTargetAll;
             this.reportTarget = res.data;
             this.type = res.data.userType;

+ 2 - 0
src/views/week/doubleWeeklyDetils.vue

@@ -208,6 +208,7 @@ export default {
       type: '-1',
       ptitle: '',
       JZQuota: false,
+      homePageIndicatorList: null,
       //
     };
   },
@@ -256,6 +257,7 @@ export default {
           this.JZQuota = true;
         }
         loading1.clear();
+        this.homePageIndicatorList = res.data.homePageIndicatorList;
         this.title = res.data.deptName + '  ' + res.data.nickName;
         this.reportTargetAll = res.data.reportTargetAll;
         this.reportTarget = res.data;

+ 13 - 0
src/views/week/weekly.vue

@@ -224,6 +224,8 @@ export default {
       reportContentsList3: [],
       temporaryShow: '',
       YFQuota: false, //应用服务
+      GZdata: false,
+      homePageIndicatorList: null,
     };
   },
   created() {
@@ -259,6 +261,16 @@ export default {
         loading1.clear();
         if (res.code == 200) {
           this.YFQuota = res.data.postType == 'YF' ? true : false;
+          this.JZQuota = false;
+          if (res.data.postType == 'JZ') {
+            this.JZQuota = true;
+          }
+          if (res.data.postType == 'GZ') {
+            this.GZdata = true;
+          } else {
+            this.GZdata = false;
+          }
+          this.homePageIndicatorList = res.data.homePageIndicatorList;
           var dayTime = res.data.date;
           this.timeList = this.parseTimeParagraph(
             dayTime.slice(0, 4) + '-' + dayTime.slice(4, 6) + '-' + dayTime.slice(6, 8),
@@ -570,6 +582,7 @@ export default {
         localStorage.setItem('powerGrade', res.data.positionId);
         localStorage.setItem('userDeptLevel', res.data.userDeptLevel);
         this.type = res.data.userType;
+        this.homePageIndicatorList = res.data.homePageIndicatorList;
         var dayTime = res.data.date;
         this.YFQuota = res.data.postType == 'YF' ? true : false;
         this.timeList = this.parseTimeParagraph(

+ 2 - 0
src/views/week/weeklyApproval.vue

@@ -234,6 +234,7 @@ export default {
       JZQuota: false,
       YFQuota: false, //应用服务
       GZdata: false,
+      homePageIndicatorList: null,
     };
   },
   created() {
@@ -351,6 +352,7 @@ export default {
           } else {
             this.GZdata = false;
           }
+          this.homePageIndicatorList = res.data.homePageIndicatorList;
           var dayTime = res.data.date;
           this.type = res.data.userType;
           this.timeList = this.parseTimeParagraph(

+ 2 - 0
src/views/week/weeklyHistoricalDetils.vue

@@ -266,6 +266,7 @@ export default {
       JZQuota: false,
       YFQuota: false, //应用服务
       GZdata: false,
+      homePageIndicatorList: null,
     };
   },
   created() {
@@ -395,6 +396,7 @@ export default {
           } else {
             this.GZdata = false;
           }
+          this.homePageIndicatorList = res.data.homePageIndicatorList || null;
           var dayTime = res.data.date;
           this.type = res.data.userType;
           this.title =