From 2354d8da3bc8fec61d949f31448dee081078632f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Sat, 16 Jul 2022 14:27:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/activiti/my-todo-task.vue   |  15 +-
 .../views/capacityOnTheShelf/Algorithm.vue    |  17 +-
 .../components/PutOnTheShelf.vue              | 446 +++++++++---------
 front/src/views/home/apply.vue                |   2 +-
 4 files changed, 254 insertions(+), 226 deletions(-)

diff --git a/back/src/views/modules/activiti/my-todo-task.vue b/back/src/views/modules/activiti/my-todo-task.vue
index d9c0482b..ebe89cce 100644
--- a/back/src/views/modules/activiti/my-todo-task.vue
+++ b/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>{{
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index dd4c312a..b0340a92 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/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;
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 742dc973..40449b33 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:34:47
+ * @LastEditTime: 2022-07-16 11:29:11
  * @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>
@@ -724,253 +726,253 @@
 </script>
 <style></style>
 <style lang="less" scoped>
-.put-on-the-shelf {
-  height: 680px;
-  overflow: scroll;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 50px 100px 25px;
-  .Technical-text {
-    height: 30px;
-    width: 100px;
-    border: 1px solid #bbd3ef;
-    border-radius: 6px;
-    background: #edf4fc;
-    color: #0087ff;
-    font-size: 14px;
-    text-align: center;
-    line-height: 30px;
-  }
-  .Technical-text:hover {
-    cursor: pointer;
-  }
-
-  & > div {
-    width: 100%;
-    margin-top: 60px;
-
-    .top {
-      color: #333333;
-      font-size: 22px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-bottom: 25px;
-
-      div:first-child,
-      div:last-child {
-        width: 245px;
-        height: 1px;
-        background: #f0f0f0;
-      }
-
-      div:nth-child(2) {
-        margin: 0 30px;
-      }
+  .put-on-the-shelf {
+    height: 680px;
+    overflow: scroll;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 50px 100px 25px;
+    .Technical-text {
+      height: 30px;
+      width: 100px;
+      border: 1px solid #bbd3ef;
+      border-radius: 6px;
+      background: #edf4fc;
+      color: #0087ff;
+      font-size: 14px;
+      text-align: center;
+      line-height: 30px;
+    }
+    .Technical-text:hover {
+      cursor: pointer;
     }
 
-    .bottom {
-      margin-top: 25px;
+    & > div {
+      width: 100%;
+      margin-top: 60px;
 
-      .items {
-        background: #fafafa;
-        padding: 10px;
+      .top {
+        color: #333333;
+        font-size: 22px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-bottom: 25px;
 
-        p {
+        div:first-child,
+        div:last-child {
+          width: 245px;
+          height: 1px;
+          background: #f0f0f0;
+        }
+
+        div:nth-child(2) {
+          margin: 0 30px;
+        }
+      }
+
+      .bottom {
+        margin-top: 25px;
+
+        .items {
+          background: #fafafa;
+          padding: 10px;
+
+          p {
+            display: flex;
+            justify-content: space-between;
+
+            span:nth-of-type(1) {
+              width: 200px;
+            }
+
+            span:nth-of-type(2) {
+              width: 100%;
+              font-weight: 600;
+            }
+          }
+
+          p:nth-of-type(1) > span:nth-of-type(1) {
+            font-size: 18px;
+            font-weight: 600;
+          }
+
+          .del {
+            display: flex;
+            justify-content: flex-end;
+            align-items: center;
+
+            .delImg {
+              cursor: pointer;
+              display: inline-block;
+              width: 16px;
+              height: 18px;
+              background: url(~@/assets/home/sf_del.png) no-repeat;
+              margin-right: 5px;
+            }
+
+            div {
+              cursor: pointer;
+            }
+          }
+        }
+
+        .add {
+          margin-top: 10px;
+          font-size: 16px;
+          color: #007efb;
+        }
+
+        .form {
+          margin-top: 20px;
           display: flex;
-          justify-content: space-between;
+          justify-content: flex-start;
+          align-items: center;
 
-          span:nth-of-type(1) {
+          span:first-child {
+            width: 120px;
+          }
+
+          :deep(.ant-input-textarea) {
+            width: 520px;
+          }
+
+          :deep(.ant-radio-group) {
+            width: 520px;
+          }
+
+          :deep(.ant-input-number) {
             width: 200px;
           }
 
-          span:nth-of-type(2) {
-            width: 100%;
-            font-weight: 600;
+          :deep(.ant-input) {
+            resize: none;
+            width: 520px;
+          }
+
+          .ant-btn {
+            width: 160px;
+            height: 32px;
+            text-align: center;
+            background: #edf4fc;
+            color: #0087ff;
+            border: 1px solid #bbd3ef;
+            border-radius: 6px;
           }
         }
 
-        p:nth-of-type(1) > span:nth-of-type(1) {
-          font-size: 18px;
-          font-weight: 600;
-        }
-
-        .del {
+        .submit {
+          margin-top: 40px;
           display: flex;
           justify-content: flex-end;
-          align-items: center;
 
-          .delImg {
-            cursor: pointer;
-            display: inline-block;
-            width: 16px;
-            height: 18px;
-            background: url(~@/assets/home/sf_del.png) no-repeat;
-            margin-right: 5px;
+          .ant-btn {
+            width: 80px;
+            height: 28px;
+            text-align: center;
+            background: #d9ebff;
+            color: #0087ff;
+            border: 1px solid #0087ff;
+            border-radius: 6px;
           }
-
-          div {
-            cursor: pointer;
-          }
-        }
-      }
-
-      .add {
-        margin-top: 10px;
-        font-size: 16px;
-        color: #007efb;
-      }
-
-      .form {
-        margin-top: 20px;
-        display: flex;
-        justify-content: flex-start;
-        align-items: center;
-
-        span:first-child {
-          width: 120px;
-        }
-
-        :deep(.ant-input-textarea) {
-          width: 520px;
-        }
-
-        :deep(.ant-radio-group) {
-          width: 520px;
-        }
-
-        :deep(.ant-input-number) {
-          width: 200px;
-        }
-
-        :deep(.ant-input) {
-          resize: none;
-          width: 520px;
-        }
-
-        .ant-btn {
-          width: 160px;
-          height: 32px;
-          text-align: center;
-          background: #edf4fc;
-          color: #0087ff;
-          border: 1px solid #bbd3ef;
-          border-radius: 6px;
-        }
-      }
-
-      .submit {
-        margin-top: 40px;
-        display: flex;
-        justify-content: flex-end;
-
-        .ant-btn {
-          width: 80px;
-          height: 28px;
-          text-align: center;
-          background: #d9ebff;
-          color: #0087ff;
-          border: 1px solid #0087ff;
-          border-radius: 6px;
         }
       }
     }
+
+    & > div:nth-of-type(1) {
+      margin-top: 0;
+    }
   }
 
-  & > div:nth-of-type(1) {
-    margin-top: 0;
+  .application-Area {
+    width: 520px;
+    display: grid;
+    margin-top: -5px;
+    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+
+    .application-Area-son {
+      cursor: pointer;
+      font-size: 14px;
+      width: 90px;
+      height: 26px;
+      border-radius: 13px;
+      color: #333333;
+      background: #f5f5f5;
+      border: 1px #cccccc solid;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 10px;
+      font-weight: 500;
+    }
+
+    .application-Area-down {
+      background: #0087ff;
+      color: #fff;
+    }
   }
-}
 
-.application-Area {
-  width: 520px;
-  display: grid;
-  margin-top: -5px;
-  grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+  :deep(.ant-image-img) {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+  }
 
-  .application-Area-son {
-    cursor: pointer;
-    font-size: 14px;
-    width: 90px;
-    height: 26px;
-    border-radius: 13px;
-    color: #333333;
-    background: #f5f5f5;
-    border: 1px #cccccc solid;
+  :deep(.ant-modal) {
+    width: 960px;
+  }
+
+  :deep(.ant-transfer-list) {
+    width: 39.5%;
+    height: 520px;
+  }
+
+  :deep(.ant-transfer-operation) {
+    flex-direction: row-reverse;
+    margin: 0 30px;
+  }
+
+  :deep(.ant-btn) {
+    width: 56px;
+    height: 40px;
+    border-radius: 4px;
+  }
+
+  :deep(.ant-btn:first-child) {
+    margin-left: 4px;
+  }
+
+  :deep(.ant-modal-footer) {
+    border: 0;
+  }
+
+  :deep(.ant-modal-header) {
+    border: 0;
+  }
+
+  :deep(.ant-modal-title) {
+    line-height: 24px;
+    font-size: 18px;
+    color: #303133;
+  }
+
+  :deep(.ant-transfer-list-header) {
+    background: #f5f7fa;
+  }
+
+  :deep(.ant-transfer-list-header-selected) {
     display: flex;
-    justify-content: center;
+    width: 90%;
+    flex-direction: row-reverse;
+    justify-content: space-between;
     align-items: center;
-    margin-top: 10px;
-    font-weight: 500;
   }
 
-  .application-Area-down {
-    background: #0087ff;
-    color: #fff;
+  :deep(.ant-transfer-list-header-title) {
+    font-size: 16px;
+    color: #303133;
+    font-weight: 400;
+    text-align: left;
   }
-}
-
-:deep(.ant-image-img) {
-  width: 100%;
-  height: 100%;
-  object-fit: contain;
-}
-
-:deep(.ant-modal) {
-  width: 960px;
-}
-
-:deep(.ant-transfer-list) {
-  width: 39.5%;
-  height: 520px;
-}
-
-:deep(.ant-transfer-operation) {
-  flex-direction: row-reverse;
-  margin: 0 30px;
-}
-
-:deep(.ant-btn) {
-  width: 56px;
-  height: 40px;
-  border-radius: 4px;
-}
-
-:deep(.ant-btn:first-child) {
-  margin-left: 4px;
-}
-
-:deep(.ant-modal-footer) {
-  border: 0;
-}
-
-:deep(.ant-modal-header) {
-  border: 0;
-}
-
-:deep(.ant-modal-title) {
-  line-height: 24px;
-  font-size: 18px;
-  color: #303133;
-}
-
-:deep(.ant-transfer-list-header) {
-  background: #f5f7fa;
-}
-
-:deep(.ant-transfer-list-header-selected) {
-  display: flex;
-  width: 90%;
-  flex-direction: row-reverse;
-  justify-content: space-between;
-  align-items: center;
-}
-
-:deep(.ant-transfer-list-header-title) {
-  font-size: 16px;
-  color: #303133;
-  font-weight: 400;
-  text-align: left;
-}
 </style>
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 19bdb3f0..8683e7da 100644
--- a/front/src/views/home/apply.vue
+++ b/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 + '个'
                   : '能力申请'
               )

From bb6d58f568c4f997f779a498a3b0caa285cd69dd Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Sat, 16 Jul 2022 14:40:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SharingSituation.vue              | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue
index 9fdf2b43..88b0eddc 100644
--- a/front/src/views/abilityStatistics/components/SharingSituation.vue
+++ b/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: