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

back/src/views/modules/activiti/my-todo-task.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-27 19:34:30
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-23 21:08:01
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-07-16 11:40:26
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -40,6 +40,17 @@
           align="center"
           width="50"
         ></el-table-column>
+        <!-- <el-table-column label="申请标题" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{
+              (scope.row.params && scope.row.params.tAbilityApplicationDTOList && scope.row.params.tAbilityApplicationDTOList[0].title) ||
+              (scope.row.params && scope.row.params.comment) ||
+              (scope.row.params && scope.row.params.userName) ||
+              (scope.row.params && scope.row.params.undercarriageUserName)||
+              (scope.row.params && scope.row.params.name)
+            }}</span>
+          </template>
+        </el-table-column> -->
         <el-table-column label="申请人" header-align="center" align="center">
           <template slot-scope="scope">
             <span>{{

front/src/views/abilityStatistics/components/SharingSituation.vue

@@ -182,15 +182,15 @@
     })
   }
   let photoBg = ref([
-    require('../../../assets/abilityStatistics/zhishiku-bg.png'),
     require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
+    require('../../../assets/abilityStatistics/zhishiku-bg.png'),
     require('../../../assets/abilityStatistics/zujianfuwu-bg.png'),
     require('../../../assets/abilityStatistics/shujuziyuan-bg.png'),
     require('../../../assets/abilityStatistics/jichujianshe-bg.png'),
   ])
   let photo = ref([
-    require('../../../assets/abilityStatistics/zhishiku.png'),
     require('../../../assets/abilityStatistics/yingyongziyuan.png'),
+    require('../../../assets/abilityStatistics/zhishiku.png'),
     require('../../../assets/abilityStatistics/zujianfuwu.png'),
     require('../../../assets/abilityStatistics/shujuziyuan.png'),
     require('../../../assets/abilityStatistics/jichujianshe.png'),
@@ -202,19 +202,19 @@
       // dataLists.value = res.data.data
       res.data.data.map((item) => {
         switch (item.type) {
-          case '知识库':
-            dataLists.value[0] = item
-            break
           case '应用资源':
             dataLists.value[1] = item
             break
-          case '组件服务':
+          case '业务组件':
+            dataLists.value[0] = item
+            break
+          case '图层服务':
             dataLists.value[2] = item
             break
-          case '数据资源':
+          case '开发组件':
             dataLists.value[3] = item
             break
-          case '基础设施':
+          case '智能算法':
             dataLists.value[4] = item
             break
           default:

front/src/views/capacityOnTheShelf/Algorithm.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:38:56
+ * @LastEditTime: 2022-07-16 14:27:31
  * @Description: 算法上架
 -->
 <template>
@@ -449,6 +449,21 @@
           background: #999;
         }
       }
+      .finish {
+        color: #0087ff;
+        .bg-box {
+          background: #9ccefa;
+          color: #fff;
+          border: 1px solid #9ccefa;
+          span {
+            background: #0087ff;
+            border: 1px solid #0087ff;
+          }
+        }
+        .line {
+          background: #0087ff;
+        }
+      }
       .btn {
         display: flex;
         justify-content: space-around;

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-16 13:20:06
+ * @LastEditTime: 2022-07-16 15:05:16
  * @Description: 上架
 -->
 <template>
@@ -111,7 +111,9 @@
             ></upload>
           </div>
           <div class="submit">
-            <a-button type="primary" @click="add(title.name)">添加</a-button>
+            <a-button type="primary" @click="add(title.name)">
+              添加更多
+            </a-button>
           </div>
         </div>
       </template>

front/src/views/home/apply.vue

@@ -290,7 +290,7 @@
           ? list.value[0].children
               .filter((val) => val.id == list.value[0].checkedList[0])[0]
               .resourceName.concat(
-                list.value[0].checkedList.length > 0
+                list.value[0].checkedList.length > 1
                   ? '等能力申请' + num.value + '个'
                   : '能力申请'
               )