From ab254545271d2e2194026c96a22a302560292e85 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 15 Apr 2022 09:48:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/views/hiddenDangerRegistration/listAssociatedHazards.vue | 246 +++
src/views/accidentHidden/fillProgress.vue | 209 ++
src/views/hiddenDangerRectification/applicationForExtension.vue | 160 ++
src/views/hiddenDangerManagement/fillRectification.vue | 281 +++
src/views/hiddenDangerReview/recheckCancellationNumber.vue | 304 +++
src/router/index.js | 116 +
src/views/hiddenDangerManagement/fillRectificationAdd.vue | 230 ++
src/views/hiddenDangerRegistration/hiddenDangerList.vue | 218 +
src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue | 219 +
src/views/hiddenDangerManagement/index.vue | 405 +++++
src/views/hiddenDangerRegistration/index.vue | 371 ++++
src/views/hiddenDangerReview/recheckHiddenDangerList.vue | 219 +
src/views/accidentHidden/majorHidden.vue | 286 +++
src/views/hiddenDangerRegistration/hiddenDangerAdd.vue | 258 +++
src/views/delayHiddenDangerRectification/index.vue | 309 +++
src/views/hiddenDangerManagement/fillInspector.vue | 314 +++
src/views/hiddenDangerRectification/index.vue | 412 +++++
src/views/hiddenDangerRectification/sendHiddenDangerList.vue | 217 +
18 files changed, 4,501 insertions(+), 273 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 62095f4..6b88c8a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -201,10 +201,120 @@
meta: { title: '重大隐患整改进度', icon: '' }
},
{
+ path: '/fillProgress',
+ // name: '重大隐患整改进度-填写进度',
+ component: () => import('@/views/accidentHidden/fillProgress'),
+ // meta: { title: '重大隐患整改进度-填写进度', icon: '' }
+ hidden: true
+ },
+ {
+ id: 2,
+ parentId: 0,
+ path: '/hiddenDangerRegistration',
+ name: '隐患登记下达',
+ component: () => import('@/views/hiddenDangerRegistration'),
+ meta: { title: '隐患登记下达', icon: '' }
+ },
+ {
+ path: '/hiddenDangerAdd',
+ // name: '新增',
+ component: () => import('@/views/hiddenDangerRegistration/hiddenDangerAdd'),
+ // meta: { title: '隐患登记下达-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
path: '/hiddenDangerList',
- // name: '重大隐患整改进度-发送隐患单',
- component: () => import('@/views/accidentHidden/hiddenDangerList'),
- // meta: { title: '重大隐患整改进度-发送隐患单', icon: '' }
+ // name: '隐患登记下达-发送隐患单',
+ component: () => import('@/views/hiddenDangerRegistration/hiddenDangerList'),
+ // meta: { title: '隐患登记下达-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/listAssociatedHazards',
+ // name: '隐患登记下达-关联危险源-列表页面',
+ component: () => import('@/views/hiddenDangerRegistration/listAssociatedHazards'),
+ // meta: { title: '隐患登记下达-关联危险源-列表页面', icon: '' }
+ hidden: true
+ },
+ {
+ id: 3,
+ parentId: 0,
+ path: '/hiddenDangerRectification',
+ name: '隐患整改治理',
+ component: () => import('@/views/hiddenDangerRectification'),
+ meta: { title: '隐患整改治理', icon: '' }
+ },
+ {
+ path: '/sendHiddenDangerList',
+ // name: '隐患整改治理-发送隐患单',
+ component: () => import('@/views/hiddenDangerRectification/sendHiddenDangerList'),
+ // meta: { title: '隐患整改治理-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/applicationForExtension',
+ // name: '隐患整改治理-申请延期',
+ component: () => import('@/views/hiddenDangerRectification/applicationForExtension'),
+ // meta: { title: '隐患整改治理-申请延期', icon: '' }
+ hidden: true
+ },
+ {
+ id: 4,
+ parentId: 0,
+ path: '/recheckCancellationNumber',
+ name: '隐患复查销号',
+ component: () => import('@/views/hiddenDangerReview/recheckCancellationNumber'),
+ meta: { title: '隐患复查销号', icon: '' }
+ },
+ {
+ path: '/recheckHiddenDangerList',
+ // name: '隐患复查销号-发送隐患单',
+ component: () => import('@/views/hiddenDangerReview/recheckHiddenDangerList'),
+ // meta: { title: '隐患复查销号-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
+ id: 5,
+ parentId: 0,
+ path: '/delayHiddenDangerRectification',
+ name: '隐患整改延期',
+ component: () => import('@/views/delayHiddenDangerRectification'),
+ meta: { title: '隐患整改延期', icon: '' }
+ },
+ {
+ path: '/rectificationDelayHiddenDanger',
+ // name: '隐患整改延期-发送隐患单',
+ component: () => import('@/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger'),
+ // meta: { title: '隐患整改延期-发送隐患单', icon: '' }
+ hidden: true
+ },
+ {
+ id: 6,
+ parentId: 0,
+ path: '/hiddenDangerManagement',
+ name: '自查隐患管理',
+ component: () => import('@/views/hiddenDangerManagement'),
+ meta: { title: '自查隐患管理', icon: '' }
+ },
+ {
+ path: '/fillRectificationAdd',
+ // name: '自查隐患管理-填写整改',
+ component: () => import('@/views/hiddenDangerManagement/fillRectificationAdd'),
+ // meta: { title: '自查隐患管理-填写整改', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/fillRectification',
+ // name: '自查隐患管理-填写整改',
+ component: () => import('@/views/hiddenDangerManagement/fillRectification'),
+ // meta: { title: '自查隐患管理-填写整改', icon: '' }
+ hidden: true
+ },
+ {
+ path: '/fillInspector',
+ // name: '自查隐患管理-填写督察',
+ component: () => import('@/views/hiddenDangerManagement/fillInspector'),
+ // meta: { title: '自查隐患管理-填写督察', icon: '' }
hidden: true
},
]
diff --git a/src/views/accidentHidden/fillProgress.vue b/src/views/accidentHidden/fillProgress.vue
new file mode 100644
index 0000000..6695adb
--- /dev/null
+++ b/src/views/accidentHidden/fillProgress.vue
@@ -0,0 +1,209 @@
+<template>
+ <div class="app-container">
+ <div>
+ <Titlename title="列表页面"></Titlename>
+ <div class="whole">
+ <el-form ref="form" :model="form" label-width="100px">
+ <el-form-item style="text-align: right;">
+ <el-button class="btn" type="primary" size="small" icon="el-icon-plus" @click="onSubmit">添加</el-button>
+ <el-button size="small">批量删除</el-button>
+ </el-form-item>
+ </el-form>
+ <el-table
+ type="selection"
+ :data="tableData"
+ style="width: 1600px"
+ border
+ @cell-mouse-enter="handleCellEnter"
+ @cell-mouse-leave="handleCellLeave"
+ @cell-click="handleCellClick"
+ >
+ <el-table-column
+ type="selection"
+ align="center"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ prop="fillingTime"
+ align="center"
+ width="220"
+ label="填报时间">
+ <div class="item" slot-scope="scope">
+<!-- <el-input class="item__input" v-model="scope.row.fillingTime" placeholder="请输入内容"></el-input>-->
+ <el-date-picker
+ class="item__input"
+ v-model="scope.row.fillingTime"
+ type="date"
+ ref="saveDateInput"
+ placeholder="选择日期" clearable>
+ </el-date-picker>
+ <div class="item__txt">{{scope.row.fillingTime}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ prop="filledBy"
+ align="center"
+ width="300"
+ label="填报人">
+ <div class="item" slot-scope="scope">
+ <el-input class="item__input" v-model="scope.row.filledBy" placeholder="请输入内容"></el-input>
+ <div class="item__txt">{{scope.row.filledBy}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ prop="progress"
+ label="整改形象进度"
+ width="300"
+ align="center">
+ <div class="item" slot-scope="scope">
+ <el-input class="item__input" v-model="scope.row.progress" placeholder="请输入内容" clearable></el-input>
+ <div class="item__txt">{{scope.row.progress}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ prop="remarks"
+ label="备注"
+ align="center">
+ <div class="item" slot-scope="scope">
+ <el-input type="textarea" class="item__input" v-model="scope.row.remarks" placeholder="请输入内容" clearable></el-input>
+ <div class="item__txt">{{scope.row.remarks}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ label="操作"
+ align="center"
+ width="200">
+ <template slot-scope="scope">
+ <el-button type="text" size="small">编辑</el-button>
+ <el-button @click="save(scope.row)" type="text" size="small">保存</el-button>
+ <el-button type="text" size="small" style="color: #f56c6c">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+ import Titlename from "../../components/Titlename/index.vue";
+ export default {
+ components: {Titlename},
+ name: "fillProgress",
+ data(){
+ return{
+ // tableData: [],
+ tableData: [{
+ fillingTime: '2016-05-02',
+ progress: '无进度',
+ remarks: '222222222',
+ filledBy:'王小虎'
+ }, {
+ fillingTime: '2016-05-02',
+ progress: '无进度',
+ remarks: '222222222',
+ filledBy:'王小虎'
+ }],
+ // // 需要编辑的属性
+ // editProp: ['fillingTime', 'progress', 'remarks'],
+ // // 保存进入编辑的cell
+ // clickCellMap: {},
+ // 需要编辑的属性
+ editProp: ['fillingTime', 'progress', 'remarks','filledBy'],
+ // 保存进入编辑的cell
+ clickCellMap: {}
+ }
+ },
+ methods: {
+ /** 鼠标移入cell */
+ handleCellEnter (row, column, cell, event) {
+ const property = column.property
+ if (property === 'date' || property === 'name' || property === 'food') {
+ cell.querySelector('.item__txt').classList.add('item__txt--hover')
+ }
+ },
+ /** 鼠标移出cell */
+ handleCellLeave (row, column, cell, event) {
+ const property = column.property
+ if (this.editProp.includes(property)) {
+ cell.querySelector('.item__txt').classList.remove('item__txt--hover')
+ }
+ },
+ /** 点击cell */
+ handleCellClick (row, column, cell, event) {
+ const property = column.property
+ if (this.editProp.includes(property)) {
+ // 保存cell
+ this.saveCellClick(row, cell)
+ cell.querySelector('.item__txt').style.display = 'none'
+ cell.querySelector('.item__input').style.display = 'block'
+ cell.querySelector('input').focus()
+ }
+ },
+ /** 取消编辑状态 */
+ cancelEditable (cell) {
+ cell.querySelector('.item__txt').style.display = 'block'
+ cell.querySelector('.item__input').style.display = 'none'
+ },
+ /** 保存进入编辑的cell */
+ saveCellClick (row, cell) {
+ const id = row.id
+ if (this.clickCellMap[id] !== undefined) {
+ if (!this.clickCellMap[id].includes(cell)) {
+ this.clickCellMap[id].push(cell)
+ }
+ } else {
+ this.clickCellMap[id] = [cell]
+ }
+ },
+ /** 保存数据 */
+ save (row) {
+ const id = row.id
+ // 取消本行所有cell的编辑状态
+ this.clickCellMap[id].forEach(cell => {
+ this.cancelEditable(cell)
+ })
+ this.clickCellMap[id] = []
+ },
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+ }
+ .btn {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .item .item__input{
+ display: none;
+ font-size: 14px;
+ }
+ .item .item__input .el-input__inner{
+ height: 24px!important;
+ }
+ /*/deep/ .el-input__inner{*/
+ /* width: 200px;*/
+ /*}*/
+ /*/deep/ .el-textarea__inner{*/
+ /* width: 200px;*/
+ /*}*/
+ .item .item__input .el-input__suffix i{
+ font-size: 14px !important;
+ line-height: 26px !important;
+ }
+ .item .item__txt{
+ box-sizing: border-box;
+ border: 1px solid transparent;
+ width: 100%;
+ line-height: 24px;
+ font-size: 14px;
+ padding: 0 8px;
+ }
+
+</style>
diff --git a/src/views/accidentHidden/majorHidden.vue b/src/views/accidentHidden/majorHidden.vue
index ef11716..c0b4936 100644
--- a/src/views/accidentHidden/majorHidden.vue
+++ b/src/views/accidentHidden/majorHidden.vue
@@ -1,17 +1,279 @@
<template>
- <div class="app-container">
-
+ <div class="app-container">
+<el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+ <el-form-item label="编号">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="检查单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查人">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患级别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="班次">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="是否关联">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="录入人">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="限改时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item style="text-align:center;padding:0 50px">
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search">查询</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+ </el-form-item>
+ </el-form>
+ <el-row class="title-center">
+ <el-col :span="10">
+ <el-radio-group v-model="radio1" style="border:none">
+ <el-radio-button label="正在整改"></el-radio-button>
+ <el-radio-button label="正在复查"></el-radio-button>
+ <el-radio-button label="整改完成"></el-radio-button>
+ </el-radio-group>
+ </el-col>
+ <el-col :offset="4" :span="10" style="text-align:right;">
+ <el-button class="btns" type="primary" icon="el-icon-search" size="small">查看进度</el-button>
+ <el-button class="btns" type="primary" icon="el-icon-edit" size="small" @click="fillProgress()">填写进度</el-button>
+ </el-col>
+ </el-row>
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="date"
+ label="编号"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查部门"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查人"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column prop="date" label="检查类别" align="center">
+ </el-table-column>
+ <el-table-column label="隐患项目" align="center">
+ <el-table-column label="检查时间" width="120" sortable align="center">
+ </el-table-column>
+ <el-table-column label="地点" align="center"> </el-table-column>
+ <el-table-column label="内容" align="center"> </el-table-column>
+ <el-table-column label="类别" align="center"> </el-table-column>
+ <el-table-column label="级别" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="整改计划" align="center">
+ <el-table-column label="整改措施" align="center"> </el-table-column>
+ <el-table-column label="隐患部门" align="center"> </el-table-column>
+ <el-table-column label="责任人" align="center"> </el-table-column>
+ <el-table-column label="限改时间" width="120" sortable align="center">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="风险等级" align="center"> </el-table-column>
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
</div>
+ </div>
</template>
<script>
- export default{
- data(){
- return{
-
- }
- }
- }
+export default {
+ data() {
+ return {
+ form:{},
+ radio1: '正在整改',
+ options: [{
+ value: '选项1',
+ label: '黄金糕'
+ }, {
+ value: '选项2',
+ label: '双皮奶'
+ }, {
+ value: '选项3',
+ label: '蚵仔煎'
+ }, {
+ value: '选项4',
+ label: '龙须面'
+ }, {
+ value: '选项5',
+ label: '北京烤鸭'
+ }],
+ tableData: [],
+ pageSize: 10,
+ recordTotal: 0,
+ currentPage: 1,
+ };
+ },
+ methods:{
+ fillProgress(){
+ this.$router.push({
+ path:"/fillProgress"
+ })
+ },
+ }
+};
</script>
-<style>
-
-</style>
\ No newline at end of file
+<style scoped>
+.inquire{
+ display: flex;
+ justify-content:left;
+ flex-wrap: wrap;
+}
+.inquire .el-form-item{
+ padding: 0 46px;
+}
+.title-center{
+ padding: 20px 0;
+}
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner{
+ border: none;
+}
+.title-center /deep/ .el-radio-button__inner{
+ border: none;
+ border-radius: 0px;
+}
+.title-center /deep/ .el-radio-button__orig-radio:checked+.el-radio-button__inner{
+ background-color: #034ea2;background-color: #034ea2;
+}
+</style>
diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
new file mode 100644
index 0000000..7f69dac
--- /dev/null
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -0,0 +1,309 @@
+<template>
+ <div class="app-container">
+<el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+ <el-form-item label="编号">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="检查单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查人">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患级别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="班次">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="是否关联">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="录入人">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="限改时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item style="text-align:center;padding:0 50px">
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search">查询</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+ </el-form-item>
+ </el-form>
+ <el-row class="title-center">
+ <!-- <el-col :span="10">
+ <el-radio-group v-model="radio1">
+ <el-radio-button label="上海"></el-radio-button>
+ <el-radio-button label="北京"></el-radio-button>
+ <el-radio-button label="广州"></el-radio-button>
+ </el-radio-group>
+ </el-col> -->
+ <el-col :span="24" style="text-align:right;">
+ <el-button class="btns" type="primary" size="small">批量发送</el-button>
+ </el-col>
+ </el-row>
+ <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="date"
+ label="编号"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查部门"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查人"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column prop="date" label="检查类别" align="center">
+ </el-table-column>
+ <el-table-column label="隐患项目" align="center">
+ <el-table-column label="检查时间" width="120" sortable align="center">
+ </el-table-column>
+ <el-table-column label="地点" align="center"> </el-table-column>
+ <el-table-column label="内容" align="center"> </el-table-column>
+ <el-table-column label="类别" align="center"> </el-table-column>
+ <el-table-column label="级别" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="整改计划" align="center">
+ <el-table-column label="整改措施" align="center"> </el-table-column>
+ <el-table-column label="隐患部门" align="center"> </el-table-column>
+ <el-table-column label="责任人" align="center"> </el-table-column>
+ <el-table-column label="限改时间" width="120" sortable align="center">
+ </el-table-column>
+ <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
+ </el-table-column>
+ <el-table-column label="整改情况" align="center">
+ <el-table-column label="完成时间" sortable width="120" align="center"> </el-table-column>
+ <el-table-column label="复查结果" align="center"> </el-table-column>
+ <el-table-column label="复查人" align="center"> </el-table-column>
+ <el-table-column label="复查时间" width="120" sortable align="center">
+ </el-table-column>
+ <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
+ </el-table-column>
+ <el-table-column label="隐患处理状态" align="center"> </el-table-column>
+ <el-table-column label="是否关联" align="center"> </el-table-column>
+ <el-table-column label="风险等级" align="center"> </el-table-column>
+ <el-table-column label="初始警情" align="center"> </el-table-column>
+ <el-table-column label="当前警情" align="center"> </el-table-column>
+ <el-table-column label="流程操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+ </div>
+</template>
+<script>
+export default {
+ data() {
+ return {
+ form:{},
+ radio1: '上海',
+ options: [{
+ value: '选项1',
+ label: '黄金糕'
+ }, {
+ value: '选项2',
+ label: '双皮奶'
+ }, {
+ value: '选项3',
+ label: '蚵仔煎'
+ }, {
+ value: '选项4',
+ label: '龙须面'
+ }, {
+ value: '选项5',
+ label: '北京烤鸭'
+ }],
+ tableData: [{
+ date: '2016-05-02',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1518 弄'
+ }, {
+ date: '2016-05-04',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1517 弄'
+ }, {
+ date: '2016-05-01',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1519 弄'
+ }, {
+ date: '2016-05-03',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1516 弄'
+ }],
+ multipleSelection :[],
+ pageSize: 10,
+ recordTotal: 0,
+ currentPage: 1,
+ };
+ },
+ methods:{
+ // table点击多选框返回数据
+ handleSelectionChange(val) {
+ this.multipleSelection = val;
+ console.log(val)
+ },
+ // 发送隐患单跳转
+ handleClick(){
+ this.$router.push({
+ path:"/rectificationDelayHiddenDanger"
+ })
+ },
+ }
+};
+</script>
+<style>
+.inquire{
+ display: flex;
+ justify-content:left;
+ flex-wrap: wrap;
+}
+.inquire .el-form-item{
+ padding: 0 46px;
+}
+.title-center{
+ padding: 20px 0;
+}
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+</style>
diff --git a/src/views/accidentHidden/hiddenDangerList.vue b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
similarity index 66%
copy from src/views/accidentHidden/hiddenDangerList.vue
copy to src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
index 7bdf847..e735c09 100644
--- a/src/views/accidentHidden/hiddenDangerList.vue
+++ b/src/views/delayHiddenDangerRectification/rectificationDelayHiddenDanger.vue
@@ -7,12 +7,12 @@
style="margin: 0 14% 0 16%;">
<el-row>
<el-col :span="9">
- <el-form-item label="隐患编号：" prop="name">
+ <el-form-item label="隐患编号" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="检查单位：" prop="elementAName">
+ <el-form-item label="检查单位" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -24,7 +24,7 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查人：" prop="region">
+ <el-form-item label="检查人" prop="region">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
<!-- <el-select-->
<!-- v-model="ruleForm.elementAName"-->
@@ -35,14 +35,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="陪检人员：" prop="name">
+ <el-form-item label="陪检人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查时间：" prop="name">
+ <el-form-item label="检查时间" prop="name">
<el-date-picker
v-model="value1"
type="date"
@@ -53,10 +53,10 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <!-- <el-form-item label="班次：" prop="name">-->
+ <!-- <el-form-item label="班次" prop="name">-->
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<!-- </el-form-item>-->
- <el-form-item label="班次：" prop="elementAName">
+ <el-form-item label="班次" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -68,26 +68,26 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="跟班、带班情况：" prop="name">
+ <el-form-item label="跟班、带班情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="跟班、带班人员：" prop="name">
+ <el-form-item label="跟班、带班人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="行走路线：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="行走路线" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患单位：" prop="name">
+ <el-form-item label="隐患单位" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -98,7 +98,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患部门：" prop="name">
+ <el-form-item label="隐患部门" prop="name">
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -111,21 +111,21 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患地点：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患地点" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患内容：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患内容" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患类别：" prop="name">
+ <el-form-item label="隐患类别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -136,7 +136,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患级别：" prop="name">
+ <el-form-item label="隐患级别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -149,19 +149,19 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="整改措施：" prop="name">
+ <el-form-item label="整改措施" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="所需资金：" prop="name">
+ <el-form-item label="所需资金" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="限改时间：" prop="name">
+ <el-form-item label="限改时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -173,14 +173,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="责任人：" prop="name">
+ <el-form-item label="责任人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
+ <el-form-item label="完成时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -192,14 +192,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改完成情况：" prop="name">
+ <el-form-item label="整改完成情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间：" prop="name">
+ <el-form-item label="复查时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -211,33 +211,33 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="复查人：" prop="name">
+ <el-form-item label="复查人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查结果：" prop="name">
+ <el-form-item label="复查结果" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改次数：" prop="name">
+ <el-form-item label="整改次数" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="危险源：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="危险源" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="风险等级：" prop="name">
+ <el-form-item label="风险等级" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -248,7 +248,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="业务科室：" prop="name">
+ <el-form-item label="业务科室" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -261,10 +261,11 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="流程信息：" prop="name">
+ <el-form-item label="流程信息" prop="name">
<!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
<el-table
:data="tableData"
+ border
style="width: 100%">
<el-table-column
prop="date"
@@ -274,25 +275,25 @@
</el-table-column>
<el-table-column
prop="name"
- label="操作人："
+ label="操作人"
align="center"
- width="139">
+ width="138">
</el-table-column>
<el-table-column
prop="province"
- label="处理时间："
+ label="处理时间"
align="center"
width="200">
</el-table-column>
<el-table-column
prop="city"
- label="审批意见："
+ label="审批意见"
align="center"
width="260">
</el-table-column>
<el-table-column
prop="address"
- label="流程信息："
+ label="流程信息"
align="center"
width="170">
</el-table-column>
@@ -302,17 +303,17 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="发送流程：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="发送流程" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="下一步：" prop="name">
+ <el-form-item label="是否发送" prop="name">
<el-radio-group v-model="ruleForm.safetyInspectionItemResult">
- <el-radio :label="0">申请复查</el-radio>
- <el-radio :label="1">不接受,返回安全环保部</el-radio>
+ <el-radio :label="0">通过</el-radio>
+ <el-radio :label="1">不通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -321,45 +322,79 @@
v-if="ruleForm.safetyInspectionItemResult == 0">
<el-row>
<el-col :span="9">
- <el-form-item label="落实责任人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="选择复查单位/人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" clearable v-model="ruleForm.reviewResults"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <div
+ v-else="ruleForm.safetyInspectionItemResult == 1">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="9">
- <el-form-item label="所需资金：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" v-model="ruleForm.reviewResults1"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc1">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc1"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="22">
- <el-form-item label="备注" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button size="small" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -375,7 +410,7 @@
export default {
components: {Titlename},
- name: "hiddenDangerList",
+ name: "rectificationDelayHiddenDanger",
data() {
return {
ruleForm: {
@@ -387,9 +422,21 @@
type: [],
resource: '',
value1: '',
- desc: ''
+ desc: '',
+ rechecker:'',
+ reviewTime:'',
+ reviewResults:'',
+ rechecker1:'',
+ reviewTime1:'',
+ reviewResults1:'',
+ desc1:''
},
- rules: {},
+ rules: {
+ reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
+ rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
+ reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
+ desc1: { required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur' },
+ },
tableData: [{
date: ' 1',
name: '超级管理员',
@@ -409,6 +456,8 @@
city: '',
address: '已发送众泰煤焦化安全环保部',
}],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
};
},
methods: {
@@ -422,6 +471,27 @@
}
});
},
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/delayHiddenDangerRectification"
+ })
+ }
}
}
</script>
@@ -440,4 +510,23 @@
/deep/ .multiline .el-input__inner {
height: 62px;
}
+ /deep/ .textarea .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+ }
+ /deep/ .textarea2 .el-textarea__inner{
+ height: 100px;
+ max-height: 100px;
+ overflow-y: auto
+ }
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
</style>
diff --git a/src/views/hiddenDangerManagement/fillInspector.vue b/src/views/hiddenDangerManagement/fillInspector.vue
new file mode 100644
index 0000000..6052daa
--- /dev/null
+++ b/src/views/hiddenDangerManagement/fillInspector.vue
@@ -0,0 +1,314 @@
+<template>
+ <div class="app-container">
+ <div>
+ <Titlename title="填写督查"></Titlename>
+ <div class="whole-form">
+ <el-form :model="config" ref="configTableForm">
+ <el-table
+ :data="tableData"
+ border
+ style="width: 1600px"
+ @cell-mouse-enter="handleCellEnter"
+ @cell-mouse-leave="handleCellLeave"
+ >
+ <el-table-column
+ prop="serial"
+ label="序号"
+ align="center"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ prop="number"
+ label="编号"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="hiddenDanger"
+ label="隐患单位"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="Inspector"
+ label="检查人"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="inspection"
+ label="检查班次"
+ align="center"
+ width="80">
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查时间"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="place"
+ label="地点"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="content"
+ label="内容"
+ align="center"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="category"
+ label="类别"
+ align="center"
+ width="80">
+ </el-table-column>
+ <el-table-column
+ prop="level"
+ label="级别"
+ align="center"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="rectification"
+ label="整改措施"
+ align="center"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="liable"
+ label="责任人"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="time"
+ label="限改时间"
+ align="center"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="completionTime"
+ align="center"
+ label="完成时间"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="rechecker"
+ label="复查人"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="reviewTime"
+ align="center"
+ width="100"
+ label="复查时间">
+ </el-table-column>
+ <el-table-column
+ prop="supervision"
+ label="督察单位"
+ align="center"
+ width="160">
+ <div class="item" slot-scope="scope">
+ <el-input class="item__input" v-model="scope.row.rechecker" placeholder="请输入内容" clearable></el-input>
+ <div class="item__txt">{{scope.row.rechecker}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ prop="inspectorTime"
+ align="center"
+ label="督察时间"
+ width="160">
+ <div class="item" slot-scope="scope">
+ <el-date-picker
+ v-model="scope.row.completionTime"
+ type="date"
+ placeholder="选择日期" clearable>
+ </el-date-picker>
+ <div class="item__txt">{{scope.row.completionTime}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ prop="results"
+ label="督察结果"
+ align="center"
+ width="160">
+ <div class="item" slot-scope="scope">
+ <el-input class="item__input" v-model="scope.row.rechecker" placeholder="请输入内容" clearable></el-input>
+ <div class="item__txt">{{scope.row.rechecker}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ prop="inspector"
+ label="督察人"
+ align="center"
+ width="160">
+ <div class="item" slot-scope="scope">
+ <el-input class="item__input" v-model="scope.row.rechecker" placeholder="请输入内容" clearable></el-input>
+ <div class="item__txt">{{scope.row.rechecker}}</div>
+ </div>
+ </el-table-column>
+ </el-table>
+ </el-form>
+ <div class="btn">
+ <el-button
+ class="btns"
+ size="small"
+ type="primary"
+ @click="submitConfig('config')">保存</el-button>
+ <el-button size="small"
+ @click="close()">关闭</el-button>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+ import Titlename from "../../components/Titlename/index.vue";
+
+ export default {
+ components: {Titlename},
+ name: "fillInspector",
+ data() {
+ return {
+ // 表格数据
+ tableData: [{
+ serial:'1',
+ number:'dycj-20220409-0083',
+ hiddenDanger:'电仪车间',
+ Inspector:'吴甲甲 ',
+ inspection:'早班',
+ date: '2016-05-02',
+ place:'生化站 ',
+ content:'生化站3号污泥回流泵电机接地线脱落',
+ category:'电气',
+ level:'一般隐患C',
+ rectification:'已紧固处理',
+ liable:'常春',
+ time:'2016-05-02',
+ completionTime:'',
+ rechecker:'',
+ reviewTime:'',
+ }, {
+ serial:'2',
+ number:'dycj-20220409-0083',
+ hiddenDanger:'电仪车间',
+ Inspector:'吴甲甲 ',
+ inspection:'早班',
+ date: '2016-05-02',
+ place:'生化站 ',
+ content:'生化站3号污泥回流泵电机接地线脱落',
+ category:'电气',
+ level:'一般隐患C',
+ rectification:'已紧固处理',
+ liable:'常春',
+ time:'2016-05-02',
+ completionTime:'',
+ rechecker:'',
+ reviewTime:'',
+ }, {
+ serial:'3',
+ number:'dycj-20220409-0083',
+ hiddenDanger:'电仪车间',
+ Inspector:'吴甲甲 ',
+ inspection:'早班',
+ date: '2016-05-02',
+ place:'生化站 ',
+ content:'生化站3号污泥回流泵电机接地线脱落',
+ category:'电气',
+ level:'一般隐患C',
+ rectification:'已紧固处理',
+ liable:'常春',
+ time:'2016-05-02',
+ completionTime:'',
+ rechecker:'',
+ reviewTime:'',
+ }],
+ // 需要编辑的属性
+ editProp: ['inspectorTime', 'results', 'inspector']
+ };
+ },
+ computed: {
+ foodLabel () {
+ return (val) => {
+ return this.options.find(o => o.value === val).label
+ }
+ }
+ },
+ methods: {
+ /** 鼠标移入cell */
+ handleCellEnter (row, column, cell, event) {
+ const property = column.property
+ if (this.editProp.includes(property)) {
+ // cell.querySelector('.item__input').style.display = 'block'
+ // cell.querySelector('.item__txt').style.display = 'none'
+ }
+ },
+ /** 鼠标移出cell */
+ handleCellLeave (row, column, cell, event) {
+ const property = column.property
+ if (this.editProp.includes(property)) {
+ // cell.querySelector('.item__input').style.display = 'none'
+ // cell.querySelector('.item__txt').style.display = 'block'
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerManagement"
+ })
+ }
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+ }
+ .whole-form{
+ margin-top: 20px;
+ }
+ .item .item__input {
+ /*display: none;*/
+ font-size: 14px;
+ }
+ /deep/ .item .item__input .el-input__inner{
+ font-size: 14px;
+ }
+ .item .item__txt{
+ display: none;
+ /*box-sizing: border-box;*/
+ /*padding: 0 15px;*/
+ /*height: 36px;*/
+ /*line-height: 36px;*/
+ /*font-size: 14px;*/
+ /* border: 1px solid transparent;*/
+ }
+ /deep/ .item .el-input--medium .el-input__inner{
+ /*display: none;*/
+ width: 140px;
+ }
+ /deep/ .is-center{
+ font-size: 14px;
+ }
+ .btn{
+ text-align: center;
+ margin-top: 50px;
+ }
+ .btns{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
+</style>
diff --git a/src/views/hiddenDangerManagement/fillRectification.vue b/src/views/hiddenDangerManagement/fillRectification.vue
new file mode 100644
index 0000000..7e4ecb0
--- /dev/null
+++ b/src/views/hiddenDangerManagement/fillRectification.vue
@@ -0,0 +1,281 @@
+<template>
+ <div class="app-container">
+ <div>
+ <Titlename title="填写整改"></Titlename>
+ <div class="whole-form">
+ <el-form :model="config" ref="configTableForm">
+ <el-table
+ :data="tableData"
+ border
+ style="width: 1600px"
+ @cell-mouse-enter="handleCellEnter"
+ @cell-mouse-leave="handleCellLeave"
+ >
+ <el-table-column
+ prop="serial"
+ label="序号"
+ align="center"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ prop="number"
+ label="编号"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="hiddenDanger"
+ label="隐患单位"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="Inspector"
+ label="检查人"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="inspection"
+ label="检查班次"
+ align="center"
+ width="80">
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查时间"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="place"
+ label="地点"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="content"
+ label="内容"
+ align="center"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="category"
+ label="类别"
+ align="center"
+ width="80">
+ </el-table-column>
+ <el-table-column
+ prop="level"
+ label="级别"
+ align="center"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="rectification"
+ label="整改措施"
+ align="center"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="liable"
+ label="责任人"
+ align="center"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="time"
+ label="限改时间"
+ align="center"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="completionTime"
+ align="center"
+ label="完成时间"
+ width="160">
+ <div class="item" slot-scope="scope">
+ <el-date-picker
+ v-model="scope.row.completionTime"
+ type="date"
+ placeholder="选择日期" clearable>
+ </el-date-picker>
+ <div class="item__txt">{{scope.row.completionTime}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ prop="rechecker"
+ label="复查人"
+ align="center"
+ width="160">
+ <div class="item" slot-scope="scope">
+ <el-input class="item__input" v-model="scope.row.rechecker" placeholder="请输入内容" clearable></el-input>
+ <div class="item__txt">{{scope.row.rechecker}}</div>
+ </div>
+ </el-table-column>
+ <el-table-column
+ prop="reviewTime"
+ align="center"
+ width="160"
+ label="复查时间">
+ <div class="item" slot-scope="scope">
+ <el-date-picker
+ v-model="scope.row.reviewTime"
+ type="date"
+ placeholder="选择日期" clearable>
+ </el-date-picker>
+ <div class="item__txt">{{scope.row.reviewTime}}</div>
+ </div>
+ </el-table-column>
+ </el-table>
+ </el-form>
+ <div class="btn">
+ <el-button
+ class="btns"
+ type="primary"
+ size="small"
+ @click="submitConfig('config')">保存</el-button>
+ <el-button
+ size="small" @click="close()">关闭</el-button>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+ import Titlename from "../../components/Titlename/index.vue";
+
+ export default {
+ components: {Titlename},
+ name: "fillRectification",
+ data() {
+ return {
+ // 表格数据
+ tableData: [{
+ serial:'1',
+ number:'dycj-20220409-0083',
+ hiddenDanger:'电仪车间',
+ Inspector:'吴甲甲 ',
+ inspection:'早班',
+ date: '2016-05-02',
+ place:'生化站 ',
+ content:'生化站3号污泥回流泵电机接地线脱落',
+ category:'电气',
+ level:'一般隐患C',
+ rectification:'已紧固处理',
+ liable:'常春',
+ time:'2016-05-02',
+ }, {
+ serial:'2',
+ number:'dycj-20220409-0083',
+ hiddenDanger:'电仪车间',
+ Inspector:'吴甲甲 ',
+ inspection:'早班',
+ date: '2016-05-02',
+ place:'生化站 ',
+ content:'生化站3号污泥回流泵电机接地线脱落',
+ category:'电气',
+ level:'一般隐患C',
+ rectification:'已紧固处理',
+ liable:'常春',
+ time:'2016-05-02',
+ }, {
+ serial:'3',
+ number:'dycj-20220409-0083',
+ hiddenDanger:'电仪车间',
+ Inspector:'吴甲甲 ',
+ inspection:'早班',
+ date: '2016-05-02',
+ place:'生化站 ',
+ content:'生化站3号污泥回流泵电机接地线脱落',
+ category:'电气',
+ level:'一般隐患C',
+ rectification:'已紧固处理',
+ liable:'常春',
+ time:'2016-05-02',
+ }],
+ // 需要编辑的属性
+ editProp: ['completionTime', 'rechecker', 'reviewTimes']
+ };
+ },
+ computed: {
+ foodLabel () {
+ return (val) => {
+ return this.options.find(o => o.value === val).label
+ }
+ }
+ },
+ methods: {
+ /** 鼠标移入cell */
+ handleCellEnter (row, column, cell, event) {
+ const property = column.property
+ if (this.editProp.includes(property)) {
+ // cell.querySelector('.item__input').style.display = 'block'
+ // cell.querySelector('.item__txt').style.display = 'none'
+ }
+ },
+ /** 鼠标移出cell */
+ handleCellLeave (row, column, cell, event) {
+ const property = column.property
+ if (this.editProp.includes(property)) {
+ // cell.querySelector('.item__input').style.display = 'none'
+ // cell.querySelector('.item__txt').style.display = 'block'
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerManagement"
+ })
+ },
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+ }
+ .whole-form{
+ margin-top: 20px;
+ }
+ .item .item__input {
+ /*display: none;*/
+ font-size: 14px;
+ }
+ /deep/ .item .item__input .el-input__inner{
+ font-size: 14px;
+ }
+ .item .item__txt{
+ display: none;
+ /*box-sizing: border-box;*/
+ /*padding: 0 15px;*/
+ /*height: 36px;*/
+ /*line-height: 36px;*/
+ /*font-size: 14px;*/
+ /* border: 1px solid transparent;*/
+ }
+ /deep/ .item .el-input--medium .el-input__inner{
+ /*display: none;*/
+ width: 140px;
+ }
+ /deep/ .is-center{
+ font-size: 14px;
+ }
+ .btn{
+ text-align: center;
+ margin-top: 50px;
+ }
+ .btns{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
+</style>
diff --git a/src/views/hiddenDangerManagement/fillRectificationAdd.vue b/src/views/hiddenDangerManagement/fillRectificationAdd.vue
new file mode 100644
index 0000000..65f8106
--- /dev/null
+++ b/src/views/hiddenDangerManagement/fillRectificationAdd.vue
@@ -0,0 +1,230 @@
+<template>
+ <div class="app-container">
+ <div>
+ <Titlename title="自查隐患管理新增"></Titlename>
+ <div class="whole-form">
+ <el-form
+ :model="ruleForm"
+ :rules="rules"
+ ref="ruleForm"
+ label-width="150px"
+ class="demo-ruleForm"
+ style="margin: 0 14% 0 16%"
+ >
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查时间" prop="name">
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="班次" prop="name">
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查人" prop="name">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患单位">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患级别">
+ <!-- <el-input v-model="ruleForm.name"></el-input> -->
+ <el-select
+ v-model="ruleForm.elementAName"
+ style="width: 100%"
+ >
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患类别" >
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="限改时间">
+ <!--<el-input v-model="ruleForm.name"></el-input>-->
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="责任人">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="整改情况">
+ <!-- <el-input v-model="ruleForm.name"></el-input> -->
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="9" :offset="4">
+ <el-form-item label="业务科室：" prop="name">
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col> -->
+ </el-row>
+ <!-- <el-row>
+ <el-col :span="22">
+ <el-form-item label="行走路线：" prop="name">
+ <el-input v-model="ruleForm.name" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row> -->
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患地点" >
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患内容" >
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="整改措施">
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="关联危险源" >
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center">
+ <el-button type="primary" class="btns" @click="submitForm('ruleForm')"
+ >保存</el-button
+ >
+ <el-button @click="close()">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import Titlename from "../../components/Titlename/index.vue";
+
+export default {
+ components: { Titlename },
+ name: "hiddenDangerList",
+ data() {
+ return {
+ ruleForm: {
+ name: "",
+ region: "",
+ date1: "",
+ date2: "",
+ delivery: false,
+ type: [],
+ resource: "",
+ value1: "",
+ desc: "",
+ },
+ rules: {
+ name: [
+ { required: true, message: '请输入活动名称', trigger: 'blur' },
+ ],
+ },
+ tableData: [
+ {
+ date: " 1",
+ name: "超级管理员",
+ province: "2022-04-07 16:10:27",
+ city: "",
+ address: "已发送众泰煤焦化安全环保部",
+ },
+ {
+ date: " 1",
+ name: "超级管理员",
+ province: "2022-04-07 16:10:27",
+ city: "",
+ address: "已发送众泰煤焦化安全环保部",
+ },
+ {
+ date: " 1",
+ name: "超级管理员",
+ province: "2022-04-07 16:10:27",
+ city: "",
+ address: "已发送众泰煤焦化安全环保部",
+ },
+ ],
+ };
+ },
+ methods: {
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ alert("submit!");
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ },
+};
+</script>
+
+<style scoped>
+.app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+}
+
+.app-container /deep/ .box {
+ padding-top: 0;
+}
+
+/* /deep/ .multiline .el-input__inner {
+ height: 62px;
+} */
+ .btns{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/hiddenDangerManagement/index.vue b/src/views/hiddenDangerManagement/index.vue
new file mode 100644
index 0000000..b6a1b2f
--- /dev/null
+++ b/src/views/hiddenDangerManagement/index.vue
@@ -0,0 +1,405 @@
+<template>
+ <div class="app-container">
+ <el-form
+ ref="form"
+ :inline="true"
+ class="inquire"
+ :model="form"
+ label-width="80px"
+ >
+ <el-form-item label="编号">
+ <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="检查单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item> -->
+ <el-form-item label="检查人">
+ <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="隐患部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item> -->
+ <el-form-item label="隐患类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患级别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患来源">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="班次">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="是否关联">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="录入人">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item> -->
+ <el-form-item label="检查时间">
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-col>
+ <el-col style="text-align: center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="限改时间">
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-col>
+ <el-col style="text-align: center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item style="text-align: center; padding: 0 50px">
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search"
+ >查询</el-button
+ >
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2"
+ >导出excel</el-button
+ >
+ </el-form-item>
+ </el-form>
+ <el-row class="title-center">
+ <el-col :span="7">
+ <el-radio-group v-model="radio1">
+ <el-radio-button label="未整改"></el-radio-button>
+ <el-radio-button label="整改完成"></el-radio-button>
+ </el-radio-group>
+ </el-col>
+ <el-col :span="10">
+ <el-form ref="form" :inline="true" :model="form" label-width="100px">
+ <el-form-item label="EXCEL导入">
+ <el-input v-model="form.name" placeholder="未选择文件"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="small" class="btns"
+ >选择文件</el-button
+ >
+ <el-button
+ type="primary"
+ class="btns"
+ size="small"
+ icon="el-icon-bottom"
+ >导入</el-button
+ >
+ <el-button
+ type="primary"
+ class="btns"
+ size="small"
+ icon="el-icon-download"
+ >下载模板</el-button
+ >
+ </el-form-item>
+ </el-form>
+ </el-col>
+ <el-col :span="7" style="text-align: right">
+ <el-button
+ class="btns"
+ type="primary"
+ size="small"
+ @click="fillRectification()"
+ >填写整改</el-button
+ >
+ <el-button
+ class="btns"
+ type="primary"
+ size="small"
+ @click="fillInspector()"
+ >填写督查</el-button
+ >
+ <el-button class="btns" type="primary" icon="el-icon-plus" @click="jump" size="small"
+ >添加</el-button
+ >
+ <el-button size="small"
+ >批量删除</el-button
+ >
+
+ </el-col>
+ </el-row>
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="date"
+ label="编号"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="隐患单位"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查人"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <!-- <el-table-column prop="date" label="检查类别" align="center">
+ </el-table-column> -->
+ <el-table-column label="隐患项目" align="center">
+ <el-table-column label="检查时间" width="120" sortable align="center">
+ </el-table-column>
+ <el-table-column label="地点" align="center"> </el-table-column>
+ <el-table-column label="内容" align="center"> </el-table-column>
+ <el-table-column label="类别" align="center"> </el-table-column>
+ <el-table-column label="级别" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="整改计划" align="center">
+ <el-table-column label="整改措施" align="center"> </el-table-column>
+ <!-- <el-table-column label="隐患部门" align="center"> </el-table-column> -->
+ <el-table-column label="责任人" align="center"> </el-table-column>
+ <el-table-column label="限改时间" width="120" sortable align="center">
+ </el-table-column>
+ <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
+ </el-table-column>
+ <el-table-column label="整改情况" align="center">
+ <el-table-column label="完成时间" sortable width="110px" align="center"> </el-table-column>
+ <!-- <el-table-column label="复查结果" align="center"> </el-table-column> -->
+ <el-table-column label="复查人" align="center"> </el-table-column>
+ <el-table-column label="复查时间" width="120" sortable align="center">
+ </el-table-column>
+ </el-table-column>
+ <!-- <el-table-column label="隐患处理状态" align="center"> </el-table-column> -->
+ <el-table-column label="是否关联" align="center"> </el-table-column>
+ <!-- <el-table-column label="风险等级" align="center"> </el-table-column> -->
+ <el-table-column label="初始警情" align="center"> </el-table-column>
+ <el-table-column label="当前警情" align="center"> </el-table-column>
+ <!-- <el-table-column label="流程操作" align="center"> </el-table-column> -->
+ <el-table-column label="基本操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
+ <el-button type="text" size="small">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+ </div>
+</template>
+<script>
+export default {
+ data() {
+ return {
+ form: {},
+ radio1: "未整改",
+ options: [
+ {
+ value: "选项1",
+ label: "黄金糕",
+ },
+ {
+ value: "选项2",
+ label: "双皮奶",
+ },
+ {
+ value: "选项3",
+ label: "蚵仔煎",
+ },
+ {
+ value: "选项4",
+ label: "龙须面",
+ },
+ {
+ value: "选项5",
+ label: "北京烤鸭",
+ },
+ ],
+ tableData: [
+
+ ],
+ pageSize: 10,
+ recordTotal: 0,
+ currentPage: 1,
+ };
+ },
+ methods:{
+ handleClick(data){
+
+ },
+ jump(){
+ this.$router.push({
+ path:"/fillRectificationAdd"
+ })
+ },
+ fillRectification(){
+ this.$router.push({
+ path:"/fillRectification"
+ })
+ },
+ fillInspector(){
+ this.$router.push({
+ path:"/fillInspector"
+ })
+ window.open(href, '_blank');
+ },
+ }
+};
+</script>
+<style scoped>
+.inquire {
+ display: flex;
+ justify-content: left;
+ flex-wrap: wrap;
+}
+.inquire .el-form-item {
+ padding: 0 46px;
+}
+.title-center {
+ padding: 20px 0;
+}
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+.title-center /deep/ .el-radio-button:first-child .el-radio-button__inner{
+ border: none;
+}
+.title-center /deep/ .el-radio-button__inner{
+ border: none;
+ border-radius: 0px;
+}
+.title-center /deep/ .el-radio-button__orig-radio:checked+.el-radio-button__inner{
+ background-color: #034ea2;background-color: #034ea2;
+}
+</style>
+
diff --git a/src/views/hiddenDangerRectification/applicationForExtension.vue b/src/views/hiddenDangerRectification/applicationForExtension.vue
new file mode 100644
index 0000000..cb23bd2
--- /dev/null
+++ b/src/views/hiddenDangerRectification/applicationForExtension.vue
@@ -0,0 +1,160 @@
+<template>
+ <div class="app-container">
+ <div style="">
+ <Titlename title="申请延期"></Titlename>
+ <div class="whole-form">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
+ style="margin: 0 14% 0 16%;">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="申请限改时间：" prop="name">
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="附件上传" prop="desc">
+ <el-upload
+ class="upload-demo"
+ ref="upload"
+ action="https://jsonplaceholder.typicode.com/posts/"
+ :on-preview="handlePreview"
+ :on-remove="handleRemove"
+ :file-list="fileList"
+ :before-upload="beforeUpload"
+ :auto-upload="true">
+ <el-button slot="trigger" size="small" type="primary" class="btn">选择文件</el-button>
+ <div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc">
+ <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center;">
+ <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button size="small" @click="close()">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+ import Titlename from "../../components/Titlename/index.vue";
+
+ export default {
+ components: {Titlename},
+ name: "applicationForExtension",
+ data() {
+ return {
+ ruleForm: {
+ name: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ value1: '',
+ desc: ''
+ },
+ rules: {},
+ tableData: [{
+ date: ' 1',
+ name: '超级管理员',
+ province: '2022-04-07 16:10:27',
+ city: '',
+ address: '已发送众泰煤焦化安全环保部',
+ }, {
+ date: ' 1',
+ name: '超级管理员',
+ province: '2022-04-07 16:10:27',
+ city: '',
+ address: '已发送众泰煤焦化安全环保部',
+ }, {
+ date: ' 1',
+ name: '超级管理员',
+ province: '2022-04-07 16:10:27',
+ city: '',
+ address: '已发送众泰煤焦化安全环保部',
+ }],
+ fileList: [],
+
+ };
+ },
+ methods: {
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ alert('submit!');
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerRectification"
+ })
+ }
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+ }
+ /deep/ .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+ }
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
+</style>
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
new file mode 100644
index 0000000..9f6e594
--- /dev/null
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -0,0 +1,412 @@
+<template>
+ <div class="app-container">
+<el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+ <el-form-item label="编号">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="检查单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查人">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患级别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="班次">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="是否关联">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="录入人">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item> -->
+ <el-form-item label="检查时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="限改时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item style="text-align:center;padding:0 50px">
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search">查询</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+ </el-form-item>
+ </el-form>
+ <el-row class="title-center">
+ <!-- <el-col :span="10">
+ <el-radio-group v-model="radio1">
+ <el-radio-button label="上海"></el-radio-button>
+ <el-radio-button label="北京"></el-radio-button>
+ <el-radio-button label="广州"></el-radio-button>
+ </el-radio-group>
+ </el-col> -->
+ <el-col :span="24" style="text-align:right;">
+ <el-button class="btns" type="primary" size="small" @click="dialogVisible=true">申请延期</el-button>
+ </el-col>
+ </el-row>
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="date"
+ label="编号"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查部门"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查人"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column prop="date" label="检查类别" align="center">
+ </el-table-column>
+ <el-table-column label="隐患项目" align="center">
+ <el-table-column label="检查时间" width="120" sortable align="center">
+ </el-table-column>
+ <el-table-column label="地点" align="center"> </el-table-column>
+ <el-table-column label="内容" align="center"> </el-table-column>
+ <el-table-column label="类别" align="center"> </el-table-column>
+ <el-table-column label="级别" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="整改计划" align="center">
+ <el-table-column label="整改措施" align="center"> </el-table-column>
+ <el-table-column label="隐患部门" align="center"> </el-table-column>
+ <el-table-column label="责任人" align="center"> </el-table-column>
+ <el-table-column label="限改时间" width="120" sortable align="center">
+ </el-table-column>
+ <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
+ </el-table-column>
+ <el-table-column label="整改情况" align="center">
+ <el-table-column label="完成时间" sortable width="120" align="center"> </el-table-column>
+ <el-table-column label="复查结果" align="center"> </el-table-column>
+ <el-table-column label="复查人" align="center"> </el-table-column>
+ <el-table-column label="复查时间" width="120" sortable align="center">
+ </el-table-column>
+ <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
+ </el-table-column>
+ <el-table-column label="隐患处理状态" align="center"> </el-table-column>
+ <el-table-column label="是否关联" align="center"> </el-table-column>
+ <el-table-column label="风险等级" align="center"> </el-table-column>
+ <el-table-column label="初始警情" align="center"> </el-table-column>
+ <el-table-column label="当前警情" align="center"> </el-table-column>
+ <el-table-column label="流程操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!--申请延期弹窗-->
+ <el-dialog
+ title="提示"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ width="30%"
+ :before-close="handleClose">
+ <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+ <el-row>
+ <el-col :span="16" :offset="3">
+ <el-form-item label="申请限改时间" prop="name">
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ :disabled="true"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="16" :offset="3">
+ <el-form-item label="附件上传" prop="desc">
+ <el-upload
+ class="upload-demo"
+ ref="upload"
+ action="https://jsonplaceholder.typicode.com/posts/"
+ :on-preview="handlePreview"
+ :on-remove="handleRemove"
+ :file-list="fileList"
+ :before-upload="beforeUpload"
+ :auto-upload="true">
+ <el-button slot="trigger" size="small" type="primary" class="btns">选择文件</el-button>
+ <div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="16" :offset="3">
+ <el-form-item label="备注" prop="desc">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <div style="text-align: center">
+ <el-button class="btns" size="small" type="primary" @click="dialogVisible = false">保存</el-button>
+ <el-button size="small" @click="dialogVisible = false">关闭</el-button>
+ </div>
+ </el-form>
+ </el-dialog>
+ <!--申请延期弹窗-->
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+ </div>
+</template>
+<script>
+export default {
+ data() {
+ return {
+ form:{},
+ radio1: '上海',
+ options: [{
+ value: '选项1',
+ label: '黄金糕'
+ }, {
+ value: '选项2',
+ label: '双皮奶'
+ }, {
+ value: '选项3',
+ label: '蚵仔煎'
+ }, {
+ value: '选项4',
+ label: '龙须面'
+ }, {
+ value: '选项5',
+ label: '北京烤鸭'
+ }],
+ tableData: [{
+ date: '2016-05-02',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1518 弄'
+ }, {
+ date: '2016-05-04',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1517 弄'
+ }, {
+ date: '2016-05-01',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1519 弄'
+ }, {
+ date: '2016-05-03',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1516 弄'
+ }],
+ dialogVisible: false,
+ ruleForm: {
+ name: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ value1: '',
+ desc: ''
+ },
+ rules: {},
+ fileList: [],
+
+ pageSize: 10,
+ recordTotal: 0,
+ currentPage: 1,
+ };
+ },
+ methods:{
+ // 发送隐患单跳转
+ handleClick(){
+ this.$router.push({
+ path:"/sendHiddenDangerList"
+ })
+ },
+
+ // applicationExtension(){
+ // this.$router.push({
+ // path:"/applicationForExtension"
+ // })
+ // },
+ handleClose(done) {
+ this.$confirm('确认关闭？')
+ .then(_ => {
+ done();
+ })
+ .catch(_ => {});
+ },
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ }
+};
+</script>
+<style>
+.inquire{
+ display: flex;
+ justify-content:left;
+ flex-wrap: wrap;
+}
+.inquire .el-form-item{
+ padding: 0 46px;
+}
+.title-center{
+ padding: 20px 0;
+}
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+/deep/ .el-dialog .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+}
+/deep/.el-dialog .button .el-form-item__content{
+ margin-left: 0;
+}
+ .textarea{
+ max-height: 70px;
+ overflow-y: auto;
+ }
+</style>
diff --git a/src/views/accidentHidden/hiddenDangerList.vue b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
similarity index 67%
copy from src/views/accidentHidden/hiddenDangerList.vue
copy to src/views/hiddenDangerRectification/sendHiddenDangerList.vue
index 7bdf847..0fa02ce 100644
--- a/src/views/accidentHidden/hiddenDangerList.vue
+++ b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue
@@ -7,12 +7,12 @@
style="margin: 0 14% 0 16%;">
<el-row>
<el-col :span="9">
- <el-form-item label="隐患编号：" prop="name">
+ <el-form-item label="隐患编号" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="检查单位：" prop="elementAName">
+ <el-form-item label="检查单位" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -24,7 +24,7 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查人：" prop="region">
+ <el-form-item label="检查人" prop="region">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
<!-- <el-select-->
<!-- v-model="ruleForm.elementAName"-->
@@ -35,14 +35,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="陪检人员：" prop="name">
+ <el-form-item label="陪检人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查时间：" prop="name">
+ <el-form-item label="检查时间" prop="name">
<el-date-picker
v-model="value1"
type="date"
@@ -56,7 +56,7 @@
<!-- <el-form-item label="班次：" prop="name">-->
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<!-- </el-form-item>-->
- <el-form-item label="班次：" prop="elementAName">
+ <el-form-item label="班次" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -68,26 +68,26 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="跟班、带班情况：" prop="name">
+ <el-form-item label="跟班、带班情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="跟班、带班人员：" prop="name">
+ <el-form-item label="跟班、带班人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="行走路线：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="行走路线" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患单位：" prop="name">
+ <el-form-item label="隐患单位" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -98,7 +98,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患部门：" prop="name">
+ <el-form-item label="隐患部门" prop="name">
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -111,21 +111,21 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患地点：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患地点" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患内容：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患内容" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患类别：" prop="name">
+ <el-form-item label="隐患类别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -136,7 +136,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患级别：" prop="name">
+ <el-form-item label="隐患级别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -149,19 +149,19 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="整改措施：" prop="name">
+ <el-form-item label="整改措施" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="所需资金：" prop="name">
+ <el-form-item label="所需资金" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="限改时间：" prop="name">
+ <el-form-item label="限改时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -173,14 +173,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="责任人：" prop="name">
+ <el-form-item label="责任人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
+ <el-form-item label="完成时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -192,14 +192,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改完成情况：" prop="name">
+ <el-form-item label="整改完成情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间：" prop="name">
+ <el-form-item label="复查时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -211,33 +211,33 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="复查人：" prop="name">
+ <el-form-item label="复查人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查结果：" prop="name">
+ <el-form-item label="复查结果" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改次数：" prop="name">
+ <el-form-item label="整改次数" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="危险源：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="危险源" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="风险等级：" prop="name">
+ <el-form-item label="风险等级" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -248,7 +248,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="业务科室：" prop="name">
+ <el-form-item label="业务科室" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -261,10 +261,11 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="流程信息：" prop="name">
+ <el-form-item label="流程信息" prop="name">
<!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
<el-table
:data="tableData"
+ border
style="width: 100%">
<el-table-column
prop="date"
@@ -274,25 +275,25 @@
</el-table-column>
<el-table-column
prop="name"
- label="操作人："
+ label="操作人"
align="center"
- width="139">
+ width="138">
</el-table-column>
<el-table-column
prop="province"
- label="处理时间："
+ label="处理时间"
align="center"
width="200">
</el-table-column>
<el-table-column
prop="city"
- label="审批意见："
+ label="审批意见"
align="center"
width="260">
</el-table-column>
<el-table-column
prop="address"
- label="流程信息："
+ label="流程信息"
align="center"
width="170">
</el-table-column>
@@ -302,17 +303,17 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="发送流程：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="发送流程" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="下一步：" prop="name">
+ <el-form-item label="是否发送" prop="name">
<el-radio-group v-model="ruleForm.safetyInspectionItemResult">
- <el-radio :label="0">申请复查</el-radio>
- <el-radio :label="1">不接受,返回安全环保部</el-radio>
+ <el-radio :label="0">通过</el-radio>
+ <el-radio :label="1">不通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -321,45 +322,79 @@
v-if="ruleForm.safetyInspectionItemResult == 0">
<el-row>
<el-col :span="9">
- <el-form-item label="落实责任人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="选择复查单位/人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" clearable v-model="ruleForm.reviewResults"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <div
+ v-else="ruleForm.safetyInspectionItemResult == 1">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="9">
- <el-form-item label="所需资金：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" v-model="ruleForm.reviewResults1"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc1">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc1"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="22">
- <el-form-item label="备注" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button size="small" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -375,7 +410,7 @@
export default {
components: {Titlename},
- name: "hiddenDangerList",
+ name: "sendHiddenDangerList",
data() {
return {
ruleForm: {
@@ -387,9 +422,21 @@
type: [],
resource: '',
value1: '',
- desc: ''
+ desc: '',
+ rechecker:'',
+ reviewTime:'',
+ reviewResults:'',
+ rechecker1:'',
+ reviewTime1:'',
+ reviewResults1:'',
+ desc1:''
},
- rules: {},
+ rules: {
+ reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
+ rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
+ reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
+ desc1: { required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur' },
+ },
tableData: [{
date: ' 1',
name: '超级管理员',
@@ -409,6 +456,8 @@
city: '',
address: '已发送众泰煤焦化安全环保部',
}],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
};
},
methods: {
@@ -422,6 +471,27 @@
}
});
},
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerRectification"
+ })
+ }
}
}
</script>
@@ -440,4 +510,23 @@
/deep/ .multiline .el-input__inner {
height: 62px;
}
+ /deep/ .textarea .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+ }
+ /deep/ .textarea2 .el-textarea__inner{
+ height: 100px;
+ max-height: 100px;
+ overflow-y: auto
+ }
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
</style>
diff --git a/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
new file mode 100644
index 0000000..0d062cc
--- /dev/null
+++ b/src/views/hiddenDangerRegistration/hiddenDangerAdd.vue
@@ -0,0 +1,258 @@
+<template>
+ <div class="app-container">
+ <div style="">
+ <Titlename title="隐患等级下达新增"></Titlename>
+ <div class="whole-form">
+ <el-form
+ :model="ruleForm"
+ :rules="rules"
+ ref="ruleForm"
+ label-width="150px"
+ class="demo-ruleForm"
+ style="margin: 0 14% 0 16%"
+ >
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查时间" prop="name">
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="班次" prop="name">
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查类别">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="检查单位" prop="name">
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查人员" prop="region">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="陪检人员">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患部门">
+ <el-input v-model="ruleForm.name"></el-input>
+ <!-- <el-select
+ v-model="ruleForm.elementAName"
+ style="width: 100%"
+ >
+ </el-select> -->
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患类别">
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="风险等级">
+ <!-- <el-input v-model="ruleForm.name"></el-input> -->
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患级别">
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="限改时间">
+ <!--<el-input v-model="ruleForm.name"></el-input>-->
+ <el-date-picker
+ v-model="value1"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="责任人">
+ <el-input v-model="ruleForm.name"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="整改情况">
+ <!-- <el-input v-model="ruleForm.name"></el-input> -->
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="业务科室">
+ <el-select v-model="ruleForm.elementAName" style="width: 100%">
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="行走路线">
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="地点">
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="隐患内容">
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="整改措施" >
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="关联危险源">
+ <el-input v-model="ruleForm.name" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item style="text-align: center">
+ <el-button type="primary" class="btns" @click="submitForm('ruleForm')"
+ >保存</el-button
+ >
+ <el-button @click="close()">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+import Titlename from "../../components/Titlename/index.vue";
+
+export default {
+ components: { Titlename },
+ name: "hiddenDangerList",
+ data() {
+ return {
+ ruleForm: {
+ name: "",
+ region: "",
+ date1: "",
+ date2: "",
+ delivery: false,
+ type: [],
+ resource: "",
+ value1: "",
+ desc: "",
+ },
+ rules: {
+ name: [
+ { required: true, message: '请输入活动名称', trigger: 'blur' },
+ ],
+ },
+ tableData: [
+ {
+ date: " 1",
+ name: "超级管理员",
+ province: "2022-04-07 16:10:27",
+ city: "",
+ address: "已发送众泰煤焦化安全环保部",
+ },
+ {
+ date: " 1",
+ name: "超级管理员",
+ province: "2022-04-07 16:10:27",
+ city: "",
+ address: "已发送众泰煤焦化安全环保部",
+ },
+ {
+ date: " 1",
+ name: "超级管理员",
+ province: "2022-04-07 16:10:27",
+ city: "",
+ address: "已发送众泰煤焦化安全环保部",
+ },
+ ],
+ };
+ },
+ methods: {
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ alert("submit!");
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ },
+};
+</script>
+
+<style scoped>
+.app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+}
+
+.app-container /deep/ .box {
+ padding-top: 0;
+}
+
+/* /deep/ .multiline .el-input__inner {
+ height: 62px;
+} */
+ .btns{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/accidentHidden/hiddenDangerList.vue b/src/views/hiddenDangerRegistration/hiddenDangerList.vue
similarity index 67%
copy from src/views/accidentHidden/hiddenDangerList.vue
copy to src/views/hiddenDangerRegistration/hiddenDangerList.vue
index 7bdf847..a0c57b9 100644
--- a/src/views/accidentHidden/hiddenDangerList.vue
+++ b/src/views/hiddenDangerRegistration/hiddenDangerList.vue
@@ -1,18 +1,18 @@
<template>
<div class="app-container">
- <div style="">
+ <div>
<Titlename title="发送隐患单"></Titlename>
<div class="whole-form">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" class="demo-ruleForm"
style="margin: 0 14% 0 16%;">
<el-row>
<el-col :span="9">
- <el-form-item label="隐患编号：" prop="name">
+ <el-form-item label="隐患编号" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="检查单位：" prop="elementAName">
+ <el-form-item label="检查单位" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -24,7 +24,7 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查人：" prop="region">
+ <el-form-item label="检查人" prop="region">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
<!-- <el-select-->
<!-- v-model="ruleForm.elementAName"-->
@@ -35,14 +35,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="陪检人员：" prop="name">
+ <el-form-item label="陪检人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查时间：" prop="name">
+ <el-form-item label="检查时间" prop="name">
<el-date-picker
v-model="value1"
type="date"
@@ -56,7 +56,7 @@
<!-- <el-form-item label="班次：" prop="name">-->
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<!-- </el-form-item>-->
- <el-form-item label="班次：" prop="elementAName">
+ <el-form-item label="班次" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -68,26 +68,26 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="跟班、带班情况：" prop="name">
+ <el-form-item label="跟班、带班情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="跟班、带班人员：" prop="name">
+ <el-form-item label="跟班、带班人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="行走路线：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="行走路线" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患单位：" prop="name">
+ <el-form-item label="隐患单位" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -98,7 +98,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患部门：" prop="name">
+ <el-form-item label="隐患部门" prop="name">
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -111,21 +111,21 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患地点：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患地点" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患内容：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患内容" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患类别：" prop="name">
+ <el-form-item label="隐患类别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -136,7 +136,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患级别：" prop="name">
+ <el-form-item label="隐患级别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -149,19 +149,19 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="整改措施：" prop="name">
+ <el-form-item label="整改措施" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="所需资金：" prop="name">
+ <el-form-item label="所需资金" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="限改时间：" prop="name">
+ <el-form-item label="限改时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -173,14 +173,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="责任人：" prop="name">
+ <el-form-item label="责任人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
+ <el-form-item label="完成时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -192,14 +192,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改完成情况：" prop="name">
+ <el-form-item label="整改完成情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间：" prop="name">
+ <el-form-item label="复查时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -211,33 +211,33 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="复查人：" prop="name">
+ <el-form-item label="复查人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查结果：" prop="name">
+ <el-form-item label="复查结果" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改次数：" prop="name">
+ <el-form-item label="整改次数" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="危险源：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="危险源" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="风险等级：" prop="name">
+ <el-form-item label="风险等级" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -248,7 +248,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="业务科室：" prop="name">
+ <el-form-item label="业务科室" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -261,10 +261,11 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="流程信息：" prop="name">
+ <el-form-item label="流程信息" prop="name">
<!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
<el-table
:data="tableData"
+ border
style="width: 100%">
<el-table-column
prop="date"
@@ -274,25 +275,25 @@
</el-table-column>
<el-table-column
prop="name"
- label="操作人："
+ label="操作人"
align="center"
- width="139">
+ width="138">
</el-table-column>
<el-table-column
prop="province"
- label="处理时间："
+ label="处理时间"
align="center"
width="200">
</el-table-column>
<el-table-column
prop="city"
- label="审批意见："
+ label="审批意见"
align="center"
width="260">
</el-table-column>
<el-table-column
prop="address"
- label="流程信息："
+ label="流程信息"
align="center"
width="170">
</el-table-column>
@@ -302,17 +303,17 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="发送流程：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="发送流程" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="下一步：" prop="name">
+ <el-form-item label="是否发送" prop="name">
<el-radio-group v-model="ruleForm.safetyInspectionItemResult">
- <el-radio :label="0">申请复查</el-radio>
- <el-radio :label="1">不接受,返回安全环保部</el-radio>
+ <el-radio :label="0">通过</el-radio>
+ <el-radio :label="1">不通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -321,45 +322,80 @@
v-if="ruleForm.safetyInspectionItemResult == 0">
<el-row>
<el-col :span="9">
- <el-form-item label="落实责任人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="选择复查单位/人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" clearable v-model="ruleForm.reviewResults"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <div
+ v-else="ruleForm.safetyInspectionItemResult == 1">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="9">
- <el-form-item label="所需资金：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" v-model="ruleForm.reviewResults1"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc1">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc1"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="22">
- <el-form-item label="备注" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" size="small" @click="submitForm('ruleForm')" type="primary">保存</el-button>
+ <el-button size="small" @click="close()"
+ >删除</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -387,9 +423,21 @@
type: [],
resource: '',
value1: '',
- desc: ''
+ desc: '',
+ rechecker:'',
+ reviewTime:'',
+ reviewResults:'',
+ rechecker1:'',
+ reviewTime1:'',
+ reviewResults1:'',
+ desc1:''
},
- rules: {},
+ rules: {
+ reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
+ rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
+ reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
+ desc1: { required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur' },
+ },
tableData: [{
date: ' 1',
name: '超级管理员',
@@ -409,6 +457,8 @@
city: '',
address: '已发送众泰煤焦化安全环保部',
}],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
};
},
methods: {
@@ -422,6 +472,27 @@
}
});
},
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/hiddenDangerRegistration"
+ })
+ }
}
}
</script>
@@ -440,4 +511,23 @@
/deep/ .multiline .el-input__inner {
height: 62px;
}
+ /deep/ .textarea .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+ }
+ /deep/ .textarea2 .el-textarea__inner{
+ height: 100px;
+ max-height: 100px;
+ overflow-y: auto
+ }
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
</style>
diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue
new file mode 100644
index 0000000..0e73bba
--- /dev/null
+++ b/src/views/hiddenDangerRegistration/index.vue
@@ -0,0 +1,371 @@
+<template>
+ <div class="app-container">
+ <el-form
+ ref="form"
+ :inline="true"
+ class="inquire"
+ :model="form"
+ label-width="80px"
+ >
+ <el-form-item label="编号">
+ <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="检查单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查人">
+ <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患级别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="form.name" style="width: 202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="班次">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="是否关联">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="录入人">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查时间">
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-col>
+ <el-col style="text-align: center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="限改时间">
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-col>
+ <el-col style="text-align: center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker
+ type="date"
+ placeholder="选择日期"
+ v-model="form.date1"
+ style="width: 100%"
+ ></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item style="text-align: center; padding: 0 50px">
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search"
+ >查询</el-button
+ >
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2"
+ >导出excel</el-button
+ >
+ </el-form-item>
+ </el-form>
+ <el-row class="title-center">
+ <el-col :span="14">
+ <el-form ref="form" :inline="true" :model="form" label-width="100px">
+ <el-form-item label="EXCEL导入">
+ <el-input v-model="form.name" placeholder="未选择文件"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="small" class="btns"
+ >选择文件</el-button
+ >
+ <el-button
+ type="primary"
+ class="btns"
+ size="small"
+ icon="el-icon-bottom"
+ >导入</el-button
+ >
+ <el-button
+ type="primary"
+ class="btns"
+ size="small"
+ icon="el-icon-download"
+ >下载模板</el-button
+ >
+ </el-form-item>
+ </el-form>
+ </el-col>
+ <el-col :span="10" style="text-align: right">
+ <el-button
+ class="btns"
+ type="primary"
+ size="small"
+ >批量发送</el-button
+ >
+ <el-button class="btns" @click="jump" type="primary" icon="el-icon-plus" size="small"
+ >添加</el-button
+ >
+ <el-button size="small"
+ >删除</el-button
+ >
+
+ </el-col>
+ </el-row>
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="date"
+ label="编号"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查部门"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查人"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column prop="date" label="检查类别" align="center">
+ </el-table-column>
+ <el-table-column label="隐患项目" align="center">
+ <el-table-column label="检查时间" width="120" sortable align="center">
+ </el-table-column>
+ <el-table-column label="地点" align="center"> </el-table-column>
+ <el-table-column label="内容" align="center"> </el-table-column>
+ <el-table-column label="类别" align="center"> </el-table-column>
+ <el-table-column label="级别" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="整改计划" align="center">
+ <el-table-column label="整改措施" align="center"> </el-table-column>
+ <el-table-column label="隐患部门" align="center"> </el-table-column>
+ <el-table-column label="责任人" align="center"> </el-table-column>
+ <el-table-column label="限改时间" width="120" sortable align="center">
+ </el-table-column>
+ <el-table-column label="级别" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="整改情况" align="center">
+ <el-table-column label="完成时间" width="110px" sortable align="center"> </el-table-column>
+ <el-table-column label="复查结果" align="center"> </el-table-column>
+ <el-table-column label="复查人" align="center"> </el-table-column>
+ <el-table-column label="复查时间" width="120" sortable align="center">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="隐患处理状态" align="center"> </el-table-column>
+ <el-table-column label="是否关联" align="center"> </el-table-column>
+ <el-table-column label="风险等级" align="center"> </el-table-column>
+ <el-table-column label="初始警情" align="center"> </el-table-column>
+ <el-table-column label="当前警情" align="center"> </el-table-column>
+ <el-table-column label="流程操作" align="center"> </el-table-column>
+ <el-table-column label="基本操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+ </div>
+</template>
+<script>
+export default {
+ data() {
+ return {
+ form: {},
+ options: [
+ {
+ value: "选项1",
+ label: "黄金糕",
+ },
+ {
+ value: "选项2",
+ label: "双皮奶",
+ },
+ {
+ value: "选项3",
+ label: "蚵仔煎",
+ },
+ {
+ value: "选项4",
+ label: "龙须面",
+ },
+ {
+ value: "选项5",
+ label: "北京烤鸭",
+ },
+ ],
+ tableData: [{
+ date:"2016-05-04",
+ }],
+ pageSize: 10,
+ recordTotal: 0,
+ currentPage: 1,
+ };
+ },
+ methods:{
+ jump(){
+ this.$router.push({
+ path:"/hiddenDangerAdd"
+ })
+ },
+ // 发送隐患单跳转
+ handleClick(){
+ this.$router.push({
+ path:"/hiddenDangerList",
+
+ })
+ },
+ }
+};
+</script>
+<style>
+.inquire {
+ display: flex;
+ justify-content: left;
+ flex-wrap: wrap;
+}
+.inquire .el-form-item {
+ padding: 0 46px;
+}
+.title-center {
+ padding: 20px 0;
+}
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+</style>
diff --git a/src/views/hiddenDangerRegistration/listAssociatedHazards.vue b/src/views/hiddenDangerRegistration/listAssociatedHazards.vue
new file mode 100644
index 0000000..5fd4d1b
--- /dev/null
+++ b/src/views/hiddenDangerRegistration/listAssociatedHazards.vue
@@ -0,0 +1,246 @@
+<template>
+ <div class="app-container">
+ <div>
+ <Titlename title="列表页面"></Titlename>
+ <div class="whole">
+ <div class="left-tree">
+ <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+ </div>
+ <div class="right">
+ <el-form ref="form" :model="form" label-width="100px">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="风险点名称：">
+ <el-input v-model="form.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="事故类型：">
+ <el-input v-model="form.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="主要危险源：">
+ <el-input v-model="form.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item>
+ <el-button class="btn" type="primary" @click="onSubmit">查询</el-button>
+ <el-button class="btn" type="primary">确定</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <el-table
+ ref="multipleTable"
+ :data="tableData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ align="center"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ label="风险点"
+ align="center"
+ show-overflow-tooltip
+ width="120">
+ <template slot-scope="scope">{{ scope.row.riskPoint }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="hazardSources"
+ show-overflow-tooltip
+ align="center"
+ label="主要危险源"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="accidentType"
+ align="center"
+ label="事故类型"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="riskLevel"
+ label="风险等级"
+ align="center"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="controlMeasures"
+ label="管控措施"
+ align="center"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="controlLevel"
+ align="center"
+ label="管控层级"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="responsibleUnit"
+ label="责任单位"
+ align="center"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ prop="personLiable"
+ label="责任人"
+ align="center"
+ show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+ import Titlename from "../../components/Titlename/index.vue";
+ export default {
+ components: {Titlename},
+ name: "listAssociatedHazards",
+ data(){
+ return{
+ data: [{
+ label: '一级 1',
+ children: [{
+ label: '二级 1-1',
+ children: [{
+ label: '三级 1-1-1'
+ }]
+ }]
+ }, {
+ label: '一级 2',
+ children: [{
+ label: '二级 2-1',
+ children: [{
+ label: '三级 2-1-1'
+ }]
+ }, {
+ label: '二级 2-2',
+ children: [{
+ label: '三级 2-2-1'
+ }]
+ }]
+ }, {
+ label: '一级 3',
+ children: [{
+ label: '二级 3-1',
+ children: [{
+ label: '三级 3-1-1'
+ }]
+ }, {
+ label: '二级 3-2',
+ children: [{
+ label: '三级 3-2-1'
+ }]
+ }]
+ }],
+ defaultProps: {
+ children: 'children',
+ label: 'label'
+ },
+ form: {
+ name: '',
+ region: '',
+ date1: '',
+ date2: '',
+ delivery: false,
+ type: [],
+ resource: '',
+ desc: ''
+ },
+ tableData: [{
+ riskPoint:'油库区动火作业',
+ hazardSources:'油库区为重大危险源，储存有粗苯，焦油、洗油、碱液等危险化学品，具有爆炸危险性和腐蚀性，在油库区进行动火作业时，安全措施落实不到位，可能引起中毒和窒息、火灾、爆炸、灼烫、触电、其他伤害。',
+ accidentType:'中毒和窒息、火灾、爆炸、灼烫、触电、其他伤害',
+ riskLevel:'重大风险',
+ controlMeasures:'1.工程技术措施：作业现场配备...',
+ controlLevel:'公司级',
+ responsibleUnit:'化产一车间',
+ personLiable:'冉玉新',
+ }, {
+ riskPoint:'粗苯储槽',
+ hazardSources:'粗苯极易燃烧爆炸，当粗苯在空气中达1.4-7.5%（体积）时将形成爆炸性的混合物，如果粗苯储槽泄漏，遇到明火可能造成火灾、爆炸、中毒和窒息。',
+ accidentType:'火灾、爆炸、中毒和窒息',
+ riskLevel:'重大风险',
+ controlMeasures:'1.工程技术措施：每年做一次防...',
+ controlLevel:'公司级',
+ responsibleUnit:'化产一车间',
+ personLiable:'侯冠秋',
+ }, {
+ riskPoint:'油库产品装车操作',
+ hazardSources:'油库装车产品为粗苯和焦油，操作过程不当可能造成火灾、爆炸、中毒、窒息事故。油库卸车原料为洗油、碱液，操作过程中可能造成触电、其他伤害事故。',
+ accidentType:'火灾、爆炸、中毒和窒息、触电、其他伤害',
+ riskLevel:'重大风险',
+ controlMeasures:'1.工程技术措施：配备装车静电...',
+ controlLevel:'公司级',
+ responsibleUnit:'化产一车间',
+ personLiable:'侯冠秋',
+ }],
+ multipleSelection: [],
+ pageSize: 10,
+ recordTotal: 0,
+ currentPage: 1,
+ }
+ },
+ methods: {
+ handleNodeClick(data) {
+ console.log(data);
+ },
+ onSubmit() {
+ console.log('submit!');
+ },
+ handleSelectionChange(val) {
+ this.multipleSelection = val;
+ }
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ padding: 20px;
+ height: 850px;
+ overflow-y: auto;
+ }
+ .whole{
+ display: flex;
+ flex-direction: row;
+ }
+ .left-tree{
+ width: 15%;
+ }
+ .right{
+ width: 85%;
+ }
+ .btn{
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ .el-button:hover {
+ background: #66b1ff;
+ border-color: #66b1ff;
+ color: #FFF;
+ }
+</style>
diff --git a/src/views/hiddenDangerReview/recheckCancellationNumber.vue b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
new file mode 100644
index 0000000..7a6d1e2
--- /dev/null
+++ b/src/views/hiddenDangerReview/recheckCancellationNumber.vue
@@ -0,0 +1,304 @@
+<template>
+ <div class="app-container">
+<el-form ref="form" :inline="true" class="inquire" :model="form" label-width="80px">
+ <el-form-item label="编号">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="检查单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查人">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患单位">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患部门">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患级别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查类别">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="form.name" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="班次">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="是否关联">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="录入人">
+ <el-select v-model="value" placeholder="请选择">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="检查时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="限改时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ <el-col style="text-align:center" :span="2">-</el-col>
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
+ </el-col>
+ </el-form-item>
+ <el-form-item style="text-align:center;padding:0 50px">
+ <el-button type="primary" class="btns" size="small" icon="el-icon-search">查询</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+ </el-form-item>
+ </el-form>
+ <el-row class="title-center">
+ <!-- <el-col :span="10">
+ <el-radio-group v-model="radio1">
+ <el-radio-button label="上海"></el-radio-button>
+ <el-radio-button label="北京"></el-radio-button>
+ <el-radio-button label="广州"></el-radio-button>
+ </el-radio-group>
+ </el-col> -->
+ <el-col :span="24" style="text-align:right;">
+ <el-button class="btns" type="primary" size="small">批量复查</el-button>
+ <el-button class="btns" type="primary" size="small">批量发送</el-button>
+ </el-col>
+ </el-row>
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ prop="date"
+ label="编号"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查部门"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="检查人"
+ align="center"
+ sortable
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column prop="date" label="检查类别" align="center">
+ </el-table-column>
+ <el-table-column label="隐患项目" align="center">
+ <el-table-column label="检查时间" width="120" sortable align="center">
+ </el-table-column>
+ <el-table-column label="地点" align="center"> </el-table-column>
+ <el-table-column label="内容" align="center"> </el-table-column>
+ <el-table-column label="类别" align="center"> </el-table-column>
+ <el-table-column label="级别" align="center"> </el-table-column>
+ </el-table-column>
+ <el-table-column label="整改计划" align="center">
+ <el-table-column label="整改措施" align="center"> </el-table-column>
+ <el-table-column label="隐患部门" align="center"> </el-table-column>
+ <el-table-column label="责任人" align="center"> </el-table-column>
+ <el-table-column label="限改时间" width="120" sortable align="center">
+ </el-table-column>
+ <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
+ </el-table-column>
+ <el-table-column label="整改情况" align="center">
+ <el-table-column label="完成时间" sortable width="120" align="center"> </el-table-column>
+ <el-table-column label="复查结果" align="center"> </el-table-column>
+ <el-table-column label="复查人" align="center"> </el-table-column>
+ <el-table-column label="复查时间" width="120" sortable align="center">
+ </el-table-column>
+ <!-- <el-table-column label="级别" align="center"> </el-table-column> -->
+ </el-table-column>
+ <el-table-column label="隐患处理状态" align="center"> </el-table-column>
+ <el-table-column label="是否关联" align="center"> </el-table-column>
+ <el-table-column label="风险等级" align="center"> </el-table-column>
+ <el-table-column label="初始警情" align="center"> </el-table-column>
+ <el-table-column label="当前警情" align="center"> </el-table-column>
+ <el-table-column label="流程操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">点击发送</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div style="text-align: right">
+ <el-pagination
+ v-show="recordTotal > 0"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="recordTotal"
+ >
+ </el-pagination>
+ </div>
+ </div>
+</template>
+<script>
+export default {
+ data() {
+ return {
+ form:{},
+ radio1: '上海',
+ options: [{
+ value: '选项1',
+ label: '黄金糕'
+ }, {
+ value: '选项2',
+ label: '双皮奶'
+ }, {
+ value: '选项3',
+ label: '蚵仔煎'
+ }, {
+ value: '选项4',
+ label: '龙须面'
+ }, {
+ value: '选项5',
+ label: '北京烤鸭'
+ }],
+ tableData: [{
+ date: '2016-05-02',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1518 弄'
+ }, {
+ date: '2016-05-04',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1517 弄'
+ }, {
+ date: '2016-05-01',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1519 弄'
+ }, {
+ date: '2016-05-03',
+ name: '王小虎',
+ address: '上海市普陀区金沙江路 1516 弄'
+ }],
+ pageSize: 10,
+ recordTotal: 0,
+ currentPage: 1,
+ };
+ },
+ methods:{
+ // 发送隐患单跳转
+ handleClick(){
+ this.$router.push({
+ path:"/recheckHiddenDangerList"
+ })
+ },
+ }
+};
+</script>
+<style>
+.inquire{
+ display: flex;
+ justify-content:left;
+ flex-wrap: wrap;
+}
+.inquire .el-form-item{
+ padding: 0 46px;
+}
+.title-center{
+ padding: 20px 0;
+}
+.btns {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+}
+</style>
diff --git a/src/views/accidentHidden/hiddenDangerList.vue b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
similarity index 67%
rename from src/views/accidentHidden/hiddenDangerList.vue
rename to src/views/hiddenDangerReview/recheckHiddenDangerList.vue
index 7bdf847..65c83af 100644
--- a/src/views/accidentHidden/hiddenDangerList.vue
+++ b/src/views/hiddenDangerReview/recheckHiddenDangerList.vue
@@ -7,12 +7,12 @@
style="margin: 0 14% 0 16%;">
<el-row>
<el-col :span="9">
- <el-form-item label="隐患编号：" prop="name">
+ <el-form-item label="隐患编号" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="检查单位：" prop="elementAName">
+ <el-form-item label="检查单位" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -24,7 +24,7 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查人：" prop="region">
+ <el-form-item label="检查人" prop="region">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
<!-- <el-select-->
<!-- v-model="ruleForm.elementAName"-->
@@ -35,14 +35,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="陪检人员：" prop="name">
+ <el-form-item label="陪检人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="检查时间：" prop="name">
+ <el-form-item label="检查时间" prop="name">
<el-date-picker
v-model="value1"
type="date"
@@ -53,10 +53,10 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <!-- <el-form-item label="班次：" prop="name">-->
+ <!-- <el-form-item label="班次" prop="name">-->
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<!-- </el-form-item>-->
- <el-form-item label="班次：" prop="elementAName">
+ <el-form-item label="班次" prop="elementAName">
<el-select
v-model="ruleForm.elementAName"
:disabled="true"
@@ -68,26 +68,26 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="跟班、带班情况：" prop="name">
+ <el-form-item label="跟班、带班情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="跟班、带班人员：" prop="name">
+ <el-form-item label="跟班、带班人员" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="行走路线：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="行走路线" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患单位：" prop="name">
+ <el-form-item label="隐患单位" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -98,7 +98,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患部门：" prop="name">
+ <el-form-item label="隐患部门" prop="name">
<!-- <el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -111,21 +111,21 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患地点：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患地点" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="隐患内容：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="隐患内容" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="隐患类别：" prop="name">
+ <el-form-item label="隐患类别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -136,7 +136,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="隐患级别：" prop="name">
+ <el-form-item label="隐患级别" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -149,19 +149,19 @@
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="整改措施：" prop="name">
+ <el-form-item label="整改措施" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="所需资金：" prop="name">
+ <el-form-item label="所需资金" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="限改时间：" prop="name">
+ <el-form-item label="限改时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -173,14 +173,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="责任人：" prop="name">
+ <el-form-item label="责任人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
+ <el-form-item label="完成时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -192,14 +192,14 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改完成情况：" prop="name">
+ <el-form-item label="整改完成情况" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查时间：" prop="name">
+ <el-form-item label="复查时间" prop="name">
<!--<el-input v-model="ruleForm.name"></el-input>-->
<el-date-picker
v-model="value1"
@@ -211,33 +211,33 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="复查人：" prop="name">
+ <el-form-item label="复查人" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="复查结果：" prop="name">
+ <el-form-item label="复查结果" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="整改次数：" prop="name">
+ <el-form-item label="整改次数" prop="name">
<el-input v-model="ruleForm.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="危险源：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="危险源" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="风险等级：" prop="name">
+ <el-form-item label="风险等级" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -248,7 +248,7 @@
</el-form-item>
</el-col>
<el-col :span="9" :offset="4">
- <el-form-item label="业务科室：" prop="name">
+ <el-form-item label="业务科室" prop="name">
<!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>-->
<el-select
v-model="ruleForm.elementAName"
@@ -261,10 +261,11 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="流程信息：" prop="name">
+ <el-form-item label="流程信息" prop="name">
<!-- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>-->
<el-table
:data="tableData"
+ border
style="width: 100%">
<el-table-column
prop="date"
@@ -274,25 +275,25 @@
</el-table-column>
<el-table-column
prop="name"
- label="操作人："
+ label="操作人"
align="center"
- width="139">
+ width="138">
</el-table-column>
<el-table-column
prop="province"
- label="处理时间："
+ label="处理时间"
align="center"
width="200">
</el-table-column>
<el-table-column
prop="city"
- label="审批意见："
+ label="审批意见"
align="center"
width="260">
</el-table-column>
<el-table-column
prop="address"
- label="流程信息："
+ label="流程信息"
align="center"
width="170">
</el-table-column>
@@ -302,17 +303,17 @@
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="发送流程：" prop="name">
- <el-input v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
+ <el-form-item label="发送流程" prop="name">
+ <el-input type="textarea" v-model="ruleForm.name" class="multiline" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
- <el-form-item label="下一步：" prop="name">
+ <el-form-item label="是否发送" prop="name">
<el-radio-group v-model="ruleForm.safetyInspectionItemResult">
- <el-radio :label="0">申请复查</el-radio>
- <el-radio :label="1">不接受,返回安全环保部</el-radio>
+ <el-radio :label="0">通过</el-radio>
+ <el-radio :label="1">不通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -321,45 +322,79 @@
v-if="ruleForm.safetyInspectionItemResult == 0">
<el-row>
<el-col :span="9">
- <el-form-item label="落实责任人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="选择复查单位/人：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" clearable v-model="ruleForm.reviewResults"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <div
+ v-else="ruleForm.safetyInspectionItemResult == 1">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="复查时间" prop="reviewTime">
+ <el-date-picker
+ v-model="ruleForm.reviewTime"
+ type="date"
+ placeholder="选择日期"
+ style="width: 100%">
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
- <el-form-item label="完成时间：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-form-item label="复查人" prop="rechecker">
+ <el-input v-model="ruleForm.rechecker" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="9">
- <el-form-item label="所需资金：" prop="name">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-col :span="22">
+ <el-form-item label="复查结果" prop="reviewResults">
+ <el-input class="textarea2" type="textarea" v-model="ruleForm.reviewResults1"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="备注" prop="desc1">
+ <el-input class="textarea" type="textarea" v-model="ruleForm.desc1"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="22">
- <el-form-item label="备注" prop="desc">
- <el-input type="textarea" v-model="ruleForm.desc"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="22">
<el-form-item style="text-align: center;">
- <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
- <el-button @click="close()">关闭</el-button>
+ <el-button class="btn" size="small" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+ <el-button size="small" @click="close()">关闭</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -375,7 +410,7 @@
export default {
components: {Titlename},
- name: "hiddenDangerList",
+ name: "recheckHiddenDangerList",
data() {
return {
ruleForm: {
@@ -387,9 +422,21 @@
type: [],
resource: '',
value1: '',
- desc: ''
+ desc: '',
+ rechecker:'',
+ reviewTime:'',
+ reviewResults:'',
+ rechecker1:'',
+ reviewTime1:'',
+ reviewResults1:'',
+ desc1:''
},
- rules: {},
+ rules: {
+ reviewTime: { required: true, message: '请填写复查时间', trigger: 'blur' },
+ rechecker: { required: true, message: '请填写复查人', trigger: 'blur' },
+ reviewResults: { required: true, message: '请填写复查结果', trigger: 'blur' },
+ desc1: { required: true, message: '复查不通过时请在备注说明原因！', trigger: 'blur' },
+ },
tableData: [{
date: ' 1',
name: '超级管理员',
@@ -409,6 +456,8 @@
city: '',
address: '已发送众泰煤焦化安全环保部',
}],
+ fileList: [],
+ // safetyInspectionItemResult:'0',
};
},
methods: {
@@ -422,6 +471,27 @@
}
});
},
+ handleRemove(file, fileList) {
+ console.log(file, fileList);
+ },
+ handlePreview(file) {
+ console.log(file);
+ },
+ beforeUpload(file) {
+ var FileExt = file.name.replace(/.+\./, "");
+ if (['jpg','png','bmp','gif','jpeg'].indexOf(FileExt.toLowerCase()) === -1){
+ this.$message({
+ type: 'warning',
+ message: '请上传后缀名为jpg、png、bmp、gif、jpeg的图片！'
+ });
+ return false;
+ }
+ },
+ close(){
+ this.$router.push({
+ path:"/recheckCancellationNumber"
+ })
+ }
}
}
</script>
@@ -440,4 +510,23 @@
/deep/ .multiline .el-input__inner {
height: 62px;
}
+ /deep/ .textarea .el-textarea__inner{
+ height: 80px;
+ max-height: 80px;
+ overflow-y: auto
+ }
+ /deep/ .textarea2 .el-textarea__inner{
+ height: 100px;
+ max-height: 100px;
+ overflow-y: auto
+ }
+ .btn {
+ background-color: #034ea2;
+ border: 1px solid #034ea2;
+ }
+ /*.el-button:hover {*/
+ /* background: #66b1ff;*/
+ /* border-color: #66b1ff;*/
+ /* color: #FFF;*/
+ /*}*/
</style>
--
Gitblit v1.9.2