diff --git a/src/api/advance-boot/bearingCapacity.ts b/src/api/advance-boot/bearingCapacity.ts index 1d52906c..10f8b07b 100644 --- a/src/api/advance-boot/bearingCapacity.ts +++ b/src/api/advance-boot/bearingCapacity.ts @@ -1,5 +1,13 @@ import createAxios from '@/utils/request' +//承载能力评估用户查询 +export function queyDetailUser(data) { + return createAxios({ + url: '/advance-boot/carrycapacityuser/queyDetailUser', + method: 'post', + data + }) +} //承载能力评估用户新增 export function addUse(data) { return createAxios({ @@ -13,7 +21,7 @@ export function updateUse(data) { return createAxios({ url: '/advance-boot/carrycapacityuser/update', method: 'post', - data + data }) } //承载能力评估用户批量删除 @@ -28,31 +36,81 @@ export function removeUse(data) { export function carryCapacityTree() { return createAxios({ url: '/advance-boot/carrycapacity/carryCapacityTree', - method: 'get', - + method: 'GET' }) } //承载能力评估策略初始化查询 export function queyDetail() { return createAxios({ url: '/advance-boot/carrycapacity/queyDetail', - method: 'post', - + method: 'post' }) } -//承载能力评估策略初始化查询 -export function addCarryc() { +//用户新增承载能力评估策略 +export function addCarryc(data) { return createAxios({ url: '/advance-boot/carrycapacity/add', method: 'post', - + data }) } //承载能力评估策略一键还原 export function restore() { return createAxios({ url: '/advance-boot/carrycapacity/restore', - method: 'post', - + method: 'post' + }) +} +//承载能力评估数据查询-主页面 +export function queryCarryCapacityData(data) { + return createAxios({ + url: '/advance-boot/carrycapacity/queryCarryCapacityData', + method: 'post', + data + }) +} +//承载能力评估数据查询-无功功率 +export function queryCarryCapacityQData(data) { + return createAxios({ + url: '/advance-boot/carrycapacity/queryCarryCapacityQData', + method: 'post', + data + }) +} +//承载能力评估数据查询-谐波电流幅值 +export function queryCarryCapacityIData(data) { + return createAxios({ + url: '/advance-boot/carrycapacity/queryCarryCapacityIData', + method: 'post', + data + }) +} +//承载能力评估 +export function carryCapacityCal(data) { + return createAxios({ + url: '/advance-boot/carrycapacity/carryCapacityCal', + method: 'post', + data + }) +} +//导出数据集模板 +export function getExcelTemplate() { + return createAxios({ + url: '/advance-boot/carrycapacity/getExcelTemplate', + method: 'get', + responseType: 'blob' + }) +} +//上传数据集 +export function uploadExcel(file: any, data: any) { + let form = new FormData() + form.append('file', file) + form.append('lineId', data.lineId) + form.append('startTime', data.startTime) + form.append('endTime', data.endTime) + return createAxios({ + url: '/advance-boot/carrycapacity/uploadExcel', + method: 'post', + data: form }) } diff --git a/src/api/user-boot/user.ts b/src/api/user-boot/user.ts index b78d345a..122fcee4 100644 --- a/src/api/user-boot/user.ts +++ b/src/api/user-boot/user.ts @@ -140,3 +140,9 @@ export function checkUser(data: any) { data: data }) } +export function existMonitorDeptTree() { + return request({ + url: '/user-boot/dept/existMonitorDeptTree', + method: 'post' + }) +} diff --git a/src/components/table/fieldRender/index.vue b/src/components/table/fieldRender/index.vue index 00ab858d..cf59b514 100644 --- a/src/components/table/fieldRender/index.vue +++ b/src/components/table/fieldRender/index.vue @@ -9,11 +9,11 @@ @@ -172,8 +172,10 @@ if (props.field.renderFormatter && typeof props.field.renderFormatter == 'functi fieldValue.value = props.field.renderFormatter(props.row, props.field, fieldValue.value, props.column, props.index) } -const onChangeField = (value: any) => { - TableStore.onTableAction('field-change', { value: value, ...props }) +const onChangeField = (row: any, value: any) => { + row.onChangeField && row.onChangeField(props.row, value) + + // TableStore.onTableAction('field-change', { value: value, ...props }) } const onButtonClick = (btn: OptButton) => { diff --git a/src/components/tree/pqs/policyTree.vue b/src/components/tree/pqs/policyTree.vue new file mode 100644 index 00000000..931cec74 --- /dev/null +++ b/src/components/tree/pqs/policyTree.vue @@ -0,0 +1,322 @@ + + + + diff --git a/src/utils/request.ts b/src/utils/request.ts index 3c409174..45061a44 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -55,6 +55,10 @@ function createAxios>( // 请求拦截 Axios.interceptors.request.use( config => { + if(config.url?.substring(0, 13)=='/advance-boot'){ + config.url=config.url?.slice(13) + config.baseURL='/hzj' + } // 取消重复请求 removePending(config) options.CancelDuplicateRequest && addPending(config) diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue index 5b3075d3..5a816986 100644 --- a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue +++ b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue @@ -1,30 +1,35 @@