rev 冲突

acs/nladmin-ui/src/layout/components/Navbar.vue

@@ -31,7 +31,7 @@
         <el-dropdown-menu slot="dropdown">
           <span style="display:block;" @click="show = true">
             <el-dropdown-item>
-               {{ $t('common.Layout_setting') }}
+              {{ $t('common.Layout_setting') }}
             </el-dropdown-item>
           </span>
           <router-link to="/user/center">
@@ -46,7 +46,7 @@
           </span>
         </el-dropdown-menu>
       </el-dropdown>
-      <el-dropdown class="right-menu-item"  trigger="click" @command="langChange">
+      <el-dropdown class="right-menu-item" trigger="click" @command="langChange">
         <span class="el-dropdown-link">
           {{ language }} <i class="el-icon-caret-bottom" />
         </span>

acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo" :src="logo" class="sidebar-logo">
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+        <img v-if="logo" :src="logo" class="sidebar-logo">
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
     </transition>
@@ -24,6 +24,13 @@ export default {
       required: true
     }
   },
+  data() {
+    return {
+      title: '诺力开发平台',
+      logo: Logo,
+      title_param: 'platform'
+    }
+  },
   computed: {
     variables() {
       return variables
@@ -32,13 +39,6 @@ export default {
       return this.$store.state.settings.sideTheme
     }
   },
-  data() {
-    return {
-      title: '诺力开发平台',
-      logo: Logo,
-      title_param: 'platform'
-    }
-  },
   created() {
     this.getValueByCode(this.title_param).then(res => {
       this.title = res.value