diff --git a/src/config/config.ts b/src/config/config.ts index c1a2a08..6ff2206 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 = "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 083d2fd..a7c5fd8 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/overviewScreen/commandCenter/rightAll.vue b/src/views/overviewScreen/commandCenter/rightAll.vue index bc21ffd..87db2b2 100644 --- a/src/views/overviewScreen/commandCenter/rightAll.vue +++ b/src/views/overviewScreen/commandCenter/rightAll.vue @@ -103,10 +103,10 @@ let questionTotal = ref(0 as any); const emits = defineEmits(["openDialog"]); // 打开弹窗 -const openDialogData = (obj: any) => { - console.log("111111111111"); - emits("openDialog", obj); -}; +// const openDialogData = (obj: any) => { +// console.log("111111111111"); +// emits("openDialog", obj); +// }; let dateRange = ref([] as any); @@ -210,7 +210,7 @@ function Pie() { } function drawEchart() { - echartsTest.value = echarts.init(document.getElementById("echartsSafe")); + echartsTest.value = echarts.init(document.getElementById("echartsSafe") as any); let option = { animation: false, // 取消动画 tooltip: { @@ -639,7 +639,7 @@ const qualityInfo = async (showLoading: boolean) => { }; function getManAnalysisEchart() { - const echartsTest = echarts.init(document.getElementById("eacherManAnalysis")); + const echartsTest = echarts.init(document.getElementById("eacherManAnalysis") as any); let option = { tooltip: { trigger: "axis", @@ -656,7 +656,7 @@ function getManAnalysisEchart() { itemWidth: 10, itemHeight: 10, icon: "roundRect", - data: ["一号区域", "二号区域", "三号区域"] + data: ["一号区域", "二号区域", "三号区域", "四号区域"] }, // color: ["#2BA5FF", "#F97766", "#1EF1FF", "#1EF1FF"], grid: { @@ -790,6 +790,26 @@ function getManAnalysisEchart() { smooth: true, symbol: "none", data: [20, 30, 14, 15, 26, 1] + }, + { + name: "四号区域", + type: "line", + // stack: "Total", + lineStyle: { + color: "rgba(255, 181, 179, 1)", + shadowBlur: 12, + shadowColor: "rgba(255, 181, 179, 0.9)", + shadowOffsetX: 1, + shadowOffsetY: 1 + }, + itemStyle: { + color: "rgba(255, 181, 179, 1) ", + borderWidth: 1, + borderColor: "#FFF" + }, + smooth: true, + symbol: "none", + data: [10, 82, 52, 10, 42, 20] } ] }; @@ -799,6 +819,7 @@ function getManAnalysisEchart() { echartsTest.resize(); }); console.log(echartsTest); + console.log("我是随机数", Math.floor(Math.random() * 256)); } watch( @@ -838,7 +859,8 @@ onMounted(async () => { margin-top: 1%; :deep(.h-card .content) { padding: 6px 10px; - height: 80%; + height: 78%; + margin-top: 1%; } .enterprise-info { display: flex; @@ -978,6 +1000,10 @@ onMounted(async () => { height: 100%; } :deep() { + .el-carousel__indicators li { + padding-top: 6px; + padding-bottom: 2px; + } .el-carousel__indicator--horizontal .el-carousel__button { width: 10px; height: 10px;