Browse Source

[新增]新增聊天框

非煤矿山灾害智能感知和预警系统
邵佳豪 3 years ago
parent
commit
139ad9ea5c
  1. 6
      src/app/app.module.ts
  2. 0
      src/app/commonComponents/select-unit/select-unit.component.html
  3. 53
      src/app/commonComponents/select-unit/select-unit.component.scss
  4. 17
      src/app/commonComponents/select-unit/select-unit.component.ts
  5. 1
      src/app/commonComponents/test/test.component.html
  6. 0
      src/app/commonComponents/test/test.component.scss
  7. 25
      src/app/commonComponents/test/test.component.spec.ts
  8. 15
      src/app/commonComponents/test/test.component.ts
  9. 3
      src/app/home/commonComponents/chat-window/chat-window.component.html
  10. 7
      src/app/home/commonComponents/chat-window/chat-window.component.scss
  11. 15
      src/app/home/commonComponents/chat-window/chat-window.component.ts
  12. 5
      src/app/home/home.module.ts
  13. 13
      src/app/home/task/station-task-apply/station-task-apply.component.html
  14. 11
      src/app/home/task/station-task-apply/station-task-apply.component.scss
  15. 5
      src/app/home/task/station-task-apply/station-task-apply.component.ts

6
src/app/app.module.ts

@ -15,15 +15,11 @@ import { registerLocaleData } from '@angular/common';
import { NzModalModule } from 'ng-zorro-antd/modal';
import zh from '@angular/common/locales/zh';
import { MethodService } from './service/method.service';
import { SelectUnitComponent } from './commonComponents/select-unit/select-unit.component';
import { TestComponent } from './commonComponents/test/test.component';
import { ObjectsSimpleService } from './service/objectsSimple.service';
registerLocaleData(zh);
@NgModule({
declarations: [
AppComponent,
SelectUnitComponent,
TestComponent
AppComponent
],
imports: [
BrowserModule,

0
src/app/commonComponents/select-unit/select-unit.component.html

53
src/app/commonComponents/select-unit/select-unit.component.scss

@ -1,53 +0,0 @@
.selectUnitPopover {
width: 550px;
height: 492px;
nz-form-item {
margin: 12px 0;
}
display: flex;
flex-direction: column;
.popoverTitle {
display: flex;
align-items: center;
span {
color: #C7CAD0;
cursor: pointer;
}
.selectedspan {
color: #2C4DC0;
}
}
.popoverContent {
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden;
.popoverContentitem {
flex: 1;
overflow-y: auto;
display: flex;
flex-direction: column;
p {
text-align: center;
}
}
}
.popoverBtn {
display: flex;
justify-content: flex-end;
margin-top: 16px;
button {
margin-left: 18px;
}
}
}

17
src/app/commonComponents/select-unit/select-unit.component.ts

@ -1,17 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-select-unit',
templateUrl: './select-unit.component.html',
styleUrls: ['./select-unit.component.scss']
})
export class SelectUnitComponent implements OnInit {
constructor() { }
complaint
ngOnInit(): void {
}
}

1
src/app/commonComponents/test/test.component.html

@ -1 +0,0 @@
<p>test works!</p>

0
src/app/commonComponents/test/test.component.scss

25
src/app/commonComponents/test/test.component.spec.ts

@ -1,25 +0,0 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TestComponent } from './test.component';
describe('TestComponent', () => {
let component: TestComponent;
let fixture: ComponentFixture<TestComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ TestComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(TestComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

15
src/app/commonComponents/test/test.component.ts

@ -1,15 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-test',
templateUrl: './test.component.html',
styleUrls: ['./test.component.scss']
})
export class TestComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

3
src/app/home/commonComponents/chat-window/chat-window.component.html

@ -0,0 +1,3 @@
<div class="chatbox">
</div>

7
src/app/home/commonComponents/chat-window/chat-window.component.scss

@ -0,0 +1,7 @@
.chatbox {
width: 478px;
height: 734px;
background: #F5F6F8;
border-radius: 4px 4px 4px 4px;
opacity: 1;
}

15
src/app/home/commonComponents/chat-window/chat-window.component.ts

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-chat-window',
templateUrl: './chat-window.component.html',
styleUrls: ['./chat-window.component.scss']
})
export class ChatWindowComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

5
src/app/home/home.module.ts

@ -69,6 +69,8 @@ import { NzBadgeModule } from 'ng-zorro-antd/badge';
import { NzListModule } from 'ng-zorro-antd/list';
import { OperationLogComponent } from './basic-info/unit-details/operation-log/operation-log.component';
import { NzDividerModule } from 'ng-zorro-antd/divider';
import { AppModule } from '../app.module';
import { ChatWindowComponent } from './commonComponents/chat-window/chat-window.component';
@NgModule({
declarations: [
NavComponent,
@ -106,7 +108,8 @@ import { NzDividerModule } from 'ng-zorro-antd/divider';
TaskDetailsComponent,
EditOrComponent,
CreateTaskComponent,
OperationLogComponent
OperationLogComponent,
ChatWindowComponent
],
imports: [
CommonModule,

13
src/app/home/task/station-task-apply/station-task-apply.component.html

@ -190,6 +190,14 @@
操作
</span>
</div>
<div class="flexcol">
<span>
<span class="blue" (click)="xxx()">消息</span>
</span>
<span>
消息
</span>
</div>
</div>
</div>
<div class="pagination">
@ -202,4 +210,9 @@
</div>
</div>
</div>
<div *ngIf="ischat" style="position: absolute;">
<app-chat-window></app-chat-window>
</div>
</div>

11
src/app/home/task/station-task-apply/station-task-apply.component.scss

@ -5,6 +5,7 @@
display: flex;
flex-direction: column;
overflow: hidden;
position: relative;
.informbox {
width: 100%;
@ -169,9 +170,10 @@
div {
flex: 1;
overflow: hidden;
span {
display: inline-block;
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@ -194,7 +196,6 @@
span:nth-child(1) {
color: #303133;
// margin-bottom: 8px;
}
span:nth-child(2) {
@ -206,19 +207,23 @@
.flexcolassistant {
flex: 1.5;
overflow: hidden;
.assistant {
display: flex;
width: 100%;
span {
color: #303133;
margin-right: 6px;
}
img {
width: 16px;
height: 16px;
vertical-align: text-bottom;
}
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

5
src/app/home/task/station-task-apply/station-task-apply.component.ts

@ -401,6 +401,11 @@ export class StationTaskApplyComponent implements OnInit {
}
});
}
ischat = false
xxx() {
this.ischat = true
}
}
export enum ApprovalStatus {

Loading…
Cancel
Save