diff --git a/hx-ai-intelligent/src/api/IlluminationInfo.ts b/hx-ai-intelligent/src/api/IlluminationInfo.ts
new file mode 100644
index 0000000..f6de125
--- /dev/null
+++ b/hx-ai-intelligent/src/api/IlluminationInfo.ts
@@ -0,0 +1,20 @@
+
+// 照明系统及相关接口
+export enum lightingManage {
+
+ // 主页 ========================================================
+
+ // 获得分区与线路
+ getArea = '/carbon-smart/IlluminationInfo/region',
+ // 修改线路的可用/禁用状态
+ setDisable = '/carbon-smart/IlluminationInfo/revisePanel',
+
+ // 计划列表tab页 ================================================
+
+ // 获得计划列表tab页的表格数据
+ getPlanTable = '/carbon-smart/IlluminationPlan/selectPanelPlan',
+ // 获得计划列表tab页的穿梭框左侧数据
+ getLeftPlan = '/carbon-smart/IlluminationPlan/getPlan',
+ // 提交穿梭框被选择的数据
+ submitLeftPlan = '/carbon-smart/IlluminationPlan/joinPlan',
+}
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
index 6f92f87..1b57ddd 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
@@ -215,7 +215,7 @@
pageNum: 1,
pageSize: 99,
},
- placeholder: '请选择设备点位',
+ placeholder: '请选择设备名称',
resultField: 'data.records',
labelField: 'deviceName',
valueField: 'id',
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
index f44bf69..f591179 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -196,8 +196,8 @@
});
};
//选择设备方法
- const selectDevice = (value: string) => {
- console.log(`selected ${value}`);
+ const selectDevice = () => {
+ getDevicePoint({ id: infoObject.value.deviceName });
};
//获取设备列表
const getDevicePage = (value: any) => {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
index 41ec61d..0f660ba 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
@@ -296,7 +296,6 @@
const expanded = dataList
.map((item: TreeProps['treeData'][number]) => {
if (item.title.indexOf(value) > -1) {
- console.log(item.title.indexOf(value));
return getParentKey(item.key, deptTreeData.value);
}
return null;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
index 5edbf31..75531f6 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
@@ -98,10 +98,11 @@ export const energyAlarmConfigs = (
name: 'energyAlarmEdit',
dynamicParams: ['uuid', 'appealType'],
handle: (data: any) => {
- data.monitorFrequency = data.monitorFrequency.value;
- data.priority = data.priority.value;
- data.repetitions = data.repetitions.value;
- editeEnergyAlarm.value.toggle(data);
+ const obj = { ...data };
+ obj.monitorFrequency = data.monitorFrequency.value;
+ obj.priority = data.priority.value;
+ obj.repetitions = data.repetitions.value;
+ editeEnergyAlarm.value.toggle(obj);
},
},
{
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
index 3848142..18530e1 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
@@ -99,10 +99,11 @@ export const equipmentAlarmTableConfig = (
name: 'equipmentAlarmEdit',
dynamicParams: ['uuid', 'appealType'],
handle: (data: any) => {
- data.priority = data.priority.value;
- data.repetitions = data.repetitions.value;
- data.monitorTimeUnit = data.monitorTimeUnit.value;
- editEquipmentAlarm.value.toggle(data);
+ const obj = { ...data };
+ obj.priority = data.priority.value;
+ obj.repetitions = data.repetitions.value;
+ obj.monitorTimeUnit = data.monitorTimeUnit.value;
+ editEquipmentAlarm.value.toggle(obj);
},
},
{
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
index baeb5df..8aea66b 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
@@ -17,14 +17,14 @@
display: flex;
position: relative;
font-size: 16px;
- border-bottom: 1px solid rgb(255, 118, 2); /* 设置底部边框为1像素实线,并指定颜色 */
+ border-bottom: 1px solid #2778ff; /* 设置底部边框为1像素实线,并指定颜色 */
">
告警编号:20230310001
- 15点08分
+ 2024-03-10 15:08:10
@@ -38,7 +38,7 @@
新告警
C003
用电量超标
当日用电量超出预设值用电量超标
当日用电量超出预设值
1栋10层低压柜
0
@@ -233,7 +233,7 @@
top: 0px;
width: 5px;
height: 35px;
- background-color: rgb(254, 118, 2);
+ background-color: #2778ff;
}
:deep(.ant-descriptions-item-label) {
width: 25%;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
index 9ec1b01..499db32 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -1,7 +1,7 @@
- Content of Tab Pane 1
+
+
+
-
- 创建工单
+
确定
@@ -72,6 +53,14 @@
setup() {
const visible = ref(false);
+ const infoObject = ref({});
+ const statusOptions = ref([
+ { value: '0', label: '待处理' },
+ { value: '1', label: '处理中' },
+ { value: '2', label: '已完成' },
+ { value: '3', label: '超时' },
+ { value: '4', label: '已关闭' },
+ ]);
const logList = ref([
{ name: '李四', status: '2' },
{ name: '王五', status: '4' },
@@ -91,6 +80,8 @@
};
const toggle = (data) => {
console.log(data, 'data');
+ infoObject.value = logList.value[0];
+ console.log(infoObject.value, 'infoObject.value');
visible.value = true;
};
const createOrder = () => {
@@ -120,6 +111,8 @@
});
};
return {
+ infoObject,
+ statusOptions,
btnClick,
createOrder,
visible,
@@ -131,4 +124,10 @@
},
});
-
+
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
index 8d4092f..069127e 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -145,7 +145,7 @@ export const notificationtableConfig = (look: any, status: any) => {
fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
componentProps: {
valueFormat: 'YYYY-MM-DD',
- placeholder: ['设备生产开始日期', '设备生产结束日期'],
+ placeholder: ['开始日期', '结束日期'],
},
},
],
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
index 9298666..d792f11 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -83,7 +83,7 @@
},
{
title: '计量单位',
- dataIndex: 'unit',
+ dataIndex: 'unitName',
},
{
title: '加权平均',
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
index 33312db..c4a1582 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -214,7 +214,9 @@
const wrapperCol = { span: 19 };
const switchLabelCol = { span: 10 };
const switchWrapperCol = { span: 14 };
- const formState = ref({})
+ const formState = ref({
+ orgId: orgId.value,
+ })
// 定义form表单的必填
const rules: Record = {
energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
@@ -289,8 +291,8 @@
},
{
title: '计量单位',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'unitName',
+ dataIndex: 'unitName',
},
{
title: '全年',
@@ -361,9 +363,9 @@
getDictList()
visible.value = true
fetch(energyConsumption.findById , {id : record.id }).then((res) => {
- if(res.data.unit){
- res.data.unit = res.data.unit.split(',')
- }
+ // if(res.data.unit){
+ // res.data.unit = res.data.unit.split(',')
+ // }
formState.value = res.data
});
},
@@ -423,12 +425,14 @@
.then(() => {
console.log('values', formState, toRaw(formState));
if(formState.value.unit){
- formState.value.unit = formState.value.unit.join(',')
+ formState.value.unit = formState.value.unit.join(',').split(',')[1]
}
if(formState.value.id){
fetch(energyConsumption.update , formState.value).then((res) => {
visible.value = false
- formState.value = {}
+ formState.value = {
+ orgId: orgId.value,
+ }
message.success('操作成功!');
mainRef.value?.nsTableRef.reload();
});
@@ -439,7 +443,9 @@
NsMessage.warning(res.data);
}else{
visible.value = false
- formState.value = {}
+ formState.value = {
+ orgId: orgId.value,
+ }
message.success('操作成功!');
mainRef.value?.nsTableRef.reload();
}
@@ -491,8 +497,8 @@
getDictList()
visible.value = true
fetch(energyConsumption.findById , {id : record.id }).then((res) => {
- if(res.data.unit){
- res.data.unit = res.data.unit.split(',')
+ if(res.data.unitName){
+ res.data.unitName = res.data.unitName.split(',')
}
formState.value = res.data
});
@@ -519,7 +525,9 @@
// 关闭新增抽屉
const onClose = () => {
visible.value = false;
- formState.value = {}
+ formState.value = {
+ orgId: orgId.value,
+ }
formRef.value.resetFields();
};
// 点击上传凭证按钮
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
index 6f1a5d3..602471f 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -319,11 +319,11 @@
label: '编辑',
name: 'userEdit',
handle: (record: any) => {
- selectedRowKeys.value = [record.carbonId];
+ selectedRowKeys.value = [record.factorId];
formState.value.id = record.id
formState.value.emissionFactors = record.emissionFactors
formState.value.dateRange = [record.startTime, record.endTime];
- formState.value.carbonId = record.carbonId
+ formState.value.factorId = record.factorId
visible.value = true
getNewTable()
},
@@ -375,7 +375,7 @@
const onSelectionChange = (selectedKeys, selectedRows) => {
selectedRowKeys.value = selectedKeys;
formState.value.emissionFactors = selectedRows[0].emissionFactors
- formState.value.carbonId = selectedRows[0].id
+ formState.value.factorId = selectedRows[0].id
};
const queryData = ref({
orgId: orgId.value,
@@ -390,11 +390,11 @@
};
// 点击编辑按钮
const editData = (record) =>{
- selectedRowKeys.value = [record.carbonId];
+ selectedRowKeys.value = [record.factorId];
formState.value.id = record.id
formState.value.emissionFactors = record.emissionFactors
formState.value.dateRange = [record.startTime, record.endTime];
- formState.value.carbonId = record.carbonId
+ formState.value.factorId = record.factorId
visible.value = true
getNewTable()
};
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
new file mode 100644
index 0000000..eb62cd7
--- /dev/null
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index d1a1a77..89ff479 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -1,8 +1,55 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.cnValue }}
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
-
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
index d0db90a..d1a523d 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -14,29 +14,29 @@
- {{ row.key }} |
- {{ row.data }} |
+ {{ index + 1 }} |
+ {{ row.startTime }} |
{{ row.planName }} |
-
+ |
|
-
+ |
|
@@ -73,41 +73,53 @@
|