Commit f102e732d60715ae753c9b43f59690d24876f5a5

Authored by xp.Huang
2 parents e7a88598 17aa7bb1

Merge branch 'sqy_dev' into 'main'

'fix:删除初始密码,转换脚本开发中...'

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