Explorar o código

Merge branch 'develop' into feature/1.3.7-humanradar-2022-10-20

* develop:
  hp_ui:bdhp1.99版本
wuyunfeng %!s(int64=2) %!d(string=hai) anos
pai
achega
2489e32ee7
Modificáronse 3 ficheiros con 14 adicións e 14 borrados
  1. 1 1
      languages/zh-CN.js
  2. 1 1
      src/layout/components/Navbar.vue
  3. 12 12
      src/layout/components/Sidebar/Logo.vue

+ 1 - 1
languages/zh-CN.js

@@ -1,7 +1,7 @@
 const i18n = require('@/utils/i18n')
 module.exports = {
   action: {
-    wdklCallingSystem: '维鼎康联呼叫系统配置中心',
+    wdklCallingSystem: '呼叫系统配置中心',
     home: '首页',
     add: '新增',
     edit: '编辑',

+ 1 - 1
src/layout/components/Navbar.vue

@@ -21,7 +21,7 @@
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avator" class="user-avatar">
+<!--          <img :src="avator" class="user-avatar">-->
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">

+ 12 - 12
src/layout/components/Sidebar/Logo.vue

@@ -1,16 +1,16 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
-    <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <!--        <h1 v-else class="sidebar-title">{{ title }} </h1>-->
-      </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <!--        <h1 class="sidebar-title">{{ title }} </h1>-->
-      </router-link>
-    </transition>
-  </div>
+<!--  <div class="sidebar-logo-container" :class="{'collapse':collapse}">-->
+<!--    <transition name="sidebarLogoFade">-->
+<!--      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">-->
+<!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
+<!--        &lt;!&ndash;        <h1 v-else class="sidebar-title">{{ title }} </h1>&ndash;&gt;-->
+<!--      </router-link>-->
+<!--      <router-link v-else key="expand" class="sidebar-logo-link" to="/">-->
+<!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
+<!--        &lt;!&ndash;        <h1 class="sidebar-title">{{ title }} </h1>&ndash;&gt;-->
+<!--      </router-link>-->
+<!--    </transition>-->
+<!--  </div>-->
 </template>
 
 <script>