Merge branch 'hi-ucs-dev' into release

front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue

@@ -19,7 +19,8 @@
           <p
             style="cursor: pointer"
             :class="{
-              'blur-word': !(approveStatus == '通过' && whoShow1.itShowXiHaiAn
+              'blur-word': !((approveStatus == '通过' || role) &&
+              whoShow1.itShowXiHaiAn
                 ? false
                 : true),
             }"
@@ -35,7 +36,8 @@
           <!-- <p style="filter: blur(4px)">{{ dataFrom.number }}</p> -->
           <p
             :class="{
-              'blur-word': !(approveStatus == '通过' && whoShow1.itShowXiHaiAn
+              'blur-word': !((approveStatus == '通过' || role) &&
+              whoShow1.itShowXiHaiAn
                 ? false
                 : true),
             }"
@@ -59,7 +61,8 @@
           <p
             style="filter: blur(4px)"
             :class="{
-              'blur-word': !(approveStatus == '通过' && whoShow1.itShowXiHaiAn
+              'blur-word': !((approveStatus == '通过' || role) &&
+              whoShow1.itShowXiHaiAn
                 ? false
                 : true),
             }"

front/src/views/detailsAll/components/Business/BusinessUsageMode.vue

@@ -23,7 +23,9 @@
                       approveStatus === '通过' ? item.linkValue : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.linkValue }}
                   </span>
                 </a-tooltip>

front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue

@@ -17,7 +17,7 @@
               </template>
               <p @click="ServiceAddressFunction(item.linkValue)">
                 <span>服务地址：</span>
-                <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                <span :class="{ 'blur-word': approveStatus !== '通过' && !role }">
                   {{ item.linkValue }}
                 </span>
               </p>
@@ -31,7 +31,7 @@
 
               <p @click="ServiceAddressFunction(item.csslinkValue)">
                 <span>样式服务地址：</span>
-                <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                <span :class="{ 'blur-word': approveStatus !== '通过' && !role }">
                   {{ item.csslinkValue }}
                 </span>
               </p>