批量出库

angular.json

@@ -36,6 +36,7 @@
               "src/styles.less",
               "src/assets/iconfont/iconfont.css",
               "src/assets/iconfont1/iconfont.css",
+              "src/assets/newIcon/iconfont.css",
               "./node_modules/swiper/swiper-bundle.min.css"
             ],
             "scripts": [
@@ -108,6 +109,7 @@
               "src/styles.less",
               "src/assets/iconfont/iconfont.css",
               "src/assets/iconfont1/iconfont.css",
+              "src/assets/newIcon/iconfont.css",
               "./node_modules/swiper/swiper-bundle.min.css"
             ],
             "scripts": [

src/app/services/main.service.ts

@@ -786,4 +786,16 @@ export class MainService {
       headers: this.headers,
     });
   }
+  // 医废-获取重量和袋数
+  getWeightAndCount(data): any {
+    return this.http.post(host.host + "/medicalWaste/getWeightAndCount", data, {
+      headers: this.headers,
+    });
+  }
+  // 医废-出库
+  medicalWasteComplete(data): any {
+    return this.http.post(host.host + "/medicalWaste/complete", data, {
+      headers: this.headers,
+    });
+  }
 }

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

@@ -453,6 +453,11 @@ const routes: Routes = [
         path: "outgoingRecord",
         loadChildren: () => import("../medical-waste-outgoing-record/medical-waste-outgoing-record.module").then((m) => m.MedicalWasteOutgoingRecordModule),
       },
