aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复detail bug和取消教育版管理员获取用户使用的地区接口

Browse Source
This commit is contained in:
X1627315083
2025-09-10 09:41:00 +08:00
parent 9590a53e15
commit 584f711f1c
14 changed files with 62 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/component/Administrator/SE/designDetailList/index.vue
View File

@@ -51,7 +51,7 @@
</div>
</div>
<div class="admin_search">
<div class="admin_search_item" @click="searchHistoryList">{{ $t('adminSeAllUser.search') }}</div>
<div class="admin_search_item" @click="searchHistoryList">{{ $t('admin.search') }}</div>
</div>
</div>

15
src/component/Detail/DesignDetail.vue
View File

@@ -56,6 +56,7 @@
<div class="item model" >
<model
ref="model"
:key="positionKey"
@canvasReload="canvasReload"
@detailEdit="detailEdit"
@addSketch="()=>isEditPattern.value=false"
@@ -152,6 +153,7 @@ export default defineComponent({
getCanvasIfEdit:{
fun:null,
},
positionKey:0,
})
provide('getCanvasIfEdit',detailData.getCanvasIfEdit)
@@ -170,6 +172,7 @@ export default defineComponent({
detailData.loadingShow = true
Https.axiosGet(url).then(
async (rv: any) => {
store.commit('DesignDetail/setDesignDetail',rv)
rv.clothes.forEach((item:any)=>{
let a
item.designType='Library'
@@ -205,9 +208,8 @@ export default defineComponent({
})
detailData.singleOveral.value = rv.singleOverall
detailData.designDetailShow = true
store.commit('DesignDetail/setDesignDetail',rv)
// this.deleteShow = false
initialize()
setRevocation()
detailData.loadingShow = false
if(rv.singleOverall == "single"){
@@ -252,16 +254,20 @@ export default defineComponent({
detailData.oppositeRevocationShow = oppositeRevocation.length
revocation.splice(revocation.length-1,1)
detailData.revocationShow = revocation.length
store.commit("DesignDetail/setDesignDetail", revocation[revocation.length-1]);
// store.commit("DesignDetail/setDesignDetail", revocation[revocation.length-1]);
store.commit('DesignDetail/setDesignDetail',revocation[revocation.length-1])
store.commit('DesignDetail/setDesignColthes',detailData.selectDetail.id)
sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation));
sessionStorage.setItem('revocation', JSON.stringify(revocation));
// clearSelect()
detailData.positionKey++
}
const oppositeRevocation = ()=>{//反撤回
let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any))
let revocation = JSON.parse((sessionStorage.getItem("revocation") as any))
if(!oppositeRevocation[oppositeRevocation.length-1])return
store.commit("DesignDetail/setDesignDetail", oppositeRevocation[oppositeRevocation.length-1]);
store.commit('DesignDetail/setDesignColthes',detailData.selectDetail.id)
revocation.push(oppositeRevocation[oppositeRevocation.length-1])
detailData.revocationShow = revocation.length
oppositeRevocation.splice(oppositeRevocation.length-1,1)
@@ -269,6 +275,7 @@ export default defineComponent({
sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation));
sessionStorage.setItem('revocation', JSON.stringify(revocation));
// this.clearSelect()
detailData.positionKey++
}
const setCurrentDetail = (str:string)=>{
store.commit('DesignDetail/setCurrentDetailType',str)
@@ -359,11 +366,13 @@ export default defineComponent({
let value = {
currentType : JSON.parse(JSON.stringify(detailData.currentDetailType)),
rv:rv,
fun:setRevocation
}
detailData.designDetail.oldModel = detailData.designDetail.newModel
delete detailData.designDetail.newModel
store.commit('DesignDetail/setPraeview',value)
detailData.loadingShow = false
// setRevocation()
}).catch(res=>{
detailData.loadingShow = false
});

63
src/component/Detail/canvas/index.vue
View File

@@ -334,41 +334,34 @@ export default defineComponent({
cursor: pointer;
}
}
.argument-box{
height: 4rem;
width: 100%;
margin-bottom: 3rem;
margin-left: 4rem;
}
.argument-box,
.content-bottom,
.detail-box{
:deep(i){
font-size: 2.5rem;
cursor: pointer;
width: 3.5rem;
height: 3.5rem;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
transition: all .3s;
margin-bottom: .5rem;
&.active{
border: 1px solid;
border-radius: .4rem;
}
&.icon-xiala{
transform: rotate(-90deg);
}
&.icon-xialaActive{
transform: rotate(90deg);
}
&.eventNone{
cursor: no-drop;
border: none;
opacity: .5;
.content-bottom{
:deep(.tools-sidebar){
i{
font-size: 2.5rem;
cursor: pointer;
width: 3.5rem;
height: 3.5rem;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
transition: all .3s;
margin-bottom: .5rem;
&.active{
border: 1px solid;
border-radius: .4rem;
}
&.icon-xiala{
transform: rotate(-90deg);
}
&.icon-xialaActive{
transform: rotate(90deg);
}
&.eventNone{
cursor: no-drop;
border: none;
opacity: .5;
}
}
}
}

2
src/component/Detail/detailLeft/module/currentList.vue
View File

@@ -57,7 +57,7 @@ export default defineComponent({
const selectImgItem = (file:any)=>{
if(props.type != 'models'){
if(!file.resData.minIOPath){
file.minIOPath = getMinioUrl(file.resData.url)
file.minIOPath = getMinioUrl(file.imgUrl || file.resData.url)
}
if(!file.designType){
file.designType = file.resData.designType

2
src/component/HomePage/Generate.vue
View File

@@ -356,7 +356,7 @@ export default defineComponent({
})
onUnmounted(() => {
instance.appContext.config.globalProperties.$dropdownEvents.delete(removeOpenSpeed)
instance.appContext.config.globalProperties.$dropdownEvents.offClose(removeOpenSpeed)
})
return {
userDetail,

2
src/component/HomePage/generalMenu.vue
View File

@@ -217,7 +217,7 @@ import { message, Upload, Modal } from "ant-design-vue";
})
onUnmounted(() => {
instance.appContext.config.globalProperties.$dropdownEvents.delete(removePrintModel)
instance.appContext.config.globalProperties.$dropdownEvents.offClose(removePrintModel)
window.removeEventListener('scroll', handleScroll, true)
window.removeEventListener('resize', handleResize)
})

2
src/component/LoginPage/login/enterprise.vue
View File

@@ -105,7 +105,7 @@
<span>
I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<router-link to="privacyPolicy" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</router-link>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees.
</span>
</label>

2
src/component/LoginPage/login/personal.vue
View File

@@ -88,7 +88,7 @@
<span>
I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<router-link to="privacyPolicy" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</router-link>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees.
</span>
</label>

2
src/component/LoginPage/login/school.vue
View File

@@ -105,7 +105,7 @@
<span>
I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<router-link to="privacyPolicy" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</router-link>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees.
</span>
</label>