Browse Source

refactor: ♻️ 删除配置文件部分字段

pull/1/head
jiangx 3 years ago
parent
commit
26b35f6bc9
  1. 2
      public/static/offline/JSON/GetDevCoordinateByIP.json
  2. 3
      public/static/offline/JSON/config.json
  3. 5
      src/composables/useInitMap.ts
  4. 5
      src/enums/index.ts
  5. 2
      src/http/api/base/index.ts
  6. 3
      src/http/http.ts
  7. 3
      src/types/config.d.ts

2
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",

3
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"
}
}
}

5
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, '')
}))
//初始化地图

5
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'
}

2
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` })

3
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, {

3
src/types/config.d.ts

@ -1,4 +1,5 @@
declare interface Config {
interfaceUrl: string
sourceUrl: string
mobileNav: string
handWriteUrl: string
}

Loading…
Cancel
Save