From 1dcda2bd7edee5d3a00b7b91843e84142be2b4c7 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 24 Jun 2024 22:37:07 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8C=87?= =?UTF-8?q?=E6=8C=A5=E9=83=A8=E5=A4=A7=E5=B1=8F=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/config/config.ts | 4 +- src/routers/modules/staticRouter.ts | 4 +- .../projectOverview/centerBottom.vue | 74 ++++++++++++++----- .../commandCenter/leftBottom.vue | 4 +- 5 files changed, 64 insertions(+), 26 deletions(-) diff --git a/.env.development b/.env.development index 7ed4e2e..d433bd5 100644 --- a/.env.development +++ b/.env.development @@ -3,9 +3,9 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -VITE_API_URL = 'http://192.168.34.155:19111' +# VITE_API_URL = 'http://192.168.34.155:19111' # VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 -# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 +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' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' diff --git a/src/config/config.ts b/src/config/config.ts index ff2368c..ff60707 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -29,8 +29,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 -export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 -// export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 +// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "zkjc"; //中科佳成项目 // export const COMPANY: string = "cqna"; //重庆南岸项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 550726a..fbcf688 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,10 +25,10 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/large", name: "大屏", // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - component: () => import("@/views/commandScreen/indexCommand.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/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ { diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue index d144f13..fc50dff 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/centerBottom.vue @@ -49,10 +49,10 @@
{{ item.jlNotPerformNum || 0 }}/{{ item.jlInServiceNum || 0 }}
- -
- -

暂无数据

+
+ +

暂无数据

+
@@ -183,6 +183,7 @@ onMounted(async () => { .leftTop { width: 100%; height: 100%; + .top-content { width: 18%; position: absolute; @@ -191,6 +192,7 @@ onMounted(async () => { display: flex; align-items: center; justify-content: space-between; + span { font-family: ABeeZee, ABeeZee; font-weight: normal; @@ -203,19 +205,23 @@ onMounted(async () => { text-transform: none; cursor: pointer; } + .active { color: #ffffff; } } + .box-content { width: 100%; height: 100%; padding-top: 1%; + .remark-top-data { display: flex; align-items: center; justify-content: space-around; margin-bottom: 2%; + .top-data-item { width: 135px; height: 51px; @@ -225,30 +231,37 @@ onMounted(async () => { flex-direction: column; padding: 0.5% 0; padding-left: 2%; + span:nth-child(1) { font-size: 16px; color: #fff; font-family: ABeeZee-Regular; margin-bottom: 1%; } + span:nth-child(2) { font-size: 24px; color: #65d7f9; font-family: ABeeZee-Regular; } } + .top-data-item:not(:last-child) { margin-right: 2%; } } + .remark-bottom-table { height: 62%; box-sizing: border-box; margin: 0 2%; position: relative; + .list-content { height: 95%; width: 100%; + position: relative; + .tab-list { display: flex; align-items: center; @@ -260,6 +273,7 @@ onMounted(async () => { top: 75%; color: #ccc; font-size: 16px; + // justify-content: space-around; div { width: 25%; @@ -267,8 +281,10 @@ onMounted(async () => { white-space: nowrap; } } + .list-box { height: 82%; + .listStyle { display: flex; align-items: center; @@ -278,23 +294,27 @@ onMounted(async () => { margin-top: 0.5%; cursor: pointer; background: rgba(0, 122, 255, 0.06); + div { width: 25%; text-align: center; white-space: nowrap; } } + .listStyle:hover { background: rgba(0, 122, 255, 0.43); } } } } + .member-top-data { display: flex; align-items: center; justify-content: center; margin-bottom: 2%; + .top-data-item { width: 135px; height: 51px; @@ -304,30 +324,36 @@ onMounted(async () => { flex-direction: column; padding: 0.5% 0; padding-left: 2%; + span:nth-child(1) { font-size: 16px; color: #fff; font-family: ABeeZee-Regular; margin-bottom: 1%; } + span:nth-child(2) { font-size: 24px; color: #65d7f9; font-family: ABeeZee-Regular; } } + .top-data-item:not(:last-child) { margin-right: 2%; } } + .member-bottom-table { height: 62%; box-sizing: border-box; margin: 0 2%; position: relative; + .list-content { height: 95%; width: 100%; + .tab-list { display: flex; align-items: center; @@ -339,6 +365,7 @@ onMounted(async () => { top: 75%; color: #ccc; font-size: 16px; + // justify-content: space-around; div { width: 17%; @@ -346,8 +373,10 @@ onMounted(async () => { white-space: nowrap; } } + .list-box { height: 82%; + .listStyle { display: flex; align-items: center; @@ -357,34 +386,43 @@ onMounted(async () => { margin-top: 0.5%; cursor: pointer; background: rgba(0, 122, 255, 0.06); + div { width: 17%; text-align: center; white-space: nowrap; } } + .listStyle:hover { background: rgba(0, 122, 255, 0.43); } } } } - .not-data { - top: 40%; - width: 30%; - left: 35%; - position: absolute; - text-align: center; - img { - width: 50%; - } - p { - color: #fff; - font-size: 14px; - } - } } } + +.not-data { + width: 22%; + height: 50%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + position: absolute; + text-align: center; + + img { + width: 50%; + height: 100%; + } + + p { + color: #fff; + font-size: 14px; + } +} + ::v-deep .h-card .content { height: 80%; margin-top: 1.8%; diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index a34953f..54f8b17 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -181,7 +181,7 @@ const randerInfo = reactive({ { name: "未闭合隐患", max: 1 }, { name: "特殊工种人员", max: 1 }, { name: "平均安全绩效评分", max: 1 }, - { name: "平均培训通过率", max: 1 } + { name: "平均培训未通过率", max: 1 } ], titleInfo: { titleLeft: "未来三天人员风险概率预测", @@ -226,7 +226,7 @@ const openDialogData = async () => { { name: "未闭合隐患", max: 1 }, { name: "特殊工种人员", max: 1 }, { name: "平均安全绩效评分", max: 1 }, - { name: "平均培训通过率", max: 1 } + { name: "平均培训未通过率", max: 1 } ], titleInfo: { titleLeft: "未来三天人员风险概率预测",