diff --git a/web_src/vuepages/apis/modules/tech.js b/web_src/vuepages/apis/modules/tech.js index 48dac70b2..679d4f9b6 100644 --- a/web_src/vuepages/apis/modules/tech.js +++ b/web_src/vuepages/apis/modules/tech.js @@ -16,6 +16,7 @@ export const setOpenIApply = (data) => { url: '/api/v1/tech/openi', method: 'post', data: data, + params: {}, }); } @@ -27,6 +28,7 @@ export const setNoOpenIApply = (data) => { url: '/api/v1/tech/no_openi', method: 'post', data: data, + params: {}, }); } @@ -34,7 +36,7 @@ export const setNoOpenIApply = (data) => { // 返回 [{id:用户ID,name:用户名字,rel_avatar_link:用户图像地址,short_name:用户短名称},...] export const getCreateRepoUser = () => { return service({ - url: '/api/v1/create_repo/user', + url: '/api/v1/user/owners', method: 'get', params: {}, }); @@ -98,6 +100,7 @@ export const setTechAdminOperation = (data) => { url: `/api/v1/tech/admin/action/${data.type}`, method: 'post', data: data.id, + params: {}, }); } @@ -108,6 +111,7 @@ export const setTechImportExcel = () => { url: `/api/v1/tech/basic`, method: 'post', data: {}, + params: {}, }); } @@ -119,6 +123,7 @@ export const setTechAdminAdd = (data) => { url: '/api/v1/tech/admin_add', method: 'post', data: data, + params: {}, }); } diff --git a/web_src/vuepages/pages/tech/adminview/index.vue b/web_src/vuepages/pages/tech/adminview/index.vue index 8cd86ae7b..5bd1f7664 100644 --- a/web_src/vuepages/pages/tech/adminview/index.vue +++ b/web_src/vuepages/pages/tech/adminview/index.vue @@ -104,7 +104,7 @@ export default { }, }, beforeMount() { - + this.getData(); }, mounted() { this.tableData = new Array(15).fill(0).map((item, index) => { diff --git a/web_src/vuepages/pages/tech/components/Filters.vue b/web_src/vuepages/pages/tech/components/Filters.vue index f9eb010e9..9fee2f288 100644 --- a/web_src/vuepages/pages/tech/components/Filters.vue +++ b/web_src/vuepages/pages/tech/components/Filters.vue @@ -150,7 +150,6 @@ export default { watch: { condition: { handler(newVal) { - console.log('Filters:watch:condition', newVal); this.conds.type_name = newVal.type_name || ''; this.conds.institution_name = newVal.institution_name || ''; this.conds.execute_year = newVal.execute_year || ''; @@ -169,31 +168,24 @@ export default { } else if (this.type == 1) { this.mainData = this.list_repo; } - const data = { - type_name: ['基础前沿', '应用示范研究', '重大共性关键技术', '其他', '基础前沿1', '基础前沿2', '基础前沿3', '基础前沿4', '基础前沿5'], - institution_name: ['北京大学', '北京工业大学', '北京航空航天大学', '北京交通大学', '清华大学'], - execute_year: ['2019', '2020', '2021', '2022', '2023'], - apply_year: ['2018', '2019', '2020', '2021', '2022'], - topic: ['数据库', '操作系统', '云计算', '大数据', '数据可视化', '其他'], - project_name: ['新一代神经网络模型', '小样本条件下的自适应机器学习理论', '面向复杂数据处理的新型神经网络模型'], - } - for (let i = 0, iLen = this.mainData.length; i < iLen; i++) { - const filterItem = this.mainData[i]; - const key = filterItem.key; - const max = filterItem.showMaxLen; - if (data[key]) { - filterItem.data = data[key]; - filterItem.showData = data[key].slice(0, max); - if (this.conds[key] && filterItem.showData.indexOf(this.conds[key]) < 0) { - filterItem.showData.push(this.conds[key]); - } - } - } - return; getTechFilterInfo({ type: this.type, }).then(res => { - console.log(res); + const data = res.data; + if (data) { + for (let i = 0, iLen = this.mainData.length; i < iLen; i++) { + const filterItem = this.mainData[i]; + const key = filterItem.key; + const max = filterItem.showMaxLen; + if (data[key]) { + filterItem.data = data[key].map(item => item.toString()); + filterItem.showData = filterItem.data.slice(0, max); + if (this.conds[key] && filterItem.showData.indexOf(this.conds[key]) < 0) { + filterItem.showData.push(this.conds[key]); + } + } + } + } }).catch(err => { console.log(err); }); @@ -264,6 +256,8 @@ export default { .filter-item-c { display: flex; flex-wrap: wrap; + max-height: 605px; + overflow-y: auto; .filter-item { border-radius: 3px; diff --git a/web_src/vuepages/pages/tech/components/PrjResultsItem.vue b/web_src/vuepages/pages/tech/components/PrjResultsItem.vue index 3f507a723..99974c162 100644 --- a/web_src/vuepages/pages/tech/components/PrjResultsItem.vue +++ b/web_src/vuepages/pages/tech/components/PrjResultsItem.vue @@ -2,26 +2,29 @@
- - + +
- {{ data.Alias }} + + {{ data.alias }} +
-
- {{ data.Description }} +
+ {{ data.description }}
- {{ item }} + {{ item }}
-
鹏城实验室
+
{{ data.institution.split(',').join('、') }} +
{{ $t('repos.updated') }} - - {{ calcFromNow(data.UpdatedUnix) }} + + {{ calcFromNow(data.updated_unix) }}
@@ -40,9 +43,7 @@ export default { }, components: {}, data() { - return { - - }; + return {}; }, methods: { calcFromNow(unix) { diff --git a/web_src/vuepages/pages/tech/components/PrjResultsList.vue b/web_src/vuepages/pages/tech/components/PrjResultsList.vue index 8ec0fcc39..b2de37ed1 100644 --- a/web_src/vuepages/pages/tech/components/PrjResultsList.vue +++ b/web_src/vuepages/pages/tech/components/PrjResultsList.vue @@ -1,12 +1,19 @@