解决冲突

src/app/app-routing.module.ts

@@ -13,6 +13,8 @@ import { PharmacyGuard } from './guard/pharmacy.guard';
 import { SpecimenView2Guard } from './guard/SpecimenView2Guard.guard';
 // 全局业务查看权限
 import { DisinfectionSupplyGuard } from './guard/DisinfectionSupplyGuard.guard';
+// 配置中心查看权限
+import { ConfigurationCenterGuard } from './guard/ConfigurationCenter.guard';
 
 const routes: Routes = [
   // 默认
@@ -73,6 +75,12 @@ const routes: Routes = [
     loadChildren: () => import('./views/disinfection-supply/disinfection-supply.module').then(m => m.DisinfectionSupplyModule),
     canActivate: [DisinfectionSupplyGuard]
   },
+  // 配置中心查看
+  {
+    path: 'configurationCenter',
+    loadChildren: () => import('./views/configuration-center/configuration-center.module').then(m => m.ConfigurationCenterModule),
+    canActivate: [ConfigurationCenterGuard]
+  },
   // 问卷预览
   {
     path: "preview",

src/app/guard/ConfigurationCenter.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ConfigurationCenterGuard 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 == 'configurationCenter');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/pipes/data-to-name.pipe.ts

@@ -6,7 +6,6 @@ import { Pipe, PipeTransform } from '@angular/core';
 export class DataToNamePipe implements PipeTransform {
 
   transform(value: any[], ...args: any[]): any {
-    console.log(args)
     if(Array.isArray(value)){
       return value.map(v => v[args[0]]).join(args[1]);
     }else{

src/app/services/main.service.ts

@@ -833,11 +833,17 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-	
+  // 配置中心
+	incidentPost(type, data): any {
+	  return this.http.post(host.host + "/incident/" + type, data, {
+	    headers: this.headers,
+	  });
+	}
 	// 发药批次-配置科室数据
 	getConsumeDept(data): any {
 	  return this.http.post(host.host + "/infusion/solutions/getConsumeDept", data, {
 	    headers: this.headers,
 	  });
 	}
+
 }

src/app/services/tool.service.ts

@@ -188,6 +188,9 @@ export class ToolService {
 				case "upgrade":
 				  coopBtns.upgrade = true; //升级
 				  break;
+        case "commonFault":
+          coopBtns.commonFault = true; //常见故障
+          break;
       }
     });
     console.log(coopBtns);
@@ -241,4 +244,45 @@ export class ToolService {
     }
     return res;
   }
+
+  /**
+   * @description: 扁平化结构转成树形结构-ng-zorro树形结构专用
+   * @param {*} list 扁平化的数组
+   * @param {*} rootValue 顶级parentKeyName的值
+   * @param {*} parentKeyName 父级字段名称
+   * @param {*} keyName 字段名称
+   * @return {*} 返回树形结构
+   * @author: seimin
+   */
+  tranListToTreeDataLeaf(list:Array<any>, rootValue:any, parentKeyName:string, keyName:string = 'id'):Array<any> {
+    return list.filter((t) => {
+      let children = this.tranListToTreeData(list, t[keyName], parentKeyName, keyName);
+      if(!children.length){
+        t.isLeaf = true;
+      }
+      return t[parentKeyName] === rootValue
+      ? (t.children = children)
+      : false
+    });
+  }
+
+  /**
+   * @description: 树形结构根据id回显-ng-zorro树形结构专用
+   * @param {*} list 扁平化的数组
+   * @param {*} rootValue 顶级parentKeyName的值
+   * @param {*} parentKeyName 父级字段名称
+   * @param {*} keyName 字段名称
+   * @return {*} 返回树形结构
+   * @author: seimin
+   */
+  tranListToTreeDataFindIdsLeaf(tree: Array<any>, id: number, arr = []):Array<number> {
+    let list = this.tranTreeToListData(tree);
+    console.log(list)
+    let obj = list.find(v => v.id === id);
+    arr.unshift(id);
+    if(obj.parentId){
+      this.tranListToTreeDataFindIdsLeaf(tree, obj.parentId, arr);
+    }
+    return arr;
+  }
 }

src/app/share/assets-product-management-prompt-modal/assets-product-management-prompt-modal.component.html

@@ -0,0 +1,82 @@
+<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
+  <div class="modalBody">
+    <div class="title">常见故障配置<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="list-template content">
+      <div class="list-template__content">
+        <div class="list-template__top" nz-row>
+          <div nz-col nzXl='19' class="list-template__searchBox">
+
+          </div>
+          <div nz-col nzLg="5" class="list-template__btns">
+            <button nz-button class="btn default mr8" (click)="addModal()">新增</button>
+          </div>
+        </div>
+        <div class="list-template__bottom">
+          <nz-table class="hospitalTable list-template__nzTable" [nzData]="historySpecimenList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="hsLoading" [nzScroll]="{ y: '506px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="25%">关联故障现象</th>
+                <th nzWidth="25%">别名</th>
+                <th nzWidth="25%">状态</th>
+                <th nzWidth="25%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of historySpecimenList;let i = index;">
+                <td>{{ data.incidentCategoryDTO?.category }}</td>
+                <td>{{ data.alias }}</td>
+                <td>{{ data.status?.name }}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal($event, data,'您确认要删除吗？','删除','del')">删除</span>
+                    <span (click)="showDelModal($event, data, data.status.value == 1 ? '您确认要停用吗？' : '您确认要启动吗？', data.status.value == 1 ? '停用' : '启用', 'switch', data.status.value == 1)">{{data.status.value == 1 ? '停用' : '启用'}}</span>
+                    <span (click)="edit($event, data)">编辑</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">
+        知道了
+      </button>
+    </div>
+  </div>
+</div>
+
+<!-- 新增/编辑模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modal">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="incidentCategoryId">故障现象</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择故障现象!">
+            <nz-cascader [nzOptions]="incidentCategoryList" formControlName="incidentCategoryId" nzPlaceHolder="请选择故障现象"></nz-cascader>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="alias">别&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请输入别名!">
+            <nz-input-group>
+                <input formControlName="alias" nz-input placeholder="请输入别名">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitAddForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>

src/app/share/assets-product-management-prompt-modal/assets-product-management-prompt-modal.component.less

@@ -0,0 +1,331 @@
+@import "../../../../src/theme.less";
+.list-template__top{
+  padding: 8px 0!important;
+}
+
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+  .hospitalTable {
+    width: 100%;
+    padding: 0;
+    td {
+      text-align: center !important;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 950px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .list-template{
+      padding: 0!important;
+    }
+
+    .list-template__bottom{
+      border: none!important;
+      padding: 0!important;
+    }
+
+    .content {
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      // align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        margin: 0;
+      }
+      button{
+        margin-top: 0!important;
+        margin-left: 0!important;
+      }
+      .formItem{
+        text-align: left!important;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          // margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/share/assets-product-management-prompt-modal/assets-product-management-prompt-modal.component.ts

@@ -0,0 +1,259 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { FormGroup, Validators, FormBuilder } from '@angular/forms';
+
+@Component({
+  selector: 'app-assets-product-management-prompt-modal',
+  templateUrl: './assets-product-management-prompt-modal.component.html',
+  styleUrls: ['./assets-product-management-prompt-modal.component.less']
+})
+export class AssetsProductManagementPromptModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  hsLoading = false;
+  historySpecimenList: any = [];
+
+  currentHospital; //当前院区
+  @Input() show: Boolean;
+  @Input() id: Number;
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private fb: FormBuilder,
+  ) { }
+
+  ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.getList();
+    this.getIncidentCategoryList();
+  }
+
+  // 获取故障现象
+  incidentCategoryList:any[] = [];
+  getIncidentCategoryList(){
+    if(!this.currentHospital.type || (this.currentHospital.type && this.currentHospital.type.value !== '6')){
+      this.incidentCategoryList = [];
+      return;
+    };
+    let postData = {
+      category: {
+        dutyIds: this.currentHospital.type.value === '6' ? this.currentHospital.id.toString()  : undefined,
+      },
+    };
+    this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
+      let incidentCategoryList = res.data || [];
+      incidentCategoryList = incidentCategoryList.map(v => ({...v, parentId: v.parent ? v.parent.id : undefined, label: v.category, value: v.id}));
+      this.incidentCategoryList = this.tool.tranListToTreeDataLeaf(incidentCategoryList, undefined, "parentId");
+      console.log(this.incidentCategoryList);
+    })
+  }
+
+  // 编辑
+  edit(e, data) {
+    e.stopPropagation();
+    console.log(data);
+    this.initForm();
+    this.modelName = "编辑";
+    this.add = false;
+    this.modal = true;
+    this.coopData = data;
+    this.validateForm.controls.alias.setValue(data.alias);
+    this.validateForm.controls.incidentCategoryId.setValue(this.tool.tranListToTreeDataFindIdsLeaf(this.incidentCategoryList, data.incidentCategoryId));
+  }
+
+  // 新增弹框
+  modelName = ""; //模态框名称
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  addModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modal = true;
+    this.initForm();
+  }
+  //关闭新增/编辑弹框
+  hideAddModal() {
+    this.modal = false;
+    this.initForm();
+  }
+
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      alias: ['', [Validators.required, Validators.pattern(/\S/)]],
+      incidentCategoryId: [null, [Validators.required]],
+    });
+  }
+
+  // 新增/编辑表单提交
+  btnLoading:boolean = false;
+  submitAddForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    console.log(this.validateForm.value)
+
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        // assetProductIncidentCategory: {
+          hosId: this.currentHospital.id,
+          alias: this.validateForm.value.alias,
+          productId: this.id,
+          incidentCategoryId: this.validateForm.value.incidentCategoryId.length ? this.validateForm.value.incidentCategoryId.slice(-1)[0] : undefined,
+        // }
+      };
+    } else {
+      //编辑
+      postData = {
+        // assetProductIncidentCategory:{
+          ...this.coopData,
+          ...{
+            hosId: this.currentHospital.id,
+            alias: this.validateForm.value.alias,
+            productId: this.id,
+            incidentCategoryId: this.validateForm.value.incidentCategoryId.length ? this.validateForm.value.incidentCategoryId.slice(-1)[0] : undefined,
+          }
+        // }
+      };
+    }
+    console.log(postData);
+    this.mainService
+      .simplePost("addData", "assetProductIncidentCategory", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideAddModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, "");
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList();
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  confirmDelIsSwitch: boolean; //启用/停用
+  showDelModal(
+    e,
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+    isSwitch?: boolean
+  ) {
+    e.stopPropagation();
+    this.confirmDelIsSwitch = isSwitch;
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "assetProductIncidentCategory", [this.coopData.id])
+        .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);
+          }
+        });
+    } else if (this.confirmDelType === "switch") {
+      //启用/停用
+      let postData = {
+        // assetProductIncidentCategory:{
+          ...this.coopData,
+          ...{
+            status: { key: 'product_category_status', value: this.confirmDelIsSwitch ? '0' : '1' },
+          }
+        // }
+      };
+      console.log(postData);
+      this.mainService
+        .simplePost("addData", "assetProductIncidentCategory", 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);
+          }
+        });
+    }
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+  // 获取列表数据
+  getList() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      assetProductIncidentCategory: {
+        productId: this.id,
+        hosId: this.currentHospital.id,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList("data", "assetProductIncidentCategory", postData).subscribe(data => {
+      this.hsLoading = false;
+      this.historySpecimenList = data.list || [];
+    })
+  }
+}
+
+

