diff --git a/.env.development b/.env.development index 3b6cd23..e383271 100644 --- a/.env.development +++ b/.env.development @@ -5,10 +5,12 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 李陈杰 209 + # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 -VITE_APP_BASE_API = 'http://192.168.110.180:8899' + # 罗成 # VITE_APP_BASE_API = 'http://192.168.110.188:8899' # 朱银 diff --git a/absolute/path/to/index.vue b/absolute/path/to/index.vue new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/absolute/path/to/index.vue @@ -0,0 +1 @@ + diff --git a/src/api/equipment/index.ts b/src/api/equipment/index.ts index 6b13203..7a5992d 100644 --- a/src/api/equipment/index.ts +++ b/src/api/equipment/index.ts @@ -101,3 +101,11 @@ export function getProjectId() { method: 'get' }); } + +export const getFootNote = (data) => { + return request({ + url: 'gps/equipmentSon/getList', + method: 'get', + data: data + }); +}; diff --git a/src/api/system/landTransfer/landTransferLedger/index.ts b/src/api/system/landTransfer/landTransferLedger/index.ts index fbd949e..bd397a1 100644 --- a/src/api/system/landTransfer/landTransferLedger/index.ts +++ b/src/api/system/landTransfer/landTransferLedger/index.ts @@ -79,3 +79,26 @@ export const landTransferLedgerCount = (id: string | number | Array { + return request({ + url: '/land/landTransferLedger/children/add', + method: 'post', + data: data + }); +}; + +export const listSonLandTransferLedger = (query) => { + return request({ + url: '/land/landTransferLedger/children/list', + method: 'get', + params: query + }); +}; +// api/yourApiModule.js +export const listallCountValue = (projectId) => { + return request({ + url: '/land/landTransferLedger/allCountValue/' + projectId, + method: 'get' + }); +}; diff --git a/src/api/system/landTransfer/landTransferLedger/types.ts b/src/api/system/landTransfer/landTransferLedger/types.ts index 75487d0..59daeb4 100644 --- a/src/api/system/landTransfer/landTransferLedger/types.ts +++ b/src/api/system/landTransfer/landTransferLedger/types.ts @@ -4,6 +4,11 @@ export interface LandTransferLedgerVO { */ id: string | number; + /** + * 父级ID + */ + parentId: string | number; + /** * 项目ID */ @@ -83,7 +88,6 @@ export interface LandTransferLedgerVO { * 下一步策略 */ nextStrategy: string; - } export interface LandTransferLedgerForm extends BaseEntity { @@ -92,6 +96,11 @@ export interface LandTransferLedgerForm extends BaseEntity { */ id?: string | number; + /** + * 父级ID + */ + parentId: string | number; + /** * 项目ID */ @@ -171,11 +180,9 @@ export interface LandTransferLedgerForm extends BaseEntity { * 下一步策略 */ nextStrategy?: string; - } export interface LandTransferLedgerQuery extends PageQuery { - /** * 项目ID */ @@ -256,11 +263,8 @@ export interface LandTransferLedgerQuery extends PageQuery { */ nextStrategy?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/views/equipment/equipmentGPS.vue b/src/views/equipment/equipmentGPS.vue index 3c15d21..35290b8 100644 --- a/src/views/equipment/equipmentGPS.vue +++ b/src/views/equipment/equipmentGPS.vue @@ -1,187 +1,56 @@