From 9a4bfd7ff64e2ddd4eaa49dc4b55377032a975ea Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 31 Oct 2023 10:01:06 +0800
Subject: [PATCH] 修改
---
src/views/analyse/identify/index.vue | 141 ++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 86 deletions(-)
diff --git a/src/views/analyse/identify/index.vue b/src/views/analyse/identify/index.vue
index 320da4a..62b0508 100644
--- a/src/views/analyse/identify/index.vue
+++ b/src/views/analyse/identify/index.vue
@@ -27,6 +27,7 @@
<!-- <el-button type="primary" :icon="Refresh" size="default" />-->
</el-row>
<el-table ref="multipleTableRef" :data="identifyState.identifyData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }">
+ <el-table-column type="index" label="序号"/>
<el-table-column prop="assessPlanName" label="评估计划名称"/>
<el-table-column prop="identificationMethod" label="辨识方法" show-overflow-tooltip>
<template #default="scope">
@@ -34,33 +35,44 @@
</template>
</el-table-column>
<el-table-column prop="identificationUser" 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>
<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 prop="planExecStatus" label="状态" show-overflow-tooltip>
+ <el-table-column prop="planExecStatus" label="执行状态" show-overflow-tooltip>
<template #default="scope">
<div>
+ <div v-if="scope.row.planExecStatus === 1">
+ <el-tag :type="'info'">
+ {{ '未开始' }}
+ </el-tag>
+ </div>
<div v-if="scope.row.planExecStatus === 2">
<el-tag :type="'info'">
- {{ '未辨识' }}
+ {{ '辨识阶段' }}
</el-tag>
</div>
<div v-if="scope.row.planExecStatus === 3">
- <el-tag :type="'success'">
- {{ '已辨识' }}
+ <el-tag :type="'primary'">
+ {{ '评价阶段' }}
</el-tag>
+ </div>
+ <div v-if="scope.row.planExecStatus === 4">
+ <el-tag :type="'success'">
+ {{ '完成阶段' }}
+ </el-tag>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="250">
<template #default="scope">
- <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2" @click="accessIdentify(scope.row)">提交</el-button>
- <el-button size="small" text type="primary" :icon="View" @click="openIdentifyQuery('查看', scope.row)">查看</el-button>
- <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2" :icon="Edit" @click="openIdentifyQuery('编辑', scope.row)">编辑</el-button>
- <el-button size="small" text type="danger" :icon="Delete" @click="onDelIdentify(scope.row)">删除</el-button>
+ <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2 && scope.row.identificationUserId == identifyState.user" @click="accessIdentify(scope.row)">提交</el-button>
+ <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 3 || scope.row.planExecStatus === 4" :icon="View" @click="openIdentifyQuery('查看', scope.row)">查看</el-button>
+ <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2 && scope.row.identificationUserId == identifyState.user" :icon="Edit" @click="openIdentifyQuery('辨识', scope.row)">辨识</el-button>
+<!-- <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2" :icon="Edit" @click="openIdentifyQuery('编辑', scope.row)">编辑</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -81,13 +93,17 @@
import { Edit, View, Plus, Delete } from '@element-plus/icons-vue';
import {planApi} from "/@/api/analyse/plan";
import {userApi} from "/@/api/systemManage/user";
+import {useUserInfo} from "/@/stores/userInfo";
+import {storeToRefs} from "pinia";
const IdentifyQueryDialog = defineAsyncComponent(() => import('./components/identifyQuery.vue'));
const identifyQueryDialogRef = ref();
-
+const userInfo = useUserInfo();
+const { userInfos } = storeToRefs(userInfo);
const identifyState = reactive<IdentifyStateType>({
identifyData: [],
+ user: null,
searchQuery: {
pageIndex: 1,
pageSize: 10,
@@ -146,10 +162,13 @@
const getPersonList = async () => {
let res = await userApi().getUserList({
- roleId: 1,
- usePage: false,
pageIndex: 1,
- pageSize: 10
+ pageSize: 99999,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
});
if(res.data.code === 100){
identifyState.personList = JSON.parse(JSON.stringify(res.data.data));
@@ -192,29 +211,36 @@
};
const accessIdentify = (val: IdentifyType) => {
- ElMessageBox.confirm(`此操作将派发该计划：“${val.assessPlanName}”，是否继续?`, '提示', {
+ if(val.factorQueryDTOList?.length > 0){
+ ElMessageBox.confirm(`此操作将提交该计划：“${val.assessPlanName}”的辨识信息，是否继续?`, '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
- })
- .then(async () => {
+ })
+ .then(async () => {
let res = await identifyApi().submitIdentify({ id: val.id});
if (res.data.code === 100) {
- ElMessage({
- type: 'success',
- duration: 2000,
- message: '提交成功'
- });
- await getIdentifyData();
+ ElMessage({
+ type: 'success',
+ duration: 2000,
+ message: '提交成功'
+ });
+ await getIdentifyData();
} else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
- })
- .catch((error) => {
- });
+ })
+ .catch((error) => {
+ });
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: '请先添加辨识信息'
+ });
+ }
};
const onHandleSizeChange = (val: number) => {
@@ -241,6 +267,7 @@
getIdentifyData();
getAllPlanList();
getPersonList();
+ identifyState.user = Number(userInfos.value.uid)
});
</script>
@@ -311,64 +338,6 @@
margin-right: 20px;
}
}
- }
-}
-.stepItem {
- width: 100%;
- display: flex;
- align-items: flex-start;
- margin-bottom: 30px;
- margin-left: 30px;
- padding-bottom: 30px;
- border-left: 2px solid #ccc;
- &:first-of-type {
- margin-top: 30px;
- }
- &:last-of-type {
- margin-bottom: 0;
- border-left: none;
- }
- .stepNum {
- width: 30px;
- height: 30px;
- border-radius: 15px;
- box-sizing: border-box;
- color: #333;
- border: 1px solid #999;
- line-height: 28px;
- text-align: center;
- margin-right: 10px;
- margin-left: -16px;
- margin-top: -30px;
- }
- .stepCard {
- width: 100%;
- margin-top: -30px;
-
- .box-card {
- width: 100%;
- &:deep(.el-card__header) {
- padding: 10px 15px;
- }
- .card-header {
- width: 100%;
- display: flex;
- justify-content: space-between;
- align-items: center;
- & > div:first-of-type {
- margin-right: 80px;
- font-size: 18px;
- font-weight: bold;
- }
- }
- }
- }
- &:hover .card-header {
- color: #0098f5;
- }
- &:hover .stepNum {
- border: 2px solid #0098f5;
- color: #0098f5;
}
}
--
Gitblit v1.9.2