src/app/share/share.module.ts

@@ -13,6 +13,7 @@ import { HsPromptModalComponent } from './hs-prompt-modal/hs-prompt-modal.compon
 import { HistoryPromptModalComponent } from './history-prompt-modal/history-prompt-modal.component';
 import { InspectionConfigurationItemPromptModalComponent } from './inspection-configuration-item-prompt-modal/inspection-configuration-item-prompt-modal.component';
 import { InspectionAddressDepartmentPromptModalComponent } from './inspection-address-department-prompt-modal/inspection-address-department-prompt-modal.component';
+import { AssetsProductManagementPromptModalComponent } from './assets-product-management-prompt-modal/assets-product-management-prompt-modal.component';
 import { InspectionTemplatePromptModalComponent } from './inspection-template-prompt-modal/inspection-template-prompt-modal.component';
 import { InspectionAddressTagPromptModalComponent } from './inspection-address-tag-prompt-modal/inspection-address-tag-prompt-modal.component';
 import { InspectionExecuteAssignPromptModalComponent } from './inspection-execute-assign-prompt-modal/inspection-execute-assign-prompt-modal.component';
@@ -70,6 +71,7 @@ import { wangEditorComponent } from './wang-editor/wang-editor.component';
     HistoryPromptModalComponent,
     InspectionConfigurationItemPromptModalComponent,
     InspectionAddressDepartmentPromptModalComponent,
+    AssetsProductManagementPromptModalComponent,
     InspectionTemplatePromptModalComponent,
     InspectionAddressTagPromptModalComponent,
     InspectionExecuteAssignPromptModalComponent,
@@ -132,6 +134,7 @@ import { wangEditorComponent } from './wang-editor/wang-editor.component';
     HistoryPromptModalComponent,
     InspectionConfigurationItemPromptModalComponent,
     InspectionAddressDepartmentPromptModalComponent,
+    AssetsProductManagementPromptModalComponent,
     InspectionTemplatePromptModalComponent,
     InspectionAddressTagPromptModalComponent,
     InspectionExecuteAssignPromptModalComponent,

