检测脚本详情查看

frontend/src/views/machine/testScript/components/scriptForm.ts

@@ -1,4 +1,4 @@
-import { log } from 'console'
+
 
 let scriptForm: any = {
     subType: '', //tabcode

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

@@ -132,6 +132,7 @@ const form = ref({
 // 打开弹窗，可能是新增，也可能是编辑
 
 const open = async (row: any, copyRowList: any) => {
+  
     let treeData: any = []
     await getDictTreeByCode({
         name: '',
@@ -157,6 +158,7 @@ const open = async (row: any, copyRowList: any) => {
             }
         })
     })
+
     let form = handleHarmData(JSON.parse(JSON.stringify(props.form)))
     let retryCompute = isEqual(form, copyRowList)
     await scriptDtlsCheckDataList({

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

@@ -578,6 +578,7 @@ const open = (sign: string, row: any) => {
 
     handleRowClick({ name: 'L1', sort: 0 }, { label: '相别' })
     dictStore.getDictData('Script_Value_Type')
+    console.log('🚀 ~ open ~ tabChildren.value:', tabChildren.value)
 }
 
 // 判断后台没有谐波，简谐波值 用于回显

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

@@ -187,7 +187,10 @@
             v-if="showDialog"
         />
         <!-- 查看 -->
-        <viewRow ref="viewRowRef" />
+        <viewRow ref="viewRowRef"  
+                :activeName="activeName"
+                :formContent="props.formContent"
+                />
     </div>
 </template>
 
@@ -337,6 +340,8 @@ const inquireTable = () => {
             tableData.value = res.data
         }
     })
+
+
 }
 // 打开 drawer(新增、编辑)
 const openDialog = (titleType: string, row: Partial<TestScript.ResTestScript> = {}) => {
@@ -376,8 +381,24 @@ const copyRow = async (row: any) => {
     })
 }
 // 查看
