联调 新增检测脚本

frontend/src/views/machine/testScript/components/testScriptPopup.vue

@@ -31,7 +31,13 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="检测脚本值类型" prop="valueType">
-                    <el-select v-model="formContent.valueType" filterable clearable placeholder="请选择值类型">
+                    <el-select
+                        v-model="formContent.valueType"
+                        :disabled="titleType == '编辑检测脚本'"
+                        filterable
+                        clearable
+                        placeholder="请选择值类型"
+                    >
                         <el-option
                             v-for="item in dictStore.getDictData('Script_Value_Type')"
                             :key="item.id"
@@ -49,7 +55,7 @@
             </el-form>
         </el-card>
         <el-card v-if="show">
-            <TestScriptDetail :options="secondLevelOptions" :scriptId="scriptId" />
+            <TestScriptDetail :options="secondLevelOptions" :formContent="formContent" />
         </el-card>
     </div>
 </template>
@@ -67,7 +73,7 @@ import { useRouter } from 'vue-router'
 const modeId = ref()
 const show = ref(false)
 const router = useRouter()
-const scriptId = ref('46296b72528f805376e362df594fc669')
+
 const secondLevelOptions: any[] = []
 // 定义弹出组件元信息
 const dialogFormRef = ref()
@@ -81,8 +87,7 @@ function useMetaInfo() {
         pattern: modeId.value,
         standardName: '',
         standardTime: '',
-        state: 1,
-        valueType: ''
+        state: 1
     })
     return { titleType, formContent }
 }
@@ -126,7 +131,7 @@ const closeInformation = () => {}
 // 保存数据
 const save = () => {
     // dialogFormRef
-    dialogFormRef.value.validate(valid => {
+    dialogFormRef.value.validate((valid: boolean) => {
         if (valid) {
             if (titleType.value == '新增检测脚本') {
                 formContent.value.pattern = modeId.value
@@ -134,7 +139,7 @@ const save = () => {
                     if (res.code === 'A0000') {
                         ElMessage.success({ message: res.message })
                         // scriptId.value = res.data
-                        scriptId.value = '46296b72528f805376e362df594fc669'
+                        formContent.value.id = '46296b72528f805376e362df594fc669'
                         show.value = true
                     }
                 })
@@ -157,7 +162,6 @@ const open = async (title: string, row: any) => {
     } else {
         let list = JSON.parse(row)
         formContent.value = list
-        scriptId.value = list.id
         show.value = true
     }
 
@@ -166,7 +170,15 @@ const open = async (title: string, row: any) => {
 }
 // 获取树字典
 const treeInfo = async (currentMode: string) => {
-    const result = await getDictTreeByCode({ code: 'Script_Indicator_Items' })
+    const data: Dict.ResDictTree = {
+    name: '',
+    id: '',
+    pid: '',
+    pids: '',
+    code: 'Script_Indicator_Items',
+    sort: 0
+  };
+    const result = await getDictTreeByCode(data)
     const allOptions = convertToOptions(result.data as Dict.ResDictTree[])
     secondLevelOptions.push(...(allOptions[0]?.children || []))
     modeId.value = dictStore.getDictData('Pattern').find(item => item.name === currentMode)?.id
@@ -186,6 +198,7 @@ onMounted(() => {
 const convertToOptions = (dictTree: Dict.ResDictTree[]): CascaderOption[] => {
     return dictTree.map(item => ({
         value: item.id,
+        code: item.code,
         label: item.name,
         children: item.children ? convertToOptions(item.children) : undefined
     }))