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

back/public/config/basicConfig.js

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

front/public/static/config/basicConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-25 17:19:45
+ * @LastEditTime: 2022-08-27 14:25:54
  * @Description: 系统静态参数配置
  */
 var _global = {}
@@ -12,7 +12,7 @@ var CONFIGITEM = {
   //version: 'dev', // 开发
   //version: 'test', // 测试
   //version: 'frp', // 内网穿透
-  vNum: 'v0.8.7.1',
+  vNum: 'v0.8.7.2',
   configData: {
     // 青岛市大数据局
     qingdao: {

front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue

@@ -12,12 +12,7 @@
       v-if="whoShow1 && whoShow1.itShowQingDao"
       style="width: 100%; display: flex; justify-content: center"
     >
-      <div
+      <div class="content" v-for="item in dataFrom.content" :key="item.title">
-        class="content"
-        v-for="item in dataFrom.content"
-        :key="item.title"
-        v-show="approveStatus == '通过'"
-      >
         <div class="content-left" v-if="item.titleType === '调用接口'">
           <div class="left">
             <div class="content-left-title">
@@ -27,8 +22,16 @@
               <p>
                 <span>{{ item.link.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.link.value }}</template>
+                  <template #title>
-                  <span>{{ item.link.value }}</span>
+                    {{
+                      approveStatus === '通过'
+                        ? item.link.value
+                        : '请申请后查看'
+                    }}
+                  </template>
+                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                    {{ item.link.value }}
+                  </span>
                 </a-tooltip>
               </p>
               <p>
@@ -94,15 +97,31 @@
               <p>
                 <span>{{ item.people.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.people.value }}</template>
+                  <template #title>
-                  <span>{{ item.people.value }}</span>
+                    {{
+                      approveStatus === '通过'
+                        ? item.people.value
+                        : '请申请后查看'
+                    }}
+                  </template>
+                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                    {{ item.people.value }}
+                  </span>
                 </a-tooltip>
               </p>
               <p>
                 <span>{{ item.phone.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.phone.value }}</template>
+                  <template #title>
-                  <span>{{ item.phone.value }}</span>
+                    {{
+                      approveStatus === '通过'
+                        ? item.phone.value
+                        : '请申请后查看'
+                    }}
+                  </template>
+                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                    {{ item.phone.value }}
+                  </span>
                 </a-tooltip>
               </p>
             </div>
@@ -135,13 +154,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>
@@ -489,7 +508,9 @@
     flex-direction: column;
     align-items: center;
     padding: 0.8rem 0;
-
+    .blur-word {
+      filter: blur(4px);
+    }
     .content {
       margin-top: 0.3rem;
       display: flex;

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-09 09:29:29
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-26 19:08:17
+ * @LastEditTime: 2022-08-27 10:57:24
  * @Description: 应用详情
 -->
 <template>

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

@@ -11,12 +11,7 @@
       v-if="whoShow1 && whoShow1.itShowQingDao"
       style="width: 100%; display: flex; justify-content: center"
     >
-      <div
+      <div class="content" v-for="item in dataFrom.content" :key="item.title">
-        class="content"
-        v-for="item in dataFrom.content"
-        :key="item.title"
-        v-show="approveStatus == '通过'"
-      >
         <div class="content-left">
           <div class="left">
             <div class="content-left-title">
@@ -26,8 +21,14 @@
               <p>
                 <span>{{ item.link.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.linkValue }}</template>
+                  <template #title>
-                  <span>{{ item.linkValue }}</span>
+                    {{
+                      approveStatus === '通过' ? item.linkValue : '请申请后查看'
+                    }}
+                  </template>
+                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                    {{ item.linkValue }}
+                  </span>
                 </a-tooltip>
               </p>
             </div>
@@ -51,15 +52,31 @@
               <p>
                 <span>{{ item.people.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.people.value }}</template>
+                  <template #title>
-                  <span>{{ item.people.value }}</span>
+                    {{
+                      approveStatus === '通过'
+                        ? item.people.value
+                        : '请申请后查看'
+                    }}
+                  </template>
+                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                    {{ item.people.value }}
+                  </span>
                 </a-tooltip>
               </p>
               <p>
                 <span>{{ item.phone.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.phone.value }}</template>
+                  <template #title>
-                  <span>{{ item.phone.value }}</span>
+                    {{
+                      approveStatus === '通过'
+                        ? item.phone.value
+                        : '请申请后查看'
+                    }}
+                  </template>
+                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                    {{ item.phone.value }}
+                  </span>
                 </a-tooltip>
               </p>
             </div>
@@ -92,13 +109,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>
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
@@ -359,7 +376,9 @@
     flex-direction: column;
     align-items: center;
     padding: 0.8rem 0;
-
+    .blur-word {
+      filter: blur(4px);
+    }
     .content {
       margin-top: 0.3rem;
       display: flex;

front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue

@@ -11,13 +11,17 @@
       v-if="whoShow1 && whoShow1.itShowQingDao"
       style="width: 100%; display: flex; justify-content: center"
     >
-      <div class="content" v-show="approveStatus == '通过'">
+      <div class="content">
         <div class="content-card">
           <div class="left">
             <p>{{ dataFrom.linkName }}</p>
             <a-tooltip>
-              <template #title>{{ dataFrom.link }}</template>
+              <template #title>
-              <p>{{ dataFrom.link }}</p>
+                {{ approveStatus === '通过' ? dataFrom.link : '请申请后查看' }}
+              </template>
+              <p :class="{ 'blur-word': approveStatus !== '通过' }">
+                {{ dataFrom.link }}
+              </p>
             </a-tooltip>
           </div>
           <div class="right">
@@ -35,8 +39,25 @@
                 <div>
                   <span>{{ carditem.attrType }}：</span>
                   <a-tooltip>
-                    <template #title>{{ carditem.attrValue }}</template>
+                    <template #title>
-                    <span>{{ carditem.attrValue }}</span>
+                      {{
+                        approveStatus !== '通过' &&
+                        (carditem.attrType === '部门联系人' ||
+                          carditem.attrType === '联系人电话')
+                          ? '请申请后查看'
+                          : carditem.attrValue
+                      }}
+                    </template>
+                    <span
+                      :class="{
+                        'blur-word':
+                          approveStatus !== '通过' &&
+                          (carditem.attrType === '部门联系人' ||
+                            carditem.attrType === '联系人电话'),
+                      }"
+                    >
+                      {{ carditem.attrValue }}
+                    </span>
                   </a-tooltip>
                 </div>
               </div>
@@ -44,13 +65,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>
       <div class="content">
@@ -294,6 +315,9 @@
     display: flex;
     flex-direction: column;
     align-items: center;
+    .blur-word {
+      filter: blur(4px);
+    }
     .title {
       margin-bottom: 0.3rem;
     }

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

@@ -11,30 +11,36 @@
       v-if="whoShow1 && whoShow1.itShowQingDao"
       style="width: 100%; display: flex; justify-content: center"
     >
-      <div
+      <div class="content" v-for="item in dataFrom.content" :key="item.title">
-        class="content"
-        v-for="item in dataFrom.content"
-        :key="item.title"
-        v-show="approveStatus == '通过'"
-      >
         <div class="content-left">
           <div class="left">
             <a-tooltip>
-              <template #title>{{ item.linkValue }}</template>
+              <template #title>
+                {{ approveStatus === '通过' ? item.linkValue : '请申请后查看' }}
+              </template>
               <p @click="ServiceAddressFunction(item.linkValue)">
-                服务地址：
+                <span>服务地址：</span>
-                {{ item.linkValue }}
+                <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  {{ item.linkValue }}
+                </span>
               </p>
             </a-tooltip>
             <a-tooltip>
-              <template #title>{{ item.csslinkValue }}</template>
+              <template #title>
+                {{
+                  approveStatus === '通过' ? item.csslinkValue : '请申请后查看'
+                }}
+              </template>
+
               <p @click="ServiceAddressFunction(item.csslinkValue)">
-                样式服务地址：
+                <span>样式服务地址：</span>
-                {{ item.csslinkValue }}
+                <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  {{ item.csslinkValue }}
+                </span>
               </p>
             </a-tooltip>
           </div>
-          <div class="right">
+          <div class="right" v-show="approveStatus === '通过'">
             <div @click="technical()">技术文档</div>
             <div @click="technicalNew()">新手指引</div>
           </div>
@@ -46,22 +52,42 @@
               <p>
                 <span>{{ item.facilitator.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.facilitator.value }}</template>
+                  <template #title>
-                  <span>{{ item.facilitator.value }}</span>
+                    {{ item.facilitator.value }}
+                  </template>
+                  <span>
+                    {{ item.facilitator.value }}
+                  </span>
                 </a-tooltip>
               </p>
               <p>
                 <span>{{ item.people.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.people.value }}</template>
+                  <template #title>
-                  <span>{{ item.people.value }}</span>
+                    {{
+                      approveStatus === '通过'
+                        ? item.people.value
+                        : '请申请后查看'
+                    }}
+                  </template>
+                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                    {{ item.people.value }}
+                  </span>
                 </a-tooltip>
               </p>
               <p>
                 <span>{{ item.phone.name }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.phone.value }}</template>
+                  <template #title>
-                  <span>{{ item.phone.value }}</span>
+                    {{
+                      approveStatus === '通过'
+                        ? item.phone.value
+                        : '请申请后查看'
+                    }}
+                  </template>
+                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                    {{ item.phone.value }}
+                  </span>
                 </a-tooltip>
               </p>
             </div>
@@ -94,13 +120,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>
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
@@ -318,7 +344,9 @@
   )
   //服务地址和样式服务地址跳转方法
   function ServiceAddressFunction(link) {
-    window.open(link)
+    if (link && approveStatus.value === '通过') {
+      window.open(link)
+    }
   }
   function technical() {
     // 拼接路径
@@ -373,7 +401,9 @@
     flex-direction: column;
     align-items: center;
     padding: 0.8rem 0;
-
+    .blur-word {
+      filter: blur(4px);
+    }
     .content {
       margin-top: 0.3rem;
       display: flex;