~mayuhao/HazardInvestigationSystem.git

			@@ -151,25 +151,54 @@
			</el-row>
			<el-table :data="tableData" ref="dangerRectificationTable" style="width: 100%">
			<el-table-column type="selection" width="55" align="center"></el-table-column>
			<el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
			<el-table-column prop="number" label="编号" align="center" width="120">
			<template slot-scope="scope">
			<div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
			</template>
			</el-table-column>
			<el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
			<el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
			<el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
			<el-table-column label="隐患项目" align="center">
			<el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
			<el-table-column prop="address" label="地点" align="center"></el-table-column>
			<el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
			<el-table-column prop="check_date" label="检查时间" width="120" align="center">
			<template slot-scope="scope">
			<label>{{ formatDate(scope.row.check_date)}}</label><br/>
			<label>{{ scope.row.check_class}}</label>
			</template>
			</el-table-column>
			<el-table-column prop="address" label="地点" align="center"></el-table-column>
			<el-table-column prop="ht_content" label="内容" width="150" align="center">
			<template slot-scope="scope">
			<el-popover trigger="hover" placement="top">
			<p>{{ scope.row.ht_content }}</p>
			<div slot="reference" class="name-wrapper">{{
			scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
			}}
			</div>
			</el-popover>
			</template>
			</el-table-column>
			<el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
			<el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
			</el-table-column>
			<el-table-column label="整改计划" align="center">
			<el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
			<el-table-column prop="measure" label="整改措施" width="150" align="center">
			<template slot-scope="scope">
			<el-popover trigger="hover" placement="top">
			<p>{{ scope.row.measure }}</p>
			<div slot="reference" class="name-wrapper">{{
			scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
			}}
			</div>
			</el-popover>
			</template>
			</el-table-column>
			<el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
			<el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
			<el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
			<el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
			</el-table-column>
			<el-table-column label="整改情况" align="center">
			<el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column>
			<el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
			<el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
			<el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
			<el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
			@@ -208,6 +237,7 @@
			:picker-options="pickerOptions"
			type="date"
			:disabled="false"
			value-format="yyyy-MM-dd"
			placeholder="选择日期"
			style="width: 100%">
			</el-date-picker>
			@@ -552,6 +582,26 @@
			});
			})
			},
			//方法区
			formatDate(data) {
			// 获取单元格数据
			if(data == null) {
			return null
			}
			let dt = new Date(data)
			return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
			},

			//方法区
			formatColumnDate(row, column) {
			// 获取单元格数据
			let data = row[column.property]
			if(data == null) {
			return null
			}
			let dt = new Date(data)
			return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
			},
			exportData(){
			var requestData = this.listQuery;
			requestData.export_type = 2;
			@@ -570,6 +620,12 @@
			window.URL.revokeObjectURL(href) //释放掉blob对象
			}).catch(err => {
			console.log(err)
			})
			},
			showDetails(row){
			this.$router.push({
			path: "/dangerDetails",
			query:{"id":row.id}
			})
			}
			}
			@@ -600,7 +656,10 @@
			max-height: 80px;
			overflow-y: auto
			}

			.blue-font-color:hover{
			cursor: pointer;
			color: blue;
			}
			/deep/ .el-dialog .button .el-form-item__content {
			margin-left: 0;
			}