终端检测弹框字典值修改

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue

@@ -259,6 +259,21 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item for="-" label="接线方式：">
+                <el-select v-model="form.ptType" clearable style="width: 100%" placeholder="请选择接线方式">
+                    <el-option
+                        v-for="item in ptTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="线路号：">
+                <el-select v-model="form.num" clearable style="width: 100%" placeholder="请选择线路号">
+                    <el-option v-for="item in numList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item for="-" label="电压偏差上限：" prop="voltageDeviationUpperLimit">
                 <el-input-number style="width: 100%" v-model="form.voltageDeviationUpperLimit" :min="-10" :max="10" />
             </el-form-item>
@@ -292,9 +307,9 @@
                     <el-radio value="0">否</el-radio>
                 </el-radio-group>
             </el-form-item>
-             <el-form-item for="-" label="对象名称(对端)：" prop="objName">
+            <!-- <el-form-item for="-" label="对象名称(对端)：" prop="objName">
                 <el-input v-model="form.objName" autocomplete="off" placeholder="请输入监测点对象名称" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item for="-" label="电网侧变电站：" prop="powerSubstationName">
                 <el-input v-model="form.powerSubstationName" autocomplete="off" placeholder="请输入电网侧变电站" />
             </el-form-item>
@@ -304,7 +319,7 @@
                     <el-radio value="0">否</el-radio>
                 </el-radio-group>
             </el-form-item>
-             <el-form-item for="-" label="主接线图：" prop="mainWiringDiagram">
+            <el-form-item for="-" label="主接线图：" prop="mainWiringDiagram" class="uploadFile">
                 <el-upload
                     v-model:file-list="form.mainWiringDiagram"
                     ref="uploadRef"
@@ -403,6 +418,64 @@ const operationStatusList = [
         name: '退运'
     }
 ]
+//定义接线方式下拉框数据
+const ptTypeList=[
+    {
+        id: '0',
+        name: '星型接法'
+    },
+    {
+        id: '1',
+        name: '三角型接法'
+    },
+    {
+        id: '2',
+        name: '开口三角型接法'
+    },
+]
+//定义线路号下拉框数据
+const numList = [
+    {
+        id: '1',
+        name: '1'
+    },
+    {
+        id: '2',
+        name: '2'
+    },
+    {
+        id: '3',
+        name: '3'
+    },
+    {
+        id: '4',
+        name: '4'
+    },
+    {
+        id: '5',
+        name: '5'
+    },
+    {
+        id: '6',
+        name: '6'
+    },
+    {
+        id: '7',
+        name: '7'
+    },
+    {
+        id: '8',
+        name: '8'
+    },
+    {
+        id: '9',
+        name: '9'
+    },
+    {
+        id: '10',
+        name: '10'
+    },
+]
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 //工程下拉选择数据
@@ -469,7 +542,9 @@ const resetForm = () => {
         timeInterval: '1', //测量间隔
         voltageDeviationLowerLimit: '0', //电压偏差下限
         voltageDeviationUpperLimit: '0', //	电压偏差上限
-        voltageLevel: voltageLevelList[0].id //监测点电压等级
+        voltageLevel: voltageLevelList[0].id, //监测点电压等级
+        ptType:ptTypeList[0].id,//接线方式
+        num:numList[0].id,//线路号
     }
     let obj = {}
     getList(obj).then(res => {
@@ -565,7 +640,8 @@ const changeUserName = () => {
         orgName: obj?.orgName,
         userName: obj?.projectName,
         userId: obj?.id,
-        expectedProductionDate: obj?.expectedProductionDate
+        expectedProductionDate: obj?.expectedProductionDate,
+        objName:obj?.projectName,
     }
 }
 //定义校验规则

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue

@@ -179,6 +179,16 @@
             <el-form-item for="-" label="监测终端名称：" prop="monitoringTerminalName">
                 <el-input v-model="form.monitoringTerminalName" autocomplete="off" placeholder="请输入终端名称" />
             </el-form-item>
+            <el-form-item for="-" label="通讯类型：">
+                <el-select v-model="form.frontType" clearable style="width: 100%" placeholder="请选择通讯类型">
+                    <el-option
+                        v-for="item in frontTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item for="-" label="通讯状态：" prop="communicationStatus">
                 <el-select
                     v-model="form.communicationStatus"
@@ -638,6 +648,8 @@ const terminalModelList = [
         name: '离线'
     }
 ]
+//字典获取通讯类型
+const frontTypeList = dictData.getBasicData('Front_Type')
 //定义通讯状态下拉框数据
 const communicationStatusList = [
     {
@@ -744,6 +756,7 @@ const resetForm = async () => {
         alarmFunction: '0', //告警功能
         commissioningTime: '', //投运时间
         communicationStatus: communicationStatusList[0].id, //	通讯状态
+        frontType:frontTypeList[0].id,///通讯类型
         contractNumber: '', //合同号
         dataType: dataTypeList[0].id, //数据类型
         dataUpdateTime: new Date(), //	数据更新时间
@@ -803,6 +816,7 @@ const devReportForm = ref({
         alarmFunction: '0', //告警功能
         commissioningTime: '', //投运时间
         communicationStatus: communicationStatusList[0].id, //	通讯状态
+        frontType:frontTypeList[0].id,///通讯类型
         contractNumber: '', //合同号
         currentTerminalDetectionTime: '', //本次终端检测时间
         dataType: dataTypeList[0].id, //数据类型
@@ -964,13 +978,6 @@ const rules = ref({
             trigger: 'blur'
         }
     ],
-    terminalType: [
-        {
-            required: true,
-            message: '请选择终端型号',
-            trigger: 'change'
-        }
-    ],
     terminalPort: [
         {
             required: true,
@@ -978,6 +985,13 @@ const rules = ref({
             trigger: 'blur'
         }
     ],
+    terminalType: [
+        {
+            required: true,
+            message: '请选择终端型号',
+            trigger: 'change'
+        }
+    ],
     frontEndMachine: [
         {
             required: true,