|
|
@@ -84,19 +84,16 @@
|
|
|
<span class="flexTitle">附件：</span>
|
|
|
<div class="flexInfo demo-image__preview">
|
|
|
<div style="float:left;">
|
|
|
- <el-image
|
|
|
- v-for="(item,index) in buildReportData.filelist"
|
|
|
- :key="index"
|
|
|
- style=""
|
|
|
- :src="item"
|
|
|
- :preview-src-list="buildReportData.filelist"
|
|
|
- />
|
|
|
+ <el-image v-for="(item, index) in buildReportData.filelist" :key="index" style="" :src="item"
|
|
|
+ :preview-src-list="buildReportData.filelist" />
|
|
|
</div>
|
|
|
<div>
|
|
|
- <audio v-for="(item,index) in buildReportData.audioFileList" :key="index" controls="controls" preload="auto" :src="item" />
|
|
|
+ <audio v-for="(item, index) in buildReportData.audioFileList" :key="index" controls="controls" preload="auto"
|
|
|
+ :src="item" />
|
|
|
</div>
|
|
|
<div>
|
|
|
- <video v-for="(item,index) in buildReportData.videoFileList" :key="index" controls="controls" preload="auto" :src="item" />
|
|
|
+ <video v-for="(item, index) in buildReportData.videoFileList" :key="index" controls="controls" preload="auto"
|
|
|
+ :src="item" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -135,25 +132,25 @@
|
|
|
<el-input v-model="checkHandleData.auditNotes" type="textarea" :rows="1" size="small" :disabled="true" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-show="checkHandleData.isrespect==='是'" class="flexDiv">
|
|
|
- <span class="flexTitle">巡检组：</span>
|
|
|
+ <div v-show="checkHandleData.isrespect === '是'" class="flexDiv">
|
|
|
+ <span class="flexTitle">部门：</span>
|
|
|
<div class="flexInfo">
|
|
|
<el-input v-model="checkHandleData.inspectGroupIdName" size="small" :disabled="true" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-show="checkHandleData.isrespect==='是'" class="flexDiv">
|
|
|
+ <div v-show="checkHandleData.isrespect === '是'" class="flexDiv">
|
|
|
<span class="flexTitle">巡查人：</span>
|
|
|
<div class="flexInfo">
|
|
|
<el-input v-model="checkHandleData.inspectUserName" size="small" :disabled="true" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-show="checkHandleData.isrespect==='是'" class="flexDiv">
|
|
|
+ <div v-show="checkHandleData.isrespect === '是'" class="flexDiv">
|
|
|
<span class="flexTitle">巡查周期：</span>
|
|
|
<div class="flexInfo">
|
|
|
<el-input v-model="checkHandleData.periodName" size="small" :disabled="true" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-show="checkHandleData.isrespect==='是'" class="flexDivMax">
|
|
|
+ <div v-show="checkHandleData.isrespect === '是'" class="flexDivMax">
|
|
|
<span class="flexTitle">起止时间：</span>
|
|
|
<div class="flexInfo">
|
|
|
<el-input v-model="checkHandleData.planDate" size="small" :disabled="true" />
|
|
|
@@ -162,12 +159,8 @@
|
|
|
</div>
|
|
|
</tf-table-legend>
|
|
|
<tf-table-legend label="工地巡查记录" isopen="false" style="margin-top: 8px;">
|
|
|
- <div
|
|
|
- v-for="(item,index) in dangerXjRecordData"
|
|
|
- v-show="dangerXjRecordData.length>0"
|
|
|
- :key="index"
|
|
|
- style="width: 100%; display: flex; flex-wrap: wrap;"
|
|
|
- >
|
|
|
+ <div v-for="(item, index) in dangerXjRecordData" v-show="dangerXjRecordData.length > 0" :key="index"
|
|
|
+ style="width: 100%; display: flex; flex-wrap: wrap;">
|
|
|
<div class="flexDiv">
|
|
|
<span class="flexTitle">上报时间：</span>
|
|
|
<div class="flexInfo">
|
|
|
@@ -196,84 +189,58 @@
|
|
|
<span class="flexTitle">附件：</span>
|
|
|
<div class="flexInfo demo-image__preview">
|
|
|
<div style="float:left;">
|
|
|
- <el-image
|
|
|
- v-for="(file,fileindex) in item.filelist"
|
|
|
- :key="fileindex"
|
|
|
- style=""
|
|
|
- :src="file"
|
|
|
- :preview-src-list="item.filelist"
|
|
|
- />
|
|
|
+ <el-image v-for="(file, fileindex) in item.filelist" :key="fileindex" style="" :src="file"
|
|
|
+ :preview-src-list="item.filelist" />
|
|
|
</div>
|
|
|
<div>
|
|
|
- <audio v-for="(file,index) in item.audioFileList" :key="index" controls="controls" preload="auto" :src="file" />
|
|
|
+ <audio v-for="(file, index) in item.audioFileList" :key="index" controls="controls" preload="auto"
|
|
|
+ :src="file" />
|
|
|
</div>
|
|
|
<div>
|
|
|
- <video v-for="(file,index) in item.videoFileList" :key="index" controls="controls" preload="auto" :src="file" />
|
|
|
+ <video v-for="(file, index) in item.videoFileList" :key="index" controls="controls" preload="auto"
|
|
|
+ :src="file" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <hr v-show=" index !== (dangerXjRecordData.length-1) " class="box-hr">
|
|
|
+ <hr v-show="index !== (dangerXjRecordData.length - 1)" class="box-hr">
|
|
|
</div>
|
|
|
- <div
|
|
|
- v-show="dangerXjRecordData.length <=0 "
|
|
|
- style="width: 100%; display: flex; flex-wrap: wrap;"
|
|
|
- >
|
|
|
+ <div v-show="dangerXjRecordData.length <= 0" style="width: 100%; display: flex; flex-wrap: wrap;">
|
|
|
<div style="width: 100%; height:40px;line-height:40px; text-align:center;">暂无工地巡查记录</div>
|
|
|
</div>
|
|
|
</tf-table-legend>
|
|
|
<tf-table-legend label="工地消除登记" isopen="false" style="margin-top: 8px;">
|
|
|
- <div
|
|
|
- v-for="(item,index) in dangerRemoveCheckData"
|
|
|
- v-show="dangerRemoveCheckData.length>0"
|
|
|
- :key="index"
|
|
|
- style="width: 100%; display: flex; flex-wrap: wrap;"
|
|
|
- >
|
|
|
+ <div v-for="(item, index) in dangerRemoveCheckData" v-show="dangerRemoveCheckData.length > 0" :key="index"
|
|
|
+ style="width: 100%; display: flex; flex-wrap: wrap;">
|
|
|
<div class="flexDivMax">
|
|
|
<span class="flexTitle">消除工地情况：</span>
|
|
|
<div class="flexInfo">
|
|
|
- <el-input
|
|
|
- v-model="item.notes"
|
|
|
- placeholder="消除工地情况说明"
|
|
|
- type="textarea"
|
|
|
- :rows="1"
|
|
|
- size="small"
|
|
|
- :disabled="true"
|
|
|
- />
|
|
|
+ <el-input v-model="item.notes" placeholder="消除工地情况说明" type="textarea" :rows="1" size="small"
|
|
|
+ :disabled="true" />
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="flexImage">
|
|
|
<span class="flexTitle">附件：</span>
|
|
|
<div class="flexInfo demo-image__preview">
|
|
|
<div style="float:left;">
|
|
|
- <el-image
|
|
|
- v-for="(file,fileindex) in item.filelist"
|
|
|
- :key="fileindex"
|
|
|
- style=""
|
|
|
- :src="file"
|
|
|
- :preview-src-list="item.filelist"
|
|
|
- />
|
|
|
+ <el-image v-for="(file, fileindex) in item.filelist" :key="fileindex" style="" :src="file"
|
|
|
+ :preview-src-list="item.filelist" />
|
|
|
</div>
|
|
|
<div>
|
|
|
- <audio v-for="(file,index) in item.audioFileList" :key="index" controls="controls" preload="auto" :src="file" />
|
|
|
+ <audio v-for="(file, index) in item.audioFileList" :key="index" controls="controls" preload="auto"
|
|
|
+ :src="file" />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div
|
|
|
- v-show="dangerRemoveCheckData.length <=0 "
|
|
|
- style="width: 100%; display: flex; flex-wrap: wrap;"
|
|
|
- >
|
|
|
+ <div v-show="dangerRemoveCheckData.length <= 0" style="width: 100%; display: flex; flex-wrap: wrap;">
|
|
|
<div style="width: 100%; height:40px;line-height:40px; text-align:center;">暂无工地消除登记</div>
|
|
|
</div>
|
|
|
</tf-table-legend>
|
|
|
|
|
|
- <tf-table-legend v-if="optionType === '1' " label="工地消除审核" :isopen="optionType !== '1' ? 'true' : 'false'" style="margin-top: 8px;">
|
|
|
- <div
|
|
|
- v-for="(item,index) in dangerRemoveCheckData"
|
|
|
- v-show="dangerRemoveCheckData.length>0"
|
|
|
- :key="index"
|
|
|
- style="width: 100%; display: flex; flex-wrap: wrap;"
|
|
|
- >
|
|
|
+ <tf-table-legend v-if="optionType === '1'" label="工地消除审核" :isopen="optionType !== '1' ? 'true' : 'false'"
|
|
|
+ style="margin-top: 8px;">
|
|
|
+ <div v-for="(item, index) in dangerRemoveCheckData" v-show="dangerRemoveCheckData.length > 0" :key="index"
|
|
|
+ style="width: 100%; display: flex; flex-wrap: wrap;">
|
|
|
<div class="flexDiv">
|
|
|
<span class="flexTitle">审核结果：</span>
|
|
|
<div class="flexInfo">
|
|
|
@@ -298,17 +265,15 @@
|
|
|
<el-input v-model="item.auditNotes" type="textarea" :rows="1" size="small" :disabled="true" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <hr v-show=" index !== (dangerRemoveCheckData.length-1) " class="box-hr">
|
|
|
+ <hr v-show="index !== (dangerRemoveCheckData.length - 1)" class="box-hr">
|
|
|
</div>
|
|
|
- <div
|
|
|
- v-show="dangerRemoveCheckData.length <=0 "
|
|
|
- style="width: 100%; display: flex; flex-wrap: wrap;"
|
|
|
- >
|
|
|
+ <div v-show="dangerRemoveCheckData.length <= 0" style="width: 100%; display: flex; flex-wrap: wrap;">
|
|
|
<div style="width: 100%; height:40px;line-height:40px; text-align:center;">暂无工地消除审核</div>
|
|
|
</div>
|
|
|
</tf-table-legend>
|
|
|
|
|
|
- <tf-table-legend v-if="optionType !== '1' " label="工地消除审核" :isopen="optionType !== '1' ? 'true' : 'false'" style="margin-top: 8px;">
|
|
|
+ <tf-table-legend v-if="optionType !== '1'" label="工地消除审核" :isopen="optionType !== '1' ? 'true' : 'false'"
|
|
|
+ style="margin-top: 8px;">
|
|
|
<div style="width: 100%; display: flex; flex-wrap: wrap; ">
|
|
|
<div class="flexDiv">
|
|
|
<span class="flexTitle">审核结果：</span>
|
|
|
@@ -327,7 +292,7 @@
|
|
|
</div>
|
|
|
</tf-table-legend>
|
|
|
|
|
|
- <span v-if="optionType !== '1' " slot="footer" class="dialog-footer">
|
|
|
+ <span v-if="optionType !== '1'" slot="footer" class="dialog-footer">
|
|
|
<el-button size="small" @click="dialogClose()">取 消</el-button>
|
|
|
<el-button type="primary" size="small" @click="confirmRemove()">确 定</el-button>
|
|
|
</span>
|
|
|
@@ -368,7 +333,7 @@ export default {
|
|
|
submitTime: '', // 工地上报时间
|
|
|
filelist: [], // 附件
|
|
|
audioFileList: [], // 语音文件
|
|
|
- videoFileList:[],
|
|
|
+ videoFileList: [],
|
|
|
ownerUnitName: '', // 业主单位名称
|
|
|
ownerUnitUser: '', // 业主负责人
|
|
|
ownerUnitPhone: '' // 业主联系电话
|
|
|
@@ -412,25 +377,25 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
- buildAry(newV, oldV) {
|
|
|
+ buildAry(newV, oldV) {
|
|
|
console.log('工地ID：' + JSON.stringify(newV))
|
|
|
this.buildAry = newV
|
|
|
this.optionType = this.buildAry.optionType
|
|
|
this.getTroubleById()
|
|
|
- }
|
|
|
+ }
|
|
|
},
|
|
|
mounted() {
|
|
|
this.$nextTick(() => {
|
|
|
- console.log('入口参数：' + JSON.stringify(this.buildAry))
|
|
|
+ console.log('入口参数：' + JSON.stringify(this.buildAry))
|
|
|
this.optionType = this.buildAry.optionType
|
|
|
- this.getTroubleById()
|
|
|
+ this.getTroubleById()
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
|
- /**
|
|
|
- * @description 获取工地信息
|
|
|
- */
|
|
|
- getTroubleById() {
|
|
|
+ /**
|
|
|
+ * @description 获取工地信息
|
|
|
+ */
|
|
|
+ getTroubleById() {
|
|
|
var that = this
|
|
|
that.dangerXjRecordData = []
|
|
|
that.dangerRemoveCheckData = []
|
|
|
@@ -511,7 +476,7 @@ export default {
|
|
|
createUser: element.createUserName, // 创建人
|
|
|
filelist: that.getFilePaths(element.filePathList, 1), // 图片信息
|
|
|
audioFileList: that.getFilePaths(element.filePathList, 0), // 语音信息
|
|
|
- videoFileList:that.getFilePaths(element.filePathList, 2), // 视频信息
|
|
|
+ videoFileList: that.getFilePaths(element.filePathList, 2), // 视频信息
|
|
|
note: element.note, // 情况说明
|
|
|
xaddr: element.xaddr, // 地址描述
|
|
|
yaddr: element.yaddr // 地址描述
|
|
|
@@ -531,7 +496,7 @@ export default {
|
|
|
auditUserName: element.auditUserName, // 审核人名称
|
|
|
filelist: that.getFilePaths(element.filePathList, 1), // 图片信息
|
|
|
audioFileList: that.getFilePaths(element.filePathList, 0), // 语音信息
|
|
|
- videoFileList:that.getFilePaths(element.filePathList, 2), // 视频信息
|
|
|
+ videoFileList: that.getFilePaths(element.filePathList, 2), // 视频信息
|
|
|
createTime: element.createTime, // 创建时间
|
|
|
createUser: element.createUser, // 创建人
|
|
|
notes: element.notes, // 消除工地情况说明
|
|
|
@@ -542,11 +507,11 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
- },
|
|
|
+ },
|
|
|
|
|
|
/**
|
|
|
- * @description 获取工地详情
|
|
|
- */
|
|
|
+ * @description 获取工地详情
|
|
|
+ */
|
|
|
getBuildById(buildId) {
|
|
|
var that = this
|
|
|
buildId = buildId || ''
|
|
|
@@ -569,8 +534,8 @@ export default {
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
- * @description 附件处理
|
|
|
- */
|
|
|
+ * @description 附件处理
|
|
|
+ */
|
|
|
getFilePaths(filePathList, fileType) {
|
|
|
var that = this
|
|
|
if (that.arrayIsNull(filePathList)) {
|
|
|
@@ -584,7 +549,7 @@ export default {
|
|
|
if (esuffixt === 'amr' && fileType === 0) {
|
|
|
const audioPath = `${IP}/base/file/loadAudio?remotePath=${es}&access_token=${token}`
|
|
|
filepath.push(audioPath)
|
|
|
- console.log(filepath,'filepath')
|
|
|
+ console.log(filepath, 'filepath')
|
|
|
// getFileAudio(token,es).then(src => {
|
|
|
// if (src) {
|
|
|
// var reader = new FileReader();
|
|
|
@@ -609,9 +574,9 @@ export default {
|
|
|
// this.$message.error('工地图片加载失败：' + src.message)
|
|
|
// })
|
|
|
}
|
|
|
- if (esuffixt === 'mp4'&& fileType === 2) {
|
|
|
+ if (esuffixt === 'mp4' && fileType === 2) {
|
|
|
console.log(es)
|
|
|
- let fileName = es.substr(es.lastIndexOf('/')+1) // 获取文件名
|
|
|
+ let fileName = es.substr(es.lastIndexOf('/') + 1) // 获取文件名
|
|
|
const videoPath = `${IP}/base/file/downloadFile?access_token=${token}&fileName=${fileName}&remotePath=${es}`
|
|
|
filepath.push(videoPath)
|
|
|
}
|
|
|
@@ -621,11 +586,11 @@ export default {
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
- * @description 确认提交审核意见
|
|
|
- */
|
|
|
+ * @description 确认提交审核意见
|
|
|
+ */
|
|
|
confirmRemove() {
|
|
|
var that = this
|
|
|
- that.$confirm('确认提交审核意见?', '提示', {
|
|
|
+ that.$confirm('确认提交审核意见?', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
@@ -639,7 +604,7 @@ export default {
|
|
|
|
|
|
console.log('auditModel：' + JSON.stringify(auditModel))
|
|
|
// 提交审核
|
|
|
- const auditData = JSON.parse(JSON.stringify(auditModel))
|
|
|
+ const auditData = JSON.parse(JSON.stringify(auditModel))
|
|
|
reportBuildCheck(auditData).then(res => {
|
|
|
if (res.code == -1) {
|
|
|
that.$message.error('上报审核出错,请重试')
|
|
|
@@ -655,17 +620,17 @@ export default {
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
- * @description 关闭弹窗
|
|
|
- */
|
|
|
+ * @description 关闭弹窗
|
|
|
+ */
|
|
|
dialogClose() {
|
|
|
console.log('触发关闭')
|
|
|
- // 触发父组件中的dialogVisibleEvent事件，并传递参数
|
|
|
- this.$emit('dialogVisibleEvent', false)
|
|
|
+ // 触发父组件中的dialogVisibleEvent事件，并传递参数
|
|
|
+ this.$emit('dialogVisibleEvent', false)
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
- * @description 判断数组是否为空
|
|
|
- */
|
|
|
+ * @description 判断数组是否为空
|
|
|
+ */
|
|
|
arrayIsNull(aryList) {
|
|
|
return (typeof (aryList) == 'undefined' || aryList == null || aryList.length == 0)
|
|
|
}
|
|
|
@@ -675,56 +640,62 @@ export default {
|
|
|
|
|
|
<style lang='scss' scoped>
|
|
|
.buildInfo {
|
|
|
- height: 100%;
|
|
|
- width: 100%;
|
|
|
- padding: 5px;
|
|
|
+ height: 100%;
|
|
|
+ width: 100%;
|
|
|
+ padding: 5px;
|
|
|
}
|
|
|
-.flexDiv{
|
|
|
- width: 33%;
|
|
|
- height: 30px;
|
|
|
- line-height: 30px;
|
|
|
- margin-top: 8px;
|
|
|
+
|
|
|
+.flexDiv {
|
|
|
+ width: 33%;
|
|
|
+ height: 30px;
|
|
|
+ line-height: 30px;
|
|
|
+ margin-top: 8px;
|
|
|
}
|
|
|
-.flexDivMax{
|
|
|
- width: 99%;
|
|
|
- min-height: 30px;
|
|
|
- margin-top: 8px;
|
|
|
+
|
|
|
+.flexDivMax {
|
|
|
+ width: 99%;
|
|
|
+ min-height: 30px;
|
|
|
+ margin-top: 8px;
|
|
|
}
|
|
|
-.flexImage{
|
|
|
- width: 100%;
|
|
|
- margin-top: 8px;
|
|
|
+
|
|
|
+.flexImage {
|
|
|
+ width: 100%;
|
|
|
+ margin-top: 8px;
|
|
|
}
|
|
|
-.flexTitle{
|
|
|
- min-width: 130px;
|
|
|
- display: inline-block;
|
|
|
- text-align: right;
|
|
|
+
|
|
|
+.flexTitle {
|
|
|
+ min-width: 130px;
|
|
|
+ display: inline-block;
|
|
|
+ text-align: right;
|
|
|
}
|
|
|
-.flexInfo{
|
|
|
- display: inline-block;
|
|
|
- margin-left: 5px;
|
|
|
- width:calc(100% - 140px);
|
|
|
+
|
|
|
+.flexInfo {
|
|
|
+ display: inline-block;
|
|
|
+ margin-left: 5px;
|
|
|
+ width: calc(100% - 140px);
|
|
|
}
|
|
|
+
|
|
|
/deep/.el-image__inner {
|
|
|
- width: 100px;
|
|
|
- height: 100px;
|
|
|
- margin-right: 8px;
|
|
|
+ width: 100px;
|
|
|
+ height: 100px;
|
|
|
+ margin-right: 8px;
|
|
|
|
|
|
}
|
|
|
|
|
|
-.box-hr{
|
|
|
- width: 100%;
|
|
|
- height: 1px;
|
|
|
- background-color: #F0F0F0;
|
|
|
- margin: 10px 0px 10px 0px;
|
|
|
- }
|
|
|
+.box-hr {
|
|
|
+ width: 100%;
|
|
|
+ height: 1px;
|
|
|
+ background-color: #F0F0F0;
|
|
|
+ margin: 10px 0px 10px 0px;
|
|
|
+}
|
|
|
|
|
|
-.dialog-footer{
|
|
|
- margin-top: 8px;
|
|
|
-display: flex;
|
|
|
-justify-content: flex-end;
|
|
|
- padding-top: 10px;
|
|
|
- text-align: right;
|
|
|
- -webkit-box-sizing: border-box;
|
|
|
- box-sizing: border-box;
|
|
|
+.dialog-footer {
|
|
|
+ margin-top: 8px;
|
|
|
+ display: flex;
|
|
|
+ justify-content: flex-end;
|
|
|
+ padding-top: 10px;
|
|
|
+ text-align: right;
|
|
|
+ -webkit-box-sizing: border-box;
|
|
|
+ box-sizing: border-box;
|
|
|
}
|
|
|
</style>
|
bulusiLuo