-const view = (row: any) => {
-    viewRowRef.value?.open(row)
+const view = (row: Partial<TestScript.ResTestScript> = {}) => {
+   
+    getCommunication()
+    //当前点击的一级tab
+    const parentTabName = communicationList.value.find(t => t.id === activeName.value)?.name || '未找到对应名称';
+    //当前点击的二级tab
+    const childrenTabName = ref('')
+    tabData.value.forEach((item: any) => {
+        if (item.value == activeName.value) {
+            item.children.forEach((k: any) => {
+                if (k.value == childActiveName.value) {
+                    childrenTabName.value = k.label
+                }
+            })
+        }
+    })
+    console.log(tabData.value)
+    viewRowRef.value?.open(row,communicationList.value,parentTabName,childrenTabName.value)
 }
 // 删除
 const deleteRow = async (row: any) => {

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-model="dialogVisible" title="频率_额定工作条件下的检测_详情" v-bind="dialogBig">
+    <el-dialog v-model="dialogVisible" :title= "titleType"  v-bind="dialogBig">
         <!-- <el-descriptions :column="5" border>
             <el-descriptions-item label="脚本名称">测试</el-descriptions-item>
             <el-descriptions-item label="参照标准名称">GBT 19862</el-descriptions-item>
@@ -21,7 +21,7 @@
                         </el-descriptions-item>
                         <el-descriptions-item label-align="right" label="电压相角(°)">
                             {{
-                                tableData?.channelList[item * 2 - 2].fphase
+                                tableData?.channelList[item * 2 - 2].fphase == null
                                     ? '/'
                                     : tableData?.channelList[item * 2 - 2].fphase
                             }}
@@ -129,7 +129,7 @@
                         <el-tabs type="border-card" style="flex: 1">
                             <el-tab-pane label="间谐波电压">
                                 <el-table
-                                    :data="tableData1"
+                                    :data="tableData?.channelList[item * 2 - 2].inharmList"
                                     border
                                     size="small"
                                     :header-cell-style="{
@@ -141,16 +141,16 @@
                                     :cell-style="{ textAlign: 'center' }"
                                     height="250px"
                                 >
-                                    <el-table-column prop="name" label="次数" />
-                                    <el-table-column prop="value" label="间谐波含有率(%)" />
-                                    <el-table-column prop="errorFlag" label="间谐波相角(°)" />
+                                    <el-table-column prop="inharm" label="次数" />
+                                    <el-table-column prop="famp" label="间谐波含有率(%)" />
+                                    <el-table-column prop="fphase" label="间谐波相角(°)" />
                                 </el-table>
                             </el-tab-pane>
                         </el-tabs>
                         <el-tabs type="border-card" class="ml10" style="flex: 1">
                             <el-tab-pane label="间谐波电流">
                                 <el-table
-                                    :data="tableData1"
+                                    :data="tableData?.channelList[item * 2 - 1].inharmList"
                                     border
                                     size="small"
                                     :header-cell-style="{
@@ -162,9 +162,9 @@
                                     :cell-style="{ textAlign: 'center' }"
                                     height="250px"
                                 >
-                                    <el-table-column prop="name" label="次数" />
-                                    <el-table-column prop="value" label="间谐波含有率(%)" />
-                                    <el-table-column prop="errorFlag" label="间谐波相角(°)" />
+                                    <el-table-column prop="inharm" label="次数" />
+                                    <el-table-column prop="famp" label="间谐波含有率(%)" />
+                                    <el-table-column prop="fphase" label="间谐波相角(°)" />
                                 </el-table>
                             </el-tab-pane>
                         </el-tabs>
@@ -172,21 +172,194 @@
                 </div>
             </el-tab-pane>
 
-            <el-tab-pane label="参考设定值列表">L3</el-tab-pane>
+            <el-tab-pane label="参考设定值列表">
+                <el-table
+                :data="setValue_TableData"
+                :header-cell-style="{
+                    textAlign: 'center',
+                    backgroundColor: '#003078',
+                    color: '#fff'
+                }"
+                stripe
+                :cell-style="{ textAlign: 'center' }"
+                height="550px"
+                >
+            <el-table-column type="index" label="序号" width="60" />
+            <el-table-column prop="pname" label="参考设定值类型" />
+            <el-table-column prop="name" label="参考设定值子类型" width="250">
+                <template #default="{ row }">{{ row.harmNum ? `(${row.harmNum}次)` : '' }} {{ row.name }}</template>
+            </el-table-column>
+            <el-table-column prop="dataType" label="值类型">
+                <template #default="{ row }">
+                    <el-select v-model="row.dataType" v-if="!row.show">
+                        <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                    <span v-else>
+                        {{ typeList.find(item => item.value == row.dataType)?.label || row.dataType }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="phase" label="相别" />
+            <el-table-column prop="value" label="参考设定值">
+                <template #default="{ row }">
+                    <span v-if="row.show">{{ row.value }}</span>
+                    <el-input type="number" v-else v-model="row.value" placeholder="请输入值" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="value" label="参与误差比较">
+                <template #default="{ row }">
+                    {{ row.errorFlag == 0 ? '否' : '是' }}
+                </template>
+            </el-table-column>
+        </el-table>
+
+            </el-tab-pane>
         </el-tabs>
     </el-dialog>
 </template>
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import { dialogBig } from '@/utils/elementBind'
+import { getDictTreeByCode } from '@/api/system/dictionary/dictTree'
+import { scriptDtlsCheckDataList } from '@/api/device/testScript/index'
 const dialogVisible = ref(false)
-
+const titleType = ref('')
 const tableData: any = ref({})
-const open = (row: any) => {
-    console.log('🚀 ~ open ~ row:', row)
-    tableData.value = row
+const setValue_TableData: any = ref([])
+const copyRowList = ref({})
+const props = defineProps({
+    activeName: {
+        type: String,
+        required: true
+    },
+
+    formContent: {
+        type: [Object, Array],
+        required: true
+    },
+
+})
+// 表格配置项
+const typeList = [
+    {
+        label: '实时',
+        value: 'real'
+    },
+    {
+        label: 'CP95值',
+        value: 'cp95'
+    },
+    {
+        label: '平均值',
+        value: 'avg'
+    },
+    {
+        label: '最小值',
+        value: 'min'
+    },
+    {
+        label: '最大值',
+        value: 'max'
+    }
+]
+const open = async (row: any,communicationList:any,parentTabName:string,childrenTabName:string) => {
+
+    titleType.value = parentTabName + '_' + childrenTabName+ '_详情'
+    //console.log('🚀 ~ open ~ row:', row)
+    tableData.value = row  
+    copyRowList.value = JSON.parse(JSON.stringify(row))
+
+
+    let treeData: any = []
+    await getDictTreeByCode({
+        name: '',
+        id: '',
+        pid: '',
+        pids: '',
+        code: 'Script_Error',
+        sort: 0
+    }).then((res: any) => {
+        treeData = res.data[0].children
+    })
+    
+    let checkDataList: any = []
+    await communicationList.forEach((item: any) => {
+        item.children.forEach((k: any) => {
+            if (k.enable != 0 || k.errorFlag != 0) {
+               
+                checkDataList.push({
+                    pid: k.pid,
+                    valueType: k.id,
+                    dataType: k.dataType,
+                    enable: k.enable,
+                    errorFlag: k.errorFlag
+                })
+            }
+        })
+    })
+
+    let form = handleHarmData(JSON.parse(JSON.stringify(row)))
+    let retryCompute = isEqual(form, copyRowList)
+
+    await scriptDtlsCheckDataList({
+        ...form,
+        scriptId: props.formContent?.id,
+        scriptType: props.activeName,
+        checkDataList: checkDataList,
+        retryCompute: retryCompute
+    }).then((res: any) => {
+        res.data.forEach((item: any) => {
+            let pList = treeData.filter((i: any) => i.id == item.pid)[0]
+            item.pname = pList.name
+            item.name = pList.children.filter((i: any) => i.id == item.valueType)[0].name
+            item.show = true
+        })
+        setValue_TableData.value = res.data
+    })
+
+
+  
     dialogVisible.value = true
 }
+
+
+
+
+// 处理多余数据
+const handleHarmData = (row: any) => {
+    row.channelList.forEach((channel: any) => {
+        // 筛选出 famp 和 fphase 不同时为 0 的对象
+        channel.harmList = channel.harmList.filter((item: any) => item.famp != 0 || item.fphase != 0)
+        channel.inharmList = channel.inharmList.filter(
+            (item: any) => item.inharm !== '' || item.famp !== 0 || item.fphase !== 0
+        )
+    })
+    return row
+}
+// 判断数据是否变化
+const isEqual = (obj1: any, obj2: any) => {
+    // 如果两个对象是同一个引用，直接返回 true
+    if (obj1 == obj2) return true
+    // 如果其中一个是 null 或者不是对象，返回 false
+    if (obj1 === null || typeof obj1 !== 'object' || obj2 === null || typeof obj2 !== 'object') {
+        return false
+    }
+    // 获取两个对象的键
+    const keys1 = Object.keys(obj1)
+    const keys2 = Object.keys(obj2)
+    // 如果键的数量不同，返回 false
+    if (keys1.length !== keys2.length) return false
+    // 遍历所有键，递归比较值
+    for (const key of keys1) {
+        if (!keys2.includes(key) || !isEqual(obj1[key], obj2[key])) {
+            return false
+        }
+    }
+
+    return true
+}
+
+
 defineExpose({ open })
 </script>
 <style lang="scss" scoped>