zhaohy 4 months ago
parent
commit
180ad4a005
  1. 6
      hx-ai-intelligent/src/api/IlluminationInfo.ts
  2. 9
      hx-ai-intelligent/src/store/item.ts
  3. BIN
      hx-ai-intelligent/src/view/equipmentControl/image/liftState/lift/lift1.png
  4. BIN
      hx-ai-intelligent/src/view/equipmentControl/image/liftState/lift/lift2.png
  5. BIN
      hx-ai-intelligent/src/view/equipmentControl/image/liftState/lift/line.png
  6. 28
      hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
  7. 283
      hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
  8. 3
      hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPosition.ts
  9. 37
      hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
  10. 3
      hx-ai-intelligent/src/view/equipmentControl/lightingManage/lightPosition.ts
  11. 128
      hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue

6
hx-ai-intelligent/src/api/IlluminationInfo.ts

@ -1,13 +1,13 @@
// 照明系统及相关接口 // 照明系统及相关接口
export enum lightingManage { export enum lightingManage {
// 主页 ======================================================== // 主页 ========================================================
// 获得分区与线路 // 获得分区与线路
getArea = '/carbon-smart/IlluminationInfo/region', getArea = '/carbon-smart/IlluminationInfo/region',
// 修改线路的可用/禁用状态 // 修改线路的可用/禁用状态
setDisable = '/carbon-smart/IlluminationInfo/revisePanel', setDisable = '/carbon-smart/IlluminationInfo/changePanelStatus',
// 获得设备 - 小灯泡
getBulbs = '/carbon-smart/IlluminationInfo/getLightState',
// 控制面板tab页 ================================================ // 控制面板tab页 ================================================

9
hx-ai-intelligent/src/store/item.ts

@ -3,7 +3,14 @@ import { defineStore } from 'pinia';
export const items = defineStore({ export const items = defineStore({
id: 'items', id: 'items',
state() { state() {
return { list: [], count: 10 }; return {
list: [],
count: 10,
// 当前项目ID
projectId: 'HLlmTZp8',
// 站点ID
siteId: undefined,
};
}, },
getters: { getters: {
double: (state: any) => state.count * 2, double: (state: any) => state.count * 2,

BIN
hx-ai-intelligent/src/view/equipmentControl/image/liftState/lift/lift1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
hx-ai-intelligent/src/view/equipmentControl/image/liftState/lift/lift2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
hx-ai-intelligent/src/view/equipmentControl/image/liftState/lift/line.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

28
hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue

@ -1,7 +1,7 @@
<template> <template>
<div class="map-box"> <div class="map-box">
<div class="map"> <div class="map">
<liftInfo /> <liftInfo v-for="(item, index) in liftBox" :key="index" :liftInfo="item" />
</div> </div>
</div> </div>
</template> </template>
@ -16,14 +16,30 @@
onMounted(() => {}); onMounted(() => {});
// tab ======================================================== // tab ========================================================
const liftBox = ref([
// {
const dataSource = ref([]); name: '办公区域扶梯A',
workState: 1,
faultState: 2,
direction: 1,
type: 2,
isLeft: true,
styleText: { left: '245px', bottom: '230px' },
},
{
name: '办公区域扶梯B',
workState: 0,
faultState: 3,
direction: 0,
type: 1,
isLeft: false,
styleText: { left: '700px', bottom: '360px' },
},
]);
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.map-box { .map-box {
// //
// - - - // - - -
--on: #0dffa4; --on: #0dffa4;
// //
@ -36,6 +52,8 @@
--fault: #ff7636; --fault: #ff7636;
// //
--unknown: #a742ff; --unknown: #a742ff;
//
--size: 40px;
width: 100%; width: 100%;
height: 100%; height: 100%;
.map { .map {

283
hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue

@ -1,49 +1,61 @@
<template> <template>
<div class="info-box"> <div class="icon-box" :style="info.styleText">
<div class="box-title"> <img v-if="info.type == 1" src="../image/liftState/lift/lift1.png" alt="" />
<div class="dot"></div> <img v-else-if="info.type == 2" src="../image/liftState/lift/lift2.png" alt="" />
<span>办公区域扶梯A</span> <div class="tab" :class="[info.isLeft ? 'left' : 'right']">
</div> <div v-if="info.isLeft" class="line"></div>
<div class="box-inner"> <div class="info-box">
<!-- 是否开启 --> <div class="box-title">
<div class="item"> <div class="dot"></div>
<div class="item-box"> <span>{{ info.name }}</span>
<div class="icon"> </div>
<div class="icon-item"> <div class="box-inner">
<img src="../image/liftState/lift-normal.svg" alt="" /> <!-- 是否开启 -->
<div class="item">
<div class="item-box">
<div class="icon">
<div class="icon-item">
<img v-if="info.workState" src="../image/liftState/switch-on.svg" alt="" />
<img v-else src="../image/liftState/switch-off.svg" alt="" />
</div>
</div>
</div>
<div class="item-text">
<span v-if="info.workState" style="color: var(--on)">开启</span>
<span v-else style="color: var(--off)">关闭</span>
</div> </div>
</div> </div>
</div> <!-- 是否故障 -->
<div class="item-text">开启</div> <div class="item">
</div> <div class="item-box">
<!-- 是否故障 --> <div class="icon">
<div class="item"> <div class="icon-item">
<div class="item-box"> <img src="../image/liftState/lift-normal.svg" alt="" />
<div class="icon"> </div>
<div class="icon-item"> </div>
<img src="../image/liftState/lift-normal.svg" alt="" />
</div> </div>
<div class="item-text">开启</div>
</div> </div>
</div> <!-- 如何运行 -->
<div class="item-text">开启</div> <div class="item">
</div> <div class="item-box">
<!-- 如何运行 --> <div class="icon">
<div class="item"> <div class="icon-item">
<div class="item-box"> <img src="../image/liftState/lift-normal.svg" alt="" />
<div class="icon"> </div>
<div class="icon-item"> </div>
<img src="../image/liftState/lift-normal.svg" alt="" />
</div> </div>
<div class="item-text">开启</div>
</div> </div>
</div> </div>
<div class="item-text">开启</div>
</div> </div>
<div v-if="!info.isLeft" class="line1"></div>
</div> </div>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted } from 'vue'; import { ref, computed, onMounted } from 'vue';
// //
@ -51,96 +63,151 @@
onMounted(() => {}); onMounted(() => {});
// tab ======================================================== const props = defineProps({
// >
liftInfo: {
type: Object,
default: () => {},
},
});
const info = computed(() => {
return props.liftInfo;
});
// // tab ========================================================
const runState = ref('1');
//
const liftState = ref('2');
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
// .icon-box:hover {
.info-box { }
// .icon-box {
--text: rgb(20, 255, 255); width: var(--size);
height: var(--size);
width: 240px; position: absolute;
height: 130px; transition: all ease 0.2s;
display: flex; > img {
gap: 5px; width: 100%;
flex-direction: column; height: 100%;
background: rgb(17, 44, 86, 0.9); cursor: pointer;
border-radius: 8px; user-select: none;
box-sizing: border-box; position: relative;
padding: 8px; z-index: 9;
border: 3px solid var(--text);
//
.box-title {
height: auto;
color: var(--text);
//
.dot {
display: inline-block;
width: 2px;
height: 16px;
vertical-align: middle;
background: var(--text);
}
//
span {
padding-left: 8px;
}
} }
// .tab {
.box-inner { position: absolute;
flex: 1; bottom: -20px;
display: flex; display: flex;
padding: 0 10px; .line {
// 3 position: relative;
.item { z-index: 1;
flex: 1; width: 40px;
height: 75px;
background-image: url(../image/liftState/lift/line.png);
background-size: 100% 100%;
}
.line1 {
position: relative;
z-index: 1;
width: 40px;
height: 75px;
transform: rotateY(180deg);
background-image: url(../image/liftState/lift/line.png);
background-size: 100% 100%;
}
//
.info-box {
//
--text: rgb(20, 255, 255);
width: 250px;
height: 130px;
display: flex; display: flex;
gap: 5px;
flex-direction: column; flex-direction: column;
// background: rgb(17, 44, 86, 0.9);
.item-box { border-radius: 8px;
box-sizing: border-box;
padding: 8px;
border: 2px solid var(--text);
transform: translateY(-50%);
cursor: pointer;
//
.box-title {
height: auto;
color: var(--text);
//
.dot {
display: inline-block;
width: 2px;
height: 16px;
vertical-align: middle;
background: var(--text);
}
//
span {
padding-left: 8px;
}
}
//
.box-inner {
flex: 1; flex: 1;
display: flex; display: flex;
align-items: center; padding: 0 5px;
justify-content: center; // 3
// border: 1px solid red; .item {
.icon { flex: 1;
width: 55px; display: flex;
height: 55px; flex-direction: column;
background-image: url(../image/box.svg); //
background-size: 130% 130%; .item-box {
background-repeat: no-repeat; flex: 1;
background-position: left -8px top -8px; display: flex;
// border: 1px solid red; align-items: center;
position: relative; justify-content: center;
.icon-item { // border: 1px solid red;
position: absolute; .icon {
width: 20px; width: 55px;
height: 20px; height: 55px;
left: 0; background-image: url(../image/box.svg);
right: 0; background-size: 130% 130%;
bottom: 0; background-repeat: no-repeat;
top: 0; background-position: left -8px top -8px;
margin: auto; // border: 1px solid red;
img { position: relative;
width: 100%; .icon-item {
height: 100%; position: absolute;
width: 20px;
height: 20px;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
img {
width: 100%;
height: 100%;
}
}
} }
} }
.item-text {
height: 20px;
text-align: center;
font-size: 12px;
color: white;
user-select: none;
}
} }
} }
.item-text {
height: 20px;
text-align: center;
font-size: 12px;
color: white;
user-select: none;
}
} }
.info-box:hover {
border: 2px solid white;
}
}
.right {
right: calc(var(--size) / 2);
}
.left {
left: calc(var(--size) / 2);
} }
} }
</style> </style>

3
hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftPosition.ts

@ -0,0 +1,3 @@
// 此文件只定义lift(即电梯)的位置信息
// 与显示状态和分组信息无关
export const liftPosition = [];

37
hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue

@ -3,9 +3,13 @@
<div class="lighting-img-box"> <div class="lighting-img-box">
<!-- 左上角区域切换 --> <!-- 左上角区域切换 -->
<div class="btn-box"> <div class="btn-box">
<button v-for="item in floorData" class="btn-item" @click="changeFloor(item.childList)">{{ <button
item.name v-for="(item, index) in floorData"
}}</button> :key="index"
class="btn-item"
@click="changeFloor(item.childList, item.code)"
>{{ item.name }}</button
>
</div> </div>
<!-- 楼层区域 --> <!-- 楼层区域 -->
<div class="area"> <div class="area">
@ -77,14 +81,20 @@
import { lightingManage } from '/@/api/IlluminationInfo'; import { lightingManage } from '/@/api/IlluminationInfo';
// ICON // ICON
import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons-vue'; import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons-vue';
//
import { items } from '/@/store/item';
// ======================================================= // =======================================================
onMounted(() => { onMounted(() => {
// 线 // 线
getAllArea(); getAllArea();
//
getBulbs();
}); });
//
const state = items();
// flagref // flagref
const preload = ref(false); const preload = ref(false);
@ -92,8 +102,11 @@
// //
const floorData = ref([]); const floorData = ref([]);
//
const thisFloor = ref(1);
// //
const changeFloor = (area: any) => { const changeFloor = (area: any, floor: number) => {
thisFloor.value = floor;
// //
reset(); reset();
// //
@ -220,7 +233,7 @@
// //
const getAllArea = () => { const getAllArea = () => {
http.get(lightingManage.getArea, { projectId: 'HLlmTZp8' }).then((res) => { http.get(lightingManage.getArea, { projectId: state.projectId }).then((res) => {
const data = res.data; const data = res.data;
floorData.value = data; floorData.value = data;
/** 使 /** 使
@ -248,6 +261,20 @@
}); });
}; };
// ==============================================
const getBulbs = () => {
http
.get(lightingManage.getBulbs, {
floor: thisFloor.value,
projectId: state.projectId,
siteId: state.siteId,
})
.then((res) => {
console.log(res);
});
};
// ===================================================== // =====================================================
// - tab // - tab

3
hx-ai-intelligent/src/view/equipmentControl/lightingManage/lightPosition.ts

@ -0,0 +1,3 @@
// 此文件只定义light(即俯视图小灯泡)的位置信息
// 与显示状态和分组信息无关
export const lightPosition = [];

128
hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue

@ -50,7 +50,7 @@
class="openPlan" class="openPlan"
:class="{ enabled2: isPlanEnabled2, disabled2: !isPlanEnabled2 }" :class="{ enabled2: isPlanEnabled2, disabled2: !isPlanEnabled2 }"
@click="togglePlan2"> @click="togglePlan2">
{{ isPlanEnabled2 ? '启用面板' : '禁用面板' }} {{ isPlanEnabled2 ? '启用开关' : '禁用开关' }}
</button> </button>
<a-switch <a-switch
v-model:checked="selectAllCheckbox" v-model:checked="selectAllCheckbox"
@ -248,11 +248,13 @@
import { http } from '/nerv-lib/util/http'; import { http } from '/nerv-lib/util/http';
import { lightingManage } from '/@/api/IlluminationInfo'; import { lightingManage } from '/@/api/IlluminationInfo';
import { getAllEnum } from '/@/api/index'; import { getAllEnum } from '/@/api/index';
//
import { items } from '/@/store/item';
// ========================================================================= // =========================================================================
onMounted(() => { onMounted(() => {
// //
setArea(); setArea();
// //
getEnum(['IlluminationMode', 'IlluminationScene']); getEnum(['IlluminationMode', 'IlluminationScene']);
@ -267,11 +269,13 @@
controlScene.value = data.IlluminationScene; controlScene.value = data.IlluminationScene;
}); });
}; };
// 1-1 // 1-1
const setArea = () => { const setArea = () => {
const data = props.treeData[0]; const data = props.treeData[0];
buttons2.value = data.childList; buttons2.value = data.childList;
}; };
//
const state = items();
// =================================================================== // ===================================================================
@ -279,11 +283,12 @@
// > // >
treeData: { treeData: {
type: Array, type: Array,
default: [], default: () => {
[];
},
}, },
}); });
// /**
/**
* @method changeArea 用于控制俯视图的选中状态 * @method changeArea 用于控制俯视图的选中状态
* @method reset 用于重置按钮区 * @method reset 用于重置按钮区
*/ */
@ -327,9 +332,9 @@
// id // id
const handleButton = ref(''); const handleButton = ref('');
// / // /
const isPlanEnabled2 = ref(true); const isPlanEnabled2 = ref(true);
// / // /
const togglePlan2 = () => { const togglePlan2 = () => {
// //
if (handleButton.value == '') { if (handleButton.value == '') {
@ -340,7 +345,12 @@
let panel = +!btn.ctrlStatus; let panel = +!btn.ctrlStatus;
isLoading.value = true; isLoading.value = true;
http http
.get(lightingManage.setDisable, { deviceGroup: btn.code, panel }) .get(lightingManage.setDisable, {
deviceGroup: btn.code,
panel,
projectId: state.projectId,
siteId: state.siteId,
})
.then((res) => { .then((res) => {
if (res.msg === 'success') { if (res.msg === 'success') {
// - - - loading // - - - loading
@ -392,7 +402,7 @@
buttons2.value.forEach((item: any) => { buttons2.value.forEach((item: any) => {
item.selected = false; item.selected = false;
}); });
// - //
resetMode(); resetMode();
} }
emit('changeArea', arr); emit('changeArea', arr);
@ -423,7 +433,7 @@
// //
let level1 = selectedButton.value; let level1 = selectedButton.value;
let level2 = button.id; let level2 = button.id;
// false // false
if (singleSelection.value) { if (singleSelection.value) {
buttons2.value.forEach((item: any) => { buttons2.value.forEach((item: any) => {
item.selected = false; item.selected = false;
@ -486,44 +496,64 @@
let before = data.scene.value; let before = data.scene.value;
// //
let after = button4.value; let after = button4.value;
// //
if (before === after) { if (!singleSelection.value) {
return message.info('未产生实际修改'); buttons2.value.forEach((item: any) => {
// //
} else { if (item.selected) {
thisButton2.value.scene.value = after; changeScene(item, item.scene.value, after);
// item.scene.value = after;
const result = changeList.value.find((item: any, index: number) => {
item.index = index;
return item.deviceGroup == data.code;
});
//
if (result) {
//
if (after == result.before) {
changeList.value.splice(result.index, 1);
// after
} else {
result.scene = after;
// flag
delete result.index;
} }
// });
thisButton2.value.scene.value = after;
return message.info('已修改X项');
//
} else {
//
if (before === after) {
return message.info('未产生实际修改');
//
} else {
changeScene(data, before, after);
}
}
};
/** - &
* @param button 当前被选中的回路单选 & 多选
* @param before 回路场景的初始值撤回时需使用
* @param after 回路场景被修改后的值
*/
const changeScene = (button: any, before: number, after: number) => {
//
const result = changeList.value.find((item: any, index: number) => {
item.index = index;
return item.deviceGroup == button.code;
});
//
if (result) {
//
if (after == result.before) {
changeList.value.splice(result.index, 1);
// after
} else { } else {
changeList.value.push({ result.scene = after;
// // flag
deviceGroup: data.code, delete result.index;
deviceGroupName: data.name,
//
region: data.pcode,
regionName: '',
//
before: before,
//
scene: after,
});
} }
console.log(changeList.value, 'changeList'); //
} else {
changeList.value.push({
//
deviceGroup: button.code,
deviceGroupName: button.name,
//
region: button.pcode,
regionName: '',
//
before: before,
//
scene: after,
});
} }
thisButton2.value.scene.value = after; thisButton2.value.scene.value = after;
}; };
@ -559,7 +589,11 @@
} }
buttonLoading.value = true; buttonLoading.value = true;
http http
.post(lightingManage.getChangeList, { infoList: changeList.value, projectId: 'HLlmTZp8' }) .post(lightingManage.getChangeList, {
infoList: changeList.value,
projectId: state.projectId,
siteId: state.siteId,
})
.then((res) => { .then((res) => {
if (res.msg === 'success') { if (res.msg === 'success') {
diffList.value = res.data; diffList.value = res.data;

Loading…
Cancel
Save