Compare commits
20 Commits
| Author | SHA1 | Date |
|---|---|---|
 guoyuepeng
|
c1fbdd4cf5 | |
liulixin
|
0a822905d7 | |
guoyuepeng
|
4c8e9100fd | |
limingyu
|
a79cd7165e | |
|
limingyu
|
86f9a751b8 | |
|
limingyu
|
ec26080425 | |
 songwenxuan
|
f585920e15 | |
|
limingyu
|
d027db8bb7 | |
|
songwenxuan
|
201eb7aba0 | |
|
songwenxuan
|
d0669502ce | |
|
songwenxuan
|
85f25331c5 | |
|
songwenxuan
|
ae6fb36382 | |
|
songwenxuan
|
8c193c829e | |
|
songwenxuan
|
5d6dfc3bc7 | |
|
songwenxuan
|
2768b4b6ef | |
zhaoyu
|
fdbecc3f17 | |
|
zhaoyu
|
beea017dbb | |
|
zhaoyu
|
f4bd540162 | |
|
zhaoyu
|
c8fe830e31 | |
|
guoyuepeng
|
b65da94eb7 |
|
|
@ -1,249 +0,0 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
ref="form"
|
||||
:model="infoForm"
|
||||
:rules="rules"
|
||||
label-width="180px"
|
||||
style="width: 900px"
|
||||
>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故案号" prop="incidentNumber">
|
||||
<el-input v-model="infoForm.incidentNumber" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故名称" prop="incidentName">
|
||||
<el-input v-model="infoForm.incidentName" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故类型" prop="incidentType">
|
||||
<el-select v-model="infoForm.incidentType" :disabled="isDisabled" placeholder="请选择">
|
||||
<el-option v-for="item in incidentTypes" :key="item.id" :label="item.name" :value="item.id"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故级别" prop="incidentLevel">
|
||||
<el-select v-model="infoForm.incidentLevel" :disabled="isDisabled" placeholder="请选择">
|
||||
<el-option v-for="item in incidentLevels" :key="item.id" :label="item.name" :value="item.id"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故发生地点" prop="location">
|
||||
<el-input v-model="infoForm.location" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故发生时间" prop="incidentDate">
|
||||
<el-date-picker
|
||||
:disabled="isDisabled"
|
||||
v-model="infoForm.incidentDate"
|
||||
type="date"
|
||||
placeholder="选择事故发生时间"
|
||||
style="width: 100%;"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="直接经济损失" prop="directLoss">
|
||||
<el-input v-model="infoForm.directLoss" :disabled="isDisabled" type="number" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="受伤人数" prop="injured">
|
||||
<el-input v-model="infoForm.injured" :disabled="isDisabled" type="number" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="死亡人数" prop="fatalities">
|
||||
<el-input v-model="infoForm.fatalities" :disabled="isDisabled" type="number" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="重伤人数" prop="seriouslyInjured">
|
||||
<el-input v-model="infoForm.seriouslyInjured" :disabled="isDisabled" type="number" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故起因" prop="cause">
|
||||
<el-input v-model="infoForm.cause" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故概述" prop="summary">
|
||||
<el-input v-model="infoForm.summary" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="事故照片" prop="photos">
|
||||
<el-avatar
|
||||
:size="100"
|
||||
:fit="'scale-down'"
|
||||
:src="config.fileUrl + infoForm.photos"
|
||||
shape="square"
|
||||
@click="dialogImgVisible = true"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="原因分析及责任认定" prop="analysis">
|
||||
<el-input v-model="infoForm.analysis" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="考核建议" prop="suggestions">
|
||||
<el-input v-model="infoForm.suggestions" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="整改措施" prop="measures">
|
||||
<el-input v-model="infoForm.measures" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="填表人" prop="creator">
|
||||
<el-input v-model="infoForm.creator" :disabled="isDisabled" autocomplete="off"/>
|
||||
</el-form-item>
|
||||
<el-form-item :label-width="formLabelWidth" label="报出日期" prop="reportDate">
|
||||
<el-date-picker
|
||||
v-model="infoForm.reportDate"
|
||||
:disabled="isDisabled"
|
||||
type="date"
|
||||
placeholder="请选择报出日期"
|
||||
style="width: 100%;"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-dialog :visible.sync="dialogImgVisible">
|
||||
<img :src="config.fileUrl+infoForm.photos" width="100%" alt="">
|
||||
</el-dialog>
|
||||
|
||||
<div class="ui-height"/>
|
||||
<div class="ui-foot">
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-arrow-left"
|
||||
plain
|
||||
@click="goBack">返回
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { requestFN } from '../../../../utils/request'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
config: config,
|
||||
infoForm: {
|
||||
id: '', // 主键ID
|
||||
incidentNumber: '', // 事故案号
|
||||
incidentName: '', // 事故名称
|
||||
incidentType: null, // 事故类型
|
||||
companyName: '', // 所属公司
|
||||
incidentLevel: '', // 事故级别
|
||||
incidentNature: '', // 事故性质
|
||||
location: '', // 事故发生地点
|
||||
incidentDate: null, // 事故发生时间
|
||||
directLoss: '', // 直接经济损失（万元）
|
||||
injured: null, // 受伤人数
|
||||
fatalities: null, // 死亡人数
|
||||
seriouslyInjured: null, // 重伤人数
|
||||
cause: '', // 事故起因
|
||||
summary: '', // 事故概述
|
||||
photos: '', // 事故照片
|
||||
analysis: '', // 原因分析及责任认定
|
||||
suggestions: '', // 考核建议
|
||||
measures: '', // 整改措施
|
||||
creator: '', // 填表人
|
||||
reportDate: null // 报出日期
|
||||
},
|
||||
formLabelWidth: '140px',
|
||||
/** 事故类型 */
|
||||
incidentTypes: [],
|
||||
/** 事故等级 */
|
||||
incidentLevels: [],
|
||||
|
||||
/** 图片 */
|
||||
fileList: [],
|
||||
allowRemove: true, // 添加一个控制标志
|
||||
/** 预览弹窗 */
|
||||
dialogImgVisible: false,
|
||||
rules: {
|
||||
incidentNumber: [{ required: true, message: '事故案号不能为空', trigger: 'blur' }],
|
||||
incidentName: [{ required: true, message: '事故名称不能为空', trigger: 'blur' }],
|
||||
HIDDENTYPE: [{ required: true, message: '事故类型不能为空', trigger: 'blur' }],
|
||||
incidentType: [{ required: true, message: '隐患类型不能为空', trigger: 'blur' }],
|
||||
incidentLevel: [{ required: true, message: '事故级别不能为空', trigger: 'blur' }],
|
||||
incidentNature: [{ required: true, message: '事故性质不能为空', trigger: 'blur' }],
|
||||
location: [{ required: true, message: '事故发生地点不能为空', trigger: 'blur' }],
|
||||
incidentDate: [{ required: true, message: '事故发生时间不能为空', trigger: 'blur' }],
|
||||
directLoss: [{ required: true, message: '直接经济损失（万元）不能为空', trigger: 'blur' }],
|
||||
injured: [{ required: true, message: '受伤人数不能为空', trigger: 'blur' }],
|
||||
seriouslyInjured: [{ required: true, message: '隐患类型不能为空', trigger: 'blur' }],
|
||||
cause: [{ required: true, message: '事故起因不能为空', trigger: 'blur' }],
|
||||
summary: [{ required: true, message: '事故概述不能为空', trigger: 'blur' }],
|
||||
photos: [{ required: true, message: '事故照片不能为空', trigger: 'blur' }],
|
||||
analysis: [{ required: true, message: '原因分析及责任认定不能为空', trigger: 'blur' }],
|
||||
suggestions: [{ required: true, message: '考核建议不能为空', trigger: 'blur' }],
|
||||
measures: [{ required: true, message: '整改措施不能为空', trigger: 'blur' }],
|
||||
creator: [{ required: true, message: '填表人不能为空', trigger: 'blur' }],
|
||||
reportDate: [{ required: true, message: '报出日期不能为空', trigger: 'blur' }]
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
computed: {
|
||||
isDisabled() {
|
||||
return true
|
||||
}
|
||||
},
|
||||
|
||||
created() {
|
||||
this.getDict()
|
||||
const id = this.$parent.id
|
||||
requestFN('/accident/' + id, {}).then((data) => {
|
||||
this.infoForm = data.info
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
|
||||
methods: {
|
||||
/**
|
||||
* 返回到列表页面
|
||||
*/
|
||||
goBack() {
|
||||
this.handleResetInitForm()
|
||||
this.$parent.id = ''
|
||||
this.$parent.activeName = 'List'
|
||||
},
|
||||
|
||||
/**
|
||||
* 表单清空处理
|
||||
*/
|
||||
handleResetInitForm() {
|
||||
this.infoForm = {
|
||||
id: '', // 主键ID
|
||||
incidentNumber: '', // 事故案号
|
||||
incidentName: '', // 事故名称
|
||||
incidentType: null, // 事故类型
|
||||
companyName: '', // 所属公司
|
||||
incidentLevel: '', // 事故级别
|
||||
incidentNature: '', // 事故性质
|
||||
location: '', // 事故发生地点
|
||||
incidentDate: null, // 事故发生时间
|
||||
directLoss: '', // 直接经济损失（万元）
|
||||
injured: null, // 受伤人数
|
||||
fatalities: null, // 死亡人数
|
||||
seriouslyInjured: null, // 重伤人数
|
||||
cause: '', // 事故起因
|
||||
summary: '', // 事故概述
|
||||
photos: [], // 事故照片
|
||||
analysis: '', // 原因分析及责任认定
|
||||
suggestions: '', // 考核建议
|
||||
measures: '', // 整改措施
|
||||
creator: '', // 填表人
|
||||
reportDate: null // 报出日期
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 获取字典
|
||||
*/
|
||||
getDict() {
|
||||
const url = '/dictionaries/listSelectTree'
|
||||
requestFN(url,
|
||||
{
|
||||
DICTIONARIES_ID: '8d4140a900184b60836ad1a6490fd510'
|
||||
}
|
||||
).then((data) => {
|
||||
this.incidentTypes = JSON.parse(data.zTreeNodes)
|
||||
})
|
||||
requestFN(url,
|
||||
{
|
||||
DICTIONARIES_ID: 'b61a1edc59c0430c8741c5f51aa26c3c'
|
||||
}
|
||||
).then((data) => {
|
||||
this.incidentLevels = JSON.parse(data.zTreeNodes)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss"></style>
|
||||
|
|
@ -1,211 +0,0 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form ref="searchForm" :model="searchForm" label-width="100px">
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="事故名称" prop="incidentName">
|
||||
<el-input v-model="searchForm.incidentName" placeholder="请输入隐患描述" class="filter-item"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="发生时间" prop="incidentDates">
|
||||
<el-date-picker
|
||||
v-model="searchForm.incidentDates"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
style="width: 100%"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="发生地点" prop="location">
|
||||
<el-input v-model="searchForm.location" placeholder="请输入发生地点" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="事故类型" prop="incidentType">
|
||||
<el-select v-model="searchForm.incidentType" placeholder="请选择">
|
||||
<el-option v-for="item in incidentTypes" :key="item.id" :label="item.name" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="事故等级" prop="incidentLevel">
|
||||
<el-select v-model="searchForm.incidentLevel" placeholder="请选择">
|
||||
<el-option v-for="item in incidentLevels" :key="item.id" :label="item.name" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-button v-waves type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
|
||||
<el-button v-waves icon="el-icon-refresh" @click="handleReset">重置</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-arrow-left"
|
||||
plain
|
||||
@click="goBack">返回
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- 搜索查询 end -->
|
||||
</el-form>
|
||||
|
||||
<!-- table 表格 start -->
|
||||
<div style="margin-top: 16px;">
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
ref="multipleTable"
|
||||
:data="varList"
|
||||
border
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column label="事故名称" prop="incidentName"/>
|
||||
<el-table-column label="所属公司" prop="companyName"/>
|
||||
<el-table-column label="发生时间" prop="incidentDate"/>
|
||||
<el-table-column label="发生地点" prop="location"/>
|
||||
<el-table-column label="操作" width="300">
|
||||
<template v-slot="{row}">
|
||||
<el-button icon="el-icon-view" size="mini" @click="goView(row.id)">查看</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<!-- table 表格 end -->
|
||||
|
||||
<div class="pagination-group">
|
||||
<pagination :total="listQuery.total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="searchList" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Pagination from '@/components/Pagination'
|
||||
import waves from '@/directive/waves'
|
||||
import { requestFN } from '../../../../utils/request'
|
||||
|
||||
export default {
|
||||
components: { Pagination },
|
||||
directives: { waves },
|
||||
|
||||
data() {
|
||||
return {
|
||||
// 搜索查询条件
|
||||
searchForm: {
|
||||
/** 事故名称 */
|
||||
incidentName: '',
|
||||
/** 发生时间 */
|
||||
incidentDates: [],
|
||||
/** 开始时间 */
|
||||
startTime: null,
|
||||
/** 结束时间 */
|
||||
endTime: null,
|
||||
/** 发生地点 */
|
||||
location: '',
|
||||
/** 事故类型 */
|
||||
incidentType: '',
|
||||
/** 事故等级 */
|
||||
incidentLevel: ''
|
||||
},
|
||||
/** 列表加载态 */
|
||||
listLoading: false,
|
||||
/** 源列表数据项 */
|
||||
varList: [],
|
||||
/** 事故类型 */
|
||||
incidentTypes: [],
|
||||
/** 事故等级 */
|
||||
incidentLevels: [],
|
||||
// 列表分页参数
|
||||
listQuery: {
|
||||
/** 当前页数 */
|
||||
page: 1,
|
||||
/** 分页数 */
|
||||
limit: 20,
|
||||
/** 总页数 */
|
||||
total: 0
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
created() {
|
||||
this.getDict()
|
||||
this.searchList()
|
||||
},
|
||||
|
||||
methods: {
|
||||
/**
|
||||
* 查询搜索
|
||||
*/
|
||||
searchList() {
|
||||
this.listLoading = true
|
||||
const dates = this.searchForm.incidentDates
|
||||
if (dates != null && dates.length === 2) {
|
||||
this.searchForm.startTime = dates[0]
|
||||
this.searchForm.endTime = dates[1]
|
||||
}
|
||||
const url = '/accident/page?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page
|
||||
requestFN(url, { ...this.searchForm }).then((data) => {
|
||||
this.listLoading = false
|
||||
this.varList = data.varList
|
||||
this.total = data.page.totalResult
|
||||
}).catch((e) => {
|
||||
this.listLoading = false
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 重置搜索条件
|
||||
*/
|
||||
handleReset() {
|
||||
this.searchForm = this.$options.data().searchForm
|
||||
},
|
||||
|
||||
/**
|
||||
* 跳转查看详情页面
|
||||
*/
|
||||
goView(id) {
|
||||
this.$parent.id = id
|
||||
this.$parent.activeName = 'List'
|
||||
},
|
||||
|
||||
/**
|
||||
* 查询字典
|
||||
*/
|
||||
getDict() {
|
||||
const url = '/dictionaries/listSelectTree'
|
||||
requestFN(url,
|
||||
{
|
||||
DICTIONARIES_ID: '8d4140a900184b60836ad1a6490fd510'
|
||||
}
|
||||
).then((data) => {
|
||||
this.incidentTypes = JSON.parse(data.zTreeNodes)
|
||||
})
|
||||
requestFN(url,
|
||||
{
|
||||
DICTIONARIES_ID: 'b61a1edc59c0430c8741c5f51aa26c3c'
|
||||
}
|
||||
).then((data) => {
|
||||
this.incidentLevels = JSON.parse(data.zTreeNodes)
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 返回到列表页面
|
||||
*/
|
||||
goBack() {
|
||||
this.handleResetInitForm()
|
||||
this.$parent.activeName = 'listCount'
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.pagination-group {
|
||||
margin-top: 14px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form ref="searchForm" label-width="100px">
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="4">
|
||||
<el-form-item label="企业名称" prop="corpInfoId">
|
||||
<el-select v-model="corpInfoId" placeholder="请选择">
|
||||
<el-option v-for="item in corpinfos" :key="item.corpInfoId" :label="item.corpName" :value="item.corpInfoId" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-button v-waves type="primary" icon="el-icon-search" @click="searchList">查询</el-button>
|
||||
<el-button v-waves icon="el-icon-refresh" @click="handleReset">重置</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- 搜索查询 end -->
|
||||
</el-form>
|
||||
|
||||
<!-- table 表格 start -->
|
||||
<div style="margin-top: 16px;">
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
ref="multipleTable"
|
||||
:data="varList"
|
||||
border
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column label="公司名称" prop="companyName"/>
|
||||
<el-table-column label="放炮" prop="fire"/>
|
||||
<el-table-column label="容器爆炸" prop="containerBlast"/>
|
||||
<el-table-column label="道路交通" prop="roadTraffic"/>
|
||||
<el-table-column label="火药爆炸" prop="chemicalBlast"/>
|
||||
<el-table-column label="火灾" prop="fireDamage"/>
|
||||
<el-table-column label="机械伤害" prop="mechanicalDamage"/>
|
||||
<el-table-column label="锅炉爆炸" prop="boilerBlast"/>
|
||||
<el-table-column label="淹溺" prop="drowning"/>
|
||||
<el-table-column label="灼烫" prop="scorching"/>
|
||||
<el-table-column label="高处坠落" prop="highFall"/>
|
||||
<el-table-column label="中毒和窒息" prop="poisoningAndSuffocation"/>
|
||||
<el-table-column label="车辆伤害" prop="vehicleDamage"/>
|
||||
<el-table-column label="坍塌" prop="collapse"/>
|
||||
<el-table-column label="冒顶片帮" prop="overhang"/>
|
||||
<el-table-column label="透水" prop="waterOverflow"/>
|
||||
<el-table-column label="瓦斯爆炸" prop="gasBlast"/>
|
||||
<el-table-column label="其它爆炸" prop="otherBlast"/>
|
||||
<el-table-column label="触电" prop="electricShock"/>
|
||||
<el-table-column label="物体打击" prop="objectImpact"/>
|
||||
<el-table-column label="其它伤害" prop="otherDamage"/>
|
||||
<el-table-column label="起重伤害" prop="seriousInjury"/>
|
||||
<el-table-column label="操作" width="300">
|
||||
<template v-slot="{row}">
|
||||
<el-button icon="el-icon-view" size="mini" @click="goView(row.corpinfoId)">查看</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<!-- table 表格 end -->
|
||||
<div class="pagination-group">
|
||||
<pagination :total="listQuery.total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="searchList" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Pagination from '@/components/Pagination'
|
||||
import waves from '@/directive/waves'
|
||||
import { requestFN } from '../../../../utils/request'
|
||||
|
||||
export default {
|
||||
components: { Pagination },
|
||||
directives: { waves },
|
||||
|
||||
data() {
|
||||
return {
|
||||
/** 企业id */
|
||||
corpInfoId: '',
|
||||
/** 列表加载态 */
|
||||
listLoading: false,
|
||||
/** 源列表数据项 */
|
||||
varList: [],
|
||||
/** 银行列表 */
|
||||
corpinfos: [],
|
||||
// 列表分页参数
|
||||
listQuery: {
|
||||
/** 当前页数 */
|
||||
page: 1,
|
||||
/** 分页数 */
|
||||
limit: 20,
|
||||
/** 总页数 */
|
||||
total: 0
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
created() {
|
||||
this.getDict()
|
||||
this.searchList()
|
||||
},
|
||||
|
||||
methods: {
|
||||
/**
|
||||
* 查询搜索
|
||||
*/
|
||||
searchList() {
|
||||
this.listLoading = true
|
||||
const url = '/accident/page/count?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page
|
||||
requestFN(url, { corpInfoId: this.corpInfoId }).then((data) => {
|
||||
this.listLoading = false
|
||||
this.varList = data.varList
|
||||
this.total = data.page.totalResult
|
||||
}).catch(() => {
|
||||
this.listLoading = false
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 重置搜索条件
|
||||
*/
|
||||
handleReset() {
|
||||
this.corpInfoId = this.$options.data().corpInfoId
|
||||
},
|
||||
|
||||
/**
|
||||
* 跳转查看企业异常列表页面
|
||||
*/
|
||||
goView(id) {
|
||||
this.$parent.id = id
|
||||
this.$parent.activeName = 'AddOrEdit'
|
||||
},
|
||||
|
||||
/**
|
||||
* 查询企业信息
|
||||
*/
|
||||
getDict() {
|
||||
const url = '/accident/page/count'
|
||||
requestFN(url, {}
|
||||
).then((data) => {
|
||||
this.corpinfos = JSON.parse(data.corpinfo)
|
||||
}).catch(() => {})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.pagination-group {
|
||||
margin-top: 14px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
<template>
|
||||
<div>
|
||||
<ListCount v-if="activeName === 'ListCount'" ref="ListCount" />
|
||||
<List v-if="activeName === 'List'" ref="List" />
|
||||
<Add v-if="activeName === 'AddOrEdit'" ref="AddOrEdit" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ListCount from './components/listCount.vue'
|
||||
import List from './components/list.vue'
|
||||
import Add from './components/addOrEdit.vue'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
ListCount: ListCount,
|
||||
Add: Add,
|
||||
List: List
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
activeName: 'ListCount',
|
||||
id: ''
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
activeName(val) {
|
||||
if (val === 'List') {
|
||||
this.$nextTick(() => {
|
||||
this.$refs.List.searchList()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[1].AUTOGRAPH" :src="config.fileUrl+hotUserList[1].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[1].OPERATTIME">{{ formatTime(hotUserList[1].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[1].AUTOGRAPH">{{ formatTime(hotUserList[1].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="pd.JOB_TYPE_INDEX == '1'" >
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[2].AUTOGRAPH" :src="config.fileUrl+hotUserList[2].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[2].OPERATTIME">{{ formatTime(hotUserList[2].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[2].AUTOGRAPH">{{ formatTime(hotUserList[2].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[3].AUTOGRAPH" :src="config.fileUrl+hotUserList[3].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[3].OPERATTIME">{{ formatTime(hotUserList[3].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[3].AUTOGRAPH">{{ formatTime(hotUserList[3].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[4].AUTOGRAPH" :src="config.fileUrl+hotUserList[4].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[4].OPERATTIME">{{ formatTime(hotUserList[4].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[4].AUTOGRAPH">{{ formatTime(hotUserList[4].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[5].AUTOGRAPH" :src="config.fileUrl+hotUserList[5].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[5].OPERATTIME">{{ formatTime(hotUserList[5].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[5].AUTOGRAPH">{{ formatTime(hotUserList[5].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[6].AUTOGRAPH" :src="config.fileUrl+hotUserList[6].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[6].OPERATTIME">{{ formatTime(hotUserList[6].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[6].AUTOGRAPH">{{ formatTime(hotUserList[6].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[7].AUTOGRAPH" :src="config.fileUrl+hotUserList[7].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[7].OPERATTIME">{{ formatTime(hotUserList[7].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[7].AUTOGRAPH">{{ formatTime(hotUserList[7].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -169,7 +169,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[8].AUTOGRAPH" :src="config.fileUrl+hotUserList[8].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[8].OPERATTIME">{{ formatTime(hotUserList[8].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[8].AUTOGRAPH">{{ formatTime(hotUserList[8].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -182,7 +182,7 @@
|
|||
<span class="print-approval-img">
|
||||
<img v-if="hotUserList[9].AUTOGRAPH" :src="config.fileUrl+hotUserList[9].AUTOGRAPH">
|
||||
</span>
|
||||
<span v-if="hotUserList[9].OPERATTIME">{{ formatTime(hotUserList[9].OPERATTIME) }}</span>
|
||||
<span v-if="hotUserList[9].AUTOGRAPH">{{ formatTime(hotUserList[9].OPERATTIME) }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -403,7 +403,11 @@ export default {
|
|||
this.pd = data.pd
|
||||
this.hotUserList = data.hotUserList
|
||||
for (let i = 0; i < data.hotOperator.length; i++) {
|
||||
this.hotOperatorNames += data.hotOperator[i].userName2 + ';'
|
||||
if (i === data.hotOperator.length - 1) {
|
||||
this.hotOperatorNames += data.hotOperator[i].userName2
|
||||
} else {
|
||||
this.hotOperatorNames += data.hotOperator[i].userName2 + ';'
|
||||
}
|
||||
}
|
||||
|
||||
this.corpinfo = data.corpinfo
|
||||
|
|
|
|||
|
|
@ -164,6 +164,12 @@
|
|||
icon="el-icon-view"
|
||||
@click="fnEvaluation(row.HIDDEN_ID,row.SOURCE, row.CREATOR,'edit')">考评
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="USER_ID=='1'"
|
||||
type="danger"
|
||||
icon="el-icon-view"
|
||||
@click="fnDelvaluation(row.HIDDEN_ID)">删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -420,6 +426,34 @@ export default {
|
|||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
fnDelvaluation(hiddenId) {
|
||||
this.$confirm('确定要删除选中的评审记录吗?', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.listLoading = true
|
||||
requestFN(
|
||||
'/hiddenevaluationrecord/deleteEvaluation',
|
||||
{
|
||||
HIDDEN_ID: hiddenId
|
||||
}
|
||||
).then((data) => {
|
||||
this.listLoading = false
|
||||
if (data.result === 'success') {
|
||||
this.$message.success('删除成功')
|
||||
this.getList()
|
||||
} else {
|
||||
this.$message({
|
||||
message: data.message,
|
||||
type: 'error'
|
||||
})
|
||||
}
|
||||
}).catch((e) => {
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
<span v-else-if="row.SOURCE == 2">清单排查</span>
|
||||
<span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
|
||||
<span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
|
||||
<span v-else-if="row.SOURCE == 6">消防检查</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="HIDDENDESCR" label="隐患描述"/>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
<el-option :value="2" label="清单排查"/>
|
||||
<el-option :value="4" label="安全环保检查(监管端)"/>
|
||||
<el-option :value="5" label="安全环保检查(企业端)"/>
|
||||
<el-option :value="6" label="消防检查"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -137,6 +138,7 @@
|
|||
<template v-else-if="row.SOURCE=='3'">清单排查 </template>
|
||||
<template v-else-if="row.SOURCE=='4'">安全环保检查(监管端) </template>
|
||||
<template v-else-if="row.SOURCE=='5'">安全环保检查(企业端) </template>
|
||||
<template v-else-if="row.SOURCE=='6'">消防检查 </template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="HIDDENDESCR" label="隐患描述"/>
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@
|
|||
<template v-else-if="pd.SOURCE=='5'">
|
||||
<td colspan="3">安全环保检查(企业端)</td>
|
||||
</template>
|
||||
<template v-else-if="pd.SOURCE=='6'">
|
||||
<td colspan="3">消防检查</td>
|
||||
</template>
|
||||
</tr>
|
||||
<!--<tr>
|
||||
<td class="tbg">检查内容</td>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
<el-option :value="2" label="清单排查"/>
|
||||
<el-option :value="4" label="安全环保检查(监管端)"/>
|
||||
<el-option :value="5" label="安全环保检查(企业端)"/>
|
||||
<el-option :value="6" label="消防检查"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -117,6 +118,7 @@
|
|||
<span v-if="row.SOURCE == 1">隐患快报</span>
|
||||
<span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
|
||||
<span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
|
||||
<span v-else-if="row.SOURCE == 6">消防检查</span>
|
||||
<span v-else>清单排查</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@
|
|||
<template v-else-if="pd.SOURCE=='5'">
|
||||
安全环保检查(企业端)
|
||||
</template>
|
||||
<template v-else-if="pd.SOURCE=='6'">
|
||||
消防检查
|
||||
</template>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
<el-option :value="2" label="清单排查"/>
|
||||
<el-option :value="4" label="安全环保检查(监管端)"/>
|
||||
<el-option :value="5" label="安全环保检查(企业端)"/>
|
||||
<el-option :value="6" label="消防检查"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -82,6 +83,7 @@
|
|||
<span v-if="row.SOURCE == 1">隐患快报</span>
|
||||
<span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>
|
||||
<span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>
|
||||
<span v-else-if="row.SOURCE == 6">消防检查</span>
|
||||
<span v-else>清单排查</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -107,6 +109,8 @@
|
|||
<template slot-scope="{row}">
|
||||
<template v-if="row.SOURCE == 4">{{ row.RECTIFICATIONOR_NAME }}</template>
|
||||
<template v-else-if="row.SOURCE == 5">{{ row.RECTIFICATIONOR_NAME }}</template>
|
||||
<template v-else-if="row.SOURCE == 6">{{ row.RECTIFICATIONOR_NAME }}</template>
|
||||
<template v-else-if="row.SOURCE == 2">{{ row.RECTIFICATIONOR_NAME }}</template>
|
||||
<template v-else>{{ row.PERSONCHARGE }}</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@
|
|||
<template v-else-if="pd.SOURCE=='5'">
|
||||
安全环保检查(企业端)
|
||||
</template>
|
||||
<template v-else-if="pd.SOURCE=='6'">
|
||||
消防检查
|
||||
</template>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -181,7 +181,8 @@ export default {
|
|||
varList: [],
|
||||
hiddenSourceList: [ // 隐患来源 1-隐患快报 2-清单排查
|
||||
{ value: '1', label: '隐患快报' },
|
||||
{ value: '2', label: '清单排查' }
|
||||
{ value: '2', label: '清单排查' },
|
||||
{ value: '6', label: '消防检查' }
|
||||
],
|
||||
statusList: [
|
||||
{ ID: '14', NAME: '待验收' },
|
||||
|
|
@ -238,9 +239,9 @@ export default {
|
|||
chongzhi() {
|
||||
this.STATE = ''
|
||||
this.$refs.searchForm.resetFields()
|
||||
this.$refs.deptTree_Select.clearHandle()
|
||||
this.$refs.deptTree_Select1.clearHandle()
|
||||
this.$refs.deptTree_Select3.clearHandle()
|
||||
// this.$refs.deptTree_Select.clearHandle()
|
||||
// this.$refs.deptTree_Select1.clearHandle()
|
||||
// this.$refs.deptTree_Select3.clearHandle()
|
||||
this.getList()
|
||||
},
|
||||
// 判断按钮权限，用于是否显示按钮
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
<el-select v-model="form.SOURCE" placeholder="隐患来源" clearable style="width: 100%" class="filter-item">
|
||||
<el-option :value="1" label="隐患快报"/>
|
||||
<el-option :value="2" label="清单排查"/>
|
||||
<el-option :value="2" label="清单排查"/>
|
||||
<el-option :value="6" label="消防检查"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -178,7 +178,8 @@ export default {
|
|||
varList: [],
|
||||
hiddenSourceList: [ // 隐患来源 1-隐患快报 2-清单排查
|
||||
{ value: '1', label: '隐患快报' },
|
||||
{ value: '2', label: '清单排查' }
|
||||
{ value: '2', label: '清单排查' },
|
||||
{ value: '6', label: '消防检查' }
|
||||
],
|
||||
statusList: [
|
||||
{ ID: '-2', NAME: '待确认' },
|
||||
|
|
|
|||
|
|
@ -112,6 +112,10 @@
|
|||
<td v-else colspan="2">未定位</td>
|
||||
<td><el-button type="success" @click="handleMap(pd)">查看定位</el-button></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tbg">具体位置</td>
|
||||
<td colspan="3">{{ pd.LOCATION }}</td>
|
||||
</tr>
|
||||
<tr v-for="(item, index) in file9" :key="index">
|
||||
<td class="tbg">安全管理协议{{ index + 1 }}</td>
|
||||
<td colspan="2">{{ item.FILE_NAME }}</td>
|
||||
|
|
|
|||
|
|
@ -2,219 +2,179 @@
|
|||
<div class="app-container print-work">
|
||||
<div class="level-title">
|
||||
<h1>有限空间作业许可证</h1>
|
||||
<div class="level-btns">编号:{{ info.WORK_PERMIT_NUMBER }}</div>
|
||||
<div class="level-btns">编号:{{ info.CHECK_NO }}</div>
|
||||
</div>
|
||||
<table class="table-ui">
|
||||
<tr>
|
||||
<td class="bbg-transparent">管理单位</td>
|
||||
<td>{{ info.MANAGEMENT_UNIT_NAME }}</td>
|
||||
<td class="bbg-transparent">作业单位</td>
|
||||
<td>{{ info.WORK_UNIT_NAME }}</td>
|
||||
<td class="bbg-transparent">作业申请单位</td>
|
||||
<td colspan="5">{{ info.APPLY_DEPARTMENT_NAME }}</td>
|
||||
<td class="bbg-transparent">作业申请时间</td>
|
||||
<td colspan="3">{{ info.CREATTIME }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业地点</td>
|
||||
<td>{{ info.WORK_LOCATION }}</td>
|
||||
<td class="bbg-transparent">有限空间名称及编号</td>
|
||||
<td>{{ info.RESTRICTED_SPACE_NAME }}</td>
|
||||
<td class="bbg-transparent">受限空间名称</td>
|
||||
<td colspan="5">{{ info.LIMITSPACE_NAME }}</td>
|
||||
<td class="bbg-transparent">受限空间内原有介质名称</td>
|
||||
<td colspan="3">{{ info.MEDIUM_NAME }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="bbg-transparent">主要介质</td>
|
||||
<td>{{ info.MAIN_MEDIUM }}</td>
|
||||
<td class="bbg-transparent">主要危险因素</td>
|
||||
<td>{{ info.MAJOR_RISK_FACTORS }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业内容</td>
|
||||
<td colspan="3">{{ info.CONTENTS_OF_HOMEWORK }}</td>
|
||||
<td colspan="9">{{ info.WORK_CONTENT }}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<td class="bbg-transparent">作业单位</td>
|
||||
<td colspan="5">{{ info.CONFIRM_DEPARTMENT_NAME }}</td>
|
||||
<td class="bbg-transparent">作业负责人</td>
|
||||
<td colspan="3">{{ info.CONFIRM_USER_NAME }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业人</td>
|
||||
<td colspan="5">{{ info.WORK_USER }}</td>
|
||||
<td class="bbg-transparent">监护人</td>
|
||||
<td colspan="5">
|
||||
<div v-if="info.GUARDIAN_USER_SIGNER_PATH" style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + info.GUARDIAN_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ info.GUARDIAN_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">关联的其他特殊作业及安全作业票编号</td>
|
||||
<td colspan="9">{{ info.SPECIAL_WORK }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">风险辨识结果</td>
|
||||
<td colspan="9">{{ info.RISK_IDENTIFICATION }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td :rowspan="3 + gasList.length" class="bbg-transparent">气体分析</td>
|
||||
<td class="bbg-transparent" rowspan="2">分析项目</td>
|
||||
<td class="bbg-transparent" colspan="2">有毒有害气体名称</td>
|
||||
<td class="bbg-transparent" colspan="2">可燃气体名称</td>
|
||||
<td class="bbg-transparent" rowspan="2">氧气含量</td>
|
||||
<td class="bbg-transparent" rowspan="3">取样分析时间</td>
|
||||
<td class="bbg-transparent" rowspan="3">分析部位</td>
|
||||
<td class="bbg-transparent" rowspan="3">分析人</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td :style="{padding:gas.GAS_NAME1 ? '8px' : '16px'}">{{ gas.GAS_NAME1 }}</td>
|
||||
<td :style="{padding:gas.GAS_NAME2 ? '8px' : '16px'}">{{ gas.GAS_NAME2 }}</td>
|
||||
<td :style="{padding:gas.GAS_NAME3 ? '8px' : '16px'}">{{ gas.GAS_NAME3 }}</td>
|
||||
<td :style="{padding:gas.GAS_NAME4 ? '8px' : '16px'}">{{ gas.GAS_NAME4 }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">合格标准</td>
|
||||
<td>{{ gas.GAS_STANDARD1 }}</td>
|
||||
<td>{{ gas.GAS_STANDARD2 }}</td>
|
||||
<td>{{ gas.GAS_STANDARD3 }}</td>
|
||||
<td>{{ gas.GAS_STANDARD4 }}</td>
|
||||
<td>19.5% 〜21%（体积分数）</td>
|
||||
</tr>
|
||||
<tr v-for="(item,index) in gasList" :key="index">
|
||||
<td v-if="index === 0" :rowspan="gasList.length" class="bbg-transparent">分析数据</td>
|
||||
<td><span v-if="gas.GAS_NAME1">{{ item.DATA1 }}</span></td>
|
||||
<td><span v-if="gas.GAS_NAME2">{{ item.DATA2 }}</span></td>
|
||||
<td><span v-if="gas.GAS_NAME3">{{ item.DATA3 }}</span></td>
|
||||
<td><span v-if="gas.GAS_NAME4">{{ item.DATA4 }}</span></td>
|
||||
<td>{{ item.OXYGEN_CONTENT }}</td>
|
||||
<td>{{ item.ANALYZE_TIME }}</td>
|
||||
<td>{{ item.ANALYZE_PLACE }}</td>
|
||||
<td>{{ item.ANALYZE_USER }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业实施时间</td>
|
||||
<td colspan="9">{{ info.WORK_START_DATE }}至{{ info.WORK_END_DATE }}止</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="10">
|
||||
<table class="table-ui">
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业人</td>
|
||||
<td>{{ info.WORKER }}</td>
|
||||
<td class="bbg-transparent">监护人</td>
|
||||
<td>{{ info.GUARDIAN }}</td>
|
||||
<td>序号</td>
|
||||
<td>安全措施</td>
|
||||
<td style="width: 100px">是否涉及</td>
|
||||
<td style="width: 100px">确认人</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="bbg-transparent">作业时间</td>
|
||||
<td colspan="3">
|
||||
自 {{ formatDate(info.WORK_START_DATE, 'YYYY年MM月DD日HH时mm分') }} 至
|
||||
{{ formatDate(info.WORK_END_DATE, 'YYYY年MM月DD日HH时mm分') }} 止
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<tr class="bbg-transparent">
|
||||
<td :rowspan="gasList.length+1" align="center"> 采样分析</td>
|
||||
<td align="center">分析项目</td>
|
||||
<td align="center">有毒有害物质</td>
|
||||
<td align="center">可燃气</td>
|
||||
<td align="center">含氧量</td>
|
||||
<td align="center">取样时间</td>
|
||||
<td align="center">取样部位</td>
|
||||
<td align="center">分析人</td>
|
||||
</tr>
|
||||
<template v-if="gasList.length > 0 ">
|
||||
<tr v-for="(item,index) in gasList" :key="item.CONFINEDSPACEGAS_ID">
|
||||
<td v-if="index==0" :rowspan="gasList.length">采样分析</td>
|
||||
<td>{{ item.HARMFUL_MATERIALS }}</td>
|
||||
<td>{{ item.COMBUSTIBLE_GAS }}</td>
|
||||
<td>{{ item.OXYGEN_CONTENT }}</td>
|
||||
<td>{{ item.ANALYZE_TIME }}</td>
|
||||
<td>{{ item.ANALYZE_PLACE }}</td>
|
||||
<td>{{ item.ANALYZE_USER }}</td>
|
||||
</tr>
|
||||
</template>
|
||||
<tr v-else>
|
||||
<td colspan="8" class="bbg-transparent">暂无数据</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<tr class="bbg-transparent">
|
||||
<td style="width:80px">序号</td>
|
||||
<td>主要安全措施</td>
|
||||
<td style="width: 80px">是否合格</td>
|
||||
</tr>
|
||||
<tr v-for="(item,index) in measuresList" :key="item.BUS_CONFINEDSPACE_MEASURES_ID" class="bbg-transparent">
|
||||
<tr v-for="(item,index) in measuresList" :key="index">
|
||||
<td>{{ index + 1 }}</td>
|
||||
<td>
|
||||
{{ index + 1 }}
|
||||
{{ item.PROTECTIVE_MEASURES }}
|
||||
</td>
|
||||
<td>
|
||||
<span v-if="item.STATUS=='1'"><input type="radio" disabled checked>涉 及</span>
|
||||
<span v-if="item.STATUS=='-1'"><input type="radio" disabled checked>不涉及</span>
|
||||
</td>
|
||||
<td>
|
||||
{{ item.CONFIRM_NAME }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="info.CONFIRM_USER_MEASURES || info.APPROVE_USER_MEASURES" >
|
||||
<td >{{ measuresList.length + 1 }}</td>
|
||||
<td colspan="3">
|
||||
<div v-if="info.CONFIRM_USER_MEASURES" style="display: flex;justify-content: space-between;">
|
||||
<span>其他安全措施：{{ info.CONFIRM_USER_MEASURES }}</span>
|
||||
<span>编制人：{{ info.CONFIRM_USER_NAME }}</span>
|
||||
</div>
|
||||
<div v-if="info.APPROVE_USER_MEASURES" style="display: flex;justify-content: space-between;">
|
||||
<span>其他安全措施：{{ info.APPROVE_USER_MEASURES }}</span>
|
||||
<span>编制人：{{ info.APPROVE_USER_NAME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td>{{ item.PROTECTIVE_MEASURES }}</td>
|
||||
<td v-if="item.STATUS == 1">合格</td>
|
||||
<td v-else-if="item.STATUS == 0">不合格</td>
|
||||
<td v-else/>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr v-if="oldHazardIdentification.length > 0">
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<tr class="bbg-transparent">
|
||||
<td>危害因素辨识</td>
|
||||
</tr>
|
||||
<tr v-for="(item,index) in oldHazardIdentification" :key="index">
|
||||
<td v-if="item">{{ item }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<tr>
|
||||
<td class="bbg-transparent">安全交底人</td>
|
||||
<td colspan="10">
|
||||
<div v-if="info.CONFESS_USER_SIGNER_PATH" style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + info.CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ info.CONFESS_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">接受交底人</td>
|
||||
<td colspan="10">
|
||||
<div v-for="item in imgList" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + item.ACCEPT_CONFESS_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="info.CONFIRM_USER_SIGNER_PATH">
|
||||
<td colspan="10">
|
||||
<div>作业负责人意见：{{ info.CONFIRM_CONTENT }}</div>
|
||||
<div style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + info.CONFIRM_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ info.CONFIRM_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr v-if="oldWorkSafetyMeasures.length > 0">
|
||||
<td colspan="4" style="padding: 0;">
|
||||
<table class="table-vi">
|
||||
<tr class="bbg-transparent">
|
||||
<td>作业安全措施</td>
|
||||
</tr>
|
||||
<tr v-for="(item,index) in oldWorkSafetyMeasures" :key="index">
|
||||
<td v-if="item">{{ item }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div><span>作业单位负责人意见：</span>
|
||||
<span>
|
||||
{{ info.WORK_UNIT_MANAGER_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img v-if="info.WORK_UNIT_MANAGER_IMG" :src="config.fileUrl+info.WORK_UNIT_MANAGER_IMG">
|
||||
</span>
|
||||
<span v-if="info.WORK_UNIT_MANAGER_TIME">{{
|
||||
formatDate(info.WORK_UNIT_MANAGER_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
<tr v-if="info.APPROVE_USER_SIGNER_PATH">
|
||||
<td colspan="10">
|
||||
<div>所在单位意见：{{ info.APPROVE_CONTENT }}</div>
|
||||
<div style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + info.APPROVE_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ info.APPROVE_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div><span>作业现场负责人意见：</span>
|
||||
<span>
|
||||
{{ info.JOB_SITE_MANAGER_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img v-if="info.JOB_SITE_MANAGER_IMG" :src="config.fileUrl+info.JOB_SITE_MANAGER_IMG">
|
||||
</span>
|
||||
<span v-if="info.JOB_SITE_MANAGER_TIME">{{
|
||||
formatDate(info.JOB_SITE_MANAGER_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
<tr v-if="imgList1.length>0">
|
||||
<td colspan="10">
|
||||
<div>完工验收：{{ info.ACCEPT_CONTENT }}</div>
|
||||
<div v-for="item in imgList1" :key="item.ACCEPT_CONFESS_ID" style="text-align: right">
|
||||
<span>签字：</span>
|
||||
<img v-viewer :src="config.fileUrl + item.ACCEPT_USER_SIGNER_PATH" alt="" width="100" height="100">
|
||||
<span>{{ item.ACCEPT_USER_SIGNER_TIME }}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div><span>管理单位负责人意见：</span>
|
||||
<span>
|
||||
{{ info.MANAGEMENT_UNIT_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img v-if="info.MANAGEMENT_UNIT_IMG" :src="config.fileUrl+info.MANAGEMENT_UNIT_IMG">
|
||||
</span>
|
||||
<span v-if="info.MANAGEMENT_UNIT_TIME">{{
|
||||
formatDate(info.MANAGEMENT_UNIT_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<div><span>完工验收作业单位负责人意见：</span>
|
||||
<span>
|
||||
{{ info.COMPLETION_ACCEPTANCE_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img v-if="info.COMPLETION_ACCEPTANCE_IMG" :src="config.fileUrl+info.COMPLETION_ACCEPTANCE_IMG">
|
||||
</span>
|
||||
<span v-if="info.COMPLETION_ACCEPTANCE_TIME">{{
|
||||
formatDate(info.COMPLETION_ACCEPTANCE_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<!--<tr>
|
||||
<td colspan="4">
|
||||
<div><span>完工验收管理单位负责人意见：</span>
|
||||
<span>
|
||||
{{ info.COMPLETION_ACCEPTANCE_MANAGEMENT_OPINION }}
|
||||
</span>
|
||||
</div>
|
||||
<div style="text-align: right;">
|
||||
<span class="print-approval-img">
|
||||
<img
|
||||
v-if="info.COMPLETION_ACCEPTANCE_MANAGEMENT_OPINION_IMG"
|
||||
:src="config.fileUrl+info.COMPLETION_ACCEPTANCE_MANAGEMENT_OPINION_IMG">
|
||||
</span>
|
||||
<span v-if="info.COMPLETION_ACCEPTANCE_MANAGEMENT_TIME">{{
|
||||
formatDate(info.COMPLETION_ACCEPTANCE_MANAGEMENT_TIME, 'YYYY年MM月DD日HH时mm分')
|
||||
}}</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>-->
|
||||
</table>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -249,7 +209,11 @@ export default {
|
|||
measuresList: [],
|
||||
gasList: [],
|
||||
oldHazardIdentification: [],
|
||||
oldWorkSafetyMeasures: []
|
||||
oldWorkSafetyMeasures: [],
|
||||
imgList: [],
|
||||
imgList1: [],
|
||||
gas: {},
|
||||
otherProtectiveMeasures: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -266,7 +230,7 @@ export default {
|
|||
},
|
||||
getData() {
|
||||
requestFN(
|
||||
'/map/Eight/getById',
|
||||
'/map/Eight/getByIdOrder',
|
||||
{
|
||||
id: this.id,
|
||||
TYPE: this.type,
|
||||
|
|
@ -275,15 +239,30 @@ export default {
|
|||
).then((data) => {
|
||||
this.listLoading = false
|
||||
this.info = data.pd
|
||||
this.measuresList = data.measuresList || []
|
||||
this.gasList = data.gasList || []
|
||||
|
||||
if (this.info.HARM) {
|
||||
this.oldHazardIdentification = this.info.HARM.split('$$$')
|
||||
}
|
||||
if (this.info.SAFTETY) {
|
||||
this.oldWorkSafetyMeasures = this.info.SAFTETY.split('$$$')
|
||||
this.imgList = data.imgList
|
||||
this.imgList1 = data.imgList1
|
||||
for (let i = 0; i < data.measuresList.length; i++) {
|
||||
// 将字符串转成数组
|
||||
const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('')
|
||||
for (let j = 1; j <= 3; j++) {
|
||||
// 判断字符串是否存在
|
||||
if (this.findCharIndex(PROTECTIVE_MEASURES, '（', j) !== -1) {
|
||||
// 给字符串后面添加上需要的数据
|
||||
PROTECTIVE_MEASURES.splice(
|
||||
this.findCharIndex(PROTECTIVE_MEASURES, '（', j) + 1,
|
||||
0,
|
||||
data.measuresList[i]['ANSWER' + j]
|
||||
)
|
||||
}
|
||||
}
|
||||
// 将数组转回字符串
|
||||
data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('')
|
||||
}
|
||||
this.measuresList = data.measuresList // 参数map
|
||||
this.gasList = data.gasList // 参数map
|
||||
this.gas = data.gas || {} // 参数map
|
||||
this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
|
||||
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
|
||||
}).catch((e) => {
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,23 +18,21 @@
|
|||
<!--秦港一公司 边界入侵 详细页面 start-->
|
||||
<video-play-bianjieruqin v-if="type === 'bianjieruqin'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--秦港一公司 边界入侵 详细页面 end-->
|
||||
<!--秦港一公司 八项作业 详细页面 start-->
|
||||
<!--秦港一公司 动火作业 详细页面 start-->
|
||||
<hotworkFirst v-if="type === 'HOTWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6' " :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--秦港一公司 动火作业 详细页面 end-->
|
||||
<!--其他公司 动火作业 详细页面 start-->
|
||||
<hotwork v-if="type === 'HOTWORK'&& corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--其他公司 动火作业 详细页面 end-->
|
||||
<!--其他七项作业共用一个详细页面 start-->
|
||||
<confinedspace v-if="type === 'CONFINEDSPACE' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<electricity v-if="type === 'ELECTRICITY' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<highwork v-if="type === 'HIGHWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<hoisting v-if="type === 'HOISTING' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<blindboard v-if="type === 'BLINDBOARD' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--秦港一公司 八项作业 详细页面 end-->
|
||||
<!--其他公司 八项作业 详细页面 start--> <!-- 有限空间 动火 复用一公司-->
|
||||
<electricityOrder v-if="type === 'ELECTRICITY' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<highworkOrder v-if="type === 'HIGHWORK' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<hoistingOrder v-if="type === 'HOISTING' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<blindboardOrder v-if="type === 'BLINDBOARD' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<cutroadOrder v-if="type === 'CUTROAD' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<breakgroundOrder v-if="type === 'BREAKGROUND' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'&& corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--其他公司 八项作业 详细页面 start-->
|
||||
<electricityOrder v-if="type === 'ELECTRICITY' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<highworkOrder v-if="type === 'HIGHWORK' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<hoistingOrder v-if="type === 'HOISTING' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<blindboardOrder v-if="type === 'BLINDBOARD' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<cutroadOrder v-if="type === 'CUTROAD' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<breakgroundOrder v-if="type === 'BREAKGROUND' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
|
||||
<!--其他七项作业共用一个详细页面 end-->
|
||||
<!--曹妃甸东 八项作业 曹实业详细页面 start-->
|
||||
<hotworkCfdD v-if="type === 'HOTWORK'&& corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
|
||||
<confinedspaceCfdD v-if="type === 'CONFINEDSPACE' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
|
||||
|
|
@ -65,10 +63,6 @@ import weatherstation from './weatherstation.vue'
|
|||
import temperaturestation from './weatherstation.vue'
|
||||
import humiditystation from './weatherstation.vue'
|
||||
import windspeedstation from './weatherstation.vue'
|
||||
import electricity from './electricity.vue'
|
||||
import highwork from './highwork.vue'
|
||||
import hoisting from './hoisting.vue'
|
||||
import blindboard from './blindboard.vue'
|
||||
import XfControl from './xfControl.vue'
|
||||
import XfPoint from './xfPoint.vue'
|
||||
import MkGateMachine from './mkGateMachine.vue'
|
||||
|
|
@ -112,10 +106,6 @@ export default {
|
|||
temperaturestation,
|
||||
humiditystation,
|
||||
windspeedstation,
|
||||
electricity,
|
||||
highwork,
|
||||
hoisting,
|
||||
blindboard,
|
||||
electricityOrder,
|
||||
highworkOrder,
|
||||
cutroadOrder,
|
||||
|
|
|
|||
|
|
@ -76,6 +76,10 @@
|
|||
<span v-if="pd.STATE == -2">结束申请中</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">具体位置</td>
|
||||
<td colspan="3">{{ pd.LOCATION }}</td>
|
||||
</tr>
|
||||
<tr v-for="(item, index) in file9" :key="index">
|
||||
<td class="bbg-transparent">安全管理协议{{ index + 1 }}</td>
|
||||
<td colspan="2">{{ item.FILE_NAME }}</td>
|
||||
|
|
|
|||
|
|
@ -250,7 +250,14 @@ var tiandituTk = 'e8a16137fd226a62a23cc7ba5c9c78ce'
|
|||
var subdomains = ['0', '1', '2', '3', '4', '5', '6', '7']
|
||||
const Cesium = window.Cesium
|
||||
Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkOWQ0MGYwMy0yODUwLTQ1YzktOGM4OC02MTMwY2UyZjNlMzQiLCJpZCI6MTY0NTUwLCJpYXQiOjE2OTM4OTU1Mjd9.1cC0sSzyj79LZv0ILNCcl0Mabw6hl8TNngFNFr7H8f4'
|
||||
// ys使用
|
||||
import axios from 'axios'
|
||||
// md5加密
|
||||
import md5 from 'md5'
|
||||
|
||||
const imosPlayer = window.imosPlayer
|
||||
|
||||
const iframeObj = null
|
||||
export default {
|
||||
components: {
|
||||
AnquanCfd,
|
||||
|
|
@ -1071,15 +1078,171 @@ export default {
|
|||
iniOne: 0,
|
||||
|
||||
/* 一公司人员定位 结束*/
|
||||
bottomClickDisable: false
|
||||
bottomClickDisable: false,
|
||||
|
||||
// 宇视视频播放
|
||||
dialogVideoYs: true,
|
||||
ysVideoInfo: {
|
||||
vmip: '10.30.20.54',
|
||||
name: 'loadmin',
|
||||
passwd: '_Ab54321',
|
||||
vmport: '7010',
|
||||
linkPort: '8093',
|
||||
VIIDPort: '8088'
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.initMap()
|
||||
this.pointBoxCfd = loadMapBoxCfd()
|
||||
this.pointBox = loadMapBox()
|
||||
this.ysVideoInit()
|
||||
},
|
||||
methods: {
|
||||
getRandom() {
|
||||
function S4() {
|
||||
return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1)
|
||||
}
|
||||
return S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4()
|
||||
},
|
||||
// keepalive(token) {
|
||||
// // 第二套方案
|
||||
// requestFN(
|
||||
// '/map/loginOrKeepAlive',
|
||||
// {
|
||||
// }
|
||||
// ).then((data) => {
|
||||
//
|
||||
// })
|
||||
// },
|
||||
// ysVideoInit() {
|
||||
// // 第二套方案
|
||||
// var _this = this
|
||||
// requestFN(
|
||||
// '/map/loginOrKeepAlive',
|
||||
// {
|
||||
// }
|
||||
// ).then((data) => {
|
||||
// const token = data.token
|
||||
// var nbsp = String.fromCharCode(160)
|
||||
// var arr = []
|
||||
// arr.length = 40
|
||||
// const str = arr.fill(nbsp).join('')
|
||||
// const voidPath = imosPlayer.getUniqueID()
|
||||
// window.voidPath = voidPath
|
||||
// document.title = document.title + str + new Date().getTime()
|
||||
// _this.keepalive(token)
|
||||
// setInterval(_this.keepalive, 30000, token)
|
||||
// console.info('-----------1-------------------')
|
||||
// window.videoWindow = 0
|
||||
// imosPlayer.setLinkPort('8093')
|
||||
// imosPlayer
|
||||
// .init({
|
||||
// ip: '10.30.20.54',
|
||||
// token: token,
|
||||
// title: document.title,
|
||||
// voidListenerPath: '\\' + voidPath
|
||||
// })
|
||||
// .then(async(resr) => {
|
||||
// console.info('-----------2-------------------')
|
||||
// if (resr.ErrCode === 0) {
|
||||
// console.info('-----------3-------------------')
|
||||
// // imosPlayer.setLiveNetLinkMode(liveNetProtocol, liveByMS)
|
||||
// // imosPlayer.setReplayNetLinkMode(replayNetProtocol, replayByMS)
|
||||
//
|
||||
// // eslint-disable-next-line no-alert
|
||||
// console.info('登录成功')
|
||||
// } else {
|
||||
//
|
||||
// console.info('-----------4-------------------')
|
||||
// // eslint-disable-next-line no-alert
|
||||
// console.info(resr.ErrMsg)
|
||||
// }
|
||||
// })
|
||||
// .catch((err) => {
|
||||
//
|
||||
// console.info('-----------5-------------------')
|
||||
// console.error(err)
|
||||
// })
|
||||
// })
|
||||
// },
|
||||
keepalive(token) {
|
||||
axios({
|
||||
method: 'POST',
|
||||
url: config.ysurl + '/VIID/hadesadapter/user/keepalive',
|
||||
headers: {
|
||||
'Content-Type': 'application/json; charset=utf8',
|
||||
Authorization: token
|
||||
},
|
||||
responseType: 'json'
|
||||
}).then((res) => { })
|
||||
},
|
||||
ysVideoInit() {
|
||||
var _this = this
|
||||
axios({
|
||||
method: 'POST',
|
||||
url: config.ysurl + '/VIID/login/v2', // protocol改为http://
|
||||
headers: {
|
||||
'Content-Type': 'application/json; charset=utf8'
|
||||
},
|
||||
responseType: 'json'
|
||||
}).then((res) => {
|
||||
const AccessCode = res.data.AccessCode// res.body改为res.data
|
||||
const LoginSignature = md5(btoa(_this.ysVideoInfo.name) + AccessCode + md5(_this.ysVideoInfo.passwd))
|
||||
axios({
|
||||
method: 'POST',
|
||||
url: config.ysurl + '/VIID/login/v2',
|
||||
headers: {
|
||||
'Content-Type': 'application/json; charset=utf8'
|
||||
},
|
||||
responseType: 'json',
|
||||
data: {
|
||||
UserName: _this.ysVideoInfo.name,
|
||||
AccessCode,
|
||||
LoginSignature
|
||||
}
|
||||
|
||||
}).then((res) => {
|
||||
var nbsp = String.fromCharCode(160)
|
||||
var arr = []
|
||||
arr.length = 40
|
||||
const str = arr.fill(nbsp).join('')
|
||||
const voidPath = imosPlayer.getUniqueID()
|
||||
window.voidPath = voidPath
|
||||
document.title = document.title + str + new Date().getTime()
|
||||
var token = res.data.AccessToken
|
||||
window.token = res.data.AccessToken
|
||||
console.log(res)
|
||||
_this.keepalive(token)
|
||||
setInterval(_this.keepalive, 30000, token)
|
||||
|
||||
window.videoWindow = 0
|
||||
imosPlayer.setLinkPort('8093')
|
||||
imosPlayer
|
||||
.init({
|
||||
ip: '10.30.20.54',
|
||||
token: token,
|
||||
title: document.title,
|
||||
voidListenerPath: '\\' + voidPath
|
||||
})
|
||||
.then(async(resr) => {
|
||||
if (resr.ErrCode === 0) {
|
||||
// imosPlayer.setLiveNetLinkMode(liveNetProtocol, liveByMS)
|
||||
// imosPlayer.setReplayNetLinkMode(replayNetProtocol, replayByMS)
|
||||
|
||||
// eslint-disable-next-line no-alert
|
||||
console.info('登录成功')
|
||||
} else {
|
||||
// eslint-disable-next-line no-alert
|
||||
console.info(resr.ErrMsg)
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err)
|
||||
})
|
||||
})
|
||||
})
|
||||
},
|
||||
initMap() {
|
||||
viewer = new Cesium.Viewer('cesiumContainer', {
|
||||
// terrainProvider: Cesium.createWorldTerrain()
|
||||
|
|
|
|||
|
|
@ -83,7 +83,8 @@ export default {
|
|||
{ ID: '-2', NAME: '已指派确认人' },
|
||||
{ ID: '8', NAME: '特殊处置通过' },
|
||||
{ ID: '16', NAME: '确认打回' },
|
||||
{ ID: '7', NAME: '待处理的特殊隐患' }
|
||||
{ ID: '7', NAME: '待处理的特殊隐患' },
|
||||
{ ID: '-1', NAME: '已过期' }
|
||||
],
|
||||
inspectionStatusList: [
|
||||
{ ID: '3-7', NAME: '请选择' },
|
||||
|
|
|
|||
|
|
@ -458,6 +458,7 @@ export default {
|
|||
await this.getDict()
|
||||
await this.handleAdd()
|
||||
await this.getEditMyInfo()
|
||||
await this.getHiddenReginTreeListData()
|
||||
loading.close()
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -1048,6 +1049,23 @@ export default {
|
|||
openConfirm() {
|
||||
this.$refs.confirm.init()
|
||||
},
|
||||
|
||||
// 获取隐患部位 下拉树
|
||||
getHiddenReginTreeListData() {
|
||||
return new Promise((resolve) => {
|
||||
this.treeLoading = true
|
||||
requestFN(
|
||||
'/hiddenRegion/listAll',
|
||||
{}
|
||||
).then((data) => {
|
||||
this.treeLoading = false
|
||||
this.hiddenPartList = JSON.parse(data.zTreeNodes)
|
||||
resolve('ok')
|
||||
}).catch((e) => {
|
||||
this.treeLoading = false
|
||||
})
|
||||
})
|
||||
},
|
||||
getProposal(information) {
|
||||
this.form.CONFIRM_MESSAGE = information.INSPECTION_USER_OPINION
|
||||
this.form.CONFIRM_MESSAGE_SIGN = information.INSPECTION_USER_SIGN_IMG
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const config = {
|
||||
weburl: 'http://192.168.0.45:8082/', // 前台地址
|
||||
httpurl: 'http://192.168.151.56:8092/', // 后台地址
|
||||
httpurl: 'http://192.168.151.43:8092/', // 后台地址
|
||||
qyurl: 'http://192.168.0.45:8080/', // 企业前台
|
||||
fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址
|
||||
publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',
|
||||
|
|
@ -12,5 +12,6 @@ const config = {
|
|||
perRealTimeLocUrl: '192.168.210.32:8084/netty/test.io',
|
||||
cfdfileUrl: 'http://60.2.209.238:8991/file',
|
||||
xfgUrl: 'https://skqhdg.porthebei.com:9006/static/qrcode/views/xgf_hgz/index.html',
|
||||
messageUrl: 'http://192.168.151.56:8082/static/qrcode/views/xgf_hgz/index.html'
|
||||
messageUrl: 'http://192.168.151.56:8082/static/qrcode/views/xgf_hgz/index.html',
|
||||
ysurl:'/ysapi'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
升级内容： 企业端PC： 1、新增-三人以上风险分布图菜单-分公司进行上传维护 2、新增-人员聚集分布图菜单-分公司进行上传维护 3、新增-人员培训申请-分公司进行申请培训 4、新增-相关方人员撤场申请审批-分公司审批相关方人员撤回申请 监管端PC： 1、新增-三人以上风险分布图菜单，查看分公司数据 2、新增-人员聚集分布图菜单，查看分公司数据 3、优化-重点工程菜单-搜索条件可以手动输入,主管部门和监管部门可以选择全部企业 4、优化-入场告知培训管理-优化审核流程 相关方PC： 1、新增-人员推送申请-相关方对分公司推送人员 2、新增-人员撤回申请-相关方对分公司申请撤回人员 企业端APP： 1、优化-动火作业-监火改为选择部门 2、新增-查看重点工程监控视频 3、新增-重点工程创建人审核开工申请和结束申请 监管端APP： 1、新增-查看重点工程监控视频 2、新增-重点工程创建人审核开工申请和结束申请 一公司app： 1、新增-原来动火作业改为国标新动火作业审批流程
|
||||
Loading…
Reference in New Issue