liux
/
nxdt-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修复

This commit is contained in:
BianLzhaoMin 2025-06-23 10:13:42 +08:00
parent 999c3565d1
commit e8fa89e0fc
10 changed files with 143 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/pro-tabs/bns-kkFile-preview.vue
View File

@ -107,6 +107,8 @@ export default {
}
console.log('filePreviewPath', filePreviewPath)
this.file = filePreviewPath
// alert(this.file, ' this.file')
this.fileUploadPath = fileUploadPath
},
onIframeLoad() {

4
src/utils/bonus.js
View File

@ -1,7 +1,7 @@
import { getToDoNum } from '@/api/system/notice'
//0 测试 1生产
let fileType = process.env.VUE_APP_ENV === 'testing' ? 0 : 1
// let fileType = 0
// let fileType = process.env.VUE_APP_ENV === 'testing' ? 0 : 1
let fileType = 0
export function lookFile() {
if (fileType === 0) {

45
src/utils/upload.js
View File

@ -1,13 +1,11 @@
import request from '@/utils/request'
//上传信息
export function uploadFileInfo(data){
export function uploadFileInfo(data) {
return request({
url:'/exam/multipart/uploadFileInfo',
method:'post',
data:data
url: '/exam/multipart/uploadFileInfo',
method: 'post',
data: data,
})
}
@ -16,39 +14,36 @@ export function checkUpload(MD5) {
return request({
url: '/exam/multipart/check',
method: 'get',
params: {"md5":MD5}
params: { md5: MD5 },
})
};
}
// 初始化上传
export function initUpload(data) {
return request({
url: '/exam/multipart/init',
method: 'post',
data:data
data: data,
})
};
}
// 文件合并
export function mergeUpload(data) {
return request({
url: '/exam/multipart/merge',
method: 'post',
data:data
data: data,
})
};
}
//判断文件是否存在
export function fileIsExits(data) {
return request({
url: '/exam/multipart/fileIsExits',
method: 'post',
data:data
data: data,
})
};
}
// 上传文件
export function uploadFiles(formData) {
@ -59,7 +54,19 @@ export function uploadFiles(formData) {
timeout: 600000, // 设置超时时间为 10 秒（10000 毫秒）
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
repeatSubmit:false
}
repeatSubmit: false,
},
})
}
export function uploadFilesNew(formData) {
return request({
url: '/exam/multipart/uploadFiles',
method: 'post',
data: formData,
timeout: 600000, // 设置超时时间为 10 秒（10000 毫秒）
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
repeatSubmit: false,
},
})
}

19
src/views/IndexPage/index_other.vue
View File