src/app/views/assets-info/assets-info-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { AssetsInfoComponent } from './assets-info.component';
+
+
+const routes: Routes = [
+  { path: '', component: AssetsInfoComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AssetsInfoRoutingModule { }

src/app/views/assets-info/assets-info.component.html

@@ -0,0 +1,231 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label" style="width: 100px;">资产编码|SN号</span>：
+          <input nz-input class="formItem" placeholder="请输入资产编码|SN号" [(ngModel)]="searchDto.searchKey" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">资产名称</span>：
+          <input nz-input class="formItem" placeholder="请输入资产名称" [(ngModel)]="searchDto.name" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">状态</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择状态" [(ngModel)]="searchDto.status">
+            <ng-container *ngFor="let option of dispatchMethods">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">使用科室</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeInp('search', 'department', $event)" nzAllowClear nzPlaceHolder="请选择使用科室" [(ngModel)]="searchDto.deptId">
+            <ng-container *ngFor="let option of departmentSearchList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzLg="8" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="12%">资产编号|SN号</th>
+            <th nzWidth="11%">资产名称</th>
+            <th nzWidth="11%">存放位置</th>
+            <th nzWidth="11%">状态</th>
+            <th nzWidth="11%">入库时间|有效期至</th>
+            <th nzWidth="11%">关联产品</th>
+            <th nzWidth="11%">供应商</th>
+            <th nzWidth="11%">使用科室</th>
+            <th nzWidth="11%">责任部门</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{data.code}}<br>{{data.snCode}}</td>
+            <td>{{data.name}}</td>
+            <td>{{data.buildDTO?.buildingName}}{{data.floorDTO?.floorName}}{{data.address}}</td>
+            <td>{{data.status?.name}}</td>
+            <td>{{data.inTime| date:'yyyy-MM-dd'}}<br>{{data.overTime| date:'yyyy-MM-dd'}}</td>
+            <td>{{data.assetProductDTO?.name}}</td>
+            <td>{{data.supplierDTO?.name}}</td>
+            <td>{{data.deptDTO?.dept}}</td>
+            <td>{{data.duty?.hosName}}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i></div>
+      <div class="content">
+        <form nz-form [formGroup]="validateForm" class="addForm">
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="code">资产编码</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入资产编码!">
+              <nz-input-group>
+                  <input formControlName="code" nz-input placeholder="请输入资产编码">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="snCode">SN号</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入SN号!">
+              <nz-input-group>
+                  <input formControlName="snCode" nz-input placeholder="请输入SN号">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="productId">关联产品</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择关联产品!">
+              <nz-select (nzOnSearch)="changeInp('add', 'assetProduct', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch formControlName="productId" nzPlaceHolder="请选择关联产品" (ngModelChange)="changeAssetProduct($event)" (nzOpenChange)="changeInp('add', 'assetProduct', '')">
+                <ng-container *ngFor="let option of assetProductList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="name">资产名称</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入资产名称!">
+              <nz-input-group>
+                  <input formControlName="name" nz-input placeholder="请输入资产名称">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="buildId">存放位置</nz-form-label>
+            <nz-form-control [nzSpan]="9" nzErrorTip="请选择楼栋!">
+              <nz-select (nzOnSearch)="changeInp('add', 'building', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="buildId" nzPlaceHolder="请选择楼栋" (ngModelChange)="changeBuilding($event)">
+                <ng-container *ngFor="let option of buildingAddList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.buildingName" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+            <nz-form-control [nzSpan]="9" [nzPush]="1" nzErrorTip="请选择楼层!">
+              <nz-select (nzOnSearch)="changeInp('add', 'floor', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="floorId" nzPlaceHolder="请选择楼层">
+                <ng-container *ngFor="let option of floorList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.floorName" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="address">具体位置</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入具体位置!">
+              <nz-input-group>
+                  <input formControlName="address" nz-input placeholder="请输入具体位置">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="status">状态</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择状态!">
+              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="status" nzShowSearch
+                nzPlaceHolder="请选择状态" nzServerSearch>
+                <ng-container *ngFor="let data of dispatchMethods">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="brand">品牌</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入品牌!">
+              <nz-input-group>
+                  <input formControlName="brand" nz-input placeholder="请输入品牌">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="supplierId">供应商</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择供应商!">
+              <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="supplierId" nzPlaceHolder="请选择供应商">
+                <ng-container *ngFor="let option of companyList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="deptId">使用科室</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择使用科室!">
+              <nz-select (nzOnSearch)="changeInp('add', 'department', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="deptId" nzPlaceHolder="请选择使用科室" (nzOpenChange)="changeInp('add', 'department', '')">
+                <ng-container *ngFor="let option of departmentAddList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="dutyId">责任部门</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择责任部门!">
+              <nz-select (nzOnSearch)="changeInp('add', 'hospital', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="dutyId" nzPlaceHolder="请选择责任部门" (nzOpenChange)="changeInp('add', 'hospital', '')">
+                <ng-container *ngFor="let option of dutyList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+        </form>
+      </div>
+      <div class="display_flex justify-content_flex-center">
+        <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+        <button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
+      </div>
+    </div>
+  </div>
+  <!-- 模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

src/app/views/assets-info/assets-info.component.less

@@ -0,0 +1,176 @@
+@import "../../../../src/theme.less";
+
+:host {
+  ::ng-deep .ant-calendar-picker {
+    width: 100% !important;
+  }
+  .list-template__top{
+    overflow: visible!important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          // margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/assets-info/assets-info.component.ts

@@ -0,0 +1,432 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+@Component({
+  selector: "app-assets-info",
+  templateUrl: "./assets-info.component.html",
+  styleUrls: ["./assets-info.component.less"],
+})
+export class AssetsInfoComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  nextSchemeName = ""; //下一个开启的方案名称
+  modelName = ""; //模态框名称
+
+  changeInpSubject = new Subject(); //防抖
+  showDropdown:boolean = false;
+
+  ngOnInit() {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[1] === 'department'){
+        this.getDeparts(v[0], v[2]);
+      } else if(v[1] === 'building'){
+        this.getBuildings(v[0], v[2]);
+      } else if(v[1] === 'floor'){
+        this.getFloors(v[0], v[2], this.validateForm.value.buildId);
+      } else if(v[1] === 'assetProduct'){
+        this.getAssetProductList(v[0], v[2]);
+      } else if(v[1] === 'hospital'){
+        this.getDutyList(v[0], v[2]);
+      }
+    });
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getList(1);
+    this.getDeparts('search', '');
+    this.getDeparts('add', '');
+    this.getAssetProductList('add', '');
+    this.getDutyList('add', '');
+    this.getBuildings('add', '');
+    this.getDispatchMethods();
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.getList(1);
+  }
+
+  // 表格数据
+  searchDto: any = {};
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      asset: {
+        hosId: this.currentHospital.id,
+        ...this.searchDto,
+      },
+    };
+    data.asset.status = data.asset.status ? { id: data.asset.status } : undefined;
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "asset", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 新增弹框
+  addModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modal = true;
+    this.initForm();
+  }
+  //关闭新增/编辑弹框
+  hideAddModal() {
+    this.modal = false;
+    this.initForm();
+  }
+
+  // 初始化新增form表单
+  initForm() {
+    this.floorList = [];
+    this.validateForm = this.fb.group({
+      code: ['', [Validators.required, Validators.pattern(/\S/)]],
+      snCode: ['', [Validators.required, Validators.pattern(/\S/)]],
+      productId: [null, [Validators.required]],
+      name: ['', [Validators.required, Validators.pattern(/\S/)]],
+      buildId: [null, [Validators.required]],
+      floorId: [null, [Validators.required]],
+      address: ['', [Validators.required, Validators.pattern(/\S/)]],
+      status: [null, [Validators.required]],
+      brand: ['', [Validators.required, Validators.pattern(/\S/)]],
+      supplierId: [null, [Validators.required]],
+      deptId: [null, [Validators.required]],
+      dutyId: [null, [Validators.required]],
+    });
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(type, model, e) {
+    this.isLoading = true;
+    this.changeInpSubject.next([type, model, e]);
+  }
+
+  // 获取产品列表
+  assetProductList: any = [];
+  getAssetProductList(type, keyword, init = false) {
+    let postData:any = {
+      assetProduct: {
+        name: keyword,
+        hosId: this.currentHospital.id,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "assetProduct", postData)
+      .subscribe((data) => {
+        this.assetProductList = data.list || [];
+
+        this.isLoading = false;
+      });
+  }
+
+  // 获取所有科室
+  departmentAddList: any = []; //所有所属科室
+  departmentSearchList: any = []; //所有所属科室(搜索)
+  getDeparts(type, keyword, init = false) {
+    let postData:any = {
+      department: {
+        // searchType: 1,// 简单查询
+        dept: keyword,
+        cascadeHosId: this.currentHospital.id,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("data", "department", postData)
+      .subscribe((data) => {
+        if (type == "search") {
+          this.departmentSearchList = data.list;
+        } else if (type == "add") {
+          this.departmentAddList = data.list;
+        }
+
+        this.isLoading = false;
+      });
+  }
+
+  // 获取供应商
+  companyList: any = [];
+
+  // 获取责任部门
+  dutyList: any = [];
+  getDutyList(type, keyword, init = false) {
+    let postData:any = {
+      hospital: {
+        hosName: keyword,
+        type: { key: 'hospital_type', value: '6' },
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "hospital", postData)
+      .subscribe((data) => {
+        this.dutyList = data.list || [];
+
+        this.isLoading = false;
+      });
+  }
+
+  // 获取楼栋
+  buildingAddList: any = [];
+  buildingSearchList: any = [];
+  getBuildings(type, keyword, init = false) {
+    let postData = {
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        cascadeHosId: this.currentHospital.id,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "building", postData)
+      .subscribe((data) => {
+        if (type == "search") {
+          this.buildingSearchList = data.list;
+        } else if (type == "add") {
+          this.buildingAddList = data.list;
+        }
+        this.isLoading = false;
+      });
+  }
+
+  // 修改产品
+  changeAssetProduct(id){
+    let obj = this.assetProductList.find(v => v.id == id);
+    console.log(obj);
+    this.validateForm.controls.brand.setValue(obj.brand);
+    this.companyList = obj.supplierList || [];
+    this.validateForm.controls.supplierId.setValue(null);
+  }
+
+  // 修改楼栋
+  noChangeBuilding:boolean = false;
+  changeBuilding(buildId?){
+    console.log(buildId)
+    if(!this.noChangeBuilding){
+      this.validateForm.controls.floorId.setValue(null);
+      this.getFloors('add', '', this.validateForm.value.buildId);
+    }
+    this.noChangeBuilding = false;
+  }
+
+  // 获取楼层
+  floorList: any = [];
+  getFloors(type, keyword, buildId, init = false, isNoChangeBuilding = false) {
+    console.log(isNoChangeBuilding)
+    if(!buildId){
+      this.floorList = [];
+      return;
+    }
+    let postData = {
+      floor: {
+        floorName: keyword,
+        buildId,
+        // hosId: this.currentHospital.id,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "floor", postData)
+      .subscribe((data) => {
+        this.floorList = data.list;
+        this.isLoading = false;
+      });
+  }
+
+  //获取状态
+  dispatchMethods:any[] = [];
+  getDispatchMethods() {
+    this.isLoading = true;
+    this.mainService.getDictionary("list", "asset_status").subscribe((data) => {
+      this.isLoading = false;
+      this.dispatchMethods = data || [];
+    });
+  }
+
+  // 新增/编辑表单提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    console.log(this.validateForm.value)
+
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        asset: {
+          hosId: this.currentHospital.id,
+          code: this.validateForm.value.code,
+          snCode: this.validateForm.value.snCode,
+          productId: this.validateForm.value.productId,
+          name: this.validateForm.value.name,
+          buildId: this.validateForm.value.buildId,
+          floorId: this.validateForm.value.floorId,
+          address: this.validateForm.value.address,
+          status: { id: this.validateForm.value.status },
+          deptId: this.validateForm.value.deptId,
+          dutyId: this.validateForm.value.dutyId,
+          brand: this.validateForm.value.brand,
+          supplierId: this.validateForm.value.supplierId,
+        }
+      };
+    } else {
+      //编辑
+      postData = {
+        asset:{
+          ...this.coopData,
+          ...{
+            hosId: this.currentHospital.id,
+            code: this.validateForm.value.code,
+            snCode: this.validateForm.value.snCode,
+            productId: this.validateForm.value.productId,
+            name: this.validateForm.value.name,
+            buildId: this.validateForm.value.buildId,
+            floorId: this.validateForm.value.floorId,
+            address: this.validateForm.value.address,
+            status: { id: this.validateForm.value.status },
+            deptId: this.validateForm.value.deptId,
+            dutyId: this.validateForm.value.dutyId,
+            brand: this.validateForm.value.brand,
+            supplierId: this.validateForm.value.supplierId,
+          }
+        }
+      };
+    }
+    this.mainService
+      .coopData("addData", "asset", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideAddModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, "");
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0);
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    e,
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    e.stopPropagation();
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "asset", [this.coopData.id])
+        .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/app/views/assets-info/assets-info.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { AssetsInfoRoutingModule } from './assets-info-routing.module';
+import { AssetsInfoComponent } from './assets-info.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    AssetsInfoComponent
+  ],
+  imports: [
+    CommonModule,
+    AssetsInfoRoutingModule,
+    ShareModule
+  ]
+})
+export class AssetsInfoModule { }

