update
1.根据新疆反馈,修改相关问题
This commit is contained in:
@@ -260,7 +260,7 @@
|
||||
.index-modal {
|
||||
.form-btn {
|
||||
margin-bottom: 8px;
|
||||
padding-left: 100px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -35,13 +35,25 @@
|
||||
<div style="height: 210px; display: flex; align-items: center; justify-content: center; width: 100%">
|
||||
<div style="height: 100%" class="content-chart">
|
||||
<template v-if="[0, 1, 2, 3].includes(chooseType)">
|
||||
<three-left-new-item @click-pie="clickPie" :org-code="selectValue" :type="selectValue1" :choose-type="chooseType" />
|
||||
<three-left-new-item
|
||||
@click-pie="clickPie"
|
||||
:b-key="props.bKey"
|
||||
:org-code="selectValue"
|
||||
:type="selectValue1"
|
||||
:choose-type="chooseType"
|
||||
/>
|
||||
</template>
|
||||
<template v-if="[4].includes(chooseType)">
|
||||
<sleep-item :orgCode="selectValue" :type="selectValue1" style="height: 100%" />
|
||||
<sleep-item :orgCode="selectValue" :b-key="props.bKey" :type="selectValue1" style="height: 100%" />
|
||||
</template>
|
||||
<template v-if="[5].includes(chooseType)">
|
||||
<step-item @click-pie="clickPie" :orgCode="selectValue" :type="selectValue1" style="height: 100%" />
|
||||
<step-item
|
||||
@click-pie="clickPie"
|
||||
:b-key="props.bKey"
|
||||
:orgCode="selectValue"
|
||||
:type="selectValue1"
|
||||
style="height: 100%"
|
||||
/>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
@@ -53,7 +65,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch, reactive, onBeforeUnmount, nextTick } from 'vue';
|
||||
import * as echarts from 'echarts';
|
||||
import { getClassCharts } from '/@/views/indexSun/indexSun.ts';
|
||||
// import { getClassCharts } from '/@/views/indexSun/indexSun.ts';
|
||||
import { allSecondaryDepartsApi, twoLApi } from '/@/views/indexSun/indexSun.api.ts';
|
||||
import { useUserStore } from '/@/store/modules/user.ts';
|
||||
import ThreeLeftNewItem from '/@/views/indexSun/threeLeftNewItem/threeLeftNewItem.vue';
|
||||
@@ -141,7 +153,7 @@
|
||||
if (selectOptions.value.length === 1) {
|
||||
getAllDepart();
|
||||
}
|
||||
setTimer();
|
||||
// setTimer();
|
||||
});
|
||||
// watch(props, () => {
|
||||
// selectValue.value = '';
|
||||
|
||||
@@ -21,10 +21,14 @@
|
||||
orgCode: String,
|
||||
type: String,
|
||||
themeType: String,
|
||||
bKey: {
|
||||
type: String,
|
||||
default: () => '',
|
||||
},
|
||||
});
|
||||
const sleepChart = ref<HTMLElement>();
|
||||
watch(
|
||||
props,
|
||||
() => props,
|
||||
() => {
|
||||
init();
|
||||
},
|
||||
@@ -48,7 +52,7 @@
|
||||
setValue(result);
|
||||
}
|
||||
} catch {
|
||||
const result = JSON.parse(getSession(PAGE2_RIGHT1));
|
||||
const result = JSON.parse(getSession(PAGE2_RIGHT1) || '{}');
|
||||
setValue(result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,10 @@
|
||||
orgCode: String,
|
||||
type: String,
|
||||
themeType: String,
|
||||
bKey: {
|
||||
type: String,
|
||||
default: () => '',
|
||||
},
|
||||
});
|
||||
const { setSession, getSession } = useSession();
|
||||
const { PAGE2_RIGHT2 } = caching;
|
||||
|
||||
@@ -84,13 +84,59 @@
|
||||
type: Number,
|
||||
default: () => 0,
|
||||
},
|
||||
bKey: {
|
||||
type: String,
|
||||
default: () => '',
|
||||
},
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
init();
|
||||
});
|
||||
watch(props, () => {
|
||||
init();
|
||||
});
|
||||
watch(
|
||||
() => props.orgCode,
|
||||
() => {
|
||||
init();
|
||||
}
|
||||
);
|
||||
watch(
|
||||
() => props.bKey,
|
||||
() => {
|
||||
init();
|
||||
}
|
||||
);
|
||||
watch(
|
||||
() => props.type,
|
||||
() => {
|
||||
init();
|
||||
}
|
||||
);
|
||||
watch(
|
||||
() => props.themeType,
|
||||
() => {
|
||||
init();
|
||||
}
|
||||
);
|
||||
watch(
|
||||
() => props.refreshState,
|
||||
() => {
|
||||
init();
|
||||
}
|
||||
);
|
||||
watch(
|
||||
() => props.chooseType,
|
||||
() => {
|
||||
initByLocal();
|
||||
}
|
||||
);
|
||||
|
||||
async function initByLocal() {
|
||||
if (localStorage.getItem('monitorDataOne')) {
|
||||
dataList.value = JSON.parse(localStorage.getItem('monitorDataOne') || '{}');
|
||||
} else {
|
||||
await init();
|
||||
}
|
||||
}
|
||||
|
||||
const emit = defineEmits(['clickPie']);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user