From 0878434b03aecbc5fd3284a2207406aebe3ae140 Mon Sep 17 00:00:00 2001 From: hzz Date: Mon, 14 Aug 2023 11:40:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=B8=83=E5=9B=BE?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/http/AerialView/index.ts | 4 ++-- src/locales/lang/en.ts | 3 ++- src/locales/lang/zh.ts | 1 + src/router/index.ts | 5 +++++ src/views/AerialView/index.vue | 2 +- src/views/FactoryView/index.vue | 2 +- src/views/FactoryViewTopo/index.vue | 2 +- src/views/MechanicalView/index.vue | 2 +- src/views/MechanicalViewEdit/index.vue | 2 +- src/views/MechanicalView_dajian/index.vue | 2 +- src/views/MechanicalView_hanjie/index.vue | 2 +- src/views/MechanicalView_jijia/index.vue | 2 +- src/views/MechanicalView_jingjia/index.vue | 2 +- src/views/MechanicalView_jingshi/index.vue | 2 +- 14 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/http/AerialView/index.ts b/src/http/AerialView/index.ts index c7bb05f..10c72db 100644 --- a/src/http/AerialView/index.ts +++ b/src/http/AerialView/index.ts @@ -13,8 +13,8 @@ import {get,post,put} from "@/utils/http" export function getSensorInfodata(){ return get('/device/getSensorInfo') } -export function deviceDistributeInMachineryFactorydata(){ - return get('/device/deviceDistributeInMachineryFactory') +export function deviceDistributeInMachineryFactorydata(data){ + return get('/device/deviceDistributeInMachineryFactory',data) } export function getSensorInfoByType(data){ diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index e66def4..e19e8f2 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -310,6 +310,7 @@ export default { '工作时间':'工作时间', '空闲时间':'空闲时间', '智能货架物联管理系统':'智能货架物联管理系统', - '微工厂':'微工厂', + '微工厂':'微工厂', + '微工厂环境实时监测系统':'微工厂环境实时监测系统', } } \ No newline at end of file diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 3ef83c7..203d78d 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -311,5 +311,6 @@ export default { '空闲时间':'空闲时间', '智能货架物联管理系统':'智能货架物联管理系统', '微工厂':'微工厂', + '微工厂环境实时监测系统':'微工厂环境实时监测系统', } } \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 03dd41e..4ab98af 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -263,6 +263,11 @@ const routes: Array = [ name: "intelligentShelves", component: () => import("../views/intelligentShelves/index.vue"), }, + { + path: "/MicEnvironment", + name: "MicEnvironment", + component: () => import("../views/MicEnvironment/index.vue"), + }, diff --git a/src/views/AerialView/index.vue b/src/views/AerialView/index.vue index 68c0a06..7ac54e2 100644 --- a/src/views/AerialView/index.vue +++ b/src/views/AerialView/index.vue @@ -56,7 +56,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,9,10,11'}); if (result.code == 200) { store.setdevList(result.data); diff --git a/src/views/FactoryView/index.vue b/src/views/FactoryView/index.vue index 345ab31..a699cb1 100644 --- a/src/views/FactoryView/index.vue +++ b/src/views/FactoryView/index.vue @@ -48,7 +48,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,8,9,10,11'}); if (result.code == 200) { diff --git a/src/views/FactoryViewTopo/index.vue b/src/views/FactoryViewTopo/index.vue index d9ae640..6fdca78 100644 --- a/src/views/FactoryViewTopo/index.vue +++ b/src/views/FactoryViewTopo/index.vue @@ -48,7 +48,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,8,9,10,11'}); if (result.code == 200) { diff --git a/src/views/MechanicalView/index.vue b/src/views/MechanicalView/index.vue index 918fa74..10827b3 100644 --- a/src/views/MechanicalView/index.vue +++ b/src/views/MechanicalView/index.vue @@ -60,7 +60,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,9,10,11'}); if (result.code == 200) { // setTimeout(() => { diff --git a/src/views/MechanicalViewEdit/index.vue b/src/views/MechanicalViewEdit/index.vue index 03b5597..11848c6 100644 --- a/src/views/MechanicalViewEdit/index.vue +++ b/src/views/MechanicalViewEdit/index.vue @@ -60,7 +60,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,9,10,11'}); if (result.code == 200) { // setTimeout(() => { diff --git a/src/views/MechanicalView_dajian/index.vue b/src/views/MechanicalView_dajian/index.vue index 8dc9fb3..25fa0ca 100644 --- a/src/views/MechanicalView_dajian/index.vue +++ b/src/views/MechanicalView_dajian/index.vue @@ -60,7 +60,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,9,10,11'}); if (result.code == 200) { diff --git a/src/views/MechanicalView_hanjie/index.vue b/src/views/MechanicalView_hanjie/index.vue index 65762ed..156dbca 100644 --- a/src/views/MechanicalView_hanjie/index.vue +++ b/src/views/MechanicalView_hanjie/index.vue @@ -58,7 +58,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,9,10,11'}); if (result.code == 200) { store.setdevList({"焊接车间":result.data['焊接车间']}); diff --git a/src/views/MechanicalView_jijia/index.vue b/src/views/MechanicalView_jijia/index.vue index c606004..346d7af 100644 --- a/src/views/MechanicalView_jijia/index.vue +++ b/src/views/MechanicalView_jijia/index.vue @@ -58,7 +58,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,9,10,11'}); if (result.code == 200) { store.setdevList({"机加车间":result.data['机加车间']}); diff --git a/src/views/MechanicalView_jingjia/index.vue b/src/views/MechanicalView_jingjia/index.vue index 41c1ed4..672d0b0 100644 --- a/src/views/MechanicalView_jingjia/index.vue +++ b/src/views/MechanicalView_jingjia/index.vue @@ -56,7 +56,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,9,10,11'}); if (result.code == 200) { store.setdevList({"精加车间":result.data['精加车间']}); diff --git a/src/views/MechanicalView_jingshi/index.vue b/src/views/MechanicalView_jingshi/index.vue index 0c974af..fa45c77 100644 --- a/src/views/MechanicalView_jingshi/index.vue +++ b/src/views/MechanicalView_jingshi/index.vue @@ -59,7 +59,7 @@ async function getSensorInfodatafun() { } //获取设备列表 async function deviceDistributeInMachineryFactorydatafun() { - let result: any = await deviceDistributeInMachineryFactorydata(); + let result: any = await deviceDistributeInMachineryFactorydata({ids:'6,7,9,10,11'}); if (result.code == 200) { store.setdevList({"精饰车间":result.data['精饰车间']});