From b0ddbb08bbac49999c7d252a44e509994b77a041 Mon Sep 17 00:00:00 2001 From: shj <1790240199@qq.com> Date: 星期一, 11 四月 2022 10:28:02 +0800 Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf --- src/views/hiddenDangerRectification/applicationForExtension.vue | 146 ++++++++++++ src/views/hiddenDangerRegistration/index.vue | 13 + src/views/hiddenDangerRectification/index.vue | 13 + src/router/index.js | 36 ++ src/views/hiddenDangerRectification/sendHiddenDangerList.vue | 489 ++++++++++++++++++++++++++++++++++++++++ src/views/hiddenDangerRegistration/hiddenDangerList.vue | 0 6 files changed, 694 insertions(+), 3 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index dc7a871..27ceed7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -187,10 +187,40 @@ meta: { title: '重大隐患整改进度', icon: '' } }, { + id: 2, + parentId: 0, + path: '/hiddenDangerRegistration', + name: '隐患登记下达', + component: () => import('@/views/hiddenDangerRegistration'), + meta: { title: '隐患登记下达', icon: '' } + }, + { path: '/hiddenDangerList', - // name: '重大隐患整改进度-发送隐患单', - component: () => import('@/views/accidentHidden/hiddenDangerList'), - // meta: { title: '重大隐患整改进度-发送隐患单', icon: '' } + // name: '隐患登记下达-发送隐患单', + component: () => import('@/views/hiddenDangerRegistration/hiddenDangerList'), + // meta: { title: '隐患登记下达-发送隐患单', icon: '' } + hidden: true + }, + { + id: 2, + 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 }, ] diff --git a/src/views/hiddenDangerRectification/applicationForExtension.vue b/src/views/hiddenDangerRectification/applicationForExtension.vue new file mode 100644 index 0000000..e739ddd --- /dev/null +++ b/src/views/hiddenDangerRectification/applicationForExtension.vue @@ -0,0 +1,146 @@ +<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">选择文件</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 type="primary" @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: "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; + } + } + } + } +</script> + +<style scoped> + .app-container { + padding: 20px; + height: 850px; + overflow-y: auto; + } + /deep/ .el-textarea__inner{ + height: 80px; + max-height: 80px; + overflow-y: auto + } +</style> diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue new file mode 100644 index 0000000..db27c8a --- /dev/null +++ b/src/views/hiddenDangerRectification/index.vue @@ -0,0 +1,13 @@ +<template> + +</template> + +<script> + export default { + name: "index" + } +</script> + +<style scoped> + +</style> diff --git a/src/views/hiddenDangerRectification/sendHiddenDangerList.vue b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue new file mode 100644 index 0000000..f67236f --- /dev/null +++ b/src/views/hiddenDangerRectification/sendHiddenDangerList.vue @@ -0,0 +1,489 @@ +<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-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-select + v-model="ruleForm.elementAName" + :disabled="true" + 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" :disabled="true"></el-input> + <!-- <el-select--> + <!-- v-model="ruleForm.elementAName"--> + <!-- :disabled="true"--> + <!-- style="width: 100%"--> + <!-- >--> + <!-- </el-select>--> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <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-date-picker + v-model="value1" + type="date" + :disabled="true" + 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-input v-model="ruleForm.name"></el-input>--> + <!-- </el-form-item>--> + <el-form-item label="班次:" prop="elementAName"> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + 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" :disabled="true"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <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 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-input v-model="ruleForm.name"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="隐患部门:" prop="name"> + <!-- <el-input v-model="ruleForm.name"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + 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 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 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-input v-model="ruleForm.name"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="隐患级别:" prop="name"> + <!--<el-input v-model="ruleForm.name"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + 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" :disabled="true"></el-input> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <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-input v-model="ruleForm.name"></el-input>--> + <el-date-picker + v-model="value1" + type="date" + :disabled="true" + 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-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-input v-model="ruleForm.name"></el-input>--> + <el-date-picker + v-model="value1" + type="date" + :disabled="true" + 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-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-input v-model="ruleForm.name"></el-input>--> + <el-date-picker + v-model="value1" + type="date" + :disabled="true" + 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-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-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-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 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-input v-model="ruleForm.name" :disabled="true"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + style="width: 100%" + > + </el-select> + </el-form-item> + </el-col> + <el-col :span="9" :offset="4"> + <el-form-item label="业务科室:" prop="name"> + <!-- <el-input v-model="ruleForm.name" :disabled="true"></el-input>--> + <el-select + v-model="ruleForm.elementAName" + :disabled="true" + 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" :disabled="true"></el-input>--> + <el-table + :data="tableData" + style="width: 100%"> + <el-table-column + prop="date" + label="步骤" + align="center" + width="60"> + </el-table-column> + <el-table-column + prop="name" + label="操作人:" + align="center" + width="139"> + </el-table-column> + <el-table-column + prop="province" + label="处理时间:" + align="center" + width="200"> + </el-table-column> + <el-table-column + prop="city" + label="审批意见:" + align="center" + width="260"> + </el-table-column> + <el-table-column + prop="address" + label="流程信息:" + align="center" + width="170"> + </el-table-column> + </el-table> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="22"> + <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-radio-group v-model="ruleForm.safetyInspectionItemResult"> + <el-radio :label="0">申请复查</el-radio> + <el-radio :label="1">不接受,返回安全环保部</el-radio> + </el-radio-group> + </el-form-item> + </el-col> + </el-row> + <div + 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> + </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-row> + <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-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-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">选则文件</el-button> + <div slot="tip" class="el-upload__tip">只能上传.jpg,.gif,.bmp,.png,.jpeg格式的图片</div> + </el-upload> + </el-form-item> + </el-col> + </el-row> + </div> + <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> + <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-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: "sendHiddenDangerList", + 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; + } + } + } + } +</script> + +<style scoped> + .app-container { + padding: 20px; + height: 850px; + overflow-y: auto; + } + + /deep/ .box { + padding-top: 0; + } + + /deep/ .multiline .el-input__inner { + height: 62px; + } + /deep/ .textarea .el-textarea__inner{ + height: 80px; + max-height: 80px; + overflow-y: auto + } +</style> diff --git a/src/views/accidentHidden/hiddenDangerList.vue b/src/views/hiddenDangerRegistration/hiddenDangerList.vue similarity index 100% rename from src/views/accidentHidden/hiddenDangerList.vue rename to src/views/hiddenDangerRegistration/hiddenDangerList.vue diff --git a/src/views/hiddenDangerRegistration/index.vue b/src/views/hiddenDangerRegistration/index.vue new file mode 100644 index 0000000..db27c8a --- /dev/null +++ b/src/views/hiddenDangerRegistration/index.vue @@ -0,0 +1,13 @@ +<template> + +</template> + +<script> + export default { + name: "index" + } +</script> + +<style scoped> + +</style> -- Gitblit v1.9.2