解决冲突

README.md

@@ -6,6 +6,7 @@
 - services     存放服务
 - views        存放视图
 - share        存放共享组件
+- components   存放复用性不高的组件
 
 # 后端提示-seimin(2021-07-05)
 - /simple/data/fetchDataList/{model}            查询列表

proxy.conf.json

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

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

@@ -139,7 +139,7 @@
         </nz-form-item>
         <nz-form-item>
           <nz-form-label [nzSpan]="5" nzRequired nzFor="userGroup">分配方式</nz-form-label>
-          <nz-form-control [nzSpan]="19" nzErrorTip="请选择积分!">
+          <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>

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

@@ -0,0 +1,182 @@
+<div class="content priority">
+  <div class="contentInner">
+    <div class="list-template" id="wechatTable">
+      <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)="addWechatModal()">新增</button>
+            </div>
+          </div>
+          <nz-table class="list-template__nzTable" [nzData]="wechatList" nzSize="middle" [nzShowPagination]="false"
+            [nzLoading]="loading1" [nzScroll]="{ y: tableWechatHeight + 'px' }">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="14%">名称|appId</th>
+                <th nzWidth="22%">appSecret|agentId</th>
+                <th nzWidth="8%">是否企业号</th>
+                <th nzWidth="12%">token更新时间</th>
+                <th nzWidth="20%">服务地址|服务域名</th>
+                <th nzWidth="8%">是否启用</th>
+                <th nzWidth="16%">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of wechatList;let i = index">
+                <td>{{data.name}}<br>{{data.appId}}</td>
+                <td>{{data.appSecret}}<br>{{data.agentId}}</td>
+                <td>{{data.qy ? '是' : '否'}}</td>
+                <td>{{data.atuTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
+                <td>{{data.url}}<br>{{data.domain}}</td>
+                <td>{{data.active ? '是' : '否'}}</td>
+                <td>
+                  <div class="coop">
+                    <span (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
+                    <span (click)="editWechat(data)">编辑</span>
+                    <span (click)="showDelModal(data,'您确认要重置获取token吗？','重置','delToken')">重置token</span>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+    </div>
+  </div>
+</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="modalWechat">
+  <div class="modalBody">
+    <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideWechatModal()"></i></div>
+    <div class="content">
+      <form nz-form [formGroup]="validateWechatForm" 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="appId">appId</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入appId!">
+            <nz-input-group>
+              <input formControlName="appId" nz-input placeholder="请输入appId">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="appSecret">appSecret</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入appSecret!">
+            <nz-input-group>
+              <input formControlName="appSecret" nz-input placeholder="请输入appSecret">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="agentId">agentId</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入agentId!">
+            <nz-input-group>
+              <input formControlName="agentId" nz-input placeholder="请输入agentId">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="url">服务地址</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入服务地址!">
+            <nz-input-group>
+              <input formControlName="url" nz-input placeholder="请输入服务地址">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="domain">服务域名</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入服务域名!">
+            <nz-input-group>
+              <input formControlName="domain" nz-input placeholder="请输入服务域名">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="7" nzRequired nzFor="active">是否启用</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择是否启用!">
+            <nz-radio-group formControlName="active">
+              <label nz-radio [nzValue]="true">是</label>
+              <label nz-radio [nzValue]="false">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="7" nzRequired nzFor="qy">是否企业号</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择是否企业号!">
+            <nz-radio-group formControlName="qy">
+              <label nz-radio [nzValue]="true">是</label>
+              <label nz-radio [nzValue]="false">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="type">类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="type" nzShowSearch
+              nzPlaceHolder="请选择类型" nzServerSearch>
+              <ng-container *ngFor="let data of typeList">
+                <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]="7" nzRequired nzFor="bindAccount">绑定工号</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择绑定工号!">
+            <nz-radio-group formControlName="bindAccount" (ngModelChange)="changeBindAccount($event)">
+              <label nz-radio [nzValue]="true">是</label>
+              <label nz-radio [nzValue]="false">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item *ngIf="!validateWechatForm.value.bindAccount">
+          <nz-form-label [nzSpan]="7" nzRequired nzFor="createUser">自动创建用户</nz-form-label>
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择自动创建用户!">
+            <nz-radio-group formControlName="createUser" (ngModelChange)="changeCreateUser($event)">
+              <label nz-radio [nzValue]="true">是</label>
+              <label nz-radio [nzValue]="false">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item *ngIf="validateWechatForm.value.createUser">
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="defaultRole">关联角色</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择关联角色!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="defaultRole" nzShowSearch
+            nzPlaceHolder="请选择关联角色" nzServerSearch>
+              <ng-container *ngFor="let option of defaultRoleList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.role" [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)="submitWechatForm()" [nzLoading]="btnLoading">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideWechatModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/components/configurationCenter/configuration-wechat/configuration-wechat.component.less

@@ -0,0 +1,289 @@
+@import "../../../../../src/theme.less";
+:host {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #F0F2F5;
+  .list-template__nzTable,
+  .list-template__bottom{
+    padding: 0!important;
+    border: none!important;
+    background: #fff!important;
+  }
+  .list-template{
+    width: 100%!important;
+    height: 100%!important;
+  }
+  .content{
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    border: 1px solid #EEF3F9;
+    &.priority{
+      margin: 24px 16px 0;
+      background-color: #fff;
+      .contentInner{
+        padding: 48px 16px;
+        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/components/configurationCenter/configuration-wechat/configuration-wechat.component.ts

@@ -0,0 +1,346 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { MainService } from "../../../services/main.service";
+import { Validators, FormGroup, FormBuilder } from '@angular/forms';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-configuration-wechat",
+  templateUrl: "./configuration-wechat.component.html",
+  styleUrls: ["./configuration-wechat.component.less"],
+})
+export class ConfigurationWechatComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private mainService: MainService,
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  coopData: any = {}; //当前操作列
+  currentHospital; //当前院区
+
+  formatterMinute = (value: number) => `${value} 分钟`;
+  parserMinute = (value: string) => value.replace(' 分钟', '');
+
+  ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
+    setTimeout(() => {
+      this.tableWechatHeight = document.querySelector('#wechatTable').clientHeight - document.querySelector('#wechatTable .list-template__top').clientHeight - 8 - document.querySelector('#wechatTable .thead').clientHeight;
+    }, 0)
+    this.getWechatList();
+    this.getTypes();
+    this.getRoles();
+  }
+
+  // 新增弹框
+  modelName = ""; //模态框名称
+  modalWechat: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  addWechatModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modalWechat = true;
+    this.initWechatForm();
+    this.requiredConfigChange('createUser', false);
+    this.requiredConfigChange('defaultRole', false);
+  }
+  //关闭新增/编辑弹框
+  hideWechatModal() {
+    this.modalWechat = false;
+  }
+
+  // 编辑
+  editWechat(data) {
+    console.log(data);
+    this.modelName = "编辑";
+    this.add = false;
+    this.modalWechat = true;
+    this.initWechatForm();
+    if(data.bindAccount){
+      this.requiredConfigChange('createUser', false);
+    }else{
+      this.requiredConfigChange('createUser', true);
+    }
+
+    if(data.createUser){
+      this.requiredConfigChange('defaultRole', true);
+    }else{
+      this.requiredConfigChange('defaultRole', false);
+    }
+    this.coopData = data;
+    this.validateWechatForm.controls.name.setValue(data.name);
+    this.validateWechatForm.controls.appId.setValue(data.appId);
+    this.validateWechatForm.controls.appSecret.setValue(data.appSecret);
+    this.validateWechatForm.controls.agentId.setValue(data.agentId);
+    this.validateWechatForm.controls.url.setValue(data.url);
+    this.validateWechatForm.controls.domain.setValue(data.domain);
+    this.validateWechatForm.controls.active.setValue(data.active);
+    this.validateWechatForm.controls.qy.setValue(data.qy);
+    this.validateWechatForm.controls.type.setValue(data.type ? data.type.id : null);
+    this.validateWechatForm.controls.bindAccount.setValue(data.bindAccount);
+    this.validateWechatForm.controls.createUser.setValue(data.createUser);
+    this.validateWechatForm.controls.defaultRole.setValue(data.defaultRole);
+  }
+
+  // 新增/编辑表单提交
+  btnLoading: boolean = false; //提交按钮loading状态
+  submitWechatForm(): void {
+    for (const i in this.validateWechatForm.controls) {
+      this.validateWechatForm.controls[i].markAsDirty();
+      this.validateWechatForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateWechatForm.invalid) {
+      return;
+    }
+    console.log(this.validateWechatForm.value);
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        // wechatConfig: {
+          hospital: this.currentHospital.id,
+          name: this.validateWechatForm.value.name,
+          appId: this.validateWechatForm.value.appId,
+          appSecret: this.validateWechatForm.value.appSecret,
+          agentId: this.validateWechatForm.value.agentId,
+          url: this.validateWechatForm.value.url,
+          domain: this.validateWechatForm.value.domain,
+          active: this.validateWechatForm.value.active,
+          qy: this.validateWechatForm.value.qy,
+          type: { id: this.validateWechatForm.value.type },
+          bindAccount: this.validateWechatForm.value.bindAccount,
+          createUser: this.validateWechatForm.value.createUser,
+          defaultRole: this.validateWechatForm.value.defaultRole,
+        // }
+      };
+    } else {
+      //编辑
+      postData = {
+        // wechatConfig: {
+          ...this.coopData,
+          ...{
+            hospital: this.currentHospital.id,
+            name: this.validateWechatForm.value.name,
+            appId: this.validateWechatForm.value.appId,
+            appSecret: this.validateWechatForm.value.appSecret,
+            agentId: this.validateWechatForm.value.agentId,
+            url: this.validateWechatForm.value.url,
+            domain: this.validateWechatForm.value.domain,
+            active: this.validateWechatForm.value.active,
+            qy: this.validateWechatForm.value.qy,
+            type: { id: this.validateWechatForm.value.type },
+            bindAccount: this.validateWechatForm.value.bindAccount,
+            createUser: this.validateWechatForm.value.createUser,
+            defaultRole: this.validateWechatForm.value.defaultRole,
+          }
+        // }
+      };
+    }
+    this.mainService
+      .simplePost("addData", "wechatConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideWechatModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, '');
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 初始化新增form表单
+  validateWechatForm: FormGroup; //新增/编辑表单
+  initWechatForm() {
+    this.validateWechatForm = this.fb.group({
+      name: [null, [Validators.required]],
+      appId: [null, [Validators.required]],
+      appSecret: [null, [Validators.required]],
+      agentId: [null, [Validators.required]],
+      url: [null, [Validators.required]],
+      domain: [null, [Validators.required]],
+      active: [false, [Validators.required]],
+      qy: [false, [Validators.required]],
+      type: [null, [Validators.required]],
+      bindAccount: [true, [Validators.required]],
+      createUser: [false,],
+      defaultRole: [null,],
+    });
+    console.log(this.validateWechatForm.controls)
+  }
+
+  requiredConfigChange(name: string, required: boolean): void {
+    if (!required) {
+      this.validateWechatForm.get(name)!.clearValidators();
+      this.validateWechatForm.get(name)!.markAsPristine();
+    } else {
+      this.validateWechatForm.get(name)!.setValidators(Validators.required);
+      this.validateWechatForm.get(name)!.markAsDirty();
+    }
+    this.validateWechatForm.get(name)!.updateValueAndValidity();
+  }
+
+  changeBindAccount(e){
+    if(e){
+      this.requiredConfigChange('createUser', false);
+      this.requiredConfigChange('defaultRole', false);
+    }else{
+      this.requiredConfigChange('createUser', true);
+      this.requiredConfigChange('defaultRole', false);
+    }
+
+    this.validateWechatForm.controls.createUser.setValue(false);
+    this.validateWechatForm.controls.defaultRole.setValue(null);
+  }
+
+  changeCreateUser(e){
+    if(e){
+      this.requiredConfigChange('createUser', true);
+      this.requiredConfigChange('defaultRole', true);
+    }else{
+      this.requiredConfigChange('createUser', true);
+      this.requiredConfigChange('defaultRole', false);
+    }
+
+    this.validateWechatForm.controls.defaultRole.setValue(null);
+  }
+
+  // 获取列表
+  loading1:boolean = false;
+  wechatList: any[] = []; //表格数据
+  tableWechatHeight:number = 0;
+  getWechatList() {
+    let data = {
+      idx: 0,
+      sum: 9999,
+      wechatConfig: {},
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "wechatConfig", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.wechatList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 获取角色
+  defaultRoleList: any = [];
+  getRoles() {
+    let postData = {
+      role: {},
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "role", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.defaultRoleList = data.list || [];
+      });
+  }
+
+  // 获取类型
+  isLoading:boolean = false;
+  typeList: any = [];
+  getTypes() {
+    let postData = {
+      dictionary: {
+        key: "wechat_config_type"
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.typeList = data.list || [];
+      });
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    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", "wechatConfig", [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 === "delToken"){
+      //重置token
+      this.mainService
+        .refreshToken("refreshToken", { wechatConfigId: 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);
+          }
+        });
+    }
+  }
+
+  // 展示信息提示框（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.getWechatList();
+  }
+}

