From caf41c9a1aa56697a0bb96a63aaac847f51448dd Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Mon, 4 Aug 2025 13:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ppeTool.js                            |  9 +++++++++
 src/layout/components/Navbar.vue              | 14 ++++++++++---
 .../components/libaryDetail.vue               | 16 +++++++++++++--
 .../databaseLibary/components/libaryForm.vue  | 20 ++++++++++---------
 src/views/ppeTool/index.vue                   | 19 +++++++++++++++---
 .../escTask/components/LableApplyForm.vue     | 11 +++++++---
 .../escTask/components/LableReApplyForm.vue   | 14 +++++++++++--
 .../components/LableApplyForm.vue             |  9 +++++++--
 .../components/LableReApplyForm.vue           | 14 +++++++++++--
 .../safetyReview/examinerEscTask/index.vue    | 12 +++++++++--
 10 files changed, 110 insertions(+), 28 deletions(-)

diff --git a/src/api/ppeTool.js b/src/api/ppeTool.js
index 3ffd79e..3dc8c57 100644
--- a/src/api/ppeTool.js
+++ b/src/api/ppeTool.js
@@ -39,4 +39,13 @@ export function deleteBusPpeTools(ppeId) {
     url: '/admin/busPpeTools/deleteBusPpeTools/' + ppeId,
     method: 'post'
   })
