From f664da96b684088b1fd42e0020ad676f158ef0fa Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Thu, 26 Sep 2024 14:59:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=8C=E6=AC=A1=E5=80=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/device/control/index.vue | 35 ++++++++++++++++++-----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index 77c2c0a..dfe6771 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -86,6 +86,9 @@
                         dataSet.indexOf('_event') == -1
                     "
                 >
+                    <el-form-item label="日期" v-show="dataSet.indexOf('_history') != -1">
+                        <DatePicker ref="datePickerRef"></DatePicker>
+                    </el-form-item>
                     <el-form-item label="指标">
                         <el-input
                             style="width: 160px"
@@ -95,9 +98,6 @@
                             placeholder="请输入关键词"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item label="日期" v-show="dataSet.indexOf('_history') != -1">
-                        <DatePicker ref="datePickerRef"></DatePicker>
-                    </el-form-item>
                     <el-form-item label="值类型">
                         <el-select v-model="formInline.dataLevel" :disabled="dataLevel == 'Primary'">
                             <el-option value="Primary" label="一次值"></el-option>
@@ -226,7 +226,11 @@
                 ></el-pagination>
 
                 <!-- 趋势数据 -->
-                <div  style="height:calc(100vh - 340px)" v-if="dataSet.indexOf('_trenddata') != -1" v-loading="tableLoading">
+                <div
+                    style="height: calc(100vh - 340px)"
+                    v-if="dataSet.indexOf('_trenddata') != -1"
+                    v-loading="tableLoading"
+                >
                     <Trend ref="trendRef"></Trend>
                 </div>
                 <!-- 实时数据 -->
@@ -258,7 +262,11 @@
                     ></harmonicSpectrum>
                 </div>
                 <!-- 暂态事件 -->
-                <div style="height:calc(100vh - 340px)" v-if="dataSet.indexOf('_event') != -1" v-loading="tableLoading">
+                <div
+                    style="height: calc(100vh - 340px)"
+                    v-if="dataSet.indexOf('_event') != -1"
+                    v-loading="tableLoading"
+                >
                     <Event ref="eventRef"></Event>
                 </div>
                 <div v-if="!tableData" style="height: 42px"></div>
@@ -328,7 +336,7 @@ const formInline = reactive({
     endTime: '',
     id: '',
     lineId: '',
-    dataLevel: 'dataLevel'
+    dataLevel: 'Secondary'
 })
 const detail = ref<any>(null)
 //是否显示实时数据默认内容
@@ -408,6 +416,7 @@ const nodeClick = async (e: anyObj) => {
         formInline.lineId = e.id
         await getDeviceData(e.pid, 'history', e.id)
             .then((res: any) => {
+                console.log(res.data, '++++++++++++++++++420')
                 deviceData.value = res.data
                 formInline.dataLevel = res.data.dataLevel
                 dataLevel.value = res.data.dataLevel
@@ -437,6 +446,10 @@ const nodeClick = async (e: anyObj) => {
                             item.id = item.id + '_event'
                         }
                     })
+                    //便携式设备默认二次值
+                    if (deviceType.value == '1') {
+                        formInline.dataLevel = 'Secondary'
+                    }
                     dataSet.value = res.data.dataSetList[0].id
                     handleClick()
                 }
@@ -454,6 +467,8 @@ const deviceType = ref('0')
 const pointTypeChange = (val: any, obj: any) => {
     deviceType.value = val
     nodeClick(obj)
+    formInline.dataLevel = 'Secondary'
+    console.log(formInline, '????????????????????????????466')
 }
 const realTimeRef: any = ref()
 const intRealTime = async (val: any) => {
@@ -474,7 +489,7 @@ const timer: any = ref()
 //tab点击事件
 const handleClick = async (tab?: any) => {
     tableLoading.value = true
-    formInline.dataLevel = 'Secondary'
+    // formInline.dataLevel = 'Secondary'
     // loading.value = true
     //点击tab时更新dataSet最新值
     if (tab && tab.props && tab.props.name && dataSet.value != tab.props.name) {
@@ -729,4 +744,10 @@ onMounted(() => {})
         margin-right: 5px;
     }
 }
+.el-form {
+    width: 100%;
+    height: auto;
+    display: flex;
+    flex-wrap: wrap;
+}
 </style>