src/app/views/assets-product-management/assets-product-management-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { AssetsProductManagementComponent } from './assets-product-management.component';
+
+
+const routes: Routes = [
+  { path: '', component: AssetsProductManagementComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AssetsProductManagementRoutingModule { }

src/app/views/assets-product-management/assets-product-management.component.html

@@ -0,0 +1,192 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">名称</span>：
+          <input nz-input class="formItem" placeholder="请输入名称" [(ngModel)]="searchDto.name" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">编码</span>：
+          <input nz-input class="formItem" placeholder="请输入编码" [(ngModel)]="searchDto.code" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">大类</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择大类" [(ngModel)]="searchDto.mainType">
+            <ng-container *ngFor="let option of productCategoryTypeListSearch1">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzLg="8" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="8%">编码</th>
+            <th nzWidth="8%">名称</th>
+            <th nzWidth="8%">型号</th>
+            <th nzWidth="8%">品牌</th>
+            <th nzWidth="8%">大类</th>
+            <th nzWidth="8%">小类</th>
+            <th nzWidth="12%">描述</th>
+            <th nzWidth="14%">供应商</th>
+            <th nzWidth="14%">生产商</th>
+            <th nzWidth="12%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{data.code}}</td>
+            <td>{{data.name}}</td>
+            <td>{{data.model}}</td>
+            <td>{{data.brand}}</td>
+            <td>{{data.mainTypeDTO?.name}}</td>
+            <td>{{data.subTypeDTO?.name}}</td>
+            <td>{{data.description}}</td>
+            <td>{{data.supplierList | dataToName:'name':'，'}}</td>
+            <td>{{data.manufacturerList | dataToName:'name':'，'}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.commonFault" (click)="commonFault($event, data)">常见故障</span>
+                <span *ngIf="coopBtns.edit" (click)="edit($event, data)">编辑</span>
+                <span *ngIf="coopBtns.del" (click)="showDelModal($event, data,'您确认要删除吗？','删除','del')">删除</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i></div>
+      <div class="content">
+        <form nz-form [formGroup]="validateForm" class="addForm">
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="name">名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入名称!">
+              <nz-input-group>
+                  <input formControlName="name" nz-input placeholder="请输入名称">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="model">型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入型号!">
+              <nz-input-group>
+                  <input formControlName="model" nz-input placeholder="请输入型号">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="brand">品&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;牌</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入品牌!">
+              <nz-input-group>
+                  <input formControlName="brand" nz-input placeholder="请输入品牌">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="mainType">大&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;类</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择大类!">
+              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="mainType" nzShowSearch
+                nzPlaceHolder="请选择大类" (ngModelChange)="changeMainType($event)">
+                <ng-container *ngFor="let data of productCategoryTypeList1">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzFor="subType">&nbsp;&nbsp;&nbsp;小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;类</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择小类!">
+              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="subType" nzShowSearch
+                nzPlaceHolder="请选择小类">
+                <ng-container *ngFor="let data of productCategoryTypeList2">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzFor="description">&nbsp;&nbsp;&nbsp;描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入描述!">
+              <nz-input-group>
+                <textarea rows="3" nz-input formControlName="description" placeholder="请输入描述"></textarea>
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzFor="supplierIds">&nbsp;&nbsp;&nbsp;供&nbsp;应&nbsp;商</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择供应商!">
+              <nz-select nzMode="multiple" (nzOnSearch)="changeInp('1', 'company', $event)" (nzOpenChange)="openSupplier($event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="supplierIds" nzPlaceHolder="请选择供应商">
+                <ng-container *ngFor="let option of companyList1">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzFor="manufacturerIds">&nbsp;&nbsp;&nbsp;生&nbsp;产&nbsp;商</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择生产商!">
+              <nz-select nzMode="multiple" (nzOnSearch)="changeInp('2', 'company', $event)" (nzOpenChange)="openManufacturer($event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="manufacturerIds" nzPlaceHolder="请选择生产商">
+                <ng-container *ngFor="let option of companyList2">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+        </form>
+      </div>
+      <div class="display_flex justify-content_flex-center">
+        <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+        <button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
+      </div>
+    </div>
+  </div>
+  <!-- 模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 常见故障 -->
+<app-assets-product-management-prompt-modal
+  *ngIf="assetsProductManagementPromptModalShow"
+  [show]="assetsProductManagementPromptModalShow"
+  [id]="commonFaultId"
+  (closeModelHs)="closeModelAssetsProductManagement($event)"
+></app-assets-product-management-prompt-modal>

src/app/views/assets-product-management/assets-product-management.component.less

@@ -0,0 +1,179 @@
+@import "../../../../src/theme.less";
+
+:host {
+  ::ng-deep .ant-calendar-picker {
+    width: 100% !important;
+  }
+  .list-template__top{
+    overflow: visible!important;
+  }
+  textarea {
+    margin: 4px 0;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          // margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/assets-product-management/assets-product-management.component.ts

@@ -0,0 +1,388 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+@Component({
+  selector: "app-assets-product-management",
+  templateUrl: "./assets-product-management.component.html",
+  styleUrls: ["./assets-product-management.component.less"],
+})
+export class AssetsProductManagementComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  modelName = ""; //模态框名称
+
+  changeInpSubject = new Subject(); //防抖
+  showDropdown:boolean = false;
+
+  ngOnInit() {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[1] === 'company'){
+        this.getCompanyList(v[0], v[2]);
+      }
+    });
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getList(1);
+    this.getProductCategoryTypeList(1);
+    this.getProductCategoryTypeList(1, 'Search');
+    this.getCompanyTypeList();
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 常见故障
+  commonFaultId:any;
+  commonFault(e, data){
+    e.stopPropagation();
+    this.commonFaultId = data.id;
+    this.showAssetsProductManagementDepartment();
+  }
+
+  // 常见故障
+  assetsProductManagementPromptModalShow = false;
+  showAssetsProductManagementDepartment() {
+    this.assetsProductManagementPromptModalShow = true;
+  }
+  // 关闭弹窗
+  closeModelAssetsProductManagement(e) {
+    this.assetsProductManagementPromptModalShow = JSON.parse(e).show;
+  }
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.getList(1);
+  }
+
+  // 表格数据
+  searchDto: any = {};
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      assetProduct: {
+        hosId: this.currentHospital.id,
+        ...this.searchDto,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "assetProduct", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 新增弹框
+  addModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modal = true;
+    this.initForm();
+  }
+  //关闭新增/编辑弹框
+  hideAddModal() {
+    this.modal = false;
+    this.initForm();
+  }
+
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      name: ['', [Validators.required, Validators.pattern(/\S/)]],
+      model: ['', [Validators.required, Validators.pattern(/\S/)]],
+      brand: ['', [Validators.required, Validators.pattern(/\S/)]],
+      mainType: [null, [Validators.required]],
+      subType: [null],
+      description: [''],
+      supplierIds: [[]],
+      manufacturerIds: [[]],
+    });
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(type, model, e) {
+    this.isLoading = true;
+    this.changeInpSubject.next([type, model, e]);
+  }
+
+  openSupplier(flag){
+    if(flag){
+      this.getCompanyList('1');
+    }
+  }
+
+  openManufacturer(flag){
+    if(flag){
+      this.getCompanyList('2');
+    }
+  }
+
+  // 获取三方公司
+  companyList1: any = [];//供应商
+  companyList2: any = [];//生产商
+  getCompanyList(type, keyword = '') {
+    this.isLoading = true;
+    let postData:any = {
+      company: {
+        name: keyword,
+        busiType: {key: "company_busi_type", value: "2"},
+        hosId: this.currentHospital.id,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    let dictionary = this.companyTypeList.find(v => v.value == type);
+    if(!dictionary){
+      this['companyList' + type] = [];
+      return;
+    }
+    postData.company.companyTypeIds = dictionary.id.toString();
+    this.mainService
+      .getFetchDataList("simple/data", "company", postData)
+      .subscribe((data) => {
+        this['companyList' + type] = data.list || [];
+        this.isLoading = false;
+      });
+  }
+
+  //获取大类/小类
+  productCategoryTypeList1:any[] = [];
+  productCategoryTypeListSearch1:any[] = [];
+  productCategoryTypeList2:any[] = [];
+  getProductCategoryTypeList(level:number, type:string = '') {
+    this.isLoading = true;
+    let postData = {
+      dictionaryTree: {
+        deleted: 0,
+        level,
+        parent: level == 1 ? undefined : this.validateForm.value.mainType,
+        key: 'product_category_type',
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "dictionaryTree", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this['productCategoryTypeList' + type + level] = data.list || [];
+      });
+  }
+
+  // 获取三方公司公司分类
+  companyTypeList:any[] = [];
+  getCompanyTypeList(){
+    this.mainService.getDictionary("list", "company_type").subscribe((data) => {
+      this.companyTypeList = data || [];
+      this.getCompanyList('1');
+      this.getCompanyList('2');
+    });
+  }
+
+  // 修改大类
+  changeMainType(id){
+    console.log(id);
+    this.validateForm.controls.subType.setValue(null);
+    this.productCategoryTypeList2 = [];
+
+    this.getProductCategoryTypeList(2);
+  }
+
+  // 新增/编辑表单提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    console.log(this.validateForm.value)
+
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        // assetProduct: {
+          hosId: this.currentHospital.id,
+          name: this.validateForm.value.name,
+          model: this.validateForm.value.model,
+          brand: this.validateForm.value.brand,
+          mainType: this.validateForm.value.mainType,
+          subType: this.validateForm.value.subType || undefined,
+          description: this.validateForm.value.description,
+          supplierIds: this.validateForm.value.supplierIds.length ? this.validateForm.value.supplierIds.toString() : undefined,
+          manufacturerIds: this.validateForm.value.manufacturerIds.length ? this.validateForm.value.manufacturerIds.toString() : undefined,
+        // }
+      };
+    } else {
+      //编辑
+      postData = {
+        // assetProduct:{
+          ...this.coopData,
+          ...{
+            hosId: this.currentHospital.id,
+            name: this.validateForm.value.name,
+            model: this.validateForm.value.model,
+            brand: this.validateForm.value.brand,
+            mainType: this.validateForm.value.mainType,
+            subType: this.validateForm.value.subType || undefined,
+            description: this.validateForm.value.description,
+            supplierIds: this.validateForm.value.supplierIds.length ? this.validateForm.value.supplierIds.toString() : undefined,
+            manufacturerIds: this.validateForm.value.manufacturerIds.length ? this.validateForm.value.manufacturerIds.toString() : undefined,
+          }
+        // }
+      };
+    }
+    console.log(postData);
+    this.mainService
+      .simplePost("addData", "assetProduct", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideAddModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, "");
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 编辑
+  edit(e, data) {
+    e.stopPropagation();
+    console.log(data);
+    this.initForm();
+    this.modelName = "编辑";
+    this.add = false;
+    this.modal = true;
+    this.coopData = data;
+    this.validateForm.controls.name.setValue(data.name);
+    this.validateForm.controls.model.setValue(data.model);
+    this.validateForm.controls.brand.setValue(data.brand);
+    this.validateForm.controls.mainType.setValue(data.mainType ? data.mainType.toString() : null);
+    this.validateForm.controls.subType.setValue(data.subType ? data.subType.toString() : null);
+    this.validateForm.controls.description.setValue(data.description);
+    this.validateForm.controls.supplierIds.setValue(Array.isArray(data.supplierList) ? data.supplierList.map(v => v.id) : []);
+    this.validateForm.controls.manufacturerIds.setValue(Array.isArray(data.manufacturerList) ? data.manufacturerList.map(v => v.id) : []);
+
+    if(data.supplierList){
+      this.companyList1 = data.supplierList || [];
+    }
+    if(data.manufacturerList){
+      this.companyList2 = data.manufacturerList || [];
+    }
+    if(data.mainType){
+      this.getProductCategoryTypeList(2);
+    }
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0);
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    e,
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    e.stopPropagation();
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "assetProduct", [this.coopData.id])
+        .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/app/views/assets-product-management/assets-product-management.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { AssetsProductManagementRoutingModule } from './assets-product-management-routing.module';
+import { AssetsProductManagementComponent } from './assets-product-management.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    AssetsProductManagementComponent
+  ],
+  imports: [
+    CommonModule,
+    AssetsProductManagementRoutingModule,
+    ShareModule
+  ]
+})
+export class AssetsProductManagementModule { }