@ -9,7 +9,7 @@
:style="{ marginTop: '-8px', float: 'right', marginRight: '10px;', fontSize: '18px' }"
@click="admissionRequest"
v-hasPermi="['system:entrance:apply']"
v-if="this.enterStatus === '草稿'"
v-if="this.enterStatus === '草稿' && proId"
>
入场申请
</el-button>
@ -35,7 +35,7 @@
</el-button>
</h3>
<el-table :data="enterList" border style="width: 100%; text-align: center; margin-top: 10px">
<el-table :data="enterList" border style="width: 100%; text-align: center; margin-top: 10px" v-if="proId">
<el-table-column prop="enterStatus" label="入场审批状态" align="center"></el-table-column>
<el-table-column prop="turnDownReason" label="驳回原因" align="center"></el-table-column>
<el-table-column label="操作" align="center">
@ -81,6 +81,8 @@
</template>
</el-table-column>
</el-table>
<el-empty description="暂无工程信息" v-if="!proId"></el-empty>
<div v-if="this.$store.state.user.thisIds.intoStatus == '3'">
<el-table
:data="exitList"
@ -138,8 +140,8 @@
</el-table-column>
</el-table>
</div>
<h3 style="color: #409eff; background: #f6f6f6; padding: 15px; border-radius: 10px">工程基础信息----</h3>
<el-row :gutter="gutter">
<h3 style="color: #409eff; background: #f6f6f6; padding: 15px; border-radius: 10px">工程基础信息</h3>
<el-row :gutter="gutter" v-if="proId">
<el-col :span="7">
<el-form-item label="工程名称：" label-width="130px" prop="">
<el-input v-model="form.proName" style="width: 300px" disabled></el-input>
@ -156,7 +158,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="gutter">
<el-row :gutter="gutter" v-if="proId">
<el-col :span="7">
<el-form-item label="工程类型：" label-width="130px" prop="">
<el-input v-model="form.proType" style="width: 300px" disabled></el-input>
@ -173,7 +175,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="gutter">
<el-row :gutter="gutter" v-if="proId">
<el-col :span="7">
<el-form-item label="监理单位：" label-width="130px" prop="">
<el-input v-model="form.unitName" style="width: 300px" disabled></el-input>
@ -190,7 +192,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="gutter">
<el-row :gutter="gutter" v-if="proId">
<el-col :span="7">
<el-form-item label="工程地址：" label-width="130px" prop="">
<el-input v-model="form.address" style="width: 300px" disabled></el-input>
@ -198,6 +200,7 @@
</el-col>
</el-row>
<el-empty description="暂无工程信息" v-if="!proId"></el-empty>
<div v-if="this.$store.state.user.userType != '01'">
<h3 style="color: #409eff; background: #f6f6f6; padding: 15px; border-radius: 10px">入场材料示例模板</h3>
<div style="display: flex; flex-direction: row; flex-wrap: wrap">
@ -261,9 +264,11 @@ export default {
directorPhone: '',
address: '',
},
proId: '',
}
},
created() {
this.proId = this.$store.state.user.thisIds.proId
if (this.$store.state.user.userType !== '00') {
this.init()
if (this.$store.state.user.userType !== '01') {

24
src/views/educationalTraining/resourceAdministration/coursewareStore/index.vue
View File

@ -78,7 +78,7 @@
icon="el-icon-upload"
@click="handleUpload(scope.row)"
>
上传
上传***
</el-button>
<el-popover placement="bottom" width="40" trigger="hover">
<div style="display: flex; flex-direction: column; align-items: center">
@ -203,9 +203,16 @@
</div>
</el-dialog>
<el-dialog title="文件查看" :visible.sync="documentPreview" width="80%" top="5vh" append-to-body>
<el-dialog
title="文件查看"
width="80%"
top="5vh"
append-to-body
v-if="documentPreview"
:visible.sync="documentPreview"
>
<div style="width: 100%; height: 720px">
<bns-kkFile-preview :items="kkFilePreview"></bns-kkFile-preview>
<bns-kkFile-preview :lookType="`minio`" :items="kkFilePreview"></bns-kkFile-preview>
</div>
</el-dialog>
</div>
@ -442,9 +449,15 @@ export default {
// 下载
async handleDownload(row) {
this.downLoading = true
this.$message.closeAll()
console.log('下载', row)
if (!row) {
// 批量下载
if (this.coursewareIds.length === 0) {
this.$message.error('请先选择文件')
return
}
const params = {
coursewareId: this.coursewareIds,
fileType: 1,
@ -457,7 +470,7 @@ export default {
this.downLoading = false
}, 300)
return
}
} else {
const params = {
coursewareId: row.coursewareId,
fileType: row.fileType,
@ -524,6 +537,7 @@ export default {
// document.body.removeChild(link)
// window.URL.revokeObjectURL(url) // 释放内存
// })
}
},
// 移动
handleMove(row) {
@ -707,6 +721,8 @@ export default {
// 文件预览按钮
handlePreview(row) {
console.log(row.filePath)
// alert(row.filePath)
this.kkFilePreview.filePreviewUrl = row.filePath
this.kkFilePreview.fileName = row.coursewareName
this.documentPreview = true

5
src/views/educationalTraining/resourceAdministration/coursewareStore/miniFileUpload.vue
View File

@ -74,7 +74,8 @@
</template>
<script>
import { uploadFiles } from '@/utils/upload'
// import { uploadFiles} from '@/utils/upload'
import { uploadFilesNew } from '@/utils/upload'
import { parseTime } from '@/utils/bonus'
export default {
@ -230,7 +231,7 @@ export default {
formData.append('totalChunks', totalChunks)
formData.append('parentId', this.paramsData.coursewareId)
formData.append('fileUrl', parseTime(new Date(), '{y}{m}'))
uploadFiles(formData)
uploadFilesNew(formData)
.then(() => {
currentChunk++
const progress = Math.floor((currentChunk / totalChunks) * 100)

3
src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
View File

@ -83,7 +83,7 @@
size="mini"
style="color: #f56c6c"
@click="handleRectify(scope.row, 1)"
v-if="scope.row.intoStatus == '1'"
v-if="scope.row.intoStatus == '1' && scope.row.checkUserId && scope.row.checkUserId.includes(userId)"
>
审批
</el-button>
@ -170,6 +170,7 @@ export default {
{ label: '已驳回', value: '4' },
{ label: '已撤回', value: '5' },
],
userId: this.$store.state.user.id,
}
},
created() {

2
src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue
View File

@ -270,7 +270,7 @@
<template slot-scope="scope">
<el-button type="text" size="mini" @click="handleRectify(scope.row, 5)">查看</el-button>
<el-button
v-if="userType == '00' && scope.row.intoStatus == '1'"
v-if="userType == '00' && (scope.row.intoStatus == '1' || scope.row.intoStatus == '2')"
type="text"
size="mini"
style="color: #f56c6c"

11
src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue
View File

@ -300,12 +300,13 @@
:btn-show="paramsData.btnShow"
:show-type="paramsData.showType"
:final-check="paramsData.finalCheck"
:items="formData.approvalItems"
:items="approvalItems"
:audit-type="'审批信息'"
v-on:pass="approvalPass"
v-on:turnDown="approvalTurnDown"
v-on:finalInstance="approvalFinalInstance"
:opinionValueOther="opinionValueOther"
:auditReason="[]"
/>
</el-tab-pane>
</el-tabs>
@ -396,6 +397,7 @@ export default {
lookFaceFile: '',
// 阅读文件时的意见
opinionValueOther: '',
approvalItems: [],
}
},
created() {
@ -411,7 +413,8 @@ export default {
hideSensitiveInfo,
approvalHistory() {
approvalHistory({ taskId: this.paramsData.taskId }).then(res => {
this.formData.approvalItems = res.data
// this.formData.approvalItems = res.data
this.approvalItems = res.data
})
},
getStatus() {
@ -562,6 +565,8 @@ export default {
pageNum: 1,
pageSize: 10,
supervisorName: this.queryParams.supervisorName,
supId: this.paramsData.supId,
supUuid: this.paramsData.supUuid,
}
this.derive(
'project/outsourcingPro/exportSupervisorPerson',
@ -587,7 +592,7 @@ export default {
}
this.getStatus()
listSupervisorPersonById(params).then(response => {
console.log(response)
console.log(response, '-----------人员信息')
this.formData = response.data
this.formData.phone = hideSensitiveInfo(response.data.phone)
this.formData.idCard = hideSensitiveInfo(response.data.idCard)

4
src/views/violationManagenment/violation/violationApprovalList.vue
View File

@ -84,7 +84,7 @@
<el-button type="text" size="mini" @click="handleRectify(scope.row, 3)">查看</el-button>
<template v-if="userType == '01'">
<template v-if="scope.row.intoStatus == '1' && scope.row.type != 1">
<template v-if="(scope.row.intoStatus == '1' || scope.row.intoStatus == '2') && scope.row.type != 1">
<el-button type="text" size="mini" style="color: #f56c6c" @click="handleRectify(scope.row, 1)">
审批
</el-button>
@ -97,7 +97,7 @@
size="mini"
style="color: #f56c6c"
@click="handleRectify(scope.row, 1)"
v-if="scope.row.intoStatus == '1'"
v-if="scope.row.intoStatus == '1' || scope.row.intoStatus == '2'"
>
审批
</el-button>