diff --git a/index.html b/index.html
index d7b892ad..a9b2b266 100644
--- a/index.html
+++ b/index.html
@@ -4,14 +4,14 @@
-
Checkpoint MES
+ Longtron MES
<% if (process.env.NODE_ENV === 'production') { %>
<% }else { %>
-
+
diff --git a/src/assets/img/avatar.png b/src/assets/img/avatar.png
index de3d87c5..dcf49122 100644
Binary files a/src/assets/img/avatar.png and b/src/assets/img/avatar.png differ
diff --git a/src/assets/img/lc.png b/src/assets/img/lc.png
new file mode 100644
index 00000000..fa3c77ff
Binary files /dev/null and b/src/assets/img/lc.png differ
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 395c3cae..797ab914 100644
--- a/src/assets/scss/global.scss
+++ b/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 {
diff --git a/src/router/index.js b/src/router/index.js
index 9d4358a3..5afc817f 100644
--- a/src/router/index.js
+++ b/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: '工厂综合运营看板' } },
]
// 主入口路由(需嵌套上左右整体布局)
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 0225a130..15918bb7 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -10,7 +10,9 @@
- 龙闯电梯
+
+
+
{{ pageLanguage.abbreviation }}
@@ -25,14 +27,14 @@
-
+
-
+
@@ -61,8 +63,7 @@
- {{ userName }}
-
+
{{ userName }}
退出
@@ -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;
diff --git a/src/views/modules/longchuang/production-plan-cable-cop-task.vue b/src/views/modules/longtron/production-plan-cable-cop-task.vue
similarity index 100%
rename from src/views/modules/longchuang/production-plan-cable-cop-task.vue
rename to src/views/modules/longtron/production-plan-cable-cop-task.vue
diff --git a/src/views/modules/longchuang/production-plan-home-order.vue b/src/views/modules/longtron/production-plan-home-order.vue
similarity index 100%
rename from src/views/modules/longchuang/production-plan-home-order.vue
rename to src/views/modules/longtron/production-plan-home-order.vue
diff --git a/src/views/modules/longchuang/production-plan-renovation-order.vue b/src/views/modules/longtron/production-plan-renovation-order.vue
similarity index 100%
rename from src/views/modules/longchuang/production-plan-renovation-order.vue
rename to src/views/modules/longtron/production-plan-renovation-order.vue
diff --git a/src/views/modules/longchuang/production-work-report.vue b/src/views/modules/longtron/production-work-report.vue
similarity index 99%
rename from src/views/modules/longchuang/production-work-report.vue
rename to src/views/modules/longtron/production-work-report.vue
index 00eb0bf3..948f3bd7 100644
--- a/src/views/modules/longchuang/production-work-report.vue
+++ b/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,
diff --git a/src/views/modules/longchuang/screen-cable-cop-progress.vue b/src/views/modules/longtron/screen-cable-cop-progress.vue
similarity index 100%
rename from src/views/modules/longchuang/screen-cable-cop-progress.vue
rename to src/views/modules/longtron/screen-cable-cop-progress.vue
diff --git a/src/views/modules/longchuang/screen-factory-overview.vue b/src/views/modules/longtron/screen-factory-overview.vue
similarity index 100%
rename from src/views/modules/longchuang/screen-factory-overview.vue
rename to src/views/modules/longtron/screen-factory-overview.vue
diff --git a/src/views/modules/longchuang/screen-renovation-progress.vue b/src/views/modules/longtron/screen-renovation-progress.vue
similarity index 100%
rename from src/views/modules/longchuang/screen-renovation-progress.vue
rename to src/views/modules/longtron/screen-renovation-progress.vue
diff --git a/src/views/modules/longchuang/screen-whole-lift-progress.vue b/src/views/modules/longtron/screen-whole-lift-progress.vue
similarity index 100%
rename from src/views/modules/longchuang/screen-whole-lift-progress.vue
rename to src/views/modules/longtron/screen-whole-lift-progress.vue
diff --git a/static/img/favicon.ico b/static/img/favicon.ico
index 7f594abd..56e55b21 100644
Binary files a/static/img/favicon.ico and b/static/img/favicon.ico differ
diff --git a/static/img/lc.png b/static/img/lc.png
new file mode 100644
index 00000000..dcf49122
Binary files /dev/null and b/static/img/lc.png differ