From 0717ac4c0a2182388d62fbbb64da56559d58e761 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期一, 16 五月 2022 10:01:53 +0800
Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf
---
src/permission.js | 2
src/views/summaryPotentialSafetyHzards/index.vue | 13 ++++++
src/views/safetyHazardAccount/index.vue | 13 ++++++
src/views/safetyHazardAccount/superiorsSend.vue | 13 ++++++
src/router/index.js | 35 ++++++++++++++++-
src/views/Issuedbysuperiors/superiorsSend.vue | 13 ++++++
6 files changed, 86 insertions(+), 3 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 987cf0a..4b87e5d 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']// no redirect whitelist
+const whiteList = ['/login', '/auth-redirect','/agreement','/register','/productionEquipment','/instrumentData','/oneFromanother','/hiddenDangerTroubleshootingList','/preview','/inspectionNotExist','/send','/Issuedbysuperiors','/oneFromanotherN','/existN','/exist','/summaryPotentialSafetyHzards','/safetyHazardAccount','/superiorsSend']// 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 cffc040..dfc57f8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -344,9 +344,9 @@
},
{
path: '/inspectionNotExist',
- // name: '内部举一反三-待自查-不存在',
+ // name: '举一反三-待自查-不存在',
component: () => import('@/views/oneFromanother/inspectionNotExist'),
- // meta: { title: '内部举一反三-待自查-不存在', icon: '' }
+ // meta: { title: '举一反三-待自查-不存在', icon: '' }
hidden: true
},
{
@@ -392,6 +392,37 @@
component: () => import('@/views/oneFromanotherN/existN'),
hidden: true
},
+ {
+ path: '/superiorsSend',
+ // name: '上级下达隐患-点击发送',
+ component: () => import('@/views/Issuedbysuperiors/superiorsSend'),
+ // meta: { title: '上级下达隐患-点击发送', icon: '' }
+ hidden: true
+ },
+ {
+ id: 10,
+ parentId: 0,
+ path: '/summaryPotentialSafetyHzards',
+ name: '安全隐患汇总',
+ component: () => import('@/views/summaryPotentialSafetyHzards'),
+ meta: { title: '安全隐患汇总', icon: '' }
+ },
+ {
+ id: 11,
+ parentId: 0,
+ path: '/safetyHazardAccount',
+ name: '安全隐患台账',
+ component: () => import('@/views/safetyHazardAccount'),
+ meta: { title: '安全隐患台账', icon: '' }
+ },
+ {
+ path: '/superiorsSend',
+ // name: '安全隐患台账-查看隐患单',
+ component: () => import('@/views/safetyHazardAccount/superiorsSend'),
+ // meta: { title: '安全隐患台账-查看隐患单', icon: '' }
+ hidden: true
+ },
+
]
}
]
diff --git a/src/views/Issuedbysuperiors/superiorsSend.vue b/src/views/Issuedbysuperiors/superiorsSend.vue
new file mode 100644
index 0000000..3da5aed
--- /dev/null
+++ b/src/views/Issuedbysuperiors/superiorsSend.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+ name: "superiorsSend"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/safetyHazardAccount/index.vue b/src/views/safetyHazardAccount/index.vue
new file mode 100644
index 0000000..34cd1a0
--- /dev/null
+++ b/src/views/safetyHazardAccount/index.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+ name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/safetyHazardAccount/superiorsSend.vue b/src/views/safetyHazardAccount/superiorsSend.vue
new file mode 100644
index 0000000..3da5aed
--- /dev/null
+++ b/src/views/safetyHazardAccount/superiorsSend.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+ name: "superiorsSend"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/summaryPotentialSafetyHzards/index.vue b/src/views/summaryPotentialSafetyHzards/index.vue
new file mode 100644
index 0000000..34cd1a0
--- /dev/null
+++ b/src/views/summaryPotentialSafetyHzards/index.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+ name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
--
Gitblit v1.9.2