diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts index 082667b..67a54e9 100644 --- a/src/assets/mapUtils/map.ts +++ b/src/assets/mapUtils/map.ts @@ -195,7 +195,6 @@ export const Map = { createAircraft(result: ResultType[]) { this.removeOverlayGroup(); this.clearActiveHospital(); - // debugger; if (!Array.isArray(result) && result.length == 0) return; this.createAirRange(result); let that = this; diff --git a/src/components/body-d-right/bodyRightHooks.ts b/src/components/body-d-right/bodyRightHooks.ts index 17d0730..ba0e755 100644 --- a/src/components/body-d-right/bodyRightHooks.ts +++ b/src/components/body-d-right/bodyRightHooks.ts @@ -58,19 +58,19 @@ export function useHealth() { { name: '高危人数', value: '0', - type: '1', + type: '2', type_dictText: '恶性肿瘤', }, { name: '中危人数', value: '0', - type: '2', + type: '1', type_dictText: '其他', }, { name: '可控人数', value: '0', - type: '3', + type: '0', type_dictText: '其他', }, ]); diff --git a/src/components/secondaryScreen/screen-right/twoR.vue b/src/components/secondaryScreen/screen-right/twoR.vue index 9dc3a6e..9f6b947 100644 --- a/src/components/secondaryScreen/screen-right/twoR.vue +++ b/src/components/secondaryScreen/screen-right/twoR.vue @@ -58,7 +58,6 @@ } function initChart(chartData) { - // debugger; let myChart = echarts.init(healthChart.value); let options = screenPie(chartData); myChart.setOption(options); diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue index 35b4267..fe8f059 100644 --- a/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue +++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/sleep.vue @@ -134,7 +134,6 @@ maxInfo.value = type.value === 1 ? result.maxValue : result.deepSleepTimes ? result.deepSleepTimes : ''; middleInfo.value = type.value === 1 ? result.total1 : result.deepLightTimes ? result.deepLightTimes : ''; minInfo.value = type.value === 1 ? result.minValue : result.lightSleepTimes ? result.lightSleepTimes : ''; - // debugger; // type.value === 1 && // result.viewDataList.map((item) => { // xArr.push(item.date); diff --git a/src/hooks/locales/useLocales.ts b/src/hooks/locales/useLocales.ts index 3c347a0..b3181e6 100644 --- a/src/hooks/locales/useLocales.ts +++ b/src/hooks/locales/useLocales.ts @@ -140,9 +140,8 @@ export function t(key) { let keys = key.split('.'); let obj = {}; for (let i = 0; i < keys.length; i++) { - // debugger; value = value[keys[i]]; } return value; } -} \ No newline at end of file +} diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 1fd94d6..a650b90 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -30,7 +30,6 @@ export function getToday() { //分钟转小时 export function minuteToStr(minutes) { - // debugger; if (!minutes) return '0分'; let h = Math.floor(minutes / 60); let m = Math.floor(minutes % 60); @@ -53,4 +52,4 @@ export function visibleChartLabel(chartData) { }); } return data; -} \ No newline at end of file +}