|
@@ -88,14 +88,14 @@
|
|
|
</HcDialog>
|
|
|
|
|
|
<!--插入设计值/频率-->
|
|
|
- <HcDialog :show="IDVFModal" title="插入设计值/频率" widths="600px" saveText="确认插入" @close="IDVFModal = false" @save="IDVFModal = false">
|
|
|
+ <HcDialog :show="IDVFModal" title="插入设计值/频率" widths="600px" saveText="确认插入" @close="IDVFModal = false" @save="IDVFModalSaveClick">
|
|
|
<el-alert title="填写完设计值和频率,系统自动计算实测值" type="warning" :closable="false"/>
|
|
|
<el-form ref="formIDVFRef" :model="formIDVFModel" :rules="formIDVFRules" label-width="auto" size="large">
|
|
|
- <el-form-item label="设计值" prop="designValue">
|
|
|
- <el-input v-model="formIDVFModel.designValue" placeholder="请输入设计值"/>
|
|
|
+ <el-form-item label="设计值" prop="design">
|
|
|
+ <el-input v-model="formIDVFModel.design" placeholder="请输入设计值"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="频率" prop="frequency">
|
|
|
- <el-input v-model="formIDVFModel.frequency" placeholder="请输入频率"/>
|
|
|
+ <el-form-item label="频率" prop="size">
|
|
|
+ <el-input v-model="formIDVFModel.size" placeholder="请输入频率"/>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</HcDialog>
|
|
@@ -197,6 +197,7 @@ const setFormDataNum = (datas) => {
|
|
|
|
|
|
//展开事件
|
|
|
const ActiveKey = ref('')
|
|
|
+const formKeyIds = ref('')
|
|
|
const CollapseChange = (name) => {
|
|
|
ActiveKey.value = name
|
|
|
const names = name ? name.split('-') : []
|
|
@@ -204,6 +205,7 @@ const CollapseChange = (name) => {
|
|
|
getOffsetTop(name)
|
|
|
const index = names[1]
|
|
|
const item = listDatas.value[index]
|
|
|
+ formKeyIds.value = item.pkeyId ? item.pkeyId + '' : ''
|
|
|
if (!item.isTableFormRender) {
|
|
|
//渲染表单
|
|
|
getExcelHtml(item,index)
|
|
@@ -212,6 +214,7 @@ const CollapseChange = (name) => {
|
|
|
}
|
|
|
} else {
|
|
|
getOffsetTop()
|
|
|
+ formKeyIds.value = ''
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -459,7 +462,7 @@ const onRightClick = (event, KeyName, index) => {
|
|
|
const startPos = specialDom?.selectionStart || 0
|
|
|
const endPos = specialDom?.selectionEnd || 0
|
|
|
//存储临时信息
|
|
|
- tableFormItemNode.value = {KeyName, index, startPos, endPos}
|
|
|
+ tableFormItemNode.value = {KeyName, index, startPos, endPos, pkeyId: formKeyIds.value}
|
|
|
contextMenuRef.value?.showMenu(event) //展开菜单
|
|
|
}
|
|
|
|
|
@@ -477,14 +480,14 @@ const handleMenuSelect = ({key}) => {
|
|
|
//插入设计值
|
|
|
const IDVFModal = ref(false)
|
|
|
const formIDVFRef = ref(null)
|
|
|
-const formIDVFModel = ref({designValue: '', frequency: ''})
|
|
|
+const formIDVFModel = ref({design: '', size: '', dev: '', key: '', pkId: ''})
|
|
|
const formIDVFRules = {
|
|
|
- designValue: {
|
|
|
+ design: {
|
|
|
required: true,
|
|
|
trigger: "blur",
|
|
|
message: "请输入设计值"
|
|
|
},
|
|
|
- frequency: {
|
|
|
+ size: {
|
|
|
required: true,
|
|
|
trigger: "blur",
|
|
|
message: "请输入频率"
|
|
@@ -561,6 +564,22 @@ const specialNodeClick = async () => {
|
|
|
//关联试验数据
|
|
|
const CTDModal = ref(false)
|
|
|
|
|
|
+//设计值频率计算
|
|
|
+const IDVFModalSaveClick = async () => {
|
|
|
+ const {pkeyId, KeyName} = tableFormItemNode.value
|
|
|
+ if (pkeyId) {
|
|
|
+ const {data} = await wbsApi.queryFormulaRange({
|
|
|
+ ...formIDVFModel.value,
|
|
|
+ dev: '±5',
|
|
|
+ key: KeyName,
|
|
|
+ pkId: pkeyId
|
|
|
+ })
|
|
|
+ console.log(data)
|
|
|
+ } else {
|
|
|
+ window?.$message?.warning('pkeyId为空')
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
//事件
|
|
|
const emit = defineEmits(['renew','offsetTop'])
|
|
|
|