From 244f5f5b10af768c2c7f02832e22346cf91da03e Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Thu, 3 Nov 2022 11:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=20portAp?=
 =?UTF-8?q?i=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                      | 2 +-
 .../project/profileV2/DeviceManage/EDeviceChildren.vue    | 8 ++++----
 src/views/profile/DeviceDetailsView/deviceLog.vue         | 4 ++--
 src/views/system/dept/index.vue                           | 3 +++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index e7e3cf12..ecfa2c9c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -9,7 +9,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.NODE_ENV === "production" ?  `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''}` : process.env.VUE_APP_BASE_API,
+  baseURL: process.env.NODE_ENV === "production" ?  `${window.dasConfig.protocol}${window.dasConfig.ip}${window.dasConfig.port ? ':'+window.dasConfig.port : ''} ${window.dasConfig.prodApi ? '/'+window.dasConfig.prodApi : ''}` : process.env.VUE_APP_BASE_API,
   // 超时
   timeout: 10000
 })
diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
index 86bda6ab..e9a5b576 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceChildren.vue
@@ -75,7 +75,7 @@
           ...operate,
         ]"
         :isIndex="true"
-        :tableHeight="tableList.length > 0 ? '470px' : '495px'"
+        :tableHeight="tableList.length > 0 ? '450px' : '495px'"
         :isSelect="true"
         rowKey="deviceId"
         @tableSelectionChange="handleTableChange"
@@ -86,7 +86,7 @@
             <span
               @click="handleOpening(scope.row)"
               :class="
-                scope.row.switch === 0 || scope.row.switch === undefined
+                scope.row.switch == 0 || scope.row.switch == undefined
                   ? 'span-disable'
                   : ''
               "
@@ -97,7 +97,7 @@
 
             <span
               @click="handleSwitchOn(scope.row)"
-              :class="scope.row.switch === 1 ? 'span-disable' : ''"
+              :class="scope.row.switch == 1 ? 'span-disable' : ''"
             >
               <i class="iconfont iconhezha"></i>
               合闸
@@ -276,7 +276,7 @@ export default {
       }
     },
     handleOpening(row) {
-      if (row.switch === 1) {
+      if (row.switch == 1) {
         this.handleSendSwitchDirect("false", row.deviceId);
       }
     },
diff --git a/src/views/profile/DeviceDetailsView/deviceLog.vue b/src/views/profile/DeviceDetailsView/deviceLog.vue
index e1d3ce9f..a2ee904b 100644
--- a/src/views/profile/DeviceDetailsView/deviceLog.vue
+++ b/src/views/profile/DeviceDetailsView/deviceLog.vue
@@ -38,9 +38,9 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getDeviceLogList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table
       v-loading="loading"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 215b5fe2..5f1e1010 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -307,6 +307,9 @@ export default {
               this.getList();
             });
           } else {
+            if ( !this.form.parentId ) {
+              this.form.parentId = 0;
+            }
             addDept(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;