diff --git a/src/views/informationSub/iconic/addAndModify.vue b/src/views/informationSub/iconic/addAndModify.vue index 5440a98..376f692 100644 --- a/src/views/informationSub/iconic/addAndModify.vue +++ b/src/views/informationSub/iconic/addAndModify.vue @@ -26,7 +26,7 @@ import { ref, reactive, defineProps, watchEffect } from 'vue' import { useForm, BasicForm } from '@/components/Form'; import { iconicformSchemas } from './iconic.data'; -import { modifyPeriodicallab, addPeriodicallab, getperiodicallabById } from './iconic.api'; +import { modifyInformationMaterial, addInformationMaterial, getInformationMaterialById } from './iconic.api'; import { ElMessage } from 'element-plus' import { useModalInner, BasicModal } from '@/components/Modal'; const [registerModal, { closeModal }] = useModalInner(init); @@ -43,7 +43,7 @@ async function init(data) { let param: any = { id: data.id } - let res = await getperiodicallabById(param) + let res = await getInformationMaterialById(param) console.log("结果是", res) setFieldsValue(res) } @@ -112,9 +112,9 @@ async function submitImportForm() { } params.append("id", id.value) params.append("name", data.name) - params.append("periods", data.periods) + params.append("type", data.type) params.append("publishTime", data.publishTime) - await modifyPeriodicallab(params) + await modifyInformationMaterial(params) } else { if (fileList.length == 0) { ElMessage.warning("请上传文件") @@ -122,9 +122,9 @@ async function submitImportForm() { } params.append('file', fileList[0].file) params.append("name", data.name) - params.append("periods", data.periods) + params.append("type", data.type) params.append("publishTime", data.publishTime) - await addPeriodicallab(params) + await addInformationMaterial(params) } dialogVisible() } diff --git a/src/views/informationSub/iconic/iconic.api.ts b/src/views/informationSub/iconic/iconic.api.ts index 2e1c50c..0a7953c 100644 --- a/src/views/informationSub/iconic/iconic.api.ts +++ b/src/views/informationSub/iconic/iconic.api.ts @@ -2,22 +2,22 @@ import { defHttp } from '@/utils/http/axios'; import { downloadFile } from "../../../api/common/api" export enum Api { - periodicallabPageList = '/huzhouPeriodicallab/periodicallabPageList', - addPeriodicallab="/huzhouPeriodicallab/addPeriodicallab", - modifyPeriodicallab = '/huzhouPeriodicallab/modifyPeriodicallab', - getperiodicallabById="/huzhouPeriodicallab/getperiodicallabById", - deletePeriodicallab = '/huzhouPeriodicallab/deletePeriodicallab', - batchdownloadPeriodicallabFiles="/huzhouPeriodicallab/batchdownloadPeriodicallabFiles", + informationMaterialPageList = '/huzhouInformationMaterial/result/informationMaterialPageList', + addInformationMaterial="/huzhouInformationMaterial/result/addInformationMaterial", + modifyInformationMaterial = '/huzhouInformationMaterial/result/modifyInformationMaterial', + getInformationMaterialById="/huzhouInformationMaterial/result/getInformationMaterialById", + deleteInformationMaterial = '/huzhouInformationMaterial/result/deleteInformationMaterial', + batchdownloadInformationMaterialFiles="/huzhouInformationMaterial/result/batchdownloadInformationMaterialFiles", } -export const periodicallabPageList = (params) => defHttp.get({ url: Api.periodicallabPageList, params }) -export const getperiodicallabById = (params) => defHttp.get({ url: Api.getperiodicallabById, params }) -export const batchdownloadPeriodicallabFiles = (params) => downloadFile(Api.batchdownloadPeriodicallabFiles,"批量导出.zip",params) -export const addPeriodicallab = (params?) =>defHttp.post({ url: Api.addPeriodicallab,headers:{ "Content-Type": "multipart/form-data" }, params }) +export const informationMaterialPageList = (params) => defHttp.get({ url: Api.informationMaterialPageList, params }) +export const getInformationMaterialById = (params) => defHttp.get({ url: Api.getInformationMaterialById, params }) +export const batchdownloadInformationMaterialFiles = (params) => downloadFile(Api.batchdownloadInformationMaterialFiles,"批量导出.zip",params) +export const addInformationMaterial = (params?) =>defHttp.post({ url: Api.addInformationMaterial,headers:{ "Content-Type": "multipart/form-data" }, params }) -export const modifyPeriodicallab = (params?) =>defHttp.post({ url: Api.modifyPeriodicallab,headers:{ "Content-Type": "multipart/form-data" }, params }) +export const modifyInformationMaterial = (params?) =>defHttp.post({ url: Api.modifyInformationMaterial,headers:{ "Content-Type": "multipart/form-data" }, params }) -export const deletePeriodicallab = (params?) =>defHttp.post({ url: Api.deletePeriodicallab, params }) +export const deleteInformationMaterial = (params?) =>defHttp.post({ url: Api.deleteInformationMaterial, params }) diff --git a/src/views/informationSub/iconic/index.vue b/src/views/informationSub/iconic/index.vue index 3c1f142..1f7eb5b 100644 --- a/src/views/informationSub/iconic/index.vue +++ b/src/views/informationSub/iconic/index.vue @@ -24,11 +24,11 @@ import { downloadResource } from "../../../api/common/api" import { isShowByRoles } from '@/views/projectLib/projectInfo/projectInfo.api'; import { iconicColumns, searchFormSchema } from './iconic.data'; import addAndModify from "./addAndModify.vue" -import { periodicallabPageList, batchdownloadPeriodicallabFiles, deletePeriodicallab } from './iconic.api'; +import { informationMaterialPageList, batchdownloadInformationMaterialFiles, deleteInformationMaterial } from './iconic.api'; const [registerSubmitProjectArchive, { openModal }] = useModal(); const [registerTable, { reload, getForm }] = useTable({ title: '标志性成果', - api: periodicallabPageList, + api: informationMaterialPageList, columns: iconicColumns, useSearchForm: true, actionColumn: { @@ -91,13 +91,13 @@ function handledown(record) { } async function handleDelete(record) { - await deletePeriodicallab({ id: record.id }) + await deleteInformationMaterial({ id: record.id }) reload() } function handleBatchdownload() { let { getFieldsValue } = getForm() let fromData = getFieldsValue() - batchdownloadPeriodicallabFiles(fromData) + batchdownloadInformationMaterialFiles(fromData) } function closeModel() { reload() diff --git a/src/views/informationSub/mechanism/addAndModify.vue b/src/views/informationSub/mechanism/addAndModify.vue index 6f678ef..acb770d 100644 --- a/src/views/informationSub/mechanism/addAndModify.vue +++ b/src/views/informationSub/mechanism/addAndModify.vue @@ -26,7 +26,7 @@ import { ref, reactive, defineProps, watchEffect } from 'vue' import { useForm, BasicForm } from '@/components/Form'; import { mechanismformSchemas } from './mechanism.data'; -import { modifyPeriodicallab, addPeriodicallab, getperiodicallabById } from './mechanism.api'; +import { modifyInformationMaterial, addInformationMaterial, getInformationMaterialById } from './mechanism.api'; import { ElMessage } from 'element-plus' import { useModalInner, BasicModal } from '@/components/Modal'; const [registerModal, { closeModal }] = useModalInner(init); @@ -43,7 +43,7 @@ async function init(data) { let param: any = { id: data.id } - let res = await getperiodicallabById(param) + let res = await getInformationMaterialById(param) console.log("结果是", res) setFieldsValue(res) } @@ -112,9 +112,9 @@ async function submitImportForm() { } params.append("id", id.value) params.append("name", data.name) - params.append("periods", data.periods) + params.append("type", data.type) params.append("publishTime", data.publishTime) - await modifyPeriodicallab(params) + await modifyInformationMaterial(params) } else { if (fileList.length == 0) { ElMessage.warning("请上传文件") @@ -122,9 +122,9 @@ async function submitImportForm() { } params.append('file', fileList[0].file) params.append("name", data.name) - params.append("periods", data.periods) + params.append("type", data.type) params.append("publishTime", data.publishTime) - await addPeriodicallab(params) + await addInformationMaterial(params) } dialogVisible() } diff --git a/src/views/informationSub/mechanism/index.vue b/src/views/informationSub/mechanism/index.vue index 6722b50..79792bd 100644 --- a/src/views/informationSub/mechanism/index.vue +++ b/src/views/informationSub/mechanism/index.vue @@ -24,11 +24,11 @@ import { downloadResource } from "../../../api/common/api" import { isShowByRoles } from '@/views/projectLib/projectInfo/projectInfo.api'; import { mechanismColumns, searchFormSchema } from './mechanism.data'; import addAndModify from "./addAndModify.vue" -import { periodicallabPageList, batchdownloadPeriodicallabFiles, deletePeriodicallab } from './mechanism.api'; +import { informationMaterialPageList, batchdownloadInformationMaterialFiles, deleteInformationMaterial } from './mechanism.api'; const [registerSubmitProjectArchive, { openModal }] = useModal(); const [registerTable, { reload, getForm }] = useTable({ title: '机制建设', - api: periodicallabPageList, + api: informationMaterialPageList, columns: mechanismColumns, useSearchForm: true, actionColumn: { @@ -91,13 +91,13 @@ function handledown(record) { } async function handleDelete(record) { - await deletePeriodicallab({ id: record.id }) + await deleteInformationMaterial({ id: record.id }) reload() } function handleBatchdownload() { let { getFieldsValue } = getForm() let fromData = getFieldsValue() - batchdownloadPeriodicallabFiles(fromData) + batchdownloadInformationMaterialFiles(fromData) } function closeModel() { reload() diff --git a/src/views/informationSub/mechanism/mechanism.api.ts b/src/views/informationSub/mechanism/mechanism.api.ts index 2e1c50c..7e1ebaa 100644 --- a/src/views/informationSub/mechanism/mechanism.api.ts +++ b/src/views/informationSub/mechanism/mechanism.api.ts @@ -2,22 +2,22 @@ import { defHttp } from '@/utils/http/axios'; import { downloadFile } from "../../../api/common/api" export enum Api { - periodicallabPageList = '/huzhouPeriodicallab/periodicallabPageList', - addPeriodicallab="/huzhouPeriodicallab/addPeriodicallab", - modifyPeriodicallab = '/huzhouPeriodicallab/modifyPeriodicallab', - getperiodicallabById="/huzhouPeriodicallab/getperiodicallabById", - deletePeriodicallab = '/huzhouPeriodicallab/deletePeriodicallab', - batchdownloadPeriodicallabFiles="/huzhouPeriodicallab/batchdownloadPeriodicallabFiles", + informationMaterialPageList = '/huzhouInformationMaterial/informationMaterialPageList', + addInformationMaterial="/huzhouInformationMaterial/addInformationMaterial", + modifyInformationMaterial = '/huzhouInformationMaterial/modifyInformationMaterial', + getInformationMaterialById="/huzhouInformationMaterial/getInformationMaterialById", + deleteInformationMaterial = '/huzhouInformationMaterial/deleteInformationMaterial', + batchdownloadInformationMaterialFiles="/huzhouInformationMaterial/batchdownloadInformationMaterialFiles", } -export const periodicallabPageList = (params) => defHttp.get({ url: Api.periodicallabPageList, params }) -export const getperiodicallabById = (params) => defHttp.get({ url: Api.getperiodicallabById, params }) -export const batchdownloadPeriodicallabFiles = (params) => downloadFile(Api.batchdownloadPeriodicallabFiles,"批量导出.zip",params) -export const addPeriodicallab = (params?) =>defHttp.post({ url: Api.addPeriodicallab,headers:{ "Content-Type": "multipart/form-data" }, params }) +export const informationMaterialPageList = (params) => defHttp.get({ url: Api.informationMaterialPageList, params }) +export const getInformationMaterialById = (params) => defHttp.get({ url: Api.getInformationMaterialById, params }) +export const batchdownloadInformationMaterialFiles = (params) => downloadFile(Api.batchdownloadInformationMaterialFiles,"批量导出.zip",params) +export const addInformationMaterial = (params?) =>defHttp.post({ url: Api.addInformationMaterial,headers:{ "Content-Type": "multipart/form-data" }, params }) -export const modifyPeriodicallab = (params?) =>defHttp.post({ url: Api.modifyPeriodicallab,headers:{ "Content-Type": "multipart/form-data" }, params }) +export const modifyInformationMaterial = (params?) =>defHttp.post({ url: Api.modifyInformationMaterial,headers:{ "Content-Type": "multipart/form-data" }, params }) -export const deletePeriodicallab = (params?) =>defHttp.post({ url: Api.deletePeriodicallab, params }) +export const deleteInformationMaterial = (params?) =>defHttp.post({ url: Api.deleteInformationMaterial, params }) diff --git a/src/views/informationSub/monthlyJournal/monthlyJournal.data.ts b/src/views/informationSub/monthlyJournal/monthlyJournal.data.ts index 3f554eb..3c606a9 100644 --- a/src/views/informationSub/monthlyJournal/monthlyJournal.data.ts +++ b/src/views/informationSub/monthlyJournal/monthlyJournal.data.ts @@ -6,9 +6,8 @@ export const monthlyJournalcolumns: BasicColumn[] = [ { title: '期刊名称', width: 250, - dataIndex: 'name', + dataIndex: 'name' }, - { title: '期刊期数', width: 150, diff --git a/src/views/projectBoard/unfinishNode/api.ts b/src/views/projectBoard/unfinishNode/api.ts index 2e1c50c..99823bf 100644 --- a/src/views/projectBoard/unfinishNode/api.ts +++ b/src/views/projectBoard/unfinishNode/api.ts @@ -2,7 +2,7 @@ import { defHttp } from '@/utils/http/axios'; import { downloadFile } from "../../../api/common/api" export enum Api { - periodicallabPageList = '/huzhouPeriodicallab/periodicallabPageList', + queryBoardInfo = '/huzhouProject/queryBoardInfo', addPeriodicallab="/huzhouPeriodicallab/addPeriodicallab", modifyPeriodicallab = '/huzhouPeriodicallab/modifyPeriodicallab', getperiodicallabById="/huzhouPeriodicallab/getperiodicallabById", @@ -10,7 +10,7 @@ export enum Api { batchdownloadPeriodicallabFiles="/huzhouPeriodicallab/batchdownloadPeriodicallabFiles", } -export const periodicallabPageList = (params) => defHttp.get({ url: Api.periodicallabPageList, params }) +export const queryBoardInfo = (params) => defHttp.get({ url: Api.queryBoardInfo, params }) export const getperiodicallabById = (params) => defHttp.get({ url: Api.getperiodicallabById, params }) export const batchdownloadPeriodicallabFiles = (params) => downloadFile(Api.batchdownloadPeriodicallabFiles,"批量导出.zip",params) export const addPeriodicallab = (params?) =>defHttp.post({ url: Api.addPeriodicallab,headers:{ "Content-Type": "multipart/form-data" }, params }) diff --git a/src/views/projectBoard/unfinishNode/data.ts b/src/views/projectBoard/unfinishNode/data.ts index 0210e42..1aed2ab 100644 --- a/src/views/projectBoard/unfinishNode/data.ts +++ b/src/views/projectBoard/unfinishNode/data.ts @@ -2,54 +2,43 @@ import { FormSchema } from '@/components/Form'; import { BasicColumn } from '@/components/Table'; -export const columns: BasicColumn[] = [ - { - title: '任务名称', - width: 250, - dataIndex: 'taskName', - }, +export const columns: BasicColumn[] = [{ + title: '湖州市公立医院改革与高质量发展示范项目各任务信息化项目建设推进晾晒表', + children: [ + { + title: '任务名称', + width: 250, + dataIndex: 'reformName', + }, - { - title: '指导处', - width: 150, - dataIndex: 'guide', - }, - { - title: '任务进度(%)', - width: 200, - dataIndex: 'taskProgress', - }, - { - title: '上级资金执行率(%)', - width: 250, - dataIndex: 'higherFundsRate', - }, + { + title: '指导处室', + width: 150, + dataIndex: 'superLeader', + }, + { + title: '项目名称', + width: 150, + dataIndex: 'projectName', + }, + { + title: '项目所处阶段', + width: 250, + dataIndex: 'currentStage', + }, - { - title: '项目名称', - width: 150, - dataIndex: 'projectName', - }, - { - title: '建设单位', - width: 200, - dataIndex: 'buildUnit', - }, - { - title: '项目所处阶段', - width: 250, - dataIndex: 'projectStage', - }, + { + title: '项目整体进度(%)', + width: 150, + dataIndex: 'totalPercent', + }, + { + title: '上级资金执行(%)', + width: 200, + dataIndex: 'superiorFundPayRate', + }, + ], +} - { - title: '项目整体进度(%)', - width: 150, - dataIndex: 'projectProgress', - }, - { - title: '上级资金执行(%)', - width: 200, - dataIndex: 'higherFunds', - }, ]; diff --git a/src/views/projectBoard/unfinishNode/index.vue b/src/views/projectBoard/unfinishNode/index.vue index 14c23a6..0cc4636 100644 --- a/src/views/projectBoard/unfinishNode/index.vue +++ b/src/views/projectBoard/unfinishNode/index.vue @@ -1,9 +1,10 @@