From ab2d50f1f69c9c1ab4e9f51d367837fb320f3eeb Mon Sep 17 00:00:00 2001
From: Kxc0822a <kxc000822>
Date: 星期一, 11 四月 2022 14:23:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/views/hiddenDangerRegistration/index.vue | 355 +++++++++++++++++++++++++++++++
src/views/hiddenDangerRectification/index.vue | 294 ++++++++++++++++++++++++++
2 files changed, 633 insertions(+), 16 deletions(-)
diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index db27c8a..163ffae 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -1,13 +1,291 @@
<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"></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"></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"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="form.name" style="width:202px"></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" icon="el-icon-search">查询</el-button>
+ <el-button type="primary" class="btns" 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%">
+ <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"> </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 {
- name: "index"
- }
+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,
+ };
+ },
+};
</script>
-
-<style scoped>
-
+<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/index.vue b/src/views/hiddenDangerRegistration/index.vue
index db27c8a..24234c9 100644
--- a/src/views/hiddenDangerRegistration/index.vue
+++ b/src/views/hiddenDangerRegistration/index.vue
@@ -1,13 +1,352 @@
<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"></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"></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"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="form.name" style="width: 202px"></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" icon="el-icon-search"
+ >查询</el-button
+ >
+ <el-button type="primary" class="btns" 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" 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="完成时间" 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"> </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 {
- name: "index"
- }
+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,
+ };
+ },
+};
</script>
-
-<style scoped>
-
+<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>
--
Gitblit v1.9.2