wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-10-28 16:39:20 +08:00
parent 6967b3f1da dd38eba69b
commit 23a885e051
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/src/i18n/zh-CN.js
View File

@ -3,8 +3,8 @@ const t = {}
t.loading = '加载中...' t.loading = '加载中...'
t.brand = {} t.brand = {}
t.brand.lg = '能力管理中心' t.brand.lg = '通用服务平台'
t.brand.mini = '一体化综合指挥' t.brand.mini = '城市云脑'
t.add = '新增' t.add = '新增'
t.delete = '删除' t.delete = '删除'
@ -576,4 +576,4 @@ t.infrastructure.street = '所在街道'
t.infrastructure.department = '所属部门' t.infrastructure.department = '所属部门'
t.infrastructure.associatedApplication = '关联应用' t.infrastructure.associatedApplication = '关联应用'
export default t export default t

10
back/src/i18n/zh-TW.js
View File

@ -3,8 +3,10 @@ const t = {}
t.loading = '加載中...' t.loading = '加載中...'
t.brand = {} t.brand = {}
t.brand.lg = '能力管理中心' // t.brand.lg = '能力管理中心'
t.brand.mini = '一体化综合指挥' // t.brand.mini = '一体化综合指挥'
t.brand.lg = '通用服务平台'
t.brand.mini = '城市云脑'
t.add = '新增' t.add = '新增'
t.delete = '刪除' t.delete = '刪除'
@ -25,7 +27,7 @@ t.choose = '請選擇'
t.fileName = '文件名' t.fileName = '文件名'
t.design = '在線設計' t.design = '在線設計'
t.preview = '預覽' t.preview = '預覽'
t.reset='重置' t.reset = '重置'
t.prompt = {} t.prompt = {}
t.prompt.title = '提示' t.prompt.title = '提示'
@ -544,4 +546,4 @@ t.notice.new = '有新通知'
t.notice.disconnect = '連接斷開' t.notice.disconnect = '連接斷開'
t.notice.disconnectMessage = 'WebSocket連接已斷開，請檢查網絡' t.notice.disconnectMessage = 'WebSocket連接已斷開，請檢查網絡'
export default t export default t

2
back/src/views/main-navbar.vue
View File

@ -222,7 +222,7 @@ export default {
.aui-navbar__header { .aui-navbar__header {
width: 25%; width: 25%;
.aui-navbar__brand { .aui-navbar__brand {
margin-left: 20px; margin-left: -30px;
a { a {
font-size: 22px; font-size: 22px;
color: #ffffff; color: #ffffff;

8
back/src/views/modules/abilityStatistics/index.vue
View File

@ -26,7 +26,7 @@
<!--起始日期 @keyup.enter.native="getDataList()"--> <!--起始日期 @keyup.enter.native="getDataList()"-->
<el-form-item> <el-form-item>
<span>日期：</span> <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"> end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -909,8 +909,10 @@ export default {
// 点击查询按钮查询数据 // 点击查询按钮查询数据
getDataList() { getDataList() {
if (this.value1 && this.value1.length > 0) { if (this.value1 && this.value1.length > 0) {
this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd') // this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd') // this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
this.startDate = this.value1[0]
this.endDate = this.value1[1]
} else { } else {
this.startDate = '' this.startDate = ''
this.endDate = '' this.endDate = ''