+} 
+
+// 公用下载文件接口
+export function downFile(fileName) {
+  return request({
+    url: '/common/download?fileName='+ encodeURIComponent(fileName),
+    method: 'get',
+    responseType: 'blob'
+  })
 } 
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 0261285..831f10c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -161,7 +161,7 @@ onBeforeUnmount(() => {
 
 // 判断是否跳转
 const isLink = (msgType) => {
-  return [10, 20, 30, 40, 50].includes(msgType)
+  return [10, 20, 22, 30, 32, 40, 42, 50].includes(msgType)
 }
 
 
@@ -278,10 +278,16 @@ const handleOpenLink = (messageId, msgType) => {
       if (msgType == 10) router.push('/system/userApproval')
       // 资质申请审核 esc 
       if (msgType == 20) router.push('/qualification/qualificationEscApproval')
+      // 资质申请审核 培训中心
+      if (msgType == 22) router.push('/qualification/trainApproval')
       // 标签申请审核 esc
       if (msgType == 30) router.push('/labelManage/escApproval')
+      // 标签申请审核 标签审核员
+      if (msgType == 32) router.push('/labelManage/adminApproval')
       // 高压安全审查整改提醒 esc
       if (msgType == 40) router.push('/safetyReview/examinerEscTask')
+      // 高压安全审查审批  安全审查员
+      if (msgType == 42) router.push('/safetyReview/examinerApproval')
       // 工具过期 esc
       if (msgType == 50) router.push('/ppeTool')
       closeMessage()
@@ -543,12 +549,12 @@ function toggleTheme() {
 }
 
 :deep(.el-dialog__body) {
-  max-height: 760px !important;
+  // max-height: 760px !important;
   padding: 0 !important;
   color: var(--el-text-color-regular);
   font-size: var(--el-dialog-content-font-size);
   word-break: break-all;
-  overflow-y: auto;
+  // overflow-y: auto;
 }
 
 .cursor-pointer {
@@ -575,6 +581,8 @@ function toggleTheme() {
   list-style: none;
   padding: 0px !important;
   margin: 6px 0px;
+  max-height: 710px;
+  overflow-y: auto;
 }
 
 .message-item {
diff --git a/src/views/databaseLibary/components/libaryDetail.vue b/src/views/databaseLibary/components/libaryDetail.vue
index c54cf90..4d90548 100644
--- a/src/views/databaseLibary/components/libaryDetail.vue
+++ b/src/views/databaseLibary/components/libaryDetail.vue
@@ -33,7 +33,7 @@
                                     <div class="section-title">相关文档</div>
                                     <ul class="resource-list">
                                         <li v-for="(doc, index) in docUploadList" :key="'doc-' + index"
-                                            class="resource-link">
+                                            class="resource-link" @click="handleDownFile(doc.name, doc.name)">
                                             <span class="documentIcon">#</span>
                                             <span class="documentName">{{ doc.name }}</span>
                                         </li>
@@ -64,7 +64,7 @@
 <script setup>
 import { onMounted, reactive, ref } from 'vue'
 import { getBusEncyclopediaDatabase } from "@/api/databaseLibary"
-// import { DocumentText as DocumentIcon, Link as LinkIcon } from '@element-plus/icons-vue';
+import { downFile } from "@/api/ppeTool"
 
 const route = useRoute()
 const levelList = ref([
@@ -100,6 +100,18 @@ const getDetailInfo = (id) => {
         }
     })
 }
+const handleDownFile = (fileName, downLoadName) => {
+    downFile(fileName).then(res => {
+        // 通过a标签打开新页面下载文件
+        const a = document.createElement('a')
+        a.href = URL.createObjectURL(res)
+        // a标签里有download属性可以自定义文件名
+        a.setAttribute('download', downLoadName)
+        document.body.appendChild(a)
+        a.click()
+        document.body.removeChild(a)
+    })
+}
 </script>
 
 <style lang='scss'>
diff --git a/src/views/databaseLibary/components/libaryForm.vue b/src/views/databaseLibary/components/libaryForm.vue
index f130238..774235c 100644
--- a/src/views/databaseLibary/components/libaryForm.vue
+++ b/src/views/databaseLibary/components/libaryForm.vue
@@ -54,7 +54,7 @@
                                     :label="item.label" :value="item.value" @change="handleChangeTwoType(item.value)" />
                             </el-checkbox-group>
                         </el-form-item>
-                        <el-form-item label="组织架构图" prop="organPic" v-show="ruleForm.category == '组织架构'">
+                        <el-form-item label="组织架构图" :prop="ruleForm.category == '组织架构' ? 'organPic' : null" v-show="ruleForm.category == '组织架构'">
                             <myFileUpload ref="organPicRef" @set-form-file="handleSetorganPic" />
                         </el-form-item>
                         <el-form-item label="正文内容" prop="mainText">
@@ -99,20 +99,17 @@
                                     <template #default="scope">
                                         <div v-show="!scope.row.editFlag">
                                             <el-button link type="primary"
-                                                @click="handleEditClick(scope.row, scope.$index)"
-                                                v-hasPermi="['system:config:edit']">编辑</el-button>
+                                                @click="handleEditClick(scope.row, scope.$index)">编辑</el-button>
                                             <el-divider direction="vertical" class="verticalLine" />
-                                            <el-button link type="primary" @click="handleRemove(scope.$index)"
-                                                v-hasPermi="['system:config:remove']">删除</el-button>
+                                            <el-button link type="primary"
+                                                @click="handleRemove(scope.$index)">删除</el-button>
                                         </div>
                                         <div v-show="scope.row.editFlag">
                                             <el-button link type="primary"
-                                                @click="handleSaveClick(scope.row, scope.$index)"
-                                                v-hasPermi="['system:config:edit']">保存</el-button>
+                                                @click="handleSaveClick(scope.row, scope.$index)">保存</el-button>
                                             <el-divider direction="vertical" class="verticalLine" />
                                             <el-button link type="primary"
-                                                @click="handleCancelClick(scope.row, scope.$index)"
-                                                v-hasPermi="['system:config:remove']">取消</el-button>
+                                                @click="handleCancelClick(scope.row, scope.$index)">取消</el-button>
                                         </div>
                                     </template>
                                 </el-table-column>
@@ -366,10 +363,15 @@ const handleCancel = () => {
     })
 }
 const handleSubmit = () => {
+    
+            console.log('提交', ruleForm.value)
     proxy.$refs["ruleFormRef"].validate(valid => {
+            console.log('提交valid', valid)
         if (valid) {
+            console.log('提交', ruleForm.value)
             ruleForm.value.fileContent = JSON.stringify(docUploadList.value)
             ruleForm.value.encyclopediaDatabaseLinkList = showTableData.value
+            console.log('提交', ruleForm.value)
             if (ruleForm.value.id != undefined) {
                 updateBusEncyclopediaDatabase(ruleForm.value).then(response => {
                     proxy.$modal.msgSuccess("修改成功")
diff --git a/src/views/ppeTool/index.vue b/src/views/ppeTool/index.vue
index 5e227c9..76caf5b 100644
--- a/src/views/ppeTool/index.vue
+++ b/src/views/ppeTool/index.vue
@@ -65,7 +65,8 @@
                 </el-table-column>
                 <el-table-column prop="fileContent" label="标定信息" min-width="360">
                     <template #default="scope">
-                        <div v-for="item in JSON.parse(scope.row.fileContent)" class="fileLink"> {{ item.name }} </div>
+                        <div v-for="item in JSON.parse(scope.row.fileContent)" class="fileLink" @click="handleDownFile(item.url, item.name)">
+                            {{ item.name }} </div>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" width="130" v-hasPermi="['ppeTool:edit']">
@@ -90,7 +91,7 @@ import Breadcrumb from '@/components/Breadcrumb'
 import addIcon from '@/assets/images/addIcon.png'
 import { customerDeptTreeSelect } from "@/api/system/user"
 import { getBusDependencyPage } from "@/api/system/dependency"
-import { busPpeToolsPageList, deleteBusPpeTools } from "@/api/ppeTool"
+import { busPpeToolsPageList, deleteBusPpeTools, downFile } from "@/api/ppeTool"
 import moment from 'moment'
 
 const router = useRouter()
@@ -190,6 +191,18 @@ const handleDelete = (record) => {
         proxy.$modal.msgSuccess("删除成功")
     }).catch(() => { })
 }
+const handleDownFile = (fileName, downLoadName) => {
+    downFile(fileName).then(res => {
+        // 通过a标签打开新页面下载文件
+        const a = document.createElement('a')
+        a.href = URL.createObjectURL(res)
+        // a标签里有download属性可以自定义文件名
+        a.setAttribute('download', downLoadName)
+        document.body.appendChild(a)
+        a.click()
+        document.body.removeChild(a)
+    })
+}
 </script>
 <style lang='scss'>
 .app-main {
@@ -356,6 +369,6 @@ const handleDelete = (record) => {
     -webkit-box-orient: vertical;
     overflow: hidden;
     text-overflow: ellipsis;
-    // cursor: pointer;
+    cursor: pointer;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/qualification/escTask/components/LableApplyForm.vue b/src/views/qualification/escTask/components/LableApplyForm.vue
index 7c98e5b..b0b2b3e 100644
--- a/src/views/qualification/escTask/components/LableApplyForm.vue
+++ b/src/views/qualification/escTask/components/LableApplyForm.vue
@@ -114,7 +114,7 @@
                                 <template #default="scope">
                                     <span v-if="scope.row.startTime"> {{
                                         moment(scope.row.startTime).format('YYYY-MM-DD')
-                                        }}</span>
+                                    }}</span>
                                     <span v-else>-</span>
                                 </template>
                             </el-table-column>
@@ -124,7 +124,7 @@
                                     <template v-else>
                                         <span v-if="scope.row.expireTime"> {{
                                             moment(scope.row.expireTime).format('YYYY-MM-DD')
-                                            }}</span>
+                                        }}</span>
                                         <span v-else>-</span>
                                     </template>
                                 </template>
@@ -290,7 +290,7 @@ const selectChanged = async (value) => {
     ruleForm.value.dependencyId = curUser.dependencyId;
     ruleForm.value.escUserName = curUser.escUserName;
 
-    if(curUser.workNo) getCurrentUserRecurrentTraining()
+    if (curUser.workNo) getCurrentUserRecurrentTraining()
 
     if (ruleForm.value.labelId) {
         requiredQualifications.value = qualificationsMap[ruleForm.value.labelId] || [];
@@ -361,6 +361,11 @@ const handleSubmit = () => {
                 proxy.$modal.msgError(`未找到您的复训信息，不能提交申请!`)
                 return false;
             }
+            const passTrainRecord = userRecurrentTrainingData.value.filter(item => item.state == '通过')
+            if (passTrainRecord.length == 0) {
+                proxy.$modal.msgError(`您今年的复训未通过，不能提交申请!`)
+                return false;
+            }
 
             const qualificArr = tableData.value.filter(item => item.certificateUrl)
             console.log('是否有资质证书', qualificArr)
diff --git a/src/views/qualification/escTask/components/LableReApplyForm.vue b/src/views/qualification/escTask/components/LableReApplyForm.vue
index 42ee688..964e50f 100644
--- a/src/views/qualification/escTask/components/LableReApplyForm.vue
+++ b/src/views/qualification/escTask/components/LableReApplyForm.vue
@@ -114,7 +114,7 @@
                                 <template #default="scope">
                                     <span v-if="scope.row.startTime"> {{
                                         moment(scope.row.startTime).format('YYYY-MM-DD')
-                                        }}</span>
+                                    }}</span>
                                     <span v-else>-</span>
                                 </template>
                             </el-table-column>
@@ -124,7 +124,7 @@
                                     <template v-else>
                                         <span v-if="scope.row.expireTime"> {{
                                             moment(scope.row.expireTime).format('YYYY-MM-DD')
-                                            }}</span>
+                                        }}</span>
                                         <span v-else>-</span>
                                     </template>
                                 </template>
@@ -376,6 +376,16 @@ const handleCancel = () => {
 const handleSubmit = () => {
     proxy.$refs["ruleFormRef"].validate(valid => {
         if (valid) {
+            if (userRecurrentTrainingData.value.length == 0) {
+                proxy.$modal.msgError(`未找到您的复训信息，不能提交申请!`)
+                return false;
+            }
+            const passTrainRecord = userRecurrentTrainingData.value.filter(item => item.state == '通过')
+            if (passTrainRecord.length == 0) {
+                proxy.$modal.msgError(`您今年的复训未通过，不能提交申请!`)
+                return false;
+            }
+
             const qualificArr = tableData.value.filter(item => item.certificateUrl)
             console.log('是否有资质证书', qualificArr)
             if (qualificArr.length < requiredQualifications.value.length) {
diff --git a/src/views/qualification/myQualifications/components/LableApplyForm.vue b/src/views/qualification/myQualifications/components/LableApplyForm.vue
index be18df8..a92dd2f 100644
--- a/src/views/qualification/myQualifications/components/LableApplyForm.vue
+++ b/src/views/qualification/myQualifications/components/LableApplyForm.vue
@@ -93,7 +93,7 @@
                     <el-table-column prop="startTime" label="有效开始日期" width="150">
                         <template #default="scope">
                             <span v-if="scope.row.startTime"> {{ moment(scope.row.startTime).format('YYYY-MM-DD')
-                                }}</span>
+                            }}</span>
                             <span v-else>-</span>
                         </template>
                     </el-table-column>
@@ -102,7 +102,7 @@
                             <span v-if="scope.row.expireFlag == 0">长期</span>
                             <template v-else>
                                 <span v-if="scope.row.expireTime"> {{ moment(scope.row.expireTime).format('YYYY-MM-DD')
-                                    }}</span>
+                                }}</span>
                                 <span v-else>-</span>
                             </template>
                         </template>
@@ -296,6 +296,11 @@ const handleSubmit = () => {
                 proxy.$modal.msgError(`未找到您的复训信息，不能提交申请!`)
                 return false;
             }
+            const passTrainRecord = userRecurrentTrainingData.value.filter(item => item.state == '通过')
+            if (passTrainRecord.length == 0) {
+                proxy.$modal.msgError(`您今年的复训未通过，不能提交申请!`)
+                return false;
+            }
 
             const qualificArr = tableData.value.filter(item => item.certificateUrl)
             console.log('是否有资质证书', qualificArr)
diff --git a/src/views/qualification/myQualifications/components/LableReApplyForm.vue b/src/views/qualification/myQualifications/components/LableReApplyForm.vue
index 5c03676..ff7e729 100644
--- a/src/views/qualification/myQualifications/components/LableReApplyForm.vue
+++ b/src/views/qualification/myQualifications/components/LableReApplyForm.vue
@@ -93,7 +93,7 @@
                     <el-table-column prop="startTime" label="有效开始日期" width="150">
                         <template #default="scope">
                             <span v-if="scope.row.startTime"> {{ moment(scope.row.startTime).format('YYYY-MM-DD')
-                            }}</span>
+                                }}</span>
                             <span v-else>-</span>
                         </template>
                     </el-table-column>
@@ -102,7 +102,7 @@
                             <span v-if="scope.row.expireFlag == 0">长期</span>
                             <template v-else>
                                 <span v-if="scope.row.expireTime"> {{ moment(scope.row.expireTime).format('YYYY-MM-DD')
-                                }}</span>
+                                    }}</span>
                                 <span v-else>-</span>
                             </template>
                         </template>
@@ -287,6 +287,16 @@ const handleCancel = () => {
 const handleSubmit = () => {
     proxy.$refs["ruleFormRef"].validate(valid => {
         if (valid) {
+            if (userRecurrentTrainingData.value.length == 0) {
+                proxy.$modal.msgError(`未找到您的复训信息，不能提交申请!`)
+                return false;
+            }
+            const passTrainRecord = userRecurrentTrainingData.value.filter(item => item.state == '通过')
+            if (passTrainRecord.length == 0) {
+                proxy.$modal.msgError(`您今年的复训未通过，不能提交申请!`)
+                return false;
+            }
+            
             const qualificArr = tableData.value.filter(item => item.certificateUrl)
             console.log('是否有资质证书', qualificArr)
             if (qualificArr.length < requiredQualifications.value.length) {
diff --git a/src/views/safetyReview/examinerEscTask/index.vue b/src/views/safetyReview/examinerEscTask/index.vue
index bd67097..a25714c 100644
--- a/src/views/safetyReview/examinerEscTask/index.vue
+++ b/src/views/safetyReview/examinerEscTask/index.vue
@@ -48,6 +48,12 @@
                         <el-text v-if="scope.row.level == 4" type="danger" class="yxText">优秀项</el-text>
                     </template>
                 </el-table-column>
+                <el-table-column prop="correctionFlag" label="是否整改" align="center" width="120">
+                    <template #default="scope">
+                        <el-text v-if="scope.row.correctionFlag == 1" type="danger" class="dangerText">是</el-text>
+                        <el-text v-if="scope.row.correctionFlag == 0" type="danger" class="successText">否</el-text>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="planDoneTime" label="计划完成时间" width="150">
                     <template #default="scope">
                         <span v-if="scope.row.planDoneTime"> {{ scope.row.planDoneTime }}</span>
@@ -64,11 +70,13 @@
                 </el-table-column>
                 <el-table-column label="操作" align="center" fixed="right" width="100">
                     <template #default="scope">
-                        <el-button type="primary" v-if="(scope.row.state == 0 || scope.row.state == 9) && scope.row.correctionFlag == 1" text
+                        <el-button type="primary"
+                            v-if="(scope.row.state == 0 || scope.row.state == 9) && scope.row.correctionFlag == 1" text
                             class="replayTextBtn" v-hasPermi="['examinerEscTask:correction']"
                             @click="handleCorrection(scope.row)">立即整改</el-button>
 
-                        <el-button type="primary" v-if="scope.row.state == 1 || scope.row.state == 2 || scope.row.correctionFlag == 0" text
+                        <el-button type="primary"
+                            v-if="scope.row.state == 1 || scope.row.state == 2 || scope.row.correctionFlag == 0" text
                             class="replayTextBtn" v-hasPermi="['examinerEscTask:viewDetail']"
                             @click="handleView(scope.row)">查看</el-button>
                     </template>