From 3a4abdbf17e2445655cb7a8646e1ef1c3e53b91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Thu, 8 Jul 2021 18:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=81=A5=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hardware/device/detail.vue | 81 ++++++++++++++++++++--------
 vue.config.js                        |  4 +-
 2 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/views/hardware/device/detail.vue b/src/views/hardware/device/detail.vue
index b217473..326e100 100644
--- a/src/views/hardware/device/detail.vue
+++ b/src/views/hardware/device/detail.vue
@@ -32,6 +32,58 @@
       <el-col :offset="1" :span="15">
         <el-scrollbar style="height: 810px;" wrap-class="scrollbar-wrapper">
           <div v-for="v in signal" :key="v.id" class="row_div">
+            <div
+              style="background-color:#fff;padding-bottom:1px"
+              v-if="v.key == '01000001' && v.value == '1'"
+            >
+              <el-row
+                v-for="(item, index) in defaultSignal"
+                :key="index"
+                type="flex"
+                class="row-bg"
+                justify="space-around"
+                style="height:65px;align-items: center;margin-bottom:10px;background-color: #f8f9fa"
+              >
+                <el-col :span="12">
+                  <div>
+                    <i class="ico_box">
+                      <span class="el-icon-data-line"></span>
+                    </i>
+                    <span style="margin-left:20px">{{ item.keyCn }}</span>
+                  </div>
+                </el-col>
+                <el-col :span="12">
+                  <div class="tr">
+                    <el-dropdown
+                      v-if="index !== 2"
+                      @command="handleCommand(item, $event)"
+                      placement="bottom"
+                      trigger="click"
+                    >
+                      <el-button size="mini" type="warning" plain>
+                        更多菜单
+                      </el-button>
+                      <el-dropdown-menu
+                        slot="dropdown"
+                        style="min-width:80px;text-align:center"
+                      >
+                        <el-dropdown-item command="0">0</el-dropdown-item>
+                        <el-dropdown-item command="1">1</el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                    <el-button
+                      v-else
+                      plain
+                      type="danger"
+                      size="mini"
+                      @click="handleCommand(item, 1)"
+                      >设备重置</el-button
+                    >
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+
             <el-row
               type="flex"
               class="row-bg"
@@ -58,7 +110,7 @@
                           : ''
                         : ''
                     "
-                    >{{ v.keyCN }}：{{ v.valueCN }}</span
+                    >{{ v.keyCN }}：{{ v.valueCN }}---{{ v.key }}</span
                   >
                   <!-- :class="v.keyCN.includes('单芯电压值') ? 'a' : ''" -->
                   <!-- {{ v.keyCN.includes('单芯电压值') ? true : false }} -->
@@ -84,11 +136,7 @@
                     >点击输入</el-button
                   >
                   <el-dropdown
-                    v-else-if="
-                      v.key == '01308001' ||
-                        v.key == '01308102' ||
-                        v.key == '01308101'
-                    "
+                    v-else-if="v.key == '01308001'"
                     @command="handleCommand(v, $event)"
                     placement="bottom"
                     trigger="click"
@@ -98,7 +146,6 @@
                       <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
                     </el-button>
                     <el-dropdown-menu
-                      v-if="v.key == '01308001'"
                       slot="dropdown"
                       style="min-width:80px;text-align:center"
                     >
@@ -107,23 +154,7 @@
                       <el-dropdown-item command="2">2</el-dropdown-item>
                       <el-dropdown-item command="3">3</el-dropdown-item>
                     </el-dropdown-menu>
-                    <el-dropdown-menu
-                      v-else
-                      slot="dropdown"
-                      style="min-width:80px;text-align:center"
-                    >
-                      <el-dropdown-item command="0">0</el-dropdown-item>
-                      <el-dropdown-item command="1">1</el-dropdown-item>
-                    </el-dropdown-menu>
                   </el-dropdown>
-                  <el-button
-                    v-else-if="v.key == '01301001'"
-                    plain
-                    type="danger"
-                    size="mini"
-                    @click="handleCommand(v, 1)"
-                    >设备重置</el-button
-                  >
                   <el-button
                     v-else
                     plain
@@ -194,6 +225,7 @@ export default {
       id: '',
       info: {},
       signal: [],
+      defaultSignal: [],
       signalUpdateTime: '',
       deviceTypeList: [
         { label: '锐能设备', value: 'rn' },
@@ -305,6 +337,9 @@ export default {
           if (info.deviceSignal) {
             let deviceSignal = JSON.parse(info.deviceSignal.signalJsonTurn);
             this.signal = deviceSignal.signal;
+            this.defaultSignal = info.defaultSignal;
+            console.log(info.deviceSignal.signalJsonTurn);
+            console.log(this.signal);
             // let a = deviceSignal.signal.find(
             //   item => item.keyCN == '单体过充阈值'
             // );
diff --git a/vue.config.js b/vue.config.js
index 9b4ed22..b91cf12 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,4 @@
-'use strict'
+'use strict'
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
 
@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.99.239:8080`,
+        target: `http://192.168.0.125:8080`,
         // target: `http://192.168.99.118:8080`,
         // target: `http://47.115.73.110:8080`,
         // target: `http://121.37.250.170:8080`,