修改测试bug
This commit is contained in:
@@ -73,7 +73,7 @@
|
||||
<el-form-item id="id300" class="form-item" label="工程名称:"
|
||||
v-if="nodeLevel > 0 || pageStatus == 2" prop="engineeringParam.name"
|
||||
:rules="{ required: true, message: '请输入工程名称', trigger: 'blur' }">
|
||||
<el-input clearable v-model="formData.engineeringParam.name" placeholder="请输入工程名称"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="formData.engineeringParam.name" placeholder="请输入工程名称"
|
||||
:disabled="!((nodeLevel == 1 && pageStatus == 3) || (nodeLevel == 0 && pageStatus == 2))
|
||||
"></el-input>
|
||||
</el-form-item>
|
||||
@@ -100,14 +100,14 @@
|
||||
|
||||
<el-form-item class="form-item" label="描述:" prop="engineeringParam.description"
|
||||
v-if="nodeLevel > 0 || pageStatus == 2">
|
||||
<el-input clearable v-model="formData.engineeringParam.description" placeholder="请输入描述"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="formData.engineeringParam.description" placeholder="请输入描述"
|
||||
:disabled="!((nodeLevel == 1 && pageStatus == 3) || (nodeLevel == 0 && pageStatus == 2))
|
||||
"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="form-item" label="排序:" prop="engineeringParam.sort"
|
||||
v-if="nodeLevel > 0 || pageStatus == 2"
|
||||
:rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]">
|
||||
<el-input clearable v-model.trim.number="formData.engineeringParam.sort"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model.trim.number="formData.engineeringParam.sort"
|
||||
placeholder="请输入排序" :disabled="!((nodeLevel == 1 && pageStatus == 3) || (nodeLevel == 0 && pageStatus == 2))
|
||||
"></el-input>
|
||||
</el-form-item>
|
||||
@@ -124,7 +124,7 @@
|
||||
:prop="'projectInfoList[' + index + '].name'" :rules="[
|
||||
{ required: true, message: '请输入项目名称', trigger: 'blur' }
|
||||
]">
|
||||
<el-input clearable v-model="item.name" placeholder="请输入项目名称" :disabled="!(
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="item.name" placeholder="请输入项目名称" :disabled="!(
|
||||
(nodeLevel == 2 && pageStatus == 3) ||
|
||||
((nodeLevel == 1 || (nodeLevel == 0 && pageStatus == 2)) &&
|
||||
pageStatus == 2)
|
||||
@@ -134,7 +134,7 @@
|
||||
<el-form-item class="form-item" label="地址:"
|
||||
:prop="'projectInfoList[' + index + '].area'"
|
||||
:rules="[{ required: true, message: '请输入地址', trigger: 'blur' }]">
|
||||
<el-input clearable v-model="item.area" placeholder="请输入地址" :disabled="!(
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="item.area" placeholder="请输入地址" :disabled="!(
|
||||
(nodeLevel == 2 && pageStatus == 3) ||
|
||||
((nodeLevel == 1 || (nodeLevel == 0 && pageStatus == 2)) &&
|
||||
pageStatus == 2)
|
||||
@@ -144,7 +144,7 @@
|
||||
<el-form-item class="form-item" label="描述:"
|
||||
:prop="'projectInfoList[' + index + '].description'"
|
||||
:rules="[{ required: true, message: '请输入描述', trigger: 'blur' }]">
|
||||
<el-input clearable v-model="item.description" placeholder="请输入描述"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="item.description" placeholder="请输入描述"
|
||||
:disabled="!(
|
||||
(nodeLevel == 2 && pageStatus == 3) ||
|
||||
((nodeLevel == 1 || (nodeLevel == 0 && pageStatus == 2)) &&
|
||||
@@ -178,7 +178,7 @@
|
||||
<el-form-item class="form-item" label="排序:"
|
||||
:prop="'projectInfoList[' + index + '].sort'"
|
||||
:rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]">
|
||||
<el-input clearable v-model.trim.number="item.sort" placeholder="请输入排序"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model.trim.number="item.sort" placeholder="请输入排序"
|
||||
:disabled="!(
|
||||
(nodeLevel == 2 && pageStatus == 3) ||
|
||||
((nodeLevel == 1 || (nodeLevel == 0 && pageStatus == 2)) &&
|
||||
@@ -206,7 +206,7 @@
|
||||
:prop="'deviceInfoList[' + bIndex + '].name'" :rules="[
|
||||
{ required: true, message: '请输入设备名称', trigger: 'blur' }
|
||||
]">
|
||||
<el-input clearable v-model="busItem.name" placeholder="请输入设备名称"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="busItem.name" placeholder="请输入设备名称"
|
||||
:disabled="!(
|
||||
(nodeLevel == 3 && pageStatus == 3) ||
|
||||
((nodeLevel == 2 || (nodeLevel == 1 && pageStatus == 2)) &&
|
||||
@@ -225,9 +225,10 @@
|
||||
pageStatus == 2)
|
||||
)
|
||||
" @change="busItem.devModel = ''">
|
||||
<el-option v-for="item in formDevTypeOptions" :key="item.value"
|
||||
:label="item.label || item.name"
|
||||
:value="item.value || item.id"></el-option>
|
||||
|
||||
<el-option v-for="item in formDevTypeOptions" :key="item.id"
|
||||
:label=" item.name"
|
||||
:value=" item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item id="id200" class="form-item" label="设备型号:"
|
||||
@@ -258,7 +259,7 @@
|
||||
pageStatus == 2)
|
||||
)
|
||||
">
|
||||
<el-option label="CLD" value="CLD"></el-option>
|
||||
<el-option label="1056协议" value="CLD"></el-option>
|
||||
<!-- <el-option label="MQTT" value="MQTT"></el-option> -->
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -289,7 +290,7 @@
|
||||
|
||||
<el-form-item class="form-item" label="合同号:"
|
||||
:prop="'deviceInfoList[' + bIndex + '].cntractNo'">
|
||||
<el-input clearable v-model="busItem.cntractNo" placeholder="请输入合同号"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="busItem.cntractNo" placeholder="请输入合同号"
|
||||
:disabled="!(
|
||||
(nodeLevel == 3 && pageStatus == 3) ||
|
||||
((nodeLevel == 2 || (nodeLevel == 1 && pageStatus == 2)) &&
|
||||
@@ -310,7 +311,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item v-if="busItem.devAccessMethod == 'CLD'" class="form-item"
|
||||
label="进程号:" :prop="'deviceInfoList[' + bIndex + '].nodeProcess'">
|
||||
<el-input clearable v-model="busItem.nodeProcess" placeholder="自动分配"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="busItem.nodeProcess" placeholder="自动分配"
|
||||
:disabled="true"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="busItem.devAccessMethod == 'CLD'" class="form-item"
|
||||
@@ -370,7 +371,7 @@
|
||||
<el-form-item class="form-item" label="排序:"
|
||||
:prop="'deviceInfoList[' + bIndex + '].sort'"
|
||||
:rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]">
|
||||
<el-input clearable v-model.trim.number="busItem.sort"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model.trim.number="busItem.sort"
|
||||
placeholder="请输入排序" :disabled="!(
|
||||
(nodeLevel == 3 && pageStatus == 3) ||
|
||||
((nodeLevel == 2 || (nodeLevel == 1 && pageStatus == 2)) &&
|
||||
@@ -400,7 +401,7 @@
|
||||
message: '请输入监测点名称',
|
||||
trigger: 'blur'
|
||||
}">
|
||||
<el-input clearable v-model="lineItem.name" placeholder="请输入监测点名称"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="lineItem.name" placeholder="请输入监测点名称"
|
||||
:disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
((nodeLevel == 3 || (nodeLevel == 2 && pageStatus == 2)) &&
|
||||
@@ -465,7 +466,7 @@
|
||||
:prop="'lineInfoList[' + lIndex + '].ptRatio'"
|
||||
:rules="{ required: true, message: '请输入pt', trigger: 'blur' }">
|
||||
<div style="width: 100%; display: flex; justify-content: space-between">
|
||||
<el-input clearable-number :controls="false" :min="1"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="1"
|
||||
style="width: 48%" oninput="value=value.replace(/[^\d]/g,'')"
|
||||
v-model.number="lineItem.ptRatio" :disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
@@ -481,7 +482,7 @@
|
||||
">
|
||||
:
|
||||
</span>
|
||||
<el-input clearable-number :controls="false" :min="1"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="1"
|
||||
style="width: 48%" oninput="value=value.replace(/[^\d]/g,'')"
|
||||
v-model.number="lineItem.pt2Ratio" :disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
@@ -496,7 +497,7 @@
|
||||
:prop="'lineInfoList[' + lIndex + '].ctRatio'"
|
||||
:rules="{ required: true, message: '请输入ct', trigger: 'blur' }">
|
||||
<div style="width: 100%; display: flex; justify-content: space-between">
|
||||
<el-input clearable-number :controls="false" :min="1"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="1"
|
||||
style="width: 48%" oninput="value=value.replace(/[^\d]/g,'')"
|
||||
v-model.number="lineItem.ctRatio" :disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
@@ -512,7 +513,7 @@
|
||||
">
|
||||
:
|
||||
</span>
|
||||
<el-input clearable-number :controls="false" :min="1"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="1"
|
||||
style="width: 48%" oninput="value=value.replace(/[^\d]/g,'')"
|
||||
v-model.number="lineItem.ct2Ratio" :disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
@@ -544,7 +545,7 @@
|
||||
<el-form-item class="form-item" label="基准容量(MVA):"
|
||||
:prop="'lineInfoList[' + lIndex + '].basicCapacity'"
|
||||
:rules="{ required: true, message: '请输入基准容量', trigger: 'blur' }">
|
||||
<el-input clearable-number :controls="false" :min="0"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="0"
|
||||
style="width: 100%" v-model="lineItem.basicCapacity" :disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
((nodeLevel == 3 || (nodeLevel == 2 && pageStatus == 2)) &&
|
||||
@@ -555,7 +556,7 @@
|
||||
<el-form-item class="form-item" label="短路容量(MVA):"
|
||||
:prop="'lineInfoList[' + lIndex + '].shortCircuitCapacity'"
|
||||
:rules="{ required: true, message: '请输入短路容量', trigger: 'blur' }">
|
||||
<el-input clearable-number :controls="false" :min="0"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="0"
|
||||
style="width: 100%" v-model="lineItem.shortCircuitCapacity"
|
||||
:disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
@@ -567,7 +568,7 @@
|
||||
<el-form-item class="form-item" label="设备容量(MVA):"
|
||||
:prop="'lineInfoList[' + lIndex + '].devCapacity'"
|
||||
:rules="{ required: true, message: '请输入设备容量', trigger: 'blur' }">
|
||||
<el-input clearable-number :controls="false" :min="0"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="0"
|
||||
style="width: 100%" v-model="lineItem.devCapacity" :disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
((nodeLevel == 3 || (nodeLevel == 2 && pageStatus == 2)) &&
|
||||
@@ -578,7 +579,7 @@
|
||||
<el-form-item class="form-item" label="协议容量(MVA):"
|
||||
:prop="'lineInfoList[' + lIndex + '].protocolCapacity'"
|
||||
:rules="{ required: true, message: '请输入协议容量', trigger: 'blur' }">
|
||||
<el-input clearable-number :controls="false" :min="0"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="0"
|
||||
style="width: 100%" v-model="lineItem.protocolCapacity" :disabled="!(
|
||||
(nodeLevel == 4 && pageStatus == 3) ||
|
||||
((nodeLevel == 3 || (nodeLevel == 2 && pageStatus == 2)) &&
|
||||
@@ -699,7 +700,7 @@
|
||||
</div>
|
||||
<div class="flex mt10" v-else>
|
||||
<el-form-item class="form-item" label="监测点名称:">
|
||||
<el-input clearable v-model="lineItem.name" placeholder="请输入监测点名称"
|
||||
<el-input maxlength="32" show-word-limit clearable v-model="lineItem.name" placeholder="请输入监测点名称"
|
||||
:disabled="true"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="form-item" label="线路号:">
|
||||
@@ -725,7 +726,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item class="form-item" label="PT变比:">
|
||||
<div style="width: 100%; display: flex; justify-content: space-between">
|
||||
<el-input clearable-number :controls="false" :min="1"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="1"
|
||||
style="width: 48%" oninput="value=value.replace(/[^\d]/g,'')"
|
||||
v-model.number="lineItem.ptRatio" :disabled="true"></el-input>
|
||||
<span style="
|
||||
@@ -735,14 +736,14 @@
|
||||
">
|
||||
:
|
||||
</span>
|
||||
<el-input clearable-number :controls="false" :min="1"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="1"
|
||||
style="width: 48%" oninput="value=value.replace(/[^\d]/g,'')"
|
||||
v-model.number="lineItem.pt2Ratio" :disabled="true"></el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item class="form-item" label="CT变比:">
|
||||
<div style="width: 100%; display: flex; justify-content: space-between">
|
||||
<el-input clearable-number :controls="false" :min="1"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="1"
|
||||
style="width: 48%" oninput="value=value.replace(/[^\d]/g,'')"
|
||||
v-model.number="lineItem.ctRatio" :disabled="true"></el-input>
|
||||
<span style="
|
||||
@@ -752,7 +753,7 @@
|
||||
">
|
||||
:
|
||||
</span>
|
||||
<el-input clearable-number :controls="false" :min="1"
|
||||
<el-input maxlength="32" show-word-limit clearable-number :controls="false" :min="1"
|
||||
style="width: 48%" oninput="value=value.replace(/[^\d]/g,'')"
|
||||
v-model.number="lineItem.ct2Ratio" :disabled="true"></el-input>
|
||||
</div>
|
||||
@@ -904,7 +905,7 @@ const currentGdName: any = ref('')
|
||||
const affiliatiedFrontArr: any = ref([])
|
||||
const voltageLevelArr = dictData.getBasicData('Dev_Voltage_Stand')
|
||||
const devCLD: any = ref([])
|
||||
const devTypeOptions: any = []
|
||||
const devTypeOptions: any =ref([])
|
||||
const devTypeOptions2: any = ref([])
|
||||
const treeClickCount = ref(0)
|
||||
const areaTree: any = tree
|
||||
@@ -1059,7 +1060,7 @@ const cityOptions = computed(() => {
|
||||
})
|
||||
|
||||
const formDevTypeOptions = computed(() => {
|
||||
return devTypeOptions.value //[devTypeOptions2.value]
|
||||
return devTypeOptions.value||[] //[devTypeOptions2.value]
|
||||
})
|
||||
|
||||
// 电压等级选项,用于显示带单位的名称
|
||||
@@ -2813,8 +2814,9 @@ const area = async () => {
|
||||
})
|
||||
})
|
||||
|
||||
return queryCsDictTree(res.data.id).then(res => {
|
||||
queryCsDictTree(res.data.id).then(res => {
|
||||
devTypeOptions.value = res.data
|
||||
console.log("🚀 ~ area ~ devTypeOptions.value:", devTypeOptions.value)
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -2857,7 +2859,9 @@ area()
|
||||
.instruction {
|
||||
animation: rotating 2s linear infinite;
|
||||
}
|
||||
|
||||
:deep(.cn-tree){
|
||||
padding: 0px 10px 0 0;
|
||||
}
|
||||
@keyframes rotating {
|
||||
0% {
|
||||
transform: rotate(0deg);
|
||||
|
||||
Reference in New Issue
Block a user