Commit bbb891f0f8eeb0c0e164428881158b87711ea11c
Merge branch 'ww' into 'main'
fix: Bug in teambition See merge request huang/yun-teng-iot-front!438
Showing
2 changed files
with
4 additions
and
3 deletions
@@ -163,7 +163,7 @@ | @@ -163,7 +163,7 @@ | ||
163 | <template> | 163 | <template> |
164 | <PageWrapper dense contentFullHeight contentClass="flex"> | 164 | <PageWrapper dense contentFullHeight contentClass="flex"> |
165 | <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" /> | 165 | <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" /> |
166 | - <section class="flex-auto p-4 w-full configuration-list"> | 166 | + <section class="flex-auto p-4 w-3/4 xl:w-4/5 w-full configuration-list"> |
167 | <div class="flex-auto w-full bg-light-50 dark:bg-dark-900 p-4"> | 167 | <div class="flex-auto w-full bg-light-50 dark:bg-dark-900 p-4"> |
168 | <BasicForm @register="registerForm" /> | 168 | <BasicForm @register="registerForm" /> |
169 | </div> | 169 | </div> |
@@ -7,7 +7,7 @@ import { | @@ -7,7 +7,7 @@ import { | ||
7 | DataSource, | 7 | DataSource, |
8 | GradientInfo, | 8 | GradientInfo, |
9 | } from '/@/api/dataBoard/model'; | 9 | } from '/@/api/dataBoard/model'; |
10 | -import { isArray, isNumber } from '/@/utils/is'; | 10 | +import { isArray } from '/@/utils/is'; |
11 | import { buildUUID } from '/@/utils/uuid'; | 11 | import { buildUUID } from '/@/utils/uuid'; |
12 | 12 | ||
13 | export interface GradientInfoRecord { | 13 | export interface GradientInfoRecord { |
@@ -256,7 +256,7 @@ export const update_instrument_2_font = (radioRecord: RadioRecord) => { | @@ -256,7 +256,7 @@ export const update_instrument_2_font = (radioRecord: RadioRecord) => { | ||
256 | }; | 256 | }; |
257 | 257 | ||
258 | const handleValue = (value: any) => { | 258 | const handleValue = (value: any) => { |
259 | - return isNumber(value) ? Number(value).toFixed(2) : 0; | 259 | + return isNaN(value) ? 0 : Number(value).toFixed(2); |
260 | }; | 260 | }; |
261 | 261 | ||
262 | export const update_instrument_1_value = (params: DashBoardValue) => { | 262 | export const update_instrument_1_value = (params: DashBoardValue) => { |
@@ -271,6 +271,7 @@ export const update_instrument_1_value = (params: DashBoardValue) => { | @@ -271,6 +271,7 @@ export const update_instrument_1_value = (params: DashBoardValue) => { | ||
271 | ) / 2 | 271 | ) / 2 |
272 | : 100 / 2; | 272 | : 100 / 2; |
273 | max = value > max ? max * 2 : max; | 273 | max = value > max ? max * 2 : max; |
274 | + | ||
274 | return { | 275 | return { |
275 | series: [ | 276 | series: [ |
276 | { | 277 | { |