diff --git a/src/views/model/params/index.vue b/src/views/model/params/index.vue
index d136e83..6948e41 100644
--- a/src/views/model/params/index.vue
+++ b/src/views/model/params/index.vue
@@ -57,10 +57,10 @@
-
-
+
+
-
-
+
@@ -294,10 +294,10 @@
-
-
+
+
@@ -392,7 +392,7 @@ import lock from "@/assets/icons/svg/lock.svg";
import { ElMessageBox } from 'element-plus';
const { proxy } = getCurrentInstance();
const router = useRouter();
-const { dc_param_uint_type, dc_param_value_type, dc_device_partion } = proxy.useDict('dc_param_uint_type', 'dc_param_value_type', 'dc_device_partion');
+const { dc_param_control_type, dc_param_value_type, dc_device_partion } = proxy.useDict('dc_param_control_type', 'dc_param_value_type', 'dc_device_partion');
const paramsList = ref([]);
const open = ref(false);
const loading = ref(true);
@@ -834,7 +834,7 @@ function getfilterNameItem(value){
});
}
}else if(value==='contrlFlag'){
- if(sortItemMap.value[value]?.length>0 && sortItemMap.value[value].value != undefined && sortItemMap.value[value].value != null){
+ if(sortItemMap.value[value]?.length>0){
result = sortItemMap.value[value].map(element=>{
contrlFlag.value.forEach(item=>{
if(item.value===element.text){
@@ -862,10 +862,11 @@ function getfilterNameItem(value){
});
}
}else if(value==='paramModelId'){
- if(sortItemMap.value[value]?.length>0 && sortItemMap.value[value].value != undefined && sortItemMap.value[value].value != null){
+ if(sortItemMap.value[value]?.length>0){
result = sortItemMap.value[value].map(element=>{
+ let textValue = getParamModelName(element.value);
return {
- text: getParamModelName(element.value),
+ text: textValue,
value: element.value,
};
});
@@ -883,6 +884,20 @@ function getfilterNameItem(value){
value: element.value,
};
});
+ }
+ }else if(value==='contrlType'){
+ if(sortItemMap.value[value]?.length>0){
+ result = sortItemMap.value[value].map(element=>{
+ dc_param_control_type.value.forEach(item=>{
+ if(item.value===String(element.text)){
+ resultItem = item.label;
+ }
+ });
+ return {
+ text: resultItem,
+ value: element.value,
+ };
+ });
}
}else{
result = sortItemMap.value[value];