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

front/src/api/cimSpecialArea.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.liangjunhua
  * @Date: 2022-08-19 14:25:45
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-19 15:25:03
+ * @LastEditTime: 2022-08-27 15:52:54
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -27,7 +27,7 @@ export function cimImgResources(params) {
     method: 'get',
   })
 }
-// cim+算法
+// CIM+组件
 export function cimAssemblyResources() {
   return request({
     url: '/resource/cimAssemblyResources',

front/src/views/cimSpecialArea/components/algorithm.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <div class="algorithm">
-    <div class="header">CIM+算法</div>
+    <div class="header">CIM+组件</div>
     <div class="main">
       <div
         class="item"

front/src/views/cimSpecialArea/components/cimHead.vue

@@ -27,7 +27,7 @@
       num: 0,
     },
     {
-      name: 'CIM+算法',
+      name: 'CIM+组件',
       img: require('@/assets/cimSpecialArea/algorithm.png'),
       num: 0,
     },

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-27 10:57:24
+ * @LastEditTime: 2022-08-27 15:43:57
  * @Description: 应用详情
 -->
 <template>
@@ -19,10 +19,7 @@
         </a-tooltip>
         <a-tooltip v-else>
           <template #title>请申请后查看</template>
-          <p
+          <p style="cursor: pointer; filter: blur(4px)">
-            style="cursor: pointer; filter: blur(4px)"
-            @click="clickLink(dataFrom.link)"
-          >
             {{ dataFrom.link }}
           </p>
         </a-tooltip>
@@ -89,19 +86,19 @@
     let obj = props.dataList.approveStatus
     if (obj !== '通过' && whoShow1.value.itShowQingDao) {
       flag.value = false
-    } else {
-      dataFrom.value.link = props.dataList.link
-      props.dataList.infoList.map((item) => {
-        if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
-          dataFrom.value.number = item.attrValue
-        } else if (item.attrType == '试用密码') {
-          dataFrom.value.password2 = item.attrValue
-        }
-      })
-      if (dataFrom.value.password2 === '') {
-        dataFrom.value.password = ''
-      }
     }
+    dataFrom.value.link = props.dataList.link
+    props.dataList.infoList.map((item) => {
+      if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
+        dataFrom.value.number = item.attrValue
+      } else if (item.attrType == '试用密码') {
+        dataFrom.value.password2 = item.attrValue
+      }
+    })
+    if (dataFrom.value.password2 === '') {
+      dataFrom.value.password = ''
+    }
+    // }
   }
   const clickLink = (link) => {
     window.open(link)
@@ -137,20 +134,19 @@
     (val) => {
       if (val) {
         let obj = props.dataList.approveStatus
-        if (obj !== '通过') {
+        if (obj !== '通过' && whoShow1.value.itShowQingDao) {
           flag.value = false
-        } else {
+        }
-          dataFrom.value.link = props.dataList.link
+        dataFrom.value.link = props.dataList.link
-          props.dataList.infoList.map((item) => {
+        props.dataList.infoList.map((item) => {
-            if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
+          if (item.attrType == '试用用户名' || item.attrType == '试用账号') {
-              dataFrom.value.number = item.attrValue
+            dataFrom.value.number = item.attrValue
-            } else if (item.attrType == '试用密码') {
+          } else if (item.attrType == '试用密码') {
-              dataFrom.value.password2 = item.attrValue
+            dataFrom.value.password2 = item.attrValue
-            }
-          })
-          if (dataFrom.value.password2 === '') {
-            dataFrom.value.password = ''
           }
+        })
+        if (dataFrom.value.password2 === '') {
+          dataFrom.value.password = ''
         }
       }
     }