This commit is contained in:
caozehui
2024-12-05 13:43:05 +08:00
parent 7d5d128b54
commit 1b171d4b8d
4 changed files with 11 additions and 6 deletions

View File

@@ -67,7 +67,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
{ type: 'index', fixed: 'left', width: 70, label: '序号' },
{
prop: 'name',
label: '设备名称',
label: '名称',
search: { el: 'input' },
minWidth: 200,
},

View File

@@ -48,7 +48,7 @@ const columns = ref<ColumnProps<ErrorSystem.ErrorSystemList>[]>([
{ type: 'index', fixed: 'left', width: 70, label: '序号' },
{
prop: 'name',
label: '误差体系名称',
label: '名称',
},
{
prop: 'standardName',

View File

@@ -83,8 +83,8 @@ function useMetaInfo() {
const formContent = reactive<TestSource.ParameterType>({
id: "",
sourceParamType: "",
sourceParamDesc: "",
sourceParamValue: "",
sourceParamDesc: "",
sort: 100,
pId: "0",
})
@@ -115,8 +115,8 @@ const resetFormContent = () => {
Object.assign(formContent, {
id: "",
sourceParamType: "",
sourceParamDesc: "",
sourceParamValue: "",
sourceParamDesc: "",
sort: 100,
pId: "0",
})
@@ -140,7 +140,6 @@ const save = () => {
let newUpdateParameter = toRaw({...formContent})
delete newUpdateParameter.children
emit('get-parameter', newUpdateParameter)
ElMessage.success({message: `${dialogTitle.value}成功!`})
close()
}
})

View File

@@ -40,6 +40,7 @@ import ParameterPopup from '@/views/machine/testSource/components/parameterPopup
import {reactive, ref, watch} from 'vue'
import {generateUUID} from "@/styles";
import {defineEmits} from "vue/dist/vue";
import {ElMessage} from "element-plus";
const parameterPopup = ref()
const dictStore = useDictStore()
@@ -178,14 +179,20 @@ const copyRow = (row) => {
}
const getParameter = (data: TestSource.ParameterType) => {
if (originalParameterArr.some(item => item.sourceParamType == data.sourceParamType)) {
ElMessage.error({message: '参数类型已存在!'})
return;
}
let index = originalParameterArr.findIndex(item => item.id === data.id)
if (index === -1) {
data.id = generateUUID()
// 新增
originalParameterArr.push(data)
ElMessage.success({message: '新增成功!'})
} else {
// 编辑
originalParameterArr[index] = data
ElMessage.success({message: '编辑成功!'})
}
emit('change-parameter', originalParameterArr)
tableData.value = getTreeData(originalParameterArr)
@@ -193,7 +200,6 @@ const getParameter = (data: TestSource.ParameterType) => {
//清空数据
const clearData = () => {
console.log('clearData')
originalParameterArr = []
tableData.value = []
}