This commit is contained in:
zk
2023-12-19 10:46:50 +08:00
parent 8cb7d4baf8
commit 9b5be1af25
11 changed files with 76 additions and 58 deletions
+20 -34
View File
@@ -25,16 +25,14 @@
class="type-select"
:options="option"
:field-names="fieldNames"
@change="orgChange"
></a-select>
<!-- <a-cascader v-model:value="treeValue" :options="treeOption" placeholder="选择单位" :open="true" :changeOnSelect="true" />-->
<a-select placeholder="选择时间范围" v-model:value="type" class="type-select" :options="timeRangeOption"></a-select>
</template>
</SecondMap>
</div>
<div class="body-d-right">
<one-r :orgCode="orgCode" :type="type" :key="refreshState" />
<two-r :orgCode="orgCode" :type="type" />
<two-r :orgCode="orgCode" :type="type" :key="refreshState" />
<three-r :orgCode="orgCode" :type="type" />
</div>
</div>
@@ -43,22 +41,33 @@
</template>
<script setup lang="ts">
import { RollbackOutlined } from '@ant-design/icons-vue';
import { nextTick, onMounted, ref, watch } from 'vue';
import { nextTick, onMounted, ref } from 'vue';
import OneR from '/@/components/secondaryScreen/screen-right/oneR.vue';
import TwoR from '/@/components/secondaryScreen/screen-right/twoR.vue';
import ThreeR from '/@/components/secondaryScreen/screen-right/threeR.vue';
import SecondMap from '/@/components/secondaryScreen/secondMap/secondMap';
import SecondMap from '/@/components/secondaryScreen/secondMap/secondMap.vue';
import screenLeft from '/@/components/secondaryScreen/screen-left/screenLeft.vue';
import router from '/@/router';
import { useDepart, useTimeType, useTree } from '/@/components/secondaryScreen/secondMap/secondMapHooks.ts';
import { useDepart, useTimeType } from '/@/components/secondaryScreen/secondMap/secondMapHooks.ts';
import { useTopTime } from '/@/utils/utils.ts';
import { useUserStore } from '/@/store/modules/user.ts';
import { useRefresh } from '/@/hooks/autoRefresh';
import { DEFAULT_TIME } from '/@/hooks/autoRefresh/pageRefreshTime.ts';
const { refreshState } = useRefresh(3000);
const { refreshState } = useRefresh(DEFAULT_TIME);
const useStore = useUserStore();
const dayTimeT = ref();
const { orgCode, option, fieldNames, setOrgCode } = useDepart();
onMounted(() => {
const userInfo = useStore.getUserInfo;
let orgCode = userInfo?.secondDepart?.orgCode;
if (orgCode) {
nextTick(() => {
setOrgCode(orgCode);
});
}
init();
});
const { type, timeRangeOption } = useTimeType('week');
function init() {
getTime();
@@ -67,6 +76,8 @@
}, 1000);
}
const dayTimeT = ref();
function getTime() {
const { timeRight } = useTopTime();
dayTimeT.value = timeRight;
@@ -75,31 +86,6 @@
function clickBack() {
router.go(-1);
}
const { orgCode, option, fieldNames, setOrgCode } = useDepart({});
// const reloadPage = ref(true);
onMounted(() => {
const userInfo = useStore.getUserInfo;
console.log('465', userInfo);
let orgCode = userInfo?.secondDepart?.orgCode;
console.log('9999', orgCode);
if (orgCode) {
nextTick(() => {
setOrgCode(orgCode);
init();
});
}
// setInterval(() => {
// reloadPage.value = !reloadPage.value;
// }, 3000);
});
function orgChange(val, option) {
console.log('val', val);
console.log('option', option);
}
const { type, timeRangeOption } = useTimeType('week');
</script>
<style lang="less" scoped>
.outer {