From fb2e57e756e26442bdd0e5513c6e9d0f2221de11 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 3 Aug 2022 14:27:57 +0800
Subject: [PATCH] =?UTF-8?q?bug746=E7=BB=84=E4=BB=B6=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=AE=97=E6=B3=95-=E7=AE=97=E6=B3=95?=
 =?UTF-8?q?=E4=BC=98=E5=8A=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Algorithm/AlgorithmAdvantage.vue          | 46 +++++++++++++++----
 .../components/addApplication.vue             | 11 ++++-
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue
index e0294a52..628c4813 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue
@@ -9,7 +9,7 @@
   <div class="algorithm-advantage" v-if="flag">
     <detals-title title="算法优势" type="ADVANTGE"></detals-title>
     <div class="main">
-      <div class="top">
+      <div class="top" v-if="data.length < 3">
         <div v-for="val in data" :key="val.id" class="item">
           <div class="icon" :class="val.icon"></div>
           <a-tooltip>
@@ -22,17 +22,44 @@
           </a-tooltip>
         </div>
       </div>
+      <div class="top" v-else>
+        <swiper
+          :slidesPerView="3"
+          :spaceBetween="30"
+          :pagination="{ clickable: true }"
+          :modules="modules"
+          class="mySwiper2"
+          @swiper="onSwiper"
+          @slideChange="onSlideChange"
+        >
+          <swiper-slide v-for="val in data" :key="val.id" class="item">
+            <div class="icon" :class="val.icon"></div>
+            <a-tooltip>
+              <template #title>{{ val.title }}</template>
+              <div class="title">{{ val.title }}</div>
+            </a-tooltip>
+            <a-tooltip>
+              <template #title>{{ val.text }}</template>
+              <div class="text">{{ val.text }}</div>
+            </a-tooltip>
+          </swiper-slide>
+        </swiper>
+      </div>
       <div class="bottom"></div>
     </div>
   </div>
 </template>
 <script setup>
   import { ref, defineProps, watch } from 'vue'
+  import { Navigation, Pagination, Scrollbar, A11y } from 'swiper'
   import DetalsTitle from '@/views/detailsAll/components/DetalsTitle.vue'
+  import { Swiper, SwiperSlide } from 'swiper/vue/swiper-vue.js'
+  import 'swiper/swiper-bundle.min.css'
   const data = ref([])
   const props = defineProps({
     dataList: { type: Object, default: null },
   })
+  const modules = ref([Pagination])
   const flag = ref(true)
   if (props.dataList.infoList) {
     let obj = props.dataList.infoList.filter(
@@ -43,10 +70,10 @@
     } else {
       data.value = []
       let arr = JSON.parse(obj.attrValue)
-      if (arr.length > 3) {
-        // 截取数组前三位
-        arr = arr.splice(0, 3)
-      }
+      // if (arr.length > 3) {
+      //   // 截取数组前三位
+      //   arr = arr.splice(0, 3)
+      // }
       arr.forEach((item, index) => {
         data.value.push({
           title: item.name,
@@ -67,10 +94,10 @@
         } else {
           data.value = []
           let arr = JSON.parse(obj.attrValue)
-          if (arr.length > 3) {
-            // 截取数组前三位
-            arr = arr.splice(0, 3)
-          }
+          // if (arr.length > 3) {
+          //   // 截取数组前三位
+          //   arr = arr.splice(0, 3)
+          // }
           arr.forEach((item, index) => {
             data.value.push({
               title: item.name,
@@ -90,6 +117,7 @@
     .main {
       margin-top: 40px;
       .top {
+        width: 13.14rem;
         display: flex;
         justify-content: space-around;
         align-items: center;
diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue
index 64221936..3dd9b38f 100644
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@@ -98,7 +98,16 @@
                 label="应用领域"
                 name="detailsField"
                 style="width: 6.93rem"
-                :rules="[{ required: true, message: '请选择应用领域' }]"
+                :rules="[
+                  {
+                    required:
+                      formName.detailsType === '应用资源' ||
+                      formName.detailsType === '组件服务'
+                        ? true
+                        : false,
+                    message: '请选择应用领域',
+                  },
+                ]"
               >
                 <a-select
                   :disabled="