Details
edit the details of your design
@@ -30,27 +25,33 @@
-
+
+
- ![]()
+ ![]()
+ ![]()
+
+
+ ![]()
+
+
-
+
-
+
-
+
-
+
- ![]()
+ ![]()
-
-
-
-
Current Apparel
@@ -58,7 +59,10 @@
-
+ Current Print
+ ![]()
+
+
@@ -68,20 +72,17 @@
-
+
-
222
- 111
+ {{currentItem.color?.tcx}}
+ {{currentItem.color?.name}}
-
{{parentData.index + 1}}/{{parentData.collectionList.length}}
-
+
+ Submit
+
+
+
+
-
-
- ![]()
-
-
- ![]()
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index a5f82a3c..dda8c1d3 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -1,41 +1,51 @@
+
+
+
+ Placement
+
+
+
+
+
+
+
+
+
+
+
+ Overal
+
+
+ Single
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ ![]()
+
+ preview
+
+
+
+ ![]()
+
+
+
+
+ ![]()
+
+
+
+ -
+
+
+
+
+
+
+
+
-
+
+
-
-
+
-
- Workspace Setting
+Workspace Setting
adjust your workspace setting
-
-
-
- 上衣
- 裤子
-
-
+
+
+
+
-
+
-
+ {{ item.name }}+ + + + +
+
-
+
+
+ ++
+
男
-
女
@@ -43,36 +53,37 @@
Overal
-
Single
-
-
-
- 上衣
- 裤子
-
-
+
@@ -85,7 +96,7 @@
-
+
+
+
-
+
-
+ {{ item.label }}+
+
+
-
-
Current
@@ -106,20 +117,20 @@
System
-
Seleves
-
+
![]()
@@ -128,104 +139,192 @@
+
-
+
-
+
+
+ Cut picture
+
@@ -153,6 +157,25 @@ export default defineComponent({
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index 3a553c54..e7f33546 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router'
+import { createRouter, createWebHistory, RouteRecordRaw, createWebHashHistory } from 'vue-router'
import { defineAsyncComponent } from 'vue'
const _import = (path : string) => defineAsyncComponent(() => import(`../views/${path}.vue`));
@@ -37,6 +37,7 @@ const routes: Array = [
const router = createRouter({
history: createWebHistory(process.env.BASE_URL),
+// history: createWebHashHistory(),
routes
})
diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts
index edd45ac6..abdc1918 100644
--- a/src/store/Detail/designDetail.ts
+++ b/src/store/Detail/designDetail.ts
@@ -20,7 +20,9 @@ const DesignDetailModule : Module = {
setDesignItemOthers(state,data){
state.designItemDetail.others[data.index] = data.others
},
-
+ // setDesignItemOthers(state,data){
+ // state.designItemDetail.others[data.index] = data.others
+ // },
},
actions:{
diff --git a/src/store/index.ts b/src/store/index.ts
index a868d635..767a30aa 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -3,6 +3,7 @@ import UploadFilesModule from './uploadFile/uploadFile'
import DesignDetailModule from './Detail/designDetail'
import HomeStoreModule from './homeStore/homeStore'
import UserHabit from './userHabit/userHabit'
+import Woekspace from './workspace/workspace'
export interface RootState{
}
@@ -20,6 +21,7 @@ export default createStore({
UploadFilesModule,
DesignDetailModule,
HomeStoreModule,
- UserHabit
+ UserHabit,
+ Woekspace
}
})
diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts
index a23bb3ae..40d4f3cb 100644
--- a/src/store/uploadFile/uploadFile.ts
+++ b/src/store/uploadFile/uploadFile.ts
@@ -4,6 +4,7 @@ import { message } from "ant-design-vue";
interface UploadFiles{
moodboard:any,
+ disposeMoodboard:any,
moodboardFiles:any,
moodboardGenerateFiles:any,
moodboardMaterialFiles:any,
@@ -24,6 +25,7 @@ interface UploadFiles{
const UploadFilesModule : Module = {
state:{
moodboard:[],
+ disposeMoodboard:[],
moodboardFiles:[],
moodboardGenerateFiles:[],
moodboardMaterialFiles:[],
@@ -46,6 +48,9 @@ const UploadFilesModule : Module = {
setMoodboardFile(state,files){
state.moodboardFiles = files
state.moodboard = [...state.moodboardFiles,...state.moodboardGenerateFiles,...state.moodboardMaterialFiles]
+ },
+ setDisposeMoodboard(state,files){
+ state.disposeMoodboard = [files]
},
setMoodboardGenerateFiles(state,files){
state.moodboardGenerateFiles = files
@@ -55,11 +60,11 @@ const UploadFilesModule : Module = {
state.moodboardMaterialFiles = files
state.moodboard = [...state.moodboardFiles,...state.moodboardGenerateFiles,...state.moodboardMaterialFiles]
},
- addGenerateMaterialFils(state,data){
+ addGenerateMaterialFils(state,data:any){
let file
let arr = state.moodboard
if(data.type_.type1 == 'generate'){
-
+ data.resData.designType = 'generate'
if(data.type_.type2 == 'Moodboard'){
file = state.moodboardGenerateFiles
}else if(data.type_.type2 == 'Sketchboard'){
@@ -68,12 +73,13 @@ const UploadFilesModule : Module = {
file = state.printGenerateFiles
}
}else{
+ data.resData.designType = 'library'
if(data.type_.type2 == 'Moodboard'){
file = state.moodboardMaterialFiles
}else if(data.type_.type2 == 'Sketchboard'){
file = state.sketchMaterialFiles
}else if(data.type_.type2 == 'Printboard'){
- file = state.printGenerateFiles
+ file = state.printMaterialFiles
}
}
if(file.length == 0){
@@ -117,7 +123,7 @@ const UploadFilesModule : Module = {
}else if(data.type_.type2 == 'Sketchboard'){
state.sketchMaterialFiles = file
}else if(data.type_.type2 == 'Printboard'){
- state.printMaterialFiles = state.printMaterialFiles
+ state.printMaterialFiles = file
}
}
state.moodboard = [...state.moodboardFiles,...state.moodboardGenerateFiles,...state.moodboardMaterialFiles]
@@ -159,6 +165,7 @@ const UploadFilesModule : Module = {
setAllBoardData(state){
state.allBoardData = {
moodboardFiles:state.moodboard,
+ disposeMoodboard:state.disposeMoodboard,
printboardFiles:state.printboard,
colorBoards:state.colorBoards,
sketchboardFiles:state.sketchboard,
@@ -185,12 +192,13 @@ const UploadFilesModule : Module = {
state.colorBoards = []
state.marketingSketchFiles = []
state.moodTemplateId = ''
+ state.disposeMoodboard = []
},
setMoodTemplateId(state,moodTemplateId){
state.moodTemplateId = moodTemplateId
},
clearMoodTemplateId(state){
- state.moodTemplateId = ''
+ state.disposeMoodboard = []
},
},
actions:{
diff --git a/src/store/workspace/workspace.ts b/src/store/workspace/workspace.ts
new file mode 100644
index 00000000..118c0bb3
--- /dev/null
+++ b/src/store/workspace/workspace.ts
@@ -0,0 +1,25 @@
+import {Module} from 'vuex'
+import {RootState} from '../index'
+
+interface DesignDetail{
+ workspace:any,
+
+}
+
+const Woekspace : Module = {
+ state:{
+ workspace:{}
+ },
+ mutations:{
+ setWoekspace(state,files){
+ state.workspace = files
+ },
+
+
+ },
+ actions:{
+
+ }
+}
+
+export default Woekspace
\ No newline at end of file
diff --git a/src/tool/domTurnImg.js b/src/tool/domTurnImg.js
index f1ae9254..b5fa0a93 100644
--- a/src/tool/domTurnImg.js
+++ b/src/tool/domTurnImg.js
@@ -2,12 +2,57 @@ import html2canvas from "html2canvas";
const getJpeg = dom =>{
return new Promise(resolve =>{
html2canvas(dom,{useCORS: true,}).then(canvas =>{
- const jpeg = canvas.toDataURL('image/jpeg',1.0);
- resolve(base64ToFile(jpeg))
- console.log(jpeg,'=========');
+ let base64 = canvas.toDataURL('image/jpeg',.9);
+ let quality = 0.9 // 压缩系数0-1之间
+ let newImage = new Image()
+ newImage.src = base64
+ newImage.setAttribute('crossOrigin', 'Anonymous') // url为外域时需要
+ let imgWidth,
+ imgHeight
+ let w = undefined
+ newImage.onload = function () {
+ w = this.width * .8
+ imgWidth = this.width
+ imgHeight = this.height
+ let canvas = document.createElement('canvas')
+ let ctx = canvas.getContext('2d')
+ if (Math.max(imgWidth, imgHeight) > w) {
+ if (imgWidth > imgHeight) {
+ canvas.width = w
+ canvas.height = w * (imgHeight / imgWidth)
+ } else {
+ canvas.height = w
+ canvas.width = w * (imgWidth / imgHeight)
+ }
+ } else {
+ canvas.width = imgWidth
+ canvas.height = imgHeight
+ quality = 0.6
+ }
+ ctx.clearRect(0, 0, canvas.width, canvas.height)
+ ctx.drawImage(this, 0, 0, canvas.width, canvas.height) // // 这里面的 this 指向 newImage
+ let smallBase64 = canvas.toDataURL('image/jpeg', quality) // 压缩语句
+ let fileData = dataURLtoFile(smallBase64);
+ let fileOfBlob = new File([fileData], new Date() + ".jpg"); // 命名图片名
+ // console.log(smallBase64);
+ // resolve(base64ToFile(fileOfBlob))
+ resolve(fileOfBlob)
+ }
})
})
}
+ //base64转成blob
+function dataURLtoFile(dataURI, type) {
+ let binary = atob(dataURI.split(",")[1]);
+ let array = [];
+ for (let i = 0; i < binary.length; i++) {
+ array.push(binary.charCodeAt(i));
+ }
+ return new Blob([new Uint8Array(array)], { type: "image/jpeg" });
+}
+
+//转换
+
const base64ToFile = urlData =>{
const arr = urlData.split(',');
const mime = arr[0].match(/:(.*?);/)[1]
@@ -17,7 +62,6 @@ const base64ToFile = urlData =>{
while (n--){
ia[n] = bytes.charCodeAt(n);
}
- console.log(new File([ia],'jpeg',{type:mime}));
return new File([ia],'jpeg',{type:mime})
}
diff --git a/src/tool/https.js b/src/tool/https.js
index c0b8e09f..1a1eba16 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -19,8 +19,15 @@ import { message } from 'ant-design-vue';
// }else{
// axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
// }
+let httpIp
+if(process.env.NODE_ENV == 'development'){
+ httpIp = 'http://192.168.1.6:10086'
+}else{
+ httpIp = ''
+}
+console.log(httpIp);
axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
-console.log(process.env.VUE_APP_BASE_URL);
+// console.log(process.env.VUE_APP_BASE_URL);
//POST传参序列化(添加请求拦截器)
axios.interceptors.request.use((config) => {
//在发送请求之前做某件事
@@ -75,10 +82,10 @@ export const Https = {
elementSavePrint:'/api/element/savePrint',//保存印花
getRgbByTcx:'/api/element/getRgbByTcx', // 通过hsv值获取潘通信息
getRgbByHsv:'/api/element/getRgbByHsv', //通过hsv值获取潘通信息
- designCollection:'/api/design/designCollection', //设计 Conllection
+ designCollection:`${httpIp}/api/design/designCollection`, //设计 Conllection
reDesignCollection:'/api/design/reDesignCollection',//重新设计 Conllection
countDesignProcess:'/api/design/countDesignProcess', //统计design进度
- getRgbByHsvBatch:'http://192.168.1.6:10086/api/element/getRgbByHsvBatch', //通过hsv值数组批量获取潘通信息
+ getRgbByHsvBatch:`${httpIp}/api/element/getRgbByHsvBatch`, //通过hsv值数组批量获取潘通信息
designLike:'/api/design/like', //Design Like
designDislike: '/api/design/dislike', //Design Dislike
queryUserGroup:'/api/history/queryUserGroup', //History用户分页分组列表
@@ -99,9 +106,12 @@ export const Https = {
saveOrEditTemplatePoint:'/api/library/saveOrEditTemplatePoint',//保存或者编辑template打点
libraryModelsDot:'/api/library/modelsDot',//Models打点预览
pythonChatStream:'/api/python/chatStream',//机器人助力
- workspaceDetail:'http://192.168.1.6:10086/api/workspace/detail',//用户习惯详情
+ workspaceDetail:`${httpIp}/api/workspace/detail`,//用户习惯详情
+ workspaceList:`${httpIp}/api/workspace/list`,
sketchAndPrintGenerate:'/api/generate/sketchAndPrint',//sketchGenerate生成图片
-
+ generateLike:'/api/generate/like',//喜欢ganerate图片
+ elementUpload:'/api/element/upload',//上传图片
+
},
axiosGet(url,config) {
diff --git a/src/tool/util.js b/src/tool/util.js
index de779c7b..fcbafc35 100644
--- a/src/tool/util.js
+++ b/src/tool/util.js
@@ -59,23 +59,25 @@ function rgbToHsv([R, G, B]) {
B /= 255
const max = Math.max(R, G, B)
const min = Math.min(R, G, B)
- const range = max - min
- let V = max
- let S = V === 0 ? 0 : range / V
- let H = 0
- if (R === V) H = (60 * (G - B)) / range
- if (G === V) H = 120 + (60 * (B - R)) / range
- if (B === V) H = 240 + (60 * (R - G)) / range
-
- if (range === 0) H = 0
- if (H < 0) H += 360
- H = (H / 2) * (256 / 180)
- S *= 255
- V *= 255
-
- H = parseInt(H)
- S = parseInt(S)
- V = parseInt(V)
+ const delta = max - min
+ var H,S,V
+ if (delta === 0) {
+ H = 0;
+ } else if (max === R) {
+ H = ((G - B) / delta) % 6;
+ } else if (max === G) {
+ H = (B - R) / delta + 2;
+ } else { // max === B
+ H = (R - G) / delta + 4;
+ }
+ H = Math.round(H * 60); // 范围为 0-360
+ if (max === 0) {
+ S = 0;
+ } else {
+ S = delta / max;
+ }
+ S = Math.round(S*100); // 范围为 0-100
+ V = Math.round(max*100); // 范围为 0-100
return [H, S, V]
}
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index f46e8584..94a26909 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -53,45 +53,7 @@
@click="resDesignCollection()">
Redesign
-
-
-
-
-
-
@@ -250,34 +212,9 @@ export default defineComponent({
},
data() {
return {
- system_scale_value: 30,
- switch_open: true,
- designType: "Outwear",
isHaveReviewCollection: false,
isFinishLoading: false,
isShowMark: false, //导出的loading蒙层
- disignTypeList: [
- {
- value: "Outwear",
- label: "Outwear",
- },
- {
- value: "Blouse",
- label: "Blouse",
- },
- {
- value: "Dress",
- label: "Dress",
- },
- {
- value: "Trousers",
- label: "Trousers",
- },
- {
- value: "Skirt",
- label: "Skirt",
- },
- ],
indicator: h(LoadingOutlined, {
style: {
fontSize: "4.8rem",
@@ -316,9 +253,7 @@ export default defineComponent({
}
},
methods: {
- change_switch() {
- this.switch_open = !this.switch_open;
- },
+
formatter(value: number) {
return `${value}%`;
@@ -346,7 +281,7 @@ export default defineComponent({
.then((res) => {
_this.store.commit("setAllBoardData");
_this.isHaveReviewCollection = true;
- _this.isFinishLoading = true;
+ _this.isFinishLoading = false;
})
.catch((res) => {
_this.isFinishLoading = false;
@@ -394,8 +329,6 @@ export default defineComponent({
designNewCollection() {
let { colorBoards } =
this.store.state.UploadFilesModule.allBoardData;
- // console.log(colorBoards);
-
if (!colorBoards || colorBoards?.length < 1) {
message.error(
"You must choose one or more colors for further process."
@@ -403,9 +336,14 @@ export default defineComponent({
return;
}
let data = this.getDesignData("");
+ console.log(data);
+
Https.axiosPost(Https.httpUrls.designCollection, data)
+
.then((rv: any) => {
if (rv) {
+ console.log(rv);
+
this.store.commit(
"setDesignCollectionList",
rv.designCollectionItems
@@ -457,31 +395,33 @@ export default defineComponent({
});
this.getDesignProcess();
},
-
+
getDesignData(designCollectionId: any) {
let {
moodboardFiles,
printboardFiles,
+ disposeMoodboard,
// generatePrintFiles,
colorBoards,
sketchboardFiles,
marketingSketchFiles,
moodTemplateId,
} = this.store.state.UploadFilesModule.allBoardData;
- // let new_printboardFiles =
- // printboardFiles.concat(generatePrintFiles);
+ // console.log(this.store.state.UploadFilesModule.allBoardData);
+ let workspace = this.store.state.Workspace.workspace
let data: any = {
colorBoards: this.getColorBoard(colorBoards),
- marketingSketchs: this.getBoardId(marketingSketchFiles),
+ // marketingSketchs: this.getBoardId(marketingSketchFiles),
moodBoards: this.getBoardId(moodboardFiles),
printBoards: this.getPrintId(printboardFiles),
// printBoards: this.getPrintId(new_printboardFiles),
sketchBoards: this.getSkecthBoard(sketchboardFiles),
- switchCategory: !this.switch_open ? this.designType : "",
- singleOverall: !this.switch_open ? "single" : "overall",
- systemScale: this.system_scale_value / 100,
+
+ switchCategory: workspace.soverallSingle ? workspace.position : "",
+ singleOverall: workspace.soverallSingle ? "single" : "overall",
+ systemScale: workspace.systemDesignerPercentage,
templateId: this.templateId,
- moodTemplateId: moodTemplateId ? String(moodTemplateId) : null,
+ moodTemplateId: disposeMoodboard[0] ? String(disposeMoodboard[0].id) : null,
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
};
if (designCollectionId) {
@@ -507,6 +447,8 @@ export default defineComponent({
},
getBoardId(boardData: any) {
+ console.log(boardData);
+
let dataList = boardData.map((v: any) => {
let data: any = {
id: v.resData.id,
@@ -733,8 +675,6 @@ export default defineComponent({
let blob: any = dataURLtoBlob(
canvas.toDataURL("image/png")
);
- // console.log(blob);
-
let allBoardData: any =
this.store.state.UploadFilesModule.allBoardData;
let index = 0;
@@ -777,6 +717,7 @@ export default defineComponent({
collectionList: any,
type: string
) {
+
let designDetail: any = this.$refs.designDetail;
let data = {
design: design,
@@ -987,124 +928,6 @@ export default defineComponent({
.button_margin_14 {
margin-left: 1.4rem;
}
-
- .system_scale {
- margin-left: 7rem;
- width: 12rem;
- position: relative;
-
- .system_scale_title {
- font-size: 13px;
- font-weight: 400;
- color: #030303;
- }
-
- .system_silder {
- margin-top: 0.5rem;
- display: flex;
- align-items: center;
- position: absolute;
-
- .system_silder_value {
- font-size: 1.3rem;
- color: #030303;
- margin-left: 0.9rem;
- }
- }
-
- .sacle_left_tip {
- position: absolute;
- left: -2rem;
- bottom: -3.8rem;
- font-size: 1.4rem;
- line-height: 1.4rem;
- color: #030303;
- }
-
- .sacle_right_tip {
- position: absolute;
- right: -2rem;
- bottom: -3.8rem;
- font-size: 1.4rem;
- line-height: 1.4rem;
- color: #030303;
- }
- }
-
- .switch_component_block {
- width: 14rem;
- height: 4rem;
- background: #343579;
- border: 1px solid #141533;
- padding: 0.4rem 0.6rem;
- margin-left: 7rem;
- box-sizing: border-box;
- display: flex;
- position: relative;
- cursor: pointer;
-
- .switch_item {
- width: 50%;
- height: 100%;
- line-height: 3rem;
- font-size: 1.2rem;
- text-align: center;
- color: #ffffff;
- }
-
- .switch_white_button {
- position: absolute;
- width: calc(50% - 0.6rem);
- height: 3rem;
- left: 0.6rem;
- top: 0.4rem;
- background: #ffffff;
- transition-duration: 0.5s;
- line-height: 3rem;
- font-size: 1.2rem;
- text-align: center;
- color: #030303;
-
- &.switch_open_button {
- left: 50%;
- }
- }
- }
-
- .select_block {
- margin-left: 2rem;
-
- .icon-xiala {
- color: #1a1a1a !important;
- }
- }
- }
-
- .right_top_right {
- display: flex;
- align-items: center;
-
- .content_header_button {
- display: flex;
- justify-content: space-between;
- align-items: center;
- height: 4rem;
- border: 1px solid #000000;
- padding: 0 1.2rem 0 0.8rem;
- font-size: 1.3rem;
- color: #1a1a1a;
- cursor: pointer;
-
- .content_header_button_des {
- margin-right: 1rem;
- font-weight: bold;
- }
-
- .icon-xiala {
- transform: rotate(-90deg);
- color: #1a1a1a;
- }
- }
}
}
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index 44ca6e60..a7b92430 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -139,9 +139,9 @@
-
+
@@ -265,6 +265,7 @@ export default defineComponent({
time: 60, //60秒倒计时
passwordType:'password',
userId:'',
+ loginTime:true
};
},
methods: {
@@ -399,9 +400,8 @@ export default defineComponent({
};
// this.loginType = 'email'
// this.emailStap = 2;
- let loginTime = true
- if(loginTime){
- loginTime = false
+ if(this.loginTime){
+ this.loginTime = false
Https.axiosPost(Https.httpUrls.preLogin, data).then(
(rv: any) => {
// if (rv) {
@@ -418,9 +418,10 @@ export default defineComponent({
}
}
);
+
setTimeout(() => {
- loginTime = true
- }, 1000);
+ this.loginTime = true
+ }, 2000);
}
}
diff --git a/vue.config.js b/vue.config.js
index 1483bb2c..33f67827 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,6 +6,7 @@ module.exports = defineConfig({
transpileDependencies: ['vuetify'],
lintOnSave:false,//关闭语法检查
+ productionSourceMap: false,//打包不生成map文件，减少文件大小
devServer: {
// hot: true, // 热更新
// port: '8060',
@@ -20,7 +21,7 @@ module.exports = defineConfig({
// changeOrigin: true, //是否允许跨越
// }
'/api':{
- target:'http://18.167.251.121:5567',
+ target:'http://192.168.1.9:5567',
changeOrigin:true,
}
},