pc-master #201

Merged
xiaomeng merged 2 commits from pc-master into portal 2024-12-04 01:01:19 +00:00
Showing only changes of commit 8797618e0f - Show all commits

View File

@ -363,7 +363,7 @@
</div>
</div>
<!-- 大冶鑫 -->
<div class="content_item" v-if="limitUserId == 7 || limitUserId == 9">
<div class="content_item" v-if="limitUserId == 7 || limitUserId == 9|| limitUserId == 10">
<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="" />
@ -1105,12 +1105,14 @@ export default {
get_sel_eqbyid(userId) {
this.api.sel_eqbyid(userId).then((res) => {
// console.log("id Copy", res);
res.data.data.forEach((item, index) => {
if (
item.cameraSerialNumber != null &&
(item.deviceId == 2023042214250027 ||
item.deviceId == 2023120613270115 ||
item.deviceId == 2024070113400048)
item.deviceId == 2024070113400048||
item.deviceId==2023042214250017)
) {
this.get_sel_eqbyid_list.push({ ...item, number: index });
@ -1379,9 +1381,7 @@ export default {
this.get_readControl_getState(2023042214250070);
} else if (this.limitUserId == 7) {
this.get_readControl_getState(2023120613270120);
} else if (this.limitUserId == 8) {
this.get_readControl_getState(list[0].deviceId);
} else if (this.limitUserId == 9) {
} else if (this.limitUserId == 8||this.limitUserId == 9||this.limitUserId == 10) {
this.get_readControl_getState(list[0].deviceId);
}