From 26b35f6bc94b4b7a783417c34ec72dc6a8388a1d Mon Sep 17 00:00:00 2001
From: jiangx <1457960500@qq.com>
Date: Tue, 13 Jun 2023 10:16:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/offline/JSON/GetDevCoordinateByIP.json | 2 +-
 public/static/offline/JSON/config.json               | 3 +--
 src/composables/useInitMap.ts                        | 5 +++--
 src/enums/index.ts                                   | 5 +++++
 src/http/api/base/index.ts                           | 2 +-
 src/http/http.ts                                     | 3 ++-
 src/types/config.d.ts                                | 3 ++-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/public/static/offline/JSON/GetDevCoordinateByIP.json b/public/static/offline/JSON/GetDevCoordinateByIP.json
index 2a45bfe..73b8464 100644
--- a/public/static/offline/JSON/GetDevCoordinateByIP.json
+++ b/public/static/offline/JSON/GetDevCoordinateByIP.json
@@ -12,7 +12,7 @@
     "buildingOrder": 0,
     "floor": "B4",
     "floorCode": "uDKfemAB1vCVZsudb_hmh",
-    "floorOrder": 0,
+    "floorOrder":2,
     "ip": "192.168.1.209",
     "mac": "4CEDFBCAFF27",
     "location": "0",
diff --git a/public/static/offline/JSON/config.json b/public/static/offline/JSON/config.json
index b1ded3b..aad3eea 100644
--- a/public/static/offline/JSON/config.json
+++ b/public/static/offline/JSON/config.json
@@ -2,9 +2,8 @@
   "code": 200,
   "msg": "操作成功",
   "data": {
-    "sourceUrl": "/static/offline",
     "interfaceUrl": "https://project-iot.test.1000my.com/api",
     "mobileNav": "https://1000my.obs.cn-east-2.myhuaweicloud.com/mobileqmgo/index.html#/",
     "handWriteUrl": "http://saas.1000my.com:8014/words"
   }
-}
\ No newline at end of file
+}
diff --git a/src/composables/useInitMap.ts b/src/composables/useInitMap.ts
index 5d7fac1..2e1d589 100644
--- a/src/composables/useInitMap.ts
+++ b/src/composables/useInitMap.ts
@@ -2,15 +2,16 @@ import { useRootStore } from '@/store/root'
 import { storeToRefs } from 'pinia'
 import { getMapData } from '@/http/api/base'
 import Message from '@/base/Message/Message'
+import { PREFIX } from '@/enums'
 
 export const useInitMap = async function () {
   const store = useRootStore()
-  const { device, facilityList, shopList, config } = storeToRefs(store)
+  const { device, facilityList, shopList } = storeToRefs(store)
   try {
     const { data } = await getMapData()
     const delPrefixOfFacilityList = facilityList.value.slice().map(item => ({
       ...item,
-      filePath: item.filePath.replace(config.value.sourceUrl, '')
+      filePath: item.filePath.replace(PREFIX.STATIC_URL, '')
     }))
 
     //初始化地图
diff --git a/src/enums/index.ts b/src/enums/index.ts
index 70718a1..b4ff379 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -25,3 +25,8 @@ export enum HTTP_CODE {
   ERR_NULL = '401', //未识别到语音
   ERR_DISCERNING = 201 //语音识别中
 }
+
+export enum PREFIX {
+  BASE64 = 'data:image/jpg;base64,',
+  STATIC_URL = './static/offline'
+}
diff --git a/src/http/api/base/index.ts b/src/http/api/base/index.ts
index 1cce37a..05fbadc 100644
--- a/src/http/api/base/index.ts
+++ b/src/http/api/base/index.ts
@@ -2,7 +2,7 @@ import { request } from '@/http/http'
 import type { WrittenQuery } from './types'
 
 //获取配置项
-export const getConfig = () => request<Config>({ url: '/static/offline/JSON/config.json' })
+export const getConfig = () => request<Config>({ url: '/JSON/config.json' })
 
 //获取天气
 export const getWeather = () => request<Weather>({ url: `/JSON/GetWeather.json` })
diff --git a/src/http/http.ts b/src/http/http.ts
index 13fc093..be9e975 100644
--- a/src/http/http.ts
+++ b/src/http/http.ts
@@ -2,6 +2,7 @@ import axios, { type AxiosResponse, AxiosInstance, InternalAxiosRequestConfig }
 import { addPrefixByRecursive } from '@/utils/utils'
 import { useRootStore } from '@/store/root'
 import type { RequestConfig, RequestInterceptors, CreateRequestConfig } from './types'
+import { PREFIX } from '@/enums'
 
 class Request {
   // axios 实例
@@ -92,7 +93,7 @@ const _request = new Request({
       const { url } = _config
       if (/.json$/.test(url as string)) {
         Object.assign(_config, {
-          url: store.config.sourceUrl ? store.config.sourceUrl + _config.url : _config.url
+          url: PREFIX.STATIC_URL + _config.url
         })
       } else {
         Object.assign(_config, {
diff --git a/src/types/config.d.ts b/src/types/config.d.ts
index 0bc6c0e..cb07377 100644
--- a/src/types/config.d.ts
+++ b/src/types/config.d.ts
@@ -1,4 +1,5 @@
 declare interface Config {
   interfaceUrl: string
-  sourceUrl: string
+  mobileNav: string
+  handWriteUrl: string
 }