diff --git a/src/components/meter/index.tsx b/src/components/meter/index.tsx
index 0136337..4bf4b3d 100644
--- a/src/components/meter/index.tsx
+++ b/src/components/meter/index.tsx
@@ -46,7 +46,7 @@ const Meter = (props: P) => {
value={props.Meter}
placeholder={props.placeholder || "请输入表号检索"}
loading={equals(MeterStatus, 'loading')}
- options={(Meters || []).map(d => ({ value: props.valueKey ? d[props.valueKey]: d.code, label: props.labelKey ? d[props.labelKey] : d.code }))}
+ options={(Meters || []).map(d => ({ value: props.valueKey ? d[props.valueKey]: d.meterNo, label: props.labelKey ? d[props.labelKey] : d.meterNo }))}
/>
)
}
diff --git a/src/pages/report/index.tsx b/src/pages/report/index.tsx
index 33fb3d5..18fd43b 100644
--- a/src/pages/report/index.tsx
+++ b/src/pages/report/index.tsx
@@ -65,7 +65,7 @@ export const UserReport: FC = () => {
const finalAmount = Number(item?.overall?.amount || 0) + Number(item?.loss?.amount || 0) + Number(item?.publicAmount || 0)
return (
- {item?.code} |
+ {item?.meterNo} |
{item?.address} |
{outputWithPrecision(item?.startNumber, 2, '-')} |
{outputWithPrecision(item?.endNumber, 2, '-')} |
diff --git a/src/queries/axios_instance.ts b/src/queries/axios_instance.ts
index 8a3d82e..b8e1da7 100644
--- a/src/queries/axios_instance.ts
+++ b/src/queries/axios_instance.ts
@@ -8,7 +8,7 @@ import { isNil } from 'ramda';
import { MaybeMapFactory } from '@/shared/foundation';
let engineCache: AxiosInstance | null = null;
-export const baseUrl = '/wxApi'
+export const baseUrl = '/api'
/**
* 应用中所需要使用的AJAX引擎。
* @param forceUnauthorized 是否强制丢弃用户会话令牌信息。
diff --git a/src/queries/park.ts b/src/queries/park.ts
index 501079f..6e8cc78 100644
--- a/src/queries/park.ts
+++ b/src/queries/park.ts
@@ -155,7 +155,7 @@ export async function create04KvMeter(pid: string, data: Meter04KvInfo): Promise
* @param data 修改0.4Kv表计信息
*/
export async function change04KvMeterInfo(pid: string, data: Meter04KvInfo): Promise {
- const response = await ajaxEngine().put(`/meter/${pid}/${data.code}`, data);
+ const response = await ajaxEngine().put(`/meter/${pid}/${data.id}`, data);
return unwrap(response);
}
diff --git a/src/shared/model-park.ts b/src/shared/model-park.ts
index 5190e71..f16bad9 100644
--- a/src/shared/model-park.ts
+++ b/src/shared/model-park.ts
@@ -119,11 +119,12 @@ export const enum MeterType {
* 0.4Kv表计信息
*/
export interface Meter04KvInfo {
+ id: string;
tableKey?: string;
/** 户址 */
address: null | string;
/** 表计表号 */
- code: string;
+ meterNo: string;
/** 条目创建时间,时间格式为 yyyy-MM-dd HH:mm:ss */
createdAt: string;
/** 是否可用 */
diff --git a/vite.config.ts b/vite.config.ts
index f1f67f3..1b9fc55 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -104,7 +104,7 @@ export default mode => {
})
],
envDir: './',
- publicDir: "/h5",
+ publicDir: "/user-report",
base: './',
server: {
port: 3000,