diff --git a/src/assets/indexImg/generalEnvironmentMechanical.png b/src/assets/indexImg/generalEnvironmentMechanical.png new file mode 100644 index 0000000..9a9da28 Binary files /dev/null and b/src/assets/indexImg/generalEnvironmentMechanical.png differ diff --git a/src/store/moduleSocketMechanics.ts b/src/store/moduleSocketMechanics.ts index e9d1f63..0e4a717 100644 --- a/src/store/moduleSocketMechanics.ts +++ b/src/store/moduleSocketMechanics.ts @@ -19,13 +19,15 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang, { // 4、通过action修改 state: () => { return { - humiture: [ - { "devId": "c6f036c0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "精饰车间", "temp": "33.4", "humidity": "30.9" }, - { "devId": "c651b930-3b15-11ed-b6af-15994988a6b3", "name": "精加车间", "temp": "26.1", "humidity": "47" }, - { "devId": "9c4be1e0-33fb-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间", "temp": "29.3", "humidity": "37.6" }, - { "devId": "0e77f0b0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "大件车间", "temp": "28.6", "humidity": "38.4" }, - { "devId": "91f6d000-33fc-11ed-a7e1-fd42bca6c8c6", "name": "机加车间", "temp": "29.9", "humidity": "36.2" } - ], + // humiture: [ + // { "devId": "c6f036c0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "精饰车间", "temp": "33.4", "humidity": "30.9" }, + // { "devId": "c651b930-3b15-11ed-b6af-15994988a6b3", "name": "精加车间", "temp": "26.1", "humidity": "47" }, + // { "devId": "9c4be1e0-33fb-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间", "temp": "29.3", "humidity": "37.6" }, + // { "devId": "0e77f0b0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "大件车间", "temp": "28.6", "humidity": "38.4" }, + // { "devId": "91f6d000-33fc-11ed-a7e1-fd42bca6c8c6", "name": "机加车间", "temp": "29.9", "humidity": "36.2" } + // ], + + humiture:{Humiture:[],bottom:{humidity:null,temp:null,name:null},top:{humidity:null,temp:null,name:null}}, //温湿度 pm: [ { "devId": "01336fd0-1fa0-11ed-9223-7db1174970a8", "name": "大件车间粉尘", "pm2": "26", "pm10": "33" }, { "devId": "083e3900-3435-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间粉尘", "pm2": "46", "pm10": "59" }, @@ -165,6 +167,30 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang, { this.newVerticalNum[pIndex].value[cIndex].val = val.data.val this.newVerticalNum[pIndex].value[cIndex].status = true } - } + }, + /** + * @函数功能: + * @param {*} val 温湿度数据 + * @出口参数: + * @函数备注: + */ + changeHumiture(val){ + // console.log(this.humiture.Humiture); + + if(this.humiture.Humiture.length==0){ + this.humiture=val + }else{ + val.Humiture.forEach(res=>{ + this.humiture.Humiture.forEach(ele=>{ + if(res.name==ele.name){ + ele.humidity=res.humidity + ele.temp=res.temp + } + }) + }) + } + + }, } + }) \ No newline at end of file diff --git a/src/views/InPlantProducts/index.vue b/src/views/InPlantProducts/index.vue index df5999c..fc2ca66 100644 --- a/src/views/InPlantProducts/index.vue +++ b/src/views/InPlantProducts/index.vue @@ -8,8 +8,8 @@ :height="'150px'" :title="t('messages.InPlantProducts')" :titleTip="titleTip" - :typeFun="['AbnormalData','time']" - :alarmType="['inplant']" + :typeFun="['time']" + :alarmType="[]" >