Merge branch 'dongming' of http://120.46.222.128:10021/elink-star/epmet-work-pc-chengyang into xiaowang-featrue

src/i18n/zh-CN.js

@@ -3,9 +3,9 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = 'e联社区数智平台'
+t.brand.lg = '东明县智慧社区平台'
 t.brand.mini = '数字'
-t.brand.work = 'e联社区数智平台'
+t.brand.work = '东明县智慧社区平台'
 t.brand.workMini = '工作端'
 
 t.add = '新增'

src/views/dataBoard/overview/components/jdjs.vue

@@ -241,8 +241,11 @@ export default {
               align: 'center',
               interval: 0,
               textStyle: {
-                fontSize: 12,
+                fontSize: 10,
-                color: '#A3B9DA'
+                color: '#A3B9DA',
+              },
+              formatter: function (value) {
+                  return value.length > 4 ? value.slice(0, 4) + '\n' + value.slice(4) : value;
               }
             },
             boundaryGap: true,

src/views/pages/login.vue

@@ -6,7 +6,7 @@
         <img src="@/assets/img/login/loginLeft.png" width="720px" height="586px" class="i-left">
       </div>
         <div class="fm">
-          <img src="@/assets/images/index/logo.png" width="50px" height="50px" class="i-logo">
+          <!-- <img src="@/assets/images/index/logo.png" width="50px" height="50px" class="i-logo"> -->
           <h2 class="title">{{ $t("brand.work") }}</h2>
           <el-form
             :model="dataForm"