From bb997653816aa78bc09a57d5fa4e18689dd168af Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 15 Jul 2022 17:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=B7=BB=E5=8A=A0=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/capacityOnTheShelf/Algorithm.vue    | 150 +++---
 .../views/capacityOnTheShelf/Application.vue  |  11 +-
 .../capacityOnTheShelf/BusinessComponent.vue  |  11 +-
 .../DevelopmentComponents.vue                 |  11 +-
 .../capacityOnTheShelf/LayerServices.vue      |  11 +-
 .../components/PutOnTheShelf.vue              | 444 +++++++++---------
 6 files changed, 329 insertions(+), 309 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index f27c0538..dd4c312a 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 16:28:56
+ * @LastEditTime: 2022-07-15 17:38:56
  * @Description: 算法上架
 -->
 <template>
@@ -397,61 +397,92 @@
   })
 </script>
 <style lang="less" scoped>
-.box {
-  position: relative;
-  top: 64px;
-  margin: 15px 400px;
-  padding: 10px;
-  background: #fff;
-  .header {
-    font-size: 28px;
-    font-weight: 600;
-  }
-  .vue-box {
-    padding: 0 100px;
-  }
-  .top {
-    margin: 10px 20px 0;
-    padding: 15px 30px;
-    background: #edf4fc;
-    display: flex;
-    justify-content: space-between;
-    div {
-      font-size: 18px;
-      color: #999;
+  .box {
+    position: relative;
+    top: 64px;
+    margin: 15px 400px;
+    padding: 10px;
+    background: #fff;
+    .header {
+      font-size: 28px;
+      font-weight: 600;
+    }
+    .vue-box {
+      padding: 0 100px;
+    }
+    .top {
+      margin: 10px 20px 0;
+      padding: 15px 30px;
+      background: #edf4fc;
       display: flex;
-      justify-content: center;
-      align-items: center;
-      .bg-box {
+      justify-content: space-between;
+      div {
+        font-size: 18px;
+        color: #999;
         display: flex;
         justify-content: center;
         align-items: center;
-        width: 45px;
-        height: 45px;
-        border-radius: 50%;
-        border: 1px solid rgb(214, 214, 214);
-        margin-right: 10px;
-        transition: all 0.3s ease;
-        span {
+        .bg-box {
           display: flex;
           justify-content: center;
           align-items: center;
-          width: 30px;
-          height: 30px;
+          width: 45px;
+          height: 45px;
           border-radius: 50%;
-          border: 1px solid #999;
+          border: 1px solid rgb(214, 214, 214);
+          margin-right: 10px;
+          transition: all 0.3s ease;
+          span {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 30px;
+            height: 30px;
+            border-radius: 50%;
+            border: 1px solid #999;
+          }
+        }
+        .line {
+          margin-left: 10px;
+          width: 130px;
+          height: 1px;
+          background: #999;
         }
       }
-      .line {
-        margin-left: 10px;
-        width: 130px;
-        height: 1px;
-        background: #999;
+      .btn {
+        display: flex;
+        justify-content: space-around;
+        padding: 10px 350px 0;
+        button {
+          cursor: pointer;
+          width: 80px;
+          height: 35px;
+          text-align: center;
+          color: #fff;
+          border: 1px solid #9ccefa;
+          span {
+            background: #0087ff;
+            border: 1px solid #0087ff;
+          }
+        }
+        .line {
+          background: #0087ff;
+        }
+        button:nth-of-type(1) {
+          color: #0087ff;
+          background: #e1edfa;
+        }
+        button:nth-of-type(2) {
+          background: #01c5dc;
+        }
+      }
+      .first {
+        justify-content: space-around;
       }
     }
     .btn {
       display: flex;
-      justify-content: space-around;
+      justify-content: space-between;
       padding: 10px 350px 0;
       button {
         cursor: pointer;
@@ -459,13 +490,8 @@
         height: 35px;
         text-align: center;
         color: #fff;
-        border: 1px solid #9ccefa;
-        span {
-          background: #0087ff;
-          border: 1px solid #0087ff;
-        }
-      }
-      .line {
+        border: none;
+        border-radius: 6px;
         background: #0087ff;
       }
       button:nth-of-type(1) {
@@ -480,30 +506,4 @@
       justify-content: space-around;
     }
   }
-  .btn {
-    display: flex;
-    justify-content: space-between;
-    padding: 10px 400px 0;
-    button {
-      cursor: pointer;
-      width: 80px;
-      height: 35px;
-      text-align: center;
-      color: #fff;
-      border: none;
-      border-radius: 6px;
-      background: #0087ff;
-    }
-    button:nth-of-type(1) {
-      color: #0087ff;
-      background: #e1edfa;
-    }
-    button:nth-of-type(2) {
-      background: #01c5dc;
-    }
-  }
-  .first {
-    justify-content: center;
-  }
-}
 </style>
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue
index dc0882d2..9e66206a 100644
--- a/front/src/views/capacityOnTheShelf/Application.vue
+++ b/front/src/views/capacityOnTheShelf/Application.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-14 09:44:49
+ * @LastEditTime: 2022-07-15 17:39:25
  * @Description: 应用上架
 -->
 <template>
@@ -75,6 +75,7 @@
       ></application-deployment-use> -->
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
+      <button @click="close()">取消</button>
       <button v-show="showView !== '基本信息'" @click="back()">上一步</button>
       <button v-show="showView === '部署与应用'" @click="preview()">
         预览
@@ -347,6 +348,10 @@
     }
     // console.log('dataFrom.value', dataFrom.value)
   })
+
+  const close = () => {
+    window.close()
+  }
   onBeforeUnmount(() => {
     mybus.off('chageDataFrom')
     mybus.off('chageFileList')
@@ -426,7 +431,7 @@
     .btn {
       display: flex;
       justify-content: space-between;
-      padding: 10px 400px 0;
+      padding: 10px 350px 0;
       button {
         cursor: pointer;
         width: 80px;
@@ -446,7 +451,7 @@
       }
     }
     .first {
-      justify-content: center;
+      justify-content: space-around;
     }
   }
 </style>
diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
index 015338ff..9d8a9617 100644
--- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue
+++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-14 09:44:58
+ * @LastEditTime: 2022-07-15 17:39:35
  * @Description: 业务组件
 -->
 <template>
@@ -59,6 +59,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
+      <button @click="close()">取消</button>
       <button v-show="showView !== '基本信息'" @click="back()">上一步</button>
       <button v-show="showView === '部署与使用'" @click="preview()">
         预览
@@ -195,6 +196,10 @@
     type: '组件服务',
     deptId: '',
   })
+
+  const close = () => {
+    window.close()
+  }
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
@@ -439,7 +444,7 @@
     .btn {
       display: flex;
       justify-content: space-between;
-      padding: 10px 400px 0;
+      padding: 10px 350px 0;
       button {
         cursor: pointer;
         width: 80px;
@@ -459,7 +464,7 @@
       }
     }
     .first {
-      justify-content: center;
+      justify-content: space-around;
     }
   }
 </style>
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
index 94bd7ee7..9d123dbd 100644
--- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
+++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:17
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-14 09:45:07
+ * @LastEditTime: 2022-07-15 17:39:42
  * @Description: 开发组件
 -->
 <template>
@@ -59,6 +59,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
+      <button @click="close()">取消</button>
       <button v-show="showView !== '基本信息'" @click="back()">上一步</button>
       <button v-show="showView === '部署与使用'" @click="preview()">
         预览
@@ -195,6 +196,10 @@
     type: '组件服务',
     deptId: '',
   })
