Merge branch 'master' of https://gitcode.com/hk_openRepo/OpenRepo_Portal into junjie_dev

# Conflicts:
#	src/api/jyh/index.ts
#	src/components/AdvanceSearch/index.vue
#	src/views/Jyh/Home/index.vue

src/components/AdvanceSearch/index.vue

@@ -4,8 +4,8 @@
     <d-form :layout="props.layout" :label-align="'end'">
       <d-row :gutter="16">
         <d-col :span="8">
-          <d-form-item field="name" label="软件/组件名称">
-            <d-input placeholder="请输入软件/组件名称" v-model="formData.searchWord"/>
+          <d-form-item field="name" label="软件名称">
+            <d-input placeholder="请输入软件名称" v-model="formData.searchWord"/>
           </d-form-item>
         </d-col>
         <d-col :span="8">
@@ -21,7 +21,7 @@
       </d-row>
       <d-row :gutter="16">
         <d-col :span="8">
-          <d-form-item field="dependency" label="依赖软件">
+          <d-form-item field="dependency" label="依赖软件名称">
             <d-input v-model="formData.dependentSoftware"/>
           </d-form-item>
         </d-col>
@@ -49,8 +49,6 @@
 
 <script setup lang="ts">
 import { ref, defineEmits, defineProps, watch } from 'vue';
-import { searchLanguageList } from '@/api/jyh'
-
 const props = defineProps({
   layout: {
     type: String,
@@ -102,15 +100,36 @@ const cancel = () => {
   emit('update:modelValue', formData.value);
 }
 
-const getLanguageList = async() => {
-  const res: any = await searchLanguageList();
-  if (!res.error) {
-    languageList.value = res.data.data;
-  }
+const getLanguageList = () => {
+  const mockData = [
+      {
+          "key": "c++",
+          "name": "C++"
+      },
+      {
+          "key": "C",
+          "name": "C"
+      },
+      {
+          "key": "PYTHON",
+          "name": "PYTHON"
+      },
+      {
+          "key": "JAVA",
+          "name": "JAVA"
+      }
+  ]
+
+  languageList.value = mockData.map(item => {
+    return {
+      name: item.name,
+      value: item.key
+    }
+  })
 }
 getLanguageList();
 </script>
 
 <style scoped lang="scss">
 
-</style>
+</style>