ysy 2 年之前
父节点
当前提交
bf647115fc

二进制
public/logo.png


+ 2 - 2
src/layout/components/header-tools.vue

@@ -31,9 +31,9 @@
         </div>
         <template v-slot:dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item command="profile" icon="el-icon-user">
+            <!-- <el-dropdown-item command="profile" icon="el-icon-user">
               {{ $t('layout.header.profile') }}
-            </el-dropdown-item>
+            </el-dropdown-item> -->
             <el-dropdown-item command="password" icon="el-icon-key">
               {{ $t('layout.header.password') }}
             </el-dropdown-item>

+ 7 - 0
src/layout/index.vue

@@ -340,4 +340,11 @@
       }
     }
   }
+
+  .ele-admin-layout .ele-admin-logo img  {
+    height: auto !important;
+    width: 80px !important;
+    margin-right: 5px;
+    max-height: 35px
+  }
 </style>

+ 9 - 0
src/views/ledgerAssets/equipment/components/equipment-list.vue

@@ -156,6 +156,8 @@
           //   minWidth: 110,
           //   slot: 'code'
           // },
+    
+
           {
             prop: 'name',
             label: '设备名称',
@@ -163,6 +165,13 @@
             minWidth: 110
           },
 
+          {
+            prop: 'codeNumber',
+            label: '编号',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+
           {
             prop: 'category.modelType',
             label: '型号',

+ 2 - 2
vue.config.js

@@ -33,8 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试环境
         // target: 'http://124.71.68.31:50001',
-        // target: 'http://192.168.1.139:18086', // 粟
-        target: 'http://192.168.1.132:18086', // 徐
+        target: 'http://192.168.1.139:18086', // 粟
+        // target: 'http://192.168.1.132:18086', // 徐
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''