diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 7d38f206..4e4d4ee8 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -55,12 +55,16 @@ width="50" > diff --git a/back/src/views/modules/ability/bsdataresources.vue b/back/src/views/modules/ability/bsdataresources.vue index dcb29158..77d9b1b0 100644 --- a/back/src/views/modules/ability/bsdataresources.vue +++ b/back/src/views/modules/ability/bsdataresources.vue @@ -84,7 +84,11 @@ export default { methods: { // 重置 resetDataList () { - this.dataForm = this.noDataForm + this.dataForm = { + orderId: '', + status: '', + userId: '' + }, this.page = 1 // 当前页码 this.query() }, diff --git a/front/package.json b/front/package.json index 60073475..d0ddbf1b 100644 --- a/front/package.json +++ b/front/package.json @@ -38,6 +38,7 @@ "pinyin-pro": "^3.8.3", "postprocessing": "^5.3.2", "remixicon": "^2.5.0", + "swiper": "^8.2.6", "three": "^0.98.0", "three.meshline": "^1.1.0", "vue": "^3.1.4", @@ -70,6 +71,7 @@ "stylus": "^0.54.5", "stylus-loader": "^3.0.2", "svg-sprite-loader": "^6.0.9", + "swiper": "^8.0.0", "vab-config": "0.0.8", "webpackbar": "^5.0.0-3" }, diff --git a/front/src/assets/newHome/newHome-title-bg.png b/front/src/assets/newHome/newHome-title-bg.png index a6f75e59..f86a4c1a 100644 Binary files a/front/src/assets/newHome/newHome-title-bg.png and b/front/src/assets/newHome/newHome-title-bg.png differ diff --git a/front/src/main.js b/front/src/main.js index 5ceb3773..8cd80605 100644 --- a/front/src/main.js +++ b/front/src/main.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-03-29 17:48:03 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-10 15:45:34 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-07-05 15:04:47 * @Description: 告诉大家这是什么 */ import { createApp } from 'vue' @@ -45,3 +45,9 @@ app for (const [key, component] of Object.entries(ElementPlusIconsVue)) { app.component(key, component) } +router.beforeEach((to, from, next) => { + // console.log('跳转路由=========>', to, from, next) + document.documentElement.scrollTop = 0 + document.body.scrollTop = 0 + next() +}) diff --git a/front/src/views/capabilityCloud/components/PlatformOverview.vue b/front/src/views/capabilityCloud/components/PlatformOverview.vue index 10f569e2..3b68b35d 100644 --- a/front/src/views/capabilityCloud/components/PlatformOverview.vue +++ b/front/src/views/capabilityCloud/components/PlatformOverview.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-19 10:15:33 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-19 17:52:04 + * @LastEditTime: 2022-07-05 16:11:11 * @Description: 告诉大家这是什么 --> @@ -134,7 +134,7 @@ }, grid: { top: '14%', - left: '4%', + left: '6%', right: '5%', bottom: '12%', containLabel: true, diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue index c01126a7..d2483801 100644 --- a/front/src/views/capacityOnTheShelf/Application.vue +++ b/front/src/views/capacityOnTheShelf/Application.vue @@ -391,7 +391,7 @@ } .line { margin-left: 10px; - width: 140px; + width: 280px; height: 1px; background: #999; } diff --git a/front/src/views/detailsAll/AlgorithmDetails.vue b/front/src/views/detailsAll/AlgorithmDetails.vue index f215bd10..b870c33b 100644 --- a/front/src/views/detailsAll/AlgorithmDetails.vue +++ b/front/src/views/detailsAll/AlgorithmDetails.vue @@ -15,12 +15,6 @@ :class="{ fixed: scrollTop >= 600 }" :selectNow="selectNow" > - - + + { associatedComponents.value[0].dataList = res.data.data - debugger loading.value = false }) }) diff --git a/front/src/views/detailsAll/DeveloperComponents.vue b/front/src/views/detailsAll/DeveloperComponents.vue index cd9fcbe3..90bcd4a5 100644 --- a/front/src/views/detailsAll/DeveloperComponents.vue +++ b/front/src/views/detailsAll/DeveloperComponents.vue @@ -16,12 +16,6 @@ :class="{ fixed: scrollTop >= 600 }" :selectNow="selectNow" > - - + + - + + + + + + + {{ dataListitem.name }} + + {{ dataListitem.name }} + + + + + {{ dataListitem.description }} + + {{ dataListitem.description }} + + + + + + + diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue index 6f3c050c..0913adce 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue @@ -1,7 +1,10 @@ - + + + + + + + {{ dataListitem.name }} + + {{ dataListitem.name }} + + + + + {{ dataListitem.description }} + + {{ dataListitem.description }} + + + + + + + diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 4d31df98..adb5ed5d 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -123,7 +123,10 @@ {{ item.deptName || '--' }} - {{ item.description || '--' }} + + {{ item.description }} + {{ item.description || '--' }} + @@ -420,9 +423,9 @@ if (props.selectCardsname == '数据资源') { if (whoShow1.itShowQingDao) { window.open( - 'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' + - item.guid - ) + 'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' + + item.guid + ) } else { window.open( 'http://10.134.135.24:30090/#/home') diff --git a/front/src/views/home/details.vue b/front/src/views/home/details.vue index ff5c7ec5..0b4a51e6 100644 --- a/front/src/views/home/details.vue +++ b/front/src/views/home/details.vue @@ -91,7 +91,7 @@ const router = useRouter() const id = router.currentRoute.value.query.id const obj = JSON.parse(window.sessionStorage.getItem('preview')) - let showView = ref('details-view') + let showView = ref('') const init = () => { if (id) { selectOne(id).then((res) => { diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue index 8457eb4e..71f12971 100644 --- a/front/src/views/newHome/components/Navigation.vue +++ b/front/src/views/newHome/components/Navigation.vue @@ -80,26 +80,32 @@ - + {{ item.name }} - + {{ item.name }} @@ -167,9 +173,9 @@ id: '100001', }, ]) - let shi = ref(['请先选择省份']) - let qu = ref(['请先选择市']) - let jiedao = ref(['请先选择区']) + let shi = ref([]) + let qu = ref([]) + let jiedao = ref([]) function qushijiedao(value) { let danwei = value.substr(-1) // name.substr(-1) diff --git a/front/src/views/personalCenter/components/Collection.vue b/front/src/views/personalCenter/components/Collection.vue index e7041a24..0490c147 100644 --- a/front/src/views/personalCenter/components/Collection.vue +++ b/front/src/views/personalCenter/components/Collection.vue @@ -50,7 +50,7 @@ > {{ item.name }} - 收藏时间:{{ item.createDate }} + 收藏时间:{{ item.updateDate }} - - {{ item.resourceName }} + + + {{ item.resourceName }} + + {{ item.type }} + + + 加购时间:{{ item.time }} + + + 删除 + + - {{ item.type }} + + + + + + +