From c93769ab4bfe637909af1a3a25d545ffb8cebe6b Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Fri, 7 Jun 2024 13:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E7=9B=91=E6=B5=8B-=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E7=82=B9=E5=8F=B0=E8=B4=A6=E5=BD=95=E5=85=A5-?=
 =?UTF-8?q?=E6=B5=8B=E9=87=8F=E9=97=B4=E9=9A=94=E6=94=B9=E4=B8=BA1?=
 =?UTF-8?q?=EF=BC=8C3=EF=BC=8C5=EF=BC=8C10=E5=88=86=E9=92=9F=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E6=8B=A9=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/monitorpoint/addForm.vue       | 35 +++++++++++++----
 .../components/monitorpoint/detail.vue        | 38 +++++++++++++++----
 2 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index 55d77aea..ea15de04 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -283,12 +283,14 @@
                 <el-input-number style="width: 100%" v-model="form.voltageDeviationLowerLimit" />
             </el-form-item>
             <el-form-item for="-" label="测量间隔：" prop="timeInterval">
-                <el-input
-                    v-model="form.timeInterval"
-                    autocomplete="off"
-                    oninput="value=value.replace(/[^0-9.]/g,'')"
-                    placeholder="请输入测量间隔"
-                />
+                <el-select v-model="form.timeInterval" placeholder="请选择测量间隔">
+                    <el-option
+                        v-for="(item, index) in timeIntervalList"
+                        :label="item.name"
+                        :value="item.id"
+                        :key="index"
+                    />
+                </el-select>
             </el-form-item>
             <el-form-item for="-" label="监测点编码：" prop="lineId">
                 <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入监测点编码" />
@@ -484,6 +486,25 @@ const numList = [
         name: '10'
     }
 ]
+//测量间隔数据
+const timeIntervalList=[
+    {
+        id:'1',
+        name:'一分钟'
+    },
+    {
+        id:'3',
+        name:'三分钟'
+    },
+    {
+        id:'5',
+        name:'五分钟'
+    },
+    {
+        id:'10',
+        name:'十分钟'
+    }
+]
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 //工程下拉选择数据
@@ -547,7 +568,7 @@ const resetForm = () => {
         operationStatus: operationStatusList[0].id, //监测点运行状态
         pointNature: pointNatureList[0].id, //监测点性质
         powerSubstationName: '', //电网侧变电站
-        timeInterval: '1', //测量间隔
+        timeInterval: timeIntervalList[0].id, //测量间隔
         voltageDeviationLowerLimit: '0', //电压偏差下限
         voltageDeviationUpperLimit: '0', //	电压偏差上限
         voltageLevel: voltageLevelList[0].id, //监测点电压等级
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
index 5f277769..54efc88d 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue
@@ -62,16 +62,20 @@
             {{ detailData.standardCapacity }}
         </el-descriptions-item>
         <el-descriptions-item label="CT变比">
-            {{ detailData.ct1 }}{{ detailData.ct2?'/'+detailData.ct2:'' }}
+            {{ detailData.ct1 }}{{ detailData.ct2 ? '/' + detailData.ct2 : '' }}
         </el-descriptions-item>
         <el-descriptions-item label="PT变比">
-            {{ detailData.pt1 }}{{ detailData.pt2?'/'+detailData.pt2:'' }}
+            {{ detailData.pt1 }}{{ detailData.pt2 ? '/' + detailData.pt2 : '' }}
         </el-descriptions-item>
         <el-descriptions-item label="监测点编码">
             {{ detailData.lineId }}
         </el-descriptions-item>
         <el-descriptions-item label="测量间隔">
-            {{ detailData.timeInterval }}
+            {{
+                timeIntervalList.find(item => {
+                    return item.id == detailData.timeInterval
+                })?.name
+            }}
         </el-descriptions-item>
         <el-descriptions-item label="干扰源类型">
             {{ detailData.loadType }}
@@ -112,10 +116,10 @@
             <el-icon>
                 <Link />
             </el-icon>
-            <a target="_blank"href="detailData?.mainWiringDiagram.url">
+            <a target="_blank" href="detailData?.mainWiringDiagram.url">
                 {{ detailData?.mainWiringDiagram.name }}
             </a>
-            <span @click="openFile(detailData?.mainWiringDiagram.name )">预览</span>
+            <span @click="openFile(detailData?.mainWiringDiagram.name)">预览</span>
         </el-descriptions-item>
     </el-descriptions>
 </template>
@@ -128,8 +132,8 @@ import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/inde
 import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { Link } from '@element-plus/icons-vue'
-const openFile = (name:any) => {
-    window.open(window.location.origin + '/#/previewFile?'+name)
+const openFile = (name: any) => {
+    window.open(window.location.origin + '/#/previewFile?' + name)
 }
 defineOptions({ name: 'BpmUserReportDetail' })
 
@@ -141,7 +145,25 @@ const props = defineProps({
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
-
+//测量间隔数据
+const timeIntervalList = [
+    {
+        id: '1',
+        name: '一分钟'
+    },
+    {
+        id: '3',
+        name: '三分钟'
+    },
+    {
+        id: '5',
+        name: '五分钟'
+    },
+    {
+        id: '10',
+        name: '十分钟'
+    }
+]
 //用户状态数组
 const userStateList = reactive([
     {