diff --git a/src/App.vue b/src/App.vue index 17a8eed9..894320dc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -99,7 +99,7 @@ body .ant-pro-basicLayout { display: flex; flex-wrap: wrap; justify-content: flex-start; - align-items: center; + align-items: left; } .button-container > button { @@ -115,7 +115,7 @@ body .ant-pro-basicLayout { .button-container { flex-direction: row; align-items: flex-start; - align-items: center; + align-items: left; } .button-container > button { margin-right: 12px; @@ -127,7 +127,7 @@ body .ant-pro-basicLayout { .button-container { flex-direction: column; align-items: flex-start; - align-items: center; + align-items: left; } .button-container > button { margin-right: 0px; diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue index 30ac1e7b..167c541c 100644 --- a/src/views/faultManage/active-alarm/index.vue +++ b/src/views/faultManage/active-alarm/index.vue @@ -22,7 +22,7 @@ import { writeSheet } from '@/utils/execl-utils'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { readLoalXlsx } from '@/utils/execl-utils'; const { getDict } = useDictStore(); -const { t,currentLocale } = useI18n(); +const { t, currentLocale } = useI18n(); /**字典数据 */ let dict: { @@ -233,9 +233,6 @@ let tableColumns: ColumnsType = [ }, ]; - - - /**帮助文档表格字段列 */ let alarmTableColumns: ColumnsType = [ { @@ -246,19 +243,19 @@ let alarmTableColumns: ColumnsType = [ }, { title: t('views.faultManage.activeAlarm.locationInfo'), - dataIndex: 'alarmInfo', + dataIndex: 'alarmInfo', align: 'center', width: 5, }, { title: t('views.faultManage.activeAlarm.addInfo'), - dataIndex:'helpInfo', + dataIndex: 'helpInfo', align: 'center', width: 8, }, { title: t('views.faultManage.activeAlarm.alarmType'), - dataIndex: 'alarmType', + dataIndex: 'alarmType', align: 'center', width: 5, }, @@ -294,7 +291,7 @@ let alarmTableColumns: ColumnsType = [ }, { title: t('views.faultManage.activeAlarm.objectNf'), - dataIndex:'objNf', + dataIndex: 'objNf', align: 'center', width: 2, }, @@ -416,14 +413,12 @@ function fnModalVisibleByVive(row: Record) { modalState.visibleByView = true; } - - /** 告警帮助文档详细信息 */ function fnModalVisibleBy(code: string) { modalState.helpShowView = false; - const lang=currentLocale.value.split('_')[0]; - modalState.title=t('views.faultManage.activeAlarm.helpFile'); - readLoalXlsx(lang,code) + const lang = currentLocale.value.split('_')[0]; + modalState.title = t('views.faultManage.activeAlarm.helpFile'); + readLoalXlsx(lang, code) .then(res => { alarmTableState.data = res; modalState.helpShowView = true; @@ -438,7 +433,7 @@ function fnModalVisibleBy(code: string) { function fnModalOk() { modalState.confirmLoading = true; const from = toRaw(modalState.from); - if (from.ackState==="1") { + if (from.ackState === '1') { message.error({ content: t('views.faultManage.activeAlarm.ackError'), duration: 3, @@ -661,7 +656,7 @@ function fnModalCancel() { modalState.visibleByEdit = false; modalState.visibleByView = false; modalState.visibleByShowSet = false; - modalState.helpShowView=false; + modalState.helpShowView = false; } /**查询列表, pageNum初始页数 */ @@ -850,12 +845,9 @@ onMounted(() => { - + @@ -1011,7 +1001,6 @@ onMounted(() => { - { :data-source="alarmTableState.data" :size="alarmTableState.size" :pagination="false" - :scroll="{ x: 1700, y: 560 }" + :scroll="{ x: 1700, y: 560 }" > diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue index 492c9909..27b8a92f 100644 --- a/src/views/monitor/job/index.vue +++ b/src/views/monitor/job/index.vue @@ -645,12 +645,9 @@ onMounted(() => { - + @@ -874,7 +866,8 @@ onMounted(() => { {{ - dict.sysJobStatus.find(s => s.value === modalState.from.status)?.label + dict.sysJobStatus.find(s => s.value === modalState.from.status) + ?.label }} diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue index 2df020b8..df32b7d7 100644 --- a/src/views/monitor/job/log.vue +++ b/src/views/monitor/job/log.vue @@ -491,53 +491,44 @@ onMounted(() => { - + diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue index a512bd5d..7c369498 100644 --- a/src/views/neUser/auth/index.vue +++ b/src/views/neUser/auth/index.vue @@ -728,78 +728,74 @@ onMounted(() => { - + diff --git a/src/views/neUser/pcf/index.vue b/src/views/neUser/pcf/index.vue index f8639b13..e9a06add 100644 --- a/src/views/neUser/pcf/index.vue +++ b/src/views/neUser/pcf/index.vue @@ -567,9 +567,8 @@ onMounted(() => { diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index d4c10c70..c83c3377 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -491,45 +491,39 @@ onMounted(() => { - + diff --git a/src/views/system/role/auth-user.vue b/src/views/system/role/auth-user.vue index 15ebc05a..ac0c03d1 100644 --- a/src/views/system/role/auth-user.vue +++ b/src/views/system/role/auth-user.vue @@ -394,43 +394,35 @@ onMounted(() => { - + diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 738a25f6..d9ee75e1 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -815,12 +815,9 @@ onMounted(() => { @@ -1242,7 +1236,10 @@ onMounted(() => { - + {{ parseDateToStr(+modalState.from.createTime) }} @@ -1251,12 +1248,18 @@ onMounted(() => { - + {{ modalState.from.roleSort }} - + { - + {{ modalState.from.roleName }} - + {{ modalState.from.roleKey }} - + {{ modalState.from.remark }} @@ -1299,21 +1305,21 @@ onMounted(() => { :checked="modalState.deptTree.expandedKeys.length > 0" @change="(e:any) => fnModalExpandedKeys(e.target.checked, 'dept')" > - {{t('views.system.role.openSwitch')}} + {{ t('views.system.role.openSwitch') }} - {{t('views.system.role.selAllSwitch')}} + {{ t('views.system.role.selAllSwitch') }} - {{t('views.system.role.relationSwitch')}} + {{ t('views.system.role.relationSwitch') }} { - +