BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1b2c2b4257de303e32e24c397635a9e5f8d3b65f

Authored by xingyu
1 parent bc233df9

fix: datetimerange type error

Inline Side-by-side
Showing 11 changed files with 62 additions and 108 deletions
yudao-ui-admin-vue3/src/views/system/dept/index.vue
  View file @1b2c2b4
... ... @@ -29,10 +29,10 @@ const formRef = ref<FormExpose>()
29 29  
30 30 // ========== 创建部门树结构 ==========
31 31 const filterText = ref('')
32   -const deptOptions = ref([]) // 树形结构
  32 +const deptOptions = ref() // 树形结构
33 33 const treeRef = ref<InstanceType<typeof ElTree>>()
34 34 const getTree = async () => {
35   - const res = await DeptApi.listSimpleDeptApi()
  35 + const res = await DeptApi.getDeptPageApi(null)
36 36 deptOptions.value = handleTree(res)
37 37 }
38 38 const filterNode = (value: string, data: Tree) => {
... ... @@ -118,6 +118,7 @@ onMounted(async () =&gt; {
118 118 :highlight-current="true"
119 119 default-expand-all
120 120 :filter-node-method="filterNode"
  121 + :expand-on-click-node="false"
121 122 >
122 123 <template #default="{ node, data }">
123 124 <span class="custom-tree-node">
... ...
yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
  View file @1b2c2b4
... ... @@ -56,26 +56,13 @@ const crudSchemas = reactive&lt;CrudSchema[]&gt;([
56 56 field: 'createTime',
57 57 form: {
58 58 show: false
59   - }
60   - },
61   - {
62   - label: t('common.createTime'),
63   - field: 'daterange',
64   - table: {
65   - show: false
66   - },
67   - form: {
68   - show: false
69   - },
70   - detail: {
71   - show: false
72 59 },
73 60 search: {
74 61 show: true,
75 62 component: 'DatePicker',
76 63 componentProps: {
77   - type: 'daterange',
78   - valueFormat: 'YYYY-MM-DD'
  64 + type: 'datetimerange',
  65 + valueFormat: 'YYYY-MM-DD HH:mm:ss'
79 66 }
80 67 }
81 68 },
... ...
yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts
  View file @1b2c2b4
... ... @@ -54,26 +54,13 @@ const crudSchemas = reactive&lt;CrudSchema[]&gt;([
54 54 field: 'createTime',
55 55 form: {
56 56 show: false
57   - }
58   - },
59   - {
60   - label: t('common.createTime'),
61   - field: 'daterange',
62   - table: {
63   - show: false
64   - },
65   - form: {
66   - show: false
67   - },
68   - detail: {
69   - show: false
70 57 },
71 58 search: {
72 59 show: true,
73 60 component: 'DatePicker',
74 61 componentProps: {
75   - type: 'daterange',
76   - valueFormat: 'YYYY-MM-DD'
  62 + type: 'datetimerange',
  63 + valueFormat: 'YYYY-MM-DD HH:mm:ss'
77 64 }
78 65 }
79 66 },
... ...
yudao-ui-admin-vue3/src/views/system/menu/index.vue
  View file @1b2c2b4
... ... @@ -16,10 +16,10 @@ import {
16 16 ElInput,
17 17 ElInputNumber,
18 18 ElSelect,
  19 + ElTreeSelect,
19 20 ElOption,
20 21 ElMessageBox,
21 22 ElMessage,
22   - ElCascader,
23 23 ElRadioGroup,
24 24 ElRadioButton
25 25 } from 'element-plus'
... ... @@ -41,10 +41,13 @@ const menuProps = {
41 41 label: 'name',
42 42 value: 'id'
43 43 }
44   -const menuOptions = ref([]) // 树形结构
  44 +const menuOptions = ref() // 树形结构
45 45 const getTree = async () => {
46 46 const res = await MenuApi.listSimpleMenusApi()
47   - menuOptions.value = handleTree(res)
  47 + const menu = { id: 0, name: '主类目', children: [] }
  48 + menu.children = handleTree(res)
  49 + console.info(menu)
  50 + menuOptions.value = menu
48 51 }
49 52 // ========== 查询 ==========
50 53 const queryParams = reactive({
... ... @@ -264,13 +267,12 @@ onMounted(async () =&gt; {
264 267 <el-row :gutter="24">
265 268 <el-col :span="24">
266 269 <el-form-item label="上级菜单">
267   - <el-cascader
268   - :options="menuData"
269   - :props="menuProps"
270   - placeholder="请选择上级菜单"
  270 + <el-tree-select
  271 + node-key="id"
271 272 v-model="menuForm.parentId"
272   - class="w-100"
273   - clearable
  273 + :props="menuProps"
  274 + :data="menuData"
  275 + check-strictly
274 276 />
275 277 </el-form-item>
276 278 </el-col>
... ...
yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
  View file @1b2c2b4
1 1 <script setup lang="ts">
2 2 import { ref, unref } from 'vue'
3 3 import dayjs from 'dayjs'
4   -import { ElMessage, ElImage } from 'element-plus'
  4 +import { ElMessage, ElImage, ElTag } from 'element-plus'
5 5 import { DICT_TYPE } from '@/utils/dict'
6 6 import { useTable } from '@/hooks/web/useTable'
7 7 import { useI18n } from '@/hooks/web/useI18n'
... ... @@ -118,6 +118,16 @@ getList()
118 118 <template #status="{ row }">
119 119 <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
120 120 </template>
  121 + <template #authorizedGrantTypes="{ row }">
  122 + <el-tag
  123 + :disable-transitions="true"
  124 + :key="index"
  125 + v-for="(authorizedGrantType, index) in row.authorizedGrantTypes"
  126 + :index="index"
  127 + >
  128 + {{ authorizedGrantType }}
  129 + </el-tag>
  130 + </template>
121 131 <template #createTime="{ row }">
122 132 <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
123 133 </template>
... ...
yudao-ui-admin-vue3/src/views/system/operatelog/index.vue
  View file @1b2c2b4
... ... @@ -68,7 +68,7 @@ getList()
68 68 <span>{{ row.resultCode === 0 ? '成功' : '失败' }}</span>
69 69 </template>
70 70 <template #startTime="{ row }">
71   - <span>{{ dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
  71 + <span>{{ dayjs(row.startTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
72 72 </template>
73 73 <template #action="{ row }">
74 74 <el-button link type="primary" @click="handleDetail(row)">
... ...
yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts
  View file @1b2c2b4
... ... @@ -41,7 +41,10 @@ const crudSchemas = reactive&lt;CrudSchema[]&gt;([
41 41 },
42 42 {
43 43 label: '操作人员',
44   - field: 'userNickname'
  44 + field: 'userNickname',
  45 + search: {
  46 + show: true
  47 + }
45 48 },
46 49 {
47 50 label: '操作明细',
... ... @@ -63,41 +66,38 @@ const crudSchemas = reactive&lt;CrudSchema[]&gt;([
63 66 },
64 67 {
65 68 label: '操作结果',
66   - field: 'resultCode'
67   - },
68   - {
69   - label: '操作日期',
70   - field: 'startTime',
71   - form: {
72   - show: false
  69 + field: 'resultCode',
  70 + search: {
  71 + show: true,
  72 + component: 'Select',
  73 + componentProps: {
  74 + options: [
  75 + { label: '成功', value: true },
  76 + { label: '失败', value: false }
  77 + ]
  78 + }
73 79 }
74 80 },
75 81 {
76   - label: '执行时长',
77   - field: 'duration'
78   - },
79   - {
80 82 label: '操作日期',
81   - field: 'daterange',
82   - table: {
83   - show: false
84   - },
  83 + field: 'startTime',
85 84 form: {
86 85 show: false
87 86 },
88   - detail: {
89   - show: false
90   - },
91 87 search: {
92 88 show: true,
93 89 component: 'DatePicker',
94 90 componentProps: {
95   - type: 'daterange',
96   - valueFormat: 'YYYY-MM-DD'
  91 + type: 'datetimerange',
  92 + valueFormat: 'YYYY-MM-DD HH:mm:ss'
97 93 }
98 94 }
99 95 },
100 96 {
  97 + label: '执行时长',
  98 + field: 'duration'
  99 + },
  100 + {
101 101 label: t('table.action'),
102 102 field: 'action',
103 103 width: '120px',
... ...
yudao-ui-admin-vue3/src/views/system/role/role.data.ts
  View file @1b2c2b4
... ... @@ -65,12 +65,15 @@ const crudSchemas = reactive&lt;CrudSchema[]&gt;([
65 65 form: {
66 66 show: false
67 67 },
  68 + detail: {
  69 + show: false
  70 + },
68 71 search: {
69 72 show: true,
70 73 component: 'DatePicker',
71 74 componentProps: {
72   - type: 'daterange',
73   - valueFormat: 'YYYY-MM-DD'
  75 + type: 'datetimerange',
  76 + valueFormat: 'YYYY-MM-DD HH:mm:ss'
74 77 }
75 78 }
76 79 },
... ...
yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts
  View file @1b2c2b4
... ... @@ -66,26 +66,13 @@ const crudSchemas = reactive&lt;CrudSchema[]&gt;([
66 66 field: 'createTime',
67 67 form: {
68 68 show: false
69   - }
70   - },
71   - {
72   - label: t('common.createTime'),
73   - field: 'daterange',
74   - table: {
75   - show: false
76   - },
77   - form: {
78   - show: false
79   - },
80   - detail: {
81   - show: false
82 69 },
83 70 search: {
84 71 show: true,
85 72 component: 'DatePicker',
86 73 componentProps: {
87   - type: 'daterange',
88   - valueFormat: 'YYYY-MM-DD'
  74 + type: 'datetimerange',
  75 + valueFormat: 'YYYY-MM-DD HH:mm:ss'
89 76 }
90 77 }
91 78 },
... ...
yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts
  View file @1b2c2b4
... ... @@ -79,23 +79,13 @@ const crudSchemas = reactive&lt;CrudSchema[]&gt;([
79 79 field: 'createTime',
80 80 form: {
81 81 show: false
82   - }
83   - },
84   - {
85   - label: '接收时间',
86   - field: 'daterange',
87   - table: {
88   - show: false
89   - },
90   - form: {
91   - show: false
92 82 },
93 83 search: {
94 84 show: true,
95 85 component: 'DatePicker',
96 86 componentProps: {
97   - type: 'daterange',
98   - valueFormat: 'YYYY-MM-DD'
  87 + type: 'datetimerange',
  88 + valueFormat: 'YYYY-MM-DD HH:mm:ss'
99 89 }
100 90 }
101 91 },
... ...
yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts
  View file @1b2c2b4
... ... @@ -77,26 +77,13 @@ const crudSchemas = reactive&lt;CrudSchema[]&gt;([
77 77 field: 'createTime',
78 78 form: {
79 79 show: false
80   - }
81   - },
82   - {
83   - label: t('common.createTime'),
84   - field: 'daterange',
85   - table: {
86   - show: false
87   - },
88   - form: {
89   - show: false
90   - },
91   - detail: {
92   - show: false
93 80 },
94 81 search: {
95 82 show: true,
96 83 component: 'DatePicker',
97 84 componentProps: {
98   - type: 'daterange',
99   - valueFormat: 'YYYY-MM-DD'
  85 + type: 'datetimerange',
  86 + valueFormat: 'YYYY-MM-DD HH:mm:ss'
100 87 }
101 88 }
102 89 },
... ...