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 0836b83d..0df84d2c 100644 --- a/back/src/views/main-navbar.vue +++ b/back/src/views/main-navbar.vue @@ -222,7 +222,7 @@ export default { .aui-navbar__header { width: 25%; .aui-navbar__brand { - margin-left: 20px; + margin-left: -30px; a { font-size: 22px; color: #ffffff; 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 @@ 日期: - @@ -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 = ''