diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
index 6fc7867e..7bd53f8a 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
@@ -118,6 +118,13 @@
+
+
+
+ 关联系统内电站
+ 手动输入电站
+
+
-
+
+
+
+
{
frontEndMachineList.value = res.data
})
}
+const changeSubstationFlag = () => {
+ console.log(form.value.customSubstaionFlag)
+ //处理所属变电站手都输入/下拉数据
+ if (form.value.customSubstaionFlag == '0') {
+ form.value.substationName = substationList.value.find(item => {
+ return form.value.substation == item.id
+ })?.name
+ } else {
+ form.value.substation=''
+ form.value.substationName = ''
+ form.value.substationVoltageLevel = voltageLevelList[0].id
+ }
+}
getFrontEndMachineList()
//定义所属供电公司数据
const powerCompanyList = ref([])
@@ -754,6 +777,7 @@ const resetForm = async () => {
userStatus: userStateList[1].id, //用户状态
userName: '', //工程名称
userId: '',
+ customSubstaionFlag: '0', //电站类型
acceptanceInspectionReport: [], //验收检验报告
acceptanceInspectionReportSingle: [], //验收检验报告单
deviceFilePath: [], //终端台账信息
@@ -821,6 +845,8 @@ const devReportForm = ref({
typeExperimentReport: [], //型式实验报告
//终端信息实体
supervisionTempDeviceReportParam: {
+ customSubstaionFlag: '0', //电站类型
+ substationName: '', //所属变电站名称
alarmFunction: '0', //告警功能
commissioningTime: '', //投运时间
communicationStatus: communicationStatusList[0].id, // 通讯状态
@@ -909,6 +935,13 @@ const rules = ref({
}
],
//终端信息
+ customSubstaionFlag: [
+ {
+ required: true,
+ message: '请选择电站类型',
+ trigger: 'change'
+ }
+ ],
powerCompany: [
{
required: true,
@@ -923,6 +956,13 @@ const rules = ref({
trigger: 'change'
}
],
+ substationName: [
+ {
+ required: true,
+ message: '请输入所属变电站',
+ trigger: 'blur'
+ }
+ ],
substationVoltageLevel: [
{
required: true,
@@ -1231,7 +1271,7 @@ const uploadFileName = val => {
uploadName.value = val
}
//移除文件上传
-const removeFile = (file: any,uploadFiles:any) => {
+const removeFile = (file: any, uploadFiles: any) => {
console.log(file, uploadFiles)
}
// 终端台账信息
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
index d24f3562..09305754 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue
@@ -27,7 +27,7 @@
{{ detailData.supervisionTempDeviceReport?.powerCompany }}
- {{ detailData.supervisionTempDeviceReport?.substation }}
+ {{ detailData.supervisionTempDeviceReport?.substationName }}
{{
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index aa3cfbad..37716572 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -35,7 +35,7 @@ const tableStore = new TableStore({
column: [
{ title: '序号', type: 'seq', width: 80 },
{ field: 'orgName', title: '填报部门名称' , minWidth: 170 },
- { field: 'substation', title: '所属变电站', minWidth: 170 },
+ { field: 'substationName', title: '所属变电站', minWidth: 170 },
{ field: 'monitoringTerminalName', title: '设备名称', minWidth: 170 },
{ field: 'monitoringTerminalCode', title: '设备编号', minWidth: 170 },
{ field: 'reportDate', title: '填报日期', minWidth: 170},