+      // 批量出库
+      {
+        path: "batchOutOfStorage",
+        loadChildren: () => import("../medical-waste-batch-out-of-storage/medical-waste-batch-out-of-storage.module").then((m) => m.MedicalWasteBatchOutOfStorageModule),
+      },
     ],
   },
 ];

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

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { MedicalWasteBatchOutOfStorageComponent } from './medical-waste-batch-out-of-storage.component';
+
+
+const routes: Routes = [
+  {
+    path: "",
+    component: MedicalWasteBatchOutOfStorageComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class MedicalWasteBatchOutOfStorageRoutingModule { }

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

@@ -0,0 +1,74 @@
+<div class="batchOutOfStorage">
+  <overlay-scrollbars #osComponentRef1 class="main">
+    <div class="head"><span class="newicon newicon-liebiao"></span>批量出库</div>
+    <div class="list">
+      <div class="list_head">医废类型</div>
+      <div class="list_checkbox"><nz-checkbox-group [(ngModel)]="clinicalWasteTypeList" (ngModelChange)="changeClinicalWasteTypeListClick(clinicalWasteTypeList)"></nz-checkbox-group></div>
+      <div class="list_sum">
+        <div class="list_sum_item">总重量：{{totalWeight}}kg</div>
+        <div class="list_sum_item">总袋数：{{totalCount}}</div>
+        <div class="list_sum_item" *ngFor="let item of storageUnits">
+          总{{item}}数：
+          <nz-input-number *ngIf="item == '箱'" nz-input [nzMin]="0" [nzStep]="1" [nzPrecision]="0" nzSize="small" [(ngModel)]="submitData.totalBox"></nz-input-number>
+          <nz-input-number *ngIf="item == '桶'" nz-input [nzMin]="0" [nzStep]="1" [nzPrecision]="0" nzSize="small" [(ngModel)]="submitData.totalBucket"></nz-input-number>
+        </div>
+      </div>
+      <div class="list_company">
+        <div class="list_company_item">
+          <label class="name">凭证编号：</label>
+          <input class="select" nz-input placeholder="请输入凭证编号" [(ngModel)]="submitData.credentialsNumber" />
+        </div>
+      </div>
+    </div>
+
+    <div class="list">
+      <div class="list_head">运输信息</div>
+      <div class="list_company">
+        <div class="list_company_item">
+          <label class="name">运输单位：</label>
+          <nz-select class="select" [(ngModel)]="submitData.transportCompany" (ngModelChange)="changeTransportCompany($event)" nzPlaceHolder="请选择运输单位">
+            <nz-option *ngFor="let option of transCompanyList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+          </nz-select>
+          <div class="number">营运证件号：{{businessCode1}}</div>
+        </div>
+        <div class="list_company_item">
+          <label class="name">运输司机：</label>
+          <nz-select class="select" [(ngModel)]="submitData.driver" nzPlaceHolder="请选择运输司机" (ngModelChange)="changeDriver($event)">
+            <nz-option *ngFor="let option of laborerList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+          </nz-select>
+          <div class="number">联系电话：{{driverPhone}}</div>
+        </div>
+        <div class="list_company_item">
+          <label class="name">车牌号码：</label>
+          <nz-select class="select" [(ngModel)]="submitData.carNo" nzPlaceHolder="请选择车牌号码">
+            <nz-option *ngFor="let option of carNoList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+          </nz-select>
+        </div>
+      </div>
+    </div>
+
+    <div class="list">
+      <div class="list_head">接收信息</div>
+      <div class="list_company">
+        <div class="list_company_item">
+          <label class="name">接收单位：</label>
+          <nz-select class="select" [(ngModel)]="submitData.receptionCompany" (ngModelChange)="changeReceiveCompany($event)" nzPlaceHolder="请选择接收单位">
+            <nz-option *ngFor="let option of receiveCompanyList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+          </nz-select>
+          <div class="number">危险物经营许可证编号：{{businessCode2}}</div>
+        </div>
+        <div class="list_company_item">
+          <div class="number" style="margin-right: 32px;width: 285px;">联系人：{{contacts2}}</div>
+          <div class="number">联系电话：{{mphone2}}</div>
+        </div>
+      </div>
+    </div>
+  </overlay-scrollbars>
+  <div class="submit">
+    <button nz-button nzType="primary" class="save" (click)="submitForm()">确认</button>
+    <button nz-button nzType="default" class="refresh btn cancel" (click)="cancel()">取消</button>
+  </div>
+  <!-- 模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="loading3"
+    (confirmDelEvent)="confirmDel()" content="您确认要出库吗？"></app-dialog-delete>
+</div>

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

@@ -0,0 +1,80 @@
+@import "../../../../src/theme.less";
+.batchOutOfStorage{
+  padding: 8px;
+  height: calc(100vh - 88px);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .main{
+    height: calc(100vh - 161px);
+  }
+  .submit {
+    margin: 0 8px;
+    border-top: 1px solid #e5e9ed;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 73px;
+    min-height: 73px;
+    .save {
+      height: 34px;
+    }
+    .refresh{
+      margin-left: 8px;
+      height: 34px;
+    }
+  }
+  .head{
+    height: 48px;
+    font-size: 18px;
+    font-weight: bold;
+    background-color: #F9FAFB;
+    display: flex;
+    align-items: center;
+    border: 1px solid #E8EBEF;
+    .newicon-liebiao{
+      margin-left: 22px;
+      margin-right: 13px;
+      color: @primary-color;
+    }
+  }
+
+  .list{
+    padding: 16px;
+    border-bottom: 1px solid #E8EBEF;
+    .list_head{
+      padding: 0 10px;
+      border-left: 5px solid @primary-color;
+      font-size: 16px;
+    }
+    .list_checkbox{
+      padding: 16px;
+    }
+    .list_sum{
+      display: flex;
+      padding: 0 16px;
+      .list_sum_item{
+        margin-right: 32px;
+        &:last-of-type{
+          margin-right: 0;
+        }
+      }
+    }
+
+    .list_company{
+      padding: 16px;
+      .list_company_item{
+        display: flex;
+        align-items: center;
+        margin-bottom: 25px;
+        &:last-of-type{
+          margin-bottom: 0;
+        }
+        .select{
+          width: 215px;
+          margin-right: 32px;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,246 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { MainService } from "src/app/services/main.service";
+import { ToolService } from "src/app/services/tool.service";
+import { Router } from '@angular/router';
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+
+@Component({
+  selector: "app-medical-waste-batch-out-of-storage",
+  templateUrl: "./medical-waste-batch-out-of-storage.component.html",
+  styleUrls: ["./medical-waste-batch-out-of-storage.component.less"],
+})
+export class MedicalWasteBatchOutOfStorageComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private router: Router,
+  ) {}
+
+  hosId;
+  submitData:any = {
+    totalBox: 0,
+    totalBucket: 0,
+    transportCompany: null,
+    receptionCompany: null,
+    driver: null,
+    carNo: null,
+    credentialsNumber: '',
+  }
+
+  clinicalWasteTypeSubject = new Subject<string>();
+
+  ngOnInit() {
+    this.clinicalWasteTypeSubject
+      .pipe(debounceTime(300),distinctUntilChanged())
+      .subscribe(clinicalWasteTypeIds => {
+				this.changeClinicalWasteTypeList(clinicalWasteTypeIds);
+      });
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getClinicalWasteTypeList();
+    this.getCompanyTransType();
+  }
+
+  //删除
+  loading3 = false;
+  delModal: boolean = false; //删除模态框
+  showDelModal() {
+    this.delModal = true;
+  }
+  hideDelModal() {
+    this.delModal = false;
+  }
+  confirmDel() {
+    this.delModal = false;
+    let maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData: any = {
+      clinicalWasteTypeIds: this.clinicalWasteTypeIds,
+      wasteOutInfo:{
+        credentialsNumber: this.submitData.credentialsNumber,
+        totalBox: this.submitData.totalBox,
+        totalBucket: this.submitData.totalBucket,
+        transportCompany: {id: this.submitData.transportCompany},
+        receptionCompany: {id: this.submitData.receptionCompany},
+        hosId: this.hosId,
+        driver: {id: this.submitData.driver},
+        carNo: this.carNoList.find(v => v.id == this.submitData.carNo).name,
+      }
+    };
+    this.mainService
+      .medicalWasteComplete(postData)
+      .subscribe((res) => {
+        this.message.remove(maskFlag);
+        if (res.status == 200) {
+          this.message.success("出库成功");
+          this.router.navigateByUrl("/main/outgoingRecord");
+        }
+      });
+  }
+
+  submitForm(){
+    if(!this.clinicalWasteTypeList.filter(v => v.checked).length){
+      this.message.error("请选择医废类型");
+      return;
+    }
+    if(!this.submitData.transportCompany){
+      this.message.error("请选择运输单位");
+      return;
+    }
+    if(!this.submitData.driver){
+      this.message.error("请选择运输司机");
+      return;
+    }
+    if(!this.submitData.carNo){
+      this.message.error("请选择车牌号码");
+      return;
+    }
+    if(!this.submitData.receptionCompany){
+      this.message.error("请选择接收单位");
+      return;
+    }
+    if(!this.totalCount){
+      this.message.error("选择的类型，无医废数据请确认后发起出库");
+      return;
+    }
+    this.showDelModal();
+
+  }
+
+  cancel(){
+    this.router.navigateByUrl("/main/outgoingRecord");
+  }
+
+  // 医废类型
+  clinicalWasteTypeList:any[] = [];
+  getClinicalWasteTypeList() {
+    let maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData: any = {
+      idx: 0,
+      sum: 9999,
+      clinicalWasteType: {
+        hosId: this.hosId,
+      },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "clinicalWasteType", postData)
+      .subscribe((res) => {
+        this.message.remove(maskFlag);
+        if (res.status == 200) {
+          let clinicalWasteTypeList = res.list || [];
+          this.clinicalWasteTypeList = clinicalWasteTypeList.map(v => ({
+            label: v.typeName,
+            value: v.id,
+            checked: false,
+          }))
+        }
+      });
+  }
+  // 单位类型
+  getCompanyTransType(){
+    this.mainService.getDictionary("list", "company_trans_type")
+      .subscribe((result) => {
+        let company_trans_types = result || [];
+        let transCompany = company_trans_types.find(v => v.value == 1);//运输单位
+        let receiveCompany = company_trans_types.find(v => v.value == 2);//接收单位
+        transCompany && this.getCompany(transCompany);
+        receiveCompany && this.getCompany(receiveCompany);
+      });
+  }
+  // 运输单位/接收单位
+  transCompanyList:any[] = [];
+  receiveCompanyList:any[] = [];
+  laborerList:any[] = [];
+  carNoList:any[] = [];
+  getCompany(dictionary) {
+    let postData: any = {
+      idx: 0,
+      sum: 9999,
+      company: {
+        hosId: this.hosId,
+        transType: dictionary,
+      },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "company", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          if(dictionary.value == 1){
+            // 运输单位
+            this.transCompanyList = result.list || [];
+          } else if(dictionary.value == 2){
+            // 接收单位
+            this.receiveCompanyList = result.list || [];
+          }
+        }
+      });
+  }
+
+  businessCode1 = '';
+  changeTransportCompany(id){
+    let transCompany = this.transCompanyList.find(v => v.id == id);
+    this.laborerList = transCompany.laborers || [];
+    this.submitData.driver = null;
+    this.carNoList = transCompany.carNo ? transCompany.carNo.split(',').map((v, index) => ({id: index + 1, name: v})) : [];
+    this.submitData.carNo = null;
+    this.businessCode1 = transCompany.businessCode;
+  }
+
+  driverPhone = '';
+  changeDriver(id){
+    let driver = this.laborerList.find(v => v.id == id);
+    this.driverPhone = driver.mphone;
+  }
+
+  businessCode2 = '';
+  mphone2 = '';
+  contacts2 = '';
+  changeReceiveCompany(id){
+    let receiveCompany = this.receiveCompanyList.find(v => v.id == id);
+    this.businessCode2 = receiveCompany.businessCode;
+    this.mphone2 = receiveCompany.mphone;
+    this.contacts2 = receiveCompany.contacts;
+  }
+
+  clinicalWasteTypeIds = '';
+  changeClinicalWasteTypeListClick(clinicalWasteTypeList) {
+    this.clinicalWasteTypeIds = clinicalWasteTypeList.filter(v => v.checked).map(v => v.value).toString();
+    this.clinicalWasteTypeSubject.next(this.clinicalWasteTypeIds);
+  }
+
+  // 选择医废类型
+  storageUnits:any[] = [];
+  totalCount = 0;
+  totalWeight = 0;
+  changeClinicalWasteTypeList(clinicalWasteTypeIds){
+    let maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData: any = {
+      clinicalWasteTypeIds,
+      hosId: this.hosId,
+    };
+    this.mainService
+      .getWeightAndCount(postData)
+      .subscribe((res) => {
+        this.message.remove(maskFlag);
+        if (res.status == 200) {
+          this.storageUnits = res.storageUnits || [];
+          this.totalCount = res.totalCount;
+          this.totalWeight = res.totalWeight;
+        }
+      });
+  }
+}
+

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

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ShareModule } from 'src/app/share/share.module';
+import { MedicalWasteBatchOutOfStorageComponent } from './medical-waste-batch-out-of-storage.component';
+import { MedicalWasteBatchOutOfStorageRoutingModule } from './medical-waste-batch-out-of-storage-routing.module';
+
+
+@NgModule({
+  declarations: [MedicalWasteBatchOutOfStorageComponent],
+  imports: [
+    CommonModule,
+    MedicalWasteBatchOutOfStorageRoutingModule,
+    ShareModule,
+  ]
+})
+export class MedicalWasteBatchOutOfStorageModule { }

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.component.html

@@ -20,7 +20,8 @@
         </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
-        <button nz-button class="btn default" (click)='reset()'>重置</button>
+        <button nz-button class="btn default" (click)='batchOutOfOtorageClick()'>批量出库</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
         <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
       </div>
     </div>

src/app/views/medical-waste-outgoing-record/medical-waste-outgoing-record.component.ts

@@ -45,6 +45,10 @@ export class MedicalWasteOutgoingRecordComponent implements OnInit {
     this.getHospital();
   }
 
+  batchOutOfOtorageClick(){
+    this.router.navigateByUrl("/main/batchOutOfStorage");
+  }
+
   // 查看
   detail(e, id) {
     e.stopPropagation();

src/assets/newIcon/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

src/assets/newIcon/demo_index.html

@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4304849" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe61a;</span>
+                <div class="name">列表</div>
+                <div class="code-name">&amp;#xe61a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe635;</span>
+                <div class="name">icon_zhengzaijinx</div>
+                <div class="code-name">&amp;#xe635;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe662;</span>
+                <div class="name">xiala02</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe660;</span>
+                <div class="name">扫一扫</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe60a;</span>
+                <div class="name">医废管理</div>
+                <div class="code-name">&amp;#xe60a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe604;</span>
+                <div class="name">头像</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe601;</span>
+                <div class="name">箭头上</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'newicon';
+  src: url('iconfont.woff2?t=1709719097594') format('woff2'),
+       url('iconfont.woff?t=1709719097594') format('woff'),
+       url('iconfont.ttf?t=1709719097594') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.newicon {
+  font-family: "newicon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="newicon"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"newicon" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon newicon newicon-liebiao"></span>
+            <div class="name">
+              列表
+            </div>
+            <div class="code-name">.newicon-liebiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-icon_zhengzaijinx"></span>
+            <div class="name">
+              icon_zhengzaijinx
+            </div>
+            <div class="code-name">.newicon-icon_zhengzaijinx
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-xiala1"></span>
+            <div class="name">
+              xiala02
+            </div>
+            <div class="code-name">.newicon-xiala1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-saoma"></span>
+            <div class="name">
+              扫一扫
+            </div>
+            <div class="code-name">.newicon-saoma
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-yifeiguanli"></span>
+            <div class="name">
+              医废管理
+            </div>
+            <div class="code-name">.newicon-yifeiguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-a-ziyuan7"></span>
+            <div class="name">
+              头像
+            </div>
+            <div class="code-name">.newicon-a-ziyuan7
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-a-ziyuan3"></span>
+            <div class="name">
+              箭头上
+            </div>
+            <div class="code-name">.newicon-a-ziyuan3
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="newicon newicon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            newicon" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-liebiao"></use>
+                </svg>
+                <div class="name">列表</div>
+                <div class="code-name">#newicon-liebiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-icon_zhengzaijinx"></use>
+                </svg>
+                <div class="name">icon_zhengzaijinx</div>
+                <div class="code-name">#newicon-icon_zhengzaijinx</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-xiala1"></use>
+                </svg>
+                <div class="name">xiala02</div>
+                <div class="code-name">#newicon-xiala1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-saoma"></use>
+                </svg>
+                <div class="name">扫一扫</div>
+                <div class="code-name">#newicon-saoma</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-yifeiguanli"></use>
+                </svg>
+                <div class="name">医废管理</div>
+                <div class="code-name">#newicon-yifeiguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-a-ziyuan7"></use>
+                </svg>
+                <div class="name">头像</div>
+                <div class="code-name">#newicon-a-ziyuan7</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-a-ziyuan3"></use>
+                </svg>
+                <div class="name">箭头上</div>
+                <div class="code-name">#newicon-a-ziyuan3</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

src/assets/newIcon/iconfont.css

@@ -0,0 +1,43 @@
+@font-face {
+  font-family: "newicon"; /* Project id 4304849 */
+  src: url('iconfont.woff2?t=1709719097594') format('woff2'),
+       url('iconfont.woff?t=1709719097594') format('woff'),
+       url('iconfont.ttf?t=1709719097594') format('truetype');
+}
+
+.newicon {
+  font-family: "newicon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.newicon-liebiao:before {
+  content: "\e61a";
+}
+
+.newicon-icon_zhengzaijinx:before {
+  content: "\e635";
+}
+
+.newicon-xiala1:before {
+  content: "\e662";
+}
+
+.newicon-saoma:before {
+  content: "\e660";
+}
+
+.newicon-yifeiguanli:before {
+  content: "\e60a";
+}
+
+.newicon-a-ziyuan7:before {
+  content: "\e604";
+}
+
+.newicon-a-ziyuan3:before {
+  content: "\e601";
+}
+

src/assets/newIcon/iconfont.json

@@ -0,0 +1,58 @@
+{
+  "id": "4304849",
+  "name": "新转运图标",
+  "font_family": "newicon",
+  "css_prefix_text": "newicon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "2172644",
+      "name": "列表",
+      "font_class": "liebiao",
+      "unicode": "e61a",
+      "unicode_decimal": 58906
+    },
+    {
+      "icon_id": "4852661",
+      "name": "icon_zhengzaijinx",
+      "font_class": "icon_zhengzaijinx",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
+      "icon_id": "5933299",
+      "name": "xiala02",
+      "font_class": "xiala1",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "6757421",
+      "name": "扫一扫",
+      "font_class": "saoma",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "39332508",
+      "name": "医废管理",
+      "font_class": "yifeiguanli",
+      "unicode": "e60a",
+      "unicode_decimal": 58890
+    },
+    {
+      "icon_id": "37864731",
+      "name": "头像",
+      "font_class": "a-ziyuan7",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "37861550",
+      "name": "箭头上",
+      "font_class": "a-ziyuan3",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    }
+  ]
+}