diff --git a/src/assets/img/paifeng.svg b/src/assets/img/paifeng.svg new file mode 100644 index 0000000..2785795 --- /dev/null +++ b/src/assets/img/paifeng.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/paifeng1.svg b/src/assets/img/paifeng1.svg new file mode 100644 index 0000000..b25dd20 --- /dev/null +++ b/src/assets/img/paifeng1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/shidu.svg b/src/assets/img/shidu.svg new file mode 100644 index 0000000..8afe60c --- /dev/null +++ b/src/assets/img/shidu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/shidu1.svg b/src/assets/img/shidu1.svg new file mode 100644 index 0000000..6234653 --- /dev/null +++ b/src/assets/img/shidu1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/wendu.svg b/src/assets/img/wendu.svg new file mode 100644 index 0000000..4d3d9c5 --- /dev/null +++ b/src/assets/img/wendu.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/wendu1.svg b/src/assets/img/wendu1.svg new file mode 100644 index 0000000..a7f767b --- /dev/null +++ b/src/assets/img/wendu1.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/store/moduleSocket.ts b/src/store/moduleSocket.ts index 34c705a..f6bb1a1 100644 --- a/src/store/moduleSocket.ts +++ b/src/store/moduleSocket.ts @@ -126,7 +126,21 @@ export const useSocketStore = defineStore(Names.socket, { } ] } - ] + ], + dqbf: { + paifeng: 0,//工作:1，未工作:0 + humidity: 30,//湿度 + temp: 40.0,//温度 + humidity_limit: 80,//湿度临界值 + temp_limit: 36,//温度临界值 + }, + xqbf: { + paifeng: 0,//工作:1，未工作:0 + humidity: 30,//湿度 + temp: 40.0,//温度 + humidity_limit: 80,//湿度临界值 + temp_limit: 36,//温度临界值 + } } }, //computed 修改一些值 @@ -142,6 +156,17 @@ export const useSocketStore = defineStore(Names.socket, { // 1、Index.方法() //异步方法需要添加async和await actions: { + setDqbfData(val) { + this.dqbf = val + console.log(this.dqbf, 'dqbf'); + + }, + setXqbfData(val) { + this.xqbf = val + console.log(this.xqbf, 'xqbf'); + }, + + /** * @函数功能: * @param {*} val 环境噪音参数 @@ -173,22 +198,22 @@ export const useSocketStore = defineStore(Names.socket, { */ changePM(val) { let arr = ['25c78580-1594-11ee-b4df-a9653aef169c', '2e0310c0-1594-11ee-b4df-a9653aef169c', '6bbbb1b0-1594-11ee-b4df-a9653aef169c'] - + // if (arr.indexOf(val.devId) > -1) { // console.log(val,'这三个设备'); - + // } if (val.devId == '2e0310c0-1594-11ee-b4df-a9653aef169c') { - this.pm.welding.two = val.pm25 - this.pm.welding.ten = val.pm10 + this.pm.welding.two = val.pm25 + this.pm.welding.ten = val.pm10 } else if (val.devId == '6bbbb1b0-1594-11ee-b4df-a9653aef169c') { - this.pm.ornaments.two = val.pm25 - this.pm.ornaments.ten = val.pm10 + this.pm.ornaments.two = val.pm25 + this.pm.ornaments.ten = val.pm10 } else if (val.devId == '25c78580-1594-11ee-b4df-a9653aef169c') { - this.pm.stuff.two = val.pm25 - this.pm.stuff.ten = val.pm10 - } + this.pm.stuff.two = val.pm25 + this.pm.stuff.ten = val.pm10 + } // if (val.enName == 'welding') { diff --git a/src/utils/devSever.ts b/src/utils/devSever.ts index 4ff6b42..e3236d8 100644 --- a/src/utils/devSever.ts +++ b/src/utils/devSever.ts @@ -8,7 +8,7 @@ * 版权信息 : 2023 by ${再登软件}, All Rights Reserved. */ -// export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.1.128:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} +// export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.110.116:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API} export const production={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API} //拼接图片url路径 diff --git a/src/views/Exhibition/CIFM/index.vue b/src/views/Exhibition/CIFM/index.vue index be382e7..69b6760 100644 --- a/src/views/Exhibition/CIFM/index.vue +++ b/src/views/Exhibition/CIFM/index.vue @@ -1,3 +1,4 @@ +