LOGO

index.html

@@ -4,14 +4,14 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>Checkpoint MES</title>
+  <title>Longtron MES</title>
 <!--  <title>旭捷 MES</title>-->
   <% if (process.env.NODE_ENV === 'production') { %>
   <!-- 生产环境 -->
   <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>
   <% }else { %>
   <!-- 开发环境 -->
-  <link rel="shortcut icon" type="image/x-icon" href="">
+  <link rel="shortcut icon" type="image/x-icon" href="static/img/favicon.ico">
   <script src="./static/config/index.js"></script>
   <script src="./static/plugins/mock-1.0.0-beta3/mock-min.js"></script>
   <script src="./static/plugins/echarts-3.8.5/echarts.common.min.js"></script>

src/assets/scss/global.scss

@@ -150,7 +150,7 @@
 }
 .site-navbar__brand {
   height: 35px;
-  line-height: 35px;
+  line-height: 2px;
   font-size: 18px;
 }
 .site-navbar {

src/router/index.js

@@ -22,10 +22,10 @@ const globalRoutes = [
   { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } },
   { path: '/pre', component: _import('common/previewFile'), name: 'pre', meta: { title: '文件预览' } },
   { path: '/login-token', component: _import('common/login-token'), name: 'login', meta: { title: '登录' } },
-  { path: '/screen-whole-lift-progress', component: _import('modules/longchuang/screen-whole-lift-progress'), name: 'screen-whole-lift-progress', meta: { title: '整梯生产进度看板' } },
-  { path: '/screen-cable-cop-progress', component: _import('modules/longchuang/screen-cable-cop-progress'), name: 'screen-cable-cop-progress', meta: { title: '线缆/COP生产进度看板' } },
-  { path: '/screen-renovation-progress', component: _import('modules/longchuang/screen-renovation-progress'), name: 'screen-renovation-progress', meta: { title: '改造项目生产进度看板' } },
-  { path: '/screen-factory-overview', component: _import('modules/longchuang/screen-factory-overview'), name: 'screen-factory-overview', meta: { title: '工厂综合运营看板' } },
+  { path: '/screen-whole-lift-progress', component: _import('modules/longtron/screen-whole-lift-progress'), name: 'screen-whole-lift-progress', meta: { title: '整梯生产进度看板' } },
+  { path: '/screen-cable-cop-progress', component: _import('modules/longtron/screen-cable-cop-progress'), name: 'screen-cable-cop-progress', meta: { title: '线缆/COP生产进度看板' } },
+  { path: '/screen-renovation-progress', component: _import('modules/longtron/screen-renovation-progress'), name: 'screen-renovation-progress', meta: { title: '改造项目生产进度看板' } },
+  { path: '/screen-factory-overview', component: _import('modules/longtron/screen-factory-overview'), name: 'screen-factory-overview', meta: { title: '工厂综合运营看板' } },
 ]
 
 // 主入口路由(需嵌套上左右整体布局)

src/views/main-navbar.vue

@@ -10,7 +10,9 @@
             <icon-svg name="zhedie"></icon-svg>
           </el-menu-item>
         </el-menu>
-        <a class="site-navbar__brand-lg" href="javascript:;">龙闯电梯</a>
+        <a class="site-navbar__brand-lg" href="javascript:;">
+          <img class="site-navbar__brand-logo" src="~@/assets/img/lc.png" alt="龙闯电梯">
+        </a>
         <a class="site-navbar__brand-mini" href="javascript:;">{{ pageLanguage.abbreviation }}</a>
       </h1>
 
@@ -25,14 +27,14 @@
 <!--         <icon-svg :name="this.$store.state.user.favorite?'xiangqufill':'xiangqu'" ></icon-svg>-->
 <!--        </span>-->
         <el-menu-item class="site-navbar__avatar" index="1">
-          <span class="el-dropdown-link" @click="userSetting">
+<!--          <span class="el-dropdown-link" @click="userSetting">
             <icon-svg name="editTable" style="width: 25px;height: 25px;margin-top: 5px"></icon-svg>
-          </span>
+          </span>-->
         </el-menu-item>
         <el-menu-item class="site-navbar__avatar" index="0">
-          <span @click="favoriteFunction()">
+<!--          <span @click="favoriteFunction()">
          <icon-svg :name="favorite?'xiangqufill':'xiangqu'" style="margin-top: 11px" class="sl-svg"></icon-svg>
-        </span>
+        </span>-->
         </el-menu-item>
 <!--        <el-menu-item class="site-navbar__avatar" index="2">-->
 <!--                      <span style="    color: #909399;" @click="helpFileList()">-->
@@ -61,8 +63,7 @@
         <el-menu-item class="site-navbar__avatar" index="4">
           <el-dropdown :show-timeout="0" placement="bottom">
                       <span class="el-dropdown-link custom-avatar">
-                       {{ userName }}
-<!--                        <img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}-->
+                        <img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}
                       </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="logoutHandle()">退出</el-dropdown-item>
@@ -130,7 +131,6 @@ import column from "./modules/common/column";
 import {
   searchFunctionButtonList,
   saveButtonList,
-  searchSysLanguage,
   getRevisionInformation, // 获取版本信息
 } from "@/api/sysLanguage.js"
 import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -367,9 +367,11 @@ export default {
     },
     // 获取多语言列表
     getLanguageList() {
-      searchSysLanguage({languageCode: this.$i18n.locale}).then(({data}) => {
-        this.languageList = data.rows
-      })
+      const isEn = this.$i18n.locale === 'en'
+      this.languageList = [
+        { languageCode: 'cn', languageName: isEn ? 'Chinese' : '中文' },
+        { languageCode: 'en', languageName: isEn ? 'English' : '英文' }
+      ]
     },
     // 获取页面多语言数据
     getFunctionButtonList() {
@@ -499,12 +501,34 @@ export default {
 
 .site-navbar__brand-lg, .site-navbar__brand-mini {
   margin: 0 5px;
-  color: #fff;
-  margin-left: -45px;
+  color: #f7fffe;
+  font-weight: 700;
+  letter-spacing: 1px;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.35);
+  -webkit-font-smoothing: antialiased;
+}
+
+.site-navbar__brand-lg {
+  display: inline-flex;
+  align-items: center;
+  font-size: 22px;
 }
 
+.site-navbar__brand-mini {
+  font-size: 16px;
+}
+
+.site-navbar__brand-logo {
+  width: auto;
+  max-width: 136px;
+  object-fit: contain;
+}
+.site-navbar__brand {
+  background-color: #263238;
+  border-right: 1px solid rgba(255, 255, 255, 0.08);
+}
 .el-menu--horizontal > .el-menu-item {
-  color: #3b4249;
+  color: #f5f7f9;
 }
 .aaa div{
   margin-top: 10px;

src/views/modules/longchuang/production-work-report.vue → src/views/modules/longtron/production-work-report.vue

@@ -160,7 +160,7 @@
         @size-change="sizeChangeHandle"
         @current-change="currentChangeHandle"
         :current-page="pageIndex"
-        :page-sizes="[6, 12, 24]"
+        :page-sizes="[8, 12, 24]"
         :page-size="pageSize"
         :total="totalPage"
         layout="total, sizes, prev, pager, next, jumper"
@@ -257,11 +257,11 @@ export default {
         planStartDate: '',
         planEndDate: '',
         page: 1,
-        limit: 6
+        limit: 8
       },
       dataList: [],
       pageIndex: 1,
-      pageSize: 6,
+      pageSize: 8,
       totalPage: 0,
       reportDialogVisible: false,
       historyDialogVisible: false,