diff --git a/frontend/.env.development b/frontend/.env.development index f553b27..d81642f 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -6,3 +6,4 @@ NODE_ENV='development' VITE_APP_TITLE = '水电水利建设项目全过程环境管理信息平台' VITE_APP_PORT = 3000 VITE_APP_BASE_API = '/dev-api' +VITE_APP_PREVIEW_URL = 'https://211.99.26.225:12125' diff --git a/frontend/.env.production b/frontend/.env.production index afcb741..508d6f8 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -4,3 +4,4 @@ NODE_ENV='production' VITE_APP_TITLE = 'qgc-buji-web' VITE_APP_PORT = 3000 VITE_APP_BASE_API = '/prod-api' +VITE_APP_PREVIEW_URL = 'https://211.99.26.225:12125' diff --git a/frontend/index.html b/frontend/index.html index e5fed2d..10c3ecb 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -6,7 +6,7 @@ - 水电水利建设项目全过程环境管理信息平台 + 水电水利建设项目全过程环境管理信息平台数据填报子系统
diff --git a/frontend/src/api/guoYuSheShiShuJuTianBao/index.ts b/frontend/src/api/guoYuSheShiShuJuTianBao/index.ts index 69561a5..b3fd165 100644 --- a/frontend/src/api/guoYuSheShiShuJuTianBao/index.ts +++ b/frontend/src/api/guoYuSheShiShuJuTianBao/index.ts @@ -8,27 +8,101 @@ export function getFishDraftPage(data:any) { data }); } -//新增目录 +//新增过鱼数据 export function addFishDraft(queryParams:any) { return request({ - url: '/data/fishDraft/add', + url: '/data/fishDraft/saveDraft', method: 'post', data: queryParams }); } -//修改目录 +//修改过鱼数据 export function editFishDraft(queryParams:any) { return request({ - url: '/data/fishDraft/update', + url: '/data/fishDraft/updateDraft', method: 'post', data: queryParams }); } -//删除 +//删除 过鱼数据 export function delFishDraft(data:any) { return request({ - url: '/data/fishDraft/batchDelete', + url: '/data/fishDraft/batchRemoveDraft', method: 'post', data }); -} \ No newline at end of file +} +//提交过鱼数据 +export function submitFishDraft(data:any) { + return request({ + url: '/data/fishDraft/submitDrafts', + method: 'post', + data + }); +} +//审批过鱼数据 +export function successFishDraft(data:any) { + return request({ + url: '/data/fishDraft/batchApprove', + method: 'post', + data + }); +} +//驳回过鱼数据 +export function rejectFishDraft(data:any) { + return request({ + url: '/data/fishDraft/reject', + method: 'post', + data + }); +} +// 导入zip +export function importFishZip(data:FormData) { + return request({ + url: '/data/fishDraft/importZip', + method: 'post', + data, + headers: { 'Content-Type': 'multipart/form-data' } + }); +} +// 取消导入任务 +export function cancelImportTask(data:any) { + return request({ + url: '/data/fishDraft/cancelImport', + method: 'post', + data + }); +} +//检测用户导入状态 +export function checkImportStatus() { + return request({ + url: '/data/fishDraft/checkImportStatus', + method: 'get' + }); +} + +// 查询用户导入导入结果 +export function getLastImportResult() { + return request({ + url: '/data/fishDraft/getLastImportResult', + method: 'get' + }); +} + +// 批量保存草稿 +export function batchSaveDraft(data:any) { + return request({ + url: '/data/fishDraft/batchSaveDraft', + method: 'post', + data + }); +} + +// 标记导入任务为成功 +export function markImportTaskSuccess(data:any) { + return request({ + url: '/data/importTask/markSuccess', + method: 'post', + data + }); +} diff --git a/frontend/src/api/select/index.ts b/frontend/src/api/select/index.ts new file mode 100644 index 0000000..71b574b --- /dev/null +++ b/frontend/src/api/select/index.ts @@ -0,0 +1,33 @@ +import request from '@/utils/request'; + +// 基地下拉列表 +export function getBaseDropdown(data:any) { + return request({ + url: '/env/hydrobase/dropdown', + method: 'get', + data + }); +} +//电站下拉列表 +export function getEngInfoDropdown(params:any) { + return request({ + url: '/env/engInfo/dropdown', + method: 'get', + params + }); +} +//过鱼设施下拉列表 +export function getFpssDropdown(params:any) { + return request({ + url: '/env/fpss/dropdown', + method: 'get', + params + }); +} +//鱼类名称下拉列表 +export function getFishDictoryDropdown() { + return request({ + url: '/env/fishDictory/listByName', + method: 'get' + }); +} \ No newline at end of file diff --git a/frontend/src/api/shengPiJiLu/index.ts b/frontend/src/api/shengPiJiLu/index.ts new file mode 100644 index 0000000..31890e6 --- /dev/null +++ b/frontend/src/api/shengPiJiLu/index.ts @@ -0,0 +1,27 @@ +import request from '@/utils/request'; + +export function queryPageList(queryParams:any){ + return request({ + url: '/data/approvalMain/queryPageList' , + method: 'post', + data:queryParams + }); +} + +// 查询审批操作日志列表 +export function getApprovalLogList(params: any) { + return request({ + url: '/data/approvalLog/queryPageList', + method: 'post', + data: params + }); +} + +// 查询审批变更记录列表 +export function getApprovalChangeLogList(params: any) { + return request({ + url: '/data/approvalChangeLog/queryPageList', + method: 'post', + data: params + }); +} diff --git a/frontend/src/components/BasicSearch/index.vue b/frontend/src/components/BasicSearch/index.vue index 6e78549..a03b9ec 100644 --- a/frontend/src/components/BasicSearch/index.vue +++ b/frontend/src/components/BasicSearch/index.vue @@ -6,6 +6,7 @@ :rules="rules" layout="inline" class="basic-search-form" + @reset="handleReset" @finish="handleFinish" @values-change="handleValuesChange" > @@ -18,14 +19,18 @@ :name="item.name" style="width: 100%; margin-bottom: 0" > - - + + + + @@ -60,38 +68,50 @@ :placeholder="item.placeholder || '请输入'" :allow-clear="item.fieldProps?.allowClear" :style="{ width: item.width ? item.width + 'px' : '200px' }" + @change="(e) => triggerManualValuesChange(item.name, e.target.value)" /> +
- - - {{ opt.label }} - - - - + {{ opt.basename }} + + + - {{ opt.label }} - - + + {{ opt.ennm }} + +
@@ -102,27 +122,28 @@ :placeholder="item.placeholder || '请选择'" :allow-clear="item.fieldProps?.allowClear" :style="{ width: item.width ? item.width + 'px' : '200px' }" + @change="(val) => triggerManualValuesChange(item.name, val)" + show-search + :filter-option="filterOption" > - {{ opt.label }} + {{ opt[item.values?.name] || opt.label || opt.dictName }} - + - + {{ opt.label }} @@ -149,7 +170,9 @@ \ No newline at end of file + diff --git a/frontend/src/components/fishSearch/index.vue b/frontend/src/components/fishSearch/index.vue index 0c702b8..6149eb8 100644 --- a/frontend/src/components/fishSearch/index.vue +++ b/frontend/src/components/fishSearch/index.vue @@ -1,24 +1,28 @@