源参数

frontend/src/utils/dict.ts

@@ -19,6 +19,6 @@ export const userStatus = [
 export const resourceType = [
   { label: "菜单", value: 0 },
   { label: "按钮", value: 1 },
-  { label: "公共资源", value: 2 }
+  { label: "公共资源", value: 2 },
   { label: "服务间调用资源", value: 3 }
 ];

frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue

@@ -14,7 +14,7 @@
                     <el-table-column prop="type" label="电能质量检测指标类型" width="181">
                         <template #default="{ row }">
                             <el-select v-model="row.type" placeholder="选择指标类型" >
-                                <el-option v-for="item in dictStore.getDictData('Error_Value_Type')"
+                                <el-option v-for="item in dictStore.getDictData('Pq_Test_Type')"
                                 :key="item.id"
                                 :label="item.name"
                                 :value="item.id"/>

frontend/src/views/machine/testSource/components/parameterPopup.vue

@@ -1,11 +1,156 @@
 <template>
+  <el-dialog v-model="dialogVisible" :title="dialogTitle"
+             v-bind="dialogSmall" @close="close">
     <div>
-
+      <el-form :model="formContent" ref="dialogFormRef" :rules="rules">
+        <el-form-item label="参数所属" prop="pId" :label-width="100">
+          <el-tree-select
+              v-model="displayPid"
+              :data="tableData"
+              check-strictly
+              :render-after-expand="false"
+              show-checkbox
+              check-on-click-node
+              node-key="id"
+              :props="defaultProps"
+          />
+        </el-form-item>
+        <el-form-item label="源参数描述" :label-width="100" prop="sourceParamDesc">
+          <el-input v-model="formContent.sourceParamDesc" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="源参数类型" :label-width="100" prop="sourceParamType">
+          <el-input v-model="formContent.sourceParamType" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item v-show="displayPid && displayPid!== '0'" label="源参数值" :label-width="100"
+                      prop="sourceParamValue">
+          <el-input v-model="formContent.sourceParamValue" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="排序" :label-width="100">
+          <el-input-number v-model="formContent.sort" :min='1' :max='999'/>
+        </el-form-item>
+      </el-form>
     </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="close()">取消</el-button>
+        <el-button type="primary" @click="save()">
+          保存
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
+import {defineEmits, reactive, watch} from 'vue'
+import {dialogSmall} from "@/utils/elementBind"
+import {TestSource} from "@/api/device/interface/testSource"
+import {ElMessage, FormItemRule} from "element-plus"
 
+defineProps<{
+  tableData: TestSource.ParameterType[]
+}>()
+
+const emit = defineEmits(['get-parameter'])
+
+// 计算属性，用于控制显示的 pid
+const displayPid = computed({
+  get: () => {
+    return formContent.pId === '0' ? '' : formContent.pId;
+  },
+  set: (value) => {
+    formContent.pId = value;
+  }
+});
+
+// 树形节点配置
+const defaultProps = {
+  children: 'children',
+  label: 'sourceParamDesc',
+  value: 'id'
+};
+
+const dialogFormRef = ref()
+const {dialogVisible, titleType, formContent} = useMetaInfo()
+
+function useMetaInfo() {
+  const dialogVisible = ref(false)
+  const titleType = ref('add')
+
+  const formContent = reactive<TestSource.ParameterType>({
+    id: "",
+    sourceParamType: "",
+    sourceParamDesc: "",
+    sourceParamValue: "",
+    sort: 100,
+    pId: "0",
+  })
+
+  return {dialogVisible, titleType, formContent}
+}
+
+const rules: reactive<Record<string, Array<FormItemRule>>> = reactive({
+  sourceParamDesc: [{required: true, message: '源参数描述必填！', trigger: 'blur'}],
+  sourceParamType: [{required: true, message: '源参数类型必填！', trigger: 'blur'}],
+  sort: [{required: true, message: '排序必填！', trigger: 'blur'}]
+})
+
+watch(() => formContent.pId, (newVal, oldVal) => {
+  if (newVal !== '0') {
+    rules.sourceParamValue = [{required: true, message: '源参数值必填！', trigger: 'blur'}]
+  } else {
+    rules.sourceParamValue = []
+  }
+})
+
+let dialogTitle = computed(() => {
+  return titleType.value === 'add' ? '新增源参数' : '编辑源参数'
+})
+
+const resetFormContent = () => {
+  Object.assign(formContent, {
+    id: "",
+    sourceParamType: "",
+    sourceParamDesc: "",
+    sourceParamValue: "",
+    sort: 100,
+    pId: "0",
+  })
+}
+const open = (sign: string, data: TestSource.ParameterType) => {
+  // 重置表单
+  dialogFormRef.value?.resetFields()
+  resetFormContent()
+
+  titleType.value = sign
+  dialogVisible.value = true
+  if (data.id) {
+    Object.assign(formContent, data)
+  }
+}
+
+const save = () => {
+  try {
+    dialogFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        let newUpdateParameter = toRaw({...formContent})
+        delete newUpdateParameter.children
+        emit('get-parameter', newUpdateParameter)
+        ElMessage.success({message: `${dialogTitle.value}成功！`})
+        close()
+      }
+    })
+  } catch (err) {
+    console.error('验证过程中出现错误', err)
+  }
+}
+const close = () => {
+  dialogVisible.value = false
+  resetFormContent()
+  dialogFormRef.value?.resetFields()
+}
+
+defineExpose({open})
 </script>
 
 <style scoped>

