diff --git a/src/api-services/api.ts b/src/api-services/api.ts index 53fa1cf..893b9cb 100644 --- a/src/api-services/api.ts +++ b/src/api-services/api.ts @@ -51,4 +51,12 @@ export * from './apis/sys-wechat-api'; export * from './apis/sys-wechat-pay-api'; export * from './apis/sys-wechat-user-api'; export * from './apis/sys-wx-open-api'; +export * from './apis/sys-faultInfomation-api';//zz +export * from './apis/sys-faultBase-api';//zz +export * from './apis/sys-stationBasic-api';//zz +export * from './apis/sys-peak-api';//zz + + + + diff --git a/src/api-services/apis/sys-dict-type-api.ts b/src/api-services/apis/sys-dict-type-api.ts index 3f5868a..9a82fd6 100644 --- a/src/api-services/apis/sys-dict-type-api.ts +++ b/src/api-services/apis/sys-dict-type-api.ts @@ -88,6 +88,7 @@ export const SysDictTypeApiAxiosParamCreator = function (configuration?: Configu * @throws {RequiredError} */ apiSysDictTypeAllDictListGet: async (options: AxiosRequestConfig = {}): Promise => { + // console.log('xxx') const localVarPath = `/api/sysDictType/allDictList`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, 'https://example.com'); diff --git a/src/api-services/models/index.ts b/src/api-services/models/index.ts index 536d34b..9d3f6f3 100644 --- a/src/api-services/models/index.ts +++ b/src/api-services/models/index.ts @@ -297,3 +297,10 @@ export * from './wx-open-id-login-input'; export * from './wx-open-id-output'; export * from './wx-phone-output'; export * from './yes-no-enum'; +export * from './update-faultinformation-input'; +export * from './sys-faultInfomation';//zz +export * from './faultinfomation';//zz +export * from './faultbasic';//zzadd字段 +export * from './delete-faultbase-input'; + + diff --git a/src/api/system/admin.ts b/src/api/system/admin.ts index f972dc7..b7aa386 100644 --- a/src/api/system/admin.ts +++ b/src/api/system/admin.ts @@ -13,6 +13,7 @@ export const getDictDataList = (params?: any) => // 获取所有字典 export const getAllDictList = () => + console.log('xxx') request({ url: `${Api.AllDictList}`, method: 'get', diff --git a/src/router/route.ts b/src/router/route.ts index bad252b..499a3b1 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -116,7 +116,7 @@ export const staticRoutes: Array = [ meta: { title: '登录', }, - } + }, /** * 提示:写在这里的为全屏界面,不建议写在这里 * 请写在 `dynamicRoutes` 路由数组中 diff --git a/src/views/system/log/oplog/index.vue b/src/views/system/log/oplog/index.vue index 60d0f12..84c0390 100644 --- a/src/views/system/log/oplog/index.vue +++ b/src/views/system/log/oplog/index.vue @@ -131,6 +131,7 @@ const handleQuery = async () => { state.loading = true; let params = Object.assign(state.queryParams, state.tableParams); var res = await getAPI(SysLogOpApi).apiSysLogOpPagePost(params); + state.logData = res.data.result?.items ?? []; state.tableParams.total = res.data.result?.total; state.loading = false; diff --git a/vite.config.ts b/vite.config.ts index 99084ff..79bbd37 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -61,10 +61,25 @@ const viteConfig = defineConfig((mode: ConfigEnv) => { open: JSON.parse(env.VITE_OPEN), hmr: true, proxy: { - '^/[Uu]pload': { - target: env.VITE_API_URL, - changeOrigin: true, + // '^/[Uu]pload': { + // target: env.VITE_API_URL, + // changeOrigin: true, + // }, + '^/api/BaseStationInfo(.*)':{ + target: 'http://192.168.2.15:5034', // + changeOrigin: true, // 改变源 + }, + '^/api/Disposition(.*)':{ + target: 'http://192.168.2.21:5034', // + changeOrigin: true, // 改变源 + + }, + '/api':{ + target: 'http://192.168.2.13:5005', // 登录 + changeOrigin: true, // 改变源 + }, + }, }, build: {