From 4ca2e05960b597a906c37aa4bbb8edb79a79943c Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期一, 16 五月 2022 17:26:41 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/views/safetyHazardAccount/accountSend.vue | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/permission.js | 2
/dev/null | 13 ---
src/router/index.js | 4
4 files changed, 209 insertions(+), 16 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 4b87e5d..5961b18 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -16,7 +16,7 @@
if (!permissionRoles) return true
return roles.some(role => permissionRoles.indexOf(role) >= 0)
}
-const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/hiddenDangerTroubleshootingList','/preview','/inspectionNotExist','/send','/Issuedbysuperiors','/oneFromanotherN','/existN','/exist','/summaryPotentialSafetyHzards','/safetyHazardAccount','/superiorsSend']// no redirect whitelist
+const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/hiddenDangerTroubleshootingList','/preview','/inspectionNotExist','/send','/Issuedbysuperiors','/oneFromanotherN','/summaryPotentialSafetyHzards','/safetyHazardAccount','/superiorsSend','/accountSend','/existN','/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 dfc57f8..838b09a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -416,9 +416,9 @@
meta: { title: '安全隐患台账', icon: '' }
},
{
- path: '/superiorsSend',
+ path: '/accountSend',
// name: '安全隐患台账-查看隐患单',
- component: () => import('@/views/safetyHazardAccount/superiorsSend'),
+ component: () => import('@/views/safetyHazardAccount/accountSend'),
// meta: { title: '安全隐患台账-查看隐患单', icon: '' }
hidden: true
},
diff --git a/src/views/safetyHazardAccount/accountSend.vue b/src/views/safetyHazardAccount/accountSend.vue
new file mode 100644
index 0000000..71b3cec
--- /dev/null
+++ b/src/views/safetyHazardAccount/accountSend.vue
@@ -0,0 +1,206 @@
+<template>
+ <div>
+ <table border="1" style="background: #FFFFFF;width: 80%;margin: 0 auto">
+ <tr>
+ <td class="table_td" style="text-align: right;">隐患编号：</td>
+ <td class="table_right_td">0220512-0008</td>
+ <td class="table_td" style="text-align: right;">检查单位：</td>
+ <td class="table_right_td">生产技术部（一通三防）</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">检查人：</td>
+ <td class="table_right_td">admin</td>
+ <td class="table_td" style="text-align: right;">陪检人员： </td>
+ <td class="table_right_td"></td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">检查时间：</td>
+ <td class="table_right_td">2022-05-12</td>
+ <td class="table_td" style="text-align: right;">班次：</td>
+ <td class="table_right_td">早班</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">跟班、带班情况：</td>
+ <td class="table_right_td"></td>
+ <td class="table_td" style="text-align: right;">跟班、带班人员：</td>
+ <td class="table_right_td"></td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">行走路线：</td>
+ <td class="table_right_td" colspan="3"></td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">隐患单位：</td>
+ <td class="table_right_td">众泰煤焦化</td>
+ <td class="table_td" style="text-align: right;">隐患部门：</td>
+ <td class="table_right_td">众泰煤焦化</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">隐患地点：</td>
+ <td class="table_right_td" colspan="3">sdf</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">隐患内容：</td>
+ <td class="table_right_td" colspan="3">sdf</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">隐患类别：</td>
+ <td class="table_right_td">采掘</td>
+ <td class="table_td" style="text-align: right;">隐患级别：</td>
+ <td class="table_right_td">一般隐患D</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">整改措施：</td>
+ <td class="table_right_td">sdf</td>
+ <td class="table_td" style="text-align: right;">所需资金：</td>
+ <td class="table_right_td">无</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">限改时间：</td>
+ <td class="table_right_td">2022-05-12</td>
+ <td class="table_td" style="text-align: right;">责任人： </td>
+ <td class="table_right_td"></td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">完成时间：</td>
+ <td class="table_right_td">2022-05-12 </td>
+ <td class="table_td" style="text-align: right;">整改完成情况： </td>
+ <td class="table_right_td">整改完成</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">复查时间：</td>
+ <td class="table_right_td">2022-05-12 </td>
+ <td class="table_td" style="text-align: right;">复查人：</td>
+ <td class="table_right_td">admin</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">复查结果：</td>
+ <td class="table_right_td">已整改</td>
+ <td class="table_td" style="text-align: right;">整改次数：</td>
+ <td class="table_right_td"></td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">危险源：</td>
+ <td class="table_right_td" colspan="3">sdf</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">风险等级：</td>
+ <td class="table_right_td"></td>
+ <td class="table_td" style="text-align: right;">业务科室：</td>
+ <td class="table_right_td">财务部</td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">附件：</td>
+ <td class="table_right_td" colspan="3"></td>
+ </tr>
+ <tr>
+ <td class="table_td" style="text-align: right;">流程信息：</td>
+ <td class="table_right_td" colspan="3">
+ <el-table
+ :data="tableData"
+ border
+ style="margin: 10px auto 0;width:98%;">
+ <el-table-column
+ prop="date"
+ label="日期"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="姓名"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="地址">
+ </el-table-column>
+ </el-table>
+ </td>
+ </tr>
+ </table>
+ <div style="text-align: center;width: 100%;margin-top: 10px;">
+ <button class="btn">关闭</button>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "superiorsSend",
+ data() {
+ return {
+ 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 弄'
+ }]
+ }
+ }
+}
+</script>
+
+<style scoped>
+table,table tr th, table tr td {
+ border:1px solid #ccc;
+}
+.table_td{
+ background: #e4edf4;
+ padding: 4px 2px;
+ height: 26px;
+ line-height: 26px;
+ width: 300px;
+}
+.table_right_td{
+ padding: 4px 2px;
+ height: 26px;
+ line-height: 26px;
+}
+.table_tr{
+ background: #e4edf4;
+ line-height: 40px;
+ height: 40px;
+}
+table{
+ width: 400px;
+ border-collapse: collapse;
+ font-size: 14px;
+}
+.input{
+ background: #f9f9f9;
+ border-width: 1px;
+ margin: 5px 0;
+}
+.btn{
+ background: url(../../assets/btn.gif) no-repeat;
+ width: 76px;
+ height: 26px;
+ line-height: 26px;
+ font-size: 14px;
+ border: none;
+ color: #fff;
+ cursor: pointer;
+ overflow: visible;
+}
+/*去掉表格背景色*/
+/deep/ .el-table tbody tr:hover > td {
+ background-color: unset !important
+}
+/deep/ .el-table .el-table__body-wrapper table tr td {
+ background-color: transparent;
+}
+/deep/ .el-table .el-table__header-wrapper table tr th {
+ background-color: transparent;
+}
+</style>
diff --git a/src/views/safetyHazardAccount/superiorsSend.vue b/src/views/safetyHazardAccount/superiorsSend.vue
deleted file mode 100644
index 3da5aed..0000000
--- a/src/views/safetyHazardAccount/superiorsSend.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
- name: "superiorsSend"
-}
-</script>
-
-<style scoped>
-
-</style>
--
Gitblit v1.9.2