From 4daa3fffc48b4ab74efaa2c6d699d117f8740df9 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Fri, 5 Jul 2024 16:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(=E8=AE=BE=E5=A4=87):?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E5=AD=90?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dr                                       |  9 ++---
 .prettierrc                                   | 15 ++++++++
 src/config/env.js                             |  2 +-
 .../DeviceDetailsView/deviceSelectNav.vue     | 34 +++++++++----------
 4 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 .prettierrc

diff --git a/.env.dr b/.env.dr
index 1a454b4b..b7cc0f5d 100644
--- a/.env.dr
+++ b/.env.dr
@@ -30,7 +30,7 @@ VUE_APP_THEME_CLASS = 'theme-blue-black'
 #VUE_APP_THEME_CLASS = 'theme-blue-white'
 
 # 智慧用电管理系统/开发环境
-VUE_APP_BASE_API = ''
+VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
@@ -41,12 +41,13 @@ port= 9988
 # 服务端地址
 // 陈志荣 本地
 // target = http://192.168.18.140:8899
-// 黄明 本地
-// target = http://192.168.18.134:8899
+
 //target = http://192.168.18.139:8899
 // target = http://192.168.18.136:8899
 
 // 测试端
 // target = http://192.168.10.241:32024
 // 开发端
- target = https://digital-core.drgyen.com
+# target = https://digital-core.dieruen-iot.com
+// 黄明 本地
+target = http://192.168.1.17:8899
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..7e65b807
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,15 @@
+{
+//  "printWidth": 220,
+//  "tabWidth": 4,
+//  "useTabs": true,
+//  "semi": true,
+//  "singleQuote": true,
+//  "quoteProps": "as-needed",
+//  "trailingComma": "none",
+//  "bracketSpacing": true,
+//  "jsxBracketSameLine": false,
+//  "arrowParens": "avoid",
+//  "endOfLine": "lf",
+//  "jsxSingleQuote": false,
+//  "vueIndentScriptAndStyle": false
+}
diff --git a/src/config/env.js b/src/config/env.js
index 8856deeb..5af8fad1 100644
--- a/src/config/env.js
+++ b/src/config/env.js
@@ -10,7 +10,7 @@ let prodApi = window.dasConfig.ip || '/prod-api';
 let wsProtocol = 'ws://';
 let iotWebSocketAlarmBaseUrl = ''
 let bigWebSocketUrl = ''
-let port = '32024'
+let port = '8899'
 let webSocketProjectGatewayUrl = ''
 let hrefHostUrl = '';
 
diff --git a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
index e3a080f4..37d28424 100644
--- a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
+++ b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="device-select-nav">
-    <div class="layout-select-wrap" v-if="childDeviceList.length > 0">
+    <div v-if="childDeviceList.length > 0" class="layout-select-wrap">
       <!-- <div
         class="but"
         :disabled="tSelectLabelList.length <= 0"
@@ -41,10 +41,10 @@
       </div> -->
 
       <el-button
+        :disabled="tSelectLabelList.length <= 0"
         plain
         size="mini"
         type="info"
-        :disabled="tSelectLabelList.length <= 0"
         @click="handleChildStatus('true')"
       >
         <div
@@ -60,10 +60,10 @@
         </div>
       </el-button>
       <el-button
+        :disabled="tSelectLabelList.length <= 0"
         plain
         size="mini"
         type="info"
-        :disabled="tSelectLabelList.length <= 0"
         @click="handleChildStatus('false')"
       >
         <div
@@ -78,7 +78,7 @@
           分闸
         </div>
       </el-button>
-      <el-button plain type="info" size="mini" @click="handleAllStatus('true')">
+      <el-button plain size="mini" type="info" @click="handleAllStatus('true')">
         <div
           style="
             width: 100%;
@@ -93,8 +93,8 @@
       </el-button>
       <el-button
         plain
-        type="info"
         size="mini"
+        type="info"
         @click="handleAllStatus('false')"
       >
         <div
@@ -110,10 +110,10 @@
         </div></el-button
       >
       <el-button
