diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 07ede728..e04fcd67 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,14 +2,14 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-12-02 16:52:28 + * @LastEditTime: 2022-12-05 15:20:39 * @Description: 系统静态参数配置 */ var _global = {} var CONFIGITEM = { - version: 'qingdao', //青岛 + // version: 'qingdao', //青岛 // version: 'xihaian', // 西海岸 - // version: 'dev', // 开发 + version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) // version: 'qingdao', // 测试 //version: 'frp', // 内网穿透 diff --git a/front/public/static/css/modal.css b/front/public/static/css/modal.css index 34345a32..130de93b 100644 --- a/front/public/static/css/modal.css +++ b/front/public/static/css/modal.css @@ -81,7 +81,7 @@ z-index: 10010!important; z-index: 10010!important; } .ant-notification { -z-index: 10010!important; +z-index: 10012!important; } .ant-popconfirm { z-index: 10010!important; diff --git a/front/src/utils/accessToken.js b/front/src/utils/accessToken.js index b5df58f4..d34fdbca 100644 --- a/front/src/utils/accessToken.js +++ b/front/src/utils/accessToken.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-03-29 17:48:03 - * @LastEditors: Light - * @LastEditTime: 2022-10-10 16:56:17 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-12-05 15:27:26 * @Description: 告诉大家这是什么 */ import { storage, tokenTableName } from '@/config' @@ -42,8 +42,9 @@ export function setAccessToken(accessToken) { } else if ('sessionStorage' === storage) { return sessionStorage.setItem(tokenTableName, accessToken) } else if ('cookie' === storage) { - let expires = new Date(new Date() * 1 + 12 * 60 * 60 * 1000) - return cookie.set(tokenTableName, accessToken, { expires: expires }) + // let expires = new Date(new Date() * 1 + 12 * 60 * 60 * 1000) + // return cookie.set(tokenTableName, accessToken, { expires: expires }) + return cookie.set(tokenTableName, accessToken) // return cookie.set(tokenTableName, '213124123412341234') } else { return localStorage.setItem(tokenTableName, accessToken) diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index d6ab3764..3ce46e29 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -835,7 +835,7 @@ let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB - let orderField =router.currentRoute.value.query.orderField + let orderField = router.currentRoute.value.query.orderField // 例如:组件服务是大类型,selectSubType是组件服务的智能算法或图层服务等... let selectSubType = router.currentRoute.value.query.type || '' let queryName = ref('') @@ -1324,8 +1324,7 @@ globalData.data = [] } select = router.currentRoute.value.query.select - - + if ( (select == '应用资源' && (paramsGetResources.orderField == '' || @@ -1786,9 +1785,9 @@ onMounted(() => { // 从本地读取查询条件,赋值 //西海岸基础设施放在最前面 - orderField= router.currentRoute.value.query.orderField //根据什么排序 - if(orderField){ - paramsGetResources.orderField=orderField + orderField = router.currentRoute.value.query.orderField //根据什么排序 + if (orderField) { + paramsGetResources.orderField = orderField } setTitle() handleSetSearchData() @@ -2098,7 +2097,7 @@ height: 100%; height: -moz-available; /* WebKit-based browsers will ignore this. */ height: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */ - height: fill-available; + height: stretch; position: absolute; width: 2.5rem; top: 0.17rem; diff --git a/front/src/views/home/algorithmCompare.vue b/front/src/views/home/algorithmCompare.vue index 5ab4b261..dcb757d4 100644 --- a/front/src/views/home/algorithmCompare.vue +++ b/front/src/views/home/algorithmCompare.vue @@ -1,6 +1,6 @@