From cbb23429b8beed72b58cbb57f9b3c56a0fb2b5d2 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期五, 09 五月 2025 13:31:26 +0800 Subject: [PATCH] 修改 --- src/views/experiment/developing/index.vue | 229 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 187 insertions(+), 42 deletions(-) diff --git a/src/views/experiment/developing/index.vue b/src/views/experiment/developing/index.vue index ba7ab0b..43cf64d 100644 --- a/src/views/experiment/developing/index.vue +++ b/src/views/experiment/developing/index.vue @@ -4,17 +4,23 @@ <el-row class="homeCard"> <div class="basic-line"> <span>实验名称:</span> - <el-input v-model="projectState.searchQuery.searchParams.experimentName" clearable filterable class="input-box" placeholder="实验名称"> + <el-input v-model="developState.searchQuery.searchParams.experimentName" clearable filterable class="input-box" placeholder="实验名称"> </el-input> </div> <div class="basic-line"> <span>实验类型:</span> - <el-select v-model="projectState.searchQuery.searchParams.experimentType" clearable filterable class="input-box" placeholder="实验类型"> - <el-option v-for="item in projectState.experimentTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option> + <el-select v-model="developState.searchQuery.searchParams.experimentType" clearable filterable class="input-box" placeholder="实验类型"> + <el-option v-for="item in developState.experimentTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option> + </el-select> + </div> + <div class="basic-line"> + <span>风险等级:</span> + <el-select v-model="developState.searchQuery.searchParams.assessLevel" clearable filterable class="input-box" placeholder="风险等级"> + <el-option v-for="item in developState.riskLevelList" :key="item.id" :label="item.name" :value="item.id"></el-option> </el-select> </div> <div style="padding-bottom: 10px"> - <el-button type="primary" @click="getProjectData">查询</el-button> + <el-button type="primary" @click="getdevelopData">查询</el-button> <el-button plain @click="reset">重置</el-button> </div> </el-row> @@ -22,35 +28,96 @@ <div class="main-card"> <el-row class="cardTop"> <el-col :span="12" class="mainCardBtn"> - <el-button type="primary" :icon="Plus" size="default" @click="openProjectDialog('新增', {})">新增</el-button> + <el-button type="primary" :icon="Plus" size="default" @click="openProjectDialog('新增', {})">录入实验信息</el-button> <!-- <el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>--> </el-col> <!-- <el-button type="primary" :icon="Refresh" size="default" />--> </el-row> - <el-table ref="multipleTableRef" :data="projectState.projectData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }"> + <el-table ref="multipleTableRef" :data="developState.developData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }"> <el-table-column prop="experimentCode" label="实验编号"/> - <el-table-column prop="expectStartTime" label="立项时间" /> + <el-table-column prop="experimentName" label="实验名称"/> + <el-table-column prop="createExperimentTime" label="立项时间"> + <template #default="scope"> + <span>{{scope.row.createExperimentTime?scope.row.createExperimentTime.substring(0,16):'--'}}</span> + </template> + </el-table-column> + <el-table-column prop="startTime" label="开展时间" show-overflow-tooltip> + <template #default="scope"> + <span>{{scope.row.startTime?scope.row.startTime.substring(0,16):'--'}}</span> + </template> + </el-table-column> <el-table-column prop="liabilityUser" label="负责人"/> - <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column> - <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column> - <el-table-column prop="updateTime" label="最后修改时间" show-overflow-tooltip></el-table-column> - <el-table-column prop="updateByUserName" label="最后修改人" show-overflow-tooltip></el-table-column> - <el-table-column label="操作" width="250"> + <el-table-column prop="siteList" label="实验场所" show-overflow-tooltip> + <template #default="scope"> + <span>{{scope.row.siteList.map(i=>i.siteName).join(',')}}</span> + </template> + </el-table-column> + <el-table-column prop="experimentTypeName" label="实验类别" width="130"> +<!-- <template #default="scope">--> +<!-- <span>{{developState.experimentTypeList.find(i=>i.id == scope.row.experimentType)?.name}}</span>--> +<!-- </template>--> + </el-table-column> + <el-table-column prop="status" label="评估申请"> + <template #default="scope"> + <span>{{scope.row.status == 1?'未申请':scope.row.status == 2?'已申请':'--'}}</span> + </template> + </el-table-column> + <el-table-column prop="status" label="评估申请时间" show-overflow-tooltip> + <template #default="scope"> + <span>{{scope.row.assessApplyTime?scope.row.assessApplyTime.substring(0,16):'--'}}</span> + </template> + </el-table-column> + <el-table-column prop="stage" label="评估状态"> + <template #default="scope"> + <el-tag :type="scope.row.stage == 4?'success':scope.row.stage == 1?'info':''"> + {{scope.row.stage == 1?'未评估':scope.row.stage == 2?'评估中':scope.row.stage == 3?'评估完成':scope.row.stage == 4?'生成报告':'--'}} + </el-tag> + </template> + </el-table-column> + <el-table-column prop="status" label="最近评估时间" show-overflow-tooltip> + <template #default="scope"> + <span>{{scope.row.experimentAssessLogs?scope.row.experimentAssessLogs.map(i=>i.assessEndTime.substring(0,16)).join(','): ''}}</span> + </template> + </el-table-column> + <el-table-column prop="assessLevel" label="风险等级"> <template #default="scope"> + <el-tag type="info" :class="developState.tagBg[scope.row.assessLevel - 1]" style="color:#383838;"> + {{scope.row.assessLevel == 1 ?'重大风险':scope.row.assessLevel == 2?'较大风险':scope.row.assessLevel == 3?'一般风险':scope.row.assessLevel == 4?'低风险':'--'}} + </el-tag> + </template> + </el-table-column> +<!-- <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>--> +<!-- <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column>--> +<!-- <el-table-column prop="updateTime" label="最后修改时间" show-overflow-tooltip></el-table-column>--> +<!-- <el-table-column prop="updateByUserName" label="最后修改人" show-overflow-tooltip></el-table-column>--> + <el-table-column label="操作" width="250" fixed="right"> + <template #default="scope"> + <div v-if="scope.row.stagingTag === 1"> <el-button size="small" text type="primary" :icon="View" @click="openProjectDialog('查看', scope.row)">查看</el-button> - <el-button size="small" text type="primary" :icon="Edit" @click="applyAccess( scope.row)">申请评估</el-button> + <el-button size="small" text type="primary" :icon="View" v-if="scope.row.stage == 4" @click="openReportDialog('查看',scope.row)">查看评估报告</el-button> + <el-button size="small" :disabled="scope.row.stage == 2 ? true : false" text type="primary" :icon="Edit" @click="applyAccess( scope.row)">申请评估</el-button> + <el-button size="small" :disabled="(scope.row.status == 2 && scope.row.stage == 1) ? false : true" text type="warning" :icon="RefreshLeft" @click="cancelAccess( scope.row)">撤销评估</el-button> + <el-button size="small" type="warning" v-if="scope.row.rectifyStatus == 1" text :icon="Edit" @click="openProjectDialog('整改', scope.row)">整改</el-button> + <el-button size="small" text type="primary" :icon="Edit" @click="openProjectDialog('编辑', scope.row)">编辑</el-button> + </div> + <div v-else> + <el-button size="small" text type="primary" :icon="Edit" @click="openProjectDialog('编辑', scope.row)">编辑</el-button> + <el-button size="small" text type="primary" :icon="Finished" @click="saveDevelop(scope.row)">提交</el-button> + </div> + </template> </el-table-column> </el-table> <div class="pageBtn"> - <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="projectState.searchQuery.pageIndex" background v-model:page-size="projectState.searchQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="projectState.total" class="page-position"> </el-pagination> + <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="developState.searchQuery.pageIndex" background v-model:page-size="developState.searchQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="developState.total" class="page-position"> </el-pagination> </div> </div> </div> </div> - <project-dialog ref="ProjectDialogRef" @refresh="getProjectData"></project-dialog> + <develop-dialog ref="DevelopDialogRef" @refresh="getdevelopData"></develop-dialog> <!-- <apply-start ref="ApplyStartRef"></apply-start>--> - <test ref="ApplyStartRef" @refresh="getProjectData"></test> + <test ref="ApplyStartRef" @refresh="getdevelopData"></test> + <report-dialog ref="ReportDialogRef"></report-dialog> </div> </template> @@ -58,23 +125,24 @@ import {defineAsyncComponent, onMounted, reactive, ref} from "vue"; import {projectApi} from "/@/api/experiment/project"; import {ElMessage, ElMessageBox} from "element-plus"; -import { View,Edit, Plus, Delete } from '@element-plus/icons-vue'; +import { View,Edit, Plus, RefreshLeft,Finished } from '@element-plus/icons-vue'; import {roomApi} from "/@/api/basic/room"; - -const ProjectDialog = defineAsyncComponent(() => import('./components/projectDialog.vue')); +const ReportDialog = defineAsyncComponent(() => import('../../analyse/assessApply/components/reportDialog.vue')); +const DevelopDialog = defineAsyncComponent(() => import('./components/developDialog.vue')); const Test = defineAsyncComponent(() => import('./components/applyDialog.vue')) -const ProjectDialogRef = ref(); -const ApplyStartRef = ref(); - -const projectState = reactive<ProjectStateType>({ - projectData: [], +const DevelopDialogRef = ref() +const ApplyStartRef = ref() +const ReportDialogRef = ref() +const developState = reactive<ProjectStateType>({ + developData: [], searchQuery: { pageIndex: 1, pageSize: 10, searchParams: { experimentName: '', experimentType: null, + assessLevel: null } }, total: 0, @@ -86,14 +154,21 @@ {id: 5, name: '特种设备类'}, {id: 6, name: '其它类'}, ], - allRoomList: [] + allRoomList: [], + riskLevelList: [ + {id: 1, name: '重大风险'}, + {id: 2, name: '较大风险'}, + {id: 3, name: '一般风险'}, + {id: 4, name: '低风险'}, + ], + tagBg: ['red', 'orange', 'yellow', 'blue'] }) -const getProjectData = async () => { - let res = await projectApi().getProjectByList(projectState.searchQuery); +const getdevelopData = async () => { + let res = await projectApi().getDevelopByList(developState.searchQuery); if(res.data.code === 100){ - projectState.projectData = res.data.data; - projectState.total = res.data.total; + developState.developData = res.data.data; + developState.total = res.data.total; }else{ ElMessage({ type: 'warning', @@ -103,12 +178,15 @@ }; const openProjectDialog = (title: string, value: ProjectType) => { - ProjectDialogRef.value.showProjectDialog(title, value, projectState.allRoomList); + DevelopDialogRef.value.showDevelopDialog(title, value, developState.allRoomList); }; +const openReportDialog = (title: string,value: ProjectType) =>{ + ReportDialogRef.value.showReportDialog(title, value, developState.allRoomList); +} + const applyAccess = (val: ProjectType) => { - debugger - ElMessageBox.confirm(`此操作将申请评估该实验:“${val.experimentCode}”,是否继续?`, '提示', { + ElMessageBox.confirm(`此操作将申请评估该实验:“${val.experimentName}”,是否继续?`, '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' @@ -121,7 +199,7 @@ duration: 2000, message: '申请成功' }); - await getProjectData(); + await getdevelopData(); } else { ElMessage({ type: 'warning', @@ -131,6 +209,32 @@ }) .catch((error) => { }); +} + +const cancelAccess = (val: ProjectType) => { + ElMessageBox.confirm(`此操作将撤销评估该实验:“${val.experimentName}”,是否继续?`, '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + .then(async () => { + let res = await projectApi().cancelProject([val.id]); + if (res.data.code === 100) { + ElMessage({ + type: 'success', + duration: 2000, + message: '撤销成功' + }); + await getdevelopData(); + } else { + ElMessage({ + type: 'warning', + message: res.data.msg + }); + } + }) + .catch((error) => { + }); } const onDelProject = (val: ProjectType) => { @@ -140,7 +244,6 @@ type: 'warning' }) .then(async () => { - debugger let res = await projectApi().deleteProjectById({ id: val.id }); if (res.data.code === 100) { ElMessage({ @@ -148,7 +251,7 @@ duration: 2000, message: '删除成功' }); - await getProjectData(); + await getdevelopData(); } else { ElMessage({ type: 'warning', @@ -159,32 +262,59 @@ .catch((error) => { }); } +const saveDevelop = async (data: any) => { + ElMessageBox.confirm(`此操作将提交该实验:“${data.experimentName}”,是否继续?`, '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }).then(async () => { + let res = await projectApi().addDevelop(data); + if(res.data.code === 100){ + ElMessage({ + type: 'success', + message: '提交成功' + }) + await getdevelopData(); + }else{ + ElMessage({ + type: 'warning', + message: res.data.msg, + }); + } +}) +.catch((error) => { +}); + +} + const onHandleSizeChange = (val: number) => { - projectState.searchQuery.pageSize = val; - getProjectData(); + developState.searchQuery.pageSize = val; + getdevelopData(); }; const onHandleCurrentChange = (val: number) => { - projectState.searchQuery.pageIndex = val; - getProjectData(); + developState.searchQuery.pageIndex = val; + getdevelopData(); }; const reset = () => { - projectState.searchQuery = { + developState.searchQuery = { pageIndex: 1, pageSize: 10, searchParams: { experimentName: '', experimentType: null, + assessLevel: null } } + getdevelopData() }; const getRoomData = async () => { let res = await roomApi().getAllRoom(); if(res.data.code === 100){ - projectState.allRoomList = JSON.parse(JSON.stringify(res.data.data)); + developState.allRoomList = JSON.parse(JSON.stringify(res.data.data)); }else{ ElMessage({ type: 'warning', @@ -194,7 +324,7 @@ }; onMounted(() => { - getProjectData(); + getdevelopData(); getRoomData(); }) @@ -326,6 +456,18 @@ color: #0098f5; } } +.red { + background: rgba(255,0,0,0.6); +} +.orange { + background: rgba(248,82,8,0.6); +} +.yellow { + background: rgba(247,255,0,0.6); +} +.blue { + background: rgba(0,112,192,0.6); +} :deep(.el-date-editor) { width: 100%; @@ -344,4 +486,7 @@ background-color: var(--el-card-bg-color); box-shadow: none; } +:deep(.el-tag){ + border: none; +} </style> -- Gitblit v1.9.2