feat: 修改代理

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;

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
 

src/enums/httpEnum.ts

@@ -14,6 +14,9 @@ export enum ResultEnum {
   TOKEN_OVERDUE = 886,
   TIMEOUT = 60000,
 }
+export enum ResultErrcode {
+  SUCCESS = '00000'
+}
 
 // 数据相关
 export enum RequestDataTypeEnum {

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: []

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

src/views/chart/ContentHeader/headerTitle/index.vue

@@ -29,7 +29,7 @@
 
 <script setup lang="ts">
 import { ref, nextTick, computed, watchEffect } from 'vue'
-import { ResultEnum } from '@/enums/httpEnum'
+import { ResultErrcode } from '@/enums/httpEnum'
 import { fetchRouteParamsLocation, httpErrorHandle, setTitle } from '@/utils'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { ProjectInfoEnum, EditCanvasConfigEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
@@ -70,10 +70,10 @@ const handleBlur = async () => {
   focus.value = false
   chartEditStore.setProjectInfo(ProjectInfoEnum.PROJECT_NAME, title.value || '')
   const res = (await updateProjectApi({
-    id: fetchRouteParamsLocation(),
+    id: Number(fetchRouteParamsLocation()),
     projectName: title.value
   }))
-  if (res && res.code === ResultEnum.SUCCESS) {
+  if (res && res.errcode === ResultErrcode.SUCCESS) {
     dataSyncUpdate()
   } else {
     httpErrorHandle()

src/views/chart/hooks/useSync.hook.ts

@@ -12,7 +12,7 @@ import { fetchChartComponent, fetchConfigComponent, fetchConfigDataComponent, cr
 import { saveInterval } from '@/settings/designSetting'
 import throttle from 'lodash/throttle'
 // 接口状态
-import { ResultEnum } from '@/enums/httpEnum'
+import { ResultEnum, ResultErrcode } from '@/enums/httpEnum'
 // 接口
 import { saveProjectApi, fetchProjectApi, uploadFile, updateProjectApi } from '@/api/path'
 // 画布枚举
@@ -339,17 +339,18 @@ export const useSync = () => {
       id: projectId,
       content: JSONStringify(chartEditStore.getStorageInfo() || {})
     }
-    const res= await saveProjectApi(params)
-
-    if (res && res.data) {
+    const res = await saveProjectApi(params)
+    if (res && res.errcode === ResultErrcode.SUCCESS) {
       // 成功状态
       setTimeout(() => {
         chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.SUCCESS)
+        window['$message'].success('保存成功！')
       }, 1000)
       return
     }
     // 失败状态
     chartEditStore.setEditCanvas(EditCanvasTypeEnum.SAVE_STATUS, SyncEnum.FAILURE)
+    window['$message'].warning('保存失败！')
   }, 3000)
 
   // * 定时处理