frontend/src/views/machine/testSource/components/parameterTable.vue

@@ -10,7 +10,8 @@
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
-        <el-button v-auth.testSource="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
+        <el-button v-auth.testSource="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增
+        </el-button>
         <el-button v-auth.testSource="'batchDelete'" type='danger' :icon='Delete'
                    plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
           批量删除
@@ -18,61 +19,61 @@
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
-        <el-button type="primary" link :icon='CopyDocument' @click="copyRow(row)">复制</el-button>
+        <el-button type="primary" link :icon='CopyDocument' @click="copyRow(scope.row)">复制</el-button>
         <el-button type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
-        <el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
+        <el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row.id)'>删除</el-button>
       </template>
     </ProTable>
 
   </div>
-  <ParameterPopup :refresh-table='getTableList' ref='parameterPopup' />
+  <ParameterPopup @getParameter="getParameter" ref='parameterPopup' :tableData="tableData"/>
 </template>
 
-  <script setup lang='tsx' name='useRole'>
+<script setup lang='tsx' name='useRole'>
-  import { type TestSource } from '@/api/device/interface/testSource'
+import {type TestSource} from '@/api/device/interface/testSource'
-  import { useHandleData } from '@/hooks/useHandleData'
+import ProTable from '@/components/ProTable/index.vue'
-  import ProTable from '@/components/ProTable/index.vue'
+import type {ColumnProps, ProTableInstance} from '@/components/ProTable/interface'
-  import type{  ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+import {CirclePlus, CopyDocument, Delete, EditPen} from '@element-plus/icons-vue'
-  import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh,CopyDocument } from '@element-plus/icons-vue'
+import {useDictStore} from '@/stores/modules/dict'
-  import { useDictStore } from '@/stores/modules/dict'
+import ParameterPopup from '@/views/machine/testSource/components/parameterPopup.vue';
-  import ParameterPopup from '@/views/machine/testSource/components/parameterPopup.vue';
+import {reactive, ref, watch} from 'vue'
-  import { onMounted, reactive, ref, watch } from 'vue'
+import {generateUUID} from "@/styles";
-  import {map} from "lodash";
+import {defineEmits} from "vue/dist/vue";
-  const parameterPopup = ref()
+
-  const dictStore = useDictStore()
+const parameterPopup = ref()
-  // ProTable 实例
+const dictStore = useDictStore()
-  const proTable = ref<ProTableInstance>()
+// ProTable 实例
-  const tableData = ref<any[]>([])
+const proTable = ref<ProTableInstance>()
-  const props = defineProps<{
+const tableData = ref<any[]>([])
+const props = defineProps<{
   parameterStr: string;
 }>();
 
-  let originalParameterArr: TestSource.ParameterType[] = []
+const emit = defineEmits(['change-parameter'])
-  onMounted(() => {
+
-    getTableList();
+let originalParameterArr=reactive<TestSource.ParameterType[]>([])
-})
 
 watch(() => props.parameterStr, (newData) => {
   if (newData) {
-    getTableList();
+    getTableList()
   }
 })
 
-  const getTableList = () => {
+const getTableList = () => {
   if (props.parameterStr) {
-      originalParameterArr =JSON.parse(props.parameterStr)
+    originalParameterArr = JSON.parse(props.parameterStr)
     tableData.value = getTreeData(originalParameterArr)
   }
 };
 
 
-  const getTreeData = (data: TestSource.ParameterType[]): TestSource.ParameterType[] => {
+const getTreeData = (data: TestSource.ParameterType[]): TestSource.ParameterType[] => {
   const result: TestSource.ParameterType[] = []// 最终返回的树形结构数据
   //不能修改原数组，所以需要深拷贝
   const copyData = JSON.parse(JSON.stringify(data))
   const map = new Map<string, TestSource.ParameterType>();
   copyData.forEach(item => {
-      map.set(item.id, item);
+    map.set(item.id, item)
   });
   for (const item of copyData) {
     let parent = map.get(item.pId);
@@ -81,16 +82,30 @@ watch(() => props.parameterStr, (newData) => {
         parent.children = [];
       }
       parent.children.push(item);
+      parent.children.sort((a, b) => {
+        if (a.sort && b.sort) {
+          return a.sort - b.sort
         } else {
-        result.push(item);
+          return 0
+        }
+      })
+    } else {
+      result.push(item)
+      result.sort((a, b) => {
+        if (a.sort && b.sort) {
+          return a.sort - b.sort
+        } else {
+          return 0
+        }
+      })
     }
   }
-    return result;
+  return result
-  }
+}
 
 const columns = reactive<ColumnProps<any>[]>([
-  { type: 'selection', fixed: 'left', width: 70 },
+  {type: 'selection', fixed: 'left', width: 70},
-  { type: 'index', fixed: 'left', width: 70, label: '序号' },
+  {type: 'index', fixed: 'left', width: 70, label: '序号'},
   {
     prop: 'sourceParamType',
     label: '参数类型',
@@ -102,47 +117,88 @@ const columns = reactive<ColumnProps<any>[]>([
     minWidth: 220,
   },
   {
-    prop: 'value',
+    prop: 'sourceParamValue',
     label: '值',
     minWidth: 150,
   },
-  { prop: 'operation', label: '操作', fixed: 'right', width: 250 },
+  {prop: 'operation', label: '操作', fixed: 'right', width: 250},
 ])
 
 
 // 打开 drawer(新增、编辑)
-const openDialog = (titleType: string, row: Partial<TestSource.ResTestSource> = {}) => {
+const openDialog = (titleType: string, row: Partial<TestSource.ParameterType> = {}) => {
-    parameterPopup.value?.open(titleType)
+  parameterPopup.value?.open(titleType, row)
 }
 
 
-// 批量删除设备
+// 批量删除源参数
-const batchDelete = async (id: string[]) => {
+const batchDelete = async (ids: string[]) => {
-  
-  proTable.value?.clearSelection()
-  proTable.value?.getTableList()
-}
-
-// 删除设备
-const handleDelete = async (params: TestSource.ResTestSource) => {
   let parentIds = originalParameterArr.map(item => item.pId)
-    if (parentIds.includes(params.id)) {
+  if (parentIds.some(item => ids.includes(item))) {
     ElMessage.error('不能删除父节点');
     return;
   }
-  originalParameterArr = originalParameterArr.filter(item => item.id !== params.id);
+  for (const id of ids) {
-  tableData.value = getTreeData(originalParameterArr)
+    handleDelete(id)
-
+  }
+  proTable.value?.clearSelection()
 }
-  const copyRow = (row) => {
+
-    let parentIds = originalParameterArr.map(item => item.pId)
+// 删除源参数
-    // if (parentIds.includes(row.id)) {
+const handleDelete = (id: string) => {
-    //   originalParameterArr.push({
+  let parentIds = originalParameterArr.map(item => item.pId)
-    //
+  if (parentIds.includes(id)) {
-    //   })
+    ElMessage.error('不能删除父节点');
-    // } else {
+    return;
-    //
+  }
-    // }
+  originalParameterArr = originalParameterArr.filter(item => item.id !== id);
-  };
+  emit('change-parameter', originalParameterArr)
-  </script>
+  tableData.value = getTreeData(originalParameterArr)
+}
+// 复制源参数
+const copyRow = (row) => {
+  delete row.children
+  let parentIds = originalParameterArr.map(item => item.pId)
+
+  if (parentIds.includes(row.id)) {
+    let newParameterId = generateUUID()
+    let children = originalParameterArr.filter(item => item.pId == row.id).map(item => ({
+      ...item,
+      id: generateUUID(),
+      pId: newParameterId
+    }))
+    originalParameterArr.push({...row, id: newParameterId})
+    originalParameterArr.push(...children)
+  } else {
+    originalParameterArr.push({...row, id: generateUUID(), pId: row.pId})
+  }
+  emit('change-parameter', originalParameterArr)
+  tableData.value = getTreeData(originalParameterArr)
+}
+
+const getParameter = (data: TestSource.ParameterType) => {
+  let index = originalParameterArr.findIndex(item => item.id === data.id)
+  if (index === -1) {
+    data.id = generateUUID()
+    // 新增
+    originalParameterArr.push(data)
+  } else {
+    // 编辑
+    originalParameterArr[index] = data
+  }
+  emit('change-parameter', originalParameterArr)
+  tableData.value = getTreeData(originalParameterArr)
+}
+
+//清空数据
+const clearData = () => {
+  console.log('clearData')
+  originalParameterArr = []
+  tableData.value = []
+}
+
+defineExpose({
+  clearData
+})
+</script>
   

frontend/src/views/machine/testSource/components/testSourcePopup.vue

@@ -2,7 +2,7 @@
   <el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
     <div class="form-grid">
       <el-form :model="formContent" ref='dialogFormRef' :rules='rules'>
-                <el-row  :gutter="24" >
+        <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="检测源名称" prop="name" :label-width="100">
               <el-input v-model='formContent.name' placeholder="检测源类型+设备类型简称+数字"/>
@@ -12,7 +12,7 @@
             <el-form-item label="设备类型" prop="devType" :label-width="100">
               <el-select v-model='formContent.devType' placeholder="请选择设备类型">
                 <el-option
-                                                v-for="item in dictStore.getDictData('PqSource_Dev_Type')"
+                    v-for="item in dictStore.getDictData(dictTypeCode)"
                     :key="item.id"
                     :label="item.name"
                     :value="item.id"
@@ -36,9 +36,9 @@
       </el-form>
     </div>
 
-        <ParameterTable :parameterStr="formContent.parameter"/>
+    <ParameterTable :parameterStr="formContent.parameter" @change-parameter="changeParameter" ref="parameterTable"/>
     <template #footer>
-            <div >
+      <div>
         <el-button @click='close()'>取 消</el-button>
         <el-button type="primary" @click='save()'>保存</el-button>
       </div>
@@ -48,97 +48,99 @@
 
 </template>
 
-  <script lang="ts" setup name="ErrorSystemDialog">
+<script lang="ts" setup name="ErrorSystemDialog">
-  import{ElMessage, type FormInstance,type FormItemRule}from'element-plus'
+import {ElMessage, type FormItemRule} from 'element-plus'
-  import { defineProps, defineEmits, reactive,watch,ref, Ref, computed } from 'vue';
+import {computed, defineProps, Ref, ref} from 'vue';
-  import { dialogBig} from '@/utils/elementBind'
+import {dialogBig} from '@/utils/elementBind'
-  import { addTestSource,updateTestSource,getTestSourceById} from '@/api/device/testSource/index'
+import {addTestSource, getTestSourceById, updateTestSource} from '@/api/device/testSource/index'
-  import {CirclePlus, Delete, EditPen,FolderOpened,CopyDocument} from '@element-plus/icons-vue'
+import {useDictStore} from '@/stores/modules/dict'
-  import { useDictStore } from '@/stores/modules/dict'
+import {type TestSource} from '@/api/device/interface/testSource';
-  import { type TestSource } from '@/api/device/interface/testSource';
+// 定义弹出组件元信息
-  import ParameterTable from '@/views/machine/testSource/components/parameterTable.vue';
+const dialogFormRef = ref()
-  // 定义弹出组件元信息
+const dictStore = useDictStore()
-  const dialogFormRef = ref()
+const mode = ref()
-  const dictStore = useDictStore()
+const modeId = ref()
-  const mode = ref()
+const parameterTable = ref()
-  const modeId = ref()
 
 
-  function useMetaInfo() {
+function useMetaInfo() {
   const dialogVisible = ref(false)
   const titleType = ref('add')
   const formContent = ref<TestSource.ResTestSource>({
     id: '',
     name: '',
     pattern: modeId.value,
-        parameter:'',
+    parameter: '',
     type: '',
     devType: '',
-        state:1,
+    state: 1,
   })
-    return { dialogVisible, titleType, formContent }
+  return {dialogVisible, titleType, formContent}
-  }
+}
 
-  const { dialogVisible, titleType, formContent } = useMetaInfo()
+const {dialogVisible, titleType, formContent} = useMetaInfo()
-  // 清空formContent
+// 清空formContent
-  const resetFormContent = () => {
+const resetFormContent = () => {
   formContent.value = {
     id: '',
     name: '',
     pattern: modeId.value,
-        parameter:'',
+    parameter: '',
     type: '',
     devType: '',
-        state:1,
+    state: 1,
-    }
   }
+}
 
-  let dialogTitle = computed(() => {
+let dialogTitle = computed(() => {
   return titleType.value === 'add' ? '新增检测源' : '编辑检测源'
-  })
+})
 
-    // 定义规则
+let dictTypeCode = computed(() => {
-    const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+  return 'S_Dev_Type_' + dictStore.getDictData('Pattern').find(item => item.id === modeId.value)?.code
-    name: [{ required: true, message: '检测源名称必填！', trigger: 'blur' }],
+})
-    devType:[{ required: true, message: '请选择一项设备类型', trigger: 'change' },],
+// 定义规则
-    type:[{ required: true, message: '请选择一项检测源类型', trigger: 'change '},]
+const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+  name: [{required: true, message: '检测源名称必填！', trigger: 'blur'}],
+  devType: [{required: true, message: '请选择一项设备类型', trigger: 'change'},],
+  type: [{required: true, message: '请选择一项检测源类型', trigger: 'change '},]
 });
 
 
-    // 关闭弹窗
+// 关闭弹窗
-    const close = () => {
+const close = () => {
   dialogVisible.value = false
   // 清空dialogForm中的值
   resetFormContent()
   // 重置表单
   dialogFormRef.value?.resetFields()
-    }
+  parameterTable.value?.clearData()
+}
 
-    // 保存数据
+// 保存数据
-    const save = () => {
+const save = () => {
   try {
     dialogFormRef.value?.validate(async (valid: boolean) => {
       if (valid) {
         if (formContent.value.id) {
           await updateTestSource(formContent.value);
-                    ElMessage.success({ message: `${dialogTitle.value}成功！` })
+          ElMessage.success({message: `${dialogTitle.value}成功！`})
         } else {
           await addTestSource(formContent.value);
-                    ElMessage.success({ message: `${dialogTitle.value}成功！` })    
+          ElMessage.success({message: `${dialogTitle.value}成功！`})
         }
         close()
         // 刷新表格
         await props.refreshTable!()
-
       }
     })
   } catch (err) {
     console.error('验证过程中出现错误', err)
   }
-    }
+}
 
 // 打开弹窗，可能是新增，也可能是编辑
-const open = async (sign: string, data: TestSource.ResTestSource,currentMode: string) => {
+const open = async (sign: string, data: TestSource.ResTestSource, currentMode: string) => {
   titleType.value = sign
   dialogVisible.value = true
   mode.value = currentMode
@@ -155,9 +157,12 @@ const open = async (sign: string, data: TestSource.ResTestSource,currentMode: st
   dialogFormRef.value?.resetFields()
 }
 
+const changeParameter = (parameterArr) => {
+  formContent.value.parameter = JSON.stringify(parameterArr)
+}
 
 // 对外映射
-defineExpose({ open })
+defineExpose({open})
 const props = defineProps<{
   refreshTable: (() => Promise<void>) | undefined;
 }>()

frontend/src/views/machine/testSource/index.vue

@@ -68,7 +68,7 @@
     {
       prop: 'devType',
       label: '设备类型',
-      enum: dictStore.getDictData('PqSource_Dev_Type'),
+      enum: dictStore.getDictData('S_Dev_Type_'+dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.code),
       fieldNames: { label: 'name', value: 'id' },
       search: { el: 'select' },
       minWidth: 220,