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/project/index.vue | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/src/views/experiment/project/index.vue b/src/views/experiment/project/index.vue
index 2918ffa..009a91b 100644
--- a/src/views/experiment/project/index.vue
+++ b/src/views/experiment/project/index.vue
@@ -13,6 +13,12 @@
<el-option v-for="item in projectState.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="projectState.searchQuery.searchParams.assessLevel" clearable filterable class="input-box" placeholder="风险等级">
+ <el-option v-for="item in projectState.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 plain @click="reset">重置</el-button>
@@ -46,11 +52,11 @@
<span>{{scope.row.siteList.map(i=>i.siteName).join(',')}}</span>
</template>
</el-table-column>
- <el-table-column prop="experimentType" label="实验类别">
- <template #default="scope">
- <span>{{projectState.experimentTypeList.find(i=>i.id == scope.row.experimentType)?.name}}</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>
@@ -68,10 +74,15 @@
</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="scope.row.assessLevel == 4?'danger':scope.row.assessLevel == 3 || scope.row.assessLevel == 2?'warning':''">
- {{scope.row.assessLevel == 1?'重大风险':scope.row.assessLevel == 2?'较大风险':scope.row.assessLevel == 3?'一般风险':scope.row.assessLevel == 4?'低风险':'--'}}
+ <el-tag type="info" :class="projectState.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>
@@ -81,12 +92,19 @@
<!-- <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="View" v-if="scope.row.stage == 4" @click="openReportDialog('查看',scope.row)">查看评估报告</el-button>
<el-button size="small" text type="primary" :icon="Edit" @click="applyStart('申请开展', scope.row)">转为已开展</el-button>
- <el-button size="small" :disabled="scope.row.status == 2 ? true : false" text type="primary" :icon="Edit" @click="applyAccess( 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" type="warning" v-if="scope.row.rectifyStatus == 1" text :icon="Edit" @click="openProjectDialog('整改', scope.row)">整改</el-button>
<el-button size="small" text type="danger" :icon="Delete" :disabled="scope.row.stage !== 1" @click="onDelProject(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>
@@ -107,7 +125,7 @@
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, Delete,Finished } from '@element-plus/icons-vue';
import {roomApi} from "/@/api/basic/room";
const ReportDialog = defineAsyncComponent(() => import('../../analyse/assessApply/components/reportDialog.vue'));
const ProjectDialog = defineAsyncComponent(() => import('./components/projectDialog.vue'));
@@ -123,6 +141,7 @@
searchParams: {
experimentName: '',
experimentType: null,
+ assessLevel: null
}
},
total: 0,
@@ -134,7 +153,15 @@
{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 () => {
@@ -187,6 +214,30 @@
.catch((error) => {
});
}
+const saveDevelop = async (data: any) => {
+ ElMessageBox.confirm(`此操作将提交该实验：“${data.experimentName}”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(async () => {
+ let res = await projectApi().addProject(data);
+ if(res.data.code === 100){
+ ElMessage({
+ type: 'success',
+ message: '提交成功'
+ })
+ await getProjectData();
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg,
+ });
+ }
+ })
+ .catch((error) => {
+ });
+
+}
const onDelProject = (val: ProjectType) => {
ElMessageBox.confirm(`此操作将永久删除该实验：“${val.experimentName}”，是否继续?`, '提示', {
@@ -231,8 +282,10 @@
searchParams: {
experimentName: '',
experimentType: null,
+ assessLevel: null
}
}
+ getProjectData()
};
const getRoomData = async () => {
@@ -380,7 +433,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%;
}
@@ -398,4 +462,7 @@
background-color: var(--el-card-bg-color);
box-shadow: none;
}
+:deep(.el-tag){
+ border: none;
+}
</style>
--
Gitblit v1.9.2