From b6cc89d82e03608d69bf92b212c3f27b6f0ea667 Mon Sep 17 00:00:00 2001
From: zhangcheng <zhuangcheng@ldxinyong.com>
Date: Wed, 23 Sep 2020 15:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                            |  2 +-
 src/views/layout/main-navbar.vue           |  3 +-
 src/views/layout/main-sidebar-sub-menu.vue |  3 +-
 src/views/layout/main-sidebar.vue          |  3 +-
 src/views/layout/main.vue                  |  3 +-
 src/views/modules/device/device-detail.vue |  5 +--
 src/views/modules/device/device-main.vue   | 50 ++++++++++------------
 7 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/config/index.js b/config/index.js
index 998aed4..b360797 100644
--- a/config/index.js
+++ b/config/index.js
@@ -13,7 +13,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/lz_management': {
-        target: 'http://localhost:8080',
+        target: 'https://tlzmanagement.ldxinyong.com',
         changeOrigin: true
       }
     },
diff --git a/src/views/layout/main-navbar.vue b/src/views/layout/main-navbar.vue
index 4696326..9b90e39 100644
--- a/src/views/layout/main-navbar.vue
+++ b/src/views/layout/main-navbar.vue
@@ -54,6 +54,7 @@
 </template>
 
 <script>
+  import IconSvg from '@/components/icon-svg'
   import UpdatePassword from './main-navbar-update-password'
   import { clearLoginInfo } from '@/utils'
   import { apiLogout } from '@/api/api_sys'
@@ -65,7 +66,7 @@
       }
     },
     components: {
-      UpdatePassword
+      UpdatePassword, IconSvg
     },
     computed: {
       navbarLayoutType: {
diff --git a/src/views/layout/main-sidebar-sub-menu.vue b/src/views/layout/main-sidebar-sub-menu.vue
index 352bbf9..dd98e9b 100644
--- a/src/views/layout/main-sidebar-sub-menu.vue
+++ b/src/views/layout/main-sidebar-sub-menu.vue
@@ -21,6 +21,7 @@
 </template>
 
 <script>
+  import IconSvg from '@/components/icon-svg'
   import SubMenu from './main-sidebar-sub-menu'
   export default {
     name: 'sub-menu',
@@ -35,7 +36,7 @@
       }
     },
     components: {
-      SubMenu
+      SubMenu, IconSvg
     },
     computed: {
       sidebarLayoutSkin: {
diff --git a/src/views/layout/main-sidebar.vue b/src/views/layout/main-sidebar.vue
index 07dac85..27569bf 100644
--- a/src/views/layout/main-sidebar.vue
+++ b/src/views/layout/main-sidebar.vue
@@ -23,6 +23,7 @@
 
 <script>
   import SubMenu from './main-sidebar-sub-menu'
+  import IconSvg from '@/components/icon-svg'
   import { isURL } from '@/utils/validate'
   export default {
     data () {
@@ -31,7 +32,7 @@
       }
     },
     components: {
-      SubMenu
+      SubMenu, IconSvg
     },
     computed: {
       sidebarLayoutSkin: {
diff --git a/src/views/layout/main.vue b/src/views/layout/main.vue
index 84b56e1..b9da026 100644
--- a/src/views/layout/main.vue
+++ b/src/views/layout/main.vue
@@ -84,7 +84,8 @@
             this.loading = false
             this.userId = res.user.userId
             this.userName = res.user.username
-            this.$store.state.user = res.user
+            this.userId = res.user && res.user.id
+            this.userName = res.user && res.user.userName
             this.mobile = res.user.mobile
 
             this.$watermark.set(res.user.realName + ' ' + this.mobile.substr(7, 4))
diff --git a/src/views/modules/device/device-detail.vue b/src/views/modules/device/device-detail.vue
index 1ce1af2..fe45b58 100644
--- a/src/views/modules/device/device-detail.vue
+++ b/src/views/modules/device/device-detail.vue
@@ -168,10 +168,7 @@
   </div>
 </template>>
 <script>
-import {
-  apiFindEquipmentByCode,
-  apiChangeEquipment,
-} from "@/api/api_equipment";
+import { apiFindEquipmentByCode, apiChangeEquipment } from "@/api/api_equipment";
 import * as dd from "dingtalk-jsapi";
 export default {
   data() {
diff --git a/src/views/modules/device/device-main.vue b/src/views/modules/device/device-main.vue
index 013b612..370b9b7 100644
--- a/src/views/modules/device/device-main.vue
+++ b/src/views/modules/device/device-main.vue
@@ -30,36 +30,30 @@
 </template>>
 <script>
 export default {
-    data () {
-        return{
-            value: ''
-        }
-
-    },
-    mounted () {
-
-    },
-    methods: {
-        batchOperate(command) {
-            switch (command) {
-                case 'staff':
-                    //去搜索人员
-                    this.$router.push({name: 'devicestaffdepat', query: {type: 3}})
-                    break;
-                case "depat":
-                    //去搜索人员
-                    this.$router.push({name: 'devicestaffdepat', query: {type: 4}})
-                    break;
-           }
-        },
-        goto (type) {
-            this.$router.push({name: 'devicedetail'})
-            
-            
-        }
+  data () {
+    return{
+      value: ''
     }
+  },
+  mounted () {},
+  methods: {
+    batchOperate(command) {
+      switch (command) {
+        case 'staff':
+          //去搜索人员
+          this.$router.push({name: 'devicestaffdepat', query: {type: 3}})
+          break;
+        case "depat":
+          //去搜索人员
+          this.$router.push({name: 'devicestaffdepat', query: {type: 4}})
+          break;
+      }
+    },
+    goto (type) {
+      this.$router.push({name: 'devicedetail'})
+    }
+  }
 }
-
 </script>
 
 <style>