+        :disabled="tSelectLabelList.length <= 0"
         plain
         size="mini"
         type="info"
-        :disabled="tSelectLabelList.length <= 0"
         @click="handleDevSearch()"
       >
         <div
@@ -145,21 +145,20 @@
       <span class="title-span">已选择设备：</span>
       <span v-if="tSelectLabelList.length <= 0">当前未选择设备</span>
       <el-tag
-        style="margin: 5px 5px 5px 0px"
         v-for="(item, idx) in tSelectLabelList"
         :key="idx"
         closable
+        style="margin: 5px 5px 5px 0px"
         @close="selectDevClose(item)"
       >
         {{ item }}
       </el-tag>
     </div>
-    <div class="layout-select-wrap" v-else>
+    <div v-else class="layout-select-wrap">
       <span class="title-span">当前没有可用于分闸合闸设备~</span>
     </div>
     <div class="layout-device-list">
       <el-card
-        @click.native="viewDeviceChange(deviceInfo.deviceId)"
         :body-style="{
           padding: '0px',
           width: '220px',
@@ -170,6 +169,7 @@
             ? 'border: 1px solid #1890ff; margin: 5px; width: 220px; flex-shrink: 0;'
             : ' margin: 5px; width: 220px; flex-shrink: 0;'
         "
+        @click.native="viewDeviceChange(deviceInfo.deviceId)"
       >
         <div class="nav-p-dev">
           <div
@@ -186,6 +186,7 @@
             "
           >
             <span
+              :title="deviceInfo.deviceName"
               class="dev-info-title"
               style="
                 font-weight: 400;
@@ -198,7 +199,6 @@
                 overflow: hidden;
                 text-overflow: ellipsis;
               "
-              :title="deviceInfo.deviceName"
               >{{ deviceInfo.deviceName }}</span
             >
             <div style="width: 60px; display: flex; justify-content: center">
@@ -239,15 +239,15 @@
       </el-card>
 
       <el-card
+        v-for="item in childDeviceList"
+        :key="item.deviceId"
         :body-style="{ padding: '0px', width: '220px' }"
-        @click.native="viewDeviceChange(item.deviceId)"
         :style="
           item.deviceId === checkobxDeviceId
             ? 'border: 1px solid #1890ff; margin: 5px; width: 220px; flex-shrink: 0; boxShadow: 0 1px 5px 0 #2530341a;'
             : ' margin: 5px; width: 220px; flex-shrink: 0; boxShadow: 0 1px 5px 0 #2530341a;'
         "
-        v-for="item in childDeviceList"
-        :key="item.deviceId"
+        @click.native="viewDeviceChange(item.deviceId)"
       >
         <div class="nav-c-dev">
           <div
@@ -263,6 +263,7 @@
             "
           >
             <span
+              :title="item.deviceName"
               class="dev-info-title"
               style="
                 font-weight: 400;
@@ -275,16 +276,15 @@
                 overflow: hidden;
                 text-overflow: ellipsis;
               "
-              :title="item.deviceName"
               >{{ item.deviceName }}</span
             >
             <div
-              @click.stop="handleCheckbox(item)"
               :class="
                 tSelectList.indexOf(item.deviceId) >= 0
                   ? 'checkbox-i selected-c'
                   : 'checkbox-i'
               "
+              @click.stop="handleCheckbox(item)"
             >
               <i
                 v-show="tSelectList.indexOf(item.deviceId) >= 0"
@@ -339,8 +339,8 @@
       </el-card>
     </div>
     <e-web-socket
-      :wsServiceUrl="wsStatusService"
       :closeSleepTime="10000"
+      :wsServiceUrl="wsStatusService"
       @message="wsMessage($event)"
     ></e-web-socket>
   </div>
@@ -406,7 +406,7 @@ export default {
               this.wsDeviceInfo["deviceId"]
             ) {
               this.childDeviceList[i]["switch"] =
-                this.wsDeviceInfoswitch?.switch.toString();
+                this.wsDeviceInfo?.switch.toString();
               this.$forceUpdate();
               break;
             }