diff --git a/packages/screen/src/component/Breadcrumb/index.vue b/packages/screen/src/component/Breadcrumb/index.vue index f98e190..7082377 100644 --- a/packages/screen/src/component/Breadcrumb/index.vue +++ b/packages/screen/src/component/Breadcrumb/index.vue @@ -52,19 +52,6 @@ const route = useRoute() const breadcrumbList = ref([]) const currentIndex = ref(0) -// 路由配置映射表(用于查找父级路由) -const routeMap = { - 'warningManagement': { - path: '/warningManagement', - name: 'warningManagement', - meta: { title: '响应预警' } - }, - 'ledgerManagement': { - path: '/ledgerManagement', - name: 'ledgerManagement', - meta: { title: '驻地台账' } - } -} // 生成面包屑数据 const generateBreadcrumb = () => { diff --git a/packages/screen/src/views/ProjectManagement_Rebuild/addDialog.vue b/packages/screen/src/views/ProjectManagement_Rebuild/addDialog.vue deleted file mode 100644 index 56afc30..0000000 --- a/packages/screen/src/views/ProjectManagement_Rebuild/addDialog.vue +++ /dev/null @@ -1,451 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/screen/src/views/ProjectManagement_Rebuild/examineDialog.vue b/packages/screen/src/views/ProjectManagement_Rebuild/examineDialog.vue new file mode 100644 index 0000000..16207f9 --- /dev/null +++ b/packages/screen/src/views/ProjectManagement_Rebuild/examineDialog.vue @@ -0,0 +1,289 @@ + + + + + \ No newline at end of file diff --git a/packages/screen/src/views/ProjectManagement_Rebuild/index.js b/packages/screen/src/views/ProjectManagement_Rebuild/index.js index 768ce99..c07a8c8 100644 --- a/packages/screen/src/views/ProjectManagement_Rebuild/index.js +++ b/packages/screen/src/views/ProjectManagement_Rebuild/index.js @@ -1,7 +1,7 @@ import { h, ref, onMounted, reactive, watch, toRaw, nextTick } from "vue"; import { request } from "@/utils/request"; import { useRoute, useRouter } from 'vue-router' -import AddDialog from "./addDialog.vue"; +import ExamineDialog from "./examineDialog.vue"; const tableData = ref([]); // 表格数据 const modelVisible = ref(false); // 弹窗状态 @@ -42,59 +42,63 @@ const drawerRef = ref(null); // 抽屉实例 const columns = [ { - prop: "xxx", + prop: "districtName", label: "区县", }, { - prop: "xxx", + prop: "routeNo", label: "路线编码", }, { - prop: "xxx", + prop: "disasterType", label: "灾害类型", }, { - prop: "xxx", + prop: "startStakeNo", label: "起点桩号", }, { - prop: "xxx", + prop: "endStakeNo", label: "止点桩号", }, { - prop: "xxx", + prop: "implementMileage", label: "实施里程(公里)", }, { - prop: "xxx", + prop: "technicalGrade", label: "技术等级", }, { - prop: "xxx", + prop: "totalInvestment", label: "总投资金额(万元)", }, { - prop: "xxx", + prop: "estimatedCost", label: "投资估算(万元)", }, { - prop: "xxx", + prop: "startTime", label: "开工或预计开工时间", }, { - prop: "xxx", + prop: "endTime", label: "完工或预计完工时间", }, { - prop: "xxx", - label: "申报状态", - }, - { - prop: "xxx", + prop: "approvalStatus", label: "审批状态", + formatter: (row) => { + const statusMap = { + 0: '待审批', + 1: '审批通过', + 2: '审批驳回' + }; + return statusMap[row.approvalStatus] || '未知状态'; + } }, { - prop: "xxx", + prop: "updateTime", label: "更新日期", }, { @@ -130,8 +134,8 @@ const columns = [ // 过滤条件 const filterData = reactive({ - year: "", - code: "", + submitTimeStart: "", + routeNo: "", }) // 分页 const pagination = reactive({ @@ -147,30 +151,33 @@ const pagination = reactive({ }, }); -// 获取预警列表 +// 获取项目列表 const getTableData = async (filterData) => { try { const res = await request({ - url: '', + url: '/snow-ops-platform/recovery/list', method: "GET", params: { - + ...filterData, + submitTimeStart: filterData.submitTimeStart ? filterData.submitTimeStart+`-01-01 00:00:00` : null, + pageNum: pagination.current, + pageSize: pagination.pageSize, } }) } catch (error) { - + console.error('获取项目列表失败:', error); } } -// 打开填报项目弹窗 -const openAddDialog = () => { - model.title = ''; +// 打开审批弹窗 +const openExamineDialog = async () => { + model.title = '项目审批'; Object.assign(form, INIT_FORM); model.props = { form: form, }; - model.content = AddDialog; + model.content = ExamineDialog; model.onCancel = () => { modelVisible.value = false; }; @@ -184,8 +191,10 @@ const openAddDialog = () => { }); }; model.width = "50%" - // model.footerPosition = 'center' - // model.onCancelType = 'null' + model.footerPosition = 'flex-end' + model.onCancelType = 'danger' + model.onConfirmName = '审批通过' + model.onCancelName = '审批驳回' // model.tagType = 'warning' // model.tagContent = '测试' modelVisible.value = true; @@ -193,10 +202,20 @@ const openAddDialog = () => { + + export default () => { const router = useRouter(); + onMounted(() => { + getTableData(); + }) + + + watch(filterData, (val) => { + getTableData(filterData); + }, { deep: true }) return { @@ -211,6 +230,6 @@ export default () => { drawer, dialogRef, drawerRef, - openAddDialog, + openExamineDialog, } } \ No newline at end of file diff --git a/packages/screen/src/views/ProjectManagement_Rebuild/index.vue b/packages/screen/src/views/ProjectManagement_Rebuild/index.vue index 47a1db2..66bc244 100644 --- a/packages/screen/src/views/ProjectManagement_Rebuild/index.vue +++ b/packages/screen/src/views/ProjectManagement_Rebuild/index.vue @@ -1,13 +1,12 @@ + + + + \ No newline at end of file diff --git a/packages/screen/vite.config.js b/packages/screen/vite.config.js index 8962074..b8b414c 100644 --- a/packages/screen/vite.config.js +++ b/packages/screen/vite.config.js @@ -93,8 +93,8 @@ export default defineConfig(({ command, mode }) => { cors: true, proxy: { '/snow-ops-platform': { - target: 'http://192.168.110.16:8661/', - // target: 'http://8.137.54.85:8661/', //测试环境 + // target: 'http://192.168.110.16:8661/', + target: 'http://8.137.54.85:8661/', //测试环境 // target: 'http://192.168.110.36:8661/', //张启生本地环境 changeOrigin: true, },