From 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 23 五月 2022 18:33:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue | 61 ++++++++++--------------------
1 files changed, 20 insertions(+), 41 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
index 80ae467..9f03856 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue
@@ -7,7 +7,7 @@
</div>
<div class="basic_search">
<span>结束时间：</span>
- <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="巡检结束时间"></el-date-picker>
+ <el-date-picker v-model="listQuery.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="巡检结束时间"></el-date-picker>
</div>
<div class="basic_search">
<span>任务类型：</span>
@@ -35,17 +35,6 @@
<span>巡检任务创建人员：</span>
<el-select v-model="listQuery.createUid" filterable clearable>
<el-option
- v-for="item in userList"
- :key="item.id"
- :value="item.id"
- :label="item.realname"
- ></el-option>
- </el-select>
- </div>
- <div class="basic_search">
- <span>异常通知人员：</span>
- <el-select v-model="listQuery.noticeUid" filterable clearable>
- <el-option
v-for="item in userList"
:key="item.id"
:value="item.id"
@@ -94,6 +83,9 @@
<el-table-column label="上报说明" prop="info" align="center">
</el-table-column>
<el-table-column label="上报照片" prop="img" align="center">
+ <template slot-scope="scope">
+ <el-button type="text" @click="downloadFile(scope.row)">下载</el-button>
+ </template>
</el-table-column>
<el-table-column label="状态" prop="status" align="center">
<template slot-scope="scope">
@@ -151,33 +143,7 @@
/>
<br>
</div>
- <el-dialog :title="title" :visible.sync="inspectionRecordVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
- <el-form ref="inspectionRecordForm" :model="inspectionRecordForm" label-position="right" label-width="165px">
- <el-form-item label="责任部门" prop="hazardDep">
- <el-select v-model="inspectionRecordForm.hazardDep" class="analyseUnit_input">
- <el-option
- v-for="item in departmentList"
- :key="item.id"
- :value="item.department"
- :label="item.department"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="责任人" prop="hazardLiablePerson">
- <el-input v-model="inspectionRecordForm.hazardLiablePerson" class="analyseUnit_input"></el-input>
- </el-form-item>
- <el-form-item label="安全风险分析对象编码" prop="hazardCode">
- <el-input v-model="inspectionRecordForm.hazardCode" class="analyseUnit_input"></el-input>
- </el-form-item>
- <el-form-item label="安全风险分析单元名称" prop="riskUnitName">
- <el-input v-model="inspectionRecordForm.riskUnitName" class="analyseUnit_input"></el-input>
- </el-form-item>
- </el-form>
- <div align="right">
- <el-button @click="unitFormVisible = false">取消</el-button>
- </div>
- </el-dialog>
- <detail ref="detail"></detail>
+ <detail ref="detail" @getList="getInspectionRecordData"></detail>
</div>
</template>
@@ -250,7 +216,6 @@
title:'',
company:'',
code:'',
- inspectionRecordVisible:false,
inspectionRecordForm:{
},
@@ -317,7 +282,7 @@
this.$refs.detail.showInspectionRecordForm(value)
},
showInspectionRecordDetailForm(value,type) {
- this.$refs.detail.showInspectionRecordDetailForm(value,type,this.userList)
+ this.$refs.detail.showInspectionRecordDetailForm(value,type,this.userList,this.departmentList)
},
async submitInspectionRecordForm(value){
if(value.unitList.find(item => item.status === 1) === undefined){
@@ -330,6 +295,7 @@
taskId: value.id
})
if(res.data.code === '200'){
+ this.getInspectionRecordData()
this.$message({
type:'success',
message:'提交成功',
@@ -349,6 +315,19 @@
})
}
},
+ downloadFile(value){
+ debugger
+ if(value.problem.imageInfoList === null){
+ this.$message({
+ type:'warning',
+ message:'无文件可下载'
+ })
+ }else{
+ for(let i in value.problem.imageInfoList){
+ window.open(process.env.IMG_API + value.problem.imageInfoList[i].imgPath, '_blank')
+ }
+ }
+ },
refreshHandle(){
this.getInspectionRecordData()
},
--
Gitblit v1.9.2