diff --git a/front/public/static/css/modal.css b/front/public/static/css/modal.css index 130de93b..df46ad54 100644 --- a/front/public/static/css/modal.css +++ b/front/public/static/css/modal.css @@ -89,6 +89,9 @@ z-index: 10010!important; .ant-tooltip{ z-index: 10010!important; } +.ant-image-preview-wrap { + z-index: 10012!important; +} .model-container .confirmChrome { width: 140px; diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue index e3d435b9..71adc58f 100644 --- a/front/src/views/newHome/components/WorkDynamics.vue +++ b/front/src/views/newHome/components/WorkDynamics.vue @@ -236,8 +236,7 @@ router.push({ path: '/DetailsPageconetent', query: { - select: '基础设施', - zwy: true, + select: '应用资源', }, }) } diff --git a/front/src/views/personalCenter/components/MyBrowse.vue b/front/src/views/personalCenter/components/MyBrowse.vue index db6fb3da..d855119a 100644 --- a/front/src/views/personalCenter/components/MyBrowse.vue +++ b/front/src/views/personalCenter/components/MyBrowse.vue @@ -220,7 +220,7 @@ type.value = '' pageNum.value = '1' pageSize.value = '5' - tabIndex.value = 0 + tabIndex.value = -1 showKey.value++ checkAll.value = false getList() @@ -333,7 +333,7 @@ showKey.value++ } // 切换筛选条件 - const tabIndex = ref(0) + const tabIndex = ref(-1) const changeTab = (index) => { console.log('tabIndex', tabIndex.value, index, tabList) if (tabIndex.value == index) { @@ -388,39 +388,39 @@ } //监听tabindex发生改变调用接口 watch(tabIndex, (val) => { - getBsList({ - limit: pageSize.value, - page: pageNum.value, - type: tabList.value[val], - name: name.value, - }).then((res) => { - checkAll.value = true - console.log('申购车列表================>', res) - initLoading.value = false - list.value = [] - total.value = res.data.data.total - res.data.data.list.forEach((val) => { - const obj = { - loading: false, - name: val.resourceDTO.name, - id: val.id, - checked: false, - visits: val.resourceDTO.visits, - type: val.resourceDTO.type, - link: val.resourceDTO.link, - resourceId: val.resourceId, - createDate: val.createDate, - description: val.resourceDTO.description, - delFlag: val.resourceDTO.delFlag, - } - if (checkedList.value.indexOf(val.id) == -1) { - checkAll.value = false - } else { - obj.checked = true - } - list.value.push(obj) - }) - }) + // getBsList({ + // limit: pageSize.value, + // page: pageNum.value, + // type: tabList.value[val], + // name: name.value, + // }).then((res) => { + // checkAll.value = true + // console.log('申购车列表================>', res) + // initLoading.value = false + // list.value = [] + // total.value = res.data.data.total + // res.data.data.list.forEach((val) => { + // const obj = { + // loading: false, + // name: val.resourceDTO.name, + // id: val.id, + // checked: false, + // visits: val.resourceDTO.visits, + // type: val.resourceDTO.type, + // link: val.resourceDTO.link, + // resourceId: val.resourceId, + // createDate: val.createDate, + // description: val.resourceDTO.description, + // delFlag: val.resourceDTO.delFlag, + // } + // if (checkedList.value.indexOf(val.id) == -1) { + // checkAll.value = false + // } else { + // obj.checked = true + // } + // list.value.push(obj) + // }) + // }) })