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

2023-11-16-dist

Browse Source
This commit is contained in:
X1627315083
2023-11-16 17:23:17 +08:00
parent 5be355374e
commit 2ed15a165b
53 changed files with 970 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/assets/style/style.css
View File

@@ -104,6 +104,87 @@ li {
cursor: pointer;
zoom: 0.9;
}
.el-cascader {
font-size: 1.2rem;
width: 100%;
height: 3rem;
--el-color-primary: #d9d9d9;
--el-cascader-tag-background: #e1d9ec;
}
.el-cascader .el-input {
height: 100%;
}
.el-cascader .el-input .el-input__wrapper .el-input__inner {
height: 80% !important;
font-size: 1.2rem;
}
.el-popper {
padding: 0.5rem 1.1rem;
}
.el-cascader__tags,
.el-cascader__collapse-tag {
--el-color-primary: #d9d9d9;
--el-cascader-tag-background: #e1d9ec;
--el-fill-color: #e1d9ec;
height: 80%;
width: 80% !important;
flex-wrap: nowrap;
overflow: hidden;
}
.el-cascader__tags .el-tag--light,
.el-cascader__collapse-tag .el-tag--light {
margin: 0 0 0 0.6rem;
padding-right: 0.5rem;
height: 100%;
--el-icon-size: 1.4rem;
display: block;
}
.el-cascader__tags .el-tag--light .el-tag__content,
.el-cascader__collapse-tag .el-tag--light .el-tag__content {
font-size: 1.4rem;
color: #000;
}
.el-cascader__tags .el-cascader__search-input,
.el-cascader__collapse-tag .el-cascader__search-input {
height: 100%;
margin: 0 0 0 1.1rem;
}
.el-cascader__collapse-tag {
margin-bottom: 0.5rem;
}
.el-cascader__collapse-tag .el-cascader__collapse-tag .el-tag--light {
display: flex !important;
}
.el-popper .el-cascader-panel {
--el-cascader-menu-selected-text-color: #000;
}
.el-popper .el-cascader-panel .el-scrollbar {
min-width: 18rem;
}
.el-popper .el-cascader-panel .el-scrollbar .el-cascader-menu__wrap {
height: 24.4rem;
}
.el-popper .el-cascader-panel .el-scrollbar .el-cascader-menu__wrap .el-cascader-menu__list .el-cascader-node {
padding-right: 2rem;
padding: 0 3rem 0 2rem;
height: 3.4rem;
line-height: 3.4rem;
font-size: 1.4rem;
}
.el-popper .el-cascader-panel .el-scrollbar .el-cascader-menu__wrap .el-cascader-menu__list .el-checkbox {
--el-checkbox-input-height: 1.4rem;
--el-checkbox-input-width: 1.4rem;
--el-checkbox-font-size: 1.4rem;
--el-checkbox-checked-bg-color: #767676;
--el-checkbox-checked-input-border-color: #767676;
--el-checkbox-input-border-color-hover: #dcdfe6;
}
.el-popper .el-cascader-panel .el-scrollbar .el-cascader-menu__wrap .el-cascader-menu__list .el-checkbox .el-checkbox__input .el-checkbox__inner::after {
height: 0.7rem;
left: 0.4rem;
top: 0.1rem;
width: 0.3rem;
}
.ant-select-allow-clear {
font-size: 1.2rem;
height: 3rem;
@@ -332,7 +413,6 @@ li {
}
.pin_block .ant-checkbox-wrapper span {
font-size: 1.4rem;
height: 100%;
line-height: 2.3rem;
}
.pin_block .ant-checkbox-wrapper span .ant-checkbox-input::after {
@@ -378,7 +458,6 @@ li {
}
.libraryPageCascader .cascader_btn_max {
height: 4rem;
position: absolute;
width: 100%;
border-bottom: 1px solid #e1e1e1;
display: flex;
@@ -386,6 +465,7 @@ li {
}
.libraryPageCascader .cascader_btn_max .cascader_btn1 {
margin: 0 1rem;
line-height: 1.5rem;
}
.libraryPageCascader .ant-cascader-menu {
margin-top: 4rem;

99
src/assets/style/style.less
View File

@@ -115,6 +115,98 @@ ul,li{
zoom: .9;
}
.el-cascader{
font-size: 1.2rem;
width: 100%;
height: 3rem;
--el-color-primary: #d9d9d9;
--el-cascader-tag-background:#e1d9ec;
.el-input{
height: 100%;
.el-input__wrapper{
.el-input__inner{
height: 80% !important;
font-size: 1.2rem;
}
}
}
}
.el-popper{
padding: .5rem 1.1rem;
}
.el-cascader__tags,.el-cascader__collapse-tag{
--el-color-primary: #d9d9d9;
--el-cascader-tag-background:#e1d9ec;
--el-fill-color:#e1d9ec;
height: 80%;
width: 80% !important;
flex-wrap: nowrap;
overflow: hidden;
.el-tag--light{
margin: 0 0 0 .6rem;
padding-right: .5rem;
height: 100%;
--el-icon-size: 1.4rem;
display: block;
.el-tag__content{
font-size: 1.4rem;
color: #000;
}
}
.el-cascader__search-input{
height: 100%;
margin: 0 0 0 1.1rem;
}
}
.el-cascader__collapse-tag{
margin-bottom: .5rem;
.el-cascader__collapse-tag{
.el-tag--light{
display: flex !important;
}
}
}
.el-popper{
.el-cascader-panel{
--el-cascader-menu-selected-text-color: #000;
.el-scrollbar{
min-width: 18rem;
.el-cascader-menu__wrap{
height: 24.4rem;
.el-cascader-menu__list{
.el-cascader-node{
padding-right: 2rem;
padding: 0 3rem 0 2rem;
height: 3.4rem;
line-height: 3.4rem;
font-size: 1.4rem;
}
.el-checkbox{
--el-checkbox-input-height: 1.4rem;
--el-checkbox-input-width: 1.4rem;
--el-checkbox-font-size: 1.4rem;
--el-checkbox-checked-bg-color:#767676;
--el-checkbox-checked-input-border-color:#767676;
--el-checkbox-input-border-color-hover: #dcdfe6;
.el-checkbox__input{
.el-checkbox__inner::after{
height: .7rem;
left: .4rem;
top: .1rem;
width: .3rem;
}
}
}
}
}
}
}
}
//Library多级菜单
.ant-select-allow-clear{
font-size: 1.2rem;
@@ -328,7 +420,9 @@ ul,li{
}
}
}
.ant-message-info .anticon{
// color: #b2b2b2;
}
.habit :deep(.ant-btn:hover),
:deep(.ant-btn:focus),
:deep(.ant-btn:active),
@@ -387,7 +481,6 @@ ul,li{
align-items: center;
span{
font-size: 1.4rem;
height: 100%;
line-height: 2.3rem;
.ant-checkbox-input::after{
height: auto;
@@ -433,13 +526,13 @@ ul,li{
border-radius: 1rem;
.cascader_btn_max{
height: 4rem;
position: absolute;
width: 100%;
border-bottom: 1px solid rgb(225 225 225);
display: flex;
align-items: center;
.cascader_btn1{
margin: 0 1rem;
line-height: 1.5rem;
}
}
.ant-cascader-menu{

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

@@ -477,7 +477,7 @@ export default defineComponent({
// return `rgb(${r}, ${g}, ${b})`;
// box.style.backgroundColor = label.textContent = result.sRGBHex;
} catch (e) {
message.warning(this.t('DesignDetailAlter.jsContent1'))
message.info(this.t('DesignDetailAlter.jsContent1'))
}
})
},
@@ -557,7 +557,7 @@ export default defineComponent({
(v) => v.status === "done"
);
if (this.uploadList.length >= 8) {
message.warning(this.t('DesignDetailAlter.jsContent2'));
message.info(this.t('DesignDetailAlter.jsContent2'));
} else {
// this.store.commit("setSketchboardFile", fileList);
this.uploadList = fileList
@@ -697,11 +697,11 @@ export default defineComponent({
beforeUpload(file){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('DesignDetailAlter.jsContent4'));
message.info(this.t('DesignDetailAlter.jsContent4'));
}
const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
message.warning(this.t('DesignDetailAlter.jsContent5'));
message.info(this.t('DesignDetailAlter.jsContent5'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
@@ -785,11 +785,11 @@ export default defineComponent({
this.setColorboardList(colorList)
this.getColorBg = true
}else{
message.warning(this.t('DesignDetailAlter.jsContent6'))
message.info(this.t('DesignDetailAlter.jsContent6'))
}
})
}else{
message.warning(this.t('ColorboardUpload.jsContent5'))
message.info(this.t('ColorboardUpload.jsContent5'))
}
},

2
src/component/Detail/DesignDetailEnd.vue
View File

@@ -179,7 +179,7 @@ export default defineComponent({
let DesignPrintOperation = this.$refs.DesignPrintOperation
DesignPrintOperation.init()
}else{
message.warning(this.t('DesignDetailEnd.jsContent1'));
message.info(this.t('DesignDetailEnd.jsContent1'));
}
},

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

@@ -438,7 +438,8 @@ export default defineComponent({
this.getworkspace()
}
}
})
}).catch((res)=>{
});
},
deleteWorkspace(data:any){
Https.axiosDelete(Https.httpUrls.workspaceRemove,data).then((rv: any) => {
@@ -495,7 +496,7 @@ export default defineComponent({
// this.deleteWorkspace(data)
}else{
if(this.workspaceItemName == ''){
message.warning(this.t('Habit.jsContent2'));
message.info(this.t('Habit.jsContent2'));
}else{
if(index == -1){
let data = {

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

@@ -227,7 +227,7 @@ export default defineComponent({
// return `rgb(${r}, ${g}, ${b})`;
// box.style.backgroundColor = label.textContent = result.sRGBHex;
} catch (e) {
message.warning(this.t('ColorboardUpload.jsContent1'))
message.info(this.t('ColorboardUpload.jsContent1'))
}
})
this.clearSelectColor()
@@ -286,11 +286,11 @@ export default defineComponent({
this.setColorboardList(colorList)
this.getColorBg = true
}else{
message.warning(this.t('ColorboardUpload.jsContent2'))
message.info(this.t('ColorboardUpload.jsContent2'))
}
})
}else{
message.warning(this.t('ColorboardUpload.jsContent5'))
message.info(this.t('ColorboardUpload.jsContent5'))
}
},
@@ -396,11 +396,11 @@ export default defineComponent({
beforeUpload(file){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('ColorboardUpload.jsContent3'));
message.info(this.t('ColorboardUpload.jsContent3'));
}
const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
message.warning(this.t('ColorboardUpload.jsContent4'));
message.info(this.t('ColorboardUpload.jsContent4'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},

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

@@ -333,7 +333,6 @@ export default defineComponent({
generageAdd(data: any) {
data.type_ = this.type_;
data.resData = JSON.parse(JSON.stringify(data))
data.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", data);
},
@@ -344,11 +343,11 @@ export default defineComponent({
file.type === "image/jpg" ||
file.type === "image/bmp";
if (!isJpgOrPng) {
message.warning(this.t('Generate.jsContent1'));
message.info(this.t('Generate.jsContent1'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('Generate.jsContent2'));
message.info(this.t('Generate.jsContent2'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
@@ -396,13 +395,13 @@ export default defineComponent({
},
getgenerate(){
if(this.isTest){//试用用户禁止使用
message.warning(
message.info(
this.t('isTest.available')
);
return
}
if(!this.searchPictureName){
message.warning(
message.info(
this.t('Generate.jsContent3')
);
return
@@ -410,13 +409,13 @@ export default defineComponent({
if(this.searchPictureName){
let arr = this.searchPictureName.split(/\s+/).length
if(arr > 75){
message.warning(
message.info(
this.t('Generate.jsContent4')
);
return
}
}else{
message.warning(
message.info(
this.t('Generate.jsContent5')
);
return
@@ -484,7 +483,7 @@ export default defineComponent({
);
let arr = this.store.state.UploadFilesModule.sketchboard;
if (arr.length >= 8) {
message.warning(this.t('Generate.jsContent6'));
message.info(this.t('Generate.jsContent6'));
} else {
this.sketchboardList = fileList
}
@@ -498,7 +497,7 @@ export default defineComponent({
if (index > -1) {
this.sketchboardList.splice(index, 1);
}
message.error(file.name + this.t('Generate.jsContent5'));
message.warning(file.name + this.t('Generate.jsContent7'));
}
},
showFileCategory(file: any) {
@@ -536,7 +535,6 @@ export default defineComponent({
},
deleteFile(item: any) {
if (item.type_ == "generate" || item.type_ == "material") {
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
} else {
this.sketchboardList =

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

@@ -246,7 +246,7 @@ export default defineComponent({
emailNextStepFun() {
if (!isEmail(this.email)) {
message.warning(this.t('Header.jsContent1'));
message.info(this.t('Header.jsContent1'));
return;
}
let data = {

9
src/component/HomePage/MoodboardUpload.vue
View File

@@ -308,7 +308,7 @@ export default defineComponent({
);
let arr = this.store.state.UploadFilesModule.moodboard
if(arr.length >= 8){
message.warning(this.t('MoodboardUpload.jsContent1'))
message.info(this.t('MoodboardUpload.jsContent1'))
}else{
this.store.commit("setMoodboardFile", fileList);
}
@@ -334,18 +334,17 @@ export default defineComponent({
file.type === "image/jpg" ||
file.type === "image/bmp";
if (!isJpgOrPng) {
message.warning(this.t('MoodboardUpload.jsContent3'));
message.info(this.t('MoodboardUpload.jsContent3'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('MoodboardUpload.jsContent4'));
message.info(this.t('MoodboardUpload.jsContent4'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
deleteFile(item: any) {
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
}else{
@@ -406,7 +405,7 @@ export default defineComponent({
// layout.init('moodboard')
layout.init()
}else{
message.warning(this.t('MoodboardUpload.jsContent5'))
message.info(this.t('MoodboardUpload.jsContent5'))
}
},

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

@@ -268,11 +268,11 @@ export default defineComponent({
beforeUpload(file:any,fileList:any){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('PrintboardUpload.jsContent1'));
message.info(this.t('PrintboardUpload.jsContent1'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('PrintboardUpload.jsContent2'));
message.info(this.t('PrintboardUpload.jsContent2'));
}
if(isJpgOrPng && isLt2M){
this.currentFileNum = fileList.length
@@ -286,7 +286,6 @@ export default defineComponent({
// this.fileList.splice(item, 1)
// this.store.commit('setPrintboardFile',this.fileList)
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
}else{
this.fileList = this.store.state.UploadFilesModule.printboardFiles
@@ -503,12 +502,12 @@ export default defineComponent({
},500)
},
getgenerate(){
if(this.isTest){//试用用户禁止使用
message.warning(
this.t('isTest.available')
);
return
}
// if(this.isTest){//试用用户禁止使用
// message.warning(
// this.t('isTest.available')
// );
// return
// }
//如果是通过moodboard随即图片生成
let generage:any = this.$refs.Generate
let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
@@ -531,7 +530,7 @@ export default defineComponent({
if(generage?.collectionElementid){
}else{
message.warning(
message.info(
this.t('PrintboardUpload.jsContent4')
);
return
@@ -543,14 +542,14 @@ export default defineComponent({
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.warning(
message.info(
this.t('PrintboardUpload.jsContent5')
);
return
}
}else{
message.warning(
message.info(
this.t('PrintboardUpload.jsContent6')
);
return
@@ -649,14 +648,16 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.elementGeneratePrint, data).then((rv) =>{
if(rv){
console.log(rv);
// let data = {
// imgUrl:rv.url,
// resData:rv
// }
// this.printImgList.push(data)
// this.store.commit('setGeneratePrintFile',this.printImgList)
// this.loadingShow = false
this.generateList = []
let value = {
id:rv.generateItemId,
imgUrl:rv.generateItemUrl,
id_:GO.id++,
like:rv.isLiked
}
this.generateList.push(value)
this.loadingShow = false
}
}).catch(res=>{
this.loadingShow = false
@@ -670,7 +671,6 @@ export default defineComponent({
type2: 'Printboard',
},
item.resData = JSON.parse(JSON.stringify(item))
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
}
}

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

@@ -157,7 +157,7 @@ export default defineComponent({
roborSend (){
this.clearTimer()
if(!this.chatCentent){
message.warning(this.t('RobotAssist.jsContent1'));
message.info(this.t('RobotAssist.jsContent1'));
return
}
this.record.push({

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

@@ -422,11 +422,11 @@ export default defineComponent({
file.type === "image/jpg" ||
file.type === "image/bmp";
if (!isJpgOrPng) {
message.warning(this.t('SketchboardUpload.jsContent2'));
message.info(this.t('SketchboardUpload.jsContent2'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('SketchboardUpload.jsContent3'));
message.info(this.t('SketchboardUpload.jsContent3'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
@@ -484,7 +484,6 @@ export default defineComponent({
deleteFile(item: any) {
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
}else{
this.fileList = this.store.state.UploadFilesModule.sketchboardFiles
@@ -597,7 +596,7 @@ export default defineComponent({
if(generateType == 'image'||generateType == 'text-image'){
if(generage?.collectionElementid){
}else{
message.warning(
message.info(
this.t('SketchboardUpload.jsContent5')
);
return
@@ -609,13 +608,13 @@ export default defineComponent({
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.warning(
message.info(
this.t('SketchboardUpload.jsContent6')
);
return
}
}else{
message.warning(
message.info(
this.t('SketchboardUpload.jsContent7')
);
@@ -651,7 +650,6 @@ export default defineComponent({
type2: 'Sketchboard',
},
item.resData = JSON.parse(JSON.stringify(item))
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
}
},

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

@@ -89,11 +89,11 @@ export default defineComponent({
beforeUpload(file:any){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('Upload.jsContent2'));
message.info(this.t('Upload.jsContent1'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('Upload.jsContent2'));
message.info(this.t('Upload.jsContent2'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
@@ -115,7 +115,7 @@ export default defineComponent({
if(index > -1){
this.fileList.splice(index, 1)
}
message.error(file.name + this.t('Upload.jsContent3'))
message.warning(file.name + this.t('Upload.jsContent3'))
}
},
deleteFile(index:any){

16
src/component/HomePage/collectionModal.vue
View File

@@ -91,18 +91,28 @@ export default defineComponent({
},
methods:{
nextStep(){
let colorBoards = this.store.state.UploadFilesModule.colorBoards
if(this.collectionStep == 1){
let disposeMoodboard = this.store.state.UploadFilesModule.disposeMoodboard
let moodboard = this.store.state.UploadFilesModule.moodboard
if(moodboard.length > 1){
if (!disposeMoodboard || disposeMoodboard.length == 0) {
message.warning(this.$t('collectionModal.jsContent1'))
message.info(this.$t('collectionModal.jsContent1'))
return
}
}
}
this.collectionStep = this.collectionStep + 1
if(this.collectionStep == 3){
if(colorBoards.length >= 1){
}else{
message.info(this.$t('collectionModal.jsContent3'))
return
}
}
this.collectionStep = this.collectionStep + 1
},
lastStep(){
@@ -149,7 +159,7 @@ export default defineComponent({
let colorBoards = this.store.state.UploadFilesModule.colorBoards
if(!colorBoards || colorBoards?.length < 1){
message.warning(this.$t('collectionModal.jsContent3'))
message.info(this.$t('collectionModal.jsContent3'))
return
}
this.store.commit('clearAllId')

21
src/component/LibraryPage/setLabel.vue
View File

@@ -51,6 +51,7 @@
import { defineComponent,ref,createVNode,watch,nextTick,inject} from 'vue'
import { Https } from "@/tool/https";
import {dataURLtoFile,base64toFile} from "@/tool/util"
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { getCookie } from "@/tool/cookie";
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
@@ -181,6 +182,7 @@ export default defineComponent({
if(index == -1){
if(this.itemName == ''){
message.warning(this.t('Habit.jsContent2'));
return
}else{
if(item){
@@ -264,6 +266,25 @@ export default defineComponent({
this.getClass()
}
).catch((res)=>{
if(res.errCode === 1){
let _this = this
Modal.confirm({
title: res.errMsg,
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
zIndex:99999,
// centered:true,
onOk() {
data.deleteConfirm = 1
_this.deleteClass(data)
},
onCancel(){
}
});
}
});
},
getClass(){

6
src/lang/en.ts
View File

@@ -104,10 +104,6 @@ export default {
jsContent1:'Deleted successfully',
jsContent2:'Do you really want to delete this collection? ',
jsContent3:'Change successfully',
jsContent4:'Image must smaller than 2MB!',
jsContent5:'This picture has been uploaded whether to continue uploading？',
jsContent6:'The entered content exceeds the maximum length.',
jsContent7:'Please enter content',
},
ModelPlacement:{
Registration:'Registration',
@@ -263,7 +259,7 @@ export default {
PrinCollection:'select printboard for your collection',
ColorCollection:'select colors for your collection',
SketchCollection:'select sketchboard for your collection',
jsContent1:'You must select the image and then use the layout.',
jsContent1:'You need to design first and then move on to the next step.',
jsContent2:'The uploaded files will not be saved, being sure to continue? ',
jsContent3:'You must choose one or more colors for further process.',
},

28
src/tool/https.js
View File

@@ -54,15 +54,29 @@ axios.interceptors.response.use((res) =>{
if (res.data.errCode === 0) {
// message.error(res.data.errMsg)
return Promise.resolve(res.data.data);
} else {
message.warning(res.data.errMsg)
} else if(res.data.errCode === 1){
return Promise.reject(res.data);
}
} else if(res.data.errCode === 2){
message.warning(res.data.errMsg)
return Promise.reject(res.data);
}else if(res.data.errCode === -1){
message.error(res.data.errMsg)
return Promise.reject(res.data);
}
} else {
message.warning(res.data.errMsg)
// message.error(res.data.errMsg)
return Promise.reject(res.data);
if (res.data.errCode === 0) {
message.warning(res.data.errMsg)
return Promise.reject(res.data);
} else if(res.data.errCode === 1){
return Promise.reject(res.data);
} else if(res.data.errCode === 2){
message.warning(res.data.errMsg)
return Promise.reject(res.data);
}else if(res.data.errCode === -1){
message.error(res.data.errMsg)
return Promise.reject(res.data);
}
}
}, function(error) {
@@ -71,7 +85,7 @@ axios.interceptors.response.use((res) =>{
return Promise.reject()
}
let data_new = error?.response?.data
message.error(data_new?.errMsg || 'Error: server exception')
// message.error(data_new?.errMsg || 'Error: server exception')
return Promise.reject(data_new);
});

4
src/views/HomeView.vue
View File

@@ -499,7 +499,7 @@ export default defineComponent({
let { colorBoards } =
this.store.state.UploadFilesModule.allBoardData;
if (!colorBoards || colorBoards?.length < 1) {
message.warning(
message.info(
this.t('HomeView.jsContent1')
);
return;
@@ -536,7 +536,7 @@ export default defineComponent({
let { colorBoards } =
this.store.state.UploadFilesModule.allBoardData;
if (!colorBoards || colorBoards?.length < 1) {
message.warning(
message.info(
this.t('HomeView.jsContent2')
);
return;

298
src/views/LibraryPage.vue
View File

@@ -90,7 +90,7 @@
<div class="content_search_block">
<input class="search_input" :placeholder="$t('LibraryPage.inputContent1')" v-model="searchPictureName" @keydown.enter="getLibraryList()">
<div class="search_cascader">
<a-cascader
<!-- <a-cascader
@click.stop="dropdownVisibleChange"
ref="cascader"
v-model:value="value.labelValue"
@@ -106,18 +106,23 @@
:open="false"
dropdownClassName="libraryPageCascader"
>
</a-cascader>
<div v-show="labelOpen.labelOpen" @click.stop="" class="search_cascader_checkbox">
<a-checkbox-group
v-model:value="value.labelValue"
:options="options"
/>
<br>
<a-checkbox-group
v-model:value="value.labelValue"
:options="options.childList"
/>
</div>
</a-cascader> -->
<el-cascader
:options="options"
:filterable="true"
v-model="value.labelValue"
:collapse-tags="true"
:show-all-levels="false"
:clearable="true"
:max-collapse-tags=3
:props="props"
:collapse-tags-tooltip="true"
clearable
ref="cascader"
popper-class="libraryPageCascader"
@visible-change="dropdownVisibleChange"
>
</el-cascader>
</div>
<!-- <div class="search_icon_block" @click="getLibraryList()"><span class="icon iconfont icon-sousuo"></span></div> -->
@@ -308,22 +313,19 @@
<div class="rename_form_content">
<input class="rename_form_input" :placeholder="$t('LibraryPage.inputContent3')" v-model="newPicName" @keydown.enter="confrimRename()">
</div>
<a-cascader
@click.stop="labelSearch"
ref="cascader"
v-model:value="value.editLabelValue"
style="width: 100%"
:field-names="{ label: 'classificationName', value: 'id', children: 'childList'}"
multiple
@change="setLabel1"
max-tag-count="responsive"
:options="options"
placeholder="Please select"
:show-search="{ filter }"
:open="labelOpen.editLabelOpen"
dropdownClassName="editLabel"
<el-cascader
:options="options"
:filterable="true"
v-model="value.editLabelValue"
:collapse-tags="true"
:show-all-levels="false"
:clearable="true"
:max-collapse-tags=6
:props="props"
:collapse-tags-tooltip="true"
clearable
>
</a-cascader>
</el-cascader>
<div class="rename_button_list">
<div class="rename_button_item rename_cancel_button" @click="closeRenameModal()">{{ $t('LibraryPage.Cancel') }}</div>
<div class="rename_button_item rename_submit_button" @click="confrimRename()">{{ $t('LibraryPage.Sure') }}</div>
@@ -359,6 +361,7 @@ import { Https } from "@/tool/https";
import { getCookie } from "@/tool/cookie";
import { useI18n } from "vue-i18n";
import type { ShowSearchType } from 'ant-design-vue/es/cascader';
import { ElCascader } from 'element-plus'
export default defineComponent({
components: {
HeaderComponent,
@@ -366,6 +369,7 @@ export default defineComponent({
setLabel,
ModelPlacementMobile,
RobotAssist,
ElCascader,
},
setup() {
@@ -442,14 +446,19 @@ export default defineComponent({
labelValue:[],
editLabelValue:[],
})
const filter: ShowSearchType['filter'] = (inputValue, path) => {
return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
};
let labelOpen = ref({
labelOpen:false,
editLabelOpen:false,
})
let props = {
multiple: true,
checkStrictly: true,
emitPath:true,
children:'childList',
value:'id',
label:'classificationName',
}
let isTest = ref()
return {
menuList,
@@ -483,9 +492,8 @@ export default defineComponent({
printModel,
value,
options,
filter,
t,
labelOpen,
props,
isTest,
}
},
@@ -686,19 +694,7 @@ export default defineComponent({
libraryName:this.newPicName,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
// Https.axiosPost(Https.httpUrls.batchUpdateLibraryName, data).then(
// (rv: any) => {
// if(this.renameType ==='batch'){
// this.selectImgList = []
// }
// this.getLibraryList()
// this.closeRenameModal()
// }
// ).catch((res)=>{
// this.closeRenameModal()
// });
console.log(this.value);
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
let labelArr:any = []
this.value.editLabelValue.forEach((item:any)=>{
// if(item.length > 1){
@@ -709,7 +705,6 @@ export default defineComponent({
labelArr.push(item[item.length-1])
})
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
let data2 = {
"classificationIdList": labelArr,
"classificationName": "",
@@ -720,16 +715,28 @@ export default defineComponent({
"updateTime": "",
"userId": 0
}
// Https.axiosPost(Https.httpUrls.relationLibrary, data2).then(
// (rv: any) => {
// console.log(rv);
// this.getLibraryList()
// this.closeRenameModal()
Https.axiosPost(Https.httpUrls.batchUpdateLibraryName, data).then(
(rv: any) => {
if(this.renameType ==='batch'){
this.selectImgList = []
}
Https.axiosPost(Https.httpUrls.relationLibrary, data2).then(
(rv: any) => {
console.log(rv);
this.getLibraryList()
this.closeRenameModal()
// }
// ).catch((res)=>{
// this.closeRenameModal()
// });
}
).catch((res)=>{
this.closeRenameModal()
});
}
).catch((res)=>{
this.closeRenameModal()
});
},
//打开修改名称弹窗
@@ -759,31 +766,26 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.getRelClassificationIdList, classData).then(
(rv: any) => {
let arr:any = []
this.options.forEach((item:any)=>{
rv.forEach((rvItem:any) => {
if(item.id == rvItem){
arr.push(item.id)
}else{
item.childList.forEach((optionsItem:any) => {
if(optionsItem.id == rvItem){
arr.push([optionsItem.parentId,optionsItem.id])
}
// this.options.forEach((item:any)=>{
// rv.forEach((rvItem:any) => {
// if(item.id == rvItem){
// arr.push(item.id)
// }else{
// item.childList.forEach((optionsItem:any) => {
// if(optionsItem.id == rvItem){
// arr.push([optionsItem.parentId,optionsItem.id])
// }
});
}
});
})
this.value.editLabelValue = arr
// });
// }
// });
// })
this.value.editLabelValue = rv
}
).catch((res)=>{
});
}
this.renameType = type
this.labelOpen.labelOpen = false
this.renameVisivle = true
},
upLoad(){
@@ -799,7 +801,6 @@ export default defineComponent({
},
//删除单个图片
deleteSinglePic(data:any,index:any){
this.labelOpen.labelOpen = false
let _this = this
Modal.confirm({
title: this.t('LibraryPage.jsContent1'),
@@ -848,17 +849,36 @@ export default defineComponent({
}
}
).catch((res)=>{
if(data.level1Type == "Models" && res.errCode === 1){
let _this = this
Modal.confirm({
title: res.errMsg,
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
zIndex:99999,
// centered:true,
onOk() {
data.deleteModelConfirm = 1
_this.confirmDeletePic(data,index)
},
onCancel(){
}
});
}
});
},
beforeUpload(file:any,fileList:any){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('LibraryPage.jsContent3'));
message.info(this.t('LibraryPage.jsContent3'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('LibraryPage.jsContent4'));
message.info(this.t('LibraryPage.jsContent4'));
}
if(isJpgOrPng && isLt2M){
this.currentUploadFileNum = fileList.length
@@ -941,8 +961,7 @@ export default defineComponent({
this.value.labelValue.forEach((item:any)=>{
labelArr.push(item[item.length-1])
})
console.log(labelArr);
console.log(this.value.labelValue);
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
let data = {
classificationIdList:labelArr,
@@ -971,7 +990,6 @@ export default defineComponent({
...data.libraryModelPoint,
url:data.url,
}
this.labelOpen.labelOpen = false
this.placementClick(newData)
},
@@ -1022,7 +1040,7 @@ export default defineComponent({
if (index > -1) {
this.selectGenerateList.splice(index, 1);
}
message.error(file.name + this.t('LibraryPage.jsContent8'));
message.warning(file.name + this.t('LibraryPage.jsContent8'));
}
},
deleteFile(index: any) {
@@ -1063,7 +1081,7 @@ export default defineComponent({
},
getgenerate(){
if(this.isTest){//试用用户禁止使用
message.warning(
message.info(
this.t('isTest.available')
);
return
@@ -1104,7 +1122,7 @@ export default defineComponent({
}
}else{
message.warning(
message.info(
this.t('LibraryPage.jsContent7')
);
return
@@ -1133,71 +1151,45 @@ export default defineComponent({
},
dropdownVisibleChange(){
this.labelOpen.labelOpen = true
document.addEventListener('click',this.setClick)
// nextTick().then(()=>{
// let cascader = document.getElementsByClassName('libraryPageCascader')[0]
// let cascaderChild = cascader.children[0].children[0]
// cascader.addEventListener('click',(event)=>{
// event.stopPropagation()
// })
// if(cascader.children[0].children[0].children.length > 1){
// }else{
// let button1:any = document.createElement("span")
// button1.classList.add('started_btn','cascader_btn1')
// let button2:any = document.createElement("span")
// button2.classList.add('started_btn','cascader_btn2')
// let divMax:any = document.createElement("div")
// divMax.classList.add('cascader_btn_max')
// button1.textContent = 'redact'
// // button2.textContent = '删除'
// button1.addEventListener('click',this.addLabel,false)
// // button2.addEventListener('click',this.removeLabel,false)
// divMax.appendChild(button1)
// // divMax.appendChild(button2)
// cascaderChild?.insertAdjacentElement("afterbegin", divMax);
// // cascader.addEventListener('click',this.cascaderClick)
// }
// })
nextTick().then(()=>{
let cascader = document.getElementsByClassName('libraryPageCascader')[0]
let cascaderChild = cascader
if(cascader.children.length > 3 ){
}else{
let button1:any = document.createElement("span")
button1.classList.add('started_btn','cascader_btn1')
let button2:any = document.createElement("span")
button2.classList.add('started_btn','cascader_btn2')
let divMax:any = document.createElement("div")
divMax.classList.add('cascader_btn_max')
button1.textContent = 'edit'
// button2.textContent = '删除'
button1.addEventListener('click',this.removeLabel,false)
divMax.appendChild(button1)
// divMax.appendChild(button2)
cascaderChild?.insertAdjacentElement("afterbegin", divMax);
// cascader.addEventListener('click',this.cascaderClick)
}
})
},
// cascaderClick(e:Event){
// console.log(e.target)
// },
setLabel1(value:any){
console.log(value);
console.log(this.value.labelValue);
// this.value.labelValue = [[31,32],[31,33],[31,35],[31,40],[31,41],[31,42]]
let myCascader:any = this.$refs.cascader
},
setClick(){
this.labelOpen.labelOpen = false
this.labelOpen.editLabelOpen = false
document.removeEventListener('click',this.setClick)
},
removeClick(){
},
addLabel(){
removeLabel(){
let setLabel:any = this.$refs.setLabel
this.labelOpen.labelOpen = false
let cascader:any = this.$refs.cascader
cascader.togglePopperVisible()
let event = new Event('click', {"bubbles":true, "cancelable":true});
document.dispatchEvent(event);
setLabel.init('add',this.options)
},
// removeLabel(){
// let setLabel:any = this.$refs.setLabel
// setLabel.init('remove')
// this.labelOpen = false
// }
labelSearch(){
this.labelOpen.editLabelOpen = true
document.addEventListener('click',this.setClick)
nextTick().then(()=>{
let cascader = document.getElementsByClassName('editLabel')[0]
cascader.addEventListener('click',(event)=>{
event.stopPropagation()
})
console.log(this.value.editLabelValue);
})
@@ -1399,17 +1391,7 @@ export default defineComponent({
width: 60%;
display: flex;
position: relative;
.search_cascader_checkbox{
position: absolute;
top: 3rem;
background: #fff;
z-index: 2;
border: 1px solid;
.ant-checkbox-group{
display: flex;
flex-direction: column;
}
}
}
.search_icon_block{
@@ -1785,19 +1767,11 @@ export default defineComponent({
color: #FFFFFF;
}
}
.ant-select-allow-clear{
.el-cascader{
height: 4.6rem;
margin-top: 2rem;
.ant-select-selector{
.ant-select-selection-overflow{
.ant-select-selection-overflow-item{
.ant-select-selection-item{
.ant-select-selection-item-content{
line-height: 2.7;
}
}
}
}
.el-tag__content{
line-height: 2.5;
}
}

14
src/views/LoginPage.vue
View File

@@ -298,7 +298,7 @@ export default defineComponent({
//邮箱登录的下一步
emailNextStepFun() {
if (!isEmail(this.email)) {
message.warning("The email format is incorrect");
message.info("The email format is incorrect");
return;
}
let data = {
@@ -331,7 +331,7 @@ export default defineComponent({
//忘记密码的下一步
forgetPasswordNextStepFun() {
if (!isEmail(this.forgetPasswordEmail)) {
message.warning("The email format is incorrect");
message.info("The email format is incorrect");
return;
}
let data = {
@@ -381,22 +381,22 @@ export default defineComponent({
return;
}else{
if (!this.username || !this.password) {
message.warning("Please enter your account number or password");
message.info("Please enter your account number or password");
return;
}
//输入邮箱
if (!this.email) {
message.warning("Please enter your email address");
message.info("Please enter your email address");
return;
}
//判断邮箱格式是否正确
if (!isEmail(this.email)) {
message.warning("The email format is incorrect");
message.info("The email format is incorrect");
return;
}
//判断是否同意隐私政策
if (!this.checked) {
message.warning("Agree to all terms, privacy fees and policies");
message.info("Agree to all terms, privacy fees and policies");
return;
}
let data = {
@@ -453,7 +453,7 @@ export default defineComponent({
if (rv) {
this.createTimer();
let token = rv.token;
let isTest = true
let isTest = false
setCookie("token", token);
setCookie("isTest", isTest);
setCookie("userInfo", JSON.stringify(rv));