From 676a3345d5a1e317190dc7e464435c016fcd94f4 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Fri, 5 Jul 2024 19:14:33 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=8C=87?= =?UTF-8?q?=E6=8C=A5=E9=83=A8=E5=A4=A7=E5=B1=8F=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/config.ts | 4 +- src/routers/modules/staticRouter.ts | 4 +- .../dialogCompnnents/member-count-list.vue | 2 + .../dialogCompnnents/safe-info.vue | 177 ++++++++++++------ 4 files changed, 122 insertions(+), 65 deletions(-) diff --git a/src/config/config.ts b/src/config/config.ts index 68d46c8..fe79fea 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -28,8 +28,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 -export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 -// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +// export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 +export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "zkjc"; //中科佳成项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 2f4fdda..6408db4 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,8 +25,8 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/large", name: "大屏", // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 - component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 + component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + // component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) diff --git a/src/views/commandScreen/dialogCompnnents/member-count-list.vue b/src/views/commandScreen/dialogCompnnents/member-count-list.vue index ea6b54c..35f2d74 100644 --- a/src/views/commandScreen/dialogCompnnents/member-count-list.vue +++ b/src/views/commandScreen/dialogCompnnents/member-count-list.vue @@ -177,6 +177,7 @@ 照片
所属企业
所属班组
-
身份证号
+
身份证号
联系电话
-
考试时间
+
考试时间
培训状态
@@ -58,18 +58,20 @@ {{ item.personType == 1 ? item.teamName : item.departmentName }} -
+
{{ item.idCard }}
{{ item.phoneNumber }}
-
+
{{ item.educationTime }}
-
{{ item.isExamPass == -1 ? "未培训" : item.isExamPass == 1 ? "合格" : "不合格" }}
+
+ {{ item.isExamPass == -1 ? "未培训" : item.isExamPass == 1 ? "合格" : "不合格" }} +
@@ -78,6 +80,7 @@
{{ item.title || "--" }}
-
{{ item.trainBeginTime || '--'}} - {{item.trainEndTime || '--' }}
-
{{ item.workerNum || '--' }}
-
{{ item.createByName || '--' }}
-
{{ item.completeRadio != null ? item.completeRadio + '%' : '--' }}
-
{{ item.passRadio != null ? item.passRadio + '%' : '--' }}
-
查看培训详情
+
{{ item.trainBeginTime || "--" }} - {{ item.trainEndTime || "--" }}
+
{{ item.workerNum || "--" }}
+
{{ item.createByName || "--" }}
+
+ {{ item.completeRadio != null ? item.completeRadio + "%" : "--" }} +
+
{{ item.passRadio != null ? item.passRadio + "%" : "--" }}
+
查看培训详情
@@ -141,6 +146,7 @@
序号
姓名
课程名称
-
身份证号
+
身份证号
培训计划名称
开始学习时间
结束学习时间
@@ -173,20 +179,32 @@
{{ index + 1 }}
-
{{ item.workerName || '--' }}
+
{{ item.workerName || "--" }}
- - {{ eduPlanItem.courseName || '--' }} + + {{ eduPlanItem.courseName || "--" }}
-
{{ item.workerCard || '--' }}
+
{{ item.workerCard || "--" }}
- - {{ eduPlanItem.name || '--' }} + + {{ eduPlanItem.name || "--" }}
-
{{ item.beginTime || '--' }}
-
{{ item.endTime || '--' }}
+
{{ item.beginTime || "--" }}
+
{{ item.endTime || "--" }}
@@ -202,37 +220,51 @@
姓名
科目名称
考试名称
-
培训计划名称
-
身份证号
-
开始考试时间
+
培训计划名称
+
身份证号
+
开始考试时间
作答时长
考试结果
考试总分
考得分
-
剩余重考次数
+
剩余重考次数
{{ index + 1 }}
-
{{ item.workerName || '--' }}
-
{{ item.subjectName || '--' }}
+
{{ item.workerName || "--" }}
+
{{ item.subjectName || "--" }}
- - {{ item.examPaperName || '--' }} + + {{ item.examPaperName || "--" }}
-
- - {{ eduPlanItem.name || '--' }} +
+ + {{ eduPlanItem.name || "--" }}
-
{{ item.workerCard || '--' }}
-
{{ item.startExamTime || '--' }}
-
{{ item.duration || '--' }}
-
{{ item.isPass == 1 ? '合格' : '不合格'}}
-
{{ item.totalScore != null ? item.totalScore : 0}}
-
{{ item.score != null ? item.score : 0}}
-
{{ item.examCount != null ? item.examCount : 0}}
+
{{ item.workerCard || "--" }}
+
{{ item.startExamTime || "--" }}
+
{{ item.duration || "--" }}
+
{{ item.isPass == 1 ? "合格" : "不合格" }}
+
{{ item.totalScore != null ? item.totalScore : 0 }}
+
{{ item.score != null ? item.score : 0 }}
+
+ {{ item.examCount != null ? item.examCount : 0 }} +
@@ -246,7 +278,7 @@
序号
姓名
-
身份证号
+
身份证号
培训计划名称
科目类型
课程名称
@@ -254,17 +286,29 @@
{{ index + 1 }}
-
{{ item.workerName || '--' }}
-
{{ item.workerCard || '--' }}
+
{{ item.workerName || "--" }}
+
{{ item.workerCard || "--" }}
- - {{ eduPlanItem.name || '--' }} + + {{ eduPlanItem.name || "--" }}
-
{{ eduPlanItem.subjectName || '--' }}
+
{{ eduPlanItem.subjectName || "--" }}
- - {{ eduPlanItem.courseName || '--' }} + + {{ eduPlanItem.courseName || "--" }}
@@ -280,7 +324,7 @@
序号
姓名
-
身份证号
+
身份证号
培训计划名称
科目类型
考试名称
@@ -288,17 +332,29 @@
{{ index + 1 }}
-
{{ item.workerName || '--' }}
-
{{ item.workerCard || '--' }}
+
{{ item.workerName || "--" }}
+
{{ item.workerCard || "--" }}
- - {{ eduPlanItem.name || '--' }} + + {{ eduPlanItem.name || "--" }}
-
{{ eduPlanItem.subjectName || '--' }}
+
{{ eduPlanItem.subjectName || "--" }}
- - {{ eduPlanItem.paperName || '--' }} + + {{ eduPlanItem.paperName || "--" }}
@@ -310,6 +366,7 @@
import { ref, onMounted } from "vue"; import { GlobalStore } from "@/stores"; -import type { TabsPaneContext } from 'element-plus' +import type { TabsPaneContext } from "element-plus"; import noDataImage from "@/assets/images/vehicleManagement/car.png"; -import { getSafeEducationDataApi,getEduPlanDataApi, - getStudyDataApi,getExamDataApi -} from "@/api/modules/agjtCommandApi"; +import { getSafeEducationDataApi, getEduPlanDataApi, getStudyDataApi, getExamDataApi } from "@/api/modules/agjtCommandApi"; const store = GlobalStore(); const props = defineProps(["tip"]); const BASEURL = import.meta.env.VITE_API_URL; @@ -342,9 +397,9 @@ const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 const currentTab = ref("safeEdu" as any); function handleChangeTab(val: any) { //教育培训相关属性 - isDetail.value = false - activeIndex.value = 0 - activeName.value = 'first' + isDetail.value = false; + activeIndex.value = 0; + activeName.value = "first"; //切换安全教育和教育培训相关属性 currentTab.value = val; partyMemberList.value = [];