src/app/views/configuration-center/configuration-center-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ConfigurationCenterComponent } from './configuration-center.component';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ConfigurationCenterComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ConfigurationCenterRoutingModule { }
+

src/app/views/configuration-center/configuration-center.component.html

@@ -0,0 +1,371 @@
+<div class="configurationCenter">
+  <div class="tagsAndTemplete">
+    <div class="tags">
+      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;事件配置</div>
+      <div class="tagList">
+        <span *ngFor="let tag of tagList" [ngClass]="{ active: activeTagId === tag.id }" (click)="clickTag(tag)">{{ tag.name }}</span>
+      </div>
+      <button nz-button class="btn default" (click)="goBack()">返回</button>
+    </div>
+  </div>
+  <!-- 故障现象 -->
+  <ng-container *ngIf="activeTagId === 1">
+    <div class="hospitalConfig">
+      <nz-radio-group [(ngModel)]="hospitalConfig" (ngModelChange)="changeHospitalConfig($event)">
+        <label nz-radio [nzValue]="item.id" *ngFor="let item of hospitalConfigList">{{ item.name }}</label>
+      </nz-radio-group>
+    </div>
+
+    <div class="content">
+      <div class="contentInner">
+        <div class="address">
+          <div class="contentHead">一级故障现象<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button></div>
+          <overlay-scrollbars #osComponentRef1 class="contentBody">
+            <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
+            <div [hidden]="categoryLoading1" class="contentItem" [title]="item.category" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.category }}</div>
+          </overlay-scrollbars>
+        </div>
+        <div class="address">
+          <div class="contentHead">二级故障现象<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button></div>
+          <overlay-scrollbars #osComponentRef2 class="contentBody">
+            <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
+            <div [hidden]="categoryLoading2" class="contentItem" [title]="item.category" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.category }}</div>
+          </overlay-scrollbars>
+        </div>
+        <div class="address">
+          <div class="contentHead">三级故障现象<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory2.id" (click)="addCategoryModal(3)">新增</button></div>
+          <overlay-scrollbars #osComponentRef3 class="contentBody">
+            <nz-spin nzSimple [nzSpinning]="categoryLoading3" class="mt8 text_align_center"></nz-spin>
+            <div [hidden]="categoryLoading3" class="contentItem" [title]="item.category" [ngClass]="{ active: item.id === activeCategory3.id }" (click)="clickCategory(item, 3)" *ngFor="let item of categoryList3">{{ item.category }}</div>
+          </overlay-scrollbars>
+        </div>
+        <div class="addressAssign">
+          <div class="contentHead">
+            <div class="title" title="{{activeCategory1.category}}{{activeCategory2.category ? ' - ' + activeCategory2.category : ''}}{{activeCategory3.category ? ' - ' + activeCategory3.category : ''}}">{{activeCategory1.category}}{{activeCategory2.category ? ' - ' + activeCategory2.category : ''}}{{activeCategory3.category ? ' - ' + activeCategory3.category : ''}}</div>
+            <div class="btns" *ngIf="activeCategory1.id || activeCategory2.id || activeCategory3.id">
+              <button nz-button nzType="primary" nzSize="small" (click)="showDelModal(data, hospitalConfig === 1 ? '您确认向下复制您的配置信息吗？' : '您确认向下复制您的配置吗？将会移除各科室的配置，使用当前配置进行覆盖。','向下复制','copy')" *ngIf="currentChildrenCategoryList">向下复制</button>
+              <button nz-button nzType="primary" nzSize="small" class="ml8" *ngIf="hospitalConfig === 2" (click)="addConfigModal()">新增</button>
+            </div>
+          </div>
+          <div class="contentBody" id="categoryTable">
+            <div class="list-template">
+              <div class="list-template__content">
+                <div class="list-template__bottom">
+                  <nz-table class="list-template__nzTable" [nzData]="categoryConfigList" nzSize="middle" [nzShowPagination]="false"
+                    [nzLoading]="loading1" [nzScroll]="{ y: tableCategoryHeight + 'px' }">
+                    <thead>
+                      <tr class="thead">
+                        <th nzWidth="16%">院区</th>
+                        <th nzWidth="16%">责任部门</th>
+                        <th nzWidth="16%">优先级</th>
+                        <th nzWidth="16%">积分</th>
+                        <th nzWidth="16%">维修人|组</th>
+                        <th nzWidth="20%">操作</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr *ngFor="let data of categoryConfigList;let i = index">
+                        <td>{{data.hospitalDTO?.hosName}}</td>
+                        <td>{{data.dutyDTO?.hosName}}</td>
+                        <td>{{data.priorityDTO?.name}}</td>
+                        <td>{{data.score?.value}}</td>
+                        <td>{{data.userGroup === 1 ? data.userDTO?.name : (data.userGroup === 2 ? data.groupDTO?.groupName : '')}}</td>
+                        <td>
+                          <div class="coop">
+                            <span (click)="showDelModal(data,'您确认要删除吗？','删除','delConfig')">删除</span>
+                            <span (click)="editConfig(data)">编辑</span>
+                          </div>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </nz-table>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+  <!-- 优先级 -->
+  <ng-container *ngIf="activeTagId === 2">
+    <div class="content priority">
+      <div class="contentInner">
+        <div class="list-template" id="priorityTable">
+          <div class="list-template__content">
+            <div class="list-template__bottom">
+              <div class="list-template__top" nz-row>
+                <div nz-col nzLg="24" class="list-template__btns">
+                  <button nz-button class="btn default" (click)="addPriorityModal()">新增</button>
+                </div>
+              </div>
+              <nz-table class="list-template__nzTable" [nzData]="priorityList" nzSize="middle" [nzShowPagination]="false"
+                [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
+                <thead>
+                  <tr class="thead">
+                    <th nzWidth="20%">优先级名称</th>
+                    <th nzWidth="20%">排序</th>
+                    <th nzWidth="20%">响应时间（分钟）</th>
+                    <th nzWidth="20%">解决时间（分钟）</th>
+                    <th nzWidth="20%">操作</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr *ngFor="let data of priorityList;let i = index">
+                    <td>{{data.name}}</td>
+                    <td>{{data.orders}}</td>
+                    <td>{{data.responseTime}}</td>
+                    <td>{{data.handleTime}}</td>
+                    <td>
+                      <div class="coop">
+                        <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
+                        <span (click)="editPriority(data)">编辑</span>
+                      </div>
+                    </td>
+                  </tr>
+                </tbody>
+              </nz-table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+  <!-- 数据字典 -->
+  <ng-container *ngIf="activeTagId === 3">
+    <div class="content" id="dictionary">
+      <div class="contentInner">
+        <div class="address">
+          <overlay-scrollbars #osComponentRef5 class="contentBody">
+            <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.id === activeDictionaryKey.id }" (click)="clickDictionaryKey(item)" *ngFor="let item of dictionaryKeyList">{{ item.name }}</div>
+          </overlay-scrollbars>
+        </div>
+        <div class="addressAssign">
+          <div class="contentBody">
+            <div class="dictionaryRow">
+              <div class="name">键</div>
+              <div class="value">值</div>
+            </div>
+            <form nz-form [formGroup]="validateDictionaryForm" class="w100">
+              <div class="dictionaryRow" *ngFor="let data of dictionaryList;let i = index;">
+                <div class="name">
+                  <nz-form-item>
+                    <nz-form-control [nzSpan]="24" nzErrorTip="请输入键!">
+                      <nz-input-group>
+                        <input [formControlName]="'name_' + data.id" nz-input class="nameInput">
+                      </nz-input-group>
+                    </nz-form-control>
+                  </nz-form-item>
+                </div>
+                <div class="value">
+                  <nz-form-item>
+                    <nz-form-control [nzSpan]="24" nzErrorTip="请输入值!">
+                      <nz-input-group>
+                        <nz-input-number [formControlName]="'value_' + data.id" class="valueInput"></nz-input-number>
+                      </nz-input-group>
+                    </nz-form-control>
+                  </nz-form-item>
+                  <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)"></i>
+                  <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1" (click)="removeField(data, i)"></i>
+                </div>
+              </div>
+            </form>
+          </div>
+          <div class="contentBtns">
+            <button nz-button nzType="primary" class="ml8" (click)="saveDictionary()">保存</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+</div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 新增/编辑优先级模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalPriority">
+  <div class="modalBody">
+    <div class="title">{{modelName}}优先级<i class="icon_transport transport-guanbi" (click)="hidePriorityModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validatePriorityForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="name">优先级名称</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入优先级名称!">
+            <nz-input-group>
+              <input formControlName="name" nz-input placeholder="请输入优先级名称">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="orders">排&nbsp;&nbsp;&nbsp;序&nbsp;&nbsp;&nbsp;号</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入排序号!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="orders" nzPlaceHolder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="responseTime">响&nbsp;应&nbsp;时&nbsp;间</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入响应时间（分钟）!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="responseTime" nzPlaceHolder="请输入响应时间（分钟）" [nzMin]="0" [nzStep]="1" [nzPrecision]="0" [nzFormatter]="formatterMinute" [nzParser]="parserMinute"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="handleTime">解&nbsp;决&nbsp;时&nbsp;间</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入解决时间（分钟）!">
+            <nz-input-group>
+              <nz-input-number class="w100" formControlName="handleTime" nzPlaceHolder="请输入解决时间（分钟）" [nzMin]="0" [nzStep]="1" [nzPrecision]="0" [nzFormatter]="formatterMinute" [nzParser]="parserMinute"></nz-input-number>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitPriorityForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 新增/编辑故障现象模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalCategory">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideCategoryModal()"></i></div>
+    <div class="content">
+      <div class="tips" *ngIf="coopType === 1">您将添加一级故障现象，请输入故障现象</div>
+      <div class="tips" *ngIf="coopType === 2">您将在“<span class="red">{{activeCategory1.category}}</span>”下新增故障现象，请输入故障现象</div>
+      <div class="tips" *ngIf="coopType === 3">您将在“<span class="red">{{activeCategory1.category}}{{activeCategory2.category ? ' - ' + activeCategory2.category : ''}}</span>”下新增故障现象，请输入故障现象</div>
+      <form nz-form [formGroup]="validateCategoryForm" class="addForm">
+        <nz-form-item>
+          <nz-form-control [nzSpan]="24" nzErrorTip="请输入故障现象名称!">
+            <nz-input-group>
+              <textarea formControlName="name" nz-input placeholder="请输入故障现象名称" [nzAutosize]="{minRows: 3}"></textarea>
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitCategoryForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideCategoryModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 新增/编辑关联模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modalConfig">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideConfigModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateConfigForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="hosId">院区</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择院区!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="hosId" nzShowSearch
+              nzPlaceHolder="请选择院区" nzServerSearch (ngModelChange)="changeHospital($event)" [nzDisabled]="!add">
+              <ng-container *ngFor="let data of hospitalList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.hosName" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="dutyId">责任部门</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择责任部门!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="dutyId" nzShowSearch
+              nzPlaceHolder="请选择责任部门" nzServerSearch (ngModelChange)="changeDuty($event)" [nzDisabled]="!add">
+              <ng-container *ngFor="let data of dutyList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.hosName" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="priority">优先级</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择优先级!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="priority" nzShowSearch
+            nzPlaceHolder="请选择优先级" nzServerSearch>
+              <ng-container *ngFor="let option of priority_c_List">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="score">积分</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择积分!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="score" nzShowSearch
+              nzPlaceHolder="请选择积分" nzServerSearch>
+              <ng-container *ngFor="let data of scoreList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="userGroup">分配方式</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择积分!">
+            <nz-radio-group formControlName="userGroup" (ngModelChange)="changeUserGroup($event)">
+              <label nz-radio [nzValue]="1">人</label>
+              <label nz-radio [nzValue]="2">组</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item *ngIf="validateConfigForm.value.userGroup === 1">
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="userId">维修人</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择维修人!">
+            <nz-select (nzOnSearch)="changeInp('add', 'user', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="userId" nzPlaceHolder="请选择维修人">
+              <ng-container *ngFor="let option of userList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item *ngIf="validateConfigForm.value.userGroup === 2">
+          <nz-form-label [nzSpan]="5" nzRequired nzFor="groupId">维修组</nz-form-label>
+          <nz-form-control [nzSpan]="19" nzErrorTip="请选择维修组!">
+            <nz-select (nzOnSearch)="changeInp('add', 'group', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="groupId" nzPlaceHolder="请选择维修组">
+              <ng-container *ngFor="let option of groupList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitConfigForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideConfigModal()">取消</button>
+    </div>
+  </div>
+</div>
+
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>

