From b138efcab3bb359464de02ac366e1ad23a4d9ddd Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Thu, 7 Dec 2023 11:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=87=8C=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=8D=A2=E6=88=90=E6=8E=A7=E5=88=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/params/index.vue | 39 ++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 12 deletions(-)

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 @@
           </el-form-item>
         </el-col>
         <el-col :span="4" v-show="collapseVisible">
-          <el-form-item label="参数单位" prop="contrlType" label-width="auto">
-            <el-select v-model="queryParams.contrlType" placeholder="请选择参数单位" clearable>
+          <el-form-item label="控制类型" prop="contrlType" label-width="auto">
+            <el-select v-model="queryParams.contrlType" placeholder="请选择控制类型" clearable>
               <el-option
-                v-for="dict in dc_param_uint_type"
+                v-for="dict in dc_param_control_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -197,11 +197,11 @@
           <dict-tag :options="enabledTable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
-      <el-table-column label="参数单位" align="center" prop="contrlType" column-key="contrlType" filter-placement="bottom-end"
+      <el-table-column label="控制类型" align="center" prop="contrlType" column-key="contrlType" filter-placement="bottom-end"
         :filters="getfilterNameItem('contrlType')" :filter-method="filterMethod" :width="120" sortable
         >
         <template #default="scope">
-          <dict-tag :options="dc_param_uint_type" :value="scope.row.contrlType" :default-value="'Unknown'"/>
+          <dict-tag :options="dc_param_control_type" :value="scope.row.contrlType" :default-value="'Unknown'"/>
         </template>
       </el-table-column>
       <el-table-column label="设置值" align="center" prop="setDefautvalue" :width="120" sortable/>
@@ -294,10 +294,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="参数单位" prop="contrlType">
-            <el-select v-model="form.contrlType" placeholder="请选择参数单位">
+          <el-form-item label="控制类型" prop="contrlType">
+            <el-select v-model="form.contrlType" placeholder="请选择控制类型">
               <el-option
-                v-for="dict in dc_param_uint_type"
+                v-for="dict in dc_param_control_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value">
@@ -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];