协和南京优化开发

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.html

@@ -11,7 +11,7 @@
           <div class="orders">排序号</div>
           <div class="name">键</div>
           <div [ngClass]="{value_2: activeDictionaryKey.key == 'alarm_urgency', value: activeDictionaryKey.key != 'alarm_urgency'}">值</div>
-					<div class="value_2" *ngIf="activeDictionaryKey.key == 'alarm_urgency'">关键字</div>
+					<!-- <div class="value_2" *ngIf="activeDictionaryKey.key == 'alarm_urgency'">关键字</div> -->
         </div>
         <overlay-scrollbars #osComponentRef2 class="contentBody2">
           <form nz-form [formGroup]="validateDictionaryForm" class="w100">

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.ts

@@ -234,7 +234,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
         name: rawValueObj['name_' + this.dictionaryList[i].id],
         value: rawValueObj['value_' + this.dictionaryList[i].id],
         orders: rawValueObj['orders_' + this.dictionaryList[i].id],
-				extra1: this.activeDictionaryKey.key == 'alarm_urgency' ? rawValueObj['extra1_' + this.dictionaryList[i].id]: undefined,
+				// extra1: this.activeDictionaryKey.key == 'alarm_urgency' ? rawValueObj['extra1_' + this.dictionaryList[i].id]: undefined,
         system: uuidValidate(this.dictionaryList[i].id) ? false : this.dictionaryList[i].system,
         key: this.activeDictionaryKey.key,
       })

src/app/views/fuwutai/fuwutai.component.less

