From 98d4a5a6a5c6da40dd30482518c6490616690e7d Mon Sep 17 00:00:00 2001 From: hzz Date: Mon, 4 Sep 2023 09:08:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=A2=B0=E5=88=86?= =?UTF-8?q?=E5=8E=82=E8=BD=A6=E9=97=B4=E7=8E=AF=E5=A2=83=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=20=E7=94=A8=E7=94=B5=E9=87=8F=E6=8E=92=E5=BA=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PaintShopView/View1/bottom.vue | 8 +- src/views/PaintShopView/finishView/bottom.vue | 8 +- .../PaintShopView/machiningView/bottom.vue | 8 +- src/views/PaintShopView/stuffView/bottom.vue | 8 +- src/views/PaintShopView/weldView/bottom.vue | 8 +- src/views/index.vue | 128 +++++++----------- 6 files changed, 86 insertions(+), 82 deletions(-) diff --git a/src/views/PaintShopView/View1/bottom.vue b/src/views/PaintShopView/View1/bottom.vue index a6fccd8..0c43297 100644 --- a/src/views/PaintShopView/View1/bottom.vue +++ b/src/views/PaintShopView/View1/bottom.vue @@ -186,8 +186,14 @@ function setcontentData(val) { let powerMonth = [] for (let key in val.power) { monthData.push(key) - powerMonth.push(val.power[key]) } + monthData.sort(function(a,b){ + let c = parseInt(a) + let d = parseInt(b) + return d-c}); + monthData.forEach((res) => { + powerMonth.push(val.power[res]) + }) powerOption.option.yAxis.data = [] powerOption.option.series = [] powerOption.option.yAxis.data = monthData.reverse() diff --git a/src/views/PaintShopView/finishView/bottom.vue b/src/views/PaintShopView/finishView/bottom.vue index db5341c..a297d6f 100644 --- a/src/views/PaintShopView/finishView/bottom.vue +++ b/src/views/PaintShopView/finishView/bottom.vue @@ -184,8 +184,14 @@ function setcontentData(val) { let powerMonth = [] for (let key in val.power) { monthData.push(key) - powerMonth.push(val.power[key]) } + monthData.sort(function(a,b){ + let c = parseInt(a) + let d = parseInt(b) + return d-c}); + monthData.forEach((res) => { + powerMonth.push(val.power[res]) + }) powerOption.option.yAxis.data = [] powerOption.option.series = [] powerOption.option.yAxis.data = monthData.reverse() diff --git a/src/views/PaintShopView/machiningView/bottom.vue b/src/views/PaintShopView/machiningView/bottom.vue index 9a678c9..5a79152 100644 --- a/src/views/PaintShopView/machiningView/bottom.vue +++ b/src/views/PaintShopView/machiningView/bottom.vue @@ -185,8 +185,14 @@ function setcontentData(val) { let powerMonth = [] for (let key in val.power) { monthData.push(key) - powerMonth.push(val.power[key]) } + monthData.sort(function(a,b){ + let c = parseInt(a) + let d = parseInt(b) + return d-c}); + monthData.forEach((res) => { + powerMonth.push(val.power[res]) + }) powerOption.option.yAxis.data = [] powerOption.option.series = [] powerOption.option.yAxis.data = monthData.reverse() diff --git a/src/views/PaintShopView/stuffView/bottom.vue b/src/views/PaintShopView/stuffView/bottom.vue index f3fd14c..3f68cec 100644 --- a/src/views/PaintShopView/stuffView/bottom.vue +++ b/src/views/PaintShopView/stuffView/bottom.vue @@ -185,8 +185,14 @@ function setcontentData(val) { let powerMonth = [] for (let key in val.power) { monthData.push(key) - powerMonth.push(val.power[key]) } + monthData.sort(function(a,b){ + let c = parseInt(a) + let d = parseInt(b) + return d-c}); + monthData.forEach((res) => { + powerMonth.push(val.power[res]) + }) powerOption.option.yAxis.data = [] powerOption.option.series = [] powerOption.option.yAxis.data = monthData.reverse() diff --git a/src/views/PaintShopView/weldView/bottom.vue b/src/views/PaintShopView/weldView/bottom.vue index c9d762d..231ba37 100644 --- a/src/views/PaintShopView/weldView/bottom.vue +++ b/src/views/PaintShopView/weldView/bottom.vue @@ -185,8 +185,14 @@ function setcontentData(val) { let powerMonth = [] for (let key in val.power) { monthData.push(key) - powerMonth.push(val.power[key]) } + monthData.sort(function(a,b){ + let c = parseInt(a) + let d = parseInt(b) + return d-c}); + monthData.forEach((res) => { + powerMonth.push(val.power[res]) + }) powerOption.option.yAxis.data = [] powerOption.option.series = [] powerOption.option.yAxis.data = monthData.reverse() diff --git a/src/views/index.vue b/src/views/index.vue index d4d078f..71b3c53 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -95,13 +95,6 @@ let routerList = [ title: t("messages.realtimeSecurity"), url: require("../assets/indexImg/realtimeSecurity.png"), }, - { - id: 7, - isLink: false, - path: "/FactoryView", - title: t("messages.FactoryView"), - url: require("../assets/indexImg/FactoryView.png"), - }, // { // id:9, // path:'/AerialView', @@ -143,48 +136,7 @@ let routerList = [ title: t("messages.weldView"), url: require("../assets/indexImg/PaintShopView.png"), }, - { - id: 15, - isLink: false, - path: "/MechanicalView", - title: t("messages.MechanicalView"), - url: require("../assets/indexImg/MechanicalView.png"), - }, - { - id: 16, - isLink: false, - path: "/MechanicalViewDajian", - title: t("messages.MechanicalViewDajian"), - url: require("../assets/indexImg/MechanicalView.png"), - }, - { - id: 17, - isLink: false, - path: "/MechanicalViewHanjie", - title: t("messages.MechanicalViewHanjie"), - url: require("../assets/indexImg/MechanicalView.png"), - }, - { - id: 18, - isLink: false, - path: "/MechanicalViewJijia", - title: t("messages.MechanicalViewJijia"), - url: require("../assets/indexImg/MechanicalView.png"), - }, - { - id: 19, - isLink: false, - path: "/MechanicalViewJingjia", - title: t("messages.MechanicalViewJingjia"), - url: require("../assets/indexImg/MechanicalView.png"), - }, - { - id: 20, - isLink: false, - path: "/MechanicalViewJingshi", - title: t("messages.MechanicalViewJingshi"), - url: require("../assets/indexImg/MechanicalView.png"), - }, + { id: 21, isLink: false, @@ -240,34 +192,6 @@ let routerList = [ title: t("messages.pmData"), url: require("../assets/indexImg/pmdata.png"), }, - // { - // id: 27, - // isLink: true, - // path: "http://8.130.165.100:8081/dashboard/0e748f30-e0ac-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449", - // title: t("messages.mechanicalPm"), - // url: require("../assets/indexImg/mechanicalPm.png"), - // }, - // { - // id: 28, - // isLink: true, - // path: "http://8.130.165.100:8081/dashboard/6bfc6650-e0b1-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449", - // title: t("messages.mechanical_TVOC_CH2O"), - // url: require("../assets/indexImg/mechanical_TVOC_CH2O.png"), - // }, - // { - // id: 29, - // isLink: true, - // path: "http://8.130.165.100:8081/dashboard/44dac830-e0b3-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449", - // title: t("messages.mechanical_humidity"), - // url: require("../assets/indexImg/mechanical_humidity.png"), - // }, - // { - // id: 30, - // isLink: true, - // path: "http://8.130.165.100:8081/dashboard/0514ffe0-e0b8-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449", - // title: t("messages.mechanical_noise"), - // url: require("../assets/indexImg/mechanical_noise.png"), - // }, { id: 31, path: "/waterhousedata", @@ -298,6 +222,56 @@ let routerList = [ title: '设备大屏展示系统', url: require("../assets/indexImg/microExhibition.jpg"), }, + + { + id: 7, + isLink: false, + path: "/FactoryView", + title: t("messages.FactoryView"), + url: require("../assets/indexImg/FactoryView.png"), + }, + { + id: 15, + isLink: false, + path: "/MechanicalView", + title: t("messages.MechanicalView"), + url: require("../assets/indexImg/MechanicalView.png"), + }, + { + id: 16, + isLink: false, + path: "/MechanicalViewDajian", + title: t("messages.MechanicalViewDajian"), + url: require("../assets/indexImg/MechanicalView.png"), + }, + { + id: 17, + isLink: false, + path: "/MechanicalViewHanjie", + title: t("messages.MechanicalViewHanjie"), + url: require("../assets/indexImg/MechanicalView.png"), + }, + { + id: 18, + isLink: false, + path: "/MechanicalViewJijia", + title: t("messages.MechanicalViewJijia"), + url: require("../assets/indexImg/MechanicalView.png"), + }, + { + id: 19, + isLink: false, + path: "/MechanicalViewJingjia", + title: t("messages.MechanicalViewJingjia"), + url: require("../assets/indexImg/MechanicalView.png"), + }, + { + id: 20, + isLink: false, + path: "/MechanicalViewJingshi", + title: t("messages.MechanicalViewJingshi"), + url: require("../assets/indexImg/MechanicalView.png"), + }, ]; let lang = ref(getStoredLanguage() || '简体中文') function changelang(val) {