-
@@ -254,15 +255,20 @@ export default defineComponent({
this.designOpenrtionList.push(this.current.printObject)
this.overallSingle = DesignPrintOperationParent.overallSingle
this.systemDesignerPercentage = DesignPrintOperationParent.systemDesignerPercentage
- let skecth = new Image
- if(!this.overallSingle){
- skecth.src = this.current.layersObject[1].imageUrl
- }else{
- skecth.src = this.current.layersObject[1].maskUrl
- }
- skecth.onload=()=>{
- this.sketch.width = skecth.width/10+'rem'
- this.sketch.height = skecth.height/10+'rem'
+ // let skecth = new Image
+ // if(!this.overallSingle){
+ // skecth.src = this.current.layersObject[1].imageUrl
+ // }else{
+ // skecth.src = this.current.layersObject[1].maskUrl
+ // }
+ // skecth.onload=()=>{
+ // this.sketch.width = skecth.width/10+'rem'
+ // this.sketch.height = skecth.height/10+'rem'
+ // }
+
+ this.sketch = {
+ width:this.current.layersObject[1].imageSize[0]/10+'rem',
+ height:this.current.layersObject[1].imageSize[1]/10+'rem'
}
let print = new Image
print.src = this.current.printObject.path
@@ -272,6 +278,9 @@ export default defineComponent({
this.printStyleList[0].style.width = print.width+'px'
this.printStyleList[0].style.height = print.height+'px'
}
+ if(this.overallSingle){
+ this.refetchTemplate(0)
+ }
},
systemDesigner(num) {
let DesignPrintOperationParent = this.$parent
@@ -484,12 +493,12 @@ export default defineComponent({
//随机重置图片顺序
refetchTemplate(index) {
// let scale = (Math.trunc(Math.random()*15)+1)*.1
+
let rotateZ1 = Math.trunc(Math.random()*360)+1
let rotateZ2 = Math.trunc(Math.random()*360)+1
let sketch = document.getElementsByClassName('designOpenrtion_sketch')[0]
let width = Math.trunc(Math.random()*(sketch.width-sketch.width/3))+1+sketch.width/3
let scale = width / this.print.width.replace(/px/g,'')
- console.log(scale,width,this.print.width);
// let x = sketch.width-Number(this.print.width.replace(/px/g,''))
// let y = sketch.height-Number(this.print.height.replace(/px/g,''))
let x = sketch.width-20
@@ -540,6 +549,7 @@ export default defineComponent({
scale = this.systemDesignerPercentage*3/100
location = [arr[index].style.left.replace(/px/g,'')*sketchNum+this.print.width.replace(/px/g,'')/2-7,arr[index].style.top.replace(/px/g,'')*sketchNum+this.print.height.replace(/px/g,'')/2-7]
}else{
+ console.log(arr[index].style.width.replace(/px/g,''),this.print.width.replace(/px/g,''));
scale = (arr[index].style.width.replace(/px/g,'')/this.print.width.replace(/px/g,''))
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
}
@@ -821,6 +831,12 @@ export default defineComponent({
position: relative;
max-width: 100%;
max-height: 100%;
+ width: 100%;
+ }
+ .designOpenrtion_sketch_mask{
+ z-index: 3;
+ position: absolute;
+ inset: 0;
}
>div{
position: absolute;
@@ -830,7 +846,7 @@ export default defineComponent({
}
}
.designOpenrtion_print{
- z-index: 1;
+ z-index: 3;
.modal_imgItem{
position: absolute;
overflow: hidden;
diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue
index bbcb0eac..ebb9d797 100644
--- a/src/component/Detail/setDesignItem.vue
+++ b/src/component/Detail/setDesignItem.vue
@@ -36,7 +36,7 @@ import { LoadingOutlined } from "@ant-design/icons-vue";
import { useStore } from "vuex";
import { Modal,message } from 'ant-design-vue';
export default defineComponent({
-
+ props: ["frontBack"],
setup(prop) {
const store = useStore();
@@ -83,88 +83,15 @@ export default defineComponent({
store: useStore(),
};
},
-
- // directives:{
- // //操作旋转
- // rotote:{
- // mounted(el,value){
- // let mouse = true;
- // let angle = 0
- // let num = 1
- // let x = 0
- // let y = 0
- // num = value.value[1].scale
- // angle = value.value[1].rotateZ
- // let elParent = document.getElementsByClassName('design_compile_content')[0].getElementsByClassName('modal_imgItem')[value.value[0]]
- // // 添加鼠标按下事件监听器
- // el.style.transform = "rotateZ("+ angle + "deg)"
- // el.addEventListener('mousedown', (e) => {
- // // let scale = Number(elParent.firstElementChild.style.transform?.split('scale(')[1]?.split(')')[0])
- // // let rotateZ = Number(elParent.firstElementChild.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
- // e.stopPropagation()
- // mouse = true;
- // var info = el.getBoundingClientRect();
- // let eX = info.x + info.width / 2;
- // let eY = info.y + info.height / 2;
-
- // document.addEventListener('mousemove', (e) => {
- // if (mouse) {
- // let X = eX
- // let Y = eY
- // let x = e.clientX - X
- // let y = Y - e.clientY
- // angle = Math.atan2(x,y)*(180 / Math.PI)
- // elParent.firstElementChild.style.transform = "scale("+ num + ") rotateZ("+ angle + "deg)"
- // el.style.transform = "rotateZ("+ angle + "deg)"
- // }
- // });
- // // 添加鼠标松开事件监听器
- // document.addEventListener('mouseup', () => {
- // mouse = false;
- // });
- // });
- // //缩放
- // let timeSwitch = true
- // el.parentNode.addEventListener('mousemove', (e) => {
- // el.parentNode.addEventListener('mousewheel',(e) => {
- // if(timeSwitch){
- // timeSwitch = false
- // if(e.deltaY > 0){
- // if(num <= 1){
- // num -= 0.05
- // }else{
- // num -= 0.1
- // }
- // }else{
- // //放大
- // if(num <= 1){
- // num += 0.05
- // }else{
- // num += 0.1
- // }
- // }
- // if(num >= 3){
- // num = 3
- // }else if (num < .2){
- // num = .2
- // }
- // setTimeout(() => {
- // timeSwitch = true
- // }, 100);
- // elParent.firstElementChild.style.transform = "scale("+ num + ") rotateZ("+ angle + "deg)"
- // }
- // });
- // });
- // }
-
- // },
- // },
methods: {
init(){
let DesignParent = this.$parent
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
this.designItemDetail = designItemDetail
// this.clearModal()
+ console.log(this.frontBack);
+ // console.log(this.current,DesignParent.frontBack);
+ console.log(DesignParent);
this.printStyleList.push({
centers:{
left:0,
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index 194b7c24..b1e5c902 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -205,7 +205,8 @@ export default defineComponent({
mounted(){
this.token = getCookie('token') || ''
this.uploadUrl = getUploadUrl()
- let dropperDom = document.getElementsByClassName('vc-sketch-color-wrap')[0]
+ let dropperDom = document.getElementsByClassName("colorboard_upload_modal")[0].getElementsByClassName('vc-sketch-color-wrap')[0]
+ console.log( document.getElementsByClassName('vc-sketch-color-wrap'));
dropperDom.addEventListener('click',async ()=>{
try {
const dropper = new EyeDropper();
diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue
index 7a6d901d..c2fab25b 100644
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -582,7 +582,8 @@ export default defineComponent({
align-items: center;
flex-direction: column;
>img{
- height: 100%;
+ // height: 100%;
+ width: 100%;
}
&.active{
flex-direction: row;
diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue
index beda05da..28b6bdbf 100644
--- a/src/component/HomePage/RobotAssist.vue
+++ b/src/component/HomePage/RobotAssist.vue
@@ -2,7 +2,22 @@
-
{{item.str}}
+
+
+ {{item.str}}
+
+
+
+
+ ![]()
+
+
+
+
+
+
@@ -45,7 +60,36 @@ export default defineComponent({
let timeTop:any = 0;
let timeInput:any = 0;
let record:any = ref([
-
+ {
+ state:1,
+ str:"1111111111"
+ },
+ {
+ state:2,
+ str:"2222222222222"
+ },
+ {
+ state:1,
+ str:"1111111111"
+ },
+ {
+ state:2,
+ str:"2222222222222"
+ },
+ {
+ state:1,
+ str:"1111111111",
+ img:[
+ {url:'http://18.167.251.121:9000/aida-clothing/image/image_1695621083.572033.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230926%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230926T064349Z&X-Amz-Expires=28800&X-Amz-SignedHeaders=host&X-Amz-Signature=74f33d78f94925b1cd2e0198efad99432d7f285f951d5fc1ac11bf77fc802238'},
+ {url:'http://18.167.251.121:9000/aida-clothing/image/image_1695621083.572033.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230926%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230926T064349Z&X-Amz-Expires=28800&X-Amz-SignedHeaders=host&X-Amz-Signature=74f33d78f94925b1cd2e0198efad99432d7f285f951d5fc1ac11bf77fc802238'},
+ {url:'http://18.167.251.121:9000/aida-clothing/image/image_1695621083.572033.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230926%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230926T064349Z&X-Amz-Expires=28800&X-Amz-SignedHeaders=host&X-Amz-Signature=74f33d78f94925b1cd2e0198efad99432d7f285f951d5fc1ac11bf77fc802238'},
+ {url:'http://18.167.251.121:9000/aida-clothing/image/image_1695621083.572033.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20230926%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230926T064349Z&X-Amz-Expires=28800&X-Amz-SignedHeaders=host&X-Amz-Signature=74f33d78f94925b1cd2e0198efad99432d7f285f951d5fc1ac11bf77fc802238'},
+ ]
+ },
+ {
+ state:2,
+ str:"2222222222222"
+ },
])
const userInfo:any = {}
@@ -89,6 +133,9 @@ export default defineComponent({
},
methods: {
robotBtn(){
+
+
+ console.log(2323);
if(!this.robotTop||!this.robotInput){
this.robotTop = true
this.robotInput = true
@@ -97,22 +144,23 @@ export default defineComponent({
this.robotTop = false
this.robotInput = false
}
+ // let noRefresh = false;
+ // this.$router.push({ name: 'library', params: { noRefresh: false } });
this.textScroll()//聊天定位到最低部
this.createTimer()
},
textScroll(){
this.$nextTick(()=>{
if(this.robotDom && this.robotChildDom){
- // const items = this.robotChildDom._rawValue
- let num = 0
- for (let index = 0; index < (this.$refs.robotChildDom as any).length; index++) {
- const height = (this.$refs.robotChildDom as any)[index].clientHeight;
- num = num+40+height
+ // const items = this.robotChildDom._rawValue
+ let num = 0
+ for (let index = 0; index < (this.$refs.robotChildDom as any).length; index++) {
+ const height = (this.$refs.robotChildDom as any)[index].clientHeight;
+ num = num+40+height
+ }
+ this.robotDom.scrollTop = num
}
- this.robotDom.scrollTop = num
- }
})
-
},
robotmax(){//点击内容就设置为true显示 重置定时器
this.createTimer()
@@ -128,13 +176,26 @@ export default defineComponent({
str:this.chatCentent
})
this.textScroll()
+ let sessionId
+ if(sessionStorage.getItem("sessionId") == null){
+ let randomNum:any = Math.floor(Math.random() * 9000000000000000) + 1000000000000000;
+ sessionStorage.setItem('sessionId', randomNum);
+ sessionId = randomNum
+ }else{
+ sessionId = sessionStorage.getItem("sessionId")
+ }
+ // sessionStorage.setItem('username', '23123123123');
+ // sessionStorage.getItem("username")
+ // sessionStorage.removeItem
+ console.log(sessionId);
+
let a = true
let data = {
"user_id" : this.userInfo.userId,
// "message" : this.chatCentent,
// // "message" : "Hello, can you tell me what holiday is on July 1st",
// "session_id":""
- "session_id":"session_1",
+ "session_id":sessionId,
"message" : this.chatCentent,
}
let interaction = {onDownloadProgress: (progressEvent:any) => {
@@ -155,6 +216,8 @@ export default defineComponent({
// Https.axiosPost(Https.httpUrls.pythonChatStream, data,interaction).then(
(rv) => {
if(rv){
+ console.log(rv);
+
this.record.push({
state:1,
str:rv.output
@@ -168,6 +231,35 @@ export default defineComponent({
});
this.chatCentent = ""
},
+ likeFile(item:any,str:string){
+ if(str == 'like'){
+ let data = {
+ generateDetailId:item.id,
+ level1Type:"Moodboard",
+ level2Type: '',
+ timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
+ }
+ Https.axiosPost(Https.httpUrls.generateLike, data).then(
+ (rv) => {
+ console.log(rv);
+ item.like = true
+
+ }
+ ).catch(res=>{
+ });
+ }else{
+ let data = {
+ generateDetailId:item.id,
+ timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
+ }
+ Https.axiosGet(Https.httpUrls.generateDislike, {params:data}).then(
+ (rv) => {
+ item.like = false
+ }
+ ).catch(res=>{
+ });
+ }
+ },
//创建定时器
createTimer() {
if (this.robotTop || this.robotInput) {
@@ -201,10 +293,11 @@ export default defineComponent({
z-index: 9999;
// width: 400px;
.robot_top{
- // width: 70%;
- width: 25rem;
+ // width: 25rem;
+ width: 30rem;
margin-left: auto;
- height: 14rem;
+ height: 30rem;
+ // height: 20rem;
overflow-x: hidden;
transition: .3s all;
opacity: 0;
@@ -215,10 +308,60 @@ export default defineComponent({
&.robot_top::-webkit-scrollbar{display: none;}
.robot_text{
font-size: 1.4rem;
- padding: .5rem 1rem;
+ padding: 1rem 1.5rem;
display: inline-block;
border-radius: 2rem;
max-width: 80%;
+ .robot_img{
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
+ .robot_img_item{
+ margin-bottom: 5%;
+ margin-right: 2.5%;
+ max-height: 100%;
+ position: relative;
+ width: 40%;
+ .delete_like_file_block{
+ display: none;
+ width: 3.2rem;
+ height: 3.2rem;
+ background: rgba(0,0,0,0.6);
+ border-radius: 0.4rem;
+ position: absolute;
+ top: 0rem;
+ right: 0rem;
+ text-align: center;
+ line-height: 3.2rem;
+ left: auto;
+ cursor: pointer;
+ i{
+ font-size: 1.6rem;
+ color: #fff;
+ &.fi-rr-heart{
+
+ }
+ &.fi-sr-heart{
+ color: red;
+ }
+ }
+ }
+ &:hover .delete_like_file_block{
+ display: block;
+ }
+ }
+ img{
+ width: 100%;
+ height: 8rem;
+ object-fit: contain;
+ cursor: auto;
+ // width: auto;
+ }
+ img:nth-child(2n-1){
+ // margin-right: 5%;
+ }
+ }
}
.text_left,.text_right{
margin: 2rem 0;
diff --git a/src/tool/https.js b/src/tool/https.js
index e6d66ba3..fa71cf28 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -21,7 +21,7 @@ import { message } from 'ant-design-vue';
// }
let httpIp
if(process.env.NODE_ENV == 'development'){
- httpIp = 'http://192.168.1.6:10086'
+ httpIp = 'http://192.168.1.12:10086'
}else{
httpIp = ''
}
@@ -106,7 +106,9 @@ export const Https = {
saveOrEditTemplatePoint:'/api/library/saveOrEditTemplatePoint',//保存或者编辑template打点
libraryModelsDot:'/api/library/modelsDot',//Models打点预览
// pythonChatStream:'/api/python/chatStream',//机器人助力
- chatStreamTest:`${httpIp}/robot/chat_stream_test`,//机器人助力
+ // chatStreamTest:`${httpIp}/robot/chat_stream_test`,//机器人助力
+ chatStreamTest:`${httpIp}/api/python/chatStream`,//机器人助力
+
workspaceDetail:`${httpIp}/api/workspace/detail`,//用户习惯详情
workspaceenumValues:`${httpIp}/api/workspace/enumValues`,//getSex