diff --git a/src/views/DataCollect/Collector/Point/Save/DeathArea.vue b/src/views/DataCollect/Collector/Point/Save/DeathArea.vue
index ccb6e5c4..05f94ec9 100644
--- a/src/views/DataCollect/Collector/Point/Save/DeathArea.vue
+++ b/src/views/DataCollect/Collector/Point/Save/DeathArea.vue
@@ -21,8 +21,9 @@
:max="_value[1] ? _value[1].value : 999999" :min="1" @change="handleChange" />
-
+
点位值
@@ -88,6 +89,11 @@ const termTypeOptions = computed(() => {
}
});
+const leftOptions = [
+ { label: '<', value: 'lte' },
+ { label: '≤', value: 'lt' },
+];
+
const handleDeathArea = (e: any) => {
if (e) {
_value.value = [{
@@ -175,7 +181,7 @@ const handlePercent = (e: any) => {
type: 'or',
}
]
- }else{
+ } else {
_value.value = [
{
column: `this['currentValue'] - this['lastValue'] * 1/100`,
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
index f02c333f..e752a2b4 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
@@ -242,7 +242,7 @@ getTypes();
const dataAreaFilterList = computed(() => {
let result = daveAreaList.value.filter((item: any) =>
- dataAreaFilter[deviceType.value].includes(item.id),
+ dataAreaFilter[deviceType.value]?.includes(item.id),
);
if (deviceType.value == 'S200') {
result.push({
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 6f6546d4..15131ce0 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -505,7 +505,10 @@ const handlEdit = (data: any) => {
}else{
visible.saveModBus = true;
}
- current.value = cloneDeep(data);
+ current.value = cloneDeep({
+ ...data,
+ deviceType:props.data?.configuration.type,
+ });
};
const handlDelete = async (id: string | undefined = undefined) => {