From 18aff5cd709785bb357ec8c22b4074680cadf0d0 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期一, 19 二月 2024 09:12:42 +0800
Subject: [PATCH] bug修改
---
src/utils/request.js | 2
src/views/safetyReview/projectManage/components/employNoticeRecord.vue | 22 ++++---
src/views/safetyReview/projectManage/components/evaluatePlan.vue | 22 +++---
src/views/safetyReview/projectManage/components/innerReview.vue | 2
src/views/safetyReview/projectManage/components/techLeaderReview.vue | 2
src/views/safetyReview/projectManage/components/projectArchive.vue | 3
src/views/safetyReview/projectManage/components/siteCheckRcd.vue | 95 +++++++++++++++++--------------
src/views/safetyReview/projectManage/components/riskAnalysis.vue | 2
8 files changed, 81 insertions(+), 69 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 1514693..3a8d1b5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -55,7 +55,7 @@
const s_url = sessionObj.url; // 请求地址
const s_data = sessionObj.data; // 请求数据
const s_time = sessionObj.time; // 请求时间
- const interval = 10; // 间隔时间(ms)，小于此时间视为重复提交
+ const interval = 1; // 间隔时间(ms)，小于此时间视为重复提交
if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url && s_url!=='/system/common/uploadFile') {
const message = '数据正在处理，请勿重复提交';
console.warn(`[${s_url}]: ` + message)
diff --git a/src/views/safetyReview/projectManage/components/employNoticeRecord.vue b/src/views/safetyReview/projectManage/components/employNoticeRecord.vue
index e3a816d..bf53ce7 100644
--- a/src/views/safetyReview/projectManage/components/employNoticeRecord.vue
+++ b/src/views/safetyReview/projectManage/components/employNoticeRecord.vue
@@ -36,20 +36,20 @@
</el-row>
<el-table :data="state.planPersons" :border="true" style="margin: 20px 0">
<el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
- <el-table-column label="评价组成员" prop="person.name" header-align="center" :show-overflow-tooltip="true"/>
- <el-table-column label="专业能力/资格证书" prop="person.certificateNo" header-align="center" :show-overflow-tooltip="true">
+ <el-table-column label="评价组成员" prop="person.name" align="center" :show-overflow-tooltip="true"/>
+ <el-table-column label="专业能力/资格证书" prop="person.certificateNo" align="center" :show-overflow-tooltip="true">
<template #default="scope">
{{ getCertNo(scope.row) }}
</template>
</el-table-column>
- <el-table-column label="承担工作" prop="work" header-align="center" class-name="small-padding fixed-width"></el-table-column>
- <el-table-column label="承诺后期前往现场勘验" prop="laterPromise" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="承担工作" prop="work" align="center" class-name="small-padding fixed-width"></el-table-column>
+ <el-table-column label="承诺后期前往现场勘验" prop="laterPromise" align="center" class-name="small-padding fixed-width">
<template #default="scope">
{{(scope.row.laterPromise==1 || scope.row.laterPromise==true)?'是':'否'}}
</template>
</el-table-column>
- <el-table-column label="未到现场勘验原因" prop="reason" header-align="center" class-name="small-padding fixed-width"></el-table-column>
- <el-table-column label="是否已告知" header-align="center" class-name="small-padding fixed-width">
+ <el-table-column label="未到现场勘验原因" prop="reason" align="center" class-name="small-padding fixed-width"></el-table-column>
+ <el-table-column label="是否已告知" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-radio-group v-model="scope.row.informed" size="large" @change="(value)=>changePerson(value,scope.row)">
<el-radio :label="1" size="large">是</el-radio>
@@ -96,14 +96,16 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
- // getWorksList(props.projectId)
-});
+ if(props.projectId){
+ getWorksList(props.projectId)
+ }
+});
const riskOpen = async (type,val) => {
state.formData.projectId = val
state.projectId = val
- await getWorksList(val)
+ // await getWorksList(val)
if(type === 'detail' || type === 'edit' ){
const res = await getWorkDetail({projectId: val})
if(res.code == 200){
@@ -128,7 +130,7 @@
if (res.code == 200) {
ElMessage.success('保存成功')
formRef.value.clearValidate();
- emit('getNextStatus', res.data);
+ emit('getNextStatus', state.projectId);
} else {
ElMessage.warning(res.message)
}
diff --git a/src/views/safetyReview/projectManage/components/evaluatePlan.vue b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
index c162cee..2e37f72 100644
--- a/src/views/safetyReview/projectManage/components/evaluatePlan.vue
+++ b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
@@ -166,7 +166,7 @@
auserId: null,
estimateSchedules: [
{
- id: 1,
+ id: null,
sort: 1,
name: '勘验准备',
startDate: '',
@@ -175,7 +175,7 @@
projectId: null
},
{
- id: 2,
+ id: null,
sort: 2,
name: '现场勘验',
startDate: '',
@@ -184,7 +184,7 @@
projectId: null
},
{
- id: 3,
+ id: null,
sort: 3,
name: '材料分析整理',
startDate: '',
@@ -193,7 +193,7 @@
projectId: null
},
{
- id: 4,
+ id: null,
sort: 4,
name: '评价报告编写',
startDate: '',
@@ -202,7 +202,7 @@
projectId: null
},
{
- id: 5,
+ id: null,
sort: 5,
name: '整改情况现场确认',
startDate: '',
@@ -211,7 +211,7 @@
projectId: null
},
{
- id: 6,
+ id: null,
sort: 6,
name: '整理评价报告',
startDate: '',
@@ -220,7 +220,7 @@
projectId: null
},
{
- id: 7,
+ id: null,
sort: 7,
name: '报告审核',
startDate: '',
@@ -229,7 +229,7 @@
projectId: null
},
{
- id: 8,
+ id: null,
sort: 8,
name: '报告修改',
startDate: '',
@@ -286,8 +286,8 @@
for(let i of state.formData.estimateSchedules){
i.projectId = val
}
- await getWorksList(val)
- await getDeviceList(val)
+ // await getWorksList(val)
+ // await getDeviceList(val)
if(type === 'detail' || type === 'edit' ){
const res = await getDetail({projectId: val})
if(res.code == 200){
@@ -310,7 +310,7 @@
if (res.code == 200) {
ElMessage.success('保存成功')
formRef.value.clearValidate();
- emit('getNextStatus', res.data);
+ emit('getNextStatus', state.formData.projectId);
} else {
ElMessage.warning(res.message)
diff --git a/src/views/safetyReview/projectManage/components/innerReview.vue b/src/views/safetyReview/projectManage/components/innerReview.vue
index ba24145..730b748 100644
--- a/src/views/safetyReview/projectManage/components/innerReview.vue
+++ b/src/views/safetyReview/projectManage/components/innerReview.vue
@@ -176,7 +176,7 @@
if (res.code == 200) {
ElMessage.success('保存成功')
formRef.value.clearValidate();
- emit('getNextStatus', res.data);
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
diff --git a/src/views/safetyReview/projectManage/components/projectArchive.vue b/src/views/safetyReview/projectManage/components/projectArchive.vue
index c151d06..93ee337 100644
--- a/src/views/safetyReview/projectManage/components/projectArchive.vue
+++ b/src/views/safetyReview/projectManage/components/projectArchive.vue
@@ -3,7 +3,8 @@
<el-form ref="formRef" :model="state.formData" :rules="state.rules" class="register-form" label-position="top">
<el-row :gutter="30">
<el-col :span="10">
- <el-button type="primary" :disabled="projectType === 'edit'" @click="addUpload">新增附件列表</el-button>
+<!-- <el-button type="primary" :disabled="projectType === 'edit'" @click="addUpload">新增附件列表</el-button>-->
+ <span style="font-size: 20px;font-weight: 600">附件列表</span>
<span style="font-size: 13px;color: rgb(232, 78, 79);font-weight: 400;margin-left: 10px">项目列表仅支持pdf、jpg、jpeg 等格式上传</span>
</el-col>
</el-row>
diff --git a/src/views/safetyReview/projectManage/components/riskAnalysis.vue b/src/views/safetyReview/projectManage/components/riskAnalysis.vue
index 368141b..36c8535 100644
--- a/src/views/safetyReview/projectManage/components/riskAnalysis.vue
+++ b/src/views/safetyReview/projectManage/components/riskAnalysis.vue
@@ -405,7 +405,7 @@
if (res.code == 200) {
ElMessage.success('保存成功')
formRef.value.clearValidate();
- emit('getNextStatus', res.data);
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
diff --git a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
index 255819d..4dbb3c4 100644
--- a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
+++ b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
@@ -194,54 +194,63 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
+ if(props.projectId){
+ getDetail(props.projectId)
+ }
+
});
+
+const getDetail = async (val) => {
+ const res = await getSiteCheckDetail({projectId: val});
+ if(res.code == 200){
+ state.formData = res.data;
+ state.beforeDeviceList = res.data.deviceImages.map(i=>{
+ return {
+ name: i.fileName,
+ url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
+ id: i.id,
+ projectId: i.projectId,
+ moduleType: i.moduleType
+ }
+ })
+ state.siteCheckList = res.data.investingationImages.map(i=>{
+ return {
+ name: i.fileName,
+ url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
+ id: i.id,
+ projectId: i.projectId,
+ moduleType: i.moduleType
+ }
+ })
+ state.companyList = res.data.ccompanyImages.map(i=>{
+ return {
+ name: i.fileName,
+ url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
+ id: i.id,
+ projectId: i.projectId,
+ moduleType: i.moduleType
+ }
+ })
+ state.safetyList = res.data.assAccessoryFiles.map(i=>{
+ return {
+ name: i.fileName,
+ url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
+ id: i.id,
+ projectId: i.projectId,
+ moduleType: i.moduleType
+ }
+ })
+ }else {
+ ElMessage.warning(res.message)
+ }
+}
+
const riskOpen = async (type,val) => {
state.formData.projectId = val
state.projectId = val
if(type === 'detail' || type === 'edit' ){
- const res = await getSiteCheckDetail({projectId: val});
- if(res.code == 200){
- state.formData = res.data;
- state.beforeDeviceList = res.data.deviceImages.map(i=>{
- return {
- name: i.fileName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
- moduleType: i.moduleType
- }
- })
- state.siteCheckList = res.data.investingationImages.map(i=>{
- return {
- name: i.fileName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
- moduleType: i.moduleType
- }
- })
- state.companyList = res.data.ccompanyImages.map(i=>{
- return {
- name: i.fileName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
- moduleType: i.moduleType
- }
- })
- state.safetyList = res.data.assAccessoryFiles.map(i=>{
- return {
- name: i.fileName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
- moduleType: i.moduleType
- }
- })
- }else {
- ElMessage.warning(res.message)
- }
+ // await getDetail(val)
}
if(type === 'add' || type === 'clickEdit') {
const valid = await formRef.value.validate();
@@ -271,7 +280,7 @@
}
}
formRef.value.clearValidate();
- emit('getNextStatus', res.data);
+ emit('getNextStatus', state.projectId);
} else {
ElMessage.warning(res.message)
}
diff --git a/src/views/safetyReview/projectManage/components/techLeaderReview.vue b/src/views/safetyReview/projectManage/components/techLeaderReview.vue
index d928c0e..237c4e0 100644
--- a/src/views/safetyReview/projectManage/components/techLeaderReview.vue
+++ b/src/views/safetyReview/projectManage/components/techLeaderReview.vue
@@ -172,7 +172,7 @@
if (res.code == 200) {
ElMessage.success('保存成功')
formRef.value.clearValidate();
- emit('getNextStatus', res.data);
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
--
Gitblit v1.9.2