From c235d0de4a8a68dc378b031637d636bea2032cea Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 20 May 2025 16:47:27 +0800
Subject: [PATCH] =?UTF-8?q?chat=E8=81=8A=E5=A4=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev | 2 +-
src/assets/style/style.css | 2 -
src/assets/style/style.less | 2 +-
src/component/Account/account.vue | 4 +-
.../Account/frontPage/cancelRenewal.vue | 4 +-
.../Administrator/organization/add.vue | 196 ++
.../organization/organization.vue | 230 +++
src/component/Detail/setDesignItem.vue | 1 -
.../detailRight/editPrintElement.vue | 1 -
src/component/HomePage/ExportModel.vue | 4 +-
src/component/HomePage/Generate.vue | 4 +-
src/component/HomePage/MoodboardUpload.vue | 7 +-
src/component/HomePage/PrintboardUpload.vue | 1 -
src/component/HomePage/SketchboardUpload.vue | 2 +-
src/component/HomePage/UpgradePlan.vue | 1 -
.../model/collection/MoodboardUpload.vue | 10 +-
.../model/collection/PrintboardUpload.vue | 1 -
.../model/collection/SketchboardUpload.vue | 3 +-
.../HomePage/index/model/mannequin/edit.vue | 47 +-
.../HomePage/index/model/mannequin/index.vue | 2 +-
.../index/model/patternMaking3D/index.vue | 3 +-
.../index/model/poseTransfer/index.vue | 1 +
.../index/workflow/content/seriesDesign.vue | 1 +
src/component/LibraryPage/ModelPlacement.vue | 1191 ------------
.../LibraryPage/ModelPlacementMobile.vue | 1191 ------------
src/component/LibraryPage/searchLabel.vue | 2 +-
src/component/LoginPage/login/enterprise.vue | 11 +-
src/component/LoginPage/login/personal.vue | 12 +-
src/component/LoginPage/login/school.vue | 11 +-
src/component/home/chat/index.vue | 531 +++++
src/component/home/design/childModel.vue | 0
src/component/home/design/index.vue | 1725 +++++++++++++++++
src/component/home/index.vue | 394 ++++
src/component/home/newProject/index.vue | 415 ++++
src/component/home/newProject/workspace.vue | 376 ++++
.../mainPage/signUp/registerModel.vue | 88 +-
src/component/modules/generalCanvas.vue | 4 +-
src/component/modules/navRouter.vue | 77 -
src/component/toolsPage/index.vue | 109 ++
src/router/index.ts | 20 +-
src/store/uploadFile/uploadFile.ts | 40 +-
src/store/userHabit/userHabit.ts | 9 +-
src/tool/adminRouter.js | 7 +
src/tool/https.js | 18 +-
src/tool/listData.js | 77 +-
src/views/HomeMain.vue | 757 +++++---
src/views/HomeView/Tools.vue | 43 +
src/views/HomeView/Works.vue | 59 +-
src/views/HomeView/library.vue | 64 +-
src/views/Login.vue | 3 +-
50 files changed, 4902 insertions(+), 2861 deletions(-)
create mode 100644 src/component/Administrator/organization/add.vue
create mode 100644 src/component/Administrator/organization/organization.vue
delete mode 100644 src/component/LibraryPage/ModelPlacement.vue
delete mode 100644 src/component/LibraryPage/ModelPlacementMobile.vue
create mode 100644 src/component/home/chat/index.vue
create mode 100644 src/component/home/design/childModel.vue
create mode 100644 src/component/home/design/index.vue
create mode 100644 src/component/home/index.vue
create mode 100644 src/component/home/newProject/index.vue
create mode 100644 src/component/home/newProject/workspace.vue
delete mode 100644 src/component/modules/navRouter.vue
create mode 100644 src/component/toolsPage/index.vue
create mode 100644 src/views/HomeView/Tools.vue
diff --git a/.env.dev b/.env.dev
index e7d91588..d48a5159 100644
--- a/.env.dev
+++ b/.env.dev
@@ -8,5 +8,5 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# 徐佩
# VUE_APP_BASE_URL = 'http://192.168.31.118:5567'
# 海波
-# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
+VUE_APP_BASE_URL = 'http://192.168.1.3:5567'
diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index cfad2dab..d5ef0f57 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -551,14 +551,12 @@ li {
.ant-btn-primary {
background-color: #000;
}
-.ant-picker-range-wrapper,
.ant-picker-dropdown {
border-radius: 2rem;
overflow: hidden;
background-color: #fff;
border: 2px solid #000;
}
-.ant-picker-range-wrapper .ant-picker-range-arrow,
.ant-picker-dropdown .ant-picker-range-arrow {
display: none;
}
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index e5dfe43e..0b59dace 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -612,7 +612,7 @@ input:focus{
.ant-btn-primary{
background-color: #000;
}
-.ant-picker-range-wrapper,.ant-picker-dropdown{
+.ant-picker-dropdown{
border-radius: 2rem;
overflow: hidden;
background-color: #fff;
diff --git a/src/component/Account/account.vue b/src/component/Account/account.vue
index 64adc87f..fd841bb9 100644
--- a/src/component/Account/account.vue
+++ b/src/component/Account/account.vue
@@ -266,8 +266,8 @@ export default defineComponent({
.account_page{
height: 100%;
// overflow-y: auto;
- padding: 0 30rem;
- padding-top: 7rem;
+ padding: 0 7rem;
+ padding-top: 4rem;
display: flex;
overflow: hidden;
.account_page_titleImg{
diff --git a/src/component/Account/frontPage/cancelRenewal.vue b/src/component/Account/frontPage/cancelRenewal.vue
index 82a1ab7b..27b09009 100644
--- a/src/component/Account/frontPage/cancelRenewal.vue
+++ b/src/component/Account/frontPage/cancelRenewal.vue
@@ -36,8 +36,8 @@
{{ $t('cancelRenewal.subscriptionRenewal') }}
diff --git a/src/component/Administrator/organization/add.vue b/src/component/Administrator/organization/add.vue
new file mode 100644
index 00000000..57b20cc5
--- /dev/null
+++ b/src/component/Administrator/organization/add.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+ User Name: *
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/Administrator/organization/organization.vue b/src/component/Administrator/organization/organization.vue
new file mode 100644
index 00000000..7ce63f0b
--- /dev/null
+++ b/src/component/Administrator/organization/organization.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue
index ab78c0c5..9c6b6980 100644
--- a/src/component/Detail/setDesignItem.vue
+++ b/src/component/Detail/setDesignItem.vue
@@ -653,7 +653,6 @@ export default defineComponent({
}
.modal_imgItem{
position: absolute;
- overflow: hidden;
top: 0;
}
diff --git a/src/component/DetailCopy/detailRight/editPrintElement.vue b/src/component/DetailCopy/detailRight/editPrintElement.vue
index bb0b7720..50c4c31b 100644
--- a/src/component/DetailCopy/detailRight/editPrintElement.vue
+++ b/src/component/DetailCopy/detailRight/editPrintElement.vue
@@ -711,7 +711,6 @@ export default defineComponent({
z-index: 3;
.modal_imgItem{
position: absolute;
- overflow: hidden;
top: 0;
img{
width: 100%;
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 70c68bd2..f480f701 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -755,8 +755,8 @@ export default defineComponent({
if(key == 'upImgFiles')imgWidth[key] = setImageWidth(key,img);
let url = imgUrl.split('?')[0]
- var match = url.match(/:(\d+)\/(.*)/);
- minioUrl = match[2]
+ var match = url.match(/^(?:https?:\/\/[^\/]+)\/(.*)/);
+ minioUrl = match[1]
// let id =
let proportion = img.height / img.width; //计算图形宽高比例
// let imgWidth = setImageWidth(key)
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 248a69d9..bfaa85ec 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -246,7 +246,7 @@ export default defineComponent({
sketchCategory,
UpgradePlan,
},
- props: ["msg",'sketchCatecoryList','scene'],
+ props: ["msg",'sketchCatecoryList','scene','gender'],
setup(props) {
// console.log(prop.msg);
let userDetail:any= computed(()=>{
@@ -366,8 +366,8 @@ export default defineComponent({
}),
upload: {
isPin: 0,
- gender:'',
level1Type: prop.msg,
+ gender: prop.gender,
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
},
token: "",
diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue
index b305f821..071627aa 100644
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -607,7 +607,6 @@ export default defineComponent({
flex: 1;
height: calc(30rem*1.2);
overflow-x: hidden;
- border-right: 1px solid #e5e5e5;
display: flex;
flex-direction: column;
&.moodboard_body::-webkit-scrollbar {
@@ -705,8 +704,10 @@ export default defineComponent({
}
.modal_img_max{
// flex: 1;
- width: calc(57rem*1.2);
- height: calc(35rem*1.2);
+ // width: calc(57rem*1.2);
+ // height: calc(35rem*1.2);
+ width: 100%;
+ aspect-ratio: 1.62 / 1;
position: relative;
.mark_loading{
position: absolute;
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index 7cde30f8..e89fb9cd 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -719,7 +719,6 @@ export default defineComponent({
padding-top: calc(2.5rem*1.2);
height: calc(30rem*1.2);
overflow-x: hidden;
- border-right: 1px solid #e5e5e5;
&.printboard_body::-webkit-scrollbar {
display: none;
}
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index f694c7cc..cf1c4d99 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -127,6 +127,7 @@
v-show="openClick == 3"
ref="Generate"
msg="Sketchboard"
+ :gender="upload.gender"
:scene="scene"
:sketchCatecoryList="sketchCatecoryList"
>
@@ -682,7 +683,6 @@ export default defineComponent({
padding-top: calc(2.5rem*1.2);
height: calc(30rem*1.2);
overflow-x: hidden;
- border-right: 1px solid #e5e5e5;
display: flex;
flex-direction: column;
&.moodboard_body::-webkit-scrollbar {
diff --git a/src/component/HomePage/UpgradePlan.vue b/src/component/HomePage/UpgradePlan.vue
index bb37c11d..d243b0a1 100644
--- a/src/component/HomePage/UpgradePlan.vue
+++ b/src/component/HomePage/UpgradePlan.vue
@@ -299,7 +299,6 @@ export default defineComponent({
// overflow-x: hidden;
display: flex;
flex-direction: column;
- border-right: 1px solid #e5e5e5;
position: relative;
.mark_loading{
position: absolute;
diff --git a/src/component/HomePage/index/model/collection/MoodboardUpload.vue b/src/component/HomePage/index/model/collection/MoodboardUpload.vue
index 45650755..f588021b 100644
--- a/src/component/HomePage/index/model/collection/MoodboardUpload.vue
+++ b/src/component/HomePage/index/model/collection/MoodboardUpload.vue
@@ -577,7 +577,6 @@ export default defineComponent({
flex: 1;
height: calc(30rem*1.2);
overflow-x: hidden;
- border-right: 1px solid #e5e5e5;
display: flex;
flex-direction: column;
&.moodboard_body::-webkit-scrollbar {
@@ -673,11 +672,10 @@ export default defineComponent({
padding-block: calc(2rem*1.2);
}
.modal_img_max{
- // flex: 1;
- // width: 57rem;
- // height: 35rem;
- width: 92rem;
- height: 56.5rem;
+ // width: calc(57rem*1.2);
+ // height: calc(35rem*1.2);
+ width: 100%;
+ aspect-ratio: 1.62 / 1;
position: relative;
.mark_loading{
position: absolute;
diff --git a/src/component/HomePage/index/model/collection/PrintboardUpload.vue b/src/component/HomePage/index/model/collection/PrintboardUpload.vue
index d6772195..88c26ca3 100644
--- a/src/component/HomePage/index/model/collection/PrintboardUpload.vue
+++ b/src/component/HomePage/index/model/collection/PrintboardUpload.vue
@@ -923,7 +923,6 @@ export default defineComponent({
position: relative;
cursor: pointer;
text-align: center;
- overflow: hidden;
.moreBox{
position: absolute;
right: 1rem;
diff --git a/src/component/HomePage/index/model/collection/SketchboardUpload.vue b/src/component/HomePage/index/model/collection/SketchboardUpload.vue
index 45abdaa2..24aad8e5 100644
--- a/src/component/HomePage/index/model/collection/SketchboardUpload.vue
+++ b/src/component/HomePage/index/model/collection/SketchboardUpload.vue
@@ -129,6 +129,7 @@
ref="Generate"
msg="Sketchboard"
:scene="scene"
+ :gender="workspace.sex"
:sketchCatecoryList="sketchCatecoryList"
>
@@ -685,7 +686,6 @@ export default defineComponent({
padding-top: calc(2.5rem*1.2);
height: calc(30rem*1.2);
overflow-x: hidden;
- border-right: 1px solid #e5e5e5;
display: flex;
flex-direction: column;
&.moodboard_body::-webkit-scrollbar {
@@ -877,7 +877,6 @@ export default defineComponent({
position: relative;
cursor: pointer;
text-align: center;
- overflow: hidden;
.moreBox{
position: absolute;
right: 1rem;
diff --git a/src/component/HomePage/index/model/mannequin/edit.vue b/src/component/HomePage/index/model/mannequin/edit.vue
index 80da8e8e..59a51f99 100644
--- a/src/component/HomePage/index/model/mannequin/edit.vue
+++ b/src/component/HomePage/index/model/mannequin/edit.vue
@@ -1,12 +1,14 @@