xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

Browse Source
This commit is contained in:
zhaohy
2024-08-14 17:24:27 +08:00
parent fbc6619126 aef40e64de
commit 5c2f77dc9d
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
View File

@@ -152,7 +152,7 @@
// 未知 // 未知
--unknown: #a742ff; --unknown: #a742ff;
// 触发图标大小 // 触发图标大小
--size: 40px; --size: 36px;
width: 100%; width: 100%;
height: 100%; height: 100%;
position: relative; position: relative;

1
hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
View File

@@ -242,6 +242,7 @@
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
user-select: none;
} }
} }
} }

10
hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
View File

@@ -5,15 +5,19 @@
<div class="light-tag-tit"> <div class="light-tag-tit">
<div> <div>
<img src="/asset/image//bulbLogo/21962.png" alt="" /> <img src="/asset/image//bulbLogo/21962.png" alt="" />
<span class="tag-text">{{ blub.regionName + ' > ' + blub.deviceGroupName }}</span> <span class="tag-text">{{ blub.regionName + ' > ' + blub.deviceGroupName }}</span></div
</div> >
<button class="right-button">{{ blub.scene.label }}</button> <button class="right-button">{{ blub.scene.label }}</button>
</div> </div>
<div class="light-tag-box"> <div class="light-tag-box">
<div class="tag-box-item"> <div class="tag-box-item">
<img src="/asset/image//bulbLogo/22496.png" alt="" /> <img src="/asset/image//bulbLogo/22496.png" alt="" />
<span class="title">控制模式</span> <span class="title">控制模式</span>
<span class="result">{{ blub.mode.label }}</span> <span class="result">{{
blub.mode.label.indexOf('模式') != -1
? blub.mode.label.replace('模式', '')
: blub.mode.label
}}</span>
</div> </div>
<div class="tag-box-item"> <div class="tag-box-item">
<img src="/asset/image//bulbLogo/22496.png" alt="" /> <img src="/asset/image//bulbLogo/22496.png" alt="" />

5
hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
View File

@@ -791,6 +791,11 @@
}) })
.then((res) => { .then((res) => {
let data = res.data; let data = res.data;
// 修改请求发送了，但操作时产生了失败结果
if (data.retcode != 0) {
// 直接提示并跳出
return message.warning(data.msg);
}
// 所有修改均生效 // 所有修改均生效
if (data.allSucceed) { if (data.allSucceed) {
message.success('修改完成'); message.success('修改完成');

2
hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue
View File

@@ -78,6 +78,7 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.box-model { .box-model {
position: relative;
min-width: 162px; min-width: 162px;
height: 110px; height: 110px;
background: inherit; background: inherit;
@@ -87,6 +88,7 @@
border-style: solid; border-style: solid;
border-color: rgba(13, 255, 255, 1); border-color: rgba(13, 255, 255, 1);
border-radius: 8px; border-radius: 8px;
z-index: 99;
.title { .title {
position: relative; position: relative;
padding-left: 9px; padding-left: 9px;