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

部分页面调整

Browse Source
This commit is contained in:
X1627315083
2024-06-17 11:32:31 +08:00
parent 363b880276
commit 9b8134989d
19 changed files with 192 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/component/Administrator/allUser.vue
View File

@@ -109,8 +109,6 @@ export default defineComponent({
renameData,
userInfo,
handleResizeColumn: (w:any, col:any) => {
console.log(col,w);
col.width = w;
},
};

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

@@ -94,11 +94,11 @@
<i class="fi fi-rr-edit" @click.stop="openCurrent(2)"></i>
</div>
<div class="Guide_1_20 clothes_item_icon" :class="[driver__.driver?'showEvents':'']">
<div class="centent_div centent_print" v-if="current?.printObject?.prints?.[0]?.path && current?.printObject?.prints.length > 1" @click="openCurrent(2)">
<img v-for="item in current?.printObject?.prints" :key="item.id" :src="item.path" alt="">
<div class="centent_div centent_print" v-if="exhibitionList.print && exhibitionList.print.length > 1" @click="openCurrent(2)">
<img v-for="item in exhibitionList.print" :key="item.id" :src="item.path" alt="">
</div>
<div v-else-if="current?.printObject?.prints?.[0]?.path && current?.printObject?.prints.length == 1" class="centent_div">
<img :src="current?.printObject?.prints[0]?.path" alt="">
<div v-else-if="exhibitionList.print && exhibitionList.print.length == 1" class="centent_div">
<img :src="exhibitionList.print[0]?.path" alt="">
</div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(2)"></i>
</div>
@@ -130,7 +130,13 @@
<!-- <div class="centent_div" v-if="current?.printObject?.prints?.[0]?.path" @click="openCurrent(2)">
<img :src="current?.printObject?.prints[0]?.path" alt="">
</div> -->
<i class="fi fi-rr-picture centent" @click="openCurrent(4)"></i>
<div class="centent_div centent_print" v-if="exhibitionList.elements && exhibitionList.elements.length > 1" @click="openCurrent(4)">
<img v-for="item in exhibitionList.elements" :key="item.id" :src="item.path" alt="">
</div>
<div v-else-if="exhibitionList.elements && exhibitionList.elements.length == 1" class="centent_div">
<img :src="exhibitionList.elements[0]?.path" alt="">
</div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(4)"></i>
</div>
</div>
</div>
@@ -230,7 +236,7 @@ export default defineComponent({
provide('body',body)
let moible:any = isMoible()
provide('moible',moible)
let exhibitionList = ref({
let exhibitionList:any = ref({
print:[],
elements:[],
})
@@ -1458,6 +1464,9 @@ export default defineComponent({
flex-wrap: wrap;
justify-content: space-between;
align-content: space-between;
max-height: 10rem;
overflow-y: auto;
&.centent_print::-webkit-scrollbar{display: none;}
img{
width: 30%;
height: 30%;

26
src/component/Detail/DesignDetailAlter.vue
View File

@@ -510,7 +510,7 @@ export default defineComponent({
// console.log(JSON.parse(JSON.stringify(this.colorList)),JSON.parse(JSON.stringify(newVal)));
clearInterval(this.getPantongNameTime)
this.getPantongNameTime = setTimeout(() => {
this.getPantongName(newVal.rgba)
this.getPantongName(newVal.rgba,-1)
}, 100);
},
immediate: true
@@ -1021,7 +1021,7 @@ export default defineComponent({
},
//查询颜色的潘通值和txc
getPantongName(v) {
getPantongName(v,index) {
if(v?.r == undefined){
return
}
@@ -1036,8 +1036,13 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.getRgbByHsvBatch, data)
.then((rv) => {
if (rv) {
this.colorList[this.selectIndex].tcx = rv[0].tcx
this.colorList[this.selectIndex].name = rv[0].name
if(index == -1){
this.colorList[this.selectIndex].tcx = rv[0].tcx
this.colorList[this.selectIndex].name = rv[0].name
}else{
this.colorList[index].tcx = rv[0].tcx
this.colorList[index].name = rv[0].name
}
resolve();
}
})
@@ -1114,7 +1119,18 @@ export default defineComponent({
});
this.selectColorList = selectColorList
// this.getHsvColor(selectColorList)
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
// this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
let colorListIndex = []
this.colorList.forEach((item,index)=>{
if(!item.rgba){
colorListIndex.push(index)
}
})
for (let index = 0; index < selectColorList.length; index++) {
this.colorList[colorListIndex[0]] = selectColorList[index]
this.getPantongName(selectColorList[index].rgba,colorListIndex[0])
colorListIndex.splice(0,1)
}
img.remove()
};

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

@@ -369,7 +369,7 @@ export default defineComponent({
driverObj__.moveNext()
}
if(color?.rgba?.r){
this.selectColor.rgba = {r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1}
this.selectColor = color
this.selectColor.hex = hex
}
},
@@ -481,6 +481,18 @@ export default defineComponent({
this.selectColorList = selectColorList
this.getHsvColor(selectColorList)
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
// console.log(this.colorList);
// console.log(selectColorList);
let colorListIndex = []
this.colorList.forEach((item,index)=>{
if(!item.rgba){
colorListIndex.push(index)
}
})
for (let index = 0; index < selectColorList.length; index++) {
this.colorList[colorListIndex[0]] = selectColorList[index]
colorListIndex.splice(0,1)
}
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()

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

@@ -642,7 +642,6 @@ export default defineComponent({
let url = data.imgUrl.split('?')[0]
var match = url.match(/:(\d+)\/(.*)/);
minioUrl = match[2]
console.log(match[2]);
// data.imgUrl
}else{
minioUrl = data.minIOPath?data.minIOPath:data.resData.minIOPath

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

@@ -39,9 +39,13 @@
</div>
</div>
</div>
<a-popover title="Seed">
<a-popover>
<template #content>
<p>Seed</p>
</template>
<input class="search_seed" v-show="scene?.value == 'Logo'" @input="ifSeedValue" v-model="searchPictureSeed" type="Number" placeholder='Seed' min="0">
</a-popover>
<input
class="search_input"
@input="ifMaximumLength"

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

@@ -292,8 +292,6 @@ export default defineComponent({
category:imgData.category,
designType:'library'
}
console.log(obj);
// parent.useGenerate.designType = 'collection'
this.$emit('setLibrary',obj)
}else{

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

@@ -412,7 +412,6 @@ export default defineComponent({
if(generateProceedList){
// let str = generateProceedList.map((obj:any) => obj.taskId).join(',');
let str = generateProceedList.join(',')
console.log(str,generateProceedList);
let data = {uniqueId:str,userId:JSON.parse(userInfo).userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => {

44
src/component/WorksPage/newScaleImage.vue
View File

@@ -53,7 +53,7 @@
<img v-for="item in scaleImageData?.designPythonOutfitList" v-lazy="item.designUrl">
</div>
</div>
<div class="started_btn" @click="setChoose" :title="scaleImageData.openSource == 0?'发布者不允许二次创作~':''" :class="{active:scaleImageData.openSource == 0}">二创</div>
<div class="started_btn" @click="setChoose" :title="systemUser.value != 1?'请先登录或者升级为正式用户': scaleImageData.openSource == 0?'作者不允许二次创作':''" :class="{active:systemUser.value != 1?true:scaleImageData.openSource == 0}">二创</div>
</div>
<div v-else class="newScaleImage_right_content_generate">
<div class="scaleImage_chunk_item content_left_generate_item">
@@ -78,13 +78,13 @@
<div class="newScaleImage_right_detail">
<div class="scaleImage_chunk_item">
<div class="detail_right_user detail_left_right_item">
<div class="detail_right_user_head">
<!-- <img v-lazy="scaleImageData?.imgUrl"> -->
</div>
<!-- <div class="detail_right_user_head">
<img v-lazy="scaleImageData?.imgUrl">
</div> -->
<div class="detail_right_user_content">
<div class="scaleImage_chunk_title">名字</div>
<div class="scaleImage_chunk_title_intro">个性签名</div>
<div class="scaleImage_chunk_btn">关注</div>
<!-- <div class="scaleImage_chunk_title_intro">个性签名</div>
<div class="scaleImage_chunk_btn">关注</div> -->
</div>
</div>
<div class="detail_right_work_detail detail_left_right_item">
@@ -113,20 +113,16 @@
<i v-else class="fi fi-rr-social-network"></i>
<span>{{scaleImageData.likeNum}}</span>
</div>
<div>
<!-- <svg xmlns="http://www.w3.org/2000/svg" width="2.5rem" height="2.5rem" viewBox="0 0 16 16" fill="none" role="img" style="color: #9e9ea7;fill: currentColor;">
<path d="M8 3C4.36992 3 1.98789 6.21774 1.18763 7.49059C1.09079 7.64462 1.04237 7.72163 1.01527 7.84042C0.99491 7.92964 0.99491 8.07036 1.01527 8.15958C1.04237 8.27837 1.09079 8.35539 1.18763 8.50941C1.98789 9.78226 4.36992 13 8 13C11.6301 13 14.0121 9.78226 14.8124 8.50941L14.8124 8.50939C14.9092 8.35538 14.9576 8.27837 14.9847 8.15958C15.0051 8.07036 15.0051 7.92964 14.9847 7.84042C14.9576 7.72163 14.9092 7.64462 14.8124 7.4906L14.8124 7.49059C14.0121 6.21774 11.6301 3 8 3Z" fill="currentColor"></path>
<path d="M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="white"></path>
</svg> -->
<!-- <div>
<i class="fi fi-sr-eye"></i>
<span>{{scaleImageData.likeNum}}</span>
</div>
</div> -->
<div>
<i class="fi fi-rr-comment-alt-dots"></i>
<span>{{scaleImageData.likeNum}}</span>
<span>{{commentList.length}}</span>
</div>
</div>
<div class="detail_right_auther detail_left_right_item">
<!-- <div class="detail_right_auther detail_left_right_item">
<div class="scaleImage_chunk_title">Auther Other Products</div>
<div class="detail_right_auther_img">
<div class="detail_right_auther_img_item">
@@ -145,7 +141,7 @@
<span>more +</span>
</div>
</div>
</div>
</div> -->
</div>
</div>
<div class="newScaleImage_right_comment scaleImage_chunk_item">
@@ -219,12 +215,15 @@ import { defineComponent,watch,getCurrentInstance, h, ref ,toRefs,computed,react
import { Https } from "@/tool/https";
// import { getCookie } from "@/tool/cookie";
// import domTurnImg from '@/tool/domTurnImg'
import { useStore } from "vuex";
import { useRouter } from 'vue-router'
import { downloadIamge,setPubDate } from "@/tool/util";
import { message } from "ant-design-vue";
export default defineComponent({
setup() {
//首先在setup中定义
const store = useStore();
const router = useRouter()
let scaleImage: any = ref(false);//弹窗
let scaleImageMask:any = ref(false)//弹窗遮罩
@@ -249,6 +248,9 @@ export default defineComponent({
commentInput:'',//评论框提示词
commentList:[],
})
let systemUser = computed(()=>{
return store.state.UserHabit.systemUser
})
let commentInputFocus:any = ref()
let textarea: any = ref(null)
let setCopy = ()=>{
@@ -311,7 +313,12 @@ export default defineComponent({
}
let setChoose = () =>{
if(imgData.scaleImageData.openSource == 0)return
if(systemUser.value != 1){
return message.info('请先登录或者升级为正式用户')
}
if(imgData.scaleImageData.openSource == 0){
return message.info('作者不允许二次创作哦')
}
router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})
}
let setCommentReply = (value:any,str:any)=>{
@@ -396,6 +403,7 @@ export default defineComponent({
scaleImage,
scaleImageMask,
...toRefs(imgData),
systemUser,
commentInputFocus,
textarea,
setCopy,
@@ -528,7 +536,7 @@ export default defineComponent({
height: 100%;
position: relative;
overflow: hidden;
overflow-y: auto;
// overflow-y: auto;
.newScaleImage_content_right_img{
height: 100%;
@@ -861,6 +869,7 @@ export default defineComponent({
.detail_right_user_head{
border-radius: 50%;
overflow: hidden;
margin-right: var(--margin);
img{
width: 10rem;
height: 10rem;
@@ -876,7 +885,6 @@ export default defineComponent({
flex-direction: column;
justify-content: center;
align-items: flex-start;
margin-left: var(--margin);
.detail_right_user_content_intro,.detail_right_user_content_btn{
font-size: 1.6rem;

1
src/component/WorksPage/publish.vue
View File

@@ -218,7 +218,6 @@ export default defineComponent({
publishData.isShowMark = true
Https.axiosPost(Https.httpUrls.publish, param,config)
.then((rv) => {
console.log(rv);
cleardata()
publishData.isShowMark = false
message.success('Release success! You can find it in my work')