diff --git a/src/component/Administrator/SE/allUser/addAllUser.vue b/src/component/Administrator/SE/allUser/addAllUser.vue index 79b09877..a0357ed6 100644 --- a/src/component/Administrator/SE/allUser/addAllUser.vue +++ b/src/component/Administrator/SE/allUser/addAllUser.vue @@ -111,10 +111,12 @@ import { Modal, message } from "ant-design-vue"; import { ExclamationCircleOutlined } from "@ant-design/icons-vue"; import { formatTime, isEmail } from "@/tool/util"; import md5 from "md5"; +import { useI18n } from 'vue-i18n' export default defineComponent({ components: {}, emits: ["searchHistoryList"], setup(props, { emit }) { + const {t} = useI18n() let operations = reactive({ operationsModal: false, operationsEdit: false, @@ -183,7 +185,7 @@ export default defineComponent({ return { creditsUsageLimit: operationsData.credits, userEmail: operationsData.userEmail, - userPassword: md5(operationsData.password + "abc"), + userPassword: operationsData.password?md5(operationsData.password + "abc"):'', userName: operationsData.userName, }; }; diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue index 6319b442..89a75525 100644 --- a/src/component/Administrator/allUserPoerations.vue +++ b/src/component/Administrator/allUserPoerations.vue @@ -30,7 +30,7 @@
User Name: * User Email: * Country: Organization Name: Sub Account Num: { nextTick(async ()=>{ + detailData.currentView = 'canvasEditor' if(detailData.selectDetail.canvasId){ detailData.isShowMark = true await new Promise((resolve, reject) => { diff --git a/src/component/Detail/detailLeft/module/libraryList.vue b/src/component/Detail/detailLeft/module/libraryList.vue index 21af3b2b..5b40f497 100644 --- a/src/component/Detail/detailLeft/module/libraryList.vue +++ b/src/component/Detail/detailLeft/module/libraryList.vue @@ -138,11 +138,6 @@ export default defineComponent({ default:'' as any, required:true }, - isSegmentation:{ - type:Boolean, - default:false as any, - required:true - }, }, emits:['selectImgItem'], setup(props,{emit}) { @@ -154,7 +149,6 @@ export default defineComponent({ designTypeList:computed(()=>props.catecoryList) as any, designType:'', searchPictureName:'', - designDetail:computed(()=>store.state.DesignDetail.designDetail), mannequinData:{ sex:'Female', style:'', @@ -188,36 +182,10 @@ export default defineComponent({ detailData.designType = detailData.designTypeList[0]?.value?detailData.designTypeList[0]?.value:'' getLibraryList() } - const hasDuplicateId = (id:any)=>{ - let arr = detailData.designDetail.clothes - for (let i = 0; i < arr.length; i++) { - if (arr[i].id === id) { - return true; - } - } - return false; - } const selectImgItem = (file:any)=>{ - let randomNum = Math.floor(100 + Math.random() * 900); - let type = props.type - // let type = store.state.DesignDetail.currentDetailType - let id = file.id - if(type == 'sketch'){ - id = Number(file.id + (randomNum + '')) - if(props.randomId){ - if(hasDuplicateId(id)){ - selectImgItem(file) - return - } - } - } let data = JSON.parse(JSON.stringify(file)) data.type = detailData.mannequinData.system == 'system'?'System':'Library' - if(!props.isSegmentation){ - data.id = id - } emit('selectImgItem',data) - // store.commit('DesignDetail/setNewDetail',data) } const getLibraryList = ()=>{ if(props.type == 'models'){ @@ -260,7 +228,6 @@ export default defineComponent({ detailData.isShowLoading = true let level2Type = '' let workspace = store.state.Workspace.probjects - // let type = store.state.DesignDetail.currentDetailType let data = { level1Type:props.level1Type, // level2Type:'Pattern', diff --git a/src/component/Detail/detailLeft/module/selectList.vue b/src/component/Detail/detailLeft/module/selectList.vue index 1b73b082..0bf32560 100644 --- a/src/component/Detail/detailLeft/module/selectList.vue +++ b/src/component/Detail/detailLeft/module/selectList.vue @@ -37,7 +37,7 @@
- +
@@ -121,7 +121,9 @@ export default defineComponent({ detailData.selectTitle = 'library' getDetailListDom.libraryList.init() } + const selectImgItem = (data:any)=>{ + emit('selectImgItem',data) } onMounted(()=>{ diff --git a/src/component/Detail/detailLeft/sketch.vue b/src/component/Detail/detailLeft/sketch.vue index c19e42b8..b5895d3a 100644 --- a/src/component/Detail/detailLeft/sketch.vue +++ b/src/component/Detail/detailLeft/sketch.vue @@ -35,6 +35,7 @@ export default defineComponent({ const detailData = reactive({ selectTitle:'current', selectDetail:computed(()=>store.state.DesignDetail.selectDetail), + designDetail:computed(()=>store.state.DesignDetail.designDetail), sketchCatecoryList:computed(()=>{ return store.state.Workspace.probjects.positionList }), @@ -58,8 +59,24 @@ export default defineComponent({ detailData.selectTitle = 'library' getDetailListDom.libraryList.init() } + const hasDuplicateId = (id:any)=>{ + let arr = detailData.designDetail.clothes + for (let i = 0; i < arr.length; i++) { + if (arr[i].id === id) { + return true; + } + } + return false; + } const selectImgItem = (data:any)=>{ - console.log(data) + let randomNum = Math.floor(100 + Math.random() * 900); + let id = data.id + id = Number(data.id + (randomNum + '')) + if(hasDuplicateId(id)){ + selectImgItem(data) + return + } + data.id = id if(data?.imgUrl)data.url = data.imgUrl let value = { data, diff --git a/src/component/Detail/model/index.vue b/src/component/Detail/model/index.vue index aa4af4f6..37921146 100644 --- a/src/component/Detail/model/index.vue +++ b/src/component/Detail/model/index.vue @@ -14,7 +14,7 @@ - + @@ -48,6 +48,7 @@ export default defineComponent({ const store = useStore(); const detailData = reactive({ getCanvasIfEdit:inject('getCanvasIfEdit')as any, + selectDetail:computed(()=>store.state.DesignDetail.selectDetail), }) const setRevocation:any = inject('setRevocation') const getDetailListData = reactive({ @@ -187,6 +188,11 @@ export default defineComponent({ width: 4rem; height: 4rem; justify-content: center; + &.pointerEventsNone{ + cursor: not-allowed; + pointer-events: none; + opacity: 0.6; + } @media (min-width: 1024px) { font-size: 2.4rem; } diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue index f490db5e..f5fd7522 100644 --- a/src/component/LoginPage/login/enterprise.vue +++ b/src/component/LoginPage/login/enterprise.vue @@ -485,11 +485,14 @@ export default defineComponent({ userId: this.userId, organizationName: this.selectEnterprise, }; + this.$emit('update:isMask',true) Https.axiosPost(Https.httpUrls.accountLogin, data) .then((rv: any) => { this.setSuccessLogin(rv); }) - .catch((res) => {}); + .catch((res) => { + this.$emit('update:isMask',false) + }); }, isCheckAgreement() { message.info("Agree to all terms, privacy fees and policies"); diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue index 8efcd11b..20a1f7ae 100644 --- a/src/component/LoginPage/login/personal.vue +++ b/src/component/LoginPage/login/personal.vue @@ -486,11 +486,14 @@ export default defineComponent({ loginType: "EMAIL", userId: this.userId, }; + this.$emit('update:isMask',true) Https.axiosPost(Https.httpUrls.accountLogin, data) .then((rv: any) => { this.setSuccessLogin(rv); }) - .catch((res) => {}); + .catch((res) => { + this.$emit('update:isMask',false) + }); }, isCheckAgreement() { message.info("Agree to all terms, privacy fees and policies"); diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue index 60969f0c..7435cc00 100644 --- a/src/component/LoginPage/login/school.vue +++ b/src/component/LoginPage/login/school.vue @@ -488,11 +488,14 @@ export default defineComponent({ userId: this.userId, organizationName: this.selectSchool, }; + this.$emit('update:isMask',true) Https.axiosPost(Https.httpUrls.accountLogin, data) .then((rv: any) => { this.setSuccessLogin(rv); }) - .catch((res) => {}); + .catch((res) => { + this.$emit('update:isMask',false) + }); }, isCheckAgreement() { message.info("Agree to all terms, privacy fees and policies"); diff --git a/src/router/index.ts b/src/router/index.ts index 7d2c6dcd..c8949bf8 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -499,7 +499,7 @@ router.beforeEach((to: any, from, next) => { if (to.meta.enter == "all") { next(); } else if ( - (state.UserHabit.userDetail.systemList.indexOf(to.meta.enter) > -1) || (vuex_systemList.indexOf(to.meta.enter)) + (state.UserHabit?.userDetail?.systemList?.indexOf(to.meta.enter) > -1) || (vuex_systemList?.indexOf(to.meta.enter)) ) { next(); } else { diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index 91e9bbf4..d76ad75a 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -265,7 +265,7 @@ const userHabit : Module = { */ state.userDetail.affiliate = data.affiliate state.userDetail.systemUser = data.systemUser - // state.userDetail.systemUser = 7 + // state.userDetail.systemUser = 3 // 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户 state.userDetail.systemList = [] if(data.systemUser != 0)state.userDetail.systemList.push(1) diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index b4f485a1..e0618e59 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -266,7 +266,7 @@