Compare commits

..

No commits in common. "f94ae07f6e4166966621eb9662de419ad24ee834" and "8d08393653df8b467fd9ac0e3f0e6628c6d24986" have entirely different histories.

5 changed files with 48 additions and 161 deletions

View File

@ -102,13 +102,9 @@
</div> </div>
<div class="drag_box1" ref="drag_box1" v-show="limitUserId == 2"> <div class="drag_box1" ref="drag_box1" v-show="limitUserId == 2">
<img class="drag_img" src="../../assets/img/map1.png" alt="" /> <img class="drag_img" src="../../assets/img/map1.png" alt="" />
<img class="axis_init" :class="'axis_' + (index + 8)" src="../../assets/img/axis1.png" <img class="axis_init" :class="'axis_' + (index + 8)" src="../../assets/img/axis1.png" :style="'left:' + (48.5 + index * 4.1) + '%'" alt="" @click="handlerAxis_2" v-for="(i,index) in 10" :key="index + '_1'"/>
:style="'left:' + (48.5 + index * 4.1) + '%'" alt="" @click="handlerAxis_2" v-for="(i, index) in 10"
:key="index + '_1'" />
<img class="axis_init1" :class="'axis_' + (index1 + 17)" src="../../assets/img/axis1.png" <img class="axis_init1" :class="'axis_' + (index1 + 17)" src="../../assets/img/axis1.png" :style="'top:' + (22 + index1 * 0.105) + '%' + ';' + 'left:' + (5 + index1 * 3.3) + '%' + ';'" alt="" @click="handlerAxis_2" v-for="(i,index1) in 25" :key="index1 + '_2'"/>
:style="'top:' + (22 + index1 * 0.105) + '%' + ';' + 'left:' + (5 + index1 * 3.3) + '%' + ';'" alt=""
@click="handlerAxis_2" v-for="(i, index1) in 25" :key="index1 + '_2'" />
</div> </div>
</div> </div>
</div> </div>
@ -142,12 +138,12 @@
<div> <div>
<div class="swiper-container middle_disasterWarningAnalysis" :style="styleContainer"> <div class="swiper-container middle_disasterWarningAnalysis" :style="styleContainer">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div :class="(limitUserId == 1 ? current : current1) == index <div :class="current == index
? 'swiper-slide swiper-slide2' ? 'swiper-slide swiper-slide2'
: 'swiper-slide swiper-slide1' : 'swiper-slide swiper-slide1'
" v-for="(item, index) in dataList" :key="index" :style="styleItem" " v-for="(item, index) in dataList" :key="index" :style="styleItem"
@click="getCurrent(index, item)"> @click="getCurrent(index, item)">
{{ item.greenhouseName + (limitUserId == 1 ? "温室" : '') }} {{ item.greenhouseName + "温室" }}
</div> </div>
</div> </div>
</div> </div>
@ -162,9 +158,7 @@
</div> </div>
<div class="device_content scroll"> <div class="device_content scroll">
<div class="content_item">
<!-- 丽水 -->
<div class="content_item" v-if="limitUserId == 1">
<div class="i_title" v-if="fanStatus.open != 0"> <div class="i_title" v-if="fanStatus.open != 0">
<img src="../../assets/img/i_title_img.png" alt="" /> <img src="../../assets/img/i_title_img.png" alt="" />
<span>风机</span> <span>风机</span>
@ -230,30 +224,6 @@
</template> </template>
</div> </div>
</div> </div>
<!-- 东北 -->
<div class="content_item" v-if="limitUserId == 2" style="margin-top: 0.05rem;">
<div v-for="(item,index) in fiveControlList" :key="index" style="margin-bottom: 0.15rem;">
<div class="i_title" v-if="item.controlState != 0">
<img src="../../assets/img/i_title_img.png" alt="" />
<span>{{ item.title }}</span>
<span class="line"></span>
<span>{{item.controlState == 1 ? "自动控制" : "手机控制"}}</span>
<span class="line"></span>
<i class="progress" v-if="Number(item.progress) == ''">{{ item.progress }}%</i>
<span>菜单</span>
</div>
<div class="i_title" v-else>
<img src="../../assets/img/i_title_img.png" alt="" />
<span>{{ item.title }}</span>
<span class="line"></span>
<span>无效</span>
<span class="line"></span>
<span>菜单</span>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -299,7 +269,6 @@ export default {
content_item_current: -1, content_item_current: -1,
current: 5, current: 5,
current1: 1,
dataList: [ dataList: [
// "", "", "", "", "", "" // "", "", "", "", "", ""
@ -711,56 +680,12 @@ export default {
}, },
], ],
limitUserId: '', limitUserId:''
//
fiveControlList: [{
title: '加温水泵',
controlState: 0,
num: '1000',
close_btn: false
},
{
title: '地热风机',
controlState: 0,
num: '1002',
close_btn: false
},
{
title: '上风口',
controlState: 0,
num: '1004',
close_btn: true,
progress_num: '1006',
progress: ''
},
{
title: '下风口',
controlState: 0,
num: '1007',
close_btn: true,
progress_num: '1009',
progress: ''
},
{
title: '卷被',
controlState: 0,
num: '1010',
close_btn: true
},
{
title: '除雪',
controlState: 0,
num: '1013',
close_btn: false
},
]
}; };
}, },
mounted() { mounted() {
this.login(); this.login();
@ -775,7 +700,7 @@ export default {
}, },
methods: { methods: {
// id // id
dataInit(userid, limitUserId) { dataInit(userid) {
this.api.Bigdata_getAllControl(userid).then((res) => { this.api.Bigdata_getAllControl(userid).then((res) => {
// console.log('id', res); // console.log('id', res);
this.dataList = res.data.data; this.dataList = res.data.data;
@ -797,22 +722,11 @@ export default {
// this.get_environmentData(el.deviceId) // this.get_environmentData(el.deviceId)
// this.get_readControl_getState(el.deviceId) // this.get_readControl_getState(el.deviceId)
}); });
if (limitUserId == 1) { this.get_weather_echart_data(2023042214250027);
// this.get_thisWeekTemperature_echart_data(2023042214250027);
this.get_weather_echart_data(2023042214250027); this.get_environmentData(2023042214250027);
this.get_thisWeekTemperature_echart_data(2023042214250027); this.get_readControl_getState(2023042214250027);
this.get_environmentData(2023042214250027); this.getWeatherData(2023042214250027);
this.get_readControl_getState(2023042214250027);
this.getWeatherData(2023042214250027);
} else if (limitUserId == 2) {
//
this.get_weather_echart_data(2023112911050004);
this.get_thisWeekTemperature_echart_data(2023112911050004);
this.get_environmentData(2023112911050004);
this.get_readControl_getState(2023112911050004);
this.getWeatherData(2023112911050004);
}
} }
}); });
}, },
@ -944,6 +858,7 @@ export default {
}, 100); }, 100);
} }
}); });
// console.log(this.get_sel_eqbyid_list);
}); });
}, },
@ -992,16 +907,8 @@ export default {
this.statusList.push(statusData); this.statusList.push(statusData);
} }
// console.log(this.statusList); // console.log(this.statusList);
//
this.fiveControlList.forEach(el => {
el.controlState = res.data.data[el.num];
if(el.progress_num){
el.progress = res.data.data[el.progress_num];
}
})
} }
});0 });
}, },
// //
@ -1042,7 +949,7 @@ export default {
// }) // })
let userInfo = JSON.parse(localStorage.getItem("userInfo")); let userInfo = JSON.parse(localStorage.getItem("userInfo"));
//this.dataInit(userInfo.userid); this.dataInit(userInfo.userid);
this.get_sel_eqbyid(userInfo.userid); this.get_sel_eqbyid(userInfo.userid);
// id // id
@ -1060,16 +967,14 @@ export default {
}, },
// id // id
get_user_getjurisdiction(userId) { get_user_getjurisdiction(userId){
this.api.user_getjurisdiction(userId).then(res => { this.api.user_getjurisdiction(userId).then(res=>{
if (res.data.code == 200) { if(res.data.code == 200){
this.limitUserId = res.data.data[0].id; this.limitUserId = res.data.data[0].id;
if (this.limitUserId == 1) { if(this.limitUserId == 1){
this.drag_boxHandler(); this.drag_boxHandler();
this.dataInit(userId, this.limitUserId); }else if(this.limitUserId == 2){
} else if (this.limitUserId == 2) {
this.drag_boxHandler1(); this.drag_boxHandler1();
this.dataInit(userId, this.limitUserId);
} }
} }
}) })
@ -1143,10 +1048,8 @@ export default {
getCurrent(index, item) { getCurrent(index, item) {
this.current = index; this.current = index;
this.current1 = index;
// console.log(item,'00000000000000'); // console.log(item,'00000000000000');
// this.get_readControl_getState(item.deviceId); this.get_readControl_getState(item.deviceId);
this.get_readControl_getState(2023112911050004);
}, },
drag_boxHandler() { drag_boxHandler() {
@ -1597,7 +1500,6 @@ export default {
width: 3.98rem; width: 3.98rem;
height: 3.08rem; height: 3.08rem;
overflow: hidden; overflow: hidden;
padding-top: 0.15rem;
.title_child { .title_child {
width: 100%; width: 100%;
@ -1702,7 +1604,7 @@ export default {
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
overflow: hidden; overflow: hidden;
.drag_box1 { .drag_box1{
width: 100%; width: 100%;
height: 100%; height: 100%;
position: absolute; position: absolute;
@ -1724,7 +1626,7 @@ export default {
transparent 97%); transparent 97%);
} }
.axis_init { .axis_init{
width: 0.4rem; width: 0.4rem;
height: 0.5rem; height: 0.5rem;
position: absolute; position: absolute;
@ -1732,14 +1634,13 @@ export default {
z-index: 99; z-index: 99;
} }
.axis_init1 { .axis_init1{
width: 0.4rem; width: 0.4rem;
height: 0.5rem; height: 0.5rem;
position: absolute; position: absolute;
z-index: 99; z-index: 99;
} }
} }
.drag_box { .drag_box {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -2084,17 +1985,7 @@ export default {
// margin-right: 0.47rem; // margin-right: 0.47rem;
// } // }
.progress{ >span:nth-child(6) {
width: 18%;
font-size: 0.14rem;
font-style: normal;
font-family: MicrosoftYaHei;
font-weight: 400;
color: #7ae1ff;
margin-right: 0.47rem;
}
>span:nth-child(6),>span:nth-child(7) {
width: 0.66rem; width: 0.66rem;
height: 0.3rem; height: 0.3rem;
background: linear-gradient(-35deg, background: linear-gradient(-35deg,
@ -2228,4 +2119,5 @@ export default {
} }
} }
} }
}</style> }
</style>

View File

@ -50,13 +50,13 @@
<span></span> <span></span>
</div> </div>
<div class="input-main"> <div class="input-main">
<div>打开的通道</div> <div>展开的输出通道</div>
<input @blur="blurChange('21546', $event)" v-model="inputData['21546']" @input="change('21546', $event)" <input @blur="blurChange('21546', $event)" v-model="inputData['21546']" @input="change('21546', $event)"
type="text" value="60" placeholder="60" /> type="text" value="60" placeholder="60" />
<span></span> <span></span>
</div> </div>
<div class="input-main"> <div class="input-main">
<div>关闭的通道</div> <div>关闭的输出通道</div>
<input @blur="blurChange('21547', $event)" v-model="inputData['21547']" @input="change('21547', $event)" <input @blur="blurChange('21547', $event)" v-model="inputData['21547']" @input="change('21547', $event)"
type="text" value="60" placeholder="60" /> type="text" value="60" placeholder="60" />
<span></span> <span></span>

View File

@ -228,29 +228,24 @@ export default {
getStatus(data) { getStatus(data) {
this.api.getControlGetState(data).then(res => { this.api.getControlGetState(data).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.sunrise = this.insertColonEveryTwoDigits(this.convertToTimeMinutes(res.data.data['1021'])) this.sunrise = this.convertToTimeMinutes(res.data.data['1021'])
this.sunset = this.insertColonEveryTwoDigits(this.convertToTimeMinutes(res.data.data['1022'])) this.sunset = this.convertToTimeMinutes(res.data.data['1022'])
} }
}) })
}, },
//16 16 //16 16
convertToTimeMinutes(hexValue) { convertToTimeMinutes(hexValue) {
// 16 // 16 16
let hexString = hexValue.toString(16); const intValue = hexValue
// 416 //
while (hexString.length < 4) { const hours = (intValue >> 8) & 0xFF;
hexString = '0' + hexString; const minutes = intValue & 0xFF;
}
return hexString; // :
const formattedTime = `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}`;
},
insertColonEveryTwoDigits(inputString) { return formattedTime;
// 使
const chunks = inputString.match(/.{1,2}/g);
return chunks.join(':')
// 使join
}, },
dataInit() { dataInit() {
var store = this.$store.state var store = this.$store.state

View File

@ -56,7 +56,7 @@
<div class="flex-sel border-right" @click="changeOpenTrue(1)"> <div class="flex-sel border-right" @click="changeOpenTrue(1)">
<div v-if="openTrue[1] == 0" class="no-sel"></div> <div v-if="openTrue[1] == 0" class="no-sel"></div>
<div v-else class="sel"></div> <div v-else class="sel"></div>
大风保护有效 大风保护
</div> </div>
<div class="flex-sel border-right" @click="changeOpenTrue(2)"> <div class="flex-sel border-right" @click="changeOpenTrue(2)">
<div v-if="openTrue[2] == 0" class="no-sel"></div> <div v-if="openTrue[2] == 0" class="no-sel"></div>
@ -87,13 +87,13 @@
<span></span> <span></span>
</div> </div>
<div class="input-main"> <div class="input-main">
<div>打开的通道</div> <div>展开的输出通道</div>
<input @blur="blurChange('21539', $event)" v-model="inputData['21539']" @input="change('21539', $event)" <input @blur="blurChange('21539', $event)" v-model="inputData['21539']" @input="change('21539', $event)"
type="text" value="60" placeholder="60" /> type="text" value="60" placeholder="60" />
<span></span> <span></span>
</div> </div>
<div class="input-main"> <div class="input-main">
<div>关闭的通道</div> <div>收拢的输出通道</div>
<input @blur="blurChange('21540', $event)" v-model="inputData['21540']" @input="change('21540', $event)" <input @blur="blurChange('21540', $event)" v-model="inputData['21540']" @input="change('21540', $event)"
type="text" value="60" placeholder="60" /> type="text" value="60" placeholder="60" />
<span></span> <span></span>

View File

@ -44,7 +44,7 @@
<span>室内1#平均温度夜间时段高于</span> <span>室内1#平均温度夜间时段高于</span>
<input @blur="blurChangeCount('21524', $event)" v-model="inputData['21524']" <input @blur="blurChangeCount('21524', $event)" v-model="inputData['21524']"
@input="changeCountData('21524', $event)" type="text" value="60" placeholder="60" /> @input="changeCountData('21524', $event)" type="text" value="60" placeholder="60" />
<span>停止</span> <span>启动</span>
</div> </div>
</div> </div>
<div class="flex-view border-none"> <div class="flex-view border-none">