From edcb5d7232547cb2cbb2d91ef2eaca9beda9b05d Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期四, 01 二月 2024 16:56:27 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/userManage/expertUsers/index.vue | 8 ++--
src/views/safetyReview/projectManage/components/siteCheckRcd.vue | 8 ++--
src/views/safetyReview/projectManage/components/signConfirm.vue | 16 ++------
src/components/ImagePreview/index.vue | 2
src/views/safetyReview/projectManage/components/expertsList.vue | 6 +-
src/views/safetyReview/projectManage/components/processCtrlReview.vue | 2
src/views/safetyReview/projectManage/components/riskAnalysis.vue | 23 ++++++-----
7 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue
index 8bc5d05..40a187e 100644
--- a/src/components/ImagePreview/index.vue
+++ b/src/components/ImagePreview/index.vue
@@ -4,7 +4,7 @@
fit="cover"
:style="`width:${realWidth};height:${realHeight};`"
:preview-src-list="realSrcList"
- :preview-teleported="true"
+ :preview-teleported= true
>
<template #error>
<div class="image-slot">
diff --git a/src/views/safetyReview/projectManage/components/expertsList.vue b/src/views/safetyReview/projectManage/components/expertsList.vue
index fbe7987..8c4d603 100644
--- a/src/views/safetyReview/projectManage/components/expertsList.vue
+++ b/src/views/safetyReview/projectManage/components/expertsList.vue
@@ -87,7 +87,7 @@
:preview-src-list="scope.row.socialAttach"
:initial-index="0"
fit="cover"
- preview-teleported="true"
+ :preview-teleported= true
/>
</div>
</template>
@@ -104,7 +104,7 @@
:preview-src-list="scope.row.medicalAttach"
:initial-index="0"
fit="cover"
- preview-teleported="true"
+ :preview-teleported= true
/>
</div>
</template>
@@ -121,7 +121,7 @@
:preview-src-list="scope.row.salaryAttach"
:initial-index="0"
fit="cover"
- preview-teleported="true"
+ :preview-teleported= true
/>
</div>
</template>
diff --git a/src/views/safetyReview/projectManage/components/processCtrlReview.vue b/src/views/safetyReview/projectManage/components/processCtrlReview.vue
index bd61ef2..60bf3cc 100644
--- a/src/views/safetyReview/projectManage/components/processCtrlReview.vue
+++ b/src/views/safetyReview/projectManage/components/processCtrlReview.vue
@@ -71,7 +71,7 @@
<el-row :gutter="30">
<el-col :span="18">
<el-form-item label="附件上传" prop="assAccessoryFiles">
- <el-upload accept="image/*,.pdf,.doc,.docx,.xlsx,.xls" :action="state.uploadUrl" :data="{moduleType: 8,projectId: props.projectId}" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.fileList" :before-upload="picSize" :disabled="state.disabled" :on-remove="handleRemove" :before-remove="beforeRemove">
+ <el-upload accept="image/*,.pdf,.doc,.docx,.xlsx,.xls" :action="state.uploadUrl" :data="{moduleType: 8,projectId: props.projectId}" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.fileList" :before-upload="picSize" :disabled="state.disabled" :on-remove="handleRemove" >
<el-button type="primary">附件上传</el-button>
<template #tip>
<div class="el-upload__tip">上传文件尺寸小于5M,最多可上传1份</div>
diff --git a/src/views/safetyReview/projectManage/components/riskAnalysis.vue b/src/views/safetyReview/projectManage/components/riskAnalysis.vue
index d05904d..368141b 100644
--- a/src/views/safetyReview/projectManage/components/riskAnalysis.vue
+++ b/src/views/safetyReview/projectManage/components/riskAnalysis.vue
@@ -229,6 +229,17 @@
import Cookies from "js-cookie";
const emit = defineEmits(["getNextStatus"]);
+const isAmin = ref(false)
+const formRef = ref();
+onMounted(() => {
+ const userInfo = JSON.parse(Cookies.get('userInfo'))
+ if(userInfo.identity === 0){
+ isAmin.value = true;
+ }
+ getRiskList();
+ getBusinessList();
+ getArea();
+});
const state = reactive({
formData: {
project: {
@@ -321,17 +332,7 @@
value: 'name',
label: 'name'
}
-const isAmin = ref(false)
-const formRef = ref();
-onMounted(() => {
- const userInfo = JSON.parse(Cookies.get('userInfo'))
- if(userInfo.identity === 0){
- isAmin.value = true;
- }
- getRiskList();
- getBusinessList();
- getArea();
-});
+
const getRiskList = async () => {
const res = await getDictList({dictType: "sys_assess_type"});
diff --git a/src/views/safetyReview/projectManage/components/signConfirm.vue b/src/views/safetyReview/projectManage/components/signConfirm.vue
index badcb05..49269a0 100644
--- a/src/views/safetyReview/projectManage/components/signConfirm.vue
+++ b/src/views/safetyReview/projectManage/components/signConfirm.vue
@@ -1,7 +1,7 @@
<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="序号" 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"/>
@@ -41,7 +41,7 @@
:preview-src-list="scope.row.facePic"
:initial-index="0"
fit="cover"
- preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
@@ -58,7 +58,7 @@
:preview-src-list="scope.row.signPic"
:initial-index="0"
fit="cover"
- preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
@@ -75,20 +75,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>
diff --git a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
index 514bd3e..255819d 100644
--- a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
+++ b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
@@ -48,7 +48,7 @@
<el-row :gutter="30">
<el-col :span="24" v-if="state.formData.isSafetyCheck == 1">
<el-form-item label="安全检查表上传" prop="assAccessoryFiles">
- <el-upload accept="image/*,.pdf,.doc,.docx,.xlsx,.xls" :action="state.uploadUrl" :data="{moduleType: 5,projectId: props.projectId}" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,5)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.safetyList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,5)" :before-remove="beforeRemove">
+ <el-upload accept="image/*,.pdf,.doc,.docx,.xlsx,.xls" :action="state.uploadUrl" :data="{moduleType: 5,projectId: props.projectId}" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,5)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.safetyList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,5)">
<el-button type="primary">附件上传</el-button>
<template #tip>
<div class="el-upload__tip">上传文件尺寸小于5M,最多可上传1份</div>
@@ -71,7 +71,7 @@
<el-row style="border: 1px dashed #999;border-radius: 4px;padding: 10px;margin-top: 20px">
<el-col :span="24">
<el-form-item label="主要装置前合影照片" prop="deviceImages">
- <el-upload accept="image/*" :action="state.uploadUrl" :data="{moduleType: 1,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,1)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.beforeDeviceList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,1)" :before-remove="beforeRemove">
+ <el-upload accept="image/*" :action="state.uploadUrl" :data="{moduleType: 1,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,1)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.beforeDeviceList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,1)" >
<el-icon><Plus /></el-icon>
<template #tip>
<div class="el-upload__tip">上传照片尺寸小于5M,最多可上传10张</div>
@@ -83,7 +83,7 @@
<el-row style="border: 1px dashed #999;border-radius: 4px;padding: 10px;margin-top: 20px">
<el-col :span="24">
<el-form-item label="现场勘验照片" prop="investingationImages">
- <el-upload accept="image/*" :action="state.uploadUrl" :data="{moduleType: 2,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,2)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.siteCheckList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,2)" :before-remove="beforeRemove">
+ <el-upload accept="image/*" :action="state.uploadUrl" :data="{moduleType: 2,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,2)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.siteCheckList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,2)" >
<el-icon><Plus /></el-icon>
<template #tip>
<div class="el-upload__tip">上传照片尺寸小于5M,最多可上传10张</div>
@@ -95,7 +95,7 @@
<el-row style="border: 1px dashed #999;border-radius: 4px;padding: 10px;margin-top: 20px;margin-bottom: 20px">
<el-col :span="24">
<el-form-item label="企业陪同人员照片" prop="ccompanyImages">
- <el-upload accept="image/*" :action="state.uploadUrl" :data="{moduleType: 3,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,3)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.companyList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,3)" :before-remove="beforeRemove">
+ <el-upload accept="image/*" :action="state.uploadUrl" :data="{moduleType: 3,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,3)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.companyList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,3)" >
<el-icon><Plus /></el-icon>
<template #tip>
<div class="el-upload__tip">上传照片尺寸小于5M,最多可上传10张</div>
diff --git a/src/views/safetyReview/userManage/expertUsers/index.vue b/src/views/safetyReview/userManage/expertUsers/index.vue
index 47e83ba..75e70c9 100644
--- a/src/views/safetyReview/userManage/expertUsers/index.vue
+++ b/src/views/safetyReview/userManage/expertUsers/index.vue
@@ -79,7 +79,7 @@
:preview-src-list="scope.row.socialAttach"
:initial-index="0"
fit="cover"
- :preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
@@ -96,7 +96,7 @@
:preview-src-list="scope.row.medicalAttach"
:initial-index="0"
fit="cover"
- :preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
@@ -113,7 +113,7 @@
:preview-src-list="scope.row.salaryAttach"
:initial-index="0"
fit="cover"
- :preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
@@ -130,7 +130,7 @@
:preview-src-list="scope.row.idPhoto"
:initial-index="0"
fit="cover"
- :preview-teleported="true"
+ :preview-teleported=true
/>
</div>
</template>
--
Gitblit v1.9.2