diff --git a/proxyConfig.ts b/proxyConfig.ts index e112defa..27f4c06e 100644 --- a/proxyConfig.ts +++ b/proxyConfig.ts @@ -39,6 +39,7 @@ const devProxy = (mode:any) => { } // 这里是生产环境的代理配置 +/* const prodProxy = (mode:any) => { return { // 生产list页缩略图 开发时注释掉 @@ -56,6 +57,7 @@ const prodProxy = (mode:any) => { }, } } + */ // 根据环境变量导出相应的配置 export const proxyConfig = process.env.NODE_ENV === 'production' ? prodProxy : devProxy; diff --git a/src/api/axios.ts b/src/api/axios.ts index ac51a2a2..69c3102a 100644 --- a/src/api/axios.ts +++ b/src/api/axios.ts @@ -21,7 +21,8 @@ export interface MyRequestInstance extends Axios { } const axiosInstance = axios.create({ - baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`, + // baseURL: `${import.meta.env.PROD ? import.meta.env.VITE_PRO_PATH : ''}${axiosPre}`, + baseURL: `${import.meta.env.PROD ? window.location.href : ''}${axiosPre}`, timeout: ResultEnum.TIMEOUT }) as unknown as MyRequestInstance diff --git a/src/enums/httpEnum.ts b/src/enums/httpEnum.ts index fb212059..e14a3aea 100644 --- a/src/enums/httpEnum.ts +++ b/src/enums/httpEnum.ts @@ -14,6 +14,9 @@ export enum ResultEnum { TOKEN_OVERDUE = 886, TIMEOUT = 60000, } +export enum ResultErrcode { + SUCCESS = '00000' +} // 数据相关 export enum RequestDataTypeEnum { diff --git a/src/packages/components/CustomComponents/CustomComponents/GDMap/index.vue b/src/packages/components/CustomComponents/CustomComponents/GDMap/index.vue index d71666af..026b6dc6 100644 --- a/src/packages/components/CustomComponents/CustomComponents/GDMap/index.vue +++ b/src/packages/components/CustomComponents/CustomComponents/GDMap/index.vue @@ -149,7 +149,7 @@ const props = defineProps({ } }) if(!isPreview()) { - Object.assign(props.chartConfig.attr, { w: 950, h: 620 }) + Object.assign(props.chartConfig.attr, { w: 950, h: 820 }) Object.assign(props.chartConfig.request, { requestInterval: 15, requestIntervalUnit: RequestHttpIntervalEnum.SECOND }) } // Object.assign(props.chartConfig.attr, { w: 870, h: 560 }) @@ -191,11 +191,10 @@ const getData = () => { publicInterface('/dcim/space_page', 'get_one_no_permission', { id: props.chartConfig.customData!.mapId }).then(res => { if(res && res.data){ const arr:[] = JSON.parse(res.data.canvas_data) - gdMap = arr.find((_:any) => _.component === 'Picture') || {} + for (const key in gdMap) delete gdMap[key] Object.assign(gdMap, arr.find((_:any) => _.component === 'Picture') || {}) text.splice(0, text.length, ...arr.filter((_:any) => _.component === 'v-text')) - point.splice(0, text.length, ...arr.filter((_:any) => _.component === 'svg-shape')) - + point.splice(0, point.length, ...arr.filter((_:any) => _.component === 'svg-shape')) const activeAlarmData = { levels: [], confirm_statuses: [] diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts index 11bb131b..f91c8f0c 100644 --- a/src/settings/designSetting.ts +++ b/src/settings/designSetting.ts @@ -53,7 +53,7 @@ export const carouselInterval = 4000 export const backgroundImageSize = 5 // 预览展示方式 -export const previewScaleType = PreviewScaleEnum.FULL +export const previewScaleType = PreviewScaleEnum.SCROLL_Y // 编辑工作台同步到 JSON 的轮询间隔(5S) export const editToJsonInterval = 5000 diff --git a/src/views/chart/ContentHeader/headerTitle/index.vue b/src/views/chart/ContentHeader/headerTitle/index.vue index 1ed56ebd..25285f86 100644 --- a/src/views/chart/ContentHeader/headerTitle/index.vue +++ b/src/views/chart/ContentHeader/headerTitle/index.vue @@ -29,7 +29,7 @@