diff --git a/package-lock.json b/package-lock.json index 1ec645d..c7cb05c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,6 +56,7 @@ "devDependencies": { "@commitlint/cli": "^17.0.1", "@commitlint/config-conventional": "^17.0.0", + "@types/echarts": "^4.9.22", "@types/node": "^17.0.31", "@types/sortablejs": "^1.15.0", "@typescript-eslint/eslint-plugin": "^5.22.0", @@ -3186,6 +3187,15 @@ "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-18.6.4.tgz", "integrity": "sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ==" }, + "node_modules/@types/echarts": { + "version": "4.9.22", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/echarts/-/echarts-4.9.22.tgz", + "integrity": "sha512-7Fo6XdWpoi8jxkwP7BARUOM7riq8bMhmsCtSG8gzUcJmFhLo387tihoBYS/y5j7jl3PENT5RxeWZdN9RiwO7HQ==", + "dev": true, + "dependencies": { + "@types/zrender": "*" + } + }, "node_modules/@types/eslint": { "version": "8.40.0", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.0.tgz", @@ -3287,6 +3297,12 @@ "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz", "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==" }, + "node_modules/@types/zrender": { + "version": "4.0.6", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/zrender/-/zrender-4.0.6.tgz", + "integrity": "sha512-1jZ9bJn2BsfmYFPBHtl5o3uV+ILejAtGrDcYSpT4qaVKEI/0YY+arw3XHU04Ebd8Nca3SQ7uNcLaqiL+tTFVMg==", + "dev": true + }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "5.59.7", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.7.tgz", @@ -18822,6 +18838,15 @@ "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-18.6.4.tgz", "integrity": "sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ==" }, + "@types/echarts": { + "version": "4.9.22", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/echarts/-/echarts-4.9.22.tgz", + "integrity": "sha512-7Fo6XdWpoi8jxkwP7BARUOM7riq8bMhmsCtSG8gzUcJmFhLo387tihoBYS/y5j7jl3PENT5RxeWZdN9RiwO7HQ==", + "dev": true, + "requires": { + "@types/zrender": "*" + } + }, "@types/eslint": { "version": "8.40.0", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.0.tgz", @@ -18923,6 +18948,12 @@ "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz", "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==" }, + "@types/zrender": { + "version": "4.0.6", + "resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/zrender/-/zrender-4.0.6.tgz", + "integrity": "sha512-1jZ9bJn2BsfmYFPBHtl5o3uV+ILejAtGrDcYSpT4qaVKEI/0YY+arw3XHU04Ebd8Nca3SQ7uNcLaqiL+tTFVMg==", + "dev": true + }, "@typescript-eslint/eslint-plugin": { "version": "5.59.7", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.7.tgz", diff --git a/package.json b/package.json index 7397a4f..8020e6b 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "devDependencies": { "@commitlint/cli": "^17.0.1", "@commitlint/config-conventional": "^17.0.0", + "@types/echarts": "^4.9.22", "@types/node": "^17.0.31", "@types/sortablejs": "^1.15.0", "@typescript-eslint/eslint-plugin": "^5.22.0", diff --git a/src/config/config.ts b/src/config/config.ts index c061128..0501177 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -28,6 +28,7 @@ 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 = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 @@ -37,4 +38,4 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "phmw"; //鄱湖美湾医疗、医美产业集群项目 (需要去src\routers\modules\staticRouter.ts更换首页) // export const COMPANY: string = "xjnb"; // 新建宁波项目 // export const COMPANY: string = "ahsa"; // 安徽水安项目 -export const COMPANY: string = "zkax"; // 中科安信项目 +// export const COMPANY: string = "zkax"; // 中科安信项目 diff --git a/src/config/staticMenu.ts b/src/config/staticMenu.ts index 69aea8e..59b0e7c 100644 --- a/src/config/staticMenu.ts +++ b/src/config/staticMenu.ts @@ -1321,7 +1321,7 @@ export const ZHZRFMenu: Array = [ }, ]; //中海·臻如府 -// 中科安信大屏 + export const ZKAXMenu: Array = [ { moduleName: "首页概览", @@ -1343,4 +1343,4 @@ export const ZKAXMenu: Array = [ moduleName: "进度计划", modulePath: "/schedulePlan" } -]; \ No newline at end of file +]; //中科安信大屏 \ No newline at end of file diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 09a23d5..012a71b 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/large", name: "大屏", - component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 + component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ { @@ -269,6 +269,11 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/commandScreen", name: "指挥部大屏", component: () => import("@/views/commandScreen/commandCenter/index.vue") + }, + { + path: "/liveScreen", + name: "现场大屏", + component: () => import("@/views/commandScreen/liveScreen/index.vue") } ], meta: { diff --git a/src/views/commandScreen/indexCommand.vue b/src/views/commandScreen/indexCommand.vue index 5bb09ce..383559a 100644 --- a/src/views/commandScreen/indexCommand.vue +++ b/src/views/commandScreen/indexCommand.vue @@ -5,6 +5,7 @@

指挥部大屏

+

现场大屏

数字化项目监管平台
@@ -69,6 +70,13 @@ let agjtCommandList = ref([ modulePath: "/commandScreen" } ]); +// 鞍山现场大屏 +let agjtLiveList = ref([ + { + moduleName: "现场大屏", + modulePath: "/liveScreen" + } +]); const itemList = ref([]); const activeTab = ref(0); @@ -100,6 +108,10 @@ onMounted(async () => { // menuList.value = AGJTCommandMenu; menuList.value = agjtCommandList.value; } + if (COMPANY === "agjtLive") { + // menuList.value = AGJTCommandMenu; + menuList.value = agjtLiveList.value; + } //这里是跳转过来后免登录的操作,接收token 登录 懂了 //数据看板跳转免登录 if (window.location.href.indexOf("token") != -1) { @@ -194,6 +206,9 @@ function jumpBgd() { if(COMPANY === "agjtCommand"){ window.location.replace("http://47.93.215.234:9809" + "/#/login?token=" + store.token); } + if(COMPANY === "agjtLive"){ + window.location.replace("http://47.93.215.234:9809" + "/#/login?token=" + store.token); + } } diff --git a/src/views/commandScreen/liveScreen/centerBottomLeft.vue b/src/views/commandScreen/liveScreen/centerBottomLeft.vue new file mode 100644 index 0000000..d96752a --- /dev/null +++ b/src/views/commandScreen/liveScreen/centerBottomLeft.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/views/commandScreen/liveScreen/centerBottomRight.vue b/src/views/commandScreen/liveScreen/centerBottomRight.vue new file mode 100644 index 0000000..de1ed4a --- /dev/null +++ b/src/views/commandScreen/liveScreen/centerBottomRight.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/views/commandScreen/liveScreen/centerTop.vue b/src/views/commandScreen/liveScreen/centerTop.vue new file mode 100644 index 0000000..ce0c36a --- /dev/null +++ b/src/views/commandScreen/liveScreen/centerTop.vue @@ -0,0 +1,374 @@ + + + + + diff --git a/src/views/commandScreen/liveScreen/ckplayerComp.vue b/src/views/commandScreen/liveScreen/ckplayerComp.vue new file mode 100644 index 0000000..9ffc5aa --- /dev/null +++ b/src/views/commandScreen/liveScreen/ckplayerComp.vue @@ -0,0 +1,41 @@ + + + + diff --git a/src/views/commandScreen/liveScreen/index.vue b/src/views/commandScreen/liveScreen/index.vue new file mode 100644 index 0000000..e7e6dd0 --- /dev/null +++ b/src/views/commandScreen/liveScreen/index.vue @@ -0,0 +1,146 @@ + + + + diff --git a/src/views/commandScreen/liveScreen/leftBottom.vue b/src/views/commandScreen/liveScreen/leftBottom.vue new file mode 100644 index 0000000..7ca8a29 --- /dev/null +++ b/src/views/commandScreen/liveScreen/leftBottom.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/src/views/commandScreen/liveScreen/leftCenter.vue b/src/views/commandScreen/liveScreen/leftCenter.vue new file mode 100644 index 0000000..139ddc0 --- /dev/null +++ b/src/views/commandScreen/liveScreen/leftCenter.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/views/commandScreen/liveScreen/leftTop.vue b/src/views/commandScreen/liveScreen/leftTop.vue new file mode 100644 index 0000000..3b947f4 --- /dev/null +++ b/src/views/commandScreen/liveScreen/leftTop.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/src/views/commandScreen/liveScreen/rightBottom.vue b/src/views/commandScreen/liveScreen/rightBottom.vue new file mode 100644 index 0000000..a55ebbf --- /dev/null +++ b/src/views/commandScreen/liveScreen/rightBottom.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/views/commandScreen/liveScreen/rightTop.vue b/src/views/commandScreen/liveScreen/rightTop.vue new file mode 100644 index 0000000..d5e4311 --- /dev/null +++ b/src/views/commandScreen/liveScreen/rightTop.vue @@ -0,0 +1,31 @@ + + + + +