+
-
-
- 且(and)
- 或(or)
-
-
+
+
+ 且 (and)
+ 或 (or)
+
+
-
-
-
-
+
+
{{ `逻辑${index}:` }}
+
+
{{ `数值${index}:` }}
-
+
+
+
+
+
@@ -120,6 +141,8 @@
delivery: null,
alarmList: [{ alarm: null, number: null }],
});
+ //删除的逻辑列表
+ const delAlarmList = ref([]);
const formRef = ref();
//站点数
const zdTreeData = ref
([
@@ -193,6 +216,14 @@
{ value: '实时值', label: '实时值', code: '1' },
{ value: '平均值', label: '平均值', code: '2' },
]);
+ //逻辑
+ const ljOptions = ref([
+ { value: '1', label: '≥' },
+ { value: '2', label: '>' },
+ { value: '3', label: '≤' },
+ { value: '4', label: '<' },
+ { value: '5', label: '=' },
+ ]);
//设备点位方法
const filterOption = (input: string, option: any) => {
console.log('搜索', option.value);
@@ -264,6 +295,7 @@
//数据是否验证通过
formRef.value.validate().then(() => {
console.log('values', infoObject, toRaw(infoObject));
+ delAlarmList.value = [];
});
//调用接口
// http
@@ -293,8 +325,24 @@
alarmList: [{ alarm: null, number: null }],
};
visible.value = false;
+ delAlarmList.value = [];
NsMessage.success('操作成功');
};
+ // 新增逻辑列表
+ const addAlarmList = () => {
+ if (infoObject.value.alarmList) {
+ infoObject.value.alarmList.push({ alarm: null, number: null });
+ } else {
+ infoObject.value.alarmList = [{ alarm: null, number: null }];
+ }
+ };
+ // 删除 逻辑列表、
+ const deleteAlarmList = (index: number) => {
+ if (infoObject.value.alarmList[index]?.id) {
+ delAlarmList.value.push(infoObject.value.alarmList[index]);
+ }
+ infoObject.value.alarmList.splice(index, 1);
+ };
defineExpose({
toggle,
handleClose,
@@ -334,6 +382,6 @@
/deep/ .ant-form-item-label {
z-index: 20;
text-align: right;
- width: 20%;
+ width: 23%;
}
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
index a8ab1e0..95761fe 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -2,7 +2,7 @@
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
index 3eac872..ada33f3 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -2,7 +2,7 @@
-
+
@@ -54,11 +54,11 @@
equipmentAlarm.value = !equipmentAlarm.value;
configureDeviceAlarms.value.show = false;
};
- const changeUse = () => {
- console.log(mainRef.value);
- mainRef.value?.nsTableRef.reload();
- // console.log(newList.value.formFinish, '数据');
- };
+ // const changeUse = () => {
+ // console.log(mainRef.value);
+ // mainRef.value?.nsTableRef.reload();
+ // // console.log(newList.value.formFinish, '数据');
+ // };
// 编辑或添加成功 刷新列表
const editObject = () => {
console.log('添加成功 刷新列表');
@@ -69,7 +69,6 @@
callback,
notificationConfig,
equipmentAlarmConfig,
- changeUse,
editObject,
editEquipmentAlarm,
configureDeviceAlarms,
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/configureDeviceAlarms.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/configureDeviceAlarms.ts
index 05d46c4..3ed560d 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/configureDeviceAlarms.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/configureDeviceAlarms.ts
@@ -16,7 +16,7 @@ const tableKeyMap = [
dataIndex: 'id',
},
{
- title: '设备信心',
+ title: '设备信息',
dataIndex: 'deviceCode',
},
{
diff --git a/lib/component/table/table.vue b/lib/component/table/table.vue
index 75824f5..c12e0d6 100644
--- a/lib/component/table/table.vue
+++ b/lib/component/table/table.vue
@@ -141,16 +141,6 @@
-
-
-
-
-
{
- emit('switch', data);
- };
function setLoading(loading: boolean) {
tableState.loading = loading;
@@ -647,7 +633,6 @@
tableState,
isEmpty,
formFinish,
- clickSwitch,
tableChangeEvent,
treeSelect,
getTreeBindValue,