diff --git a/.env.development b/.env.development index fde4112..4f79e0e 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.155:19111' -# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' @@ -33,7 +33,9 @@ NODE_ENV = 'development' # 中科安信 # VITE_API_URL = 'http://8.136.222.164:8808' # 中科佳成 -VITE_API_URL = 'http://1.13.185.209:8089' +# VITE_API_URL = 'http://1.13.185.209:8089' +# 九柱 +# VITE_API_URL = 'http://jxjzw.zhgdyun.com:11111' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/assets/images/lcbTip.png b/src/assets/images/lcbTip.png new file mode 100644 index 0000000..217c722 Binary files /dev/null and b/src/assets/images/lcbTip.png differ diff --git a/src/config/config.ts b/src/config/config.ts index fe79fea..68d46c8 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 6408db4..2f4fdda 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/agjtLiveScreen/liveScreen/leftBottom.vue b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue index 9fe7e12..c0c2e92 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue @@ -191,7 +191,7 @@ function drawPie(pieNum: number, pieInfo: any) { name: "pieCircle", type: "pie", radius: ["45%", "60%"], - minAngle: 45, + minAngle: 50, labelLine: { length: 1 }, @@ -199,9 +199,11 @@ function drawPie(pieNum: number, pieInfo: any) { // formatter: '{a|{a}}{abg|}\n{hr|}\n {b|{b}：}{c} {per|{d}%} ', formatter: function (params: any) { let done = "已完成：" + pieInfo.outPie[params.dataIndex].complete + " "; + const oldName = pieInfo.outPie[params.dataIndex].name; + const newName = oldName.length > 7 ? oldName.substring(0, 7) + "..." : oldName; return ( "{name|" + - pieInfo.outPie[params.dataIndex].name + + newName + "}{abg|} {per|" + pieInfo.outPie[params.dataIndex].ratio + "%}\n{hr|}\n{done|" + diff --git a/src/views/agjtLiveScreen/liveScreen/leftTop.vue b/src/views/agjtLiveScreen/liveScreen/leftTop.vue index a9bd506..959ac61 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftTop.vue @@ -96,7 +96,7 @@ 承包商名称： {{ item.name || "--" }} - +
diff --git a/src/views/commandScreen/commandCenter/centerTop.vue b/src/views/commandScreen/commandCenter/centerTop.vue index 5445857..9c3edfc 100644 --- a/src/views/commandScreen/commandCenter/centerTop.vue +++ b/src/views/commandScreen/commandCenter/centerTop.vue @@ -80,9 +80,9 @@
-
+
危险特殊作业 {{ statsDirectorateBigScreen.dangerousEngineeringRecordNum }}
diff --git a/src/views/commandScreen/dialogCompnnents/data-dialog.vue b/src/views/commandScreen/dialogCompnnents/data-dialog.vue index ce8959b..e774727 100644 --- a/src/views/commandScreen/dialogCompnnents/data-dialog.vue +++ b/src/views/commandScreen/dialogCompnnents/data-dialog.vue @@ -2,7 +2,13 @@
@@ -46,9 +52,10 @@
-
+ +
diff --git a/src/views/commandScreen/dialogCompnnents/member-count-list.vue b/src/views/commandScreen/dialogCompnnents/member-count-list.vue index 70fff98..ea6b54c 100644 --- a/src/views/commandScreen/dialogCompnnents/member-count-list.vue +++ b/src/views/commandScreen/dialogCompnnents/member-count-list.vue @@ -27,11 +27,11 @@
-
{{ index + 1 }}
-
{{ item.engineeringName }}
+
{{index + 1}}
+
{{item.engineeringName || '--'}}
- {{ item.progressDescribe }} + {{item.progressDescribe || '--'}}
@@ -47,8 +47,8 @@
-
{{ item.createUserName }}
-
{{ item.createTime }}
+
{{item.createUserName || '--'}}
+
{{item.createTime || '--'}}
@@ -67,24 +67,20 @@
-
{{ index + 1 }}
-
{{ item.engineeringName }}
-
- {{ - item.status == 2 - ? "待整改" - : item.status == 3 - ? "待复查" - : item.status == 4 - ? "待核验" - : item.status == 5 - ? "合格" - : "" - }} -
-
{{ item.inspectManName }}
-
{{ item.inspectTime }}
-
{{ item.changeName }}
+
{{index + 1}}
+
{{item.engineeringName || '--'}}
+
{{item.status == 2 + ? '待整改' + : item.status == 3 + ? '待复查' + : item.status == 4 + ? '待核验' + : item.status == 5 + ? '合格' + : '--'}}
+
{{item.inspectManName || '--'}}
+
{{item.inspectTime || '--'}}
+
{{item.changeName || '--'}}
@@ -99,19 +95,25 @@
验收描述
验收结果
图片
-
申请验收人
+
记录人
创建时间
-
{{ index + 1 }}
-
{{ item.engineeringName }}
+
{{index + 1}}
+
{{item.engineeringName || '--'}}
- {{ item.acceptanceDesc }} + {{item.acceptanceDesc || '--'}}
-
{{ item.acceptanceResult == 1 ? "合格" : "不合格" }}
+
{{ + item.acceptanceResult == undefined || + item.acceptanceResult == null || + item.acceptanceResult == '' ? '待确认' : + item.acceptanceResult == 1 ? '合格' : + item.acceptanceResult == 2 ? '不合格' : '' + }}
-
{{ item.applyAcceptanceUserName }}
-
{{ item.createTime }}
+
{{item.acceptanceUserName || '--'}}
+
{{item.createTime || '--'}}
@@ -145,9 +147,13 @@
-
{{ index + 1 }}
-
{{ item.engineeringName }}
-
{{ item.buildSituation }}
+
{{index + 1}}
+
{{item.engineeringName || '--'}}
+
+ + {{item.buildSituation || '--'}} + +
-
{{ item.createUserName }}
-
{{ item.createTime }}
+
{{item.createUserName || '--'}}
+
{{item.createTime || '--'}}
@@ -206,7 +212,11 @@ {{ item.type === typeItem.type ? typeItem.name : "" }}
-
{{ item.workTicketCode || "--" }}
+
+ + {{item.workTicketCode || '--'}} + +
{{ item.progressDescribe || "--" }} @@ -225,9 +235,13 @@
-
{{ item.jobApplicationUnitName || "--" }}
-
{{ item.createUserName || "--" }}
-
{{ item.createTime || "--" }}
+
+ + {{item.jobApplicationUnitName || '--'}} + +
+
{{item.createUserName || '--'}}
+
{{item.createTime || '--'}}
@@ -251,27 +265,31 @@
{{ index + 1 }}
- {{ item.type === typeItem.type ? typeItem.name : "--" }} + {{ item.type === typeItem.type? typeItem.name : '' }}
-
{{ item.workTicketCode || "--" }}
- {{ - item.status == 2 - ? "待整改" - : item.status == 3 - ? "待复查" - : item.status == 4 - ? "待核验" - : item.status == 5 - ? "合格" - : "--" - }} + + {{item.workTicketCode || '--'}} +
-
{{ item.inspectManName || "--" }}
-
{{ item.inspectTime || "--" }}
-
{{ item.jobApplicationUnitName || "--" }}
-
{{ item.changeName || "--" }}
+
{{item.status == 2 + ? '待整改' + : item.status == 3 + ? '待复查' + : item.status == 4 + ? '待核验' + : item.status == 5 + ? '合格' + : '--'}}
+
{{item.inspectManName || '--'}}
+
{{item.inspectTime || '--'}}
+
+ + {{item.jobApplicationUnitName || '--'}} + +
+
{{item.changeName || '--'}}
@@ -287,7 +305,7 @@
验收描述
验收结果
图片
-
申请验收人
+
记录人
创建时间
@@ -295,16 +313,26 @@
{{ index + 1 }}
- {{ item.type === typeItem.type ? typeItem.name : "--" }} + {{ item.type === typeItem.type? typeItem.name : '' }}
-
{{ item.workTicketCode || "--" }}
+
+ + {{item.workTicketCode || '--'}} + +
{{ item.acceptanceDesc || "--" }}
-
{{ item.acceptanceResult == 1 ? "合格" : "不合格" }}
+
{{ + item.acceptanceResult == undefined || + item.acceptanceResult == null || + item.acceptanceResult == '' ? '待确认' : + item.acceptanceResult == 1 ? '合格' : + item.acceptanceResult == 2 ? '不合格' : '' + }}
-
{{ item.applyAcceptanceUserName || "--" }}
-
{{ item.createTime || "--" }}
+
{{item.acceptanceUserName || '--'}}
+
{{item.createTime || '--'}}
@@ -342,11 +370,19 @@
{{ index + 1 }}
- {{ item.type === typeItem.type ? typeItem.name : "--" }} + {{ item.type === typeItem.type? typeItem.name : '' }}
-
{{ item.workTicketCode || "--" }}
-
{{ item.buildSituation || "--" }}
+
+ + {{item.workTicketCode || '--'}} + +
+
+ + {{item.buildSituation || '--'}} + +
{ .political-outlook { height: 97%; margin: 0 60px; + // background-color: #fff; + transform: translateY(40px) translateX(-13px); .content { height: 95%; width: 100%; @@ -333,6 +335,7 @@ onMounted(async () => { } .listBox { height: 73%; + // background-color: #fff; .listStyle { display: flex; align-items: center; diff --git a/src/views/commandScreen/dialogCompnnents/quality-manage.vue b/src/views/commandScreen/dialogCompnnents/quality-manage.vue index 80a1f46..4b6195b 100644 --- a/src/views/commandScreen/dialogCompnnents/quality-manage.vue +++ b/src/views/commandScreen/dialogCompnnents/quality-manage.vue @@ -153,7 +153,7 @@ const statusList = ref([ { name: "待复查", value: 3 }, { name: "待核验", value: 4 }, { name: "合格", value: 5 }, - { name: "已撤回", value: 6 }, + // { name: "已撤回", value: 6 }, { name: "超期未关闭", value: 7 }, ]); let pageNo = ref(1 as any); @@ -256,9 +256,9 @@ const getMemberCountList = async (tip:any) => { // const res: any = await getInspectionRecordApi(requestData); const res: any = await getQualityInspectionRecordApi(requestData); if(tip == 'more'){ - partyMemberList.value = partyMemberList.value.concat(res.result.page.records); + partyMemberList.value = partyMemberList.value.concat(res.result.page.records.filter((item:any) => item.status != 6)); } else { - partyMemberList.value = res.result.page.records; + partyMemberList.value = res.result.page.records.filter((item:any) => item.status != 6); } // 为图片拼接IP // partyMemberList.value.map((item:any) => { diff --git a/src/views/commandScreen/dialogCompnnents/safe-hidden.vue b/src/views/commandScreen/dialogCompnnents/safe-hidden.vue index 89def6d..53f2e72 100644 --- a/src/views/commandScreen/dialogCompnnents/safe-hidden.vue +++ b/src/views/commandScreen/dialogCompnnents/safe-hidden.vue @@ -150,7 +150,7 @@ const statusList = ref([ { name: "待复查", value: 3 }, { name: "待核验", value: 4 }, { name: "合格", value: 5 }, - { name: "已撤回", value: 6 }, + // { name: "已撤回", value: 6 }, { name: "超期未关闭", value: 7 }, ]); let pageNo = ref(1 as any); @@ -251,9 +251,9 @@ const getMemberCountList = async (tip:any) => { } const res: any = await getInspectionRecordApi(requestData); if(tip == 'more'){ - partyMemberList.value = partyMemberList.value.concat(res.result.page.records); + partyMemberList.value = partyMemberList.value.concat(res.result.page.records.filter((item:any) => item.status != 6)); } else { - partyMemberList.value = res.result.page.records; + partyMemberList.value = res.result.page.records.filter((item:any) => item.status != 6); } // 为图片拼接IP // partyMemberList.value.map((item:any) => { diff --git a/src/views/commandScreen/dialogCompnnents/safe-info.vue b/src/views/commandScreen/dialogCompnnents/safe-info.vue index 5ef2cfb..8287c95 100644 --- a/src/views/commandScreen/dialogCompnnents/safe-info.vue +++ b/src/views/commandScreen/dialogCompnnents/safe-info.vue @@ -19,9 +19,9 @@
照片
所属企业
所属班组
-
身份证号
+
身份证号
联系电话
-
考试时间
+
考试时间
培训状态
@@ -37,6 +37,9 @@ :src="BASEURL + '/image/' + item.fieldAcquisitionUrl" :preview-src-list="[BASEURL + '/image/' + item.fieldAcquisitionUrl]" > +
@@ -55,13 +58,13 @@ {{ item.personType == 1 ? item.teamName : item.departmentName }}
-
+
{{ item.idCard }}
{{ item.phoneNumber }}
-
+
{{ item.educationTime }} @@ -124,12 +127,12 @@ {{ item.title || "--" }}
-
{{ item.trainBeginTime || "--" }} - {{ item.trainEndTime || "--" }}
-
{{ item.workerNum || "--" }}
-
{{ item.createByName || "--" }}
-
{{ item.completeRadio ? item.completeRadio + "%" : "--" }}
-
{{ item.passRadio ? item.passRadio + "%" : "--" }}
-
查看培训详情
+
{{ item.trainBeginTime || '--'}} - {{item.trainEndTime || '--' }}
+
{{ item.workerNum || '--' }}
+
{{ item.createByName || '--' }}
+
{{ item.completeRadio != null ? item.completeRadio + '%' : '--' }}
+
{{ item.passRadio != null ? item.passRadio + '%' : '--' }}
+
查看培训详情
@@ -162,7 +165,7 @@
序号
姓名
课程名称
-
身份证号
+
身份证号
培训计划名称
开始学习时间
结束学习时间
@@ -170,12 +173,20 @@
{{ index + 1 }}
-
{{ item.workerName || "--" }}
-
{{ item.courseName || "--" }}
-
{{ item.workerCard || "--" }}
-
{{ eduPlanItem.name || "--" }}
-
{{ item.beginTime || "--" }}
-
{{ item.endTime || "--" }}
+
{{ item.workerName || '--' }}
+
+ + {{ eduPlanItem.courseName || '--' }} + +
+
{{ item.workerCard || '--' }}
+
+ + {{ eduPlanItem.name || '--' }} + +
+
{{ item.beginTime || '--' }}
+
{{ item.endTime || '--' }}
@@ -191,29 +202,37 @@
姓名
科目名称
考试名称
-
培训计划名称
-
身份证号
-
开始考试时间
+
培训计划名称
+
身份证号
+
开始考试时间
作答时长
考试结果
考试总分
考得分
-
剩余重考次数
+
剩余重考次数
{{ index + 1 }}
-
{{ item.workerName || "--" }}
-
{{ item.subjectName || "--" }}
-
{{ item.examPaperName || "--" }}
-
{{ eduPlanItem.name || "--" }}
-
{{ item.workerCard || "--" }}
-
{{ item.startExamTime || "--" }}
-
{{ item.duration || "--" }}
-
{{ item.isPass || "--" }}
-
{{ item.totalScore || "--" }}
-
{{ item.score || "--" }}
-
{{ item.examCount || "--" }}
+
{{ item.workerName || '--' }}
+
{{ item.subjectName || '--' }}
+
+ + {{ item.examPaperName || '--' }} + +
+
+ + {{ 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}}
@@ -227,7 +246,7 @@
序号
姓名
-
身份证号
+
身份证号
培训计划名称
科目类型
课程名称
@@ -235,11 +254,19 @@
{{ index + 1 }}
-
{{ item.workerName || "--" }}
-
{{ item.workerCard || "--" }}
-
{{ eduPlanItem.name || "--" }}
-
{{ eduPlanItem.subjectName || "--" }}
-
{{ eduPlanItem.courseName || "--" }}
+
{{ item.workerName || '--' }}
+
{{ item.workerCard || '--' }}
+
+ + {{ eduPlanItem.name || '--' }} + +
+
{{ eduPlanItem.subjectName || '--' }}
+
+ + {{ eduPlanItem.courseName || '--' }} + +
@@ -253,7 +280,7 @@
序号
姓名
-
身份证号
+
身份证号
培训计划名称
科目类型
考试名称
@@ -261,11 +288,19 @@
{{ index + 1 }}
-
{{ item.workerName || "--" }}
-
{{ item.workerCard || "--" }}
-
{{ eduPlanItem.name || "--" }}
-
{{ eduPlanItem.subjectName || "--" }}
-
{{ eduPlanItem.paperName || "--" }}
+
{{ item.workerName || '--' }}
+
{{ item.workerCard || '--' }}
+
+ + {{ eduPlanItem.name || '--' }} + +
+
{{ eduPlanItem.subjectName || '--' }}
+
+ + {{ eduPlanItem.paperName || '--' }} + +
@@ -291,8 +326,11 @@