From 48b9dbfb66cf8bf6c83dac0f9365ba71d3181fba Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期二, 27 二月 2024 15:55:41 +0800
Subject: [PATCH] bug修改增加地图搜索
---
src/views/safetyReview/projectManage/components/signConfirm.vue | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/signConfirm.vue b/src/views/safetyReview/projectManage/components/signConfirm.vue
index badcb05..c529f8d 100644
--- a/src/views/safetyReview/projectManage/components/signConfirm.vue
+++ b/src/views/safetyReview/projectManage/components/signConfirm.vue
@@ -1,22 +1,23 @@
<template>
<div class="riskBox">
- <el-table v-loading="loading" ref="tableRef" :data="tableData" :border="true">
- <el-table-column type="index" width="55" />
- <el-table-column label="人员姓名" prop="person.name" align="center"/>
- <el-table-column label="联系电话" prop="person.phone" align="center"/>
- <el-table-column label="职位" prop="person.post" align="center"/>
+ <el-table v-loading="loading" ref="tableRef" :data="tableData" :border="true" style="margin-top: 20px">
+ <el-table-column label="序号" type="index" width="55" />
+ <el-table-column label="人员姓名" prop="planPerson.person.name" align="center"/>
+ <el-table-column label="联系电话" prop="planPerson.person.phone" align="center"/>
+ <el-table-column label="职位" prop="planPerson.person.post" align="center"/>
<el-table-column label="项目担任角色" prop="username" align="center">
<template #default="scope">
<span>{{ scope.row.planPerson.playRole === 1?'项目负责人': scope.row.planPerson.playRole === 2?
'项目组成员':scope.row.planPerson.playRole === 3?
'过程控制负责人':scope.row.planPerson.playRole === 4?
- '机构评价负责人':scope.row.planPerson.playRole === 5?'技术负责人':''}}
+ '机构评价负责人':scope.row.planPerson.playRole === 5?
+ '技术负责人':scope.row.planPerson.playRole === 6?'内部审核员':''}}
</span>
</template>
</el-table-column>
- <el-table-column label="评价师等级" prop="person.level" align="center"/>
- <el-table-column label="专业能力" prop="username" align="center"/>
- <el-table-column label="人员类型" prop="username" align="center">
+ <el-table-column label="评价师等级" prop="planPerson.person.level" align="center"/>
+ <el-table-column label="专业能力" prop="planPerson.person.majorNames" align="center"/>
+ <el-table-column label="工作类型" align="center">
<template #default="scope">
<span>{{scope.row.planPerson.jobType === 1 ? '普通人员' : scope.row.planPerson.jobType === 2?'组长': ''}}</span>
</template>
@@ -24,11 +25,11 @@
<el-table-column label="扫脸时间" prop="faceRecord.updateTime" align="center" width="120"/>
<el-table-column label="是否扫脸" prop="username" align="center">
<template #default="scope">
- <span v-if="scope.row.facePic">是</span>
+ <span v-if="scope.row.facePic.length>0">是</span>
<span v-else>否</span>
</template>
</el-table-column>
- <el-table-column label="是否变更" prop="username" align="center"/>
+<!-- <el-table-column label="是否变更" prop="username" align="center"/>-->
<el-table-column label="人脸照片" prop="socialSecurity" align="center" width="120">
<template #default="scope">
<div class="demo-image__preview" v-if="scope.row.facePic && scope.row.facePic.length>0">
@@ -41,7 +42,7 @@
:preview-src-list="scope.row.facePic"
:initial-index="0"
fit="cover"
- preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
@@ -58,7 +59,7 @@
:preview-src-list="scope.row.signPic"
:initial-index="0"
fit="cover"
- preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
@@ -75,20 +76,12 @@
:preview-src-list="scope.row.commitPic"
:initial-index="0"
fit="cover"
- preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
</el-table-column>
</el-table>
-
- <pagination
- v-show="total > 0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
</div>
</template>
<script setup>
@@ -141,13 +134,9 @@
facePic: item.faceRecord ? [import.meta.env.VITE_APP_BASE_API + '/' + item.faceRecord.facePath ] : [],
signPic: item.signPath ? [import.meta.env.VITE_APP_BASE_API + '/' + item.signPath] : [],
commitPic: item.insurancePath ? [import.meta.env.VITE_APP_BASE_API + '/' + item.insurancePath] : [],
- planPerson: {
- playRole: item.planPerson ? item.planPerson.playRole : '',
- jobType: item.planPerson ? item.planPerson.jobType : '',
- }
}
})
- console.log("res",res)
+ console.log("res", state.tableData)
}else {
ElMessage.warning(res.message)
}
@@ -165,16 +154,11 @@
return;
}
if(type === 'add'){
- const resCheck = await checkAll({projectId: val});
- if (resCheck.code == 200) {
- const res = await addFaceRecognition({projectId: val});
- if (res.code == 200) {
- ElMessage.success('保存成功')
- formRef.value.clearValidate();
- emit('getNextStatus', val);
- } else {
- ElMessage.warning(res.message)
- }
+ const res = await addFaceRecognition({projectId: val});
+ if (res.code == 200) {
+ ElMessage.success('保存成功')
+ formRef.value.clearValidate();
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
}
--
Gitblit v1.9.2