修复bug

This commit is contained in:
X1627315083
2024-08-22 14:49:46 +08:00
parent 4269957cf2
commit b4f3ae68c5
7 changed files with 47 additions and 30 deletions

View File

@@ -155,15 +155,19 @@ import {
onMounted, onMounted,
} from "vue"; } from "vue";
import { formatTime } from "@/tool/util"; import { formatTime } from "@/tool/util";
import { useStore } from "vuex";
import { Https } from "@/tool/https"; import { Https } from "@/tool/https";
import allUserPoerationsVue from "./allUserPoerations.vue"; import allUserPoerationsVue from "./allUserPoerations.vue";
export default defineComponent({ export default defineComponent({
components: {allUserPoerationsVue,}, components: {allUserPoerationsVue,},
setup() { setup() {
const store:any = useStore()
let filter: any = reactive({ let filter: any = reactive({
dataList: [], dataList: [],
tableLoading: false, tableLoading: false,
allUserList: [], allUserList: computed(()=>{
return store.state.adminPage.allUserList
}),
allCountry:[] allCountry:[]
}); });
let filterData: any = reactive({ let filterData: any = reactive({
@@ -478,10 +482,6 @@ export default defineComponent({
allUserPoerationsVue.value.init('Edit',data) allUserPoerationsVue.value.init('Edit',data)
} }
onMounted(() => { onMounted(() => {
let allUserList: any = sessionStorage.getItem("allUserList");
if (allUserList) {
filter.allUserList = JSON.parse(allUserList);
}
let allCountry: any = sessionStorage.getItem("allCountry"); let allCountry: any = sessionStorage.getItem("allCountry");
if (allCountry) { if (allCountry) {
filter.allCountry = JSON.parse(allCountry); filter.allCountry = JSON.parse(allCountry);

View File

@@ -60,13 +60,17 @@ import * as echarts from 'echarts/core';
import { TooltipComponent, LegendComponent } from 'echarts/components'; import { TooltipComponent, LegendComponent } from 'echarts/components';
import { PieChart } from 'echarts/charts'; import { PieChart } from 'echarts/charts';
import { LabelLayout } from 'echarts/features'; import { LabelLayout } from 'echarts/features';
import { useStore } from "vuex";
import { CanvasRenderer } from 'echarts/renderers'; import { CanvasRenderer } from 'echarts/renderers';
export default defineComponent({ export default defineComponent({
components: { components: {
}, },
setup() { setup() {
const store:any = useStore()
let filter:any = reactive({ let filter:any = reactive({
dataList:[], dataList:computed(()=>{
return store.state.adminPage.allUserList
}),
}) })
let filterData:any = reactive({ let filterData:any = reactive({
@@ -77,19 +81,6 @@ export default defineComponent({
let searchHistoryList = ()=> { let searchHistoryList = ()=> {
gettrialList(); 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 () =>{ let gettrialList = async () =>{
filter.tableLoading = true filter.tableLoading = true
@@ -203,7 +194,6 @@ export default defineComponent({
} }
onMounted(()=>{ onMounted(()=>{
lastGeTrialList('month') lastGeTrialList('month')
getUserIDName()
}) })
return { return {
...toRefs(filter), ...toRefs(filter),

View File

@@ -94,15 +94,19 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, ref, createVNode, computed, reactive, toRefs, onMounted } from "vue"; import { defineComponent, ref, createVNode, computed, reactive, toRefs, onMounted } from "vue";
import { formatTime } from "@/tool/util"; import { formatTime } from "@/tool/util";
import { useStore } from "vuex";
import { Https } from "@/tool/https"; import { Https } from "@/tool/https";
export default defineComponent({ export default defineComponent({
components: { components: {
}, },
setup() { setup() {
const store:any = useStore()
let filter:any = reactive({ let filter:any = reactive({
dataList:[], dataList:[],
tableLoading:false, tableLoading:false,
allUserList: [], allUserList: computed(()=>{
return store.state.adminPage.allUserList
}),
allCountry:[] allCountry:[]
}) })
let filterData:any = reactive({ let filterData:any = reactive({
@@ -261,10 +265,6 @@ export default defineComponent({
gettrialList(); gettrialList();
} }
onMounted(()=>{ onMounted(()=>{
let allUserList: any = sessionStorage.getItem("allUserList");
if (allUserList) {
filter.allUserList = JSON.parse(allUserList);
}
let allCountry: any = sessionStorage.getItem("allCountry"); let allCountry: any = sessionStorage.getItem("allCountry");
if (allCountry) { if (allCountry) {
filter.allCountry = JSON.parse(allCountry); filter.allCountry = JSON.parse(allCountry);

View File

@@ -491,7 +491,7 @@ export default defineComponent({
// let num = this.sketch/ // let num = this.sketch/
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
let arr = JSON.parse(JSON.stringify(this.printStyleList)) let arr = JSON.parse(JSON.stringify(this.printStyleList))
let sketch = document.getElementsByClassName("designElements_sketch")[0] let sketch = document.getElementsByClassName("designElementsMobile_modal")[0]?.getElementsByClassName('designElementsMobile_sketch')[0]
let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
let prints = [] let prints = []
let scale let scale
@@ -833,8 +833,8 @@ export default defineComponent({
li{ li{
cursor: pointer; cursor: pointer;
// border-radius: 50%; // border-radius: 50%;
width: calc(1rem*1.2); width: calc(2.5rem*1.2);
height: calc(1rem*1.2); height: calc(2.5rem*1.2);
background-color: rgb(20, 188, 255); background-color: rgb(20, 188, 255);
position: absolute; position: absolute;
pointer-events: none; pointer-events: none;

View File

@@ -0,0 +1,23 @@
import {Module} from 'vuex'
import {RootState} from '../index'
interface DesignDetail{
allUserList:any,
}
const adminPage : Module<DesignDetail,RootState> = {
state:{
allUserList:[],
},
mutations:{
setAllUserList(state,files){
state.allUserList = files
},
},
actions:{
}
}
export default adminPage

View File

@@ -5,6 +5,7 @@ import HomeStoreModule from './homeStore/homeStore'
import UserHabit from './userHabit/userHabit' import UserHabit from './userHabit/userHabit'
import Workspace from './workspace/workspace' import Workspace from './workspace/workspace'
import Guide from './guide/guide' import Guide from './guide/guide'
import adminPage from './adminPage/adminPage'
export interface RootState{ export interface RootState{
} }
@@ -25,5 +26,6 @@ export default createStore<RootState>({
UserHabit, UserHabit,
Workspace, Workspace,
Guide, Guide,
adminPage,
} }
}) })

View File

@@ -81,6 +81,7 @@ import { getUploadUrl } from "@/tool/util";
import scaleImage from "@/component/HomePage/scaleImage.vue"; import scaleImage from "@/component/HomePage/scaleImage.vue";
import { openGuide,driverObj__,driverIndex__ } from "@/tool/guide"; import { openGuide,driverObj__,driverIndex__ } from "@/tool/guide";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import store from "@/store";
export default defineComponent({ export default defineComponent({
components: { components: {
MailOutlined, MailOutlined,
@@ -90,7 +91,8 @@ export default defineComponent({
props: ["msg",'sketchCatecoryList'], props: ["msg",'sketchCatecoryList'],
setup() { setup() {
const router = useRouter() const router = useRouter()
const route:any = useRoute() // const route:any = useRoute()
const store:any = useStore()
const state:any = reactive({ const state:any = reactive({
rootSubmenuKeys: [{ rootSubmenuKeys: [{
name:'All User', name:'All User',
@@ -263,7 +265,7 @@ export default defineComponent({
//储存所有用户id和name //储存所有用户id和name
Https.axiosGet(Https.httpUrls.getAllUserId,).then((rv: any) => { Https.axiosGet(Https.httpUrls.getAllUserId,).then((rv: any) => {
if (rv) { if (rv) {
sessionStorage.setItem('allUserList',JSON.stringify(rv)); store.commit('setAllUserList',rv);
} }
}) })
let allCountry = country let allCountry = country