diff --git a/.env.dev b/.env.dev
index d48a5159..5f371239 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.3:5567'
+# VUE_APP_BASE_URL = 'http://192.168.1.3:5567'
diff --git a/src/component/home/chat/index.vue b/src/component/home/chat/index.vue
index ca51a41e..3f1fd4cf 100644
--- a/src/component/home/chat/index.vue
+++ b/src/component/home/chat/index.vue
@@ -1,6 +1,9 @@
-
{openChat = !openChat;isChattingRecords=false}">
+
{isChattingRecords=!isChattingRecords}">
+
+
+
{openChat = !openChat;isChattingRecords=true}">
@@ -9,8 +12,15 @@
ICON
-
-
{{item.content.message}}
+
+
+ item.content?.isThink?(item.content.isThink = false):(item.content.isThink = true)">
+
已深度思考
+
+
+ {{item.content.think}}
+ {{item.content.message}}
+
{{fileItem.name}}
@@ -26,7 +36,7 @@
-
+
@@ -41,7 +51,7 @@
-
+
@@ -111,12 +121,13 @@ export default defineComponent({
let fileList = JSON.parse(JSON.stringify(data.filList))
let fileUrl = (fileList.filter((item:any)=>item.type == 'file').length > 0) ? fileList.filter((item:any)=>item.type == 'file')[0].minioPath : ''
let imageUrlList = (fileList.filter((item:any)=>item.type == 'image').length > 0)? fileList.filter((item:any)=>item.type == 'image').map((item:any)=>item.minioPath).join(',') : ''
- data.chatList.push({content:{message:data.chatContent},role:'user',fileList:fileList})
- data.chatList.push({content:{message:''},role:'system'})
+ data.chatList.push({content:{message:data.chatContent,think:''},role:'user',fileList:fileList})
+ data.chatList.push({content:{message:'',think:''},role:'system'})
const eventSource = new EventSource(`${process.env.VUE_APP_BASE_URL}${Https.httpUrls.llmStream}?token=${getCookie('token')}&prompt=${data.chatContent}&projectId=${data.selectObject.id}&fileUrl=${fileUrl}&imageUrlList=${imageUrlList}&enableThinking=${data.enableThinking}`);
data.chatContent = ''
dataDom.textarea.value = ''
data.filList = []
+ let isText = !data.enableThinking
eventSource.onmessage = function(event) {
data.isFinish = false
// console.log('收到数据:', JSON.parse(event.data));
@@ -128,7 +139,14 @@ export default defineComponent({
const container = dataDom.chatBox;
container.scrollTop = container.scrollHeight;
if(JSON.parse(event.data).status == "[RUNNING]"){
- data.chatList[data.chatList.length-1].content.message+=JSON.parse(event.data).content
+ if(/\[TEXT\]/.test(JSON.parse(event.data).content)){
+ isText = true
+ }
+ if(isText){
+ data.chatList[data.chatList.length-1].content.message+=JSON.parse(event.data).content
+ }else{
+ data.chatList[data.chatList.length-1].content.think+=JSON.parse(event.data).content
+ }
}else{
if(JSON.parse(event.data).status == "[DESIGN_SIGNAL]"){
@@ -141,13 +159,11 @@ export default defineComponent({
data.chatList[data.chatList.length-1].content.img = JSON.parse(JSON.parse(event.data).tools_data).receiveCollectionElementList
data.chatList.push({content:{message:''},role:'system'})
}
- console.log(data.chatList[data.chatList.length-1].content)
emit('chatChange',{type:JSON.parse(event.data).status})
}
};
eventSource.onerror = function(error) {
- console.log(error,EventSource.CLOSED,eventSource.readyState)
if (eventSource.readyState === EventSource.CLOSED) {
data.chatList[data.chatList.length-1].content.message='服务器繁忙,请稍后再试。'
@@ -168,17 +184,29 @@ export default defineComponent({
rv.content.forEach((item:any,index:number) => {
if(rv.content[rv.content.length - index -1].role == 'system'){
let text = rv.content[rv.content.length - index -1].content
- if(rv.content[rv.content.length - index -1].isImage == 1){
+ if(rv.content[rv.content.length - index -1].isImage == 2){
rv.content[rv.content.length - index -1].content={
img : JSON.parse(rv.content[rv.content.length - index -1].content)
}
- }else if(rv.content[rv.content.length - index -1].isImage==2){
+ }else if(rv.content[rv.content.length - index -1].isImage==1){
rv.content[rv.content.length - index -1].content={
color : JSON.parse(rv.content[rv.content.length - index -1].content)
}
}else{
+ let think = ''
+ let message = ''
+ if(text.split('[TEXT]').length > 1){
+ think = text.split('[TEXT]')[0]
+ text.split('[TEXT]').forEach((text:any,index:number) => {
+ if(index == 0)return
+ message += ('[TEXT]'+text)
+ });
+ }else{
+ message = text
+ }
rv.content[rv.content.length - index -1].content = {
- message:text
+ message:message,
+ think:think,
}
}
}else{
@@ -209,11 +237,11 @@ export default defineComponent({
}
const openChattingRecords = ()=>{
data.isChattingRecords = true
- let setRecords = ()=>{
- data.isChattingRecords = false
- document.removeEventListener('click',setRecords)
- }
- document.addEventListener('click',setRecords)
+ // let setRecords = ()=>{
+ // data.isChattingRecords = false
+ // document.removeEventListener('click',setRecords)
+ // }
+ // document.addEventListener('click',setRecords)
}
const handleFileUpload = (event:any)=>{
if (event.target.files[0].size > 5 * 1024 * 1024) { // 5MB
@@ -313,6 +341,14 @@ export default defineComponent({
background: #f5f5f5;
max-width: 60%;
> .text{
+ > .content{
+ > .txt{
+
+ }
+ > .showThink{
+ display: none;
+ }
+ }
> .fileBox{
> .item{
height: 3rem;
@@ -343,7 +379,8 @@ export default defineComponent({
display: flex;
padding: 1.2rem 2rem;
border-radius: 2.4rem;
-
+ -webkit-user-select: none;
+
> .text{
// display: inline-block;
// width: min-content;
@@ -351,6 +388,40 @@ export default defineComponent({
width: 100%;
// width: min-content;
// word-wrap: break-word;
+ > .content{
+ > .txt{
+
+ }
+ > .showThink{
+ cursor: pointer;
+ display: flex;
+ padding: .7rem 1.4rem;
+ margin-bottom: 1.2rem;
+ background: rgb(237 237 237);
+ border-radius: 1rem;
+ align-items: center;
+
+ &.active{
+ >i{
+ transform: rotate(180deg);
+ }
+ }
+ > i{
+ display: flex;
+ transition: all .3s;
+ }
+ }
+ > .think{
+ margin-bottom: 2rem;
+ padding-left: 2rem;
+ color: #8b8b8b;
+ white-space: pre-wrap;
+ border-left: 2px solid #e5e5e5;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ }
+ }
> .imgBox{
display: flex;
flex-wrap: wrap;
@@ -503,7 +574,7 @@ export default defineComponent({
}
}
}
- > .right,> .left{
+ > .right,> .left,>.top{
display: flex;
align-items: center;
cursor: pointer;
@@ -515,6 +586,18 @@ export default defineComponent({
transition: all .3s;
}
}
+ > .top{
+ width: 100%;
+ margin: 0 3rem;
+ height: 3rem;
+ &.active{
+ > i{
+ transform: rotate(180deg);
+ }
+ }
+ > i{
+ }
+ }
> .right{
border-left: 1px solid #e5e5e5;
> i{
@@ -527,5 +610,6 @@ export default defineComponent({
transform: rotate(90deg);
}
}
+ flex-wrap: wrap;
}
\ No newline at end of file
diff --git a/src/component/home/index.vue b/src/component/home/index.vue
index 2e2b920b..245870e2 100644
--- a/src/component/home/index.vue
+++ b/src/component/home/index.vue
@@ -10,7 +10,7 @@
-
+
@@ -25,14 +25,16 @@ import { useI18n } from 'vue-i18n'
import { useRouter,useRoute } from 'vue-router'
import design from "./design/index.vue"
import newPorject from "./newProject/index.vue"
+import router from '@/router';
import chat from "./chat/index.vue"
export default defineComponent({
components:{
design,newPorject,chat
},
props:{
+ settingGetHistory:{type:Function,default:()=>{}},
},
- emits:['setTask'],
+ emits:['setTask','newProject'],
setup(props,{emit}) {
const store = useStore();
const route = useRoute()
@@ -124,7 +126,7 @@ export default defineComponent({
let storeData = {
name:rv.name,
id:rv.id,
- type:rv.type,
+ type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
httpType:rv.process,//项目类型
ageGroup:rv.workspaceVO.ageGroup,
style:rv.workspaceVO.style,
@@ -357,18 +359,22 @@ export default defineComponent({
return colorList;
}
const chatChange = (value:any)=>{
- console.log(value)
if(value.type == '[DESIGN_SIGNAL]' && dataDom.design){
dataDom.design.designNewCollection()
}else{
getCollection()
}
}
+ const newProject = (id:any)=>{
+ props.settingGetHistory()
+ router.push(`home?history=${id}`)
+ }
return{
...toRefs(dataDom),
...toRefs(data),
setTask,
chatChange,
+ newProject,
}
},
provide() {
diff --git a/src/component/home/newProject/index.vue b/src/component/home/newProject/index.vue
index 70454269..c8c2a2f2 100644
--- a/src/component/home/newProject/index.vue
+++ b/src/component/home/newProject/index.vue
@@ -27,7 +27,7 @@
-
+
@@ -39,13 +39,12 @@
-
@@ -54,7 +53,7 @@
+
\ No newline at end of file
diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue
index 4b7f0fa6..aae93edb 100644
--- a/src/component/home/newProject/workspace.vue
+++ b/src/component/home/newProject/workspace.vue
@@ -55,7 +55,7 @@
-
+
Category:
@@ -128,9 +128,12 @@ export default defineComponent({
},
setIsShowMark:inject('setIsShowMark') as any,
})
- watch(()=>data.selectObject_,(newVal)=>{
- data.selectObject = JSON.parse(JSON.stringify(newVal))
- })
+ // watch(()=>data.selectObject_,(newVal)=>{
+ // data.selectObject = JSON.parse(JSON.stringify(newVal))
+ // })
+ const init = (storeData:any)=>{
+ data.selectObject = JSON.parse(JSON.stringify(storeData))
+ }
const dataDom = reactive({
habitSetStyle:null as any,
})
@@ -244,6 +247,7 @@ export default defineComponent({
projectList,
...toRefs(dataDom),
...toRefs(data),
+ init,
setStyle,
setWorkspaceStyle,
setprintModel,
@@ -270,7 +274,6 @@ export default defineComponent({
align-items: center;
font-weight: 600;
font-size: 1.8rem;
- border: 1px solid #0000001a;
padding: 1.2rem;
border-radius: 2.4rem;
> .workspaceBox{
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 0cafc354..f1f4c4f1 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -693,8 +693,8 @@ export default {
title:'Find Your Ideal Plan',
Monthly:'Monthly',
Yearly:'Yearly',
- promotionCode:'Promotion code',
- use:'Use',
+ promotionCode:'Coupon',
+ use:'Apply',
PromoCodeError:'Please check if the promo code is correct or if the date has expired',
CreditCard:'Credit Card',
Alipay:'Alipay',
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index d83f4c94..01a50bc1 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -41,9 +41,13 @@
-
+
+
+
+ Setting
@@ -196,7 +200,7 @@
You can use these features only after becoming a regular user~
-
+
@@ -212,6 +216,7 @@
+