Ver Fonte

Merge branch 'master' into test

hcst_sunzhen há 5 anos atrás
pai
commit
5b7e320f08
1 ficheiros alterados com 4 adições e 3 exclusões
  1. 4 3
      src/views/modules/achievements/optimize.vue

+ 4 - 3
src/views/modules/achievements/optimize.vue

@@ -17,13 +17,13 @@
           :activeTabKey="noTitleKey"
           @tabChange="key => onTabChange(key, 'noTitleKey')"
         >
-          媒体任务:{{ dataCount.mediaTask }}元
+          <!-- 媒体任务:{{ dataCount.totalMediaTask }}元 -->
           <a-row :gutter="24" style="margin-top:15px">
             <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
               <chart-card
                 :loading="loading"
                 title="总消耗(元)"
-                :total="dataCount.totalCost + ''"
+                :total="dataCount.totalPersonalCost + ''"
                 style="border: 1px solid #e8e8e8;"
               >
                 <a-tooltip title="当前所有账户下的消耗总计" slot="action">
@@ -36,7 +36,7 @@
               <chart-card
                 :loading="loading"
                 title="季度任务(元)"
-                :total="dataCount.personalTask + ''"
+                :total="dataCount.totalPersonalTask + ''"
                 style="border: 1px solid #e8e8e8;"
               >
                 <a-tooltip title="每季度需要完成的消耗量" slot="action">
@@ -322,6 +322,7 @@ export default {
     },
     expand(expanded, record) {
       var param = {}
+      param.appType = 2 
       param.projectId = record.projectId
       record.showDetail = true
       if (expanded) {