diff --git a/public/factory.glb b/public/factory.glb deleted file mode 100644 index 1138bf8f..00000000 Binary files a/public/factory.glb and /dev/null differ diff --git a/public/img/ly/hzy.png b/public/img/ly/hzy.png new file mode 100644 index 00000000..cac307b3 Binary files /dev/null and b/public/img/ly/hzy.png differ diff --git a/public/img/ly/mm.png b/public/img/ly/mm.png new file mode 100644 index 00000000..fba5047a Binary files /dev/null and b/public/img/ly/mm.png differ diff --git a/public/img/ly/shsps.png b/public/img/ly/shsps.png new file mode 100644 index 00000000..384738a3 Binary files /dev/null and b/public/img/ly/shsps.png differ diff --git a/public/img/ly/ylm.png b/public/img/ly/ylm.png new file mode 100644 index 00000000..2e738d8d Binary files /dev/null and b/public/img/ly/ylm.png differ diff --git a/public/img/ly/yrfd.png b/public/img/ly/yrfd.png new file mode 100644 index 00000000..011edf33 Binary files /dev/null and b/public/img/ly/yrfd.png differ diff --git a/public/ly.glb b/public/ly.glb deleted file mode 100644 index 1497e055..00000000 Binary files a/public/ly.glb and /dev/null differ diff --git a/public/photon_tree.glb b/public/photon_tree.glb deleted file mode 100644 index a6822ca9..00000000 Binary files a/public/photon_tree.glb and /dev/null differ diff --git a/src/App.vue b/src/App.vue index 9fa4c6cf..2f29a496 100644 --- a/src/App.vue +++ b/src/App.vue @@ -298,8 +298,8 @@ export default { color: #ffffff; } .elProgress > .el-progress-circle { - width: 5vw !important; - height: 5vw !important; + width: 9vh !important; + height: 9vh !important; } //排放系统 diff --git a/src/config/route.js b/src/config/route.js index 5ead1323..b7f55fd1 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -2687,7 +2687,7 @@ const routes = [ path: "/bigScreenly", name: "bigScreenly", meta: { - title: "能管大屏ly", + title: "数智大屏", icon: "el-icon-position", perms: ["bigScreenly"], fullpage: true, diff --git a/src/layout/other/404.vue b/src/layout/other/404.vue index f1ac3902..1647130d 100644 --- a/src/layout/other/404.vue +++ b/src/layout/other/404.vue @@ -17,8 +17,14 @@ export default { methods: { gohome(){ - location.href="#/" - }, + let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard; + if (base_dashboard == null || base_dashboard == undefined) { + base_dashboard = '/dashboard' + } + this.$router.replace({ + path: base_dashboard, + }); + }, goback(){ this.$router.go(-1); }, diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue index aacbcc25..09cb95d2 100644 --- a/src/views/bigScreen/index_enm_ly.vue +++ b/src/views/bigScreen/index_enm_ly.vue @@ -2,14 +2,14 @@
运转率
+{{ item.name }}
-- {{ radarSeriesData[0] }} -
-- {{ radarSeriesData[1] }} -
-- {{ radarSeriesData[2] }} -
-- {{ radarSeriesData[3] }} -
-- {{ radarSeriesData[4] }} -
-工序 | ++ 电耗kwh + | +
---|---|
+ 石灰石破碎 + | ++ {{ radarSeriesData[0] }} + | +
原料磨 | ++ {{ radarSeriesData[1] }} + | +
回转窑 | ++ {{ radarSeriesData[2] }} + | +
余热发电 | ++ {{ radarSeriesData[3] }} + | +
煤磨 | ++ {{ radarSeriesData[4] }} + | +
+ {{ hotData.total_production }} + kwh +
++ {{ hotData.NOx }} + mg/m³ +
++ {{ hotData.production_elec_unit }} + kwh +
++ {{ hotData.SO2 }} + mg/m³ +
++ {{ hotData.elec_consume }} + kwh +
++ {{ hotData.klw }} + mg/m³ +
+