+
+  const close = () => {
+    window.close()
+  }
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
@@ -439,7 +444,7 @@
     .btn {
       display: flex;
       justify-content: space-between;
-      padding: 10px 400px 0;
+      padding: 10px 350px 0;
       button {
         cursor: pointer;
         width: 80px;
@@ -459,7 +464,7 @@
       }
     }
     .first {
-      justify-content: center;
+      justify-content: space-around;
     }
   }
 </style>
diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue
index 03ffe283..0c58e0e2 100644
--- a/front/src/views/capacityOnTheShelf/LayerServices.vue
+++ b/front/src/views/capacityOnTheShelf/LayerServices.vue
@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-20 09:35:17
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-14 09:45:18
+ * @LastEditTime: 2022-07-15 17:39:47
  * @Description: 图层服务
 -->
 <template>
@@ -57,6 +57,7 @@
       ></put-on-the-shelf>
     </div>
     <div class="btn" :class="showView === '基本信息' ? 'first' : ''">
+      <button @click="close()">取消</button>
       <button v-show="showView !== '基本信息'" @click="back()">上一步</button>
       <button v-show="showView === '部署与使用'" @click="preview()">
         预览
@@ -157,6 +158,10 @@
       }
     })
   }
+
+  const close = () => {
+    window.close()
+  }
   const next = () => {
     let i = -1
     navList.value.forEach((val, index) => {
@@ -387,7 +392,7 @@
     .btn {
       display: flex;
       justify-content: space-between;
-      padding: 10px 400px 0;
+      padding: 10px 350px 0;
       button {
         cursor: pointer;
         width: 80px;
@@ -407,7 +412,7 @@
       }
     }
     .first {
-      justify-content: center;
+      justify-content: space-around;
     }
   }
 </style>
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index ad83b8d1..a34716d8 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 16:56:49
+ * @LastEditTime: 2022-07-15 17:34:47
  * @Description: 上架
 -->
 <template>
@@ -252,7 +252,7 @@
               </a-select-option>
             </a-select>
             <a-select
-              v-else-if="item.type == 'select'"
+              v-else-if="item.type == 'select' && item.name !== '归属部门'"
               style="width: 240px"
               v-model:value="item.note1"
               :placeholder="'请选择' + item.name"
@@ -723,253 +723,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>