From b6cb6bb904ca20a22f449acfe4a3f7b3f8505091 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 13 Jun 2024 21:57:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=B8=AD=E4=B8=8A=E9=83=A8=E5=88=86=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=95=99=E8=82=B2=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BC=80=E5=8F=91=20fix:=E4=BC=98=E5=8C=96=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=B7=A6=E4=B8=8A=E9=83=A8=E5=88=86=E6=89=BF?= =?UTF-8?q?=E5=8C=85=E5=95=86=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E3=80=81=E4=BC=98=E5=8C=96=E7=8E=B0=E5=9C=BA=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E5=B7=A6=E4=B8=8B=E9=83=A8=E5=88=86=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=83=85=E5=86=B5=E5=B5=8C=E5=A5=97=E7=8E=AF?= =?UTF-8?q?=E5=BD=A2=E5=9B=BE=E3=80=81=E8=B0=83=E6=95=B4=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=B8=AD=E4=B8=8B=E5=8F=B3=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BE=85=E5=8A=9E=E3=80=81=E5=8F=B3=E4=B8=8A?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=BA=94=E6=80=A5=E8=AE=B0=E5=BD=95=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=8F=B3=E4=B8=8B=E9=83=A8=E5=88=86=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=BE=85=E5=8A=9E?= 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 | 9 +- .../liveScreen/centerBottomRight.vue | 22 +- .../liveScreen/centerTop(初版).vue | 374 ++++++++++++++++++ .../agjtLiveScreen/liveScreen/centerTop.vue | 180 ++++----- .../agjtLiveScreen/liveScreen/leftBottom.vue | 176 +++++---- .../agjtLiveScreen/liveScreen/leftTop.vue | 37 +- .../agjtLiveScreen/liveScreen/rightBottom.vue | 2 +- .../agjtLiveScreen/liveScreen/rightTop.vue | 32 +- src/views/login/index.vue | 11 + 11 files changed, 603 insertions(+), 248 deletions(-) create mode 100644 src/views/agjtLiveScreen/liveScreen/centerTop(初版).vue diff --git a/.env.development b/.env.development index add0c2f..64850b1 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ NODE_ENV = 'development' # 后端本地 # VITE_API_URL = 'http://192.168.34.221: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' @@ -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/config/config.ts b/src/config/config.ts index eb4fc23..cda4664 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -28,9 +28,9 @@ 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 = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index e5ae589..7918a9d 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"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) @@ -273,6 +273,11 @@ export const staticRouter: RouteRecordRaw[] = [ name: "指挥部大屏", component: () => import("@/views/commandScreen/commandCenter/index.vue") }, + { + path: "/agjtLiveScreen", + name: "鞍钢现场大屏", + component: () => import("@/views/agjtLiveScreen/liveScreen/index.vue") + }, { path: "/agjtProjectKanban", name: "鞍钢项目看板大屏", diff --git a/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue b/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue index c71c8c2..0eeda0f 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue @@ -2,26 +2,8 @@
-
-
外墙、顶板、地板出现贯通性裂缝的疯狂世界东方螺丝钉解放数量大幅减少的ask大理石看得见啊来看看是多久啊老师的课
-
整改结果：已逾期
-
-
整改人：李四
-
检查人：张三
-
检查时间：2024-03-01 12:00:00
-
-
-
-
外墙、顶板、地板出现贯通性裂缝的疯狂世界东方螺丝钉解放数量大幅减少的ask大理石看得见啊来看看是多久啊老师的课
-
整改结果：已逾期
-
-
整改人：李四
-
检查人：张三
-
检查时间：2024-03-01 12:00:00
-
-
-
-
外墙、顶板、地板出现贯通性裂缝的疯狂世界东方螺丝钉解放数量大幅减少的ask大理石看得见啊来看看是多久啊老师的课
+
+
外墙、顶板、地板出现贯通性裂缝
整改结果：已逾期
整改人：李四
diff --git a/src/views/agjtLiveScreen/liveScreen/centerTop(初版).vue b/src/views/agjtLiveScreen/liveScreen/centerTop(初版).vue new file mode 100644 index 0000000..ce0c36a --- /dev/null +++ b/src/views/agjtLiveScreen/liveScreen/centerTop(初版).vue @@ -0,0 +1,374 @@ + + + + + diff --git a/src/views/agjtLiveScreen/liveScreen/centerTop.vue b/src/views/agjtLiveScreen/liveScreen/centerTop.vue index ce0c36a..9f2e974 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerTop.vue @@ -1,85 +1,36 @@ diff --git a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue index 7ca8a29..b9e9e77 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue @@ -12,7 +12,22 @@ import Card from "@/components/card.vue"; import { ref, onMounted, watch } from "vue"; import * as echarts from 'echarts'; +import { da } from "element-plus/es/locale"; +let tempList = ref([ + {name:'高处作业',value:12,doing:10,per:'12.5'},{name:'断路作业',value:12,doing:10,per:'12.5'},{name:'吊装安全',value:12,doing:10,per:'12.5'},{name:'受限空间',value:12,doing:10,per:'12.5'}, + {name:'动火作业',value:12,doing:10,per:'12.5'},{name:'盲板抽堵',value:12,doing:10,per:'12.5'},{name:'动土作业',value:12,doing:10,per:'12.5'},{name:'临时用电',value:12,doing:10,per:'12.5'}, +] as any) +let tempList2 = ref([ + { value: 123, name: '高处作业' }, + { value: 123, name: '断路作业' }, + { value: 123, name: '吊装安全' }, + { value: 123, name: '受限空间' }, + { value: 123, name: '动火作业' }, + { value: 123, name: '盲板抽堵' }, + { value: 123, name: '动土作业' }, + { value: 123, name: '临时用电' } +] as any) function drawPie(){ type EChartsOption = echarts.EChartsOption; @@ -23,87 +38,102 @@ function drawPie(){ option = { tooltip: { trigger: 'item', - formatter: '{a}
{b}: {c} ({d}%)' + // formatter: '{a}
{b}: {c} ({d}%)' + formatter: function(params: any){ + return "
"+ + "
"+tempList.value[params.dataIndex].name+" "+ tempList.value[params.dataIndex].per +"%
"+ + "
已完成"+tempList.value[params.dataIndex].value+"
"+ + "
进行中"+tempList.value[params.dataIndex].doing +"
"+ + "
" + }, }, - legend: { - data: [ 'Direct', 'Marketing', 'Search Engine', 'Email', 'Union Ads', 'Video Ads', 'Baidu', 'Google', 'Bing', 'Others' ] - }, - + // legend: { + // data: [ 'Direct', 'Marketing', 'Search Engine', 'Email', 'Union Ads', 'Video Ads', 'Baidu', 'Google', 'Bing', 'Others' ] + // }, series: [ { grid:{ - left: '5%', - right: '5%', - bottom: '5%', - containLabel:true - }, - name: 'Access From', - type: 'pie', - selectedMode: 'single', - radius: [0, '30%'], - label: { - position: 'inner', - fontSize: 14 - }, - labelLine: { - show: false - }, - data: [ - { value: 1548, name: 'Search Engine' }, - { value: 775, name: 'Direct' }, - { value: 679, name: 'Marketing', selected: true } - ] + left: '5%', + right: '5%', + bottom: '5%', + containLabel:true + }, + name: 'Access From', + type: 'pie', + selectedMode: 'single', + radius: [0, '30%'], + label: { + position: 'inner', + fontSize: 14 + }, + labelLine: { + show: false + }, + data: [ + { value: 96, name: '进行中' }, + { value: 80, name: '已完成' }, + ] }, { - name: 'Access From', - type: 'pie', - radius: ['45%', '60%'], - labelLine: { - length: 1 - }, - label: { - formatter: '{a|{a}}{abg|}\n{hr|}\n {b|{b}：}{c} {per|{d}%} ', - backgroundColor: '#F6F8FC', - borderColor: '#8C8D8E', - borderWidth: 1, - borderRadius: 3, - - rich: { - a: { - color: '#6E7079', - lineHeight: 10, - align: 'center' + name: 'Access From', + type: 'pie', + radius: ['45%', '60%'], + labelLine: { + length: 1 }, - hr: { - borderColor: '#8C8D8E', - width: '100%', - borderWidth: 1, - height: 0 + label: { + // formatter: '{a|{a}}{abg|}\n{hr|}\n {b|{b}：}{c} {per|{d}%} ', + formatter: function(params: any){ + return '{name|'+ tempList.value[params.dataIndex].name +'}{abg|} {per|'+ tempList.value[params.dataIndex].per +'%}\n{hr|}\n已完成：' + + tempList.value[params.dataIndex].value+' 进行中：' + tempList.value[params.dataIndex].doing + }, + // backgroundColor: '#1c447b', + backgroundColor: 'rgba(28,68,123,0.5)', + borderRadius: 3, + textStyle:{ + color: '#FFF' + }, + rich: { + name:{ + align: 'center', + lineHeight: 10 + }, + // a: { + // color: '#fff', + // lineHeight: 10, + // align: 'center' + // }, + hr: { + borderColor: '#8C8D8E', + width: '100%', + borderWidth: 1, + height: 0 + }, + // b: { + // color: '#fff', + // fontSize: 10, + // fontWeight: 'bold', + // lineHeight: 12 + // }, + per: { + color: '#fff', + backgroundColor: '#4C5058', + padding: [1, 1], + borderRadius: 1 + } + } }, - b: { - color: '#4C5058', - fontSize: 10, - fontWeight: 'bold', - lineHeight: 12 - }, - per: { - color: '#fff', - backgroundColor: '#4C5058', - padding: [1, 1], - borderRadius: 1 - } - } - }, - data: [ - { value: 1048, name: 'Baidu' }, - { value: 335, name: 'Direct' }, - { value: 310, name: 'Email' }, - { value: 251, name: 'Google' }, - { value: 234, name: 'Union Ads' }, - { value: 147, name: 'Bing' }, - { value: 135, name: 'Video Ads' }, - { value: 102, name: 'Others' } - ] + data: tempList2.value + // data: [ + // { value: 104, name: '高处作业' }, + // { value: 335, name: '断路作业' }, + // { value: 310, name: '吊装安全' }, + // { value: 251, name: '受限空间' }, + // { value: 234, name: '动火作业' }, + // { value: 147, name: '盲板抽堵' }, + // { value: 135, name: '动土作业' }, + // { value: 102, name: '临时用电' } + // ] } ] diff --git a/src/views/agjtLiveScreen/liveScreen/leftTop.vue b/src/views/agjtLiveScreen/liveScreen/leftTop.vue index 3b947f4..63985d9 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftTop.vue @@ -13,14 +13,30 @@
-->
承包商名称：辽宁五瞏
-
施工区域：东北角一区
项目编号：002
-
项目经理：王海龙
项目类型：epc总承包
-
联系电话：13312545623
竣工日期：2024-03-01
-
建筑面积：12457㎡
合同总额：230万元
-
投资总额：12457万元
工程类别：矿山
-
开工日期：2024-03-01
结构类型：混合结构
-
项目编号：鞍高开项备[2021]23号)
施工阶段：主体施工
-
工程类别：矿山
工程状态
+
+
施工区域：东北角一区
工程状态：在建
+
+
+
项目编号：鞍高开项备[2021]23号
项目类编号：002
+
+
+
项目经理：王海龙
联系电话：13312545623
+
+
+
项目类型：epc总承包
工程类别：矿山
+
+
+
开工日期：2024-03-01
竣工日期：2024-03-01
+
+
+
施工阶段：主体施工
结构类型：混合结构
+
+
+
投资总额：12457万元
合同总额：230万元
+
+
+
建筑面积：12457㎡
+
@@ -89,8 +105,13 @@ watch( width: 100%; height: 100%; .mainContainer{ + width: calc(100% - 20px); + height: calc(100% - 20px); color: #fff; padding: 10px; + display: flex; + flex-direction: column; + justify-content: space-around; .lineBox{ // background-color: #fff; line-height: 18px; diff --git a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue index 4acb0d4..cadef37 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue @@ -3,7 +3,7 @@
-
外墙、顶板、地板出现贯通性裂缝的疯狂世界东方螺丝钉解放数量大幅减少的ask大理石看得见啊来看看是多久啊老师的课
+
外墙、顶板、地板出现贯通性裂缝
整改结果：已逾期
整改人：李四
diff --git a/src/views/agjtLiveScreen/liveScreen/rightTop.vue b/src/views/agjtLiveScreen/liveScreen/rightTop.vue index e5fa9e5..43e9df2 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightTop.vue @@ -2,41 +2,13 @@
-
+
⚠
事项
-
被困电梯，需要救援大幅简化了士大夫艰苦拉萨的封建士大夫地方势力的空间管理的飞机过来的开发工具奥斯卡大奖阿里山可见度拉克斯基的
-
-
处理状态：已处理
-
处理报告：下载
-
2024-03-01 12:00:00
-
-
-
-
-
-
⚠
-
事项
-
-
-
被困电梯，需要救援大幅简化了士大夫艰苦拉萨的封建士大夫地方势力的空间管理的飞机过来的开发工具奥斯卡大奖阿里山可见度拉克斯基的
-
-
处理状态：已处理
-
处理报告：下载
-
2024-03-01 12:00:00
-
-
-
-
-
-
⚠
-
事项
-
-
-
被困电梯，需要救援大幅简化了士大夫艰苦拉萨的封建士大夫地方势力的空间管理的飞机过来的开发工具奥斯卡大奖阿里山可见度拉克斯基的
+
被困电梯，需要救援
处理状态：已处理
处理报告：下载
diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 263e743..69a7cd1 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -122,6 +122,17 @@ const login = (formEl: FormInstance | undefined) => { } // router.push("/commandScreen"); router.push("/agjtProjectKanban"); + } else if (COMPANY === "agjtLive") { + router.push("/agjtLiveScreen"); + if (![5, 10].includes(result.accountType)) { + ElMessage({ + message: "账号类型不匹配", + type: "warning" + }); + return; + } + // router.push("/commandScreen"); + router.push("/agjtLiveScreen"); } else if (COMPANY === "agjtOverview") { router.push("/overviewScreen"); } else {