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

front/src/main.js

@@ -21,7 +21,6 @@ import 'vue3-video-play-emiyagm/dist/style.css' // 引入css
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
-import animate from 'animate.css'
 /**
  * @author chuzhixin 1204505056@qq.com
  * @description 正式环境默认使用mock，正式项目记得注释后再打包
@@ -43,7 +42,6 @@ app
   .use(Antd)
   .use(ElementPlus)
   .mount('#app')
-  .use(animate)
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
   app.component(key, component)
 }

front/src/views/home/apply.vue

@@ -82,7 +82,6 @@
                   <a-select
                     v-model:value="formName.applicationSystem"
                     show-search
-                    mode="tags"
                     placeholder="请输入关键字"
                     style="width: 200px"
                     :options="systemOptions"
@@ -317,7 +316,7 @@
                 num.value > 1 ? '等能力申请' + num.value + '个' : '能力申请'
               )
           : list.value[0].arr[0].resourceName.concat('能力申请'), // 标题
-        applicationSystem: [], // 应用系统
+        applicationSystem: '', // 应用系统
         // applicationSystem: [], // 应用系统
         applicationScene: [], // 应用领域
         applicationBackground: '', // 应用背景
@@ -338,7 +337,7 @@
         getApplyForm(id).then((res) => {
           console.log('修改==============>', res.data.data)
           // formName.id = res.data.data.id || ''
-          formName.applicationSystem = res.data.data.applicationSystem || []
+          formName.applicationSystem = res.data.data.applicationSystem || ''
           formName.applicationScene = res.data.data.applicationScene || []
           formName.applicationBackground =
             res.data.data.applicationBackground || ''
@@ -506,7 +505,7 @@
                 )
                 if (formName.system.length !== 0) {
                   if (formName.applicationSystem.length == 0) {
-                    formName.applicationSystem = []
+                    formName.applicationSystem = ''
                   }
                   submitApply(formName).then((res) => {
                     // applySuccess.value = false
@@ -648,7 +647,7 @@
                 )
                 if (formName.system.length !== 0) {
                   if (formName.applicationSystem.length == 0) {
-                    formName.applicationSystem = []
+                    formName.applicationSystem = ''
                   }
                   submitApply(formName).then((res) => {
                     // applySuccess.value = false
@@ -682,7 +681,7 @@
                 }
               }
             } else {
-              formName.applicationSystem = []
+              formName.applicationSystem = ''
               applyAllApplication(formName).then((res) => {
                 if (res.data.code == 0) {
                   message.success('申请提交成功，请到消息中心查看！')
@@ -803,11 +802,21 @@
         console.log(`selected ${value}`)
       }
       const systemHandleSearch = (value) => {
-        console.log(`search ${value}`)
+        // console.log(`search ${value}`)
-        text.value = value
+        // text.value = value
-        systemOptions.value = systemOptions2.value.filter(
+        // systemOptions.value = systemOptions2.value.filter(
-          (item) => item.label.search(text.value) > -1
+        //   (item) => item.label.search(text.value) > -1
-        )
+        // )
+        let valueArray = []
+        systemOptions.value.map((val) => {
+          valueArray.push(val.value)
+        })
+        if (valueArray.indexOf(value) == -1) {
+          systemOptions.value.push({
+            value: value,
+            label: value,
+          })
+        }
       }
       pageWithAttrs({
         pageNum: 1,
@@ -839,7 +848,14 @@
         console.log('focus')
         // console.log(formName.applicationSystem)
         // formName.applicationSystem = []
-        systemOptions.value = systemOptions2.value
+        let arrId = []
+        for (var valueIndex of systemOptions2.value) {
+          if (arrId.indexOf(valueIndex['value']) == -1) {
+            arrId.push(valueIndex['value'])
+            systemOptions.value.push(valueIndex)
+          }
+        }
+        // systemOptions.value = systemOptions2.value
         // systemOptions.value = []
       }
       // const filterOption = (input, option) => {

front/src/views/newHome/components/Navigation.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="navigation">
+  <div class="navigation bg-pan-bl">
     <div class="main" v-if="qeihuan">
       <div class="top">
         <span
@@ -305,7 +305,7 @@
     // justify-content: center;
     align-items: center;
     background: url('~@/assets/newHome/banner-main.jpg') no-repeat;
-    background-size: cover;
+    background-size: 150%;
     :deep(.ant-btn) > span {
       font-size: 0.16rem;
     }
@@ -509,15 +509,15 @@
     /* ----------------------------------------------
  * Generated by Animista on 2022-8-15 14:3:51
  * Licensed under FreeBSD License.
- * See http://animista.net/license for more info.
+ * See http://animista.net/license for more info. 
  * w: http://animista.net, t: @cssanimista
  * ---------------------------------------------- */
 
     /**
- * ----------------------------------------
+    * ----------------------------------------
- * animation tracking-in-expand
+    * animation tracking-in-expand
- * ----------------------------------------
+    * ----------------------------------------
- */
+    */
     @-webkit-keyframes tracking-in-expand {
       0% {
         letter-spacing: -0.5em;
@@ -543,6 +543,38 @@
       }
     }
   }
+  .bg-pan-bl {
+    -webkit-animation: bg-pan-bl 2s both;
+    animation: bg-pan-bl 2s both;
+  }
+  /* ----------------------------------------------
+ * Generated by Animista on 2022-8-15 15:8:37
+ * Licensed under FreeBSD License.
+ * See http://animista.net/license for more info. 
+ * w: http://animista.net, t: @cssanimista
+ * ---------------------------------------------- */
+
+  /**
+ * ----------------------------------------
+ * animation bg-pan-bl
+ * ----------------------------------------
+ */
+  @-webkit-keyframes bg-pan-bl {
+    0% {
+      background-size: 130%;
+    }
+    100% {
+      background-size: 100%;
+    }
+  }
+  @keyframes bg-pan-bl {
+    0% {
+      background-size: 130%;
+    }
+    100% {
+      background-size: 100%;
+    }
+  }
 </style>
 <style>
   .rc-virtual-list-holder {