src/app/components/select-menu/select-menu.component.html

@@ -0,0 +1,23 @@
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="iShowMenuModal">
+  <div class="modalBody">
+    <div class="title">配置中心<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div class="content_item" (click)="toIncidentConfig()">
+        <div class="name">
+          <i class="icon_transport transport-shijianpeizhi5"></i>事件配置
+        </div>
+        <div class="tips">故障现象、优先级、数据字典、系统配置、消息通知、科室绑定人员...</div>
+      </div>
+      <div class="content_item" (click)="toOtherConfig()">
+        <div class="name">
+          <i class="icon_transport transport-disanfang"></i>第三方配置
+        </div>
+        <div class="tips">微信配置、呼叫中心...</div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

src/app/components/select-menu/select-menu.component.less

@@ -0,0 +1,76 @@
+@import "../../../../src/theme.less";
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 467px;
+    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: 100%;
+      margin-top: 12px;
+      display: flex;
+      flex-wrap: wrap;
+      gap: 16px;
+      .content_item{
+        flex: 1;
+        height: 97px;
+        background-color: #F9FAFB;
+        border: 1px solid #EEEEEE;
+        padding: 16px 8px 8px;
+        cursor: pointer;
+        .name{
+          font-size: 16px;
+          color: rgba(0,0,0,0.85);
+          display: flex;
+          align-items: center;
+          .icon_transport{
+            color: @primary-color;
+            font-size: 22px;
+            margin-right: 8px;
+          }
+        }
+        .tips{
+          font-size: 10px;
+          color: rgba(0,0,0,0.45);
+          margin-top: 8px;
+          text-align: justify;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+}

src/app/components/select-menu/select-menu.component.ts

@@ -0,0 +1,31 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { Router } from "@angular/router";
+import { ToolService } from '../../services/tool.service';
+
+@Component({
+  selector: 'app-select-menu',
+  templateUrl: './select-menu.component.html',
+  styleUrls: ['./select-menu.component.less']
+})
+export class SelectMenuComponent implements OnInit {
+  @Output() cancelMenuModal = new EventEmitter();
+  @Input() iShowMenuModal: boolean = false;//模态框
+  allHospital: any;//所有院区
+  hosLoading: boolean = false;//确定按钮的loading
+  constructor(
+    private router: Router,
+  ) { }
+
+  ngOnInit() {}
+  toIncidentConfig(){
+    this.router.navigateByUrl("configurationCenter/incidentConfig");
+  }
+  toOtherConfig(){
+    this.router.navigateByUrl("configurationCenter/otherConfig");
+  }
+  // 隐藏模态框
+  hideModal() {
+    this.cancelMenuModal.emit(false)
+  }
+}

src/app/services/main.service.ts

@@ -852,4 +852,10 @@ export class MainService {
 	  });
 	}
 	