@@ -1869,7 +1869,7 @@
   // 右侧悬浮菜单-录音盒或呼叫中心状态
   .fixedAll {
     position: fixed;
-    top: 40%;
+    top: 0;
     right: 0;
     z-index: 10;
     border-radius: 5px 0 0 5px;

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

@@ -1663,7 +1663,6 @@ export class FuwutaiComponent implements OnInit {
         console.log(data);
         console.log(this.incidentModel);
         this.websocketLoading = false;
-
         // 200签入 201摘机 202来电
         if (data.status == 200 && data.phone) {
           this.incomingService.setPhoneNumber(phoneNumber);
@@ -1672,6 +1671,7 @@ export class FuwutaiComponent implements OnInit {
           this.incidentModel.callID = data.callId || undefined;
           this.msg.info('签入成功');
           this.cancelBindExtensionNumber();
+					this.moveMenuAll("fixedMenuAll");
         } else if (data.status == 201 && data.phone) {
           this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
@@ -1679,6 +1679,7 @@ export class FuwutaiComponent implements OnInit {
 					this.contactsPhone = data.phone;
           this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data.phone;
           this.searchBxDept();
+					this.moveMenuAll("fixedMenuAll");
         } else if (data.status == 201 && data.phone === "") {
           this.incidentModel = { repairIncidentType: 'dept' };
           this.incidentMsg = {};
@@ -1688,6 +1689,7 @@ export class FuwutaiComponent implements OnInit {
             this.applyDept = null;
             this.showNewOrder(1, "no", data.phone, true, '来电弹屏');
           }
+					this.moveMenuAll("fixedMenuAll");
         } else if (data.status == 202) {
           this.msg.warning(data.msg);
         }
@@ -6135,34 +6137,37 @@ export class FuwutaiComponent implements OnInit {
 
   // 菜单拖拽-自由
   moveMenuAll(nodeId) {
-    let fixedMenu = document.getElementById(nodeId);
-    if (!fixedMenu) return;
-    fixedMenu.onmousedown = function (e) {
-      fixedMenu.classList.remove('maskFull');
-      let x = e.clientX - fixedMenu.offsetLeft;
-      let y = e.clientY - fixedMenu.offsetTop;
-      document.onmousemove = function (ev) {
-        fixedMenu.classList.add('maskFull');
-        var _y = ev.clientY - y > 0 ? ev.clientY - y : 0;
-        var h = window.innerHeight;
-        if (_y > h - fixedMenu.clientHeight) {
-          _y = h - fixedMenu.clientHeight;
-        }
-        fixedMenu.style.top = _y + "px";
-
-        var _x = ev.clientX - x > 0 ? ev.clientX - x : 0;
-        var w = window.innerWidth;
-        if (_x > w - fixedMenu.clientWidth) {
-          _x = w - fixedMenu.clientWidth;
-        }
-        fixedMenu.style.right = w - _x - fixedMenu.clientWidth + "px";
-      };
-      document.onmouseup = function () {
-        fixedMenu.classList.remove('maskFull');
-        document.onmousemove = null;
-        document.onmouseup = null;
-      };
-    };
+		setTimeout(_=>{
+			let fixedMenu = document.getElementById(nodeId);
+			console.log(88888,fixedMenu)
+			if (!fixedMenu) return;
+			fixedMenu.onmousedown = function (e) {
+			  fixedMenu.classList.remove('maskFull');
+			  let x = e.clientX - fixedMenu.offsetLeft;
+			  let y = e.clientY - fixedMenu.offsetTop;
+			  document.onmousemove = function (ev) {
+			    fixedMenu.classList.add('maskFull');
+			    var _y = ev.clientY - y > 0 ? ev.clientY - y : 0;
+			    var h = window.innerHeight;
+			    if (_y > h - fixedMenu.clientHeight) {
+			      _y = h - fixedMenu.clientHeight;
+			    }
+			    fixedMenu.style.top = _y + "px";
+			
+			    var _x = ev.clientX - x > 0 ? ev.clientX - x : 0;
+			    var w = window.innerWidth;
+			    if (_x > w - fixedMenu.clientWidth) {
+			      _x = w - fixedMenu.clientWidth;
+			    }
+			    fixedMenu.style.right = w - _x - fixedMenu.clientWidth + "px";
+			  };
+			  document.onmouseup = function () {
+			    fixedMenu.classList.remove('maskFull');
+			    document.onmousemove = null;
+			    document.onmouseup = null;
+			  };
+			};
+		},500)
   }
 
   @ViewChild("msgTemplate", { static: false }) msgTemplate: TemplateRef<any>; //消息通知模板

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1994,6 +1994,7 @@ export class HushijiandanComponent implements OnInit {
 				.subscribe((result) => {
 					let arr = result.start.start.list;
 					arr.forEach(i=>{
+						i.inputcode = i.inputcode.toUpperCase()
 						if(this.deptDisplay == 2){
 							i.deptalias = i.deptalias + '('+i.inputcode+')'
 						}else{
@@ -2018,6 +2019,7 @@ export class HushijiandanComponent implements OnInit {
 				.subscribe((result) => {
 					let arr = result.end.end.list;
 					arr.forEach(i=>{
+						i.inputcode = i.inputcode.toUpperCase()
 						if(this.deptDisplay == 2){
 							i.deptalias = i.deptalias + '('+i.inputcode+')'
 						}else{
@@ -2066,6 +2068,7 @@ export class HushijiandanComponent implements OnInit {
       .subscribe((data) => {
         if (type == "target") {
 					data.list.forEach(i=>{
+						i.inputcode = i.inputcode.toUpperCase()
 						if(this.deptDisplay == 2){
 							i.deptalias = i.deptalias + '('+i.inputcode+')'
 						}else{
@@ -2075,6 +2078,7 @@ export class HushijiandanComponent implements OnInit {
           msg.end.end.list = data.list;
         } else if (type == "start") {
 					data.list.forEach(i=>{
+						i.inputcode = i.inputcode.toUpperCase()
 						if(this.deptDisplay == 2){
 							i.deptalias = i.deptalias + '('+i.inputcode+')'
 						}else{
@@ -3588,6 +3592,7 @@ export class HushijiandanComponent implements OnInit {
       .postCustom("nurse", "workOrder/buildTrip", postData)
       .subscribe((result) => {
 				result.start.start.list.forEach(i=>{
+					i.inputcode = i.inputcode.toUpperCase()
 					if(this.deptDisplay ==2){
 						i.deptalias = i.deptalias + '('+i.inputcode+')'
 					}else{
@@ -3595,6 +3600,7 @@ export class HushijiandanComponent implements OnInit {
 					}
 				})
 				result.end.end.list.forEach(i=>{
+					i.inputcode = i.inputcode.toUpperCase()
 					if(this.deptDisplay ==2){
 						i.deptalias = i.deptalias + '('+i.inputcode+')'
 					}else{

src/app/views/users-management/users-management.component.html

@@ -264,7 +264,7 @@
 </app-dialog-delete>
 
 <!-- 恢复账号 -->
-<app-dialog-delete [delModal]="recoverModal" [btnLoading]="recoverLoading"
+<app-dialog-delete [delModal]="recoverModal" [btnLoading]="recoverLoading" (hideDelModalEvent)="hideRecoverModal()"
   (confirmDelEvent)="confirmRecover()" (cancelDelEvent)="hideRecoverModal()" content="您确认恢复此用户吗？" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>