From 43bc0dd992438b96737b27407b84de36da6cafe1 Mon Sep 17 00:00:00 2001
From: guoyue <guoyue2@hisense.com>
Date: Fri, 28 Oct 2022 14:57:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=97=A5=E6=9C=9F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/abilityStatistics/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index ac6bb284..8c544ba2 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -26,7 +26,7 @@
         <!--起始日期 @keyup.enter.native="getDataList()"-->
         <el-form-item>
           <span>日期：</span>
-          <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
             end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
@@ -909,8 +909,10 @@ export default {
     // 点击查询按钮查询数据
     getDataList() {
       if (this.value1 && this.value1.length > 0) {
-        this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
-        this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
+        // this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
+        // this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
+        this.startDate = this.value1[0]
+        this.endDate = this.value1[1]
       } else {
         this.startDate = ''
         this.endDate = ''

From 7e6fb8417a64a9c851592169296caf4269ebf87a Mon Sep 17 00:00:00 2001
From: unknown <xiaoshangqing@Hisense.ad>
Date: Fri, 28 Oct 2022 15:25:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/i18n/zh-CN.js         |  6 +++---
 back/src/i18n/zh-TW.js         | 10 ++++++----
 back/src/views/main-navbar.vue |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js
index acefdd06..4e8b0e9a 100644
--- a/back/src/i18n/zh-CN.js
+++ b/back/src/i18n/zh-CN.js
@@ -3,8 +3,8 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '能力管理中心'
-t.brand.mini = '一体化综合指挥'
+t.brand.lg = '通用服务平台'
+t.brand.mini = '城市云脑'
 
 t.add = '新增'
 t.delete = '删除'
@@ -576,4 +576,4 @@ t.infrastructure.street = '所在街道'
 t.infrastructure.department = '所属部门'
 t.infrastructure.associatedApplication = '关联应用'
 
-export default t
+export default t
\ No newline at end of file
diff --git a/back/src/i18n/zh-TW.js b/back/src/i18n/zh-TW.js
index 3e6f2cd5..55803337 100644
--- a/back/src/i18n/zh-TW.js
+++ b/back/src/i18n/zh-TW.js
@@ -3,8 +3,10 @@ const t = {}
 t.loading = '加載中...'
 
 t.brand = {}
-t.brand.lg = '能力管理中心'
-t.brand.mini = '一体化综合指挥'
+    // t.brand.lg = '能力管理中心'
+    // t.brand.mini = '一体化综合指挥'
+t.brand.lg = '通用服务平台'
+t.brand.mini = '城市云脑'
 
 t.add = '新增'
 t.delete = '刪除'
@@ -25,7 +27,7 @@ t.choose = '請選擇'
 t.fileName = '文件名'
 t.design = '在線設計'
 t.preview = '預覽'
-t.reset='重置'
+t.reset = '重置'
 
 t.prompt = {}
 t.prompt.title = '提示'
@@ -544,4 +546,4 @@ t.notice.new = '有新通知'
 t.notice.disconnect = '連接斷開'
 t.notice.disconnectMessage = 'WebSocket連接已斷開，請檢查網絡'
 
-export default t
+export default t
\ No newline at end of file
diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index f624e6cd..0959e0bb 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -221,7 +221,7 @@ export default {
   .aui-navbar__header {
     width: 25%;
     .aui-navbar__brand {
-      margin-left: 20px;
+      margin-left: -30px;
       a {
         font-size: 22px;
         color: #ffffff;