diff --git a/src/assets/img/logo2.png b/src/assets/img/logo2.png new file mode 100644 index 0000000..774214b Binary files /dev/null and b/src/assets/img/logo2.png differ diff --git a/src/assets/img/logo3.png b/src/assets/img/logo3.png new file mode 100644 index 0000000..74c7ead Binary files /dev/null and b/src/assets/img/logo3.png differ diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 66261aa..23aaf6d 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -292,7 +292,7 @@ img { display: flex; align-items: stretch; height: $navbar--height; - background-color: #409EFF; + background-color: #0b58ff; box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05); } &--colorful { diff --git a/src/components/base-dialog/addOrUpdate/index.vue b/src/components/base-dialog/addOrUpdate/index.vue index 0f5ab4d..d061f46 100644 --- a/src/components/base-dialog/addOrUpdate/index.vue +++ b/src/components/base-dialog/addOrUpdate/index.vue @@ -121,7 +121,7 @@ const title = { // 或者也可以改造成自定义颜色： const btnType = { add :'#0b58ff', - save: '#0b58ff', + save: '#000', update: '#0b58ff', reset: '' // cancel: 'text' diff --git a/src/components/base-table/components/operationComponent.js b/src/components/base-table/components/operationComponent.js index ceee763..17ce171 100644 --- a/src/components/base-table/components/operationComponent.js +++ b/src/components/base-table/components/operationComponent.js @@ -4,7 +4,7 @@ * @Author: fzq * @Date: 2023-01-06 15:49:50 * @LastEditors: fzq - * @LastEditTime: 2023-01-13 16:46:13 + * @LastEditTime: 2023-01-16 10:18:25 */ import i18n from '@/i18n' diff --git a/src/components/base-table/index.vue b/src/components/base-table/index.vue index e73ee9f..a9b666a 100644 --- a/src/components/base-table/index.vue +++ b/src/components/base-table/index.vue @@ -32,7 +32,7 @@ :header-cell-style="{ background: '#FAFAFA', color: '#000', height: '40px' }" :max-height="maxHeight" :span-method="spanMethod || null" - :row-style="{ height: '20px' }" + :row-style="{ height: '40px' }" :cell-style="{ padding: '0px' }"> diff --git a/src/i18n/en.js b/src/i18n/en.js index cc0eef4..d06475d 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -72,7 +72,7 @@ t.andeng.btnVal = 'Button Value' t.andeng.btnBoxModel = 'Button Box Model' -t.copyright = 'Intelligent Automation Research Institute Co., Ltd' +t.copyright = 'VISHAKHA glass pvt Ltd' t.dictValueList = 'View Details' t.save = 'Save' t.add = 'Add' @@ -147,6 +147,12 @@ t.startTime = 'Start Time' t.endTime = 'End Time' t.today = 'Today' t.time = 'Time' +t.eqId = 'Current Equipment ID:' +t.ti = 'Time' +t.plcCode = 'PLC Code' +t.equName = 'Equipment Name' +t.equCode = 'Equipment Code' + t.graph = 'Graph' t.category = 'Category' @@ -444,7 +450,8 @@ t.login.username = 'Username' t.login.password = 'Password' t.login.captcha = 'Captcha' t.login.demo = 'Demo' -t.login.copyright = 'Copyright @Intelligent Automation Research Institute Co., Ltd Version: 1.0' +// t.login.copyright = 'Copyright @Intelligent Automation Research Institute Co., Ltd Version: 1.0' +t.login.copyright = 'Copyright @VISHAKHA glass pvt Ltd Version: 1.0' t.login.warning = 'Already Login!' t.schedule = {} diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index d413bae..e95d2f3 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -72,7 +72,7 @@ t.andeng.btnVal = '按钮值' t.andeng.btnBoxModel = '按钮盒模式' -t.copyright = '中建材智能自动化研究院有限公司' +t.copyright = 'VISHAKHA glass pvt Ltd' t.dictValueList = '查看值列表' t.save = '保存' t.add = '新增' // 1 @@ -148,6 +148,11 @@ t.endTime = '结束时间' // 1 t.to = '至' // 1 t.today = '今天' // 1 t.time = '选择时间' +t.eqId = '当前设备ID:' +t.ti = '时间' +t.plcCode = 'PLC 编码' +t.equName = '设备名称' +t.equCode = '设备编码' t.graph = '图形' t.category = '分类' @@ -444,7 +449,8 @@ t.login.username = '用户名' t.login.password = '密码' t.login.captcha = '验证码' t.login.demo = '在线演示' -t.login.copyright = '版权所有：中建材智能自动化研究院有限公司 版本: 1.0' +// t.login.copyright = '版权所有：中建材智能自动化研究院有限公司 版本: 1.0' +t.login.copyright = '版权所有：VISHAKHA glass pvt Ltd 版本: 1.0' t.login.warning = '已经登录过了' t.schedule = {} diff --git a/src/utils/request.js b/src/utils/request.js index 1424162..18b20d4 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,8 @@ const http = axios.create({ * 请求拦截 */ http.interceptors.request.use(config => { - config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' + // config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' + config.headers['Accept-Language'] = Cookies.get('language') || 'en' config.headers['token'] = Cookies.get('token') || '' // 默认参数 var defaults = {} @@ -59,6 +60,7 @@ http.interceptors.response.use(response => { router.replace({ name: 'login' }) return Promise.reject(response.data.msg) } + // 下三行注释掉 // else if (response.data.code === 500) { // return Promise.reject(response.data.msg) // } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 485ce13..196f04b 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -10,14 +10,14 @@

- + {{ $t('brand.lg') }} - +

@@ -133,7 +133,8 @@ backgroundColor: this.$route.meta.hiddenSiderbar !== true ? '#fff' : 'rgb(13,43,104)', color: this.$route.meta.hiddenSiderbar !== true ? '#000' : '#fff' }"> - + - + + diff --git a/src/views/modules/monitoring/equipmentHistoricalParameters.vue b/src/views/modules/monitoring/equipmentHistoricalParameters.vue index 4f792a8..5ed69fe 100644 --- a/src/views/modules/monitoring/equipmentHistoricalParameters.vue +++ b/src/views/modules/monitoring/equipmentHistoricalParameters.vue @@ -1,13 +1,16 @@
- - + + {{ $route.params.id }} - +
@@ -77,10 +80,10 @@ export default { type: 'index', name: i18n.t('index') }, - { prop: 'time', name: '时间', filter: timeFilter }, - { prop: 'plcCode', name: 'PLC 编码' }, - { prop: 'equName', name: '设备名称' }, - { prop: 'equCode', name: '设备编码' }, + { prop: 'time', name: this.$t('ti'), filter: timeFilter }, + { prop: 'plcCode', name: this.$t('plcCode') }, + { prop: 'equName', name: this.$t('equName') }, + { prop: 'equCode', name: this.$t('equCode') }, // ...['数值1', '数值2', '数值3'].map(name => { // return { prop: name, name } // }) diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index bb2019e..6d637b7 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -13,7 +13,7 @@

- + {{ $t('brand.lg') }}