diff --git a/dist.7z b/dist.7z index 6aa015ac..918b947b 100644 Binary files a/dist.7z and b/dist.7z differ diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue index 9962e06e..6319b442 100644 --- a/src/component/Administrator/allUserPoerations.vue +++ b/src/component/Administrator/allUserPoerations.vue @@ -184,6 +184,14 @@ export default defineComponent({ label:'trial', value:'3', }, + { + label: "userInEvent", + value: "4", + }, + { + label: "Edu Admin", + value: "7", + }, ]); let init = (funStr,data)=>{ operations.operationsModal = true diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue index f13e1c5e..14fc7ee2 100644 --- a/src/component/Detail/model/modelPosition.vue +++ b/src/component/Detail/model/modelPosition.vue @@ -259,12 +259,13 @@ export default defineComponent({ }else{ resolve(true) isModal = false + isOpen = true } }).then((rv)=>{ }) if(isOpen){ - store.commit('DesignDetail/setDesignColthes',detailData.frontBack.front[index].id) emit('canvasReload') + store.commit('DesignDetail/setDesignColthes',detailData.frontBack.front[index].id) return } diff --git a/src/component/LoginPage/googleLogin.vue b/src/component/LoginPage/googleLogin.vue index 051ca5f7..f3c7e6bf 100644 --- a/src/component/LoginPage/googleLogin.vue +++ b/src/component/LoginPage/googleLogin.vue @@ -34,7 +34,7 @@ script:null }) let GOOGLE_CLIENT_ID = '29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com' - // let GOOGLE_CLIENT_ID = '399537927614-3sd3rs9p79doocsrff7gm5m1f3chvmn2.apps.googleusercontent.com' + // let GOOGLE_CLIENT_ID = '29310152396-c44dcsoksjirhn7vbo29p8u8n0sg4qps.apps.googleusercontent.com' // 使用谷歌登录的api const createGmailLogin = async ()=>{ var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`); diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index c5ba5f60..8306ce01 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -139,6 +139,7 @@ const DesignDetail : Module = { } }, setDesignColthes(state,data){ + console.log(data) if(!state.currentDetailType)state.currentDetailType = 'sketch' //切换选择 // state.currentDetailType = '' diff --git a/src/tool/adminRouter.js b/src/tool/adminRouter.js index 6651ec02..658c1259 100644 --- a/src/tool/adminRouter.js +++ b/src/tool/adminRouter.js @@ -177,7 +177,13 @@ const all = (t)=>{ route:'/administrator/organization', key:'sub13', isShow:true, - }] + },{ + name:'Design Frequency', + icon:'usetime', + route:'/administrator/designFrequency', + key:'sub14', + isShow:true, + },] } const schoolOrEnterprise = (t) =>{ return[ @@ -194,6 +200,19 @@ const schoolOrEnterprise = (t) =>{ icon:'usetime', key:'sub2', isShow:true, + },{ + name:'Function Use CHART', + route:'/administrator/recentActiveChart', + icon:'usetime', + key:'sub3', + isShow:true, + }, + { + name:'Design Frequency', + icon:'usetime', + route:'/administrator/designFrequency', + key:'sub4', + isShow:true, }, // { // name:'Credits Detail', @@ -215,7 +234,8 @@ const schoolOrEnterprise = (t) =>{ // route:'/administrator/designFrequency', // key:'sub5', // isShow:true, - // },{ + // }, + // { // name:'Generate Frequency', // icon:'usetime', // route:'/administrator/generateFrequency',