修复

README.md

@@ -1,7 +1,15 @@
 # 目录说明-seimin(2021-03-08)
-- directives存放指令
-- guard存放守卫
-- pipes存放管道
-- services存放服务
-- views存放视图
-- share存放共享组件
+- directives   存放指令
+- guard        存放守卫
+- pipes        存放管道
+- services     存放服务
+- views        存放视图
+- share        存放共享组件
+
+# 后端提示-seimin(2021-07-05)
+- /simple/data/fetchDataList/{model}            查询列表
+- /simple/data/fetchData/{model}/{id}           查询详情
+- /simple/data/addData/{model}                  新增，更新
+- /simple/data/addListData/{model}              新增，更新多个【暂时不用】
+- /simple/data/updData/{model}                  更新【暂时不用】
+- /simple/data/rmvData/{model}                  删除

src/app/services/main.service.ts

@@ -502,20 +502,4 @@ export class MainService {
       headers: this.headers,
     });
   }
-  //查询工单消息设置
-  getWorkorderMessage(data) {
-    return this.http.post(
-      host.host + "/configuration/pageWorkOrderMessageSettings",
-      data,
-      { headers: this.headers }
-    );
-  }
-  //修改工单消息设置
-  updateWorkorderMessage(data) {
-    return this.http.post(
-      host.host + "/configuration/saveWorkOrderMessageSettings",
-      data,
-      { headers: this.headers }
-    );
-  }
 }

src/app/views/main/main.component.html

@@ -36,6 +36,8 @@
           <button nz-button nzType="primary" *ngIf="nurseRole" (click)="toHuShi()">护士端</button>
           <button nz-button nzType="primary" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</button>
           <button nz-button nzType="primary" *ngIf="largeScreenRole" (click)="toBigScreen('largeScreen')">大屏端</button>
+          <button nz-button nzType="primary" *ngIf="largeScreenRole2"
+            (click)="toBigScreen('largeScreen2')">大屏端2</button>
           <button nz-button nzType="primary" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')"
             [nzLoading]="deptTypeLoading">业务视图</button>
         </div>

src/app/views/main/main.component.ts

@@ -26,6 +26,7 @@ export class MainComponent implements OnInit {
   nurseRole: boolean = false; //护士端权限
   pharmacyRole: boolean = false; //药房端权限
   largeScreenRole: boolean = false; //大屏端权限
+  largeScreenRole2: boolean = false; //大屏端权限
   specimenViewRole: boolean = false; //业务视图权限
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
@@ -111,6 +112,10 @@ export class MainComponent implements OnInit {
         this.largeScreenRole = true;
         console.log("大屏端权限");
       }
+      if (e.link == "largeScreen2") {
+        this.largeScreenRole2 = true;
+        console.log("大屏端2权限");
+      }
       if (e.link == "specimenView") {
         this.specimenViewRole = true;
         console.log("业务视图权限");
@@ -211,8 +216,9 @@ export class MainComponent implements OnInit {
   submitFormHand(id) {
     if (this.screenType === "largeScreen") {
       window.open(http.bigScreenHost + "/#/" + id);
+    } else if (this.screenType === "largeScreen2") {
+      window.open(http.bigScreenHost2 + "/#/" + id);
     } else if (this.screenType === "specimenView") {
-      // this.getTypeByDept(id);
       let remember = JSON.parse(localStorage.getItem("remember"));
       window.open(
         http.specimenViewHost +

src/app/views/workorder-message/workorder-message.component.ts

@@ -1,17 +1,10 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import {
-  FormBuilder,
-  Validators,
-  FormGroup,
-  FormControl,
-} from "@angular/forms";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
 
 import { MainService } from "../../services/main.service";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
-import { NzMessageService } from "ng-zorro-antd";
-import { format } from "date-fns";
 @Component({
   selector: "app-workorder-message",
   templateUrl: "./workorder-message.component.html",
@@ -24,7 +17,6 @@ export class WorkorderMessageComponent implements OnInit {
   })
   osComponentRef1: OverlayScrollbarsComponent;
   constructor(
-    private message: NzMessageService,
     private fb: FormBuilder,
     private mainService: MainService,
     private route: ActivatedRoute,
@@ -75,18 +67,20 @@ export class WorkorderMessageComponent implements OnInit {
       },
     };
     this.loading1 = true;
-    this.mainService.getWorkorderMessage(postData).subscribe((data) => {
-      this.loading1 = false;
-      if (data["status"] == 200) {
-        this.listOfData = data["list"].data;
-        this.listOfData.forEach((item) => {
-          item.applicableShiftName = Object.values(
-            JSON.parse(item.applicableShift)
-          ).join("，");
-        });
-        this.listLength = data["totalNum"];
-      }
-    });
+    this.mainService
+      .getFetchDataList("simple/data", "WorkOrderMessageSettings", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data["status"] == 200) {
+          this.listOfData = data["list"].data;
+          this.listOfData.forEach((item) => {
+            item.applicableShiftName = Object.values(
+              JSON.parse(item.applicableShift)
+            ).join("，");
+          });
+          this.listLength = data["totalNum"];
+        }
+      });
   }
   //关闭编辑弹框
   hideAddModal() {
@@ -125,17 +119,19 @@ export class WorkorderMessageComponent implements OnInit {
         id: this.dataContent.id,
       },
     };
-    this.mainService.updateWorkorderMessage(postData).subscribe((data) => {
-      this.btnLoading = false;
-      this.hideAddModal();
-      this.initForm();
-      if (data["status"] == 200) {
-        this.listLength++;
-        this.showPromptModal("修改", true, "");
-      } else {
-        this.showPromptModal("修改", false, data["msg"]);
-      }
-    });
+    this.mainService
+      .simplePost("addData", "WorkOrderMessageSettings", postData)
+      .subscribe((data) => {
+        this.btnLoading = false;
+        this.hideAddModal();
+        this.initForm();
+        if (data["status"] == 200) {
+          this.listLength++;
+          this.showPromptModal("修改", true, "");
+        } else {
+          this.showPromptModal("修改", false, data["msg"]);
+        }
+      });
   }
   // 获取班次
   getScheduleClass() {
@@ -210,15 +206,17 @@ export class WorkorderMessageComponent implements OnInit {
           id: this.dataContent.id,
         },
       };
-      this.mainService.updateWorkorderMessage(postData).subscribe((data) => {
-        this.btnLoading = false;
-        this.delModal = false;
-        if (data["status"] == 200) {
-          this.showPromptModal(this.tipsMsg2, true, "");
-        } else {
-          this.showPromptModal(this.tipsMsg2, false, data["msg"]);
-        }
-      });
+      this.mainService
+        .simplePost("addData", "WorkOrderMessageSettings", postData)
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data["status"] == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data["msg"]);
+          }
+        });
     }
   }
 }

src/assets/js/http.js

@@ -6,6 +6,7 @@ module.exports = {
   host: protocolName + '//' + domainName + ':' + port + '/service',//测试接口
   specimenViewHost: protocolName + '//' + domainName + ':' + port + '/specimenView',//业务视图
   bigScreenHost: protocolName + '//' + domainName + ':' + port + '/largeScreen',//大屏地址
+  bigScreenHost2: protocolName + '//' + domainName + ':' + port + '/largeScreen2',//大屏地址2
   homeWs: wsName + '://' + domainName + ':8080/webSocket/index',//websocket首页
   mainWs: wsName + '://' + domainName + ':8080/webSocket/message/manage',//websocket管理端
   nurseWs: wsName + '://' + domainName + ':8080/webSocket/message/nurse',//websocket护士端