Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/public/config/basicConfig.js

@@ -2,15 +2,15 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-25 19:14:13
+ * @LastEditTime: 2022-08-26 16:56:59
  * @Description: 告诉大家这是什么
  */
 var _global = {}
 var CONFIGITEM = {
-  version: 'qingdao', // 青岛
+  // version: 'qingdao', // 青岛
   // version: 'xihaian', // 西海岸
   // version: 'test', // 测试
-  // version: 'frp', // 内网穿透
+  version: 'frp', // 内网穿透
   // version: 'dev', // 开发
   vNum: 'v0.8.7.1',
   configData: {

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

@@ -1,41 +1,67 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-09 09:29:29
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-13 15:21:26
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-08-26 19:08:17
  * @Description: 应用详情
 -->
 <template>
-  <div class="algorithm-on-trial" v-if="flag">
+  <div class="algorithm-on-trial">
     <detals-title title="应用详情" type="PROBATION"></detals-title>
     <div class="main">
       <div class="main-left">
         <p>{{ dataFrom.linkName }}</p>
-        <p style="cursor: pointer" @click="clickLink(dataFrom.link)">
-          {{ dataFrom.link }}
-        </p>
+        <a-tooltip v-if="flag">
+          <template #title>{{ dataFrom.link }}</template>
+          <p style="cursor: pointer" @click="clickLink(dataFrom.link)">
+            {{ dataFrom.link || '暂无' }}
+          </p>
+        </a-tooltip>
+        <a-tooltip v-else>
+          <template #title>请申请后查看</template>
+          <p
+            style="cursor: pointer; filter: blur(4px)"
+            @click="clickLink(dataFrom.link)"
+          >
+            {{ dataFrom.link }}
+          </p>
+        </a-tooltip>
       </div>
       <div class="main-center">
         <p>{{ dataFrom.numberName }}</p>
-        <p>{{ dataFrom.number }}</p>
+        <a-tooltip v-if="flag">
+          <template #title>{{ dataFrom.number }}</template>
+          <p>{{ dataFrom.number || '暂无' }}</p>
+        </a-tooltip>
+        <a-tooltip v-else>
+          <template #title>请申请后查看</template>
+          <p style="filter: blur(4px)">{{ dataFrom.number }}</p>
+        </a-tooltip>
         <div
           @click="copyFunction(dataFrom.number, '复制账号')"
-          v-if="dataFrom.number != ''"
+          v-if="dataFrom.number != '' && flag"
         >
           复制账号
         </div>
-        <div v-else id="zanwu">暂无</div>
+        <!-- <div v-else id="zanwu">暂无</div> -->
       </div>
       <div class="main-right">
         <p>{{ dataFrom.passwordName }}</p>
-        <p>{{ dataFrom.password }}</p>
+        <a-tooltip v-if="flag">
+          <template #title>{{ dataFrom.password }}</template>
+          <p>{{ dataFrom.password || '暂无' }}</p>
+        </a-tooltip>
+        <a-tooltip v-else>
+          <template #title>请申请后查看</template>
+          <p style="filter: blur(4px)">{{ dataFrom.password }}</p>
+        </a-tooltip>
         <div
           @click="copyFunction(dataFrom.password2, '复制密码')"
-          v-if="dataFrom.password != ''"
+          v-if="dataFrom.password2 != '' && flag"
         >
           复制密码
         </div>
-        <div v-else id="zanwu">暂无</div>
+        <!-- <div v-else id="zanwu">暂无</div> -->
       </div>
     </div>
   </div>

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

@@ -12,7 +12,7 @@
       v-if="whoShow1 && whoShow1.itShowQingDao"
       style="width: 100%; display: flex; justify-content: center"
     >
-      <div class="content" v-show="approveStatus == '通过'">
+      <div class="content">
         <div
           v-for="(item, index) in dataFrom.content"
           :key="index"
@@ -23,7 +23,17 @@
             <div v-for="carditem in item.childrenContent" :key="carditem">
               <div style="display: flex">
                 <span>{{ carditem.attrType }}：</span>
-                <a-tooltip>
+                <a-tooltip
+                  v-if="
+                    approveStatus !== '通过' &&
+                    (carditem.attrType === '联系人' ||
+                      carditem.attrType === '联系人电话')
+                  "
+                >
+                  <template #title>请申请后查看</template>
+                  <span class="word-filter">{{ carditem.attrValue }}</span>
+                </a-tooltip>
+                <a-tooltip v-else>
                   <template #title>{{ carditem.attrValue }}</template>
                   <span>{{ carditem.attrValue }}</span>
                 </a-tooltip>
@@ -32,13 +42,13 @@
           </div>
         </div>
       </div>
-      <div v-show="approveStatus !== '通过'" class="contentOther">
+      <!-- <div v-show="approveStatus !== '通过'" class="contentOther">
         <img src="~@/assets/detailsAll/uesBefore.png" />
         <div class="contentOtherRight">
           <p>请在申请能力后返回查看归属部门与服务商</p>
           <div @click="toView()">进入能力申请</div>
         </div>
-      </div>
+      </div> -->
     </div>
     <!-- 其他 -->
     <div v-else>
@@ -247,7 +257,9 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-
+    .word-filter {
+      filter: blur(4px);
+    }
     .title {
       margin-bottom: 0.3rem;
     }
@@ -261,10 +273,13 @@
         height: 1.5rem;
         width: 6.2rem;
         border-radius: 0.2rem;
-        background: url('~@/assets/detailsAll/business/business_usage_mode_bg.png')
-          no-repeat;
-        background-position: center;
-        background-size: 100% 100%;
+        background: linear-gradient(
+          to right,
+          rgba(113, 132, 252, 0.4),
+          rgba(148, 163, 252, 0.4)
+        );
+        // background-position: center;
+        // background-size: 100% 100%;
         padding: 0 0.3rem;
         display: flex;
         flex-direction: column;
@@ -298,11 +313,11 @@
               span:last-child {
                 display: block;
                 width: 2.3rem;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                -webkit-box-orient: vertical;
-                -webkit-line-clamp: 1;
-                word-break: break-all;
+                // overflow: hidden;
+                // text-overflow: ellipsis;
+                // -webkit-box-orient: vertical;
+                // -webkit-line-clamp: 1;
+                // word-break: break-all;
               }
             }
           }