Merge branch 'develop' of http://git.dashitech.com/seimin/zy-pc into develop

angular.json

@@ -35,20 +35,20 @@
             "styles": [
               "src/styles.less",
               "src/assets/iconfont/iconfont.css",
-              "./node_modules/swiper/swiper-bundle.min.css"
-							// "node_modules/prismjs/themes/prism-okaidia.css",
-							// "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css"
+              "./node_modules/swiper/swiper-bundle.min.css",
+							"node_modules/prismjs/themes/prism-okaidia.css",
+							"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css"
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js",
               "./node_modules/swiper/swiper-bundle.min.js",
               "src/assets/libs/TLWebSocketAgent.js",
               "src/assets/libs/ola_api.js",
-							"node_modules/marked/marked.min.js"
-							// "node_modules/prismjs/prism.js",
-							// "node_modules/prismjs/components/prism-csharp.min.js",
-							// "node_modules/prismjs/components/prism-css.min.js",
-							// "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
+							"node_modules/marked/marked.min.js",
+							"node_modules/prismjs/prism.js",
+							"node_modules/prismjs/components/prism-csharp.min.js",
+							"node_modules/prismjs/components/prism-css.min.js",
+							"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
             ]
           },
           "configurations": {
@@ -115,20 +115,20 @@
             "styles": [
               "src/styles.less",
               "src/assets/iconfont/iconfont.css",
-              "./node_modules/swiper/swiper-bundle.min.css"
-							// "node_modules/prismjs/themes/prism-okaidia.css",
-							// "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css"
+              "./node_modules/swiper/swiper-bundle.min.css",
+							"node_modules/prismjs/themes/prism-okaidia.css",
+							"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css"
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js",
               "./node_modules/swiper/swiper-bundle.min.js",
               "src/assets/libs/TLWebSocketAgent.js",
               "src/assets/libs/ola_api.js",
-							"node_modules/marked/marked.min.js"
-							// "node_modules/prismjs/prism.js",
-							// "node_modules/prismjs/components/prism-csharp.min.js",
-							// "node_modules/prismjs/components/prism-css.min.js",
-							// "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
+							"node_modules/marked/marked.min.js",
+							"node_modules/prismjs/prism.js",
+							"node_modules/prismjs/components/prism-csharp.min.js",
+							"node_modules/prismjs/components/prism-css.min.js",
+							"node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js"
             ]
           }
         },

src/app/app.module.ts

@@ -12,6 +12,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NZ_I18N, zh_CN, NzConfig, NZ_CONFIG } from 'ng-zorro-antd';
 import { RouteReuseStrategy } from '@angular/router';
 import { SimpleReuseStrategy } from './SimpleReuseStrategy';
