From e8b741077e44a079dd99725d45a53214c4bd7621 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 15 Jul 2022 16:16:50 +0800
Subject: [PATCH] =?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

---
 .../src/views/modules/ability/bsabilityai.vue | 78 +++++++++----------
 .../views/capacityOnTheShelf/Algorithm.vue    | 14 +++-
 .../components/PutOnTheShelf.vue              |  4 +-
 3 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 513a0fc3..930685e1 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -510,45 +510,45 @@ export default {
         })
       })
       this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
-      // if (this.submitFrom.id) {
-      //   // 解决编辑无组件类型
-      //   this.submitFrom.infoList.map(val => {
-      //     if (val.attrType === '组件类型') {
-      //       val.attrValue = this.radio
-      //     }
-      //   })
-      //   console.log('编辑===============>', this.submitFrom)
-      //   console.log(this.submitFrom.infoList, '===============abc')
-      //   // 去重
-      //   const newArr = this.submitFrom.infoList.filter((element, index, self) => {
-      //     return self.findIndex(x => x.attrType === element.attrType) === index
-      //   })
-      //   this.submitFrom.infoList = newArr
-      //   console.log(this.submitFrom.infoList, '====================================wpwpwp')
-      //   this.$http
-      //     .put('/resource/update', this.submitFrom)
-      //     .then(({ data: res }) => {
-      //       if (res.code !== 0) {
-      //         this.$message.error('修改失败!')
-      //       } else {
-      //         this.$message.success('修改成功！')
-      //         this.clear()
-      //       }
-      //     })
-      //     .catch(() => {})
-      // } else {
-      //   this.$http
-      //     .post('/resource/insert?source= b', this.submitFrom)
-      //     .then(({ data: res }) => {
-      //       if (res.code !== 0) {
-      //         this.$message.error('上架失败!')
-      //       } else {
-      //         this.$message.success('上架成功！')
-      //         this.clear()
-      //       }
-      //     })
-      //     .catch(() => {})
-      // }
+      if (this.submitFrom.id) {
+        // 解决编辑无组件类型
+        this.submitFrom.infoList.map(val => {
+          if (val.attrType === '组件类型') {
+            val.attrValue = this.radio
+          }
+        })
+        console.log('编辑===============>', this.submitFrom)
+        console.log(this.submitFrom.infoList, '===============abc')
+        // 去重
+        const newArr = this.submitFrom.infoList.filter((element, index, self) => {
+          return self.findIndex(x => x.attrType === element.attrType) === index
+        })
+        this.submitFrom.infoList = newArr
+        console.log(this.submitFrom.infoList, '====================================wpwpwp')
+        this.$http
+          .put('/resource/update', this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error('修改失败!')
+            } else {
+              this.$message.success('修改成功！')
+              this.clear()
+            }
+          })
+          .catch(() => {})
+      } else {
+        this.$http
+          .post('/resource/insert?source= b', this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error('上架失败!')
+            } else {
+              this.$message.success('上架成功！')
+              this.clear()
+            }
+          })
+          .catch(() => {})
+      }
     },
     // 新修改
     UpdateData (item) {
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index dc8a25ca..cf63b3c2 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 11:50:22
+ * @LastEditTime: 2022-07-15 16:13:40
  * @Description: 算法上架
 -->
 <template>
@@ -31,12 +31,14 @@
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '算法优势'"
+        ref="sfys"
         :refData="refData"
         :dataFrom="dataFrom"
         :configure="sfys"
       ></put-on-the-shelf>
       <put-on-the-shelf
         v-else-if="showView === '应用场景'"
+        ref="yycj"
         :refData="refData"
         :dataFrom="dataFrom"
         :configure="yycj"
@@ -80,6 +82,7 @@
       ></algorithm-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()">
         预览
@@ -216,6 +219,9 @@
   getUser().then((res) => {
     dataFrom.value.deptId = res.data.data.deptId
   })
+  const close = () => {
+    window.close()
+  }
   const back = () => {
     navList.value.forEach((val, index) => {
       if (val.key === showView.value && index > 0) {
@@ -446,8 +452,8 @@
     }
     .btn {
       display: flex;
-      justify-content: space-between;
-      padding: 10px 400px 0;
+      justify-content: space-around;
+      padding: 10px 350px 0;
       button {
         cursor: pointer;
         width: 80px;
@@ -467,7 +473,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 9eead4b5..6d1bc918 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 11:51:18
+ * @LastEditTime: 2022-07-15 14:57:15
  * @Description: 上架
 -->
 <template>
@@ -111,7 +111,7 @@
             ></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>