最新需求调整优化等

components/deviceBox/index.vue

@@ -23,7 +23,8 @@
 				<u--text :lines="3" :text="item.agent.systemPrompt||''" size="24rpx" color="#7C8592" lineHeight="40rpx"></u--text>
 			</div>
 			<div class="lc_btns adfac">
-				<div class="lcb_pre" @tap="editRole(item)">角色编辑</div>
+				<!-- <div class="lcb_pre" @tap="editRole(item)">角色编辑</div> -->
+				<div class="lcb_pre" @tap="dislogRecord(item)">对话记录</div>
 				<div class="lcb_pre" @tap="changeWifi(item)">配置网络</div>
 				<div class="lcb_pre" @tap="unbindDevice(item)">解绑设备</div>
 			</div>
@@ -48,6 +49,15 @@
 			}
 		},
 		methods:{
+			dislogRecord(item){
+				this.$api.get(`/agent/${item.agentId}/${item.id}/sessions`,{page:1,limit:-1}).then(res=>{
+					if(res.data.code!==0) return this.$showToast(res.data.msg)
+					this.$api.get(`/agent/${item.agentId}/${item.id}/chat-history/${'17a9ae7e-601b-4566-96fc-7728e8342072'}`).then(res2=>{
+						if(res2.data.code!==0) return this.$showToast(res2.data.msg)
+						
+					})
+				})
+			},
 			editRole(item){
 				this.$emit('editRole');
 				uni.navigateTo({

pages/role.vue

@@ -62,12 +62,24 @@
 				originList:[],
 				deviceList:[],
 				show:false,
-				options: [{
-					text: '删除',
-					style: {
-						backgroundColor: '#f56c6c'
-					}
-				}],
+				options: [
+					{
+						text: '编辑',
+						icon: 'edit-pen',
+						iconSize:'32rpx',
+						style: {
+							backgroundColor: '#252525'
+						}
+					},
+					{
+						text: '删除',
+						icon: 'trash',
+						iconSize:'32rpx',
+						style: {
+							backgroundColor: '#f56c6c'
+						}
+					},
+				],
 				keyword:'',
 				agentId: '',
 				deviceId: ''
@@ -106,35 +118,45 @@
 				})
 			},
 			deleteRole(item,e){
-				let that = this;
-				uni.showModal({
-					content:'删除角色设备将自动解绑需重新添加，您确定删除吗？',
-					success: (res) => {
-						if(res.confirm){
-							that.$api.del('/agent/'+item.id).then(res=>{
-								if(res.data.code!==0) return that.$showToast(res.data.msg)
-								that.list.forEach((d, i) => {
-									that.$refs['swipeAction' + i][0].closeHandler();
-								})
-								that.getAgentList();
-							})
-						}
-					}
-				})
-			},
-			toBindDevice(item){
-				this.agentId = item.id;
-				if(item.deviceCount>0){
+				if(e.index===0){
+					this.list.forEach((d, i) => {
+						this.$refs['swipeAction' + i][0].closeHandler();
+					})
+					uni.navigateTo({
+						url:`/pagesRole/addRole?agentId=${item.id}`
+					})
+				}else if(e.index===1){
+					let that = this;
 					uni.showModal({
-						title:'温馨提示',
-						content:'当前角色已绑定设备，是否继续配置设备？',
+						content:'删除角色设备将自动解绑需重新添加，您确定删除吗？',
 						success: (res) => {
 							if(res.confirm){
-								this.show = true;
+								that.$api.del('/agent/'+item.id).then(res=>{
+									if(res.data.code!==0) return that.$showToast(res.data.msg)
+									that.list.forEach((d, i) => {
+										that.$refs['swipeAction' + i][0].closeHandler();
+									})
+									that.getAgentList();
+								})
 							}
 						}
 					})
-				}else this.show = true
+				}
+			},
+			toBindDevice(item){
+				this.agentId = item.id;
+				this.show = true;
+				// if(item.deviceCount>0){
+				// 	uni.showModal({
+				// 		title:'温馨提示',
+				// 		content:'当前角色已绑定设备，是否继续配置设备？',
+				// 		success: (res) => {
+				// 			if(res.confirm){
+				// 				this.show = true;
+				// 			}
+				// 		}
+				// 	})
+				// }else this.show = true
 			},
 			confirm(e){
 				this.show = false;
@@ -153,11 +175,11 @@
 
 <style>
 	.u-swipe-action-item__right__button__wrapper {
-		background: #F55454 !important;
 		font-size: 28rpx;
 		font-weight: 400;
 		color: #FFFFFF;
 		letter-spacing: 2rpx;
+		padding: 0 26rpx;
 	}
 	.swipe-action {
 	  width: 100%;

pagesMy/scanResult.vue

@@ -19,7 +19,7 @@
 		methods:{
 			addRole(){
 				uni.navigateTo({
-					url:'/pagesRole/addRole'
+					url:'/pages/role'
 				})
 			},
 			goBack(){

pagesRole/addRole.vue

@@ -24,22 +24,18 @@
 			<div class="title">角色昵称<span>*</span></div>
 			<input type="text" v-model="agentDto.agentName" placeholder="请输入角色昵称" placeholder-class="ph">
 		</div>
-		<div class="box adfacjb" @tap="selectModel">
-			<div class="title">角色模板<span>*</span></div>
-			<div class="right adfac">
-				<div class="mtext" :class="{'active':modelText!=='请选择角色模版'}">{{modelText}}</div>
-				<image src="http://106.54.209.120:8188/static/arrow_right.png"></image>
-			</div>
-		</div>
 		<div class="box">
 			<div class="top adfacjb">
-				<div class="title">设备描述</div>
-				<div class="tip">回显不可编辑</div>
+				<div class="title">设定描述<span>*</span></div>
+				<div class="tip" @tap="selectModel">角色设定辅助 ></div>
+			</div>
+			<div class="desc">
+				<u-parse :content="placeholder" @tap="showta=true;focus=true" v-if="!showta" style="color: #A6A6A6;font-size: 28rpx;line-height: 48rpx;"></u-parse>
+				<u-textarea v-model="agentDto.systemPrompt" :focus="focus" autoHeight :maxlength="-1" border="none" v-else></u-textarea>			
 			</div>
-			<div class="desc">{{deviceMemo||''}}</div>
 		</div>
 		<div class="box adfacjb">
-			<div class="title">音色<span>*</span></div>
+			<div class="title">声音<span>*</span></div>
 			<div class="right adfac" @tap="show=true">
 				<div class="mtext" :class="{'active':voiceText!=='请选择音色'}">{{voiceText}}</div>
 				<image src="http://106.54.209.120:8188/static/arrow_right.png"></image>
@@ -58,15 +54,17 @@
 		data(){
 			return {
 				title:'创建角色',
-				modelText:'请选择角色模版',
 				voiceText:'请选择音色',
 				fileList:[],
 				show:false,
 				voiceList:[],
-				deviceMemo:'',
 				modelMap:new Map(),
 				agentId:'',
 				deviceId:'',
+				showta:false,
+				focus:false,
+				placeholder:`详细描写设定信息，示例：<br>
+				你是一位经验丰富的英语老师，拥有激发学生学习热情的教学方法。你善于运用幽默和实际应用案例，使对话充满趣味。`,
 				agentDto:{
 					"agentName": "",
 					"asrModelId": "",
@@ -79,7 +77,8 @@
 					"systemPrompt": "",
 					"langCode": "",
 					"language": "",
-					"deviceId": ""
+					"deviceId": "",
+					"chatHistoryConf": ""
 				}
 			}
 		},
@@ -90,6 +89,17 @@
 				this.deviceId = option.deviceId;
 				this.getDetail();
 			} 
+			this.getModelVoiceList();
+		},
+		watch:{
+			"agentDto.systemPrompt":{
+				handler(newVal,oldVal){
+					if(newVal!==oldVal&&!newVal){
+						this.showta = false;
+						this.focus = true;
+					} 
+				}
+			}
 		},
 		methods:{
 			// 删除图片
@@ -149,19 +159,18 @@
 					url:'/pagesRole/roleModel',
 					events:{
 						selectRoleModel:data=>{
+							this.showta = true;
 							this.agentDto = {...this.agentDto,...data};
-							this.modelText = data.agentName||'';
-							this.deviceMemo = data.systemPrompt||'';
 							this.getModelVoiceList();
 						}
 					}
 				})
 			},
 			getModelVoiceList(){
-				this.$api.get(`/models/${this.agentDto.ttsModelId}/voices`).then(res=>{
+				this.$api.get(`/models/${'TTS_EdgeTTS'}/voices`).then(res=>{
 					if(res.data.code!==0) return this.$showToast(res.data.msg)
 					this.voiceList = [res.data.data];
-					this.voiceText = res.data.data.find(v=>v.id===this.agentDto.ttsVoiceId)?.name||'';
+					this.voiceText = res.data.data.find(v=>v.id===this.agentDto.ttsVoiceId)?.name||'请选择音色';
 				})
 			},
 			confirm(e){
@@ -171,17 +180,25 @@
 			},
 			comfirmSure(){
 				if(!this.agentDto.agentName) return this.$showToast('请输入角色昵称')
-				if(this.agentDto.modelText==='请选择角色模版') return this.$showToast('请选择角色模板')
 				if(this.agentDto.voiceText==='请选择音色') return this.$showToast('请选择音色')
 				
 				let dto = JSON.parse(JSON.stringify(this.agentDto));
 				if(this.agentId) dto.deviceId = this.deviceId;
+				//默认固定值(暂时)
+				dto.asrModelId = 'ASR_FunASR';
+				dto.vadModelId = 'VAD_SileroVAD';
+				dto.llmModelId = 'LLM_ChatGLMLLM';
+				dto.ttsModelId = 'TTS_EdgeTTS';
+				dto.memModelId = 'Memory_mem_local_short';
+				dto.intentModelId = 'Intent_function_call';
+				dto.chatHistoryConf = 1;
+				dto.langCode = 'zh';
+				dto.language = '中文';
 				this.$api.post(this.agentId?`/agent/update/${this.agentId}`:'/agent',dto).then(res=>{
 					if(res.data.code!==0) return this.$showToast(res.data.msg)
 					this.$showToast(this.agentId?'编辑成功':'创建成功');
 					setTimeout(()=>{
-						let url = this.agentId?'/pages/home':'/pages/role'
-						uni.reLaunch({ url })
+						uni.reLaunch({ url:'/pages/role' })
 					},1500)
 				})
 			},
@@ -189,24 +206,19 @@
 				this.$api.get(`/agent/${this.agentId}`).then(res=>{
 					if(res.data.code!==0) return this.$showToast(res.data.msg)
 					this.agentDto = {...this.agentDto,...res.data.data};
-					this.deviceMemo = this.agentDto.systemPrompt;
+					if(this.agentDto.systemPrompt) this.showta = true;
 					this.getModelVoiceList();
-					this.getAgentModelList();
-				})
-			},
-			getAgentModelList(){
-				this.$api.get('/agent/template').then(res=>{
-					if(res.data.code!==0) return this.$showToast(res.data.msg)
-					if(res.data.data.length){
-						this.modelText = res.data.data.find(d=>d.systemPrompt===this.agentDto.systemPrompt)?.agentName;
-					}
 				})
 			},
 		}
 	}
 </script>
 