+	// wechat相关-重置token
+	refreshToken(type, data): any {
+	  return this.http.post(host.host + "/wechat/" + type, data, {
+	    headers: this.headers,
+	  });
+	}
 }

src/app/share/allocation-worker copy/allocation-worker.component.html

@@ -1,63 +0,0 @@
-<div class="detail">
-  <div class="title">分配配送人员<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
-  <div class="content">
-    <div nz-row class="select">
-      <div nz-col nzSpan="6">
-        <div class="label">人员姓名：</div>
-        <input [disabled]="nameMask" nz-input placeholder="请输入人员姓名" [(ngModel)]="searchName" nzSize="default"
-          (ngModelChange)="searchInp('worker')" />
-      </div>
-      <div nz-col nzSpan="6" class="ml8">
-        <div class="label">人员分组：</div>
-        <nz-select nzAllowClear [nzDisabled]="groupMask" style="width: 220px;" [nzDropdownMatchSelectWidth]="false"
-          [(ngModel)]="checkedGroup" (ngModelChange)="searchInp('group')" nzPlaceHolder="请选择人员分组">
-          <nz-option *ngFor="let optionData of groupList" [nzLabel]="optionData.groupName" [nzValue]="optionData.id">
-          </nz-option>
-        </nz-select>
-      </div>
-    </div>
-    <div class="table">
-      <div class="box">
-        <nz-table class="allotWorkerTable" [nzShowPagination]="false" #rowSelectionTable [nzData]="workerList"
-          nzSize="small" [nzScroll]="{ y: '270px' }" [nzLoading]="loading1">
-          <thead>
-            <tr class="thead">
-              <th nzWidth="30px" style="text-align: center"></th>
-              <th style="text-align: center">姓名</th>
-              <th nzWidth="202px" style="text-align: center" *ngIf="workerDispatchUserList === 'dynamic'">分组名称</th>
-              <th nzWidth="202px" style="text-align: center" *ngIf="workerDispatchUserList === 'dynamic'">工单数</th>
-              <th nzWidth="202px" style="text-align: center" *ngIf="workerDispatchUserList === 'dynamic'">空闲时间</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr *ngFor="let data of rowSelectionTable.data" (click)="checkAllotWorker(data.id,true)">
-              <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="checkAllotWorker(data.id)">
-              </td>
-              <td nzAlign="center">{{ data.name }}</td>
-              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.groupDTO?.groupName }}</td>
-              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.totalCount }}</td>
-              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'" [ngClass]="{red: data.workStateRemark ? true : !data.freetime, green: !data.workStateRemark && data.freetime}">{{ data.workStateRemark ? '示忙-' + data.workStateRemark : (data.freetime || '忙碌中') }}</td>
-            </tr>
-          </tbody>
-        </nz-table>
-        <div class="pagination">
-          <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger
-            [(nzPageSize)]="pageSize" (nzPageIndexChange)="getWorkerList()" (nzPageSizeChange)="getWorkerList()">
-          </nz-pagination>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="btns display_flex justify-content_flex-center">
-    <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submit()"
-      *ngIf="mapOfCheckedId[worderId]">确认</button>
-    <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
-  </div>
-</div>
-
-
-<!-- 操作成功/失败提示框 -->
-<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo" (closeModel)="close()">
-  <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
-</app-prompt-modal>

