From f6e4039b5d694558698346b4e91b4257a2003529 Mon Sep 17 00:00:00 2001 From: hzz Date: Fri, 21 Jul 2023 17:30:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=89=E5=B0=98=E7=9B=91=E6=B5=8B=E8=B5=B0?= =?UTF-8?q?=E5=8A=BF=E5=9B=BE=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=99=90=E6=A0=87=E8=AE=B0=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=99=BA=E8=83=BD=E8=B4=A7=E6=9E=B6=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/borderBox/border14.vue | 8 ++++ src/locales/lang/en.ts | 1 + src/locales/lang/zh.ts | 1 + src/router/index.ts | 5 +++ src/views/TrendChart/index.vue | 30 ++++++++++++- .../generalEnvironmentMechanical/index.vue | 7 +-- src/views/index.vue | 2 +- .../components/ShelfPanel.vue | 21 +++++++++ src/views/intelligentShelves/index.vue | 44 +++++++++++++++++++ 9 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 src/components/borderBox/border14.vue create mode 100644 src/views/intelligentShelves/components/ShelfPanel.vue create mode 100644 src/views/intelligentShelves/index.vue diff --git a/src/components/borderBox/border14.vue b/src/components/borderBox/border14.vue new file mode 100644 index 0000000..07eefa6 --- /dev/null +++ b/src/components/borderBox/border14.vue @@ -0,0 +1,8 @@ + + + + + diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index c4c1192..36481f4 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -309,5 +309,6 @@ export default { '微工厂缝纫设备看板':'微工厂缝纫设备看板', '工作时间':'工作时间', '空闲时间':'空闲时间', + '智能货架物联管理系统':'智能货架物联管理系统' } } \ No newline at end of file diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 2a05655..fcd3f33 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -309,5 +309,6 @@ export default { '微工厂缝纫设备看板':'微工厂缝纫设备看板', '工作时间':'工作时间', '空闲时间':'空闲时间', + '智能货架物联管理系统':'智能货架物联管理系统' } } \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 3a1fbd3..03dd41e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -258,6 +258,11 @@ const routes: Array = [ name: "TrendChart", component: () => import("../views/TrendChart/index.vue"), }, + { + path: "/intelligentShelves", + name: "intelligentShelves", + component: () => import("../views/intelligentShelves/index.vue"), + }, diff --git a/src/views/TrendChart/index.vue b/src/views/TrendChart/index.vue index db26d17..4deede2 100644 --- a/src/views/TrendChart/index.vue +++ b/src/views/TrendChart/index.vue @@ -25,6 +25,7 @@ let { t } = useI18n(); let route = useRoute() let ids = route.query.ids as string let unit = route.query.unit as string +let limit = route.query.limit as string let timer = null document.title = t('messages.传感器监测走势图') type calcType = { @@ -67,13 +68,38 @@ async function ajax() { item.name = item.name + '(' + unit + ')' } if (tempData.hasOwnProperty(item.id)) { - tempData[item.id].data.push({ + let seriesData:any = { name: item.type, type: 'line', showSymbol: false, data: item.date.map((key, value) => [key, item.value[value]]), smooth: true, - }) + } + if (limit&&limit!=='{}') { + let arrLimit:object = JSON.parse(limit) + let markLineData = [] + for(let i in arrLimit) { + markLineData.push({ + name: i, + yAxis: arrLimit[i], + label: { + formatter: `${i}上限值：` + arrLimit[i] + unit, + position: "middle", + }, + lineStyle: { + color: "red", // 这儿设置安全基线颜色 + }, + }) + + } + seriesData.markLine = { + // 设置最大值和最小值 + silent: true, //基线显示 隐藏 + symbol: "none", // 不显示箭头和圆点 + data: markLineData + } + } + tempData[item.id].data.push(seriesData) tempData[item.id].math.push({ key: item.type, value: { diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue index b524485..ee13bb1 100644 --- a/src/views/generalEnvironmentMechanical/index.vue +++ b/src/views/generalEnvironmentMechanical/index.vue @@ -13,7 +13,7 @@ -
+
@@ -117,7 +117,7 @@ let humidityBottom = ref({}) /** * 跳转到趋势图 */ -function gotoTrendChart(value, unit) { +function gotoTrendChart(value, unit, limit={}) { let ids = value.map((item) => item.devId).toString(); ElMessageBox.confirm( '即将跳转到传感器监测走势图页面，是否继续？', @@ -128,8 +128,9 @@ function gotoTrendChart(value, unit) { type: 'info', } ) + .then(() => { - router.push({ path: '/TrendChart', query: { ids: ids, unit: unit } }) + router.push({ path: '/TrendChart', query: { ids: ids, unit: unit,limit:JSON.stringify(limit) } }) }) .catch(() => { diff --git a/src/views/index.vue b/src/views/index.vue index c79bb27..e438c2a 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -289,7 +289,7 @@ let routerList = [ { id: 31, path: "/MicrofactoryDevOnline", - title: '南门水房物联大屏', + title: '微工厂缝纫设备看板', url: require("../assets/indexImg/MicrofactoryDevOnline.png"), }, ]; diff --git a/src/views/intelligentShelves/components/ShelfPanel.vue b/src/views/intelligentShelves/components/ShelfPanel.vue new file mode 100644 index 0000000..9f74458 --- /dev/null +++ b/src/views/intelligentShelves/components/ShelfPanel.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/views/intelligentShelves/index.vue b/src/views/intelligentShelves/index.vue new file mode 100644 index 0000000..a6fcb7a --- /dev/null +++ b/src/views/intelligentShelves/index.vue @@ -0,0 +1,44 @@ + + + + + + +