From f579491e4a6323dace4f69c542feb6a018f7cd4b Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Thu, 20 Jun 2024 10:15:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=A4=A7=E5=B1=8F=E5=92=8C=E6=80=BB=E8=A7=88=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=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 +- .env.production | 4 +- src/config/config.ts | 4 +- src/routers/modules/staticRouter.ts | 4 +- .../projectOverview/leftCenter.vue | 8 +-- .../projectOverview/rightCenter.vue | 11 ++- .../commandCenter/leftBottom.vue | 3 +- .../commandScreen/commandCenter/rightAll.vue | 3 +- .../components/radarMapOption.vue | 4 +- .../commandCenter/centerBottom.vue | 8 +-- .../commandCenter/leftBottom.vue | 8 +-- .../overviewScreen/commandCenter/rightAll.vue | 71 +++++++++++-------- 12 files changed, 79 insertions(+), 53 deletions(-) diff --git a/.env.development b/.env.development index d433bd50..fbc4b896 100644 --- a/.env.development +++ b/.env.development @@ -4,8 +4,8 @@ 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://182.90.224.237:51234' #雄哥远程 +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' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' diff --git a/.env.production b/.env.production index 9c89c0fb..eb5d9625 100644 --- a/.env.production +++ b/.env.production @@ -22,13 +22,13 @@ NODE_ENV = "production" # VITE_API_URL = 'http://182.90.224.237:15551' # agjt # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 -# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 +VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # 苏立信/重庆市南岸区 # VITE_API_URL = 'http://101.43.164.214:11111' # 中科安信 # 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_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' diff --git a/src/config/config.ts b/src/config/config.ts index 7fdbcd26..06880ef7 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -28,10 +28,10 @@ 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 = "agjtLive"; //鞍钢集团现场大屏 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 -// export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 +export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "zkjc"; //中科佳成项目 // export const COMPANY: string = "cqna"; //重庆南岸项目 // export const COMPANY: string = "slx"; //苏立信项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 1ac72047..644f1805 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -26,8 +26,8 @@ export const staticRouter: RouteRecordRaw[] = [ name: "大屏", // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 - component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 - // component: () => import("@/views/overviewScreen/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"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue index 046ccae6..e83eca85 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue @@ -204,7 +204,7 @@ const drawTwoEchart = () => { title: { text: stateInfo.dataDetail.num, subtext: stateInfo.dataDetail.name, - x: "29%", + x: "24%", y: "40%", textAlign: "center", textStyle: { @@ -285,7 +285,7 @@ const drawTwoEchart = () => { name: "", type: "pie", radius: [100, 95], - center: ["30%", "50%"], + center: ["25%", "50%"], hoverAnimation: false, tooltip: { trigger: "none" // 内层饼图也设置 tooltip.trigger 为 'none' @@ -426,7 +426,7 @@ const drawTwoEchart = () => { name: "", type: "pie", radius: [60, 80], - center: ["30%", "50%"], + center: ["25%", "50%"], hoverAnimation: true, itemStyle: { borderWidth: 3, @@ -449,7 +449,7 @@ const drawTwoEchart = () => { { type: "pie", radius: ["52", "55"], - center: ["30%", "50%"], + center: ["25%", "50%"], label: { show: false }, diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue index 518aab93..bae11a4c 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue @@ -5,7 +5,7 @@
-
{{ item.enterpriseName }}
+
{{ item.enterpriseName }}
事故报警总数 @@ -106,6 +106,15 @@ onMounted(async () => { diff --git a/src/views/overviewScreen/commandCenter/rightAll.vue b/src/views/overviewScreen/commandCenter/rightAll.vue index 293f8812..725bd33c 100644 --- a/src/views/overviewScreen/commandCenter/rightAll.vue +++ b/src/views/overviewScreen/commandCenter/rightAll.vue @@ -1150,14 +1150,14 @@ onMounted(async () => { .el-carousel__arrow--left { // top: 70px; - left: -8px; - font-size: 15px; + left: -12px; + font-size: 16px; } .el-carousel__arrow--right { // top: 70px; - right: -8px; - font-size: 15px; + right: -12px; + font-size: 16px; } } From 0d3d4241b7feeeaaa6d55b02bbea9122bd5d90ae Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Thu, 20 Jun 2024 17:41:09 +0800 Subject: [PATCH 5/6] =?UTF-8?q?flx=EF=BC=9A=E8=B0=83=E6=95=B4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=80=BB=E8=A7=88=20=E9=A1=B9=E7=9B=AE=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=20=E6=8C=87=E6=8C=A5=E9=83=A8=E5=A4=A7=E5=B1=8F=20?= =?UTF-8?q?=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 +- .../projectOverview/rightBottom.vue | 49 ++++++++++++++----- .../projectOverview/rightCenter.vue | 3 +- .../commandScreen/commandCenter/rightAll.vue | 4 +- .../overviewScreen/commandCenter/rightAll.vue | 3 +- 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/.env.development b/.env.development index cb3bc298..fbc4b896 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' @@ -24,7 +24,7 @@ NODE_ENV = 'development' # VITE_API_URL = 'http://182.90.224.237:15551' # agjt # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 -VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 +# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信/重庆市南岸区 # VITE_API_URL = 'http://101.43.164.214:11111' diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue index c1beaa2d..0f45312d 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue @@ -5,12 +5,18 @@
{{ item.dangerItemContent }}
-
- 整改结果： - {{ - item.status ? statusNameFilter(item.status).name : "" - }} - 已逾期 +
+
+ 整改结果： + {{ + item.status ? statusNameFilter(item.status).name : "" + }} +
+
+ 责任单位： + {{ item.enterpriseName || "" }} +
+ 已逾期
@@ -118,14 +124,15 @@ onMounted(async () => { border-radius: 0px 0px 0px 0px; border: 1px solid; // opacity: 0.7; - opacity: 0.9; + // opacity: 0.9; border-image: linear-gradient(359deg, rgba(17, 141, 255, 1), rgba(17, 141, 255, 0)) 1 1; padding: 9px 13px; margin-bottom: 10px; + position: relative; > div:nth-child(1) { font-family: ABeeZee, ABeeZee; font-weight: 400; - font-size: 16px; + font-size: 14px; color: #ffffff; line-height: 16px; font-style: normal; @@ -135,7 +142,7 @@ onMounted(async () => { > div:nth-child(2) { font-family: ABeeZee, ABeeZee; font-weight: 400; - font-size: 13px; + font-size: 11px; color: #ffffff; font-style: normal; text-transform: none; @@ -144,12 +151,15 @@ onMounted(async () => { > div:nth-child(3) { display: flex; align-items: center; - justify-content: space-between; + // justify-content: space-between; margin-bottom: 2px; + > div:not(:last-child) { + width: 30%; + } > div:nth-child(1) { font-family: ABeeZee, ABeeZee; font-weight: 400; - font-size: 13px; + font-size: 11px; color: #ffffff; font-style: normal; text-transform: none; @@ -160,7 +170,7 @@ onMounted(async () => { > div:not(:nth-child(1)) { font-family: ABeeZee, ABeeZee; font-weight: 400; - font-size: 13px; + font-size: 11px; color: #8893a1; font-style: normal; text-transform: none; @@ -188,4 +198,19 @@ onMounted(async () => { ::v-deep .h-card .content { height: 80%; } + +.text-ellipsis { + color: #fff; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; +} +.period { + color: #e25f64; + margin-left: 6px; + position: absolute; + top: 8px; + right: 10px; +} diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue index 533cd5c4..de7294be 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightCenter.vue @@ -75,7 +75,8 @@ const getEnterpriseInfoList = async (showLoading: boolean) => { projectSn: store.sn, enterpriseName: "", enterpriseTypeId: "", - userEnterpriseId: "" + userEnterpriseId: "", + isCountMainEnterprise: 1 }, showLoading ); diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index 3e0c460c..f374e393 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -223,9 +223,9 @@ const openDialogData = async () => { res.result.forEach((item: any, index: number) => { resultList.push({ id: `list${index}`, - radius: "70%", + radius: "60%", isLegend: "top", - radarCenter: ["50%", "60%"], + radarCenter: ["50%", "55%"], dataList: [ { value: [item.security, item.safe, item.levelRisk, item.limitTime], diff --git a/src/views/overviewScreen/commandCenter/rightAll.vue b/src/views/overviewScreen/commandCenter/rightAll.vue index 725bd33c..01c5ee76 100644 --- a/src/views/overviewScreen/commandCenter/rightAll.vue +++ b/src/views/overviewScreen/commandCenter/rightAll.vue @@ -889,7 +889,8 @@ const getEnterpriseInfoList = async (showLoading: boolean) => { projectSn: store.sn, enterpriseName: "", enterpriseTypeId: "", - userEnterpriseId: "" + userEnterpriseId: "", + isCountMainEnterprise: 1 }, showLoading ); From 3a474d2c92fc977cd1611e239256a873ef615d1d Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Thu, 20 Jun 2024 18:51:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=20=E6=80=BB=E8=A7=88=20=E9=9B=B7=E8=BE=BE=E5=9B=BE?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E8=B6=85=E5=87=BA=E7=9C=81=E7=95=A5=E5=8F=B7?= 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 ++-- .../comprehensiveManage/projectOverview/leftCenter.vue | 3 ++- src/views/overviewScreen/commandCenter/leftBottom.vue | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index fbc4b896..7ed4e2e2 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ 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.155:19111' +# 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' diff --git a/src/config/config.ts b/src/config/config.ts index ff2368c0..06880ef7 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -29,9 +29,9 @@ 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 = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 -// export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 +export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "zkjc"; //中科佳成项目 // export const COMPANY: string = "cqna"; //重庆南岸项目 // export const COMPANY: string = "slx"; //苏立信项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 550726a8..644f1805 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -25,9 +25,9 @@ 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/overviewScreen/indexCommand.vue"), //总览大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ diff --git a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue index e83eca85..8d196716 100644 --- a/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue +++ b/src/views/agjtProjectKanban/comprehensiveManage/projectOverview/leftCenter.vue @@ -272,7 +272,8 @@ const drawTwoEchart = () => { if (data == "无") return; let value = dataList.value[i].value; let percentage = dataList.value[i].percentage + "%"; - return "{name| " + data + "} {gap| }" + `{value|${value}} {gap| } {value1|${percentage}}`; + const newData = data.length > 10 ? data.substr(0, 10) + "..." : data; + return "{name| " + newData + "} {gap| }" + `{value|${value}} {gap| } {value1|${percentage}}`; } } } diff --git a/src/views/overviewScreen/commandCenter/leftBottom.vue b/src/views/overviewScreen/commandCenter/leftBottom.vue index 751adbf8..c4a28cc3 100644 --- a/src/views/overviewScreen/commandCenter/leftBottom.vue +++ b/src/views/overviewScreen/commandCenter/leftBottom.vue @@ -407,7 +407,8 @@ function drawBar2() { if (data == "无") return; let value = dataList.value[i].value; let percentage = dataList.value[i].percentage + "%"; - return "{name| " + data + "} {gap| }" + `{value|${value}} {gap| } {value1|${percentage}}`; + const newData = data.length > 10 ? data.substr(0, 10) + "..." : data; + return "{name| " + newData + "} {gap| }" + `{value|${value}} {gap| } {value1|${percentage}}`; } } }