src/app/views/configuration-center/configuration-center.component.less

@@ -0,0 +1,388 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+  #dictionary{
+    margin: 24px 16px;
+    .addressAssign{
+      flex: 7;
+    }
+    .contentItem{
+      margin: 0 16px;
+      padding: 8px;
+      text-align: center;
+      &.active{
+        background-color: @primary-color;
+        color: #fff;
+        border-radius: 4px;
+      }
+    }
+    .contentBody{
+      padding: 16px;
+    }
+    ::ng-deep .ant-form-item{
+      margin-bottom: 0;
+    }
+    .dictionaryRow{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 16px;
+      .name{
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+        .nameInput{
+          width: 100px;
+        }
+      }
+      .value{
+        flex: 3;
+        display: flex;
+        align-items: center;
+        .valueInput{
+          width: 600px;
+        }
+        .icon_transport{
+          font-size: 20px;
+          color: #8a8a8a;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  .configurationCenter{
+    padding-bottom: 24px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    background-color: #F0F2F5;
+    .tagsAndTemplete{
+      height: 64px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .tags{
+        height: 100%;
+        background: #fff;
+        flex: 1;
+        padding: 16px 24px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        position: relative;
+        .transport-peizhizhongxin{
+          color: @primary-color;
+          font-size: 20px;
+          margin-right: 8px;;
+        }
+        .tagList{
+          width: 100%;
+          position: absolute;
+          left: 0;
+          top: 50%;
+          transform: translateY(-50%);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          gap: 48px;
+          span{
+            cursor: pointer;
+            &.active{
+              color: @primary-color;
+            }
+          }
+        }
+      }
+    }
+    .hospitalConfig{
+      height: 60px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      gap: 72px;
+    }
+    .content{
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      border: 1px solid #EEF3F9;
+      &.priority{
+        margin: 24px 118px 0;
+        background-color: #fff;
+        .contentInner{
+          padding: 48px 206px;
+          border: 1px solid #E8EBEF;
+        }
+      }
+      .contentItem{
+        padding: 4px 16px;
+        cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        &.active{
+          color: @primary-color;
+          background-color: #F0F6ED;
+          border-radius: 4px;
+        }
+      }
+      .contentInner{
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0 16px;
+        gap: 16px;
+        .contentHead{
+          height: 45px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          gap: 16px;
+          padding: 0 16px;
+          font-size: 16px;
+          font-weight: bold;
+          border-bottom: 1px solid #D9D9D9;
+          .title{
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+          .btns{
+            flex-shrink: 0;
+          }
+        }
+        .contentBody{
+          padding: 0 8px;
+          margin: 4px 0;
+          flex: 1;
+        }
+        .address{
+          flex: 1;
+          height: 100%;
+          background: #FFFFFF;
+          border: 1px solid #E8EBEF;
+          display: flex;
+          flex-direction: column;
+          width: 0;
+        }
+        .addressAssign{
+          flex: 3;
+          height: 100%;
+          background: #FFFFFF;
+          border: 1px solid #E8EBEF;
+          display: flex;
+          flex-direction: column;
+          width: 0;
+        }
+        .list-template__searchItem {
+          margin-bottom: 16px;
+          .label {
+            color: #333;
+            display: inline-block;
+            width: 70px;
+            text-align-last: justify;
+            text-align: justify;
+            &.label--big {
+              width: 100px;
+            }
+          }
+          .formItem {
+            width: 135px;
+          }
+        }
+      }
+      .contentBtns{
+        margin-bottom: 16px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .tips{
+      margin-bottom: 16px!important;
+    }
+
+    .modalBody {
+      width: 350px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+        padding: 16px 0;
+
+        .busyList{
+          display: flex;
+          margin-bottom: 8px;
+          .busyContent{
+            margin-right: 8px;
+            flex: 1;
+          }
+        }
+
+        & > div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            // margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 14px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+        .workAssignmentTips {
+          font-size: 12px;
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 16px;
+          max-height: 497px;
+          overflow-y: auto;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 0;
+
+              .ant-form-item-label {
+                text-align: left;
+              }
+
+              .desc {
+                margin-top: 5px;
+              }
+            }
+
+            .datesControl {
+              margin-top: -16px;
+
+              .ant-form-item-label {
+                line-height: 40px;
+              }
+            }
+
+            .timer {
+              .ant-form-item-label {
+                width: 100%;
+                text-align: left;
+              }
+
+              .numInp {
+                margin-right: 5px;
+              }
+
+              .line {
+                margin-right: 5px;
+              }
+            }
+
+            .timer2 {
+              .ant-form-item-label {
+                line-height: 20px;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 14px;
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/configuration-center/configuration-center.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationCenterRoutingModule } from './configuration-center-routing.module';
+import { ConfigurationCenterComponent } from './configuration-center.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationCenterComponent
+  ],
+  imports: [
+    CommonModule,
+    ConfigurationCenterRoutingModule,
+    ShareModule
+  ]
+})
+export class ConfigurationCenterModule { }

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

@@ -6,9 +6,9 @@
   padding: 16px;
   display: flex;
   flex-direction: column;
-}
-::ng-deep .ant-form-item-label {
-  line-height: 24px !important;
+  ::ng-deep .ant-form-item-label {
+    line-height: 24px !important;
+  }
 }
 
 .fuwutai {

src/app/views/main/main-routing.module.ts

@@ -563,11 +563,29 @@ const routes: Routes = [
         path: "inspectionExecute",
         loadChildren: () => import("../inspection-execute/inspection-execute.module").then((m) => m.InspectionExecuteModule),
       },
+<<<<<<< HEAD
 			// 故障管理-知识库管理
 			{
 			  path: "repositoryManage",
 			  loadChildren: () => import("../repository-manage/repository-manage.module").then((m) => m.RepositoryManageModule),
 			},
+=======
+      // 三方公司
+      {
+        path: "tripartiteCompany",
+        loadChildren: () => import("../tripartite-company/tripartite-company.module").then((m) => m.TripartiteCompanyModule),
+      },
+      // 资产信息
+      {
+        path: "assetsInfo",
+        loadChildren: () => import("../assets-info/assets-info.module").then((m) => m.AssetsInfoModule),
+      },
+      // 产品管理
+      {
+        path: "assetsProductManagement",
+        loadChildren: () => import("../assets-product-management/assets-product-management.module").then((m) => m.AssetsProductManagementModule),
+      },
+>>>>>>> ce9c995986db1c27e0fa1c88d63814fae0b91dcd
     ],
   },
 ];

src/app/views/main/main.component.less

@@ -81,6 +81,7 @@ nz-sider {
     & > i {
       margin-left: 24px;
       margin-right: 10px;
+      font-size: 14px;
     }
     .transport-xialajiantou {
       color: #999;

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

@@ -30,6 +30,7 @@ export class MainComponent implements OnInit {
   specimenViewRole: boolean = false; //业务视图权限
   specimenViewRole2: boolean = false; //标本视图权限
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
+  configurationCenterRole: boolean = false; //配置中心权限
   PCCommutesToWork: boolean = false; //PC上下班权限
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
@@ -65,6 +66,11 @@ export class MainComponent implements OnInit {
     this.webs.closeWs(true);
   }
 
+  // 菜单图标名称是否包含transport-
+  isTransportIcon(icon:string) {
+    return icon.indexOf("transport-") > -1;
+  }
+
   //上下班
   loading3 = false;
   workModal: boolean = false; //模态框
@@ -283,6 +289,10 @@ export class MainComponent implements OnInit {
         this.disinfectionSupplyRole = true;
         console.log("全局业务查看权限");
       }
+      if (e.link == "configurationCenter") {
+        this.configurationCenterRole = true;
+        console.log("配置中心权限");
+      }
       if (e.link == "PCCommutesToWork") {
         this.PCCommutesToWork = true;
         console.log("PC上下班");
@@ -398,6 +408,10 @@ export class MainComponent implements OnInit {
   toDisinfectionSupply(): void {
     this.router.navigateByUrl("disinfectionSupply");
   }
+  // 配置中心
+  toConfigurationCenter(): void {
+    this.router.navigateByUrl("configurationCenter");
+  }
   // 大屏端或视图端
   screenType;
   hosFlag = false;

src/app/views/medical-waste-batch-out-of-storage/medical-waste-batch-out-of-storage.component.ts

@@ -170,6 +170,7 @@ export class MedicalWasteBatchOutOfStorageComponent implements OnInit {
       company: {
         hosId: this.hosId,
         transType: dictionary,
+        busiType: { key: 'company_busi_type', value: '1' },
       },
     };
     this.mainService

src/app/views/tripartite-company/tripartite-company-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { TripartiteCompanyComponent } from './tripartite-company.component';
+
+
+const routes: Routes = [
+  { path: '', component: TripartiteCompanyComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class TripartiteCompanyRoutingModule { }

src/app/views/tripartite-company/tripartite-company.component.html

@@ -0,0 +1,131 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">公司名称</span>：
+          <input nz-input class="formItem" placeholder="请输入公司名称" [(ngModel)]="searchDto.name" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">公司分类</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择公司分类" [(ngModel)]="searchDto.companyTypeIds">
+            <ng-container *ngFor="let option of companyTypeList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" nzValue="{{option.id}}"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzLg="8" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="14%">公司编号</th>
+            <th nzWidth="14%">公司全称</th>
+            <th nzWidth="14%">公司简称</th>
+            <th nzWidth="14%">公司分类</th>
+            <th nzWidth="14%">联系人</th>
+            <th nzWidth="14%">联系电话</th>
+            <th nzWidth="11%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{data.code}}</td>
+            <td>{{data.name}}</td>
+            <td>{{data.nickName}}</td>
+            <td>{{data.companyTypeList | dataToName:'name':'，'}}</td>
+            <td>{{data.contacts}}</td>
+            <td>{{data.mphone}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.edit" (click)="edit($event, data)">编辑</span>
+                <span *ngIf="coopBtns.del" (click)="showDelModal($event, data,'删除后您配置的相关巡检计划，下次执行时不在生成巡检任务，您确认要删除吗？','删除','del')">删除</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i></div>
+      <div class="content">
+        <form nz-form [formGroup]="validateForm" class="addForm">
+          <nz-form-item *ngIf="!add">
+            <nz-form-label [nzSpan]="5" nzRequired>公司编号</nz-form-label>
+            <nz-form-control [nzSpan]="19">
+              {{coopData.code}}
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="name">公司全称</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入公司全称!">
+              <nz-input-group>
+                  <input formControlName="name" nz-input placeholder="请输入公司全称">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="nickName">公司简称</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入公司简称!">
+              <nz-input-group>
+                  <input formControlName="nickName" nz-input placeholder="请输入公司简称">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="companyTypeIds">公司分类</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择公司分类!">
+              <nz-checkbox-group formControlName="companyTypeIds"></nz-checkbox-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzFor="contacts">&nbsp;&nbsp;联&nbsp;系&nbsp;人</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入联系人!">
+              <nz-input-group>
+                  <input formControlName="contacts" nz-input placeholder="请输入联系人">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzFor="mphone">&nbsp;&nbsp;联系电话</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入联系电话!">
+              <nz-input-group>
+                  <input formControlName="mphone" nz-input placeholder="请输入联系电话">
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+        </form>
+      </div>
+      <div class="display_flex justify-content_flex-center">
+        <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+        <button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
+      </div>
+    </div>
+  </div>
+  <!-- 模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

src/app/views/tripartite-company/tripartite-company.component.less

@@ -0,0 +1,176 @@
+@import "../../../../src/theme.less";
+
+:host {
+  ::ng-deep .ant-calendar-picker {
+    width: 100% !important;
+  }
+  .list-template__top{
+    overflow: visible!important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          // margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/tripartite-company/tripartite-company.component.ts

@@ -0,0 +1,266 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+@Component({
+  selector: "app-tripartite-company",
+  templateUrl: "./tripartite-company.component.html",
+  styleUrls: ["./tripartite-company.component.less"],
+})
+export class TripartiteCompanyComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  nextSchemeName = ""; //下一个开启的方案名称
+  modelName = ""; //模态框名称
+
+  showDropdown:boolean = false;
+
+  ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getList(1);
+    this.getCompanyType();
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.getList(1);
+  }
+
+  // 表格数据
+  searchDto: any = {};
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      company: {
+        hosId: this.currentHospital.id,
+        busiType: { key: 'company_busi_type', value: '2' },
+        ...this.searchDto,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "company", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 新增弹框
+  addModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modal = true;
+    this.initForm();
+  }
+  //关闭新增/编辑弹框
+  hideAddModal() {
+    this.modal = false;
+    this.initForm();
+  }
+
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      name: ['', [Validators.required, Validators.pattern(/\S/)]],
+      nickName: ['', [Validators.required]],
+      companyTypeIds: [this.companyTypeList.map(v => ({ label: v.name, value: v.id, checked: false })), [Validators.required]],
+      contacts: [''],
+      mphone: [''],
+    });
+  }
+
+  //获取公司分类
+  isLoading:boolean = false;
+  companyTypeList:any[] = [];
+  getCompanyType() {
+    this.isLoading = true;
+    this.mainService.getDictionary("list", "company_type").subscribe((data) => {
+      this.isLoading = false;
+      this.companyTypeList = data || [];
+    });
+  }
+
+  // 新增/编辑表单提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    console.log(this.validateForm.value)
+    let companyList = this.validateForm.value.companyTypeIds.filter(v => v.checked);
+    if(!companyList.length){
+      this.message.info("请选择公司分类");
+      return;
+    }
+
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        company: {
+          hosId: this.currentHospital.id,
+          name: this.validateForm.value.name,
+          nickName: this.validateForm.value.nickName,
+          companyTypeIds: companyList.map(v => v.value).toString(),
+          contacts: this.validateForm.value.contacts,
+          mphone: this.validateForm.value.mphone,
+          busiType: { key: 'company_busi_type', value: '2' },
+        }
+      };
+    } else {
+      //编辑
+      postData = {
+        company:{
+          ...this.coopData,
+          ...{
+            hosId: this.currentHospital.id,
+            name: this.validateForm.value.name,
+            nickName: this.validateForm.value.nickName,
+            companyTypeIds: this.validateForm.value.companyTypeIds.filter(v => v.checked).map(v => v.value).toString(),
+            contacts: this.validateForm.value.contacts,
+            mphone: this.validateForm.value.mphone,
+            busiType: { key: 'company_busi_type', value: '2' },
+          }
+        }
+      };
+    }
+    console.log(postData);
+    this.mainService
+      .coopData("addData", "company", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideAddModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, "");
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 编辑
+  edit(e, data) {
+    e.stopPropagation();
+    console.log(data);
+    this.initForm();
+    this.modelName = "编辑";
+    this.add = false;
+    this.modal = true;
+    this.coopData = data;
+    this.validateForm.controls.name.setValue(data.name);
+    this.validateForm.controls.nickName.setValue(data.nickName);
+    this.validateForm.controls.companyTypeIds.setValue(this.companyTypeList.map(v => ({label: v.name, value: v.id, checked: data.companyTypeIds.includes(v.id)})));
+    this.validateForm.controls.contacts.setValue(data.contacts);
+    this.validateForm.controls.mphone.setValue(data.mphone);
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0);
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    e,
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    e.stopPropagation();
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "company", [this.coopData.id])
+        .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/app/views/tripartite-company/tripartite-company.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { TripartiteCompanyRoutingModule } from './tripartite-company-routing.module';
+import { TripartiteCompanyComponent } from './tripartite-company.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    TripartiteCompanyComponent
+  ],
+  imports: [
+    CommonModule,
+    TripartiteCompanyRoutingModule,
+    ShareModule
+  ]
+})
+export class TripartiteCompanyModule { }

src/app/views/unit-management/unit-management.component.ts

@@ -63,6 +63,7 @@ export class UnitManagementComponent implements OnInit {
       sum: this.pageSize,
       company: {
         hosId: this.hosId,
+        busiType: { key: 'company_busi_type', value: '1' },
       },
     };
     this.loading1 = true;
@@ -185,37 +186,40 @@ export class UnitManagementComponent implements OnInit {
     }
     if (that.validateForm.invalid) return;
     that.btnLoading = true;
-    let data:any = {
-      name: that.validateForm.value.name,
-      transType: { id: that.validateForm.value.transType },
-      contacts: that.validateForm.value.contacts,
-      mphone: that.validateForm.value.mphone,
-      businessCode: that.validateForm.value.businessCode,
-      address: that.validateForm.value.address,
-      hosId: that.hosId,
-      laborers: [],
-      carNo: "",
+    let postData:any = {
+      company:{
+        name: that.validateForm.value.name,
+        transType: { id: that.validateForm.value.transType },
+        contacts: that.validateForm.value.contacts,
+        mphone: that.validateForm.value.mphone,
+        businessCode: that.validateForm.value.businessCode,
+        address: that.validateForm.value.address,
+        hosId: that.hosId,
+        laborers: [],
+        carNo: "",
+        busiType: { key: 'company_busi_type', value: '1' },
+      }
     };
     // 司机信息
     if(that.validateForm.value.laborerName0 && that.validateForm.value.laborerPhone0){
-      data.laborers = [{name: that.validateForm.value.laborerName0, mphone: that.validateForm.value.laborerPhone0}];
+      postData.company.laborers = [{name: that.validateForm.value.laborerName0, mphone: that.validateForm.value.laborerPhone0}];
       this.laborers.forEach(v => {
-        data.laborers.push({name: that.validateForm.value[v[0].name], mphone: that.validateForm.value[v[1].name]})
+        postData.company.laborers.push({name: that.validateForm.value[v[0].name], mphone: that.validateForm.value[v[1].name]})
       })
     }
     // 车牌号信息
     if(that.validateForm.value.carNo0){
-      data.carNo = that.validateForm.value.carNo0;
+      postData.company.carNo = that.validateForm.value.carNo0;
       this.carNos.forEach(v => {
-        data.carNo += "," + that.validateForm.value[v.name];
+        postData.company.carNo += "," + that.validateForm.value[v.name];
       })
     }
     if (!that.add) {
-      data = {...this.coopData, ...data};
+      postData.company = {...this.coopData, ...postData.company};
     }
-    console.log(data);
+    console.log(postData);
     that.mainService
-      .simplePost("addData", "company", data)
+      .coopData("addData", "company", postData)
       .subscribe((data) => {
         that.btnLoading = false;
         that.hideModal();

src/assets/iconfont/demo_index.html

@@ -55,6 +55,36 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe611;</span>
+                <div class="name">Icon - 统计分析</div>
+                <div class="code-name">&amp;#xe611;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe630;</span>
+                <div class="name">资产</div>
+                <div class="code-name">&amp;#xe630;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe653;</span>
+                <div class="name">控制</div>
+                <div class="code-name">&amp;#xe653;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe690;</span>
+                <div class="name">建单统计</div>
+                <div class="code-name">&amp;#xe690;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe6af;</span>
+                <div class="name">配置中心</div>
+                <div class="code-name">&amp;#xe6af;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe885;</span>
                 <div class="name">24gf-tags</div>
                 <div class="code-name">&amp;#xe885;</div>
@@ -750,9 +780,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1719826829751') format('woff2'),
-       url('iconfont.woff?t=1719826829751') format('woff'),
-       url('iconfont.ttf?t=1719826829751') format('truetype');
+  src: url('iconfont.woff2?t=1721896916365') format('woff2'),
+       url('iconfont.woff?t=1721896916365') format('woff'),
+       url('iconfont.ttf?t=1721896916365') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -779,6 +809,51 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-Icon-tongjifenxi"></span>
+            <div class="name">
+              Icon - 统计分析
+            </div>
+            <div class="code-name">.transport-Icon-tongjifenxi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-zichan"></span>
+            <div class="name">
+              资产
+            </div>
+            <div class="code-name">.transport-zichan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-kongzhi"></span>
+            <div class="name">
+              控制
+            </div>
+            <div class="code-name">.transport-kongzhi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-jiandantongji"></span>
+            <div class="name">
+              建单统计
+            </div>
+            <div class="code-name">.transport-jiandantongji
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-peizhizhongxin"></span>
+            <div class="name">
+              配置中心
+            </div>
+            <div class="code-name">.transport-peizhizhongxin
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-24gf-tags"></span>
             <div class="name">
               24gf-tags
@@ -1824,6 +1899,46 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-Icon-tongjifenxi"></use>
+                </svg>
+                <div class="name">Icon - 统计分析</div>
+                <div class="code-name">#transport-Icon-tongjifenxi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-zichan"></use>
+                </svg>
+                <div class="name">资产</div>
+                <div class="code-name">#transport-zichan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-kongzhi"></use>
+                </svg>
+                <div class="name">控制</div>
+                <div class="code-name">#transport-kongzhi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-jiandantongji"></use>
+                </svg>
+                <div class="name">建单统计</div>
+                <div class="code-name">#transport-jiandantongji</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-peizhizhongxin"></use>
+                </svg>
+                <div class="name">配置中心</div>
+                <div class="code-name">#transport-peizhizhongxin</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-24gf-tags"></use>
                 </svg>
                 <div class="name">24gf-tags</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1719826829751') format('woff2'),
-       url('iconfont.woff?t=1719826829751') format('woff'),
-       url('iconfont.ttf?t=1719826829751') format('truetype');
+  src: url('iconfont.woff2?t=1721896916365') format('woff2'),
+       url('iconfont.woff?t=1721896916365') format('woff'),
+       url('iconfont.ttf?t=1721896916365') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-Icon-tongjifenxi:before {
+  content: "\e611";
+}
+
+.transport-zichan:before {
+  content: "\e630";
+}
+
+.transport-kongzhi:before {
+  content: "\e653";
+}
+
+.transport-jiandantongji:before {
+  content: "\e690";
+}
+
+.transport-peizhizhongxin:before {
+  content: "\e6af";
+}
+
 .transport-24gf-tags:before {
   content: "\e885";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,41 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "6334918",
+      "name": "Icon - 统计分析",
+      "font_class": "Icon-tongjifenxi",
+      "unicode": "e611",
+      "unicode_decimal": 58897
+    },
+    {
+      "icon_id": "11016190",
+      "name": "资产",
+      "font_class": "zichan",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "12975220",
+      "name": "控制",
+      "font_class": "kongzhi",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "26226575",
+      "name": "建单统计",
+      "font_class": "jiandantongji",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "21758119",
+      "name": "配置中心",
+      "font_class": "peizhizhongxin",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
       "icon_id": "7542757",
       "name": "24gf-tags",
       "font_class": "24gf-tags",

src/common.less

@@ -43,6 +43,9 @@
 .green {
   color: #49b856 !important;
 }
+.text_align_center{
+  text-align: center !important;
+}
 // 加载中
 .loadingFull {
   height: 100%;