diff --git a/src/http/generalEnvironment/index.ts b/src/http/generalEnvironment/index.ts
index 774c101..6865164 100644
--- a/src/http/generalEnvironment/index.ts
+++ b/src/http/generalEnvironment/index.ts
@@ -14,12 +14,12 @@ export function getHumitureData(data:any){
return get('/s/getHumitureData',data)
}
//PM2.5
-export function getPmtwoData(){
- return get('/s/getPmtwoData')
+export function getPmtwoData(data:any){
+ return get('/s/getPmtwoData',data)
}
//PM10
-export function getPmtenData(){
- return get('/s/getPmtenData')
+export function getPmtenData(data:any){
+ return get('/s/getPmtenData',data)
}
//噪音
export function getnoiseData(data:any){
diff --git a/src/views/generalEnvironment/content/right.vue b/src/views/generalEnvironment/content/right.vue
index c8eb618..b4dc348 100644
--- a/src/views/generalEnvironment/content/right.vue
+++ b/src/views/generalEnvironment/content/right.vue
@@ -140,7 +140,7 @@ watch(
* @函数备注:
*/
async function getPmtwoDatafun() {
- let resulttwo: any = await getPmtwoData()
+ let resulttwo: any = await getPmtwoData({})
if (resulttwo.code == 200) {
return resulttwo
}
@@ -148,7 +148,7 @@ async function getPmtwoDatafun() {
}
async function getPmtenDatafun() {
- let resultten: any = await getPmtenData()
+ let resultten: any = await getPmtenData({})
if (resultten.code == 200) {
return resultten
}
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index ac02798..1efde83 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -16,7 +16,7 @@
-
@@ -36,16 +36,14 @@
-
+
-
+
@@ -221,29 +219,20 @@ watch(() => store.humiture, (newVal, oldVal) => {
*/
//获取粉尘数据
let pmindex = ref(0);
+let noiseData = []
async function getPmData() {
- let resulttwo: any = await getPmtwoData()
- let resultten: any = await getPmtenData()
- let arr = [
- '01336fd0-1fa0-11ed-9223-7db1174970a8',
- '083e3900-3435-11ed-a7e1-fd42bca6c8c6',
- '270e1500-eee1-11ed-b2ee-2d727e0cafab',
- '54058c30-eee3-11ed-b2ee-2d727e0cafab',
- '76efb040-eee3-11ed-b2ee-2d727e0cafab',
- 'a6020310-eee3-11ed-b2ee-2d727e0cafab',
- 'bcbfb530-88b2-11ed-a926-570995ad0254'
- ]
+ let resulttwo: any = await getPmtwoData({ deptIds: '6,7,9,10,11' })
+ let resultten: any = await getPmtenData({ deptIds: '6,7,9,10,11' })
let data = {}
if (resulttwo) {
resulttwo.data.forEach(ele => {
- if (arr.indexOf(ele.devId) > -1) {
- data[ele.devId] = {
- devId: ele.devId,
- name: ele.devName.split('监测')[0],
- pm25: ele.value,
- pm10: null
- }
+ data[ele.devId] = {
+ devId: ele.devId,
+ name: ele.devName.split('监测')[0],
+ pm25: ele.value,
+ pm10: null
}
+ noiseData.push(ele.devId)
})
}
@@ -255,7 +244,7 @@ async function getPmData() {
})
}
-
+
store.$patch((state) => {
state.pm = Object.values(data)
})
@@ -316,8 +305,8 @@ async function getPower_data() {
}
}
-let gascolor = {step0:'#186945',step1:'#1b7a4f',border:'rgba(8, 206, 120, 0.8)',color:'rgba(8, 206, 120, 0.4)'}
-let watercolor = {step0:'#0D73B3',step1:'#1176C6',border:'#1E4D7B',color:'#0F2A57'}
+let gascolor = { step0: '#186945', step1: '#1b7a4f', border: 'rgba(8, 206, 120, 0.8)', color: 'rgba(8, 206, 120, 0.4)' }
+let watercolor = { step0: '#0D73B3', step1: '#1176C6', border: '#1E4D7B', color: '#0F2A57' }
//获取用气量数据
async function getconsumeDetailfun() {
let result: any = await getconsumeDetail()
@@ -343,23 +332,17 @@ async function getpipeDatafun() {
}
}
/************************************************************ */
-let noiseData = [
- '55aaf760-4e88-11ed-b6af-15994988a6b3',
- '8733fe40-4e82-11ed-b6af-15994988a6b3',
- 'cae16000-4e88-11ed-b6af-15994988a6b3',
- '08144ba0-4e88-11ed-b6af-15994988a6b3',
- '2a5f6600-4e87-11ed-b6af-15994988a6b3'
-]
+
//socket
function getWebsocket(val) {
headerref.value.HeadergetWebsocket(val)
try {
let data = JSON.parse(val);
- if (data.type == "noise") {
+ if (data.type == "noise") {
data.msg.listData.forEach(ele => {
if (noiseData.indexOf(ele.devId) > -1) {
- let verticalData = { name: ele.name, val: ele.value, devId: ele.devId,status:ele.status }
+ let verticalData = { name: ele.name, val: ele.value, devId: ele.devId, status: ele.status }
store.changeNewVerticalNum({ type: 'noise', data: verticalData })
}
})
diff --git a/src/views/generalEnvironmentjixiefenchang/content/right.vue b/src/views/generalEnvironmentjixiefenchang/content/right.vue
index f274e34..624d316 100644
--- a/src/views/generalEnvironmentjixiefenchang/content/right.vue
+++ b/src/views/generalEnvironmentjixiefenchang/content/right.vue
@@ -142,8 +142,8 @@ watch(
* @函数备注:
*/
async function getPmData() {
- let resulttwo: any = await getPmtwoData()
- let resultten: any = await getPmtenData()
+ let resulttwo: any = await getPmtwoData({})
+ let resultten: any = await getPmtenData({})
let data = { welding: { two: null, ten: null }, stuff: { two: null, ten: null }, ornaments: { two: null, ten: null } }
if (resulttwo) {
resulttwo.data.forEach(ele => {
diff --git a/src/views/index.vue b/src/views/index.vue
index 9f457e9..4530fdc 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -252,34 +252,34 @@ 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: 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",
diff --git a/src/views/pmData/index.vue b/src/views/pmData/index.vue
index 4997a46..b87aaac 100644
--- a/src/views/pmData/index.vue
+++ b/src/views/pmData/index.vue
@@ -49,8 +49,8 @@ let pmData = reactive([]);
* 请求数据
*/
async function getData() {
- let resulttwo: any = await getPmtwoData()
- let resultten: any = await getPmtenData()
+ let resulttwo: any = await getPmtwoData({})
+ let resultten: any = await getPmtenData({})
if (resulttwo.code == 200) {
resulttwo.data.forEach(res => {