update 调整大病人数类型
This commit is contained in:
@@ -195,7 +195,6 @@ export const Map = {
|
|||||||
createAircraft(result: ResultType[]) {
|
createAircraft(result: ResultType[]) {
|
||||||
this.removeOverlayGroup();
|
this.removeOverlayGroup();
|
||||||
this.clearActiveHospital();
|
this.clearActiveHospital();
|
||||||
// debugger;
|
|
||||||
if (!Array.isArray(result) && result.length == 0) return;
|
if (!Array.isArray(result) && result.length == 0) return;
|
||||||
this.createAirRange(result);
|
this.createAirRange(result);
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|||||||
@@ -58,19 +58,19 @@ export function useHealth() {
|
|||||||
{
|
{
|
||||||
name: '高危人数',
|
name: '高危人数',
|
||||||
value: '0',
|
value: '0',
|
||||||
type: '1',
|
type: '2',
|
||||||
type_dictText: '恶性肿瘤',
|
type_dictText: '恶性肿瘤',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '中危人数',
|
name: '中危人数',
|
||||||
value: '0',
|
value: '0',
|
||||||
type: '2',
|
type: '1',
|
||||||
type_dictText: '其他',
|
type_dictText: '其他',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '可控人数',
|
name: '可控人数',
|
||||||
value: '0',
|
value: '0',
|
||||||
type: '3',
|
type: '0',
|
||||||
type_dictText: '其他',
|
type_dictText: '其他',
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -58,7 +58,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function initChart(chartData) {
|
function initChart(chartData) {
|
||||||
// debugger;
|
|
||||||
let myChart = echarts.init(healthChart.value);
|
let myChart = echarts.init(healthChart.value);
|
||||||
let options = screenPie(chartData);
|
let options = screenPie(chartData);
|
||||||
myChart.setOption(options);
|
myChart.setOption(options);
|
||||||
|
|||||||
@@ -134,7 +134,6 @@
|
|||||||
maxInfo.value = type.value === 1 ? result.maxValue : result.deepSleepTimes ? result.deepSleepTimes : '';
|
maxInfo.value = type.value === 1 ? result.maxValue : result.deepSleepTimes ? result.deepSleepTimes : '';
|
||||||
middleInfo.value = type.value === 1 ? result.total1 : result.deepLightTimes ? result.deepLightTimes : '';
|
middleInfo.value = type.value === 1 ? result.total1 : result.deepLightTimes ? result.deepLightTimes : '';
|
||||||
minInfo.value = type.value === 1 ? result.minValue : result.lightSleepTimes ? result.lightSleepTimes : '';
|
minInfo.value = type.value === 1 ? result.minValue : result.lightSleepTimes ? result.lightSleepTimes : '';
|
||||||
// debugger;
|
|
||||||
// type.value === 1 &&
|
// type.value === 1 &&
|
||||||
// result.viewDataList.map((item) => {
|
// result.viewDataList.map((item) => {
|
||||||
// xArr.push(item.date);
|
// xArr.push(item.date);
|
||||||
|
|||||||
@@ -140,7 +140,6 @@ export function t(key) {
|
|||||||
let keys = key.split('.');
|
let keys = key.split('.');
|
||||||
let obj = {};
|
let obj = {};
|
||||||
for (let i = 0; i < keys.length; i++) {
|
for (let i = 0; i < keys.length; i++) {
|
||||||
// debugger;
|
|
||||||
value = value[keys[i]];
|
value = value[keys[i]];
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ export function getToday() {
|
|||||||
|
|
||||||
//分钟转小时
|
//分钟转小时
|
||||||
export function minuteToStr(minutes) {
|
export function minuteToStr(minutes) {
|
||||||
// debugger;
|
|
||||||
if (!minutes) return '0分';
|
if (!minutes) return '0分';
|
||||||
let h = Math.floor(minutes / 60);
|
let h = Math.floor(minutes / 60);
|
||||||
let m = Math.floor(minutes % 60);
|
let m = Math.floor(minutes % 60);
|
||||||
|
|||||||
Reference in New Issue
Block a user