From cbb23429b8beed72b58cbb57f9b3c56a0fb2b5d2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 09 五月 2025 13:31:26 +0800
Subject: [PATCH] 修改
---
src/views/analyse/evaluate/index.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/views/analyse/evaluate/index.vue b/src/views/analyse/evaluate/index.vue
index 41ec3e0..5d648a3 100644
--- a/src/views/analyse/evaluate/index.vue
+++ b/src/views/analyse/evaluate/index.vue
@@ -74,7 +74,7 @@
</template>
</el-table-column>
<el-table-column prop="riskUnitName" label="风险单元" />
- <el-table-column prop="identificationUser" label="计划负责人" />
+ <el-table-column prop="planUserName" label="计划负责人" />
<el-table-column prop="identificationUser" label="辨识专家" />
<el-table-column prop="evaluateUser" label="评价专家" />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
@@ -109,8 +109,9 @@
</el-table-column>
<el-table-column label="操作" width="250">
<template #default="scope">
- <el-button size="small" v-if="scope.row.planExecStatus===3 && scope.row.evaluateUserId == evaluateState.user" text type="primary" :icon="DocumentChecked" @click="accessEvaluate(scope.row)">提交</el-button>
- <el-button size="small" v-if="scope.row.planExecStatus===3 && scope.row.evaluateUserId == evaluateState.user" text type="primary" :icon="Edit" @click="openEvaluate(scope.row)">评价</el-button>
+ <el-button size="small" text :icon="View" type="primary" @click="openProjectDialog('查看',scope.row)">实验信息</el-button>
+ <el-button size="small" v-if="scope.row.planExecStatus===3 && scope.row.evaluateUsers?.find(i=>i.evaluateUserId== evaluateState.user)" text type="primary" :icon="DocumentChecked" @click="accessEvaluate(scope.row)">提交</el-button>
+ <el-button size="small" v-if="scope.row.planExecStatus===3 && scope.row.evaluateUsers?.find(i=>i.evaluateUserId== evaluateState.user)" text type="primary" :icon="Edit" @click="openEvaluate(scope.row)">评价</el-button>
<el-button size="small" v-if="scope.row.planExecStatus===4" text :icon="View" type="primary" @click="openEvaluate(scope.row)">查看评价</el-button>
</template>
</el-table-column>
@@ -155,13 +156,13 @@
<el-table-column v-if="evaluateState.currentEvalute.identificationMethod == 5" prop="analogyResult" label="可能存在后果" show-overflow-tooltip align="center"></el-table-column>
<el-table-column label="操作">
<template #default="scope">
- <el-button size="small" v-if="evaluateState.currentEvalute.planExecStatus === 3 && evaluateState.currentEvalute.evaluateUserId == evaluateState.user" text type="primary" :icon="Plus" @click="openEvaluateDialog('评价', scope.row)">评价</el-button>
+ <el-button size="small" v-if="evaluateState.currentEvalute.planExecStatus === 3 && evaluateState.currentEvalute.evaluateUsers?.find(i=>i.evaluateUserId== evaluateState.user)" text type="primary" :icon="Plus" @click="openEvaluateDialog('评价', scope.row)">评价</el-button>
<el-button size="small" v-if="scope.row.riskValue" text type="primary" :icon="View" @click="openEvaluateDialog('查看', scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
-
+ <develop-dialog ref="DevelopDialogRef" @refresh="getEvaluateData"></develop-dialog>
<evaluate-dialog ref="evaluateDialogRef" @refresh="getDataAndClose"></evaluate-dialog>
</div>
</template>
@@ -176,16 +177,20 @@
import {userApi} from "/@/api/systemManage/user";
import {useUserInfo} from "/@/stores/userInfo";
import {storeToRefs} from "pinia";
-
+import {roomApi} from "/@/api/basic/room";
+import {projectApi} from "/@/api/experiment/project";
+const DevelopDialog = defineAsyncComponent(() => import('../../experiment/developing/components/developDialog.vue'));
const EvaluateDialog = defineAsyncComponent(() => import('./components/evaluateDialog.vue'));
const evaluateDialogRef = ref();
+const DevelopDialogRef = ref()
const userInfo = useUserInfo();
const { userInfos } = storeToRefs(userInfo);
const evaluateState = reactive<EvaluateStateType>({
evaluateData: [],
user: null,
currentEvalute:{},
+ allRoomList: [],
evaluateDialog: false,
searchQuery: {
pageIndex: 1,
@@ -230,6 +235,47 @@
message: res.data.msg
});
}
+};
+
+const getRoomData = async () => {
+ let res = await roomApi().getAllRoom();
+ if(res.data.code === 100){
+ evaluateState.allRoomList = JSON.parse(JSON.stringify(res.data.data));
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+};
+
+const openProjectDialog = async (title: string, value: {}) => {
+ let res = await projectApi().getProjectByList({
+ pageIndex: 1,
+ pageSize: 10,
+ searchParams: {
+ experimentName: '',
+ experimentType: null,
+ assessLevel: null,
+ id: value.experimentId
+ }
+ },);
+ if(res.data.code === 100){
+ if(Array.isArray(res.data.data) && res.data.data.length>0){
+ DevelopDialogRef.value.showDevelopDialog(title, res.data.data[0], evaluateState.allRoomList);
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: '查询不到实验信息'
+ });
+ }
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+
};
const getDataAndClose =()=>{
@@ -355,6 +401,7 @@
getEvaluateData();
getAllPlanList();
getPersonList();
+ getRoomData()
evaluateState.user = Number(userInfos.value.uid)
});
--
Gitblit v1.9.2