代码合并解决冲突

src/app/app-routing.module.ts

@@ -24,7 +24,8 @@ import { OtherConfigGuard } from './guard/OtherConfig.guard';
 //业务页面控制查看权限
 import { PageConfigGuard } from './guard/PageConfig.guard';
 import { NurseConfigGuard } from './guard/nurseConfig.guard';
-
+//系统配置查看权限
+import { SystemConfigGuard } from './guard/SystemConfig.guard';
 const routes: Routes = [
   // 默认
   {
@@ -117,7 +118,7 @@ const routes: Routes = [
 	{
 	  path: 'systemConfig',
 	  loadChildren: () => import('./views/system-config/system-config.module').then(m => m.SystemConfigModule),
-	  canActivate: [PageConfigGuard]
+	  canActivate: [SystemConfigGuard]
 	},
   // 业务页面控制查看
   {

src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -883,7 +883,7 @@ export class IncidentCreateComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category.mutiCategory,
+        // "title": category.mutiCategory,
         "description": this.incidentModel.description,
         "directProcess": 1,
         "handleDescription": this.incidentModel.handleDescription,
@@ -998,7 +998,7 @@ export class IncidentCreateComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category.mutiCategory,
+        // "title": category.mutiCategory,
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
@@ -1072,7 +1072,7 @@ export class IncidentCreateComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category ? category.mutiCategory : '',
+        // "title": category ? category.mutiCategory : '',
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
@@ -1174,7 +1174,7 @@ export class IncidentCreateComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category ? category.mutiCategory : '',
+        // "title": category ? category.mutiCategory : '',
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,

src/app/guard/SystemConfig.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SystemConfigGuard implements CanActivate  {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'systemConfig');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/services/websocket-incoming.service.ts

@@ -2,7 +2,7 @@
  * @Author: seimin
  * @Date: 2024-09-24 16:34:47
  * @LastEditors: seimin
- * @LastEditTime: 2024-09-29 15:41:54
+ * @LastEditTime: 2024-11-28 03:12:59
  * @Description: 来电弹屏websocket服务
  */
 import { Injectable } from "@angular/core";
@@ -24,8 +24,8 @@ export class WebsocketIncomingService {
 
   // 连接websocket { userCount }
   private user = JSON.parse(localStorage.getItem("user")); //用户信息
-  connectWs(): Observable<any> {
-    let userCount = this.user.user.account + "|" + this.getPhoneNumber();
+  connectWs(phoneNumber): Observable<any> {
+    let userCount = this.user.user.account + "|" + phoneNumber;
     if(this.getSign() === 'box'){
       return this.phoneService.connectWs(http.phoneWs, { userCount });
     }

src/app/services/websocket-phone.service.ts

@@ -2,7 +2,7 @@
  * @Author: seimin
  * @Date: 2024-03-11 11:11:09
  * @LastEditors: seimin
- * @LastEditTime: 2024-09-24 16:38:23
+ * @LastEditTime: 2024-11-28 03:03:38
  * @Description: 录音盒websocket服务
  */
 import { Injectable } from "@angular/core";
@@ -60,15 +60,17 @@ export class WebsocketPhoneService {
       console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
       this.ws = null;
       console.log(response)
-      if (!this.isHandler && response.status === 408) {
+      if (!this.isHandler && response.status === 408 && sessionStorage.getItem('phoneNumber')) {
         this.reconnect(this.url, this.urlParams);
+      }else{
+        this.updateProperty(false);
       }
     };
 
     request.onError = (response) => {
       console.log("ws连接错误", this.isHandler);
       this.ws = null;
-      if (response.status === 0) {
+      if (response.status === 0 && sessionStorage.getItem('phoneNumber')) {
         this.reconnect(this.url, this.urlParams);
       }
     };
@@ -119,4 +121,17 @@ export class WebsocketPhoneService {
       this.ws.close();
     }
   }
+
+  // 创建一个Subject来发送和接收数据
+  private updateData = new Subject<any>();
+
+  // 提供一个方法来发送数据
+  updateProperty(data: any) {
+    this.updateData.next(data);
+  }
+
+  // 提供一个方法来订阅数据
+  getDataUpdate(): Subject<any> {
+    return this.updateData;
+  }
 }

src/app/share/pathology-add/pathology-add.component.html

@@ -281,7 +281,7 @@
   <!-- 打印 -->
   <div id="report" style="display: none;">
 		<div class="monad">
-			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && operation != 'addPrint'" style="border: 1px solid #AAAAAA;
+			<div *ngIf="printData && printData.specimenList && printData.specimenList.length" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
 				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
 					 <div style="width: 60%;height: 70px;text-align: center;">
@@ -325,51 +325,8 @@
 				</div>
 			</div>
 			
-			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>0 && operation == 'addPrint'" style="border: 1px solid #AAAAAA;
-				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
-					 <div style="width: 60%;height: 70px;text-align: center;">
-						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
-						 <div>{{printData.applyCode}}</div>
-					 </div>
-					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
-						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
-					 </div>
-				 </div>
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-					<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
-					<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>
-					<div style="width:14%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
-					<div style="width:16%;padding:1px;border-top: 1px solid #aaa;">{{printData.specimenList[0].patientGender}}</div>
-				</div>
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">住院号</div>
-					<div style="width:50%;border-right: 1px solid #AAAAAA;padding:1px;">{{printData.residenceNo}}</div>
-					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
-					<div style="width:16%;padding:1px;"> {{printData.patientAge}}岁</div>
-				</div>
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
-					<div style="width:50%;border-right: 1px solid #AAAAAA;
-					padding:1px;overflow: hidden;white-space: nowrap">{{printData.patientDept}}</div>
-					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
-					<div style="width:16%;padding:1px;">{{printData.patientBedNum}}床</div>
-				</div>
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">部位 </div>
-					<div style="width:50%;border-right: 1px solid #AAAAAA;
-					padding:1px;overflow: hidden;white-space: nowrap">{{printData.takePart}}</div>
-					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
-					<div style="width:16%;padding:1px;">{{printData.specimenNum}}</div>
-				</div>
-				<div style="display: flex;">
-					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
-					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{printData.specimenList[0].inVitroTime|date:'yyyy-MM-dd'}}</div>
-				</div>
-			</div>
-			
-			<div style="height: 70px;" *ngIf="printData && printData.specimenList && printData.specimenList.length==1 && operation == 'addPrint'"></div>
-			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && operation != 'addPrint'"></div>
+			<div style="height: 70px;" *ngIf="printData && printData.specimenList && printData.specimenList.length==1"></div>
+			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>

src/app/share/pathology-detail/pathology-detail.component.html

@@ -156,6 +156,7 @@
 				</div>
 				
 			</div>
+			<div style="height: 70px;" *ngIf="printData && printData.specimenList && printData.specimenList.length==1"></div>
 			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">

src/app/views/fuwutai/fuwutai.component.html

@@ -926,7 +926,7 @@
           </button>
         </div>
       </div>
-      <div class="fixedMenu" *ngIf="!websocketLoading && !incomingService.getPhoneNumber()">
+      <div class="fixedMenu" *ngIf="!incomingService.getPhoneNumber()">
         <div class="menuItems">
           <button nz-button nzType="link" class="item itemLink" (click)="showBindExtensionNumber()">
             绑定分机

src/app/views/fuwutai/fuwutai.component.ts

@@ -116,7 +116,12 @@ export class FuwutaiComponent implements OnInit {
     private http: HttpClient,
     public route: ActivatedRoute,
     public incomingService: WebsocketIncomingService,
-  ) {}
+  ) {
+    // 在组件中订阅服务的Observable
+    this.phones.getDataUpdate().subscribe(data => {
+      this.websocketLoading = data;
+    });
+  }
   validateFormZy!: FormGroup;
   validateFormQt!: FormGroup;
   // ---------------------------------------
@@ -804,6 +809,7 @@ export class FuwutaiComponent implements OnInit {
     TLWSA.onOpenreturn = (err) => {
       err = Number(err);
       if (!err) {
+        _this.incomingService.setPhoneNumber(TLWSA.phoneNumber);
         _this.websocketLoading = false;
         _this.cancelBindExtensionNumber();
         console.log('呼叫中心连接成功-----seimin');
@@ -888,12 +894,17 @@ export class FuwutaiComponent implements OnInit {
       clearTimeout(timer);
       if(location.hash === '#/dispatchingDesk'){
         console.log('与服务器网络连接中断-----seimin');
-        _this.msg.info('与服务器网络连接中断,2分钟后重连')
-        console.log('2分钟后自动重连-----seimin')
-        timer = setTimeout(function () {
-          //连接
-          tlwsa.tlaOpen(_this.incomingService.getSocketUrl());
-        }, 120000)
+        if(this.incomingService.getPhoneNumber()){
+          _this.msg.info('与服务器网络连接中断,2分钟后重连')
+          console.log('2分钟后自动重连-----seimin')
+          timer = setTimeout(function () {
+            //连接
+            TLWSA.phoneNumber = _this.incomingService.getPhoneNumber();
+            tlwsa.tlaOpen(_this.incomingService.getSocketUrl());
+          }, 120000)
+        }else{
+          _this.websocketLoading = false;
+        }
       }
     }
     //签入回调函数
@@ -1349,14 +1360,15 @@ export class FuwutaiComponent implements OnInit {
 
   showBindExtensionNumber() {
     this.showBindExtensionNumberModal = true;
+    this.websocketLoading = false;
   }
 
   // 保存绑定分机-签入
   checkIn(phoneNumber){
     this.websocketLoading = true;
-    this.incomingService.setPhoneNumber(phoneNumber);
+    // this.incomingService.setPhoneNumber(phoneNumber);
     this.incomingService.closeWs(true);
-    this.getWebsocketPhone();
+    this.getWebsocketPhone(phoneNumber);
   }
 
   // 签出
@@ -1385,11 +1397,11 @@ export class FuwutaiComponent implements OnInit {
     // tel1: '',//目的号码对象
     // tel2: '',//转接坐席对象
   }
-  getWebsocketPhone() {
+  getWebsocketPhone(phoneNumber) {
     const sign = this.incomingService.getSign();
     if(sign === 'box'){
       // 录音盒
-      this.incomingService.connectWs().subscribe((data) => {
+      this.incomingService.connectWs(phoneNumber).subscribe((data) => {
         // data = { status: 201, phone: '013581394341' };//ceshi
         console.log(data);
         console.log(this.incidentModel);
@@ -1397,6 +1409,7 @@ export class FuwutaiComponent implements OnInit {
 
         // 200签入 201摘机 202来电
         if (data.status == 200 && data.phone) {
+          this.incomingService.setPhoneNumber(phoneNumber);
           this.incidentModel = {};
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
@@ -1426,6 +1439,7 @@ export class FuwutaiComponent implements OnInit {
       // 呼叫中心----start
       this.preState = '';
       //连接
+      TLWSA.phoneNumber = phoneNumber;
       tlwsa.tlaOpen(this.incomingService.getSocketUrl());
     }else{
       this.websocketLoading = false;
@@ -2485,7 +2499,7 @@ export class FuwutaiComponent implements OnInit {
       this.incomingService.removePhoneNumber();
     }
     if (this.incomingService.getPhoneNumber()) {
-      this.getWebsocketPhone();
+      this.getWebsocketPhone(this.incomingService.getPhoneNumber());
     }else{
       this.websocketLoading = false;
     }
@@ -2832,7 +2846,7 @@ export class FuwutaiComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category.mutiCategory,
+        // "title": category.mutiCategory,
         "description": this.incidentModel.description,
         "directProcess": 1,
         "handleDescription": this.incidentModel.handleDescription,
@@ -3522,7 +3536,8 @@ export class FuwutaiComponent implements OnInit {
     }
 
     let category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
-    if(!this.incidentModel.duty){
+    console.log('故障现象对象=>>>>>',category)
+		if(!this.incidentModel.duty){
       this.msg.warning(`故障现象【${category.mutiCategory}】没有设置责任部门!`);
       return;
     }
@@ -3572,7 +3587,7 @@ export class FuwutaiComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category.mutiCategory,
+        // "title": category.mutiCategory,
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
@@ -3646,7 +3661,7 @@ export class FuwutaiComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category ? category.mutiCategory : '',
+        // "title": category ? category.mutiCategory : '',
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,
@@ -3746,7 +3761,7 @@ export class FuwutaiComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category ? category.mutiCategory : '',
+        // "title": category ? category.mutiCategory : '',
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,