src/app/share/allocation-worker copy/allocation-worker.component.less

@@ -1,110 +0,0 @@
-@import "../../../../src/theme.less";
-:host {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  left: 0;
-  top: 0;
-  background: rgba(0, 0, 0, 0.4);
-  z-index: 999;
-
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.detail {
-  width: 1000px;
-  min-height: 580px;
-  border-radius: 5px;
-  background: #fff;
-  color: #333;
-  font-size: 14px;
-  padding: 12px 20px;
-  padding-bottom: 70px;
-  position: relative;
-
-  .title {
-    font-size: 18px;
-    text-align: center;
-    line-height: 24px;
-    margin: 0;
-    margin-bottom: 12px;
-    position: relative;
-
-    i {
-      position: absolute;
-      right: 0;
-      top: 0;
-      font-size: 20px;
-      color: #666;
-      cursor: pointer;
-      padding: 0 5px;
-    }
-  }
-
-  .content {
-    width: 960px;
-    overflow: hidden;
-
-    .select {
-      width: 100%;
-      background: #f9fafb;
-      border: 1px solid #e5e9ed;
-      border-radius: 5px;
-      padding: 13px 20px;
-
-      .label {
-        margin-bottom: 8px;
-      }
-    }
-
-    .table {
-      width: 100%;
-      margin-top: 15px;
-
-      .thead {
-        background-image: repeating-linear-gradient(
-          to right,
-          @bg-start,
-          @bg-end 100%
-        ) !important;
-
-        th {
-          color: #fff !important;
-          text-align: center;
-          font-size: 12px;
-          border: none;
-        }
-      }
-
-      .box {
-        min-height: 380px;
-        border-radius: 5px;
-        background: #f9fafb;
-        border: 1px solid #e5e9ed;
-        padding-bottom: 60px;
-        position: relative;
-
-        .pagination {
-          margin-top: 14px;
-          position: absolute;
-          bottom: 12px;
-          right: 5px;
-        }
-      }
-    }
-  }
-
-  .btns {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    bottom: 20px;
-
-    button {
-      margin: 9px;
-      margin-bottom: 0;
-    }
-  }
-}

src/app/share/allocation-worker copy/allocation-worker.component.ts

@@ -1,168 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { MainService } from "../../services/main.service";
-
-@Component({
-  selector: "app-allocation-worker",
-  templateUrl: "./allocation-worker.component.html",
-  styleUrls: ["./allocation-worker.component.less"],
-})
-export class AllocationWorkerComponent implements OnInit {
-  constructor(
-    private route: ActivatedRoute,
-    private mainService: MainService
-  ) {}
-
-  ngOnInit() {
-    this.groupList = JSON.parse(localStorage.getItem("user")).user.scope ? JSON.parse(localStorage.getItem("user")).user.scope.groupIds : [];
-    this.getWorkerList();
-  }
-  // 配送人员数据
-  workerList = [];
-
-  id; //工单id
-  stateId; //工单状态id
-  listOfDisplayData: any[] = [];
-  mapOfCheckedId: { [key: string]: boolean } = {};
-  searchName: string = ""; //搜索框内容
-  checkedGroup; //选中人员分组
-  pageIndex: number = 1; //表格当前页码
-  pageSize: number = 10; //表格每页展示条数
-  listLength: number = 10; //表格总数据量
-
-  promptContent: string; //操作提示框提示信息
-  ifSuccess: boolean; //操作成功/失败
-  promptInfo: string; //操作结果提示信息
-  promptModalShow: boolean; //是否展示提示框
-
-  btnLoading: boolean = false; //提交按钮loading状态
-
-  // 配送人员数据
-  groupList: Array<{ groupName: string; id: string }> = []; //分组下拉框
-  snum = 0;
-  loading1 = false;
-  nameMask = false; //是否禁用
-  groupMask = false; //是否禁用
-  workerDispatchUserList = '';
-  getWorkerList(pageIndex?) {
-    this.id = this.route.snapshot.paramMap.get("id");
-    this.stateId = this.route.snapshot.paramMap.get("stateId");
-    this.pageIndex = pageIndex ? pageIndex : this.pageIndex;
-
-    let groupsId = [];
-    JSON.parse(localStorage.getItem("user")).infoPermission.groups.forEach(
-      (e) => {
-        groupsId.push(e.id);
-      }
-    );
-
-    let postData: any = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      groupIds: "",
-      hosId: this.route.snapshot.paramMap.get("hosId"),
-    };
-    if (this.searchName) {
-      postData.name = this.searchName;
-    } else {
-      delete postData.name;
-    }
-    if (this.checkedGroup) {
-      postData.groupId = this.checkedGroup;
-    } else {
-      delete postData.groupId;
-    }
-    this.snum++;
-    this.loading1 = true;
-    this.mainService
-      .getSerInfo("getOnlineWorker", postData)
-      .subscribe((data) => {
-        this.snum--;
-        if (this.snum == 0) {
-          this.loading1 = false;
-        }
-        console.log(data);
-        this.workerDispatchUserList = data.type;
-        this.workerList = data.data;
-        this.listLength = data.totalNum;
-      });
-  }
-
-  // 输入用户信息搜索节流阀
-  time: any;
-  searchInp(type) {
-    this.getWorkerList(1);
-    console.log(type);
-    if (type == "worker") {
-      this.groupMask = Boolean(this.searchName);
-    } else if (type == "group") {
-      this.nameMask = Boolean(this.checkedGroup);
-    }
-  }
-
-  // 选择分配配送人员
-  worderId = 0; //配送人员id
-  checkAllotWorker(id, flag?): void {
-    this.mapOfCheckedId = {
-      [id]: flag ? !this.mapOfCheckedId[id] : this.mapOfCheckedId[id],
-    };
-    this.worderId = id;
-  }
-
-  // 分配
-  submit() {
-    let that = this;
-    that.btnLoading = true;
-    let flag: any = that.route.snapshot.paramMap.get("flag");
-
-    let postData: any = {};
-    let flags = "";
-    if (that.id.includes("_")) {
-      flags = "batchExcuteWorkOrder";
-      let ids_types = that.id.split("-");
-      let stateIds = that.stateId.split("-");
-      postData.workOrders = [];
-      stateIds.forEach((item, i) => {
-        postData.workOrders.push({
-          id: ids_types[i].split("_")[0],
-          type: ids_types[i].split("_")[1],
-          worker: { id: that.worderId },
-          gdState: { id: item },
-        });
-      });
-    } else {
-      flags = flag == 1 ? "excuteWorkOrder/reassign" : "excuteWorkOrder/assign";
-      postData = {
-        workOrder: {
-          id: that.id,
-          worker: { id: that.worderId },
-          gdState: { id: that.stateId },
-        },
-      };
-    }
-    that.mainService.assignWorker(postData, flags).subscribe((data) => {
-      that.btnLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal("分配", true, "");
-      } else {
-        that.showPromptModal("分配", false, data.msg);
-      }
-    });
-  }
-
-  // 关闭弹框
-  close() {
-    history.go(-1);
-  }
-
-  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
-  showPromptModal(con, success, promptInfo?) {
-    this.promptModalShow = false;
-    this.promptContent = con;
-    this.ifSuccess = success;
-    this.promptInfo = promptInfo;
-    setTimeout(() => {
-      this.promptModalShow = true;
-    }, 100);
-  }
-}

