-
-
-
-
@@ -17,35 +29,25 @@
+
+
+
-
@@ -56,6 +103,15 @@
+
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/dialogStyle.less b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/dialogStyle.less
index 382533c..3d550c5 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/dialogStyle.less
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/dialogStyle.less
@@ -45,7 +45,12 @@
border: 2px solid transparent;
border-image: linear-gradient(to bottom, #0077ff, #00f6ff, #000000) 1;
.title-img {
- padding-top: 6px;
+ margin-top: 6px;
+ }
+ .title-text {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
}
.imgText {
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index 35df6a3..a82d117 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -7,6 +7,7 @@
v-for="(item, index) in floorData"
:key="index"
class="btn-item"
+ :style="{ color: item.dataCode == thisFloor ? 'black' : 'white' }"
@click="changeFloor(item.childList, item.dataCode)"
>{{ item.name }}
@@ -56,7 +57,12 @@
:maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
+
-
+
+
+ 
+
+
-
- 设备告警 (今日处理 / 总数)
- 10 / 13
+ {{ item.todayProcessing }} / {{ item.total }}
+10%+{{ item.liftRatio }}%
+ ![]()
+
+ -
+
+
+ {{
+ item.title
+ }}
+ 今日处理 / 总数
-
- 
-
-
+
-
-
+
+
+
+
-
+ ![]()
+
+
+ 优先级
+
+
+ ( 近30天 )
+
+
-
+
-
+
+ ![]()
+
+
+ 处理进度
+
+
+ ( 近30天 )
+
+
-
+
diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
index ff7a321..e14bf23 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
@@ -26,26 +26,73 @@
+
+ ![]()
+
+
+ 处理进度
+
+ ( 近30天 )
+
- 
+ ![]()
+ 开启
+ {{ { '0': '正常', '1': '维修', '2': '故障', '3': '告警' }[3] }}
-
+ ![]()
+ 开启
+ {{
+ {
+ '0': '上行', //上行
+ '1': '下行', //下行
+ '2': '暂停', //暂停
+ '3': '急停', //急停
+ '4': '未知', //未知
+ }[2]
+ }}
- 
- 
- 
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 照明区域
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 照明回路
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 控制模式
-
-
-
-
-
-
-
-
-
-
- 控制场景
-
-
-
-
-
-
-
-
-
- 灯具参数
-
-
-
-
-
-
- | 开启数量 | -亮度(lux) | -色温 | -
|---|---|---|
| {{ row.num }} | -{{ row.light }} | -{{ row.tempruter }} | -
-
-
-
-
-
-
-
- 变更内容
-
-
-
-
-
-
-
-
- 
- {{ item.name }}
-
-
-
- {{ item.name }}
-
-
- 手动
- 
- 自动
-
-
- 自动
-
-
- 100lux
-
- 30lux
-
-
- 30lux
-
-
- 手动
-
- 自动
-
-
- 自动
-
-
- 4000k
-
- 3800k
-
-
- 3800k
-
-
-
- | 序号 | -执行时间 | -计划名称 | -状态 | -操作 | -|
|---|---|---|---|---|---|
| {{ row.key }} | -{{ row.data }} | -{{ row.planname }} | -- - | -- - | -- - - | -
-
- 计划库
-
-
-
- | 序号 | -执行时间 | -操作内容 | -操作人 | -
|---|---|---|---|
| {{ row.key }} | -{{ row.data }} | -{{ row.planname }} | -{{ row.status }} | -
-
-
-
- 操作日志
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
- {{ item.name }}
-
-
-
-
- {{ item.manual }}
-
- {{ item.automatic }}
-
-
- {{ item.automatic }}
-
-
- {{ item.brightness }}
-
- {{ item.brightness2 }}
-
-
- {{ item.brightness2 }}
-
-
- {{ item.manual2 }}
-
- {{ item.automatic2 }}
-
-
- {{ item.automatic2 }}
-
-
- {{ item.brightness3 }}
-
- {{ item.brightness4 }}
-
-
- {{ item.brightness4 }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index b2017f6..108a086 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -5,12 +5,6 @@
照明区域
-
@@ -142,7 +136,7 @@
title="刷新将会取消已作出的修改"
ok-text="确定"
cancel-text="取消"
- @confirm="refresh"
+ @confirm="refresh(false)"
@cancel="changeCancel">
@@ -233,7 +227,14 @@
@@ -277,18 +278,12 @@
/** 向上传递方法
* @method changeArea 用于控制俯视图的选中状态
* @method reset 用于重置按钮区
+ * @method reload 用于刷新一次页面
*/
- const emit = defineEmits(['changeArea', 'reset']);
+ const emit = defineEmits(['changeArea', 'reset', 'reload']);
// 照明区域业务 =======================================================================
- // 计划启用状态
- const isPlanEnabled = ref(false);
- // 计划启用切换事件
- const togglePlan = () => {
- isPlanEnabled.value = !isPlanEnabled.value;
- };
-
// 按钮区展开与收起状态
const showAllButtonsArea = ref(false);
// 被选中的分区 默认为1 用于选中样式渲染
@@ -396,15 +391,9 @@
// 储存当前选中的回路
const thisButton2 = ref({
- code: '',
+ dataCode: '',
name: '',
- pcode: '',
- mode: {
- value: -1,
- },
- scene: {
- value: -1,
- },
+ treePid: '',
childList: [],
});
// 照明回路的按钮切换
@@ -443,11 +432,15 @@
// 发生了选中事件
thisButton2.value = button;
// 获得启动模式
- thisButton3.value = button.childList.find((item: any) => {
- if (item.selectAble) {
- return item.childList ? item.childList : [];
- }
- });
+ if (button.childList) {
+ thisButton3.value = button.childList.find((item: any) => {
+ if (item.selectAble) {
+ return item.childList ? item.childList : [];
+ }
+ });
+ } else {
+ thisButton3.value = { childList: [] };
+ }
} else {
// 未发生选中 或 多选的其中一个按钮被取消
resetMode();
@@ -479,52 +472,113 @@
// 控制场景业务 =====================================================================
// 控制场景 - 按钮切换
- const selectButton4 = (button4) => {
- // 当前选中的回路数据
- const data = thisButton2.value;
- // 修改前的数据
- let before = data.scene.value;
- // 修改后的数据
- let after = button4.value;
+ const selectButton4 = (button4: any) => {
+ const after = button4.dataCode;
+ let before = '';
// 如果是多选模式
if (!singleSelection.value) {
+ // 操作线路总数
+ let sum = 0;
+ // 没有这个选项的线路
+ // let nofind = 0;
+ // 修改无效的数量
+ let checked = 0;
+ // 可修改的数量
+ let changed = 0;
buttons2.value.forEach((item: any) => {
+ // 取出当前选中的值 before
+ if (item.childList) {
+ let mode = item.childList.find((lv3: any) => {
+ return lv3.selectAble;
+ });
+ if (mode.childList) {
+ mode.childList.forEach((mode: any) => {
+ // 取出当前选中的模式
+ if (mode.executeStatus.value == 1) {
+ before = mode.dataCode;
+ }
+ });
+ }
+ }
// 查看当前回路，哪些被选中
if (item.selected) {
- changeScene(item, item.scene.value, after);
- item.scene.value = after;
+ item.childList.forEach((v: any) => {
+ if (v.childList) {
+ v.childList.forEach((v1: any) => {
+ // 查看是否包含当前要修改的值
+ if (v1.dataCode == after) {
+ sum += 1;
+ // 已经被选中，无需修改的内容
+ if (before == after) {
+ return (checked += 1);
+ // 修改
+ } else {
+ changed += 1;
+ changeScene(v1, before, after, item);
+ v1.executeStatus.value = 1;
+ }
+ // 不符合条件的全部重置
+ } else {
+ v1.executeStatus.value = 0;
+ }
+ });
+ }
+ });
}
});
- thisButton2.value.scene.value = after;
- return message.info('已修改X项');
+ message.info(`共修改${sum}条数据，其中${checked}条无需修改，${changed}条修改有效`);
// 如果是单选模式
} else {
- // 如果没有产生实质性的修改（修改前后相同，则跳出）
- if (before === after) {
+ // 如果按钮已经被选择
+ if (button4.executeStatus.value == 1) {
return message.info('未产生实际修改');
- // 产生了修改
} else {
- changeScene(data, before, after);
+ // 获得线路当前的场景
+ let before;
+ thisButton2.value.childList.find((item: any) => {
+ if (item.childList) {
+ item.childList.forEach((i: any) => {
+ if (i.executeStatus.value == 1) {
+ return (before = i.dataCode);
+ }
+ });
+ }
+ });
+ // 移除选中场景
+ resetScene(thisButton2.value.childList);
+ changeScene(button4, before, after);
}
}
};
+ // 切换场景前，需要把其他场景移除
+ const resetScene = (list: any) => {
+ list.forEach((item: any) => {
+ if (item.childList) {
+ item.childList.forEach((i: any) => {
+ i.executeStatus.value = 0;
+ });
+ }
+ });
+ };
+
/** 控制场景 - 按钮切换通用方法（单选 & 多选）
* @param button 当前被选中的回路（单选 & 多选）
* @param before 回路场景的初始值（撤回时需使用）
* @param after 回路场景被修改后的值
+ * @param anyButton 多选时使用
*/
- const changeScene = (button: any, before: number, after: number) => {
- // 查询之前是否修改过
+ const changeScene = (button: any, before: string | undefined, after: string, line = null) => {
+ // 通过分组ID，查询之前是否修改过
const result = changeList.value.find((item: any, index: number) => {
item.index = index;
- return item.deviceGroup == button.dataCode;
+ return item.deviceGroup == button.treePid.split('_')[0];
});
// 如果已产生过修改
if (result) {
// 改回了原有的值，则从数组中移除
if (after == result.before) {
changeList.value.splice(result.index, 1);
- // 修改为新值，则只修改after
+ // 修改为新值，则只修改场景
} else {
result.scene = after;
// 临时flag，用后移除
@@ -532,20 +586,27 @@
}
// 如果未产生过修改
} else {
+ let nowButton;
+ // 多选，则使用第四个参数
+ if (line) {
+ nowButton = line;
+ // 如果是单选，则使用thisbotton2
+ } else {
+ nowButton = thisButton2.value;
+ }
changeList.value.push({
// 回路
- deviceGroup: button.dataCode,
- deviceGroupName: button.name,
+ deviceGroup: nowButton.dataCode,
+ deviceGroupName: nowButton.name,
// 分区
- region: button.pcode,
+ region: nowButton.treePid,
regionName: '',
// 修改前
- before: before,
- // 修改后
+ before,
scene: after,
});
}
- thisButton2.value.scene.value = after;
+ button.executeStatus.value = 1;
};
// 底部按钮区 ======================================================================
@@ -554,7 +615,7 @@
// 执行按钮loading
const buttonLoading = ref(false);
// 刷新
- const refresh = () => {
+ const refresh = (reload = false) => {
// 关闭执行弹窗
executeVisible.value = false;
// 设置当前选中的序列
@@ -562,16 +623,51 @@
// 重置选中样式 和 按钮选中状态
emit('changeArea', ['1']);
emit('reset');
+ // 如果是中途刷新，需要将所有修改改回
+ if (!reload) {
+ changeList.value.forEach((item: any) => {
+ resetChangeList(item);
+ });
+ }
+ changeList.value = [];
// 默认选择第一个楼层
let data = props.treeData[0];
- // 清空保存的修改
- changeList.value = [];
// 默认选中
data.selected = true;
// 默认选中 1-1 分区 回路
buttons2.value = data.childList;
resetMode();
};
+ // 刷新时，将已修改的值改回
+ const resetChangeList = (item: any) => {
+ props.treeData.find((v: any) => {
+ if (item.region == v.dataCode) {
+ v.childList.find((v1: any) => {
+ // 找到被修改过的线路
+ if (item.deviceGroup == v1.dataCode) {
+ v1.childList.forEach((v2: any) => {
+ if (v2.childList) {
+ v2.childList.forEach((v3: any) => {
+ // 将新值移除
+ if (item.scene == v3.dataCode) {
+ v3.executeStatus.value = 0;
+ }
+ if (!item.before) {
+ console.log(item, '没有这个选项');
+ v3.executeStatus.value = 0;
+ }
+ // 旧值选中
+ if (item.before == v3.dataCode) {
+ v3.executeStatus.value = 1;
+ }
+ });
+ }
+ });
+ }
+ });
+ }
+ });
+ };
// 右下角的执行事件
const showModal = () => {
if (!changeList.value.length) {
@@ -580,7 +676,8 @@
buttonLoading.value = true;
http
.post(lightingManage.getChangeList, {
- infoList: changeList.value,
+ sceneList: changeList.value,
+ lockList: [],
projectId: state.projectId,
siteId: state.siteId,
})
@@ -612,13 +709,9 @@
const delBtn = (obj: any) => {
console.log(obj, '当前选择的修改内容');
// 将treeData对应回路的数据改回，数据以后端为准
- const area = props.treeData.find((item: any) => {
- return item.code == obj.region;
- });
- const line = area.childList.find((item: any) => {
- return item.code == obj.deviceGroup;
- });
- line.scene.value = obj.stateBefore.scene.value;
+ obj.scene = obj.stateAfter.scene.value;
+ obj.before = obj.stateBefore.scene.value;
+ resetChangeList(obj);
// 将 changeList 与 diffList 中记录的修改移除 (排除极端情况)
changeList.value = changeList.value.filter((item: any) => {
return item.deviceGroup !== obj.deviceGroup;
@@ -633,22 +726,29 @@
executeVisible.value = false;
}
};
- const submitChangeList = () => {};
+ // 提交本次修改
+ const submitChangeList = () => {
+ http
+ .post(lightingManage.submitChangeList, {
+ sceneList: changeList.value,
+ lockList: [],
+ projectId: state.projectId,
+ siteId: state.siteId,
+ })
+ .then(() => {
+ emit('reload');
+ refresh(true);
+ });
+ };
// 其他业务 ========================================================================
// 将当前选择的回路置空
const resetMode = () => {
thisButton2.value = {
- code: '',
+ dataCode: '',
name: '',
- pcode: '',
- mode: {
- value: -1,
- },
- scene: {
- value: -1,
- },
+ treePid: '',
childList: [],
};
};
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
index 05bb3c6..6bff15e 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -1,6 +1,18 @@
+
+
+
+
+
| {{ index + 1 }} | {{ row.startTime }} | {{ row.planName }} | -- - | -+ |
- 重启
+ 启用
删除
|
@@ -82,39 +84,90 @@
// 请求
import { http } from '/nerv-lib/util/http';
import { lightingManage } from '/@/api/IlluminationInfo';
+ import { planManage } from '/@/api/planManage';
import { message } from 'ant-design-vue';
+ import { getEnum } from '/@/api';
+ // 全局变量
+ import { items } from '/@/store/item';
// 初始化 ===========================================================
onMounted(() => {
+ getStateEnum();
// 计划表格
getTable();
// 穿梭框原始数据
getLeftPlan();
});
+ // 全局变量
+ const state = items();
+ const getStateEnum = async () => {
+ let enumData = await getEnum({ params: { enumType: 'PlanExecuteStatus' } });
+ stateList.value = enumData.data;
+ };
// tab页部分 ========================================================
+ // 状态枚举
+ const stateList = ref([]);
+ // 设置枚举的颜色 与 文本
+ const setStateColor = (state: number) => {
+ if (state == 0) {
+ return '#ccc';
+ } else if (state == 1) {
+ return 'orange';
+ } else if (state == 2) {
+ return 'rgb(57, 215, 187)';
+ } else if (state == 3) {
+ return 'rgb(255, 0, 0)';
+ }
+ };
+ // 设置枚举的文本
+ const setStateText = (state: number) => {
+ const res = stateList.value.find((item) => {
+ return item.value == state;
+ });
+ return res.label;
+ };
+ // 计划启用/禁用事件
+ const togglePlan = (state: number) => {
+ dataSource.value.forEach((item: any) => {
+ item.executeStatus.value = state;
+ });
+ };
+
// 表格数据
const dataSource = ref([]);
// 获得表格数据
const getTable = () => {
- http.get(lightingManage.getPlanTable, {}).then((res) => {
- dataSource.value = res.data;
- });
+ http
+ .get(planManage.getTableData, {
+ projectId: state.projectId,
+ siteId: state.siteId,
+ // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+ deviceType: 1,
+ })
+ .then((res) => {
+ dataSource.value = res.data;
+ });
};
- // 删除表格中的计划
- const deletePlan = (id: String) => {
- http.delete(lightingManage.deletePlan, [id]).then(() => {
- message.success('操作成功');
- getTable();
- });
+ // 删除表格中的计划（将当前任意状态，修改为未启用 =0）
+ const deletePlan = (row: any) => {
+ row.executeStatus.value = 0;
+ };
+ // 重启表格中的计划（将当前任意状态，修改为待执行 = 1）
+ const startPlan = (row: any) => {
+ if (row.executeStatus.value == 1) {
+ return message.info('该数据已是待执行状态，无需再次修改');
+ }
+ row.executeStatus.value = 1;
};
- // 重启表格中的计划
- const restartPlan = (id: String) => {
- http.post(lightingManage.restartPlan, { planId: id }).then(() => {
+ // 将对表格的修改统一发送
+ const sendTable = () => {
+ http.post(lightingManage.submitTableData, dataSource.value).then((res) => {
message.success('操作成功');
getTable();
+ getLeftPlan();
});
};
@@ -133,16 +186,23 @@
const transferData = ref([]) as any;
// 获得穿梭框原始数据
const getLeftPlan = () => {
- http.get(lightingManage.getLeftPlan, {}).then((res) => {
- let arr = [];
- res.data.forEach((item: any) => {
- arr.push({
- key: item.id,
- title: item.planName,
+ http
+ .get(planManage.getTransData, {
+ projectId: state.projectId,
+ siteId: state.siteId,
+ // 设备类型(1照明,2空调,3排风扇,4风幕机,5电动窗,6进水阀,7排水泵)
+ deviceType: 1,
+ })
+ .then((res) => {
+ let arr = [];
+ res.data.forEach((item: any) => {
+ arr.push({
+ key: item.id,
+ title: item.planName,
+ });
});
+ transferData.value = arr;
});
- transferData.value = arr;
- });
};
const handleChange = (keys: string[], direction: string, moveKeys: string[]) => {
@@ -158,7 +218,7 @@
if (targetKeys.value.length < 1) {
return message.info('没有选择任何计划');
}
- http.post(lightingManage.submitLeftPlan, targetKeys.value).then(() => {
+ http.post(planManage.submitTransData, targetKeys.value).then(() => {
message.success('添加成功');
// 如果发送成功，则刷新表格
getTable();
@@ -172,7 +232,31 @@
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/dialogStyle.less b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/dialogStyle.less
new file mode 100644
index 0000000..26c41ae
--- /dev/null
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/dialogStyle.less
@@ -0,0 +1,168 @@
+.out-dialog {
+ position: fixed;
+ right: 496px;
+ width: 500px;
+ height: 100%;
+ z-index: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+ box-sizing: border-box;
+ color: rgb(255, 83, 0);
+ background: black;
+ display: flex;
+ padding: 25px;
+ flex-direction: column;
+ transition: all ease 0.5s;
+ .content {
+ overflow-y: scroll;
+ .div-operation {
+ display: inline-block;
+ width: 3px;
+ height: 13px;
+ opacity: 1;
+ border-radius: 1px;
+ background: rgba(67, 136, 251, 1);
+ }
+ .text-operation {
+ display: inline-block;
+ color: rgba(255, 255, 255, 1);
+ font-size: 16px;
+ font-weight: 700;
+ margin-left: 5px;
+ }
+ .j-box {
+ background-color: #000;
+ opacity: 1;
+ z-index: 99999;
+ overflow-y: scroll;
+ .journal {
+ padding: 1% 3%;
+ width: 100%;
+ height: 150px;
+ background-color: rgba(0, 0, 0);
+ border-radius: 12px;
+ border: 2px solid transparent;
+ border-image: linear-gradient(to bottom, #0077ff, #00f6ff, #000000) 1;
+ .title-img {
+ padding-top: 6px;
+ }
+ }
+ .imgText {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .ztzm {
+ display: flex;
+ align-items: center;
+ }
+
+ .cxbtn {
+ color: rgba(255, 255, 255, 1);
+ border: none;
+ border-radius: 6px;
+ width: 59.79px;
+ height: 32px;
+ opacity: 1;
+ background: linear-gradient(
+ 180deg,
+ rgba(255, 187, 0, 1) 0%,
+ rgba(255, 112, 3, 1) 91.21%,
+ rgba(255, 129, 3, 1) 100%
+ );
+ cursor: pointer;
+ }
+ }
+ .btn-box {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ grid-template-rows: 1fr 1fr;
+ grid-row-gap: 15px;
+ .btn-item {
+ text-align: center;
+ display: flex;
+ align-content: space-between;
+ .left {
+ width: 70px;
+ height: 35px;
+ line-height: 35px;
+ border-radius: 4px;
+ background: linear-gradient(
+ 180deg,
+ rgba(1, 206, 255, 1) 0%,
+ rgba(0, 150, 229, 1) 100%
+ );
+ color: rgba(255, 255, 255, 1);
+ font-size: 14px;
+ font-weight: 400;
+ }
+ .right {
+ width: 140px;
+ height: 35px;
+ line-height: 35px;
+ :first-child {
+ color: white;
+ }
+ span {
+ vertical-align: middle;
+ }
+ img {
+ padding: 0 5px;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .button-box {
+ width: 100%;
+ box-sizing: border-box;
+ padding: 10px;
+ height: 60px;
+ position: absolute;
+ background-color: transparent;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ .execute {
+ margin-right: 10px;
+ width: 74px;
+ height: 40px;
+ opacity: 1;
+ cursor: pointer;
+ border-radius: 4px;
+ font-size: 14px;
+ font-weight: 400;
+ border: 0;
+ margin-left: 10px;
+ }.cancel {
+ margin-right: 10px;
+ width: 74px;
+ height: 40px;
+ opacity: 1;
+ cursor: pointer;
+ border-radius: 4px;
+ font-size: 14px;
+ font-weight: 400;
+ border: 0;
+ margin-left: 10px;
+ }
+ .execute {
+ background: rgb(67, 136, 251);
+ color: white;
+ }
+ .cancel {
+ background: white;
+ color: black;
+ }
+ }
+}
+
+.fade-enter-active, .fade-leave-active {
+ transform: translateX(0px);
+}
+.fade-enter-from, .fade-leave-to {
+ transform: translateX(496px);
+}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
new file mode 100644
index 0000000..dad0fa7
--- /dev/null
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/fanControl.vue
@@ -0,0 +1,201 @@
+
+
| 序号 | +执行时间 | +计划名称 | +状态 | +操作 | +|
|---|---|---|---|---|---|
| {{ index + 1 }} | +{{ row.startTime }} | +{{ row.planName }} | ++ + | ++ + | +
+ 重启
+ 删除
+ |
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/tabs1.less b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/tabs1.less
new file mode 100644
index 0000000..e0f02c9
--- /dev/null
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/tabs1.less
@@ -0,0 +1,423 @@
+// 抽屉
+.drawer-fan {
+ .light-area,
+ .circuit-area,
+ .control-area,
+ .control-scene-area,
+ .light-parameters-area {
+ width: 100%;
+ margin-top: 20px;
+ display: flex;
+ align-items: center;
+ }
+
+ .light-area-tab,
+ .circuit-tab,
+ .control-tab,
+ .control-scene-tab,
+ .light-parameters-tab {
+ width: 5px;
+ height: 23px;
+ opacity: 1;
+ background: rgba(26, 174, 251, 1);
+ margin-right: 4px;
+ }
+
+ .light-area-text,
+ .circuit-text,
+ .control-text,
+ .control-scene-text,
+ .light-parameters-text {
+ font-size: 14px;
+ color: white;
+ padding-left: 5px;
+ line-height: 23px;
+ width: 110px;
+ height: 23px;
+ background: linear-gradient(270deg, rgba(86, 221, 253, 0) 0%, rgba(25, 176, 255, 1) 100%);
+ user-select: none;
+ }
+
+ .light-area-tab,
+ .light-area-text {
+ display: inline-block;
+ justify-content: center;
+ }
+ .plan {
+ border: none;
+ font-size: 14px;
+ font-weight: 400;
+ border-radius: 5px;
+ vertical-align: top;
+ margin-left: 235px;
+ width: 88px;
+ height: 32px;
+ color: white;
+ cursor: pointer;
+ }
+ .plan.enabled {
+ background: linear-gradient(180deg, rgba(103, 222, 0, 1) 0%, rgba(0, 181, 6, 1) 100%);
+ }
+ .plan.disabled {
+ background-color: red;
+ }
+ .plan:disabled {
+ cursor: not-allowed;
+ }
+ .openPlan {
+ cursor: pointer;
+ border: none;
+ font-size: 14px;
+ font-weight: 400;
+ border-radius: 5px;
+ color: white;
+ vertical-align: top;
+ width: 88px;
+ height: 32px;
+ }
+ .openPlan.enabled2 {
+ background: linear-gradient(180deg, rgba(103, 222, 0, 1) 0%, rgba(0, 181, 6, 1) 100%);
+ }
+
+ .openPlan.disabled2 {
+ background-color: red;
+ }
+
+ .openPlan:disabled {
+ cursor: not-allowed;
+ }
+
+ .btn2 {
+ display: flex;
+ align-items: center;
+ margin-left: 80px;
+ }
+
+ .openzm {
+ cursor: pointer;
+ color: rgba(34, 183, 255, 1);
+ margin-left: 20px;
+ font-size: 14px;
+ }
+
+ .custom-checkbox {
+ width: 13px;
+ height: 13px;
+ }
+
+ .both {
+ width: 59.79px;
+ height: 32px;
+ opacity: 1;
+ background: linear-gradient(180deg,
+ rgba(255, 187, 0, 1) 0%,
+ rgba(255, 112, 3, 1) 91.21%,
+ rgba(255, 129, 3, 1) 100%);
+ margin-left: 8px;
+ font-size: 12px;
+ color: white;
+ border: none;
+ border-radius: 5px;
+ cursor: pointer;
+ }
+
+ .btn2 {
+ button {
+ margin: 0 5px;
+ }
+ }
+
+ .allBtn {
+ border: 0;
+ width: 40px;
+ color: white;
+ background-color: transparent;
+ }
+
+ .blue-background.ant-switch-checked {
+ background-color: linear-gradient(180deg,
+ rgba(1, 206, 255, 1) 0%,
+ rgba(0, 150, 229, 1) 100%) !important;
+ }
+
+ .grey-background.ant-switch {
+ background-color: grey !important;
+ }
+
+ .blue-background.ant-switch-checked .ant-switch-handle {
+ background-color: linear-gradient(180deg,
+ rgba(1, 206, 255, 1) 0%,
+ rgba(0, 150, 229, 1) 100%) !important;
+ }
+
+ .grey-background.ant-switch .ant-switch-handle {
+ background-color: grey !important;
+ }
+
+ p {
+ color: white;
+ }
+
+ .area,
+ .btnArea,
+ .control-mode-btn-area,
+ .control-scene-btn-area {
+ margin-left: -17px;
+
+ button {
+ width: 21%;
+ padding: 0 2%;
+ }
+ }
+
+ .btn {
+ width: 92px;
+ height: 40px;
+ border-radius: 4px;
+ opacity: 1;
+ margin-top: 10px;
+ margin-left: 17px;
+ font-size: 14px;
+ font-weight: 400;
+ opacity: 1;
+ border: 1px solid rgba(207, 212, 219, 1);
+ line-height: 20.27px;
+ color: white;
+ text-align: center;
+ vertical-align: top;
+ background-color: rgba(255, 255, 255, 0.1);
+ }
+
+ .selected {
+ background: linear-gradient(180deg, rgba(201, 245, 255, 1) 0%, rgba(138, 215, 255, 1) 100%);
+ color: rgba(0, 61, 90, 1);
+ border: 1px solid white;
+ }
+
+ .btn:hover {
+ background-color: rgba(207, 212, 219, 1);
+ }
+
+ .btn:active {
+ background-color: rgba(102, 102, 102, 1);
+ color: white;
+ }
+
+ .circuit-area,
+ .control-scene-area,
+ .light-parameters-area {
+ left: 51px;
+ width: 100%;
+ margin-top: 20px;
+ }
+
+ .circuit-tab,
+ .circuit-text {
+ display: inline-block;
+ }
+
+ .batch {
+ width: 60px;
+ height: 32px;
+ opacity: 1;
+ border: 1px solid rgba(67, 136, 251, 1);
+ color: rgba(67, 136, 251, 1);
+ border-radius: 5px;
+ background-color: white;
+ margin-left: 11px;
+ }
+
+ .control-area {
+ left: 51px;
+ width: 100%;
+ margin-top: 20px;
+ }
+
+ .control-tab,
+ .control-text {
+ display: inline-block;
+ }
+
+ :deep(.cell) {
+ text-align: center;
+ }
+
+ :deep(#pane-first) {
+ height: 100%;
+ }
+
+ .control-scene-tab,
+ .control-scene-text {
+ display: inline-block;
+ }
+
+ .light-parameters-tab,
+ .light-parameters-text {
+ display: inline-block;
+ }
+
+ .light-parameters-textarea>p {
+ height: 100%;
+ display: flex;
+ border: 1px solid rgba(236, 239, 245, 1);
+ justify-content: center;
+ align-items: center;
+ }
+
+ .bottom {
+ width: 100%;
+ height: 64px;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ position: fixed;
+ bottom: 0;
+ right: 0;
+ }
+
+ .execute {
+ margin-right: 20px;
+ width: 74px;
+ height: 40px;
+ opacity: 1;
+ cursor: pointer;
+ border-radius: 4px;
+ background: rgba(67, 136, 251, 1);
+ font-size: 14px;
+ font-weight: 400;
+ color: white;
+ border: 0;
+ margin: 0 10px;
+ }
+
+ .flushed {
+ width: 74px;
+ height: 40px;
+ cursor: pointer;
+ opacity: 1;
+ border-radius: 4px;
+ font-size: 14px;
+ font-weight: 400;
+ color: rgba(102, 102, 102, 1);
+ background: white;
+ border: 1px solid rgba(193, 197, 204, 1);
+ margin: 0 10px;
+ }
+
+ :deep(.ant-table-pagination) {
+ visibility: hidden;
+ }
+
+ .drawer-content {
+ margin-left: 20px;
+ }
+
+ .arrow-indicator {
+ position: absolute;
+ top: 50%;
+ left: 0;
+ transform: translateY(-50%);
+ z-index: 1;
+ }
+
+ .drawer-title1 {
+ position: fixed;
+ width: 33px;
+ height: 33px;
+ top: 0;
+ bottom: 0;
+ right: 20px;
+ margin: auto;
+ z-index: 99999;
+ }
+
+ .drawer-title2 {
+ position: fixed;
+ width: 33px;
+ height: 33px;
+ top: 0;
+ bottom: 0;
+ right: 495px;
+ margin: auto;
+ z-index: 99999;
+ }
+
+ .arrowbtn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 28px;
+ height: 28px;
+ background: rgba(0, 0, 0, 1);
+ opacity: 0.5;
+ border: none;
+ }
+
+ :deep(.ant-tabs-tab-btn) {
+ color: white;
+ }
+
+ :deep(.ant-table) {
+ background-color: transparent;
+ }
+
+ :deep(.ant-table-bordered) {
+ background-color: transparent;
+ }
+
+ :deep(.ant-table-thead) {
+ background-color: transparent;
+ }
+
+ :deep(.ant-table-cell) {
+ background-color: transparent;
+ color: #fff;
+ }
+
+ .custom-table {
+ border-collapse: collapse;
+ width: 416px;
+ height: 60px;
+ color: rgba(255, 255, 255, 1);
+ }
+
+ .custom-table th,
+ .custom-table td {
+ border: 1px solid rgba(163, 192, 243, 1);
+ text-align: left;
+ padding: 8px;
+ text-align: center;
+ }
+
+ .table1 {
+ margin-top: 20px;
+ width: 100%;
+ cellspacing: 0;
+ cellpadding: 0;
+ border: 1px solid rgba(255, 255, 255);
+ border-radius: 5px;
+ background: rgba(255, 255, 255, 0.1);
+ }
+
+ .light-area,
+ .circuit-area,
+ .control-area,
+ .control-scene-area,
+ .light-parameters-area {
+ width: 100%;
+ margin-top: 20px;
+ display: flex;
+ align-items: center;
+ }
+
+ .zmhlbtn {
+ position: relative;
+ }
+
+ // 禁用图标
+ .anticon-stop {
+ position: absolute;
+ right: 3px;
+ bottom: 3px;
+ }
+}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
index a21cac4..3185f86 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/index.vue
@@ -2,14 +2,13 @@
+
+ 计划库
+
+
+
+
+
+
-
-
- ![]()
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
index 5cc1b0e..2a00e91 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
@@ -4,6 +4,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 日志
+
+
+
+
+
+
+
+
+
+ 风幕机
+ 计划列表
+ 日志
+
+
+
+
+
+
+
+
+ 电动窗
+ 计划列表
+ 日志
+
+
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
index d1c0c36..40615fa 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
@@ -1,6 +1,8 @@
import { http } from '/nerv-lib/util';
-import { group } from '/@/api/deviceManage';
+import { group, device } from '/@/api/deviceManage';
+import { carbonEmissionFactorLibrary, quickCalculation } from '/@/api/carbonEmissionFactorLibrary';
import { dict } from '/@/api';
+import { ref } from 'vue';
const tableCalKeyMap = [
{
title: '来源企业',
@@ -38,6 +40,54 @@ const tableCalKeyMap = [
},
},
];
+
+const tableCarbonKeyMap = [
+ {
+ title: '能源类型',
+ dataIndex: 'energyTypeName',
+ // textEllipsis: true,
+ textNumber: 5,
+ },
+ {
+ title: '设备名称',
+ textNumber: 10,
+ dataIndex: 'deviceName',
+ // textEllipsis: true,
+ },
+ {
+ title: '设备id',
+ dataIndex: 'deviceInfoCode',
+ textNumber: 10,
+ },
+ {
+ textNumber: 5,
+ title: '碳排因子值',
+ dataIndex: 'emissionFactor',
+ },
+ {
+ title: '设备品牌/型号',
+ textNumber: 10,
+ dataIndex: 'deviceModel',
+ },
+ {
+ title: '来源企业',
+ textNumber: 10,
+ dataIndex: 'manufacturer',
+ },
+ {
+ title: '分组名称',
+ textNumber: 10,
+ dataIndex: 'deviceNameType',
+ },
+ {
+ textNumber: 5,
+ title: '设备状态',
+ dataIndex: 'status',
+ customRender: ({ value }) => {
+ return value === '0' ? '启用' : '停用';
+ },
+ },
+];
const tableKeyMap = [
{
title: '来源企业',
@@ -333,11 +383,19 @@ export const tableConfig = (el, elGroup, elFormula, defaultParams) => {
};
};
-export const tableConfigCal = (el, elGroup, elFormula, defaultParams) => {
+export const tableConfigCal = (
+ el,
+ elGroup,
+ elFormula,
+ defaultParams,
+ isCarbon,
+ editCarbonEquipmentRef,
+ setFactorRef,
+) => {
// 计算节点
return {
title: '点位信息',
- api: group.queryGroupInfoPage,
+ api: isCarbon ? group.getCarbonGroupList : group.queryGroupInfoPage,
params: defaultParams.value,
headerActions: [
{
@@ -345,9 +403,32 @@ export const tableConfigCal = (el, elGroup, elFormula, defaultParams) => {
name: 'GroupPointEdit',
type: 'primary',
handle: (a, b) => {
- el.value.toggle();
+ if (isCarbon) {
+ editCarbonEquipmentRef.value.toggle();
+ } else {
+ el.value.toggle();
+ }
},
},
+ isCarbon
+ ? {
+ label: '关联因子值',
+ name: 'SetFactor',
+ type: 'primary',
+ dynamicDisabled: (data: any) => {
+ return data.list.length === 0;
+ },
+ handle: ({ list }) => {
+ // 过滤出 id 大于 0 的项
+ const filteredList = list.filter(({ id }) => id > 0);
+
+ // 提取出 id 值
+ const ids = filteredList.map(({ id }) => id);
+
+ setFactorRef.value.toggle(ids);
+ },
+ }
+ : {},
{
label: '批量删除',
name: 'GroupPointDelete',
@@ -355,11 +436,17 @@ export const tableConfigCal = (el, elGroup, elFormula, defaultParams) => {
dynamicDisabled: (data: any) => {
return data.list.length === 0;
},
- dynamicParams: { ids: 'id[]' },
+ dynamicParams: isCarbon
+ ? {
+ deviceInfoCodeList: 'id[]',
+ }
+ : {
+ ids: 'id[]',
+ },
confirm: true,
isReload: true,
isClearCheck: true,
- api: group.delComputeList,
+ api: isCarbon ? group.deleteCarbonDevice : group.delComputeList,
},
{
label: '批量导出',
@@ -425,18 +512,39 @@ export const tableConfigCal = (el, elGroup, elFormula, defaultParams) => {
},
],
scroll: { x: 1400 },
- columns: tableCalKeyMap,
+ columns: isCarbon ? tableCarbonKeyMap : tableCalKeyMap,
columnActions: {
title: '操作',
actions: [
{
+ label: '关联因子',
+ name: 'SetFactor',
+ dynamicDisabled: (record) => {
+ // 这里根据record的某个字段值判断是否禁用删除按钮
+ return record.id < 0;
+ },
+ handle: (row) => {
+ setFactorRef.value.toggle([row.id]);
+ },
+ },
+ {
label: '删除',
name: 'GroupPointDelete',
- dynamicParams: { ids: 'id[]' },
+ dynamicDisabled: (record) => {
+ // 这里根据record的某个字段值判断是否禁用删除按钮
+ return record.id < 0;
+ },
+ dynamicParams: isCarbon
+ ? {
+ deviceInfoCodeList: 'id[]',
+ }
+ : {
+ ids: 'id[]',
+ },
confirm: true,
isReload: true,
isClearCheck: true,
- api: group.delComputeList,
+ api: isCarbon ? group.deleteCarbonDevice : group.delComputeList,
},
],
},
@@ -522,7 +630,338 @@ export const tableConfigCal = (el, elGroup, elFormula, defaultParams) => {
},
],
},
- // pagination: { pageSizeOptions: false },
+ pagination: isCarbon ? false : true,
rowKey: 'id',
+ rowSelection: { checkStrictly: false },
};
};
+
+export const editCarbonEquipmentConfig = (orgId) => {
+ return ref({
+ title: '设备信息',
+ api: device.queryDevicePage,
+ params: { orgId },
+ treeConfig: {
+ header: {
+ icon: 'deviceType',
+ title: '设备类别',
+ },
+ params: { orgId },
+ dynamicParams: { deviceCode: 'code' },
+ defaultExpandAll: true,
+ api: device.queryDeviceTree,
+ fieldNames: { title: 'deviceType', key: 'code' },
+ formConfig: {
+ schemas: [
+ {
+ field: 'energyType',
+ label: '',
+ component: 'NsSelectApi',
+ autoSubmit: true,
+ componentProps: {
+ api: () => dict({ params: { dicKey: 'ENERGY_TYPE' } }),
+ // params: { dicKey: 'ENERGY_TYPE' },
+ immediate: true,
+ // resultField: 'data.ENERGY_TYPE',
+ labelField: 'cnValue',
+ valueField: 'dicKey',
+ placeholder: '请选择能耗种类',
+ autoSelectFirst: true,
+ },
+ },
+ {
+ field: 'deviceType',
+ label: '设备名称',
+ component: 'NsInput',
+ autoSubmit: true,
+ componentProps: {
+ placeholder: '请输入设备类型',
+ },
+ },
+ ],
+ },
+ },
+ // rowSelection: null,
+ rowSelection: true,
+ // scroll: { x: 2000 },
+ columns: [
+ {
+ title: '设备名称',
+ dataIndex: 'deviceName',
+ },
+ {
+ title: '设备型号',
+ dataIndex: 'deviceModel',
+ },
+ {
+ title: 'SN码',
+ dataIndex: 'snCode',
+ textNumber: 5,
+ textEllipsis: true,
+ },
+ {
+ title: '设备一级区域',
+ dataIndex: 'device1Area',
+ textWidth: 88,
+ // width: 130,
+ textEllipsis: true,
+ },
+ {
+ title: '设备二级区域',
+ dataIndex: 'device2Area',
+ textWidth: 88,
+ // width: 130,
+ textEllipsis: true,
+ },
+ {
+ title: '设备详细位置',
+ dataIndex: 'deviceAddress',
+ textNumber: 5,
+ textEllipsis: true,
+ },
+ ],
+ formConfig: {
+ schemas: [
+ {
+ field: 'areas',
+ label: '设备区域',
+ component: 'NsCascader',
+ format: (record) => {
+ console.log(record);
+
+ return record?.reduce(
+ (pre, cur) => {
+ const len = cur?.length - 1;
+ pre[len].push(cur[len]);
+ return pre;
+ },
+ [[], []],
+ );
+ },
+ fieldMap: ['area1', 'area2'],
+ componentProps: {
+ placeholder: '请选择设备区域',
+ multiple: true,
+ loadData: (selectedOptions, options) => {
+ const targetOption = selectedOptions[selectedOptions.length - 1];
+ if (!selectedOptions.length) {
+ http.post(device.dropArea, { orgId, filterField: 'DEVICE_AREA' }).then((res) => {
+ options.value = res.data?.map((item) => {
+ return { label: item, value: item, children: [], isLeaf: false };
+ });
+ });
+ }
+ const value = targetOption?.value;
+ if (targetOption) {
+ targetOption.loading = true;
+ http
+ .post(device.dropArea, { device1Area: value, orgId, filterField: 'DEVICE_AREA' })
+ .then((res) => {
+ targetOption.loading = false;
+ targetOption.children = res.data?.map((item) => {
+ return { label: item, value: item, children: [], isLeaf: true };
+ });
+ });
+ }
+ },
+ },
+ },
+ {
+ field: 'deviceName',
+ label: '设备名称',
+ component: 'NsSelectApi',
+ componentProps: {
+ placeholder: '请选择设备名称',
+ api: (params) => {
+ return http.post(device.dropArea, params).then((res) => {
+ const result = res.data?.reduce((pre, cur) => {
+ !pre.includes(cur.deviceName) && pre.push(cur.deviceName);
+ return pre;
+ }, []);
+ return { data: result };
+ });
+ },
+ resultField: 'data',
+ params: { orgId, filterField: 'DEVICE_NAME_FACTORY' },
+ // labelField: 'deviceName',
+ // valueField: 'deviceName',
+ filterOption: (input: string, option: any) => {
+ return option.deviceName?.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+ },
+ showSearch: true,
+ immediate: true,
+ dropdownReload: true,
+ allowClear: true,
+ },
+ },
+ ],
+ params: {},
+ },
+ // pagination: { pageSizeOptions: false },
+ rowKey: 'deviceInfoCode',
+ });
+};
+
+export const setFactorConfig = (orgId) => {
+ return ref({
+ title: '排放因子库',
+ // api: carbonEmissionFactorLibrary.getTableList,
+ api: quickCalculation.queryCarbonEmissionPage,
+
+ params: { orgId, pageNum: 1, pageSize: 9999 },
+ treeConfig: {
+ header: {
+ icon: 'deviceType',
+ title: '因子分类',
+ },
+ params: { orgId },
+ dynamicParams: { energyType: 'id' },
+ defaultExpandAll: true,
+ // api: carbonEmissionFactorLibrary.getCarbonFactorTree,
+ api: quickCalculation.carbonQuickTree,
+ fieldNames: { title: 'energyType', key: 'id' },
+ formConfig: {
+ schemas: [
+ {
+ field: 'deviceType',
+ label: '设备名称',
+ component: 'NsInput',
+ autoSubmit: true,
+ componentProps: {
+ placeholder: '请输入关键字',
+ },
+ },
+ ],
+ },
+ },
+ // rowSelection: null,
+ rowSelection: { type: 'radio' },
+ // scroll: { x: 2000 },
+ columns: [
+ {
+ title: '序号',
+ textNumber: 2,
+ dataIndex: 'address',
+ customRender: (text: any) => {
+ return text.index + 1;
+ },
+ },
+ {
+ title: '因子值',
+ dataIndex: 'emissionFactors',
+ textNumber: 3,
+ },
+ {
+ title: '计量单位',
+ dataIndex: 'carbonEmissionSuffix',
+ textNumber: 4,
+ textEllipsis: true,
+ },
+ {
+ title: '更新时间',
+ dataIndex: 'updateTime',
+ textWidth: 88,
+ // width: 130,
+ textEllipsis: true,
+ },
+ {
+ title: '启用时间',
+ dataIndex: 'startTime',
+ textWidth: 88,
+ // width: 130,
+ textEllipsis: true,
+ },
+ {
+ title: '结束时间',
+ dataIndex: 'endTime',
+ textNumber: 5,
+ textEllipsis: true,
+ },
+ {
+ title: '数据来源',
+ dataIndex: 'dataSources',
+ textNumber: 5,
+ textEllipsis: true,
+ },
+ ],
+ // formConfig: {
+ // schemas: [
+ // {
+ // field: 'areas',
+ // label: '设备区域',
+ // component: 'NsCascader',
+ // format: (record) => {
+ // console.log(record);
+
+ // return record?.reduce(
+ // (pre, cur) => {
+ // const len = cur?.length - 1;
+ // pre[len].push(cur[len]);
+ // return pre;
+ // },
+ // [[], []],
+ // );
+ // },
+ // fieldMap: ['area1', 'area2'],
+ // componentProps: {
+ // placeholder: '请选择设备区域',
+ // multiple: true,
+ // loadData: (selectedOptions, options) => {
+ // const targetOption = selectedOptions[selectedOptions.length - 1];
+ // if (!selectedOptions.length) {
+ // http.post(device.dropArea, { orgId, filterField: 'DEVICE_AREA' }).then((res) => {
+ // options.value = res.data?.map((item) => {
+ // return { label: item, value: item, children: [], isLeaf: false };
+ // });
+ // });
+ // }
+ // const value = targetOption?.value;
+ // if (targetOption) {
+ // targetOption.loading = true;
+ // http
+ // .post(device.dropArea, { device1Area: value, orgId, filterField: 'DEVICE_AREA' })
+ // .then((res) => {
+ // targetOption.loading = false;
+ // targetOption.children = res.data?.map((item) => {
+ // return { label: item, value: item, children: [], isLeaf: true };
+ // });
+ // });
+ // }
+ // },
+ // },
+ // },
+ // {
+ // field: 'deviceName',
+ // label: '设备名称',
+ // component: 'NsSelectApi',
+ // componentProps: {
+ // placeholder: '请选择设备名称',
+ // api: (params) => {
+ // return http.post(device.dropArea, params).then((res) => {
+ // const result = res.data?.reduce((pre, cur) => {
+ // !pre.includes(cur.deviceName) && pre.push(cur.deviceName);
+ // return pre;
+ // }, []);
+ // return { data: result };
+ // });
+ // },
+ // resultField: 'data',
+ // params: { orgId, filterField: 'DEVICE_NAME_FACTORY' },
+ // // labelField: 'deviceName',
+ // // valueField: 'deviceName',
+ // filterOption: (input: string, option: any) => {
+ // return option.deviceName?.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+ // },
+ // showSearch: true,
+ // immediate: true,
+ // dropdownReload: true,
+ // allowClear: true,
+ // },
+ // },
+ // ],
+ // params: {},
+ // },
+ // pagination: { pageSizeOptions: false },
+ rowKey: 'id',
+ });
+};
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue
new file mode 100644
index 0000000..6fcedcb
--- /dev/null
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue
@@ -0,0 +1,123 @@
+
+
+ ![]()
{{ item.name }}
@@ -65,24 +64,218 @@
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 自定义标题
+
+
+
+
+
@@ -41,7 +43,24 @@