diff --git a/public/favicon.ico b/public/favicon.ico
index e263760..cd32e2d 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/router/index.js b/src/router/index.js
index 97863d3..4ef452b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -403,6 +403,21 @@ export const dynamicRoutes = [
}
]
},
+
+ {
+ path: '/safetyReview/safetyDashboardDitail',
+ component: Layout,
+ hidden: true,
+ permissions: ['safetyReview:dashboardDitail'],
+ children: [
+ {
+ path: ':dependencyId(\\d+)?',
+ component: () => import('@/views/safetyReview/dashboard/detailForm'),
+ name: 'safetyDashboardDitail',
+ meta: { title: '安全审查看板详情', activeMenu: '/safetyReview/safetyDashboard' }
+ }
+ ]
+ },
{
path: '/ppeToolForm',
component: Layout,
diff --git a/src/views/databaseLibary/index.vue b/src/views/databaseLibary/index.vue
index ab78984..72ecd88 100644
--- a/src/views/databaseLibary/index.vue
+++ b/src/views/databaseLibary/index.vue
@@ -8,11 +8,11 @@
-
- {{ item.lable }}
-
+ 全部
+ {{ dict.label }}
@@ -22,6 +22,8 @@
+ 全部
{{ item.lable }}
@@ -52,6 +54,13 @@ import { Search } from '@element-plus/icons-vue'
import Breadcrumb from '@/components/Breadcrumb'
import list from './components/list.vue'
import card from './components/card.vue'
+
+
+const { proxy } = getCurrentInstance()
+// 一级类目和二级类目字典
+const { category_one, laws_regulations, training_materials, safety_meeting, security_document } = proxy.useDict("category_one", "laws_regulations", "training_materials", "safety_meeting", "security_document")
+
+
const router = useRouter()
// 文件列表
const fileListRef = ref(null)
@@ -59,18 +68,7 @@ const isShowFileList = ref(true)
// 组织架构图列表
const fileCardRef = ref(null)
const isShowFileCard = ref(false)
-const activeOne = ref('全部')
-const oneBtns = ref([
- { key: 'one-1', value: '全部', lable: '全部' },
- { key: 'one-2', value: '法律法规文件', lable: '法律法规文件' },
- { key: 'one-3', value: '组织架构', lable: '组织架构' },
- { key: 'one-4', value: '高压培训材料', lable: '高压培训材料' },
- { key: 'one-5', value: '高压安全会议', lable: '高压安全会议' },
- { key: 'one-6', value: '应急宣贯文件', lable: '应急宣贯文件' },
- { key: 'one-7', value: '车型技术概述', lable: '车型技术概述' },
- { key: 'one-8', value: '随车卡', lable: '随车卡' },
- { key: 'one-9', value: '高压安全文件', lable: '高压安全文件' }
-])
+const activeOne = ref('全部')
const activeTwo = ref('全部')
const twoBtns = ref([
{ key: 'two-1', value: '全部', lable: '全部' },
@@ -173,31 +171,45 @@ const queryParams = ref({
.right-item {
font-family: Microsoft YaHei;
- font-weight: 400 !important;;
- font-size: 18px !important;;
- color: #000000 !important;;
- line-height: 40px !important;;
- padding: 0px 10px 0px 20px !important;;
+ font-weight: 400 !important;
+ ;
+ font-size: 18px !important;
+ ;
+ color: #000000 !important;
+ ;
+ line-height: 40px !important;
+ ;
+ padding: 0px 10px 0px 20px !important;
+ ;
border: 0px !important;
}
.right-item:hover {
font-family: Microsoft YaHei;
- font-weight: 400 !important;;
- font-size: 18px !important;;
+ font-weight: 400 !important;
+ ;
+ font-size: 18px !important;
+ ;
color: #0090FF !important;
- line-height: 40px !important;;
- padding: 0px 10px 0px 20px !important;;
+ line-height: 40px !important;
+ ;
+ padding: 0px 10px 0px 20px !important;
+ ;
border: 0px !important;
}
.activeOption {
font-family: Microsoft YaHei;
- font-weight: 600 !important;;
- font-size: 18px !important;;
- color: #0090FF !important;;
- line-height: 40px !important;;
- padding: 0px 10px 0px 20px !important;;
+ font-weight: 600 !important;
+ ;
+ font-size: 18px !important;
+ ;
+ color: #0090FF !important;
+ ;
+ line-height: 40px !important;
+ ;
+ padding: 0px 10px 0px 20px !important;
+ ;
border: 0px !important;
}
diff --git a/src/views/safetyReview/dashboard/detailForm.vue b/src/views/safetyReview/dashboard/detailForm.vue
new file mode 100644
index 0000000..168885a
--- /dev/null
+++ b/src/views/safetyReview/dashboard/detailForm.vue
@@ -0,0 +1,514 @@
+
+
+
+
+
+ {{
+ item.title }}
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ detailForm.deptName }}
+
+
+
+
+ {{ detailForm.dependencyName }}
+
+
+
+
+ {{ detailForm.escUserName }}
+
+
+
+
+ {{ detailForm.workNo }}
+
+
+
+
+ {{ detailForm.openItemCount }}
+
+
+
+
+ {{ detailForm.reviewDate }}
+
+
+
+
+ {{ detailForm.nextReviewDate }}
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/safetyReview/dashboard/index.vue b/src/views/safetyReview/dashboard/index.vue
index 06a252a..3617c73 100644
--- a/src/views/safetyReview/dashboard/index.vue
+++ b/src/views/safetyReview/dashboard/index.vue
@@ -40,7 +40,8 @@
{{ itemRow.dependencyName }} |
{{ itemRow.escUserName }} |
- 待查
+ 待查
+ 无需审查
|
@@ -248,6 +249,11 @@ onMounted(() => {
getListBuildingDashboard()
});
+// 点击属地,打开详情
+const handleViewDetail = (dependencyId) => {
+ router.push('/safetyReview/safetyDashboardDitail/' + dependencyId)
+}
+
// 依据厂区名称 获取该厂区下的审查数据
const getListBuildingDashboard = () => {
loading.value = true
@@ -296,6 +302,7 @@ const getListBuildingDashboard = () => {
}
// 厂区切换
const handleChangeFactory = (val) => {
+ closePropModal()
getListBuildingDashboard()
}
// 关闭属地弹出层
@@ -619,8 +626,8 @@ const initMRA = () => {
.attr('x', bbox.x - data.paddingLeft)
.attr('y', bbox.y - data.paddingTop)
.attr('width', d => {
- if (data.reviewFlag) return bbox.width + 2 * data.paddingLeft
- else return bbox.width + 2 * data.paddingLeft + 20
+ if (data.reviewFlag) return bbox.width + 2 * data.paddingLeft + 20
+ else return bbox.width + 2 * data.paddingLeft
})
.attr('height', bbox.height + 2 * data.paddingTop)
.attr('rx', data.rx) // 圆角
@@ -636,8 +643,8 @@ const initMRA = () => {
.attr('height', 39)
.attr('x', d => {
if (data.text == '192' || data.text == '193') {
- if (data.reviewFlag) return bbox.x + 36
- return bbox.x + 56
+ if (data.reviewFlag) return bbox.x + 56
+ return bbox.x + 36
}
return bbox.x
})
@@ -753,8 +760,8 @@ const initShunYi = () => {
.attr('width', 36)
.attr('height', 39)
.attr('x', d => {
- if (data.reviewFlag) return bbox.x
- else return bbox.x + 10
+ if (data.reviewFlag) return bbox.x + 10
+ else return bbox.x
})
.attr('y', bbox.y + 30);
@@ -931,10 +938,12 @@ const initShunYi = () => {
.status-checked {
color: #00B32A;
+ cursor: pointer;
}
.status-pending {
color: #E13434;
+ cursor: pointer;
}
}
\ No newline at end of file
diff --git a/src/views/safetyReview/examinerApproval/approvalForm.vue b/src/views/safetyReview/examinerApproval/approvalForm.vue
index 27b992a..b75057d 100644
--- a/src/views/safetyReview/examinerApproval/approvalForm.vue
+++ b/src/views/safetyReview/examinerApproval/approvalForm.vue
@@ -13,7 +13,7 @@
@@ -28,7 +28,7 @@
-
+
建议项
@@ -28,7 +28,7 @@
-
+
建议项
-
+
建议项
-
+
建议项
{