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

Merge branch 'StableVersion' into localDevelop

Browse Source
This commit is contained in:
X1627315083
2024-05-20 09:30:00 +08:00
parent fb9e4df95e e2a98459ad
commit 3e1e8ab326
17 changed files with 119 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev
View File

@@ -1,6 +1,6 @@
NODE_ENV = 'development'
# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
VUE_APP_BASE_URL = 'https://api.aida.com.hk'
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'

2
.env.dev_build
View File

@@ -3,5 +3,5 @@ NODE_ENV = 'production'
# VUE_APP_BASE_URL = 'http://18.167.251.121:10088'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'

BIN
src/assets/images/homePage/slider.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 637 B

11
src/component/Detail/habit.vue
View File

@@ -90,6 +90,7 @@
<a-slider id="system_silder"
v-model:value="workspaceItem.systemDesignerPercentage"
@afterChange="systemDesigner"
:tooltip-visible="openType.slider"
:tip-formatter="formatter"
>
</a-slider>
@@ -194,7 +195,8 @@ export default defineComponent({
habit:false,
model:false,
addWorkspace:false,
sex:false
sex:false,
slider:false,
})
let driver__:any = computed(()=>{
return store.state.Guide.guide
@@ -217,7 +219,6 @@ export default defineComponent({
value:[],
},
])
const {t} = useI18n()
return{
systemSeleves,
@@ -239,6 +240,7 @@ export default defineComponent({
handler(newVal:any,oldVal:any){
// this.store.state.Workspace.workspace
if(!newVal){
this.openType.slider = newVal
if(!this.workspaceItem.overallSingle){
this.workspaceItem.position = 'Overall'
}
@@ -348,6 +350,8 @@ export default defineComponent({
el.style.display="block"
setTimeout(() => {
el.classList.add("active")
let value:any = model.instance
value.openType.slider = true
}, 100);
}else{
el.classList.remove("active")
@@ -892,8 +896,11 @@ export default defineComponent({
margin-top: calc(8rem*1.2);
:deep(.ant-slider-track),
:deep(.ant-slider-rail) {
height: calc(.6rem*1.2);
background-color: #e1e1e1;
// background-image: url(@../../../../assets/images/homePage/slider.png);
background-size: 100% 100%;
border-radius: calc(0.5rem*1.2);
}
:deep(.ant-slider .ant-slider-handle:not(.ant-tooltip-open)),

1
src/component/HomePage/ColorboardUpload.vue
View File

@@ -406,6 +406,7 @@ export default defineComponent({
this.selectColor = {}
// this.fileList = []
this.reviewColor={}
this.colorList[this.selectIndex] = {}
this.pantongName = ''
this.colorList[this.selectIndex] = {}
let colorList =this.colorList.filter((v) => Object.keys(v).length)

94
src/component/HomePage/ExportModel.vue
View File

@@ -194,11 +194,13 @@
<div class="subitOkPreviewBtn Guide_1_32" @click="setExport">{{ $t('exportModel.Export') }}</div>
</div>
</div>
</div>
<!-- <div @click="toSvg">12312312312</div> -->
<div class="exportCanvasBox_center">
</div>
<div class="exportCanvasBox_center" :style="[isMoible?'overflow: hidden;':'']">
</div>
<div v-if="isMoible" class="exportCanvasBox_scroll">
<div></div>
</div>
<!-- <div class="exportCanvasBox_right">
<div class="exportCanvasBox_title">
High-definition Download
@@ -308,7 +310,7 @@ export default defineComponent({
// let canvasDom = ref()
let canvasWH = ref({
width: 400,
height: 1200,
height: 100,
});
// canvasWH.value.width = [window.innerWidth/2.4]
@@ -341,6 +343,7 @@ export default defineComponent({
let normalCanvasState = ref([])//存放canvas操作
let isLoadCanvas = false//撤回或者反撤回false为撤回
let init = () => {
canvasWH.value.height = 100
normalCanvasState.value = []
reverseCanvasState.value = []
showUpgradePlan.value = true;
@@ -1239,7 +1242,7 @@ export default defineComponent({
var pointer = canvas.getPointer(e.pointer);
var x = pointer.x;
var y = pointer.y;
let textbox = new fabric.Textbox('#', {
let textbox = new fabric.Textbox('', {
left: x,
top: y,
width: 150,
@@ -1664,23 +1667,64 @@ export default defineComponent({
};
},
data(prop) {
return {};
return {
isMoible:isMoible()
};
},
mounted() {},
watch: {
// driver__:{
// handler(newVal,oldVal){
// if(this.type_.type2 == 'Printboard'){
// if(newVal.index >= 14 && newVal.index < 15){
// this.setKeyword(newVal.index-14)
// }else{
// }
// }else if(this.type_.type2 == 'Sketchboard'){
// }
// }
// },
'canvasWH.height':{
handler(newVal,oldVal){
if(!this.isMoible){
return
}
let canvasBox = document.querySelector('.exportCanvasBox .exportCanvasBox_center')
let scrollBox = document.querySelector('.exportCanvasBox_scroll div')
canvasBox.scroll({
top: 0, // 纵向滚动距离
left: 0, // 横向滚动距离
});
scrollBox.style.marginTop = 0+'px'
let height = canvasBox.offsetHeight / (newVal / canvasBox.offsetHeight )
scrollBox.style.height = height +'px'
let scale = (newVal - canvasBox.offsetHeight) / (canvasBox.offsetHeight - height)
let mousedown = (event)=>{//按下
// console.log(event.target.getBoundingClientRect());
let position = {
y:event.touches[0].screenY,
top : scrollBox.style.marginTop?scrollBox.style.marginTop.split('px')[0]*1:0
}
// let top =
let scrollMousemove = (e)=>{
let height = scrollBox.style.height.split('px')[0]*1
let offsetTop = position.top+e.touches[0].screenY - position.y
offsetTop = offsetTop <= 0? 0 : offsetTop
offsetTop = height+offsetTop >= canvasBox.offsetHeight? canvasBox.offsetHeight - height : offsetTop
console.log();
scrollBox.style.marginTop = offsetTop+'px'
canvasBox.scroll({
top: offsetTop*scale, // 纵向滚动距离
left: 0, // 横向滚动距离
});
}
let mouseup = ()=>{//抬起
window.removeEventListener('touchmove',scrollMousemove)
scrollBox.removeEventListener('touchend',mouseup)
}
window.addEventListener('touchmove',scrollMousemove)
scrollBox.addEventListener('touchend',mouseup)
}
scrollBox.removeEventListener('touchstart',mousedown)
scrollBox.addEventListener('touchstart',mousedown)
}
},
},
mounted() {},
methods: {
},
@@ -1907,6 +1951,18 @@ export default defineComponent({
height: 100%;
overflow-x: hidden;
}
.exportCanvasBox_scroll{
height: 100%;
width: 2rem;
background: #d6cfe3;
border-radius: 1rem;
div{
background: #543087;
border-radius: 1rem;
width: 100%;
height: 30rem;
}
}
.export_new_collection_review {
position: initial;
margin: 10rem auto;

3
src/component/HomePage/PrintboardUpload.vue
View File

@@ -1237,7 +1237,8 @@ export default defineComponent({
width: auto;
}
&:hover .delete_like_file_block{
display: block;
// display: block;
opacity: 1;
}
&.active{
opacity: 0.5;

3
src/component/HomePage/SketchboardUpload.vue
View File

@@ -976,7 +976,8 @@ export default defineComponent({
max-width: 100%;
}
&:hover .delete_like_file_block{
display: block;
// display: block;
opacity: 1;
}

8
src/component/HomePage/TaskPage.vue
View File

@@ -152,13 +152,13 @@ export default defineComponent({
init(data:any){
this.visible = true
// this.getTaskList()
this.isShowMark = true
let time = 0
let time = 100
if(data){
time = 1000
}
setTimeout(() => {
this.currentPage = 1
this.isShowMark = true
this.getTaskMoreList()
this.getTaskTime = null
}, time);
@@ -236,11 +236,11 @@ export default defineComponent({
}
Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
this.isShowMark = false
this.currentPage += 1
if(this.currentPage > 1 && rv.content.length == 0){
if(this.currentPage != 1 && rv.content.length == 0){
this.currentPage = 1
this.getTaskMoreList()
}else{
this.currentPage += 1
this.taskListMore.push(...rv.content)
this.total = rv.total
this.taskListUnfinished = []

4
src/component/HomePage/UpgradePlan.vue
View File

@@ -83,14 +83,14 @@
<div class="UpgradePlan_payAffirm_content_btn" :class="[modeOfPayment == 'paypal'?'active':'']">
</div>
<label>
<!-- <label>
<input name="payAffirm" type="radio" value="alipay" v-model="modeOfPayment">
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAEXRFWHRTb2Z0d2FyZQBTbmlwYXN0ZV0Xzt0AAANmSURBVEiJvZZdaFxFFMd/M/cj926yu02MWWObEm3quoHGYBJBC4aCqbRRKoE+aLH6JhUFBT9Aij4oiooSfKn4oiA+FKlIkfbBj3TZYkGDDVWs1M1aaKgkJqEJazab+zE+3Gziunu3qwmep7kz95zfzH/OmRmhlFL8D6aXGl9ecjl2dpncnIe/QbQmIdmm8dwei/6OACGUUiqTc3nqxBKbvTgp4NjBRu7u1JEAo+nlTYcA+Ao+OFcEVqWbnPXqcoxZgvdGGtEljE95jJ4pXNcnN+evg+rdkyZTcOc2DYA//vTr8inF1sN+MDXQpCjrs4z1b10KbEP80w3XVzhVBAoFvf5AhL1JI3Sm93TqfP1krKL/xIUV3hmrlDQU9MLJAi+Kcof2qODUE1EAvvjZ4ZXTS6ETqRvkK8XANp2bYnKtrzmyLtXOVsnhgYYyn29/c8jOVt+7UBBAe1zS1SrL+j76rrjWbm0U9G7V6d0aJMhDOTc0Vk3QyZ9Wag0D8OEjTQBcnvfJzYWXSVVQS0QylNRJtmlYusDxFNN5RXbWZ2LKZSYfyNPZoq2l++c/1p5UBWgoafDq/giWDtN5haVB3BaUMl0p+GXG46tLDqmEhgCuFRTHz/8LUGeL5I3hCO+fK/LJeJGCE1RbxBR0JzQGu3T2pUxSCY1UQlvzuzzvs71Z4+J0+B4JpZTqeWsBgGcHLYQQvFvjaNGlYKTH4Oheu2Ls6oLPWNblm18dfphy8XyI25LM09HyFW1v1vjsQm0JpAjkBSi6iquLiltagsy8OS451GdyqM9kcVmRybmMXwlWWQaayfsMdulkck5VyI1NgjcfjNDfoeP5QVGfyTrcu0Pnsbss+jvW5YxZguFug+FuoxL06USR449HWfHg4++L/L4YZNcNjZKRHpNH+0222IJ8UXH0VIGxbDCh9KRLejJPKqFxeKCB+2830MvLr3yPAPbsNHhtn03UCgI6HmyxBWI168aveLx8eompa+Gnd1uT4OG+Bg7eYRKzRHVQadn7Uya72iUxW1BYgdy8TzrrcHG6vrsLwDYEB3YZvHSfHYB6317Y8DshzKSAiefjwVV+a6t2vf//s+1YjS0BjuwO6mezTQjBM4NW0C696zI5l9H0MpOzG39uSRGodGS3xdBtf3tubSxsffYXznw1EQcnMd4AAAAASUVORK5CYII=" alt="">
支付宝
</label>
<div class="UpgradePlan_payAffirm_content_btn" :class="[modeOfPayment == 'alipay'?'active':'']">
</div>
</div> -->
</div>
<div class="UpgradePlan_payAffirm_clause" ref="labelDisclaimer">
<label>

2
src/lang/cn.ts
View File

@@ -61,7 +61,7 @@ export default {
jsContent2:'我们只支持对印花进行超分',
jsContent3:'您的积分小于一次超分',
jsContent4:'您的积分余额不足',
jsContent5:'您选择的{str}张图像在超分辨率增强后的分辨率超过2048。请选择较低的放大倍数。',
jsContent5:'您选择的第{str}张图像在超分辨率增强后的分辨率超过2048。请选择较低的放大倍数。',
jsContent6:'请选择需要超分的图片',
},
upgradePlan:{

2
src/lang/en.ts
View File

@@ -62,7 +62,7 @@ export default {
jsContent2:'We only provide super-resolution capabilities for printboard images.',
jsContent3:'Your points are less than one SR',
jsContent4:'Your points balance is insufficient',
jsContent5:'The resolution of the {str} images you selected exceeds 2048 after super-resolution enhancement, Please choose a lower magnification level.',
jsContent5:'After super-resolution enhancement, the {str} th image you selected has a resolution exceeding 2048, Please choose a lower magnification level.',
jsContent6:'Please select the picture that requires upscale',
},
upgradePlan:{

2
src/tool/guide.js
View File

@@ -119,7 +119,7 @@ function createDriver(){
showButtons:false,
stagePadding:10,//切口到元素的距离
stageRadius:5,//切口圆弧度
allowKeyboardControl:true,//控制是否可以键盘控制下一步
allowKeyboardControl:false,//控制是否可以键盘控制下一步
disableActiveInteraction:false,//是否禁用显示元素的交互
overlayOpacity:.4,
overlay: true,

11
src/tool/util.js
View File

@@ -150,11 +150,16 @@ const isMoible = () => {//判断是否是移动端
let is_mobile = navigator.userAgent.toLowerCase().match(/(ipad|ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
// alert(navigator.userAgent.toLowerCase())
var isiPad = (navigator.maxTouchPoints && navigator.maxTouchPoints > 0);
// if (is_mobile) {
// return true//判断是否在正则内
// } else if(window.matchMedia("(pointer:fine)").matches){
// return false//判断是否支持鼠标
// }else{
// isiPad//判断触摸点
// }
if (is_mobile) {
return true//判断是否在正则内
} else if(window.matchMedia("(pointer:fine)").matches){
return false//判断是否支持鼠标
}else{
} else{
isiPad//判断触摸点
}
}

10
src/views/HomeView/HomeView.vue
View File

@@ -441,7 +441,6 @@ export default defineComponent({
let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的
window.addEventListener('beforeunload', (event)=>{
this.store.commit("setUserGroupId", this.$route.params.id);
this.store.commit("clearAllCollection");
});
if (this.$route.name == "homePage") {
@@ -520,8 +519,10 @@ export default defineComponent({
this.isMannequinShow = false
let num = 0
this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
this.workspacePosition.forEach((positionItem:any) => {
if(positionItem.name == sketchItem.category){
if(positionItem.value == sketchItem.category){
num ++
// console.log(num,this.allBoardData?.sketchboardFiles.length);
}
@@ -636,6 +637,7 @@ export default defineComponent({
"setDesignCollectionList",
rv.designCollectionItems
);
this.store.commit("setLikeDesignCollectionList", []);
this.store.commit("deleteUserGroupId");
this.store.commit(
@@ -645,7 +647,6 @@ export default defineComponent({
this.store.commit("setDesignId", rv.designId);
// this.designProgress = 0;
this.startDesignType = "design";
}
})
.catch((res) => {
@@ -680,6 +681,7 @@ export default defineComponent({
);
// this.designProgress = 0,
this.startDesignType = "resDesign";
this.store.commit("setDesignId", rv.designId);
}
})
.catch((res) => {
@@ -829,6 +831,7 @@ export default defineComponent({
if (this.likeLoading) {
return;
}
this.likeLoading = true;
Https.axiosPost(Https.httpUrls.designLike, data)
.then((rv: any) => {
@@ -892,6 +895,7 @@ export default defineComponent({
Https.httpUrls.historyChoose + `?userGroupId=${userGroupId}`;
Https.axiosGet(url)
.then((rv: any) => {
this.store.commit("setUserGroupId", rv.userGroupId);
this.dealHistoryChooseData(rv, type);
this.isShowMark = false;
})

2
src/views/LoginPage.vue
View File

@@ -527,6 +527,8 @@ export default defineComponent({
// this.$router.push("/home");
// console.log(window.location.search.substring(1));
this.store.commit("clearAllData");
this.store.commit("clearAllCollection");
this.store.commit("setAllBoardDataChoose",{});
this.$router.push("/home");
},
//获取当前语言

3
src/views/Upgrade.vue
View File

@@ -7,7 +7,8 @@
<div class="upgrade-content-wire"></div>
<div class="upgrade-content-text">System upgrading</div>
<!-- <div class="upgrade-content-text">System maintenance</div> -->
<div class="upgrade-content-textab">Due to system server upgrades, we will be conducting maintenance on Friday, May 17 from 10:30 AM to 11:30 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
<div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Friday, March 17 until further notice. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div>
<!-- <div class="upgrade-content-textab">Due to system server upgrades, we will carry out repairs on Friday, March 17th, from 9:30 AM to 16:00 PM Hong Kong time. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
</div>
</div>
</template>