From 5c45db7c1be28da293b3583c16834ee97e8bac47 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期三, 02 四月 2025 13:43:06 +0800 Subject: [PATCH] 修改 --- src/views/analyse/identify/index.vue | 67 ++------------------------------- 1 files changed, 5 insertions(+), 62 deletions(-) diff --git a/src/views/analyse/identify/index.vue b/src/views/analyse/identify/index.vue index d5f3e03..f5c5d8d 100644 --- a/src/views/analyse/identify/index.vue +++ b/src/views/analyse/identify/index.vue @@ -27,13 +27,14 @@ <!-- <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"> <span>{{`${identifyState.identificationMethodList.find(item =>item.id === scope.row.identificationMethod)?.name}`}}</span> </template> </el-table-column> - <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> @@ -68,9 +69,9 @@ </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 && scope.row.identificationUserId == identifyState.user" @click="accessIdentify(scope.row)">提交</el-button> + <el-button size="small" text type="primary" v-if="scope.row.planExecStatus === 2 && scope.row.identityUsers?.find(i=>i.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 && scope.row.identityUsers?.find(i=>i.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> @@ -169,7 +170,7 @@ realName: '' } }); - if(res.data.code === 200){ + if(res.data.code === 100){ identifyState.personList = JSON.parse(JSON.stringify(res.data.data)); }else{ ElMessage({ @@ -337,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