diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts
index c18ebd5..83f38b3 100644
--- a/src/routers/modules/staticRouter.ts
+++ b/src/routers/modules/staticRouter.ts
@@ -77,6 +77,11 @@ export const staticRouter: RouteRecordRaw[] = [
// name: "基站监测",
// component: () => import("@/views/sevenLargeScreen/ztsyjitem/trench.vue")
// },
+ {
+ path: "/iframe",
+ name: "动态内嵌",
+ component: () => import("@/views/sevenLargeScreen/dynamicAllocation/iframe.vue")
+ },
{
path: "/towerCraneMonitoring",
name: "塔吊监测",
diff --git a/src/utils/util.ts b/src/utils/util.ts
index 1636959..f97c6de 100644
--- a/src/utils/util.ts
+++ b/src/utils/util.ts
@@ -312,6 +312,6 @@ export function filterEnum(
}
// 获取assets静态资源
-export const getAssetsFile = (url) => {
+export const getAssetsFile = (url: string) => {
return new URL(`../assets/images/${url}`, import.meta.url).href
-}
+}
\ No newline at end of file
diff --git a/src/views/sevenLargeScreen/dynamicAllocation/iframe.vue b/src/views/sevenLargeScreen/dynamicAllocation/iframe.vue
new file mode 100644
index 0000000..b9688c8
--- /dev/null
+++ b/src/views/sevenLargeScreen/dynamicAllocation/iframe.vue
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/sevenLargeScreen/headNoise/leftTop.vue b/src/views/sevenLargeScreen/headNoise/leftTop.vue
index 245c0e0..e7ac555 100644
--- a/src/views/sevenLargeScreen/headNoise/leftTop.vue
+++ b/src/views/sevenLargeScreen/headNoise/leftTop.vue
@@ -39,6 +39,7 @@ import { getCurrentDayAirQualityApi } from "@/api/modules/headNoise";
import { ref, onMounted, reactive } from "vue";
import * as echarts from "echarts";
import Card from "@/components/card.vue";
+import { title } from "process";
const store = GlobalStore();
const analysisType = ref("" as any);
const analysisData = ref(0 as any);
@@ -133,8 +134,14 @@ function drawChart() {
distance: -40
},
pointer: {
- show: 0
- }
+ show: 0,
+ },
+ title: {
+ show: false,
+ },
+ detail: {
+ show: false
+ },
},
{
// 内侧指针、数值显示
diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index e44ef92..580c220 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -88,7 +88,7 @@
active: activeTab === item.modulePath
}"
>
-
+
{{ item.moduleName }}
@@ -174,7 +174,6 @@ import {
QYGMenu
} from "@/config/staticMenu";
import { COMPANY } from "@/config/config";
-
import { useRouter } from "vue-router";
import { GlobalStore } from "@/stores";
const store = GlobalStore();
@@ -587,6 +586,24 @@ const navigateTo = (path, type) => {
});
} else {
activeTab2.value = path.companyPath;
+ let index = path.companyPath.indexOf("?");
+ console.log("获取到的参数----", index);
+ if (index > -1) {
+ let result = path.companyPath.substring(index);
+ const uIndex = result.indexOf("url=");
+ if (uIndex > -1) {
+ const url = result.substring(uIndex + 4);
+ console.log("获取到的参数----", url);
+ router.push({
+ path: path.companyPath,
+ query: {
+ url,
+ }
+ });
+ return;
+ }
+ }
+ // console.log("点击的路由---", activeTab2.value);
router.push({
path: path.companyPath
});
diff --git a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topCenter.vue b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topCenter.vue
index 4a1eccd..05c1d75 100644
--- a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topCenter.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topCenter.vue
@@ -14,19 +14,19 @@
日产量(m³)
-
{{ realTimeTotal.dailyOutput || 0 }}
+
{{ Math.round(realTimeTotal.dailyOutput).toFixed(2) || 0 }}
总产量(m³)
-
{{ realTimeTotal.totalOutput || 0 }}
+
{{ Math.round(realTimeTotal.totalOutput).toFixed(2) || 0 }}
日盘数
-
{{ realTimeTotal.dayNumber || 0 }}
+
{{ Math.round(realTimeTotal.dayNumber).toFixed(2) || 0 }}
总盘数
-
{{ realTimeTotal.totalNumber || 0 }}
+
{{ Math.round(realTimeTotal.totalNumber).toFixed(2) || 0 }}
diff --git a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue
index a97ede8..392d179 100644
--- a/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue
+++ b/src/views/sevenLargeScreen/largeMachinery/concreteMixingPlant/topRight.vue
@@ -105,7 +105,7 @@ function drawEchart() {
trigger: "item"
},
title: {
- text: max,
+ text: Math.round(max).toFixed(2),
subtext: "材料总数",
x: "27%",
y: "42%",
@@ -140,7 +140,7 @@ function drawEchart() {
color: "#000",
rich: {
name: {
- width: 100,
+ width: 70,
verticalAlign: "left",
fontSize: 14,
color: "#FFFFFF"
@@ -162,7 +162,7 @@ function drawEchart() {
for (let i = 0; i < dataList.value.length; i++) {
if (data === dataList.value[i].name) {
let value = dataList.value[i].value;
- return "{name| " + data + "}" + "{value| " + value + "}" + " ";
+ return "{name| " + data + "}" + "{value| " + value + 'kg' + "}" + " ";
}
}
}
@@ -334,7 +334,7 @@ const getMemberCareList = async () => {
let picArr = [];
for (let i = 0; i < dataArr.length; i++) {
let currentPic = {
- value: dataArr[i].count,
+ value: Math.round(Number(dataArr[i].count)).toFixed(2),
show: true,
name: dataArr[i].name,
itemStyle: {
diff --git a/src/views/sevenLargeScreen/rainfallMonitoring/leftTop.vue b/src/views/sevenLargeScreen/rainfallMonitoring/leftTop.vue
index 6dd7510..54272ad 100644
--- a/src/views/sevenLargeScreen/rainfallMonitoring/leftTop.vue
+++ b/src/views/sevenLargeScreen/rainfallMonitoring/leftTop.vue
@@ -134,7 +134,13 @@ function drawChart() {
},
pointer: {
show: 0
- }
+ },
+ title: {
+ show: false,
+ },
+ detail: {
+ show: false
+ },
},
{
// 内侧指针、数值显示