From 0f57e4b746af7753aacf82e6640c7555c561feca Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 27 Dec 2024 10:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8=E6=A0=BC=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                    |  2 +-
 src/views/govern/device/control/index.vue      | 10 ++++++----
 src/views/govern/device/control/tabs/trend.vue |  2 +-
 src/views/govern/manage/factory.vue            |  2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a949514..cd53d16 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,7 +14,7 @@ import { provide, getCurrentInstance } from 'vue'
 // let buildUrl = 'wss://pqmcn.com:8087/mqtt'//102
 let buildUrl = 'ws://pqmcn.com:8073/mqtt'//27
 //本地mqtt
-let devUrl = 'ws://192.168.1.24:8085/mqtt'
+let devUrl = 'ws://192.168.1.24:8085/mqtt' 
 provide('MQTTURL', buildUrl)
 useSetTheme()
 </script>
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index cc3433b..1ba93dc 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -115,14 +115,15 @@
                                     :value="item.id" />
                             </el-select>
                         </el-form-item>
-
+                      
                         <el-form-item v-if="!dataSet.includes('_items')">
                             <!-- <el-select style="min-width: 120px !important" v-model.trim="formInline.dataLevel"
                                 :disabled="dataLevel == 'Primary' && deviceType == '0'">
                                 <el-option value="Primary" label="一次值"></el-option>
                                 <el-option value="Secondary" label="二次值"></el-option>
                             </el-select> -->
-                            <el-radio-group v-model.trim="formInline.dataLevel" @change="handleClick">
+                            <el-radio-group v-model.trim="formInline.dataLevel" :disabled="TrendList?.lineType != 1"
+                                @change="handleClick">
                                 <el-radio-button label="一次值" value="Primary" />
                                 <el-radio-button label="二次值" value="Secondary" />
 
@@ -142,9 +143,10 @@
                                     :value="item.id" />
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="关键字" v-if="!dataSet.includes('_')" >
+                        <el-form-item label="关键字" v-if="!dataSet.includes('_')">
                             <el-input maxlength="32" show-word-limit v-model.trim="searchValue" autocomplete="off"
-                                clearable @input="handleSearch" placeholder="请输入关键词" style="width: 180px !important"></el-input>
+                                clearable @input="handleSearch" placeholder="请输入关键词"
+                                style="width: 180px !important"></el-input>
                         </el-form-item>
                     </template>
                     <template #operation>
diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue
index f342f79..df49ccd 100644
--- a/src/views/govern/device/control/tabs/trend.vue
+++ b/src/views/govern/device/control/tabs/trend.vue
@@ -15,7 +15,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item>
-                        <el-radio-group v-model="searchForm.dataLevel" @change="init()">
+                        <el-radio-group v-model="searchForm.dataLevel" :disabled="props?.TrendList?.lineType != 1" @change="init()">
                             <el-radio-button label="一次值" value="Primary" />
                             <el-radio-button label="二次值" value="Secondary" />
 
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index fe30963..0eca9ea 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -613,7 +613,9 @@ const onSubmit = () => {
                             nDid: res.data.ndid
                         }).then(pres => {
                             ElMessage.success(pres.message)
+                           setTimeout(() => {
                             tableStore.index()
+                           },1000)
                         }).catch(err => {
                             // clearTimeout (time)
                         })