修改机械分厂车间环境大屏用电量排序问题

2023-09-04 09:08:34 +08:00 · 2023-09-04 09:08:34 +08:00 · 98d4a5a6a5
commit 98d4a5a6a5
parent d7d4468a61
6 changed files with 86 additions and 82 deletions
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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) {