gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CN-936 开发appearance页面:保存逻辑调整，及timezoneOffset设置方式修改

Browse Source
This commit is contained in:
hyx
2023-03-24 18:44:02 +08:00
parent 102f99e4f5
commit 5433006ebd
6 changed files with 148 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/table/report/ReportTable.vue
View File

@@ -292,7 +292,7 @@ export default {
loadingTableId: '',
loadingPreviewId: '',
downDataList: [],
disableEdit:false,//编辑按钮是否不可用，当选择多条记录的时候你，编辑按钮不可用
disableEdit: false, // 编辑按钮是否不可用，当选择多条记录的时候你，编辑按钮不可用
// pageObj: {
// pageNo: 1,
// pageSize: 20,
@@ -542,9 +542,9 @@ export default {
// this.selectIds = selectIds
}
this.batchDeleteObjs = objs
if(objs.length > 1) {
if (objs.length > 1) {
this.disableEdit = true
}else {
} else {
this.disableEdit = false
}
},
@@ -566,9 +566,9 @@ export default {
}
this.batchDeleteObjs = objs
if(objs.length > 1) {
if (objs.length > 1) {
this.disableEdit = true
}else {
} else {
this.disableEdit = false
}

30
src/mixins/data-list.js
View File

@@ -37,7 +37,7 @@ export default {
tableData: [],
scrollbarWrap: null,
delFlag: false,
disableEdit:false,//编辑按钮是否不可用，当选择多条记录的时候你，编辑按钮不可用
disableEdit: false, // 编辑按钮是否不可用，当选择多条记录的时候你，编辑按钮不可用
operationWidth: '165' // 操作列宽
}
},
@@ -75,9 +75,9 @@ export default {
},
selectionChange (objs) {
this.batchDeleteObjs = objs
if(this.batchDeleteObjs.length > 1) {
if (this.batchDeleteObjs.length > 1) {
this.disableEdit = true
}else {
} else {
this.disableEdit = false
}
},
@@ -129,18 +129,18 @@ export default {
})
},
delBatch () {
let ids = []
if(this.batchDeleteObjs && this.batchDeleteObjs.length > 0){
this.batchDeleteObjs.forEach(item =>{
const ids = []
if (this.batchDeleteObjs && this.batchDeleteObjs.length > 0) {
this.batchDeleteObjs.forEach(item => {
ids.push(item.id)
})
}
if(ids.length === 0){
this.$alert(this.$t('tip.pleaseSelect'),{
if (ids.length === 0) {
this.$alert(this.$t('tip.pleaseSelect'), {
confirmButtonText: this.$t('tip.yes'),
type:'warning'
type: 'warning'
})
}else {
} else {
this.$confirm(this.$t('tip.confirmDelete'), {
confirmButtonText: this.$t('tip.yes'),
cancelButtonText: this.$t('tip.no'),
@@ -199,13 +199,13 @@ export default {
}
})
},
editSelectRecord(){
if(this.batchDeleteObjs.length === 0){
this.$alert(this.$t('tip.pleaseSelectForEdit'),{
editSelectRecord () {
if (this.batchDeleteObjs.length === 0) {
this.$alert(this.$t('tip.pleaseSelectForEdit'), {
confirmButtonText: this.$t('tip.yes'),
type:'warning'
type: 'warning'
})
}else {
} else {
get(`${this.url}/${this.batchDeleteObjs[0].id}`).then(response => {
if (response.code === 200) {
this.object = response.data

2
src/utils/api.js
View File

@@ -20,7 +20,7 @@ export const api = {
login: '/sys/login',
// user
user: '/sys/user',
timezone:'/sys/timezones',
timezone: '/sys/timezones',
// 获取配置
config: '/sys/config',
// role

2
src/utils/date-util.js
View File

@@ -1,5 +1,5 @@
import _ from 'lodash'
import {storageKey} from '@/utils/constants'
import { storageKey } from '@/utils/constants'
// 将时间转化为秒
export function getSecond (time) {

129
src/views/administration/Appearance.vue
View File

@@ -57,12 +57,11 @@
</div>
</template>
<script>
import { api,getDictList } from '@/utils/api'
import { get, put } from '@/utils/http'
import { storageKey } from '@/utils/constants'
import { api } from '@/utils/api'
import { storageKey } from '@/utils/constants'
import axios from 'axios'
export default {
export default {
name: 'Appearance',
data () {
return {
@@ -72,37 +71,37 @@
lang: '',
timezone: ''
},
timezoneList:[],
dateFormatList:[
timezoneList: [],
dateFormatList: [
{
id:1,
label:'DD/MM/YYYY HH:mm:ss',
value:'DD/MM/YYYY HH:mm:ss',
example:'20/03/2023 09:30:38'
id: 1,
label: 'DD/MM/YYYY HH:mm:ss',
value: 'DD/MM/YYYY HH:mm:ss',
example: '20/03/2023 09:30:38'
},
{
id:2,
label:'MM/DD/YYYY HH:mm:ss',
value:'MM/DD/YYYY HH:mm:ss',
example:'03/20/2023 09:30:38'
id: 2,
label: 'MM/DD/YYYY HH:mm:ss',
value: 'MM/DD/YYYY HH:mm:ss',
example: '03/20/2023 09:30:38'
},
{
id:3,
label:'YYYY-MM-DD HH:mm:ss',
value:'YYYY-MM-DD HH:mm:ss',
example:'2023-03-20 09:30:38'
id: 3,
label: 'YYYY-MM-DD HH:mm:ss',
value: 'YYYY-MM-DD HH:mm:ss',
example: '2023-03-20 09:30:38'
}
],
langList:[
langList: [
{
id:1,
label:'English',
value:'en'
id: 1,
label: 'English',
value: 'en'
},
{
id:2,
label:'中文',
value:'zh'
id: 2,
label: '中文',
value: 'zh'
}
]
}
@@ -110,60 +109,70 @@
mounted () {
this.initData()
},
methods:{
async initData () {
methods: {
initData () {
this.dateFormatList.forEach(date => {
date.example = window.$dayJs(new Date()).tz().format(date.value)
})
await get(api.timezone).then(response => {
if (response.code === 200) {
this.timezoneList = response.data
}
})
axios.get(api.timezone).then(response => {
if (response.data.code === 200) {
this.timezoneList = response.data.data
if (this.timezoneList && this.timezoneList.length > 0) {
this.timezoneList.forEach(mapData => {
let offset = Number(mapData.offset)/3600000 //转换为小
const offset = Number(mapData.offset) / 3600000 // 转换为小
mapData.timezoneOffset = offset
let hour = Math.abs(parseInt(offset))
let offsetStr = offset.toString()
const hour = Math.abs(parseInt(offset))
const offsetStr = offset.toString()
let minute = 0
if(offsetStr.indexOf('.') > -1){
minute = Math.abs(Number(offsetStr.substring(offsetStr.indexOf('.')))*60)
if (offsetStr.indexOf('.') > -1) {
minute = Math.abs(Number(offsetStr.substring(offsetStr.indexOf('.'))) * 60)
}
let str = ''
if(hour<10){
str = '0'+hour
}else {
if (hour < 10) {
str = '0' + hour
} else {
str = hour
}
str += ':'
if(minute<10){
str += '0'+minute
}else {
if (minute < 10) {
str += '0' + minute
} else {
str += minute
}
if(offset > 0){
mapData.offset = 'UTC+'+str
}else if(offset === 0){
if (offset > 0) {
mapData.offset = 'UTC+' + str
} else if (offset === 0) {
mapData.offset = 'UTC'
}else {
mapData.offset = 'UTC-'+str
} else {
mapData.offset = 'UTC-' + str
}
})
}
get(this.url, { pageSize: -1 }).then(response => {
if (response.code === 200) {
this.appearanceObject = response.data
}
})
axios.get(this.url, { pageSize: -1 }).then(response => {
if (response.data.code === 200) {
this.appearanceObject = response.data.data
}
})
},
save () {
if (this.blockOperation.save) { return }
this.blockOperation.save = true
put(this.url, this.appearanceObject).then(response => {
if (response.code === 200) {
axios.put(this.url, this.appearanceObject).then(response => {
if (response.data.code === 200) {
this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
if (this.appearanceObject.date_format !== localStorage.getItem(storageKey.dateFormat)) {
localStorage.setItem(storageKey.dateFormat, this.appearanceObject.date_format)
}
if (this.appearanceObject.timezone !== localStorage.getItem(storageKey.sysTimezone)) {
localStorage.setItem(storageKey.sysTimezone, this.appearanceObject.timezone)
window.$dayJs.tz.setDefault(this.appearanceObject.timezone)
localStorage.setItem(storageKey.timezoneOffset, window.$dayJs.tz().utcOffset() / 60)
localStorage.setItem(storageKey.timezoneLocalOffset, dayjs().utcOffset() / 60)
}
} else {
this.$message.error(response.message)
}
@@ -176,18 +185,8 @@
}
}).finally(() => {
this.blockOperation.save = false
if (this.appearanceObject.date_format !== localStorage.getItem(storageKey.dateFormat)) {
localStorage.setItem(storageKey.dateFormat, this.appearanceObject.date_format)
}
if (this.appearanceObject.timezone !== localStorage.getItem(storageKey.sysTimezone)) {
localStorage.setItem(storageKey.sysTimezone, this.appearanceObject.timezone)
}
let timezone = this.timezoneList.find(mapData => mapData.name === this.appearanceObject.timezone)
if (timezone.timezoneOffset !== localStorage.getItem(storageKey.timezoneOffset)) {
localStorage.setItem(storageKey.timezoneOffset, timezone.timezoneOffset)
}
})
}
}
}
}
</script>

10
src/views/report/Report.vue
View File

@@ -295,13 +295,13 @@ export default {
this.rightBox.show = true
},
editReport () {
if(this.batchDeleteObjs.length === 0){
this.$alert(this.$t('tip.pleaseSelectForEdit'),{
if (this.batchDeleteObjs.length === 0) {
this.$alert(this.$t('tip.pleaseSelectForEdit'), {
confirmButtonText: this.$t('tip.yes'),
type:'warning'
type: 'warning'
})
}else {
let curRecord = this.batchDeleteObjs[0]
} else {
const curRecord = this.batchDeleteObjs[0]
this.initConfig(curRecord)
this.object = curRecord
this.rightBox.show = true