Commit 572e045cf361af1d86040e1c19985bd819bdc2bd

Authored by fengtao
2 parents 7d720750 f102e732

Merge branch 'main' into ft-dev

... ... @@ -51,7 +51,7 @@
51 51 series: [
52 52 {
53 53 name: '告警数',
54   - barMaxWidth: '4%',
  54 + barWidth: '10%',
55 55 type: 'bar',
56 56 stack: 'Total',
57 57 data: props.alarmList,
... ... @@ -94,7 +94,7 @@
94 94 type: 'bar',
95 95 stack: 'Total',
96 96 color: '#3C78FF',
97   - barMaxWidth: '4%',
  97 + barWidth: '10%',
98 98 data: newValue,
99 99 },
100 100 ],
... ...
... ... @@ -66,14 +66,14 @@
66 66 type: 'bar',
67 67 stack: 'total',
68 68 data: newValue,
69   - barMaxWidth: '4%',
  69 + barWidth: '10%',
70 70 color: '#5AEEED',
71 71 },
72 72 {
73 73 name: '传输消息量',
74 74 type: 'bar',
75 75 stack: 'total',
76   - barMaxWidth: '4%',
  76 + barWidth: '10%',
77 77 data: newValue1,
78 78 color: '#3C78FF',
79 79 },
... ...
... ... @@ -92,8 +92,8 @@
92 92 const rememberMe = ref(false);
93 93
94 94 const formData = reactive({
95   - account: 'sysadmin',
96   - password: 'Sysadmin@123',
  95 + account: '',
  96 + password: '',
97 97 });
98 98
99 99 const { validForm } = useFormValid(formRef);
... ...
... ... @@ -143,7 +143,7 @@
143 143 });
144 144 }
145 145
146   - const tenantAdminColumns = [
  146 + const tenantAdminColumns: BasicColumn[] = [
147 147 {
148 148 title: '用户名',
149 149 dataIndex: 'username',
... ... @@ -173,7 +173,7 @@
173 173 ];
174 174 const [tenantAdminTable, { reload }] = useTable({
175 175 api: getTenantAdminPage,
176   - columns: tenantAdminColumns as BasicColumn[],
  176 + columns: tenantAdminColumns,
177 177 showTableSetting: true,
178 178 bordered: true,
179 179 showIndexColumn: false,
... ...