seimin месяцев назад: 6
Родитель
Сommit
cce38948cd

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-		"target": "http://192.168.3.108",
3
+		"target": "http://192.168.4.105",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 4 - 1
src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component.html

@@ -3,7 +3,6 @@
3 3
     <div class="addressAssign">
4 4
       <overlay-scrollbars #osComponentRef2 class="contentBody2">
5 5
         <div class="contentBody">
6
-          <div class="hospital">{{currentHospital.hosName}}</div>
7 6
           <div class="classList">
8 7
             节假日班次:
9 8
             <nz-select class="select" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="dataInfo.holidayClassId"
@@ -28,6 +27,10 @@
28 27
               </nz-option>
29 28
             </nz-select>
30 29
           </div>
30
+          <div class="classList">
31
+            呼叫中心服务连接:
32
+            <input style="width: 270px;" nz-input placeholder="请填写呼叫中心服务连接" [(ngModel)]="dataInfo.socketUrl" />
33
+          </div>
31 34
         </div>
32 35
       </overlay-scrollbars>
33 36
       <div class="contentBtns">

+ 2 - 4
src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component.ts

@@ -33,9 +33,9 @@ export class ConfigurationCallcenterComponent implements OnInit {
33 33
   submitMessageForm(): void {
34 34
     this.btnLoading = true;
35 35
     let postData:any = {
36
-      hosId: this.currentHospital.id,
37 36
       workdayClassId: this.dataInfo.workdayClassId,
38 37
       holidayClassId: this.dataInfo.holidayClassId,
38
+      socketUrl: this.dataInfo.socketUrl,
39 39
     };
40 40
     postData = { ...this.dataInfo, ...postData };
41 41
     this.mainService
@@ -80,9 +80,7 @@ export class ConfigurationCallcenterComponent implements OnInit {
80 80
     let data = {
81 81
       idx: 0,
82 82
       sum: 9999,
83
-      callCenterConfig: {
84
-        hosId: this.currentHospital.id,
85
-      },
83
+      callCenterConfig: {},
86 84
     };
87 85
     this.loading1 = true;
88 86
     this.mainService

+ 5 - 12
src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.ts

@@ -1,4 +1,4 @@
1
-import { Component, OnInit, ViewChild } from "@angular/core";
1
+import { Component, OnInit, ViewChild, Input } from "@angular/core";
2 2
 import { ActivatedRoute } from "@angular/router";
3 3
 import { MainService } from "../../../services/main.service";
4 4
 import { Validators, FormGroup, FormBuilder, FormControl } from '@angular/forms';
@@ -33,23 +33,16 @@ export class ConfigurationDictionaryComponent implements OnInit {
33 33
   osComponentRef2: OverlayScrollbarsComponent;
34 34
 
35 35
   ngOnInit() {
36
-    this.initDictionaryForm();
36
+    this.activeDictionaryKey = this.dictionaryKeyList[0];
37 37
     this.getDictionaryList();
38
+    this.initDictionaryForm();
38 39
   }
39 40
 
40 41
   // 数据字典key列表
41
-  dictionaryKeyList: any[] = [
42
-    { id: 1, name: '积分配置', key: "incident_category_score"},
43
-    { id: 2, name: '事件来源', key: "incident_source"},
44
-    { id: 3, name: '处理结果', key: "incident_closecode"},
45
-    { id: 4, name: '处理方式', key: "incident_handle_type"},
46
-    { id: 5, name: '状态', key: "incident_status"},
47
-    { id: 6, name: '维修记录', key: "repair_type"},
48
-    { id: 7, name: '满意度评价', key: "incident_degree"},
49
-  ];
42
+  @Input() dictionaryKeyList: any[] = [];
50 43
 
51 44
   // 点击数据字典key
52
-  activeDictionaryKey:any = this.dictionaryKeyList[0];
45
+  activeDictionaryKey:any;
53 46
   clickDictionaryKey(item){
54 47
     this.activeDictionaryKey = item;
55 48
     this.getDictionaryList();

+ 20 - 0
src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module.ts

@@ -0,0 +1,20 @@
1
+import { NgModule } from '@angular/core';
2
+import { CommonModule } from '@angular/common';
3
+
4
+import { ConfigurationDictionaryComponent } from './configuration-dictionary.component';
5
+import { ShareModule } from 'src/app/share/share.module';
6
+
7
+
8
+@NgModule({
9
+  declarations: [
10
+    ConfigurationDictionaryComponent,
11
+  ],
12
+  imports: [
13
+    CommonModule,
14
+    ShareModule,
15
+  ],
16
+  exports: [
17
+    ConfigurationDictionaryComponent,
18
+  ]
19
+})
20
+export class ConfigurationDictionaryModule { }

+ 1 - 1
src/app/views/incident-config/incident-config.component.html

@@ -18,7 +18,7 @@
18 18
   </ng-container>
19 19
   <!-- 数据字典 -->
20 20
   <ng-container *ngIf="activeTagId === 3">
21
-    <app-configuration-dictionary></app-configuration-dictionary>
21
+    <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
22 22
   </ng-container>
23 23
   <!-- 消息通知 -->
24 24
   <ng-container *ngIf="activeTagId === 4">

+ 11 - 0
src/app/views/incident-config/incident-config.component.ts

@@ -22,6 +22,17 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
22 22
     { id: 7, name: '院区配置',},
23 23
   ];
24 24
 
25
+  // 数据字典
26
+  dictionaryKeyList:any[] = [
27
+    { id: 1, name: '积分配置', key: "incident_category_score"},
28
+    { id: 2, name: '事件来源', key: "incident_source"},
29
+    { id: 3, name: '处理结果', key: "incident_closecode"},
30
+    { id: 4, name: '处理方式', key: "incident_handle_type"},
31
+    { id: 5, name: '状态', key: "incident_status"},
32
+    { id: 6, name: '维修记录', key: "repair_type"},
33
+    { id: 7, name: '满意度评价', key: "incident_degree"},
34
+  ]
35
+
25 36
   ngOnInit(): void {}
26 37
 
27 38
   ngAfterViewInit(){

+ 3 - 3
src/app/views/incident-config/incident-config.module.ts

@@ -6,11 +6,11 @@ import { IncidentConfigComponent } from './incident-config.component';
6 6
 import { ShareModule } from 'src/app/share/share.module';
7 7
 import { ConfigurationCategoryComponent } from 'src/app/components/configurationCenter/configuration-category/configuration-category.component';
8 8
 import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
9
-import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
10 9
 import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
11 10
 import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
12 11
 import { ConfigurationMessageComponent } from 'src/app/components/configurationCenter/configuration-message/configuration-message.component';
13 12
 import { ConfigurationHospitalComponent } from 'src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component';
13
+import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
14 14
 
15 15
 
16 16
 @NgModule({
@@ -18,7 +18,6 @@ import { ConfigurationHospitalComponent } from 'src/app/components/configuration
18 18
     IncidentConfigComponent,
19 19
     ConfigurationCategoryComponent,
20 20
     ConfigurationPriorityComponent,
21
-    ConfigurationDictionaryComponent,
22 21
 		ConfigurationManHourComponent,
23 22
 		ConfigurationDeptUserComponent,
24 23
     ConfigurationMessageComponent,
@@ -27,7 +26,8 @@ import { ConfigurationHospitalComponent } from 'src/app/components/configuration
27 26
   imports: [
28 27
     CommonModule,
29 28
     IncidentConfigRoutingModule,
30
-    ShareModule
29
+    ShareModule,
30
+    ConfigurationDictionaryModule,
31 31
   ]
32 32
 })
33 33
 export class IncidentConfigModule { }

+ 1 - 1
src/app/views/other-config/other-config.component.html

@@ -18,7 +18,7 @@
18 18
   </ng-container>
19 19
   <!-- 数据字典 -->
20 20
   <ng-container *ngIf="activeTagId === 3">
21
-    <!-- <app-configuration-dictionary></app-configuration-dictionary> -->
21
+    <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
22 22
   </ng-container>
23 23
 </div>
24 24
 

+ 6 - 1
src/app/views/other-config/other-config.component.ts

@@ -15,9 +15,14 @@ export class OtherConfigComponent implements OnInit, AfterViewInit {
15 15
   tagList:any = [
16 16
     { id: 1, name: '呼叫中心',},
17 17
     { id: 2, name: '微信配置',},
18
-    // { id: 3, name: '数据字典',},
18
+    { id: 3, name: '数据字典',},
19 19
   ];
20 20
 
21
+  // 数据字典
22
+  dictionaryKeyList:any[] = [
23
+    { id: 1, name: '呼叫中心分机号', key: "hjzx_cornet"},
24
+  ]
25
+
21 26
   ngOnInit(): void {}
22 27
 
23 28
   ngAfterViewInit(){

+ 3 - 1
src/app/views/other-config/other-config.module.ts

@@ -6,6 +6,7 @@ import { OtherConfigComponent } from './other-config.component';
6 6
 import { ShareModule } from 'src/app/share/share.module';
7 7
 import { ConfigurationWechatComponent } from 'src/app/components/configurationCenter/configuration-wechat/configuration-wechat.component';
8 8
 import { ConfigurationCallcenterComponent } from 'src/app/components/configurationCenter/configuration-callcenter/configuration-callcenter.component';
9
+import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
9 10
 
10 11
 
11 12
 @NgModule({
@@ -17,7 +18,8 @@ import { ConfigurationCallcenterComponent } from 'src/app/components/configurati
17 18
   imports: [
18 19
     CommonModule,
19 20
     OtherConfigRoutingModule,
20
-    ShareModule
21
+    ShareModule,
22
+    ConfigurationDictionaryModule,
21 23
   ]
22 24
 })
23 25
 export class OtherConfigModule { }

+ 2 - 1
src/assets/js/http.ts

@@ -14,6 +14,7 @@ const baseUrl: baseUrlType = {
14 14
   mainWs: `${wsName}://${domainName}:${port}/webSocket/message/manage`, //websocket管理端地址
15 15
   nurseWs: `${wsName}://${domainName}:${port}/webSocket/message/nurse`, //websocket护士端地址
16 16
   fwtWs: `${wsName}://${domainName}:${port}/webSocket/message/ser`, //websocket服务台地址
17
-  phoneWs: `${wsName}://${domainName}:${port}/webSocket/message/phone`, //websocket服务台来电地址
17
+  // phoneWs: `${wsName}://${domainName}:${port}/webSocket/message/phone`, //websocket服务台来电地址
18
+  phoneWs: `${wsName}://192.168.3.111:29999/webSocket/message/phone`, //websocket服务台来电地址
18 19
 };
19 20
 export default baseUrl;