zhujindu 2 veckor sedan
förälder
incheckning
179b597897
2 ändrade filer med 16 tillägg och 8 borttagningar
  1. 14 3
      src/components/share.vue
  2. 2 5
      src/components/shareCommonTarget.vue

+ 14 - 3
src/components/share.vue

@@ -64,8 +64,18 @@
         </template>
         </template>
         <!-- 日报指标 -->
         <!-- 日报指标 -->
         <template v-if="isTarget">
         <template v-if="isTarget">
-          <shareAtarget :reportInfo="reportTarget"></shareAtarget>
-          <shareBtarget :reportInfo="reportTarget"></shareBtarget>
+          <template v-if="reportTarget.targetType == '1'">
+            <!--targetType 0-历史指标  1-动态指标,String类型 -->
+            <shareCommonTarget
+              :homePageIndicatorDate="reportTarget.homePageIndicatorList"></shareCommonTarget>
+          </template>
+          <template v-else>
+            <!-- YFQuota:应用服务平台 不显示各项指标 -->
+            <shareAtarget :reportInfo="reportTarget"></shareAtarget>
+            <shareBtarget :reportInfo="reportTarget"></shareBtarget>
+          </template>
+          <!-- <shareAtarget :reportInfo="reportTarget"></shareAtarget>
+          <shareBtarget :reportInfo="reportTarget"></shareBtarget> -->
         </template>
         </template>
         <!-- 日报填写内容 -->
         <!-- 日报填写内容 -->
         <template v-if="isReportCustom">
         <template v-if="isReportCustom">
@@ -142,9 +152,10 @@ import ShareAtarget from './shareAtarget.vue';
 import shareBtarget from './shareBtarget.vue';
 import shareBtarget from './shareBtarget.vue';
 import shareReportCustom from './shareReportCustom.vue';
 import shareReportCustom from './shareReportCustom.vue';
 import uploadAliOss from '@/utils/uploadAliOss';
 import uploadAliOss from '@/utils/uploadAliOss';
+import shareCommonTarget from './shareCommonTarget.vue';
 export default {
 export default {
   name: 'share',
   name: 'share',
-  components: { VueQr, ShareAtarget, shareReportCustom, shareBtarget },
+  components: { VueQr, ShareAtarget, shareReportCustom, shareBtarget, shareCommonTarget },
   props: {
   props: {
     // 日报数据
     // 日报数据
     reportTarget: {
     reportTarget: {

+ 2 - 5
src/components/shareCommonTarget.vue

@@ -106,11 +106,6 @@
               <template #title>
               <template #title>
                 <div style="display: flex; justify-content: space-between">
                 <div style="display: flex; justify-content: space-between">
                   <span>{{ homePageItem.name }}</span>
                   <span>{{ homePageItem.name }}</span>
-                  <p
-                    v-if="homePageItem.indicatorDate"
-                    style="color: #999; margin-top: 0; margin-right: 20px">
-                    {{ homePageItem.indicatorDate }}
-                  </p>
                 </div>
                 </div>
               </template>
               </template>
               <!-- 外层循环:遍历主要类别 -->
               <!-- 外层循环:遍历主要类别 -->
@@ -296,6 +291,7 @@ export default {
     color: #fff;
     color: #fff;
     display: inline-block;
     display: inline-block;
     margin-top: 10px;
     margin-top: 10px;
+    background-color: unset !important;
   }
   }
 
 
   .rightTitle {
   .rightTitle {
@@ -303,6 +299,7 @@ export default {
     display: inline-block;
     display: inline-block;
     white-space: nowrap;
     white-space: nowrap;
     margin-top: 10px;
     margin-top: 10px;
+    background-color: unset !important;
   }
   }
   .colorblack {
   .colorblack {
     color: #fff;
     color: #fff;