大屏、储能首页及换肤

.env.development

@@ -4,7 +4,7 @@ ENV = 'development'
 # base api //http://192.168.1.181:8000/api   192.168.1.199:8000/api //  http://124.71.192.230:8000/api // http://127.0.0.1:4523/m1/1450402-0-default
 
 
-VUE_APP_BASE_API = 'https://zetatech.zzkj-cloud.com/api'
+VUE_APP_BASE_API = 'https://zzkj-cloud.com/api'
 VUE_APP_VISUALE_API = http://192.168.0.82:9527
 VUE_APP_ZUTAI_API = http://192.168.100.83:8001
 

.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://zetatech.zzkj-cloud.com/api'
+VUE_APP_BASE_API = 'https://zzkj-cloud.com/api'
 

public/bpmnjs/index.js

@@ -3450,7 +3450,7 @@ function getDi(element) {
 
 function getSemantic(element) {
   return element.businessObject;
-} // color access //////////////////////
+} //////////////////////
 
 
 function getFillColor(element, defaultColor) {

src/App.vue

@@ -60,7 +60,10 @@ export default {
 </style>
 <style lang="scss" scoped>
 ::v-deep .item-top-new {
-  background-image: var(--item-header-bg) !important;
+  background-image: var(--item-header-bg-new-2x) !important;
+  .top-title{
+    padding: 0 10px 0 15px !important;
+  }
 }
 
 ::v-deep #chart{
@@ -81,12 +84,17 @@ export default {
 }
 
 ::v-deep .stationData-content-box{
-    background: url(./assets/station-data/item-bg.png) no-repeat !important;
+    // background: url(./assets/station-data/item-bg.png) no-repeat !important;
     background-size: 100% 100%!important;
+    padding: 0 20px!important;
+    margin-bottom: 7px!important;
 }
 
 ::v-deep .price-con-item {
   background: url(./assets/images/price-bg.png) no-repeat !important;
   background-size: 100% 100%!important;
 }
+::v-deep .item-con{
+  background: rgba(0, 0, 0, 0.3) !important;
+}
 </style>

src/filters/index.js

@@ -1,4 +1,6 @@
 // import parseTime, formatTime and set to filter
+
+import { getLanguage } from '../lang'
 export { parseTime, formatTime } from '@/utils'
 
 /**
@@ -200,7 +202,7 @@ export function kgFormat(num, digits) {
  * @param {number} digits
  */
 export function moneyUnitFormat(num) {
-  if (sessionStorage.getItem('language') === 'en_US') {
+  if (getLanguage() !== 'zh_CN') {
     if (!num) {
       return 'EUR'
     }
@@ -226,7 +228,7 @@ export function moneyUnitFormat(num) {
  */
 
 export function KgUnitFormat(num) {
-  if (sessionStorage.getItem('language') === 'en_US') {
+  if (getLanguage() === 'en_US') {
     if (!num) {
       return 'kg'
     }

src/lang/dashboard/zh.js

@@ -198,7 +198,7 @@ export default {
     shutStan: '待机/停机',
     powerSide: '电厂侧',
     energySide: '储能侧',
-    controlPlatform: '智慧储能管控平台',
+    controlPlatform: '中自智慧能源平台',
     measureAmmeter: '计量电表',
     sodBattery: '钠离子电池',
     Atransformer: '一段变压器',

src/lang/en.js

@@ -94,9 +94,9 @@ export default {
     noPagePermiss: 'No permission for this page'
   },
   login: {
-    title: 'Smart energy storage control platform',
+    title: 'Zetatech smart energy storage management platform',
     logIn: 'Login',
-    username: 'Account',
+    username: 'Username',
     password: 'Password',
     any: 'Fill as needed',
     thirdparty: 'Third-party login',