+import { MarkdownModule } from 'ngx-markdown';
 const ngZorroConfig: NzConfig = {
   // 注意组件名称没有 nz 前缀
   notification: { nzTop: 100 }
@@ -27,7 +28,8 @@ registerLocaleData(zh);
     BrowserAnimationsModule,
     AppRoutingModule,
     HttpClientModule,
-    ShareModule
+    ShareModule,
+		MarkdownModule.forRoot()
   ],
   providers: [
     { provide: NZ_I18N, useValue: zh_CN },

src/app/components/smart-dialogue/smart-dialogue.component.html

@@ -9,20 +9,33 @@
 				<div class="timestamp" *ngIf="message.showTime">
 					<!-- {{ formatSendTime(message.timestamp) }} -->
 				</div>
-				<div class="content-message" [ngClass]="{'user-message' : message.role === 'user','bot-message': message.role === 'assistant'}">
-					<!-- <div markdown [data]="message.content" *ngIf="message.role=='assistant'"></div> -->
-					<markdown data="123456"></markdown>
-					<!-- <div *ngIf="message.role=='user'">{{message.content}}</div> -->
-					<!-- {{message.content}} -->
+				<div class="content-message"
+					[ngClass]="{'user-message' : message.role === 'user','bot-message': message.role === 'assistant'}">
+					<!-- <markdown [data]="message.content" *ngIf="message.role=='assistant'"></markdown> -->
+					<div class="content-left">
+						<div markdown [data]="message.content" *ngIf="message.role=='assistant'"
+							[ngClass]="{'mark-class' : isLoad}">
+						</div>
+						<i class="icon_transport transport-xiazai"
+							*ngIf="message.role=='assistant' && message.content != '正在思考中...' && message.content != '抱歉，我现在无法回答您的问题，请稍后再试。'"
+							(click)="exportWord(message)"></i>
+					</div>
+					<div *ngIf="message.role=='user'">{{message.content}}</div>
 				</div>
 			</div>
 		</div>
 		<div class="display_flex justify-content_flex-center">
 			<nz-input-group nzSearch [nzAddOnAfter]="suffixIconButton">
-			  <input type="text" (keydown.enter)="handleEnter()" nz-input [(ngModel)]="userContent" placeholder="请输入您想咨询的问题" />
+				<input type="text" [disabled]="isDisabled" (keydown.enter)="handleEnter()" nz-input [(ngModel)]="userContent"
+					placeholder="请输入您想咨询的问题" />
 			</nz-input-group>
 			<ng-template #suffixIconButton>
-			  <button nz-button nzType="primary" nzSearch (click)="searchDeepSeek()"><i nz-icon nzType="search"></i></button>
+				<button nz-button nzType="primary" [disabled]="isDisabled" nzSearch (click)="searchDeepSeek()"><i nz-icon
+						nzType="search"></i></button>
 			</ng-template>
 		</div>
+	</div>
+</div>
+	<div class="mask-style" *ngIf="exportLoading">
+		<nz-spin nzSimple class="spin-style"></nz-spin>
 	</div>

src/app/components/smart-dialogue/smart-dialogue.component.less

@@ -1,5 +1,38 @@
 @import "../../../../src/theme.less";
+
 :host {
+	
+  h1,
+  h2,
+  h3,
+  p {
+    margin: 0;
+  }
+  em {
+    font-style: normal;
+  }
+	
+	/* 修改垂直滚动条 */
+	::-webkit-scrollbar {
+		width: 4px; /* 修改宽度 */
+		border-radius: 2px;
+	}
+	 
+	/* 修改滚动条轨道背景色 */
+	::-webkit-scrollbar-track {
+		background-color: #f1f1f1;
+	}
+	 
+	/* 修改滚动条滑块颜色 */
+	::-webkit-scrollbar-thumb {
+		background-color: #888;
+	}
+	 
+	/* 修改滚动条滑块悬停时的颜色 */
+	::-webkit-scrollbar-thumb:hover {
+		background-color: #555;
+	}
+	
   .add-button {
     margin: 0 auto 16px !important;
   }
@@ -110,21 +143,6 @@
     .modalBody {
       width: 70%;
       height: auto;
-				.mask-style{
-					width: 100%;
-					height: 100%;
-					position: fixed;
-					top: 0;
-					left: 0;
-					z-index: 999;
-					display: flex;
-					background: rgba(0,0,0,0.2);
-					align-items: center;
-					justify-content: center;
-				}
-				.spin-style{
-					z-index:9999;
-				}
 			.view-box{
 				height: 400px;
 				padding: 20px;
@@ -134,13 +152,22 @@
 				border-radius: 5px;
 				.content-message{
 					position: relative;
-					padding: 10px 15px;
+					padding: 10px 20px;
 					border-radius: 10px;
 					font-size: 14px;
 					color: #333;
 					line-height: 25px;
 					width: fit-content;
 					max-width: 70%;
+					.content-left{
+						i{
+							cursor: pointer;
+							position: absolute;
+							top: 10px;
+							right: 4px;
+							color: #34b349;
+						}
+					}
 				}
 				
 				.user-message {
@@ -152,6 +179,39 @@
 				.bot-message {
 				  background: #f2f2f2;
 				  color: #000;
+					.mark-class{
+						white-space: nowrap;
+						overflow: hidden;
+						animation: typing 2s steps(15, end) infinite;
+						position: relative;
+					}
+					
+			// 		.mark-class::before{
+			// 			position: absolute;
+			// 			width: 0;
+			// 			height: 100%;
+			// 			text-wrap: nowrap;
+			// 			overflow: hidden;
+			// 			animation: moving 3s calc(var(--delay) * 3s) linear forwards, flashing 0.5s infinite alternate;
+			// 			text-shadow: 0.05em 0.05em 0.05em hsla(0, 0%, 0%, .5);
+			// 		}
+					
+			// 		@keyframes moving {
+			// 			to {
+			// 				width: 100%;
+			// 			}
+			// 		}
+			
+			// 		@keyframes flashing {
+			// 			to {
+			// 				border-color: transparent;
+			// 			}
+			// 		}
+					
+					@keyframes typing {
+						from { width: 0; }
+						to { width: 100%; }
+					}
 				}
 				
 				.left-box{
@@ -364,3 +424,19 @@
 		}
 	}
 }
+
+.mask-style{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	display: flex;
+	background: rgba(0,0,0,0.2);
+	align-items: center;
+	justify-content: center;
+}
+.spin-style{
+	z-index:9999;
+}

src/app/components/smart-dialogue/smart-dialogue.component.ts

@@ -28,6 +28,34 @@ export class SmartDialogueComponent implements OnInit  {
 	userContent:any;
   hosId: number;
   messagesData:any = [];
+	isDisabled:boolean = false;
+	isLoad:boolean = false;
+	
+	// 导出
+	exportLoading:boolean = false;
+	exportWord(item){
+		this.exportLoading = true;
+		this.mainService.exportDeepSeek({
+			chatList:[item]
+		}).subscribe(
+		  (data:any) => {
+				this.exportLoading = false;
+		    var file = new Blob([data], {
+		      type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+		    });
+		    var fileURL = URL.createObjectURL(file);
+		    var a = document.createElement("a");
+		    a.href = fileURL;
+		    a.target = "_blank";
+		    a.download = new Date().getTime() + ".docx";
+		    document.body.appendChild(a);
+		    a.click();
+		  },
+		  (err) => {
+		    this.exportLoading = false;
+		  }
+		);
+	}
 	
 	// 回车
 	handleEnter(){
@@ -35,10 +63,11 @@ export class SmartDialogueComponent implements OnInit  {
 	}
 	
   searchDeepSeek(){
-		this.scrollContainer.nativeElement.scrollTop = this.scrollContainer.nativeElement.scrollHeight;
-		if(this.userContent==''){
+		if(this.userContent=='' || this.userContent == undefined){
 			return
 		}
+		this.isDisabled = true
+		this.isLoad = false
 		let messagesStr = JSON.parse(JSON.stringify(this.userContent))
 		this.messagesData.push({
 			role: "user",
@@ -54,6 +83,9 @@ export class SmartDialogueComponent implements OnInit  {
 		let arr = this.messagesData.filter((item) => {
 			return item.content.indexOf("正在思考中") === -1;
 		});
+		setTimeout(_=>{
+			this.scrollContainer.nativeElement.scrollTop = this.scrollContainer.nativeElement.scrollHeight;
+		},100)
 		this.mainService.getDeepSeekData({
 			chatList:arr
 		})
@@ -78,7 +110,14 @@ export class SmartDialogueComponent implements OnInit  {
 						// timestamp: new Date(), //时间戳
 					});
 				}
-				this.scrollContainer.nativeElement.scrollTop = this.scrollContainer.nativeElement.scrollHeight;
+				this.isLoad = true;
+				setTimeout(_=>{
+					this.isLoad = false;
+				},2000)
+				setTimeout(_=>{
+					this.scrollContainer.nativeElement.scrollTop = this.scrollContainer.nativeElement.scrollHeight;
+					this.isDisabled = false
+				},100)
 			});
   }
 

src/app/components/smart-dialogue/smart-dialogue.module.ts

@@ -12,7 +12,7 @@ import { MarkdownModule } from 'ngx-markdown';
   imports: [
     CommonModule,
     ShareModule,
-		MarkdownModule.forRoot()
+		MarkdownModule.forChild()
   ],
   exports: [
     SmartDialogueComponent

src/app/services/main.service.ts

@@ -1100,4 +1100,12 @@ export class MainService {
 		  headers: this.headers,
 		});
 	}
+	// 导出deepSeek数据
+	exportDeepSeek(data){
+		return this.http.post(host.host + `/user/data/ds/exportChat`, data, {
+		  headers: this.headers,
+			responseType: "arraybuffer",
+		});
+	}
+	
 }

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1435,8 +1435,8 @@
       <div class="patientMsg">
         <div class="patientMsgTips">患者姓名：{{patientMsg.patientName}}</div>
         <div class="patientMsgTips">住院号：{{patientMsg.residenceNo}}</div>
-        <div class="patientMsgTips">护理级别：{{patientMsg.illnessState?.name}}</div>
-        <div class="patientMsgTips">危重等级：{{patientMsg.careLevel?.name}}</div>
+        <div class="patientMsgTips">护理级别：{{patientMsg.careLevel?.name}}</div>
+        <div class="patientMsgTips">危重等级：{{patientMsg.illnessState?.name}}</div>
       </div>
       <div>
         <form nz-form [formGroup]="patientForm" class="patientForm">
@@ -2730,9 +2730,9 @@
   </div>
 </nz-modal>
 
-<div class="kefu" (click)="smartOpen()">
+<!-- <div class="kefu" (click)="smartOpen()">
 	<img src="../../assets/images/kefu.png" alt="">
-</div>
+</div> -->
 
 <!-- 快捷方式建单弹窗 -->
 <app-build-quick-confirm *ngIf="isShowBuildQuickConfirm" [buildQuickConfirmData]="buildQuickConfirmData" (cancelModal)="cancelBuildQuickConfirm($event)" (confirmModal)="confirmBuildQuickConfirm($event)" [loading5]="loadingQuick"></app-build-quick-confirm>