diff --git a/web/src/utils/format.js b/web/src/utils/format.js new file mode 100644 index 00000000..987992d6 --- /dev/null +++ b/web/src/utils/format.js @@ -0,0 +1,17 @@ +import { formatTimeToStr } from '@/utils/date' + +export const formatBoolean = (bool) => { + if (bool !== null) { + return bool ? '是' : '否' + } else { + return '' + } +} +export const formatDate = (time) => { + if (time !== null && time !== '') { + var date = new Date(time) + return formatTimeToStr(date, 'yyyy-MM-dd hh:mm:ss') + } else { + return '' + } +} diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue index 3ae5619c..2da3b2dd 100644 --- a/web/src/view/superAdmin/api/api.vue +++ b/web/src/view/superAdmin/api/api.vue @@ -239,7 +239,7 @@ const getTableData = async() => { } } -getTableData(getApiList) +getTableData() // 批量操作 const handleSelectionChange = (val) => { diff --git a/web/src/view/superAdmin/dictionary/sysDictionary.vue b/web/src/view/superAdmin/dictionary/sysDictionary.vue index 4e8f579e..484b5315 100644 --- a/web/src/view/superAdmin/dictionary/sysDictionary.vue +++ b/web/src/view/superAdmin/dictionary/sysDictionary.vue @@ -21,14 +21,28 @@ - 查询 - 重置 + 查询 + 重置
- 新增 + 新增
- + - + - + - + @@ -82,14 +137,24 @@ />
- - + + @@ -97,20 +162,33 @@ v-model="formData.type" placeholder="请输入字典名(英)" clearable - :style="{width: '100%'}" + :style="{ width: '100%' }" /> - + - + @@ -118,140 +196,174 @@ + + - + diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue index 84728d50..be422e38 100644 --- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue +++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue @@ -48,12 +48,12 @@