From 5dbbefcb9109b5494d13b3353eedc7e3bf5ca9b6 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 28 Jun 2024 16:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electricalEnergy/components1/online.vue    | 18 ++++++++++++------
 .../components/terminainal/addForm.vue         |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index 401cb29d..c02519e7 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -6,6 +6,12 @@
             <el-form-item label="区域">
                 <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea" />
             </el-form-item>
+            <el-form-item label="监测点性质">
+                <el-select v-model="tableStore.table.params.lineType" clearable>
+                    <el-option label="电网侧"   :value="0" />
+                    <el-option label="非电网侧" :value="1" />
+                </el-select>
+            </el-form-item>
             <el-form-item label="超标指标">
                 <el-select
                     v-model="tableStore.table.params.targetList"
@@ -28,7 +34,7 @@
                     inactive-text="无数据"
                 />
             </el-form-item>
-            <el-form-item label="预警阈值" >
+            <el-form-item label="预警阈值">
                 <!-- <el-input v-model="tableStore.table.params.alertThreshold" placeholder="请输入预警阈值" clearable></el-input> -->
                 <el-input-number
                     v-model="tableStore.table.params.alertThreshold"
@@ -38,7 +44,7 @@
                     @change="changeAlert"
                 />
             </el-form-item>
-            <el-form-item label="告警阈值" >
+            <el-form-item label="告警阈值">
                 <el-input-number
                     v-model="tableStore.table.params.alarmThreshold"
                     :min="0"
@@ -99,7 +105,7 @@ const list: any = ref({
     alarmThreshold: ''
 })
 const level: any = ref(dictData.state.area[0]?.level)
-const flag:any = ref('')
+const flag: any = ref('')
 const tableStore = new TableStore({
     url: '/supervision-boot/onlineMonitor/list',
     publicHeight: 65,
@@ -147,7 +153,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'updateTime',
-            visible:flagTime,
+            visible: flagTime,
             title: '最新数据时间'
         },
         {
@@ -280,8 +286,7 @@ const tableStore = new TableStore({
         list.value.alertThreshold = tableStore.table.params.alertThreshold
         list.value.alarmThreshold = tableStore.table.params.alarmThreshold
         flag.value = level.value
-        flagTime.value=tableStore.table.params.dataType==0?true:false
-
+        flagTime.value = tableStore.table.params.dataType == 0 ? true : false
     },
     loadCallback: () => {
         // tableStore.table.data = [
@@ -307,6 +312,7 @@ const tableStore = new TableStore({
 tableStore.table.params.alertThreshold = 5
 tableStore.table.params.alarmThreshold = 5
 tableStore.table.params.targetList = []
+tableStore.table.params.lineType = null
 tableStore.table.params.dataType = '1'
 tableStore.table.params.deptId = dictData.state.area[0].id
 provide('tableStore', tableStore)
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
index 0e41a12e..12ba7df1 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
@@ -49,7 +49,7 @@
                     type="date"
                     format="YYYY-MM-DD"
                     value-format="YYYY-MM-DD"
-                    :disabled-date="disabledDate"
+                 
                     placeholder="请选择工程投产日期"
                 />
             </el-form-item>