diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index 9367efc9..4c7c520c 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -155,15 +155,19 @@ import { onMounted, } from "vue"; import { formatTime } from "@/tool/util"; +import { useStore } from "vuex"; import { Https } from "@/tool/https"; import allUserPoerationsVue from "./allUserPoerations.vue"; export default defineComponent({ components: {allUserPoerationsVue,}, setup() { + const store:any = useStore() let filter: any = reactive({ dataList: [], tableLoading: false, - allUserList: [], + allUserList: computed(()=>{ + return store.state.adminPage.allUserList + }), allCountry:[] }); let filterData: any = reactive({ @@ -478,10 +482,6 @@ export default defineComponent({ allUserPoerationsVue.value.init('Edit',data) } onMounted(() => { - let allUserList: any = sessionStorage.getItem("allUserList"); - if (allUserList) { - filter.allUserList = JSON.parse(allUserList); - } let allCountry: any = sessionStorage.getItem("allCountry"); if (allCountry) { filter.allCountry = JSON.parse(allCountry); diff --git a/src/component/Administrator/recentActiveChart.vue b/src/component/Administrator/recentActiveChart.vue index 0f984ecf..d0c866e1 100644 --- a/src/component/Administrator/recentActiveChart.vue +++ b/src/component/Administrator/recentActiveChart.vue @@ -60,13 +60,17 @@ import * as echarts from 'echarts/core'; import { TooltipComponent, LegendComponent } from 'echarts/components'; import { PieChart } from 'echarts/charts'; import { LabelLayout } from 'echarts/features'; +import { useStore } from "vuex"; import { CanvasRenderer } from 'echarts/renderers'; export default defineComponent({ components: { }, setup() { + const store:any = useStore() let filter:any = reactive({ - dataList:[], + dataList:computed(()=>{ + return store.state.adminPage.allUserList + }), }) let filterData:any = reactive({ @@ -77,19 +81,6 @@ export default defineComponent({ let searchHistoryList = ()=> { gettrialList(); } - let getUserIDName = ()=>{ - let allUserList:any = sessionStorage.getItem('allUserList'); - if(allUserList){ - filter.dataList = JSON.parse(allUserList) - } - // Https.axiosGet(Https.httpUrls.getAllUserId,).then((rv: any) => { - // if (rv) { - // let username = sessionStorage.getItem('allUserList'); - // sessionStorage.setItem('allUserList',rv); - // filter.dataList = rv - // } - // }) - } //获取列表 let gettrialList = async () =>{ filter.tableLoading = true @@ -203,7 +194,6 @@ export default defineComponent({ } onMounted(()=>{ lastGeTrialList('month') - getUserIDName() }) return { ...toRefs(filter), diff --git a/src/component/Administrator/trialAllUser.vue b/src/component/Administrator/trialAllUser.vue index 34e15932..983b0b27 100644 --- a/src/component/Administrator/trialAllUser.vue +++ b/src/component/Administrator/trialAllUser.vue @@ -94,15 +94,19 @@