src/app/views/incident-config/incident-config.component.less

@@ -29,6 +29,7 @@
         }
         .tagList{
           width: 100%;
+          height: 100%;
           position: absolute;
           left: 0;
           top: 50%;
@@ -36,11 +37,17 @@
           display: flex;
           justify-content: center;
           align-items: center;
-          gap: 48px;
           span{
+            height: 100%;
+            display: inline-block;
+            padding: 0 24px;
             cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
             &.active{
               color: @primary-color;
+              background: #F0F6ED;
             }
           }
         }

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

@@ -151,5 +151,7 @@
     </div>
   </div>
 </div>
+<!-- 菜单选择 -->
+<app-select-menu (cancelMenuModal)="cancelMenuModal($event)" [iShowMenuModal]="iShowMenuModal"></app-select-menu>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

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

@@ -414,7 +414,8 @@ export class MainComponent implements OnInit {
   }
   // 配置中心
   toConfigurationCenter(): void {
-    this.router.navigateByUrl("configurationCenter");
+    this.iShowMenuModal = true;
+    // this.router.navigateByUrl("configurationCenter");
   }
   // 大屏端或视图端
   screenType;
@@ -467,6 +468,13 @@ export class MainComponent implements OnInit {
     }
   }
 
+
+  // 选择菜单-知道了
+  iShowMenuModal:boolean = false;
+  cancelMenuModal(flag) {
+    this.iShowMenuModal = false;
+  }
+
   // 退出
   logOut(): void {
     // 假退出

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

@@ -4,10 +4,12 @@ import { CommonModule } from '@angular/common';
 import { MainRoutingModule } from './main-routing.module';
 import { MainComponent } from './main.component';
 import { ShareModule } from 'src/app/share/share.module';
+import { SelectMenuComponent } from 'src/app/components/select-menu/select-menu.component';
 
 @NgModule({
   declarations: [
     MainComponent,
+    SelectMenuComponent,
   ],
   imports: [
     CommonModule,

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

@@ -1,24 +1,24 @@
 <div class="incidentConfig">
   <div class="tagsAndTemplete">
     <div class="tags">
-      <div><i class="icon_transport transport-peizhizhongxin"></i>配置中心&emsp;&gt;&emsp;事件配置</div>
+      <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">
-    <app-configuration-category></app-configuration-category>
+    <app-configuration-wechat></app-configuration-wechat>
   </ng-container>
   <!-- 优先级 -->
   <ng-container *ngIf="activeTagId === 2">
-    <app-configuration-priority></app-configuration-priority>
+    <!-- <app-configuration-priority></app-configuration-priority> -->
   </ng-container>
   <!-- 数据字典 -->
   <ng-container *ngIf="activeTagId === 3">
-    <app-configuration-dictionary></app-configuration-dictionary>
+    <!-- <app-configuration-dictionary></app-configuration-dictionary> -->
   </ng-container>
 </div>
 

src/app/views/other-config/other-config.component.less

@@ -29,6 +29,7 @@
         }
         .tagList{
           width: 100%;
+          height: 100%;
           position: absolute;
           left: 0;
           top: 50%;
@@ -36,11 +37,17 @@
           display: flex;
           justify-content: center;
           align-items: center;
-          gap: 48px;
           span{
+            height: 100%;
+            display: inline-block;
+            padding: 0 24px;
             cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
             &.active{
               color: @primary-color;
+              background: #F0F6ED;
             }
           }
         }

src/app/views/other-config/other-config.component.ts

@@ -13,9 +13,9 @@ export class OtherConfigComponent implements OnInit, AfterViewInit {
 
   // tab
   tagList:any = [
-    { id: 1, name: '故障现象',},
-    { id: 2, name: '优先级',},
-    { id: 3, name: '数据字典',},
+    { id: 1, name: '微信配置',},
+    // { id: 2, name: '优先级',},
+    // { id: 3, name: '数据字典',},
   ];
 
   ngOnInit(): void {}

src/app/views/other-config/other-config.module.ts

@@ -10,6 +10,11 @@ import { ConfigurationDictionaryComponent } from 'src/app/components/configurati
 import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
 import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
 
+import { ConfigurationWechatComponent } from 'src/app/components/configurationCenter/configuration-wechat/configuration-wechat.component';
+// import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
+// import { ConfigurationDictionaryComponent } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component';
+
+
 @NgModule({
   declarations: [
     OtherConfigComponent,
@@ -18,6 +23,10 @@ import { ConfigurationDeptUserComponent } from 'src/app/components/configuration
     ConfigurationDictionaryComponent,
 		ConfigurationManHourComponent,
 		ConfigurationDeptUserComponent,
+    ConfigurationWechatComponent,
+    // ConfigurationPriorityComponent,
+    // ConfigurationDictionaryComponent,
+
   ],
   imports: [
     CommonModule,

src/assets/iconfont/demo_index.html

@@ -55,6 +55,30 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe606;</span>
+                <div class="name">星号</div>
+                <div class="code-name">&amp;#xe606;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe76e;</span>
+                <div class="name">第三方</div>
+                <div class="code-name">&amp;#xe76e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe645;</span>
+                <div class="name">事件配置</div>
+                <div class="code-name">&amp;#xe645;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon icon_transport">&#xe635;</span>
+                <div class="name">失败 (1)</div>
+                <div class="code-name">&amp;#xe635;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe689;</span>
                 <div class="name">快速报修</div>
                 <div class="code-name">&amp;#xe689;</div>
@@ -493,12 +517,6 @@
               </li>
           
             <li class="dib">
-              <span class="icon icon_transport">&#xe606;</span>
-                <div class="name">星号</div>
-                <div class="code-name">&amp;#xe606;</div>
-              </li>
-          
-            <li class="dib">
               <span class="icon icon_transport">&#xe61b;</span>
                 <div class="name">空白页-暂无漏接诊单</div>
                 <div class="code-name">&amp;#xe61b;</div>
@@ -804,9 +822,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1722576999612') format('woff2'),
-       url('iconfont.woff?t=1722576999612') format('woff'),
-       url('iconfont.ttf?t=1722576999612') format('truetype');
+  src: url('iconfont.woff2?t=1722850118502') format('woff2'),
+       url('iconfont.woff?t=1722850118502') format('woff'),
+       url('iconfont.ttf?t=1722850118502') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -833,6 +851,42 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-required"></span>
+            <div class="name">
+              星号
+            </div>
+            <div class="code-name">.transport-required
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-disanfang"></span>
+            <div class="name">
+              第三方
+            </div>
+            <div class="code-name">.transport-disanfang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-shijianpeizhi5"></span>
+            <div class="name">
+              事件配置
+            </div>
+            <div class="code-name">.transport-shijianpeizhi5
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon icon_transport transport-shibai1"></span>
+            <div class="name">
+              失败 (1)
+            </div>
+            <div class="code-name">.transport-shibai1
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-kuaisubaoxiu"></span>
             <div class="name">
               快速报修
@@ -1490,15 +1544,6 @@
           </li>
           
           <li class="dib">
-            <span class="icon icon_transport transport-required"></span>
-            <div class="name">
-              星号
-            </div>
-            <div class="code-name">.transport-required
-            </div>
-          </li>
-          
-          <li class="dib">
             <span class="icon icon_transport transport-yunzhuanzhentongjiicon-"></span>
             <div class="name">
               空白页-暂无漏接诊单
@@ -1959,6 +2004,38 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-required"></use>
+                </svg>
+                <div class="name">星号</div>
+                <div class="code-name">#transport-required</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-disanfang"></use>
+                </svg>
+                <div class="name">第三方</div>
+                <div class="code-name">#transport-disanfang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-shijianpeizhi5"></use>
+                </svg>
+                <div class="name">事件配置</div>
+                <div class="code-name">#transport-shijianpeizhi5</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-shibai1"></use>
+                </svg>
+                <div class="name">失败 (1)</div>
+                <div class="code-name">#transport-shibai1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-kuaisubaoxiu"></use>
                 </svg>
                 <div class="name">快速报修</div>
@@ -2543,14 +2620,6 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#transport-required"></use>
-                </svg>
-                <div class="name">星号</div>
-                <div class="code-name">#transport-required</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-yunzhuanzhentongjiicon-"></use>
                 </svg>
                 <div class="name">空白页-暂无漏接诊单</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1722576999612') format('woff2'),
-       url('iconfont.woff?t=1722576999612') format('woff'),
-       url('iconfont.ttf?t=1722576999612') format('truetype');
+  src: url('iconfont.woff2?t=1722850118502') format('woff2'),
+       url('iconfont.woff?t=1722850118502') format('woff'),
+       url('iconfont.ttf?t=1722850118502') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-required:before {
+  content: "\e606";
+}
+
+.transport-disanfang:before {
+  content: "\e76e";
+}
+
+.transport-shijianpeizhi5:before {
+  content: "\e645";
+}
+
+.transport-shibai1:before {
+  content: "\e635";
+}
+
 .transport-kuaisubaoxiu:before {
   content: "\e689";
 }
@@ -305,10 +321,6 @@
   content: "\e62f";
 }
 
-.transport-required:before {
-  content: "\e606";
-}
-
 .transport-yunzhuanzhentongjiicon-:before {
   content: "\e61b";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,34 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "20719696",
+      "name": "星号",
+      "font_class": "required",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "4561786",
+      "name": "第三方",
+      "font_class": "disanfang",
+      "unicode": "e76e",
+      "unicode_decimal": 59246
+    },
+    {
+      "icon_id": "36196168",
+      "name": "事件配置",
+      "font_class": "shijianpeizhi5",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "5132740",
+      "name": "失败 (1)",
+      "font_class": "shibai1",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
       "icon_id": "18856229",
       "name": "快速报修",
       "font_class": "kuaisubaoxiu",
@@ -517,13 +545,6 @@
       "unicode_decimal": 58927
     },
     {
-      "icon_id": "2817690",
-      "name": "星号",
-      "font_class": "required",
-      "unicode": "e606",
-      "unicode_decimal": 58886
-    },
-    {
       "icon_id": "5260595",
       "name": "空白页-暂无漏接诊单",
       "font_class": "yunzhuanzhentongjiicon-",