From 3606a96b3e06b63936db0b04ed73fda13379bb51 Mon Sep 17 00:00:00 2001
From: cqf <2252655793@qq.com>
Date: 星期五, 13 五月 2022 16:17:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shf' into shf
---
src/views/oneFromanother/manage.vue | 106 ++++
src/permission.js | 2
src/views/oneFromanother/index.vue | 178 ++++++++
src/views/hiddenDangerTroubleshootingList/index.vue | 186 ++++++++
src/views/hiddenDangerTroubleshootingList/preview.vue | 127 +++++
src/router/index.js | 37 +
src/views/oneFromanother/exist.vue | 635 ++++++++++++++++++++++++++++
7 files changed, 1,264 insertions(+), 7 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 3e68d61..0df4e88 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -17,7 +17,7 @@
return roles.some(role => permissionRoles.indexOf(role) >= 0)
}
-const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/equipmentAlarm'] // no redirect whitelist
+const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/exist'] // no redirect whitelist
router.beforeEach((to, from, next) => {
NProgress.start() // start progress bar
diff --git a/src/router/index.js b/src/router/index.js
index cc13a9f..46432e1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -54,8 +54,7 @@
{
path: '/',
component: Layout,
- // redirect: '/workPlan/workPlan/reserve',
- redirect: '/accidentHidden/majorHidden',
+ redirect: '/workPlan/workPlan/reserve',
children: [
{
path: 'dashboard',
@@ -326,10 +325,36 @@
hidden: true
},
{
- path: '/dangerDetails',
- // name: '隐患详情',
- component: () => import('@/views/dangerDetails/dnagerDetails'),
- // meta: { title: '自查隐患管理-填写督察', icon: '' }
+ id: 7,
+ parentId: 0,
+ path: '/oneFromanother',
+ name: '内部举一反三',
+ component: () => import('@/views/oneFromanother'),
+ meta: { title: '内部举一反三', icon: '' }
+ },
+ {
+ path: '/manage',
+ component: () => import('@/views/oneFromanother/manage'),
+ hidden: true
+ },
+ {
+ path: '/exist',
+ component: () => import('@/views/oneFromanother/exist'),
+ hidden: true
+ },
+ {
+ id: 8,
+ parentId: 0,
+ path: '/hiddenDangerTroubleshootingList',
+ name: '隐患排查清单',
+ component: () => import('@/views/hiddenDangerTroubleshootingList'),
+ meta: { title: '隐患排查清单', icon: '' }
+ },
+ {
+ path: '/preview',
+ // name: '隐患排查清单-预览',
+ component: () => import('@/views/hiddenDangerTroubleshootingList/preview'),
+ // meta: { title: '隐患排查清单-预览', icon: '' }
hidden: true
},
]
diff --git a/src/views/hiddenDangerTroubleshootingList/index.vue b/src/views/hiddenDangerTroubleshootingList/index.vue
new file mode 100644
index 0000000..88dfb61
--- /dev/null
+++ b/src/views/hiddenDangerTroubleshootingList/index.vue
@@ -0,0 +1,186 @@
+<template>
+ <div class="whole">
+ <div class="left-tree">
+ <el-tree
+ :data="data"
+ node-key="id"
+ default-expand-all
+ @node-drag-start="handleDragStart"
+ @node-drag-enter="handleDragEnter"
+ @node-drag-leave="handleDragLeave"
+ @node-drag-over="handleDragOver"
+ @node-drag-end="handleDragEnd"
+ @node-drop="handleDrop"
+ draggable
+ :allow-drop="allowDrop"
+ :allow-drag="allowDrag">
+ <span slot-scope="{ node, data }" class="slot-t-node">
+ <template>
+ <i
+ v-if="data.ChildItems&&data.ChildItems.length"
+ :class="{
+ 'el-icon-folder': !node.expanded, // 节点收缩时的图标
+ 'el-icon-folder-opened': node.expanded, // 节点展开时的图标
+ }"
+ style="color: #409eff;"
+ />
+ <i v-else class="
+el-icon-folder-add" style="color: #EC933A;" />
+ <span>{{ node.label }}</span>
+ </template>
+ </span>
+ </el-tree>
+ </div>
+ <div class="right-table">
+ <el-form :model="config" ref="configTableForm">
+ <el-table
+ :data="config.list"
+ style="width: 100%"
+ max-height="450">
+<!-- <el-table-column label="查询名">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-form-item>-->
+<!-- <el-input-->
+<!-- v-model.trim="scope.row.value"-->
+<!-- size="mini"-->
+<!-- placeholder="请填写值"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="查询名">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-form-item>-->
+<!-- <el-input-->
+<!-- v-model.trim="scope.row.value"-->
+<!-- size="mini"-->
+<!-- placeholder="请填写值"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <tr>sssss</tr>
+ <td>ss</td>
+ </el-table>
+ </el-form>
+ <div class="btns">
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- @click="submitConfig('configTableForm')">保存并确定</el-button>-->
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "index" ,
+ data() {
+ return {
+ data: [{
+ id: 1,
+ label: '隐患排查清单',
+ icon:'el-icon-folder',
+ children: [{
+ id: 4,
+ label: '现场管理清单',
+ icon:'el-icon-folder',
+ },
+ {
+ id: 5,
+ label: '基础管理清单',
+ icon:'el-icon-success',
+ }]
+ }],
+ defaultProps: {
+ children: 'children',
+ label: 'label'
+ },
+ // 配置列表
+ config: {
+ list: [
+ {name: ''}
+ ]
+ },
+ };
+ },
+ mounted(){
+ this.getAllColumns()
+ },
+ methods: {
+ handleDragStart(node, ev) {
+ console.log('drag start', node);
+ },
+ handleDragEnter(draggingNode, dropNode, ev) {
+ console.log('tree drag enter: ', dropNode.label);
+ },
+ handleDragLeave(draggingNode, dropNode, ev) {
+ console.log('tree drag leave: ', dropNode.label);
+ },
+ handleDragOver(draggingNode, dropNode, ev) {
+ console.log('tree drag over: ', dropNode.label);
+ },
+ handleDragEnd(draggingNode, dropNode, dropType, ev) {
+ console.log('tree drag end: ', dropNode && dropNode.label, dropType);
+ },
+ handleDrop(draggingNode, dropNode, dropType, ev) {
+ console.log('tree drop: ', dropNode.label, dropType);
+ },
+ allowDrop(draggingNode, dropNode, type) {
+ if (dropNode.data.label === '二级 3-1') {
+ return type !== 'inner';
+ } else {
+ return true;
+ }
+ },
+ allowDrag(draggingNode) {
+ return draggingNode.data.label.indexOf('三级 3-2-2') === -1;
+ },
+ // 获取表格数据进行渲染
+ getAllColumns() {
+ var data = this.$route.query
+ },
+ }
+}
+</script>
+
+<style scoped>
+.whole{
+ display: flex;
+}
+.left-tree{
+ width: 15%;
+}
+.left-tree .el-tree{
+ background: #f0f6e4;
+ height: 400px;
+ overflow-y: scroll;
+ border: 1px solid #000;
+}
+/deep/ .is-leaf{
+ background: transparent !important;
+ width: 5px;
+ height: 5px;
+ background-size: 100%;
+ margin-right: 5px;
+}
+/*/deep/ .el-tree-node__expand-icon{*/
+/* background: url(../../../../assets/shu_ic_wzk.png) no-repeat;*/
+/* width: 5px;*/
+/* height: 5px;*/
+/* background-size: 100%;*/
+/* margin-right: 5px;*/
+/*}*/
+/*/deep/ .expanded{*/
+/* background: url(../../../../assets/shu_ic_zk.png) no-repeat;*/
+/* width: 5px;*/
+/* height: 5px;*/
+/* background-size: 100%;*/
+/* margin-right: 5px;*/
+/* transform: rotate(0deg) !important;*/
+/*}*/
+/deep/ .el-icon-caret-right:before{
+ content: '';
+}
+.right-table{
+ width: 80%;
+}
+</style>
diff --git a/src/views/hiddenDangerTroubleshootingList/preview.vue b/src/views/hiddenDangerTroubleshootingList/preview.vue
new file mode 100644
index 0000000..f41ca01
--- /dev/null
+++ b/src/views/hiddenDangerTroubleshootingList/preview.vue
@@ -0,0 +1,127 @@
+<template>
+<div class="whole">
+ <h3 style="text-align: center">隐患排查标准清单(基础管理清单)</h3>
+ <el-table
+ :data="tableData"
+ style="width: 100%">
+ <el-table-column label="排查内容" align="center">
+ <el-table-column
+ prop="province"
+ label="Ⅰ级要素"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="Ⅱ级要素"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="Ⅲ级要素"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="zip"
+ label="Ⅳ级要素"
+ width="120">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="排查标准" align="center">
+ <el-table-column
+ prop="province"
+ label="标准项具体描述"
+ width="300">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ width="200"
+ label="参考依据">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="排查方法"
+ width="150">
+ </el-table-column>
+ <el-table-column
+ prop="date"
+ label="排查周期"
+ width="150">
+ </el-table-column>
+ <el-table-column label="排查责任" align="center">
+ <el-table-column
+ prop="province"
+ label="排查级别">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="责任单位">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+</div>
+</template>
+
+<script>
+export default {
+ name: "preview",
+ data() {
+ return {
+ tableData: [{
+ date: '2016-05-03',
+ name: '王小虎',
+ province: '上海',
+ city: '普陀区',
+ address: '上海市普陀区金沙江路 1518 弄',
+ zip: 200333
+ }, {
+ date: '2016-05-02',
+ name: '王小虎',
+ province: '上海',
+ city: '普陀区',
+ address: '上海市普陀区金沙江路 1518 弄',
+ zip: 200333
+ }, {
+ date: '2016-05-04',
+ name: '王小虎',
+ province: '上海',
+ city: '普陀区',
+ address: '上海市普陀区金沙江路 1518 弄',
+ zip: 200333
+ }, {
+ date: '2016-05-01',
+ name: '王小虎',
+ province: '上海',
+ city: '普陀区',
+ address: '上海市普陀区金沙江路 1518 弄',
+ zip: 200333
+ }, {
+ date: '2016-05-08',
+ name: '王小虎',
+ province: '上海',
+ city: '普陀区',
+ address: '上海市普陀区金沙江路 1518 弄',
+ zip: 200333
+ }, {
+ date: '2016-05-06',
+ name: '王小虎',
+ province: '上海',
+ city: '普陀区',
+ address: '上海市普陀区金沙江路 1518 弄',
+ zip: 200333
+ }, {
+ date: '2016-05-07',
+ name: '王小虎',
+ province: '上海',
+ city: '普陀区',
+ address: '上海市普陀区金沙江路 1518 弄',
+ zip: 200333
+ }]
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/oneFromanother/exist.vue b/src/views/oneFromanother/exist.vue
new file mode 100644
index 0000000..ab40f32
--- /dev/null
+++ b/src/views/oneFromanother/exist.vue
@@ -0,0 +1,635 @@
+<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="check_date">
+ <el-date-picker
+ v-model="ruleForm.check_date"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="班次" prop="check_class">
+ <el-select v-model="ruleForm.check_class" placeholder="请选择" style="width: 100%">
+ <el-option
+ v-for="item in BCList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查类别" prop="checktype">
+ <el-select v-model="ruleForm.checktype" placeholder="请选择" style="width: 100%">
+ <el-option
+ v-for="item in JCLBList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="检查单位" prop="check_main_branch">
+ <el-select v-model="ruleForm.check_main_branch" placeholder="请选择" @change="changeJCDW" style="width: 100%">
+ <el-option
+ v-for="item in JCDWList"
+ :key="item.label"
+ :label="item.label"
+ :value="item.label"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="检查人员" prop="check_man">
+ <el-input v-model="ruleForm.check_man"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="陪检人员" prop="acc_man">
+ <el-input v-model="ruleForm.acc_man"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+
+ <el-row>
+ <el-col :span="22">
+ <el-form-item label="行走路线">
+ <el-input v-model="ruleForm.route" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <!-- <el-row style="margin-bottom: 20px" v-if="addShow">
+ <el-col :span="9">
+ <el-button type="primary" class="btns" @click="addDanger">新增隐患</el-button>
+ </el-col>
+ </el-row> -->
+
+ <el-table :data="tableData" style="width: 100%">
+ <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+ <el-table-column prop="ht_branch" align="center" label="隐患部门"></el-table-column>
+ <el-table-column prop="address" align="center" label="地点"></el-table-column>
+ <el-table-column prop="ht_content" align="center" label="隐患内容"></el-table-column>
+ <el-table-column prop="measure" align="center" label="整改措施"></el-table-column>
+ <el-table-column prop="ht_typesub" align="center" label="隐患类别"></el-table-column>
+ <el-table-column prop="dangerousSource" align="center" label="关联危险源"></el-table-column>
+ <el-table-column prop="DTRisk_level" align="center" label="风险等级"></el-table-column>
+ <el-table-column prop="ht_level" align="center" label="隐患级别"></el-table-column>
+ <el-table-column prop="alter_time" align="center" label="限改时间"></el-table-column>
+ <el-table-column prop="duty_officer" align="center" label="责任人"></el-table-column>
+ <el-table-column prop="alter_status" align="center" label="整改情况"></el-table-column>
+ <el-table-column prop="Review" align="center" label="业务科室"></el-table-column>
+ <el-table-column prop="time" label="操作" align="center" width="140">
+ <template slot-scope="scope">
+ <div style="display: flex;align-items: center;flex-direction: row;">
+ <el-button
+ size="mini"
+ @click="editDanger(scope.row, scope.$index)"
+ >添加
+ </el-button>
+ <el-button
+ size="mini"
+ v-if="addShow"
+ @click="deleteDanger(scope.row, scope.$index)"
+ >删除
+ </el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
+
+ <el-row style="margin-top: 20px">
+ <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="returnIndex">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ </div>
+
+ <el-dialog
+ :title="title"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ width="40%">
+ <el-form ref="form" :rules="dangerRules" :model="dangerForm" label-width="100px">
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患部门" prop="ht_branch">
+ <el-select v-model="dangerForm.ht_branch" placeholder="请选择">
+ <el-option
+ v-for="item in YHBMList"
+ :key="item.branch_id"
+ :label="item.branch_name"
+ :value="item.branch_name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="地点" prop="address">
+ <el-input v-model="dangerForm.address" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患内容" prop="ht_content">
+ <el-input v-model="dangerForm.ht_content" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="整改措施" prop="measure">
+ <el-input v-model="dangerForm.measure" rows="3" type="textarea" class="multiline"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="隐患类别" prop="ht_typesub">
+ <el-select v-model="dangerForm.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="关联危险源" prop="DTRisk_bankId">
+ <el-select v-model="dangerForm.DTRisk_bankId" placeholder="请选择" @change="changeWxy" filterable>
+ <el-option
+ v-for="item in dangerList"
+ :key="item.id"
+ :label="item.mriskPoint"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="风险等级" prop="DTRisk_level">
+ <el-input v-model="dangerForm.DTRisk_level" :disabled="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="隐患级别" prop="ht_level">
+ <el-select v-model="dangerForm.ht_level" placeholder="请选择">
+ <el-option
+ v-for="item in YHJBList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="限改时间" prop="alter_time">
+ <el-date-picker
+ v-model="dangerForm.alter_time"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="责任人" prop="duty_officer">
+ <el-input v-model="dangerForm.duty_officer"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="9">
+ <el-form-item label="整改情况" prop="alter_status">
+ <el-select v-model="dangerForm.alter_status" placeholder="请选择">
+ <el-option
+ v-for="item in statusList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="9" :offset="4">
+ <el-form-item label="业务科室" prop="Review">
+ <el-select v-model="dangerForm.Review" style="width: 100%">
+ <el-option
+ v-for="item in YWKSList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="dangerForm.alter_status=='重复反弹隐患'">
+ <el-col :span="9">
+ <el-form-item label="重复反弹隐患" prop="repeatId">
+ <el-select v-model="dangerForm.repeatId" placeholder="请选择">
+ <el-option
+ v-for="item in reboundList"
+ :key="item.id"
+ :label="item.content"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </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="submitDanger('form')"
+ >保存</el-button
+ >
+ <el-button @click="dialogVisible=false">关闭</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
+
+ </div>
+</template>
+
+<script>
+import Titlename from "../../components/Titlename/index.vue";
+
+import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initReformStatus,initYwks,initWxy} from "@/api/sgyhpczl/initSelect";
+import {saveDanger,initDangerRebound,getDangerInfo,editDanger} from '@/api/sgyhpczl/hiddenDangerRegistration'
+import {deepClone} from '@/utils'
+
+export default {
+ components: { Titlename },
+ name: "hiddenDangerList",
+ data() {
+ return {
+ addShow:true,
+ id:'',
+ rowIndex:-1,
+ dangerList:[],
+ dangerForm:{},
+ dangerRules:{
+ ht_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ address: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ ht_content: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ ht_typesub: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ DTRisk_bankId: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ ht_level: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ alter_time: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ alter_status: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ Review: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ duty_officer:[{ required: true, message: '不能为空', trigger: 'blur' },]
+ },
+ title:'新增',
+ dialogVisible:false,
+ BCList:[],
+ JCLBList:[],
+ JCDWList:[{label:"众泰煤焦化",value:0},{label:"上级单位",value:1}],
+ YHBMList:[],
+ YHLXList:[],
+ YHJBList:[],
+ JCBMList:[],
+ llrList:[],
+ statusList:[],
+ YWKSList:[],
+ reboundList:[],
+ ruleForm: {},
+ rules: {
+ check_date: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ check_class: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ check_main_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ check_branch: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ check_man: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ checktype: [{ required: true, message: '不能为空', trigger: 'blur' },],
+ },
+ tableData: [],
+ };
+ },
+ mounted(){
+ this.initBC()
+ this.initJCLB()
+ this.initYHJB()
+ this.initYHLX()
+ //this.initLlr()
+ this.initReformStatus()
+ this.initYHBM()
+ this.initYWKS()
+ this.initWXY()
+ this.initDangerRebound()
+ this.id = this.$route.query.id;
+ if( this.id!=null && this.id!=''){
+ this.initInfo();
+ this.addShow=false
+ }
+ },
+ methods: {
+ async initInfo(){
+ var res=await getDangerInfo(this.id)
+ if (res.data.ok==1){
+ this.ruleForm=res.data.data
+ this.changeJCDW(res.data.data.check_main_branch)
+ var obj=deepClone(res.data.data)
+ this.tableData.push(obj)
+
+ }
+ },
+ initDangerRebound(){
+ initDangerRebound().then(res=>{
+ if (res.data.ok==1){
+ this.reboundList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ submitDanger(formName){
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ if(this.title=='新增'){
+ this.tableData.push(this.dangerForm)
+ }else {
+ var arr = this.tableData;
+ arr.splice(this.rowIndex, 1, this.dangerForm);
+ this.tableData = arr;
+ }
+ this.dialogVisible=false
+
+ } else {
+ console.log("error submit!!");
+ return false;
+ }
+ });
+ },
+ deleteDanger(row, index) {
+
+
+ this.$confirm('确认删除吗', '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(() => {
+ var arr = deepClone(this.tableData);
+ var brr = [];
+ for (var i = 0; i < arr.length; i++) {
+ if (i == index) {
+ } else {
+ brr.push(arr[i]);
+ }
+ }
+ this.tableData = deepClone(brr);
+ //this.tableData.splice(index)
+
+ })
+ .catch(error => {
+ });
+
+
+ },
+ editDanger(row, index) {
+ this.dangerForm = deepClone(row);
+ this.rowIndex = index;
+ this.dialogVisible = true;
+ this.title = '编辑';
+ },
+
+ addDanger(){
+ this.dangerForm={}
+ this.title="新增"
+ this.dialogVisible=true
+ },
+ changeWxy(e){
+ for(var i=0;i<this.dangerList.length;i++){
+ if(e==this.dangerList[i].id){
+ this.dangerForm.DTRisk_level=this.dangerList[i].mriskLevel
+ this.dangerForm.dangerousSource=this.dangerList[i].mriskPoint
+ }
+ }
+ },
+ initWXY(){
+ var param={
+ page: 1,
+ limit: 1000
+ }
+ initWxy(param).then(res=>{
+ if (res.data.ok==1){
+ this.dangerList=res.data.data.items
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYWKS(){
+ initYwks().then(res=>{
+ if (res.data.ok==1){
+ this.YWKSList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHBM(){
+ initYHBM().then(res=>{
+ if (res.data.ok==1){
+ this.YHBMList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initLlr(){
+ initLlr().then(res=>{
+ if (res.data.ok==1){
+ this.llrList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initReformStatus(){
+ initReformStatus().then(res=>{
+ if (res.data.ok==1){
+ this.statusList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ changeJCDW(val){
+ initJCBM(val).then(res=>{
+ if (res.data.ok==1){
+ this.JCBMList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHLX(){
+ initYHLX().then(res=>{
+ if (res.data.ok==1){
+ this.YHLXList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initYHJB(){
+ initYHJB().then(res=>{
+ if (res.data.ok==1){
+ this.YHJBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initBC(){
+ initBC().then(res=>{
+ if (res.data.ok==1){
+ this.BCList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+ initJCLB(){
+ initJCLB().then(res=>{
+ if (res.data.ok==1){
+ this.JCLBList=res.data.data
+ } else{
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ },
+
+
+ returnIndex(){
+ this.$router.push({
+ path:"/hiddenDangerRegistration"
+ })
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ if(this.tableData==null || this.tableData.length==0){
+ this.$message({type:'error', message:"请添加隐患", duration:2000})
+ }
+ this.ruleForm.items=this.tableData
+ if(this.addShow){
+ saveDanger(this.ruleForm).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"新增成功", duration:3000})
+ this.$router.push({
+ path:"/hiddenDangerRegistration"
+ })
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }else {
+ var param=deepClone(this.ruleForm)
+ var obj=deepClone(this.tableData[0])
+ param.ht_branch=obj.ht_branch
+ param.address=obj.address
+ param.ht_content=obj.ht_content
+ param.measure=obj.measure
+ param.ht_typesub=obj.ht_typesub
+ param.DTRisk_bankId=obj.DTRisk_bankId
+ param.DTRisk_level=obj.mriskLevel
+ param.dangerousSource=obj.mriskPoint
+ param.ht_level=obj.ht_level
+ param.alter_time=obj.alter_time
+ param.duty_officer=obj.duty_officer
+ param.alter_status=obj.alter_status
+ param.Review=obj.Review
+ param.repeatId=obj.repeatId
+ editDanger(param).then(res=>{
+ if (res.data.ok==1){
+ this.$message({type:'success', message:"编辑成功", duration:3000})
+ this.$router.push({
+ path:"/hiddenDangerRegistration"
+ })
+ }else {
+ this.$message({type:'error', message:res.data.msg, duration:3000})
+ }
+ })
+ }
+
+
+
+ } 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>
diff --git a/src/views/oneFromanother/index.vue b/src/views/oneFromanother/index.vue
new file mode 100644
index 0000000..b3b8cc3
--- /dev/null
+++ b/src/views/oneFromanother/index.vue
@@ -0,0 +1,178 @@
+<template>
+ <div class="app-container">
+ <el-form ref="form" :inline="true" class="inquire" :model="listQuery" label-width="80px">
+ <el-form-item label="下发单位">
+ <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患单位">
+ <el-input v-model="listQuery.form.ht_branch" style="width:202px"></el-input>
+ </el-form-item>
+ <el-form-item label="隐患类别">
+ <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患级别">
+ <el-select v-model="listQuery.form.ht_level" placeholder="请选择">
+ <el-option
+ v-for="item in YHJBList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患地点">
+ <el-input v-model="listQuery.form.address" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="检查类别">
+ <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="隐患内容">
+ <el-input v-model="listQuery.form.ht_content" style="width:202px" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ <el-form-item label="检查时间">
+ <el-col :span="11">
+ <el-date-picker type="date" placeholder="选择日期" v-model="listQuery.form.check_dateStart"
+ style="width: 100%;" value-format="yyyy-MM-dd"></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="listQuery.form.check_dateEnd"
+ style="width: 100%;" value-format="yyyy-MM-dd"></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" @click="getPageList()">查询
+ </el-button>
+ <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
+ <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出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-group>
+ </el-col>
+ <el-col :span="14" style="text-align:right;">
+ <el-button class="btns" type="primary" size="small" @click="sendBath()">管理专业</el-button>
+ </el-col>
+ </el-row>
+ <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center"></el-table-column>
+ <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+ <template slot-scope="scope">
+ <label>{{ formatDate(scope.row.check_date)}}</label><br/>
+ <label>{{ scope.row.check_class}}</label>
+ </template>
+ </el-table-column>
+ <el-table-column prop="check_branch" label="检查单位" align="center"></el-table-column>
+ <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
+ <el-table-column prop="measure" label="被检单位" align="center"></el-table-column>
+ <el-table-column prop="date" label="隐患类别" align="center"></el-table-column>
+ <el-table-column prop="DTRisk_level" label="隐患级别" align="center"></el-table-column>
+ <el-table-column prop="warningLevel" label="隐患地点" align="center"></el-table-column>
+ <el-table-column prop="curWarningLevel" label="内容" width="200" align="center"></el-table-column>
+ <el-table-column prop="curWarningLevel" label="下发单位" align="center"></el-table-column>
+ <el-table-column prop="date" label="流程操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">不存在</el-button>
+ <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{
+ listQuery:{
+ form:{}
+ },
+ radio1:'待自查',
+ }
+ },
+ methods:{
+ sendBath(){
+ this.$router.push({
+ path:'/manage'
+ })
+ },
+ handleClick(data,val){
+ if(val=='存在'){
+ this.$router.push({
+ path:'/exist'
+ })
+ }
+ }
+ }
+ }
+</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>
\ No newline at end of file
diff --git a/src/views/oneFromanother/manage.vue b/src/views/oneFromanother/manage.vue
new file mode 100644
index 0000000..c6571d2
--- /dev/null
+++ b/src/views/oneFromanother/manage.vue
@@ -0,0 +1,106 @@
+<template>
+ <div class="app-container">
+ <el-form ref="form" :inline="true" class="inquire" :model="listQuery" label-width="80px">
+ <el-form-item label="部门">
+ <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="专业">
+ <el-select v-model="listQuery.form.ht_typesub" placeholder="请选择">
+ <el-option
+ v-for="item in YHLXList"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </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" @click="getPageList()">查询
+ </el-button>
+ <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
+ <!-- <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出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-group>
+ </el-col> -->
+ <el-col :span="24" style="text-align:right;">
+ <el-button class="btns" type="primary" size="small" icon="el-icon-plus">添加</el-button>
+ <el-button class="btns" type="primary" size="small" icon="el-icon-close">批量删除</el-button>
+ </el-col>
+ </el-row>
+ <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center"></el-table-column>
+ <el-table-column prop="check_branch" label="部门" align="center"></el-table-column>
+ <el-table-column prop="checktype" label="专业" align="center"></el-table-column>
+ <el-table-column prop="measure" label="备注" align="center"></el-table-column>
+ <el-table-column prop="date" label="基本操作" align="center">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" size="small">删除</el-button>
+ <el-button @click="handleClick(scope.row)" type="text" size="small">保存</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div style="margin-top:20px;text-align: center">
+ <el-button class="btns" type="primary">关闭</el-button>
+
+ </div>
+ </div>
+</template>
+<script>
+ export default{
+ data(){
+ return{
+ listQuery:{
+ form:{}
+ },
+ radio1:'待自查',
+ }
+ }
+ }
+</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>
\ No newline at end of file
--
Gitblit v1.9.2