删除首页无效的四个链接
噪音接口修改 机械分厂环境大屏修改
This commit is contained in:
hzz
parent
93675f8e4f
commit
3ac9a7943d
@ -14,12 +14,12 @@ export function getHumitureData(data:any){
|
|||||||
return get('/s/getHumitureData',data)
|
return get('/s/getHumitureData',data)
|
||||||
}
|
}
|
||||||
//PM2.5
|
//PM2.5
|
||||||
export function getPmtwoData(){
|
export function getPmtwoData(data:any){
|
||||||
return get('/s/getPmtwoData')
|
return get('/s/getPmtwoData',data)
|
||||||
}
|
}
|
||||||
//PM10
|
//PM10
|
||||||
export function getPmtenData(){
|
export function getPmtenData(data:any){
|
||||||
return get('/s/getPmtenData')
|
return get('/s/getPmtenData',data)
|
||||||
}
|
}
|
||||||
//噪音
|
//噪音
|
||||||
export function getnoiseData(data:any){
|
export function getnoiseData(data:any){
|
||||||
|
|||||||
@ -140,7 +140,7 @@ watch(
|
|||||||
* @函数备注:
|
* @函数备注:
|
||||||
*/
|
*/
|
||||||
async function getPmtwoDatafun() {
|
async function getPmtwoDatafun() {
|
||||||
let resulttwo: any = await getPmtwoData()
|
let resulttwo: any = await getPmtwoData({})
|
||||||
if (resulttwo.code == 200) {
|
if (resulttwo.code == 200) {
|
||||||
return resulttwo
|
return resulttwo
|
||||||
}
|
}
|
||||||
@ -148,7 +148,7 @@ async function getPmtwoDatafun() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function getPmtenDatafun() {
|
async function getPmtenDatafun() {
|
||||||
let resultten: any = await getPmtenData()
|
let resultten: any = await getPmtenData({})
|
||||||
if (resultten.code == 200) {
|
if (resultten.code == 200) {
|
||||||
return resultten
|
return resultten
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,16 +36,14 @@
|
|||||||
<border13>
|
<border13>
|
||||||
<!-- <humidityBar :title="'温湿度'" :data="humidityData" :bottom="humidityBottom" :top="humidityTop">
|
<!-- <humidityBar :title="'温湿度'" :data="humidityData" :bottom="humidityBottom" :top="humidityTop">
|
||||||
</humidityBar> -->
|
</humidityBar> -->
|
||||||
<gas :title="t('messages.gashistory')" :value="gasData"
|
<gas :title="t('messages.gashistory')" :value="gasData" :color="gascolor"></gas>
|
||||||
:color="gascolor"></gas>
|
|
||||||
</border13>
|
</border13>
|
||||||
</div>
|
</div>
|
||||||
<div style="width: 16%;height: 100%;">
|
<div style="width: 16%;height: 100%;">
|
||||||
<border13>
|
<border13>
|
||||||
<!-- <humidityBar :title="'温湿度'" :data="humidityData" :bottom="humidityBottom" :top="humidityTop">
|
<!-- <humidityBar :title="'温湿度'" :data="humidityData" :bottom="humidityBottom" :top="humidityTop">
|
||||||
</humidityBar> -->
|
</humidityBar> -->
|
||||||
<gas :title="t('messages.waterhistory')" :value="waterData"
|
<gas :title="t('messages.waterhistory')" :value="waterData" :color="watercolor"></gas>
|
||||||
:color="watercolor"></gas>
|
|
||||||
</border13>
|
</border13>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -221,29 +219,20 @@ watch(() => store.humiture, (newVal, oldVal) => {
|
|||||||
*/
|
*/
|
||||||
//获取粉尘数据
|
//获取粉尘数据
|
||||||
let pmindex = ref(0);
|
let pmindex = ref(0);
|
||||||
|
let noiseData = []
|
||||||
async function getPmData() {
|
async function getPmData() {
|
||||||
let resulttwo: any = await getPmtwoData()
|
let resulttwo: any = await getPmtwoData({ deptIds: '6,7,9,10,11' })
|
||||||
let resultten: any = await getPmtenData()
|
let resultten: any = await getPmtenData({ deptIds: '6,7,9,10,11' })
|
||||||
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 data = {}
|
let data = {}
|
||||||
if (resulttwo) {
|
if (resulttwo) {
|
||||||
resulttwo.data.forEach(ele => {
|
resulttwo.data.forEach(ele => {
|
||||||
if (arr.indexOf(ele.devId) > -1) {
|
|
||||||
data[ele.devId] = {
|
data[ele.devId] = {
|
||||||
devId: ele.devId,
|
devId: ele.devId,
|
||||||
name: ele.devName.split('监测')[0],
|
name: ele.devName.split('监测')[0],
|
||||||
pm25: ele.value,
|
pm25: ele.value,
|
||||||
pm10: null
|
pm10: null
|
||||||
}
|
}
|
||||||
}
|
noiseData.push(ele.devId)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -343,13 +332,7 @@ 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
|
//socket
|
||||||
function getWebsocket(val) {
|
function getWebsocket(val) {
|
||||||
headerref.value.HeadergetWebsocket(val)
|
headerref.value.HeadergetWebsocket(val)
|
||||||
|
|||||||
@ -142,8 +142,8 @@ watch(
|
|||||||
* @函数备注:
|
* @函数备注:
|
||||||
*/
|
*/
|
||||||
async function getPmData() {
|
async function getPmData() {
|
||||||
let resulttwo: any = await getPmtwoData()
|
let resulttwo: any = await getPmtwoData({})
|
||||||
let resultten: any = await getPmtenData()
|
let resultten: any = await getPmtenData({})
|
||||||
let data = { welding: { two: null, ten: null }, stuff: { two: null, ten: null }, ornaments: { two: null, ten: null } }
|
let data = { welding: { two: null, ten: null }, stuff: { two: null, ten: null }, ornaments: { two: null, ten: null } }
|
||||||
if (resulttwo) {
|
if (resulttwo) {
|
||||||
resulttwo.data.forEach(ele => {
|
resulttwo.data.forEach(ele => {
|
||||||
|
|||||||
@ -252,34 +252,34 @@ let routerList = [
|
|||||||
title: t("messages.pmData"),
|
title: t("messages.pmData"),
|
||||||
url: require("../assets/indexImg/pmdata.png"),
|
url: require("../assets/indexImg/pmdata.png"),
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
id: 27,
|
// id: 27,
|
||||||
isLink: true,
|
// isLink: true,
|
||||||
path: "http://8.130.165.100:8081/dashboard/0e748f30-e0ac-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449",
|
// path: "http://8.130.165.100:8081/dashboard/0e748f30-e0ac-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449",
|
||||||
title: t("messages.mechanicalPm"),
|
// title: t("messages.mechanicalPm"),
|
||||||
url: require("../assets/indexImg/mechanicalPm.png"),
|
// url: require("../assets/indexImg/mechanicalPm.png"),
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
id: 28,
|
// id: 28,
|
||||||
isLink: true,
|
// isLink: true,
|
||||||
path: "http://8.130.165.100:8081/dashboard/6bfc6650-e0b1-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449",
|
// 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"),
|
// title: t("messages.mechanical_TVOC_CH2O"),
|
||||||
url: require("../assets/indexImg/mechanical_TVOC_CH2O.png"),
|
// url: require("../assets/indexImg/mechanical_TVOC_CH2O.png"),
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
id: 29,
|
// id: 29,
|
||||||
isLink: true,
|
// isLink: true,
|
||||||
path: "http://8.130.165.100:8081/dashboard/44dac830-e0b3-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449",
|
// path: "http://8.130.165.100:8081/dashboard/44dac830-e0b3-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449",
|
||||||
title: t("messages.mechanical_humidity"),
|
// title: t("messages.mechanical_humidity"),
|
||||||
url: require("../assets/indexImg/mechanical_humidity.png"),
|
// url: require("../assets/indexImg/mechanical_humidity.png"),
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
id: 30,
|
// id: 30,
|
||||||
isLink: true,
|
// isLink: true,
|
||||||
path: "http://8.130.165.100:8081/dashboard/0514ffe0-e0b8-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449",
|
// path: "http://8.130.165.100:8081/dashboard/0514ffe0-e0b8-11ed-b217-b1f43b805208?publicId=ee1adcf0-c350-11eb-b8eb-250fadb0e449",
|
||||||
title: t("messages.mechanical_noise"),
|
// title: t("messages.mechanical_noise"),
|
||||||
url: require("../assets/indexImg/mechanical_noise.png"),
|
// url: require("../assets/indexImg/mechanical_noise.png"),
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
id: 31,
|
id: 31,
|
||||||
path: "/waterhousedata",
|
path: "/waterhousedata",
|
||||||
|
|||||||
@ -49,8 +49,8 @@ let pmData = reactive<pmData[]>([]);
|
|||||||
* 请求数据
|
* 请求数据
|
||||||
*/
|
*/
|
||||||
async function getData() {
|
async function getData() {
|
||||||
let resulttwo: any = await getPmtwoData()
|
let resulttwo: any = await getPmtwoData({})
|
||||||
let resultten: any = await getPmtenData()
|
let resultten: any = await getPmtenData({})
|
||||||
|
|
||||||
if (resulttwo.code == 200) {
|
if (resulttwo.code == 200) {
|
||||||
resulttwo.data.forEach(res => {
|
resulttwo.data.forEach(res => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user