From 952c2e09c0698dac22d84dbf818af0bfa819ccd8 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Wed, 8 Jun 2022 12:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/iot/device/device-edit.vue      | 8 +++++---
 vue/src/views/iot/device/device-statistic.vue | 1 +
 vue/src/views/iot/device/index.vue            | 4 +---
 vue/src/views/iot/product/product-edit.vue    | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index 4441d9d4..d78bd72b 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -8,7 +8,7 @@
                     <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
                         <el-form-item label="设备名称" prop="deviceName">
                             <el-input v-model="form.deviceName" placeholder="请输入设备名称">
-                                <el-button slot="append" @click="openSummaryDialog" :disabled="form.deviceId==0">摘要</el-button>
+                                <el-button slot="append" @click="openSummaryDialog" v-if="form.deviceId!=0">摘要</el-button>
                             </el-input>
                         </el-form-item>
                         <el-form-item label="" prop="serialNumber">
@@ -52,12 +52,12 @@
                         </el-form-item>
                         <el-form-item label="设备经度" prop="longitude">
                             <el-input v-model="form.longitude" placeholder="请输入设备经度" type="number" :disabled="form.locationWay!=3">
-                                <el-link slot="append" :underline="false" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">坐标拾取</el-link>
+                                <el-link slot="append" :underline="false" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank" :disabled="form.locationWay!=3">坐标拾取</el-link>
                             </el-input>
                         </el-form-item>
                         <el-form-item label="设备纬度" prop="latitude">
                             <el-input v-model="form.latitude" placeholder="请输入设备纬度" type="number" :disabled="form.locationWay!=3">
-                                <el-link slot="append" :underline="false" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">坐标拾取</el-link>
+                                <el-link slot="append" :underline="false" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank" :disabled="form.locationWay!=3">坐标拾取</el-link>
                             </el-input>
                         </el-form-item>
                         <el-form-item label="所在地址" prop="networkAddress">
@@ -279,7 +279,9 @@ export default {
         getDevice(deviceId) {
             getDevice(deviceId).then(response => {
                 this.form = response.data;
+                if(this.form.summary!=null && this.form.summary!=""){
                 this.summary = JSON.parse(this.form.summary);
+                }
                 // 禁用状态
                 if (this.form.status == 2) {
                     this.deviceStatus = 1;
diff --git a/vue/src/views/iot/device/device-statistic.vue b/vue/src/views/iot/device/device-statistic.vue
index 5cacac66..2b63b845 100644
--- a/vue/src/views/iot/device/device-statistic.vue
+++ b/vue/src/views/iot/device/device-statistic.vue
@@ -177,6 +177,7 @@ export default {
                         itemStyle: {
                             color: i>9? color[0]:color[i]
                         },
+                        areaStyle: {},
                         data: []
                     }]
                 };
diff --git a/vue/src/views/iot/device/index.vue b/vue/src/views/iot/device/index.vue
index b3d75e6c..dec4f981 100644
--- a/vue/src/views/iot/device/index.vue
+++ b/vue/src/views/iot/device/index.vue
@@ -599,9 +599,7 @@ export default {
                         itemStyle: {
                             color: i > 9 ? color[0] : color[i]
                         },
-                        areaStyle: {
-
-                        },
+                        areaStyle: {},
                         data: []
                     }]
                 };
diff --git a/vue/src/views/iot/product/product-edit.vue b/vue/src/views/iot/product/product-edit.vue
index 77fd09a6..35b38154 100644
--- a/vue/src/views/iot/product/product-edit.vue
+++ b/vue/src/views/iot/product/product-edit.vue
@@ -86,12 +86,12 @@
             <product-authorize ref="productAuthorize" :product="form" />
         </el-tab-pane>
 
-        <el-tab-pane label="" name="alert">
+        <el-tab-pane label="" name="alert" :disabled="form.productId==0">
             <span slot="label"> 告警配置</span>
             <product-alert ref="productAlert" :product="form"></product-alert>
         </el-tab-pane>
 
-        <el-tab-pane label="" name="productApp">
+        <el-tab-pane label="" name="productApp" :disabled="form.productId==0">
             <span slot="label">控制界面</span>
             <product-app ref="productApp" :product="form" />
         </el-tab-pane>