-<style scoped lang="less">
+<style scoped lang="scss">
+	::v-deep .desc .u-textarea{
+		padding: 0 !important;
+	}
+	
 	.ph{
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
@@ -278,12 +290,13 @@
 			.desc{
 				margin-top: 20rpx;
 				min-height: 200rpx;
+				overflow-y: auto;
 			}
 			.tip{
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
 				font-size: 28rpx;
-				color: #A6A6A6;
+				color: #1B50FF;
 				line-height: 40rpx;
 				text-align: right;
 			}

pagesRole/roleModel.vue

@@ -12,7 +12,13 @@
 			<image src="http://106.54.209.120:8188/static/avatar_default.png"></image>
 			<p>{{agentDto.agentName||''}}</p>
 		</div>
-		<div class="desc">{{agentDto.systemPrompt||''}}</div>
+		<div class="desc">
+			<!-- <u-read-more :toggle="true" showHeight="300rpx">
+				<rich-text :nodes="agentDto.systemPrompt||''"></rich-text>
+			</u-read-more> -->
+			<!-- {{agentDto.systemPrompt||''}} -->
+			<u-textarea v-model="agentDto.systemPrompt" autoHeight :maxlength="-1" border="none" disabled="disabled"></u-textarea>
+		</div>
 		<div class="zt_btn" @tap="confirm">确认选择</div>
 	</view>
 </template>
@@ -57,13 +63,20 @@
 	}
 </script>
 
-<style scoped lang="less">
+<style scoped lang="scss">
+	::v-deep .desc .u-textarea{
+		padding: 0 20rpx !important;
+		font-size: 26rpx !important;
+		color: #7C8592 !important;
+		line-height: 37rpx !important;
+		background: transparent !important;
+	}
+	
 	.page{
 		width: 100%;
 		background: #FFFFFF;
-		padding: 0 30rpx 30rpx;
+		padding: 0 30rpx 150rpx;
 		box-sizing: border-box;
-		overflow: hidden;
 		.title{
 			font-family: PingFang-SC, PingFang-SC;
 			font-weight: bold;
@@ -137,7 +150,11 @@
 			margin-top: 36rpx;
 		}
 		.zt_btn{
-			margin-top: 285rpx;
+			width: calc(100% - 60rpx);
+			position: fixed;
+			left: 30rpx;
+			bottom: 30rpx;
+			z-index: 999;
 		}
 	}
 </style>