-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
\ No newline at end of file
diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.scss b/src/app/home/task/station-task-apply/station-task-apply.component.scss
index 09c8e58..0a5ecdc 100644
--- a/src/app/home/task/station-task-apply/station-task-apply.component.scss
+++ b/src/app/home/task/station-task-apply/station-task-apply.component.scss
@@ -1,13 +1,87 @@
.box {
width: 100%;
height: 100%;
-
color: #303133;
- box-sizing: border-box;
- padding: 20px;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+
+ .informbox {
+ width: 100%;
+ height: 60px;
+ box-sizing: border-box;
+ padding: 10px 20px;
+ padding-bottom: 0px;
+
+ .inform {
+ width: 100%;
+ height: 100%;
+ background: #FFFFFF;
+ border-radius: 0px 0px 0px 0px;
+ opacity: 1;
+ display: flex;
+ .informleft {
+ height: 100%;
+ display: flex;
+ align-items: center;
+ margin-right: 20px;
+
+ img {
+ margin: 0 20px;
+ }
+ }
+
+ .informright {
+ flex: 1;
+ }
+ }
+ }
+
+ .timebox {
+ width: 100%;
+ height: 68px;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ border-bottom: 1px dashed #C7CAD0;
+ padding: 0 20px;
+
+ nz-select {
+ margin-right: 16px;
+ border-radius: 4px 4px 4px 4px;
+ }
+
+ .monthbtn {
+ width: 80px;
+ height: 32px;
+ line-height: 32px;
+ background: #FFFFFF;
+ border-radius: 4px 4px 4px 4px;
+ opacity: 1;
+ border: 1px solid #E4E7EC;
+ color: #303133;
+ margin-right: 16px;
+ cursor: pointer;
+ }
+
+ .selectedMonth {
+
+ background: #2C4DC0;
+ color: #FFFFFF;
+ }
+ }
+
+ .contentbox {
+ flex: 1;
+ box-sizing: border-box;
+ padding: 20px;
+ position: relative;
+ overflow: hidden;
+ }
.fffbox {
+ position: relative;
width: 100%;
height: 100%;
background: #FFFFFF;
@@ -17,6 +91,7 @@
border: 1px solid #E4E7EC;
display: flex;
flex-direction: column;
+ overflow: hidden;
}
@@ -70,12 +145,103 @@
padding-top: 0px;
display: flex;
flex-direction: column;
+ overflow-y: auto;
.applybtn {
align-self: flex-start;
margin: 18px 0;
}
+ .tablebox {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .tableboxitem {
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ padding: 22px 20px;
+ border: 1px solid #C7CAD0;
+ justify-content: space-around;
+ padding-left: 80px;
+ margin-bottom: 10px;
+
+ div {
+ flex: 1;
+
+ span {
+ display: inline-block;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ height: 33px;
+ line-height: 33px;
+ text-align: left;
+
+ img {
+ width: 32px;
+ height: 32px;
+ }
+ }
+ }
+
+ .flexcol {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ margin-right: 3%;
+
+ span:nth-child(1) {
+ color: #303133;
+ // margin-bottom: 8px;
+ }
+
+ span:nth-child(2) {
+ color: #C7CAD0;
+ }
+
+ }
+
+ .flexcolassistant {
+ flex: 2;
+ 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;
+ }
+ }
+
+ .unitnamebox {
+ flex: 3;
+ }
+
+ }
+
+ .greenborder {
+
+ border: 1px solid #42B983;
+ }
+
+ .redborder {
+
+ border: 1px solid #FF9203;
+ }
+ }
+
.operation {
a {
margin-right: 16px;
diff --git a/src/app/home/task/station-task-apply/station-task-apply.component.ts b/src/app/home/task/station-task-apply/station-task-apply.component.ts
index b766ea7..995d4f3 100644
--- a/src/app/home/task/station-task-apply/station-task-apply.component.ts
+++ b/src/app/home/task/station-task-apply/station-task-apply.component.ts
@@ -3,10 +3,12 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NzFormatEmitEvent, NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
import { NzModalService } from 'ng-zorro-antd/modal';
import { NzMessageService } from 'ng-zorro-antd/message';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
import { TreeService } from 'src/app/service/tree.service';
import { ApplyComponent } from './apply/apply.component';
import { ApplyLookComponent } from './apply-look/apply-look.component';
+import { ThisReceiver } from '@angular/compiler';
+
@Component({
selector: 'app-station-task-apply',
@@ -24,12 +26,36 @@ export class StationTaskApplyComponent implements OnInit {
or: ''
}
OrganizationId
- ngOnInit(): void {
- this.OrganizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId
- this.getAllOrganization()
+
+ isSupervisor: boolean //是否为检查员
+
+ months = [
+ { id: 1, name: '1月', isable: true },
+ { id: 2, name: '2月', isable: true },
+ { id: 3, name: '3月', isable: true },
+ { id: 4, name: '4月', isable: true },
+ { id: 5, name: '5月', isable: true },
+ { id: 6, name: '6月', isable: true },
+ { id: 7, name: '7月', isable: true },
+ { id: 8, name: '8月', isable: true },
+ { id: 9, name: '9月', isable: true },
+ { id: 10, name: '10月', isable: true },
+ { id: 11, name: '11月', isable: true },
+ { id: 12, name: '12月', isable: true }
+ ]
+ selectedMonth
+ selectedYear = 2022
+ selectedTime
+ selectMonth(item) {
+ this.selectedMonth = item.id
+
+ this.getTaskList()
+ }
+ selectYear(e) {
+ this.selectedYear = e
+ console.log('年', e)
this.getTaskList()
}
-
cancel(item, type) {
@@ -38,30 +64,34 @@ export class StationTaskApplyComponent implements OnInit {
}
- nzLoading = false
+ isloading = false
totalCount
PageNumber = 1
PageSize = 10
taskLIst = []
getTaskList() {
- this.nzLoading = true
+ this.isloading = true
+ let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01'
let params = {
+ Month: selectedTime,
OrganizationId: this.OrganizationId,
TaskName: this.searchForm.taskname,
CompanyName: this.searchForm.unitname,
AssitantOrganizationId: this.searchForm.or,
PageNumber: this.PageNumber,
+ CreatorId: this.userId,
PageSize: this.PageSize
}
this.http.get('/api/PlanTasks', {
params: params
}).subscribe((data: any) => {
- this.nzLoading = false
+ this.isloading = false
console.log('任务申请列表', data);
this.totalCount = data.totalCount
this.taskLIst = [...data.items]
})
}
+
pageChange($event) {
this.PageNumber = $event
this.getTaskList()
@@ -85,26 +115,149 @@ export class StationTaskApplyComponent implements OnInit {
expandKeys
defaultOrId: string
//获取所有组织机构
+ organizationList: any
+ organizationListAll: any
nodes: any = []
- getAllOrganization() {
+ async getAllOrganization() {
let params = {
PageNumber: 1,
PageSize: 9999
}
- this.http.get('/api/Organizations', {
- params: params
- }).subscribe((data: any) => {
- data.items.forEach(element => {
- element.key = element.id
- element.title = element.name
- });
- this.nodes = [...this.toTree.toTree(data.items)]
+ var p = new Promise
((resolve, reject) => {
+ this.http.get('/api/Organizations', {
+ params: params
+ }).subscribe((data: any) => {
+ data.items.forEach(element => {
+ element.key = element.id
+ element.title = element.name
+ element.disableCheckbox = true
+ element.selectable = false
+ });
+ this.organizationListAll = JSON.parse(JSON.stringify(data.items))
+ this.organizationList = JSON.parse(JSON.stringify(data.items)).filter(item => {
+ return item.level != 'squadron'
+ })
+ resolve(data)
+ })
+ })
+ return p
+ }
+
+ //获得所有检查员
+ supervisorList = []
+ mainsupervisorList = []
+ assitantsupervisorList = []
+ async getSupervisor() {
+ var p = new Promise((resolve, reject) => {
+ this.http.get('/api/Users/Inspectors').subscribe((data: any) => {
+ console.log('检查员列表', data)
+ data.forEach(element => {
+ element.key = element.id
+ element.title = element.name
+ element.parentId = element.organizationId
+ });
+ this.supervisorList = data
+ resolve(data)
+ })
+ })
+ return p
+ }
+
+ //获得除了检查员的其他用户
+ users
+ async getUsers() {
+ var p = new Promise((resolve, reject) => {
+ let params = {
+ OrganizationId: this.OrganizationId,
+ OrganizationLevel: 'squadron',
+ ContainsChildren: true,
+ PageNumber: 1,
+ PageSize: 9999
+ }
+ this.http.get('/api/Users', {
+ params: params
+ }).subscribe((data: any) => {
+ console.log('用户列表', data.items)
+ data.items.forEach(element => {
+ element.key = element.id
+ element.title = element.name
+ element.parentId = element.organizationId
+ });
+ this.users = data.items
+ resolve(data)
+ })
})
+ return p
+ }
+
+ userId
+ ngOnInit(): void {
+ this.OrganizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId
+ this.userId = JSON.parse(sessionStorage.getItem('userData')).id
+ let roles = JSON.parse(sessionStorage.getItem('userData')).roles
+ let isSupervisor = roles.find(item => {
+ return item.name.indexOf('检查') != -1
+ })
+ isSupervisor ? this.isSupervisor = true : this.isSupervisor = false
+ this.selectedMonth = new Date().getMonth() + 1
+ this.getTaskList()
+ Promise.all([this.getAllOrganization(), this.getSupervisor(), this.getUsers()])
+ .then((results) => {
+ if (this.isSupervisor) {
+ let arr = [...this.users, ...this.organizationListAll]
+ this.nodes = this.toTree.toTree(JSON.parse(JSON.stringify(arr)))
+ } else {
+ let arr = [...this.supervisorList, ...this.organizationList]
+ this.nodes = this.toTree.toTree(JSON.parse(JSON.stringify(arr)))
+ }
+ });
+
+ this.rollStart()
+ }
+
+ messageList = [1, 1, 1, 1, 1]
+ timer
+ rollStart() {
+ var ROLL_SPEED = 100
+ var noticeList1 = document.getElementById('notice-list');
+ var noticeList2 = document.getElementById('notice-list-2');
+ var listWrapper = document.getElementById('list-wrapper');
+ noticeList2.innerHTML = noticeList1.innerHTML;
+ this.timer = setInterval(rollStart, ROLL_SPEED);
+
+ function rollStart() {
+ if (Math.abs(_subStr(listWrapper.style.top)) >= noticeList1.clientHeight) {
+ listWrapper.style.top = '0px'
+ } else {
+ var top = listWrapper.style.top
+ listWrapper.style.top = _subStr(top) - 1 + 'px'
+ }
+ }
+ // 截取px前数值
+ function _subStr(str) {
+ var index = str.indexOf('px');
+ if (index > -1) {
+ return parseFloat(str.substr(0, index + 1))
+ }
+ }
+ }
+ mouseEnter() {
+ // console.log('进入了')
+ window.clearInterval(this.timer);
+ }
+ mouseleave() {
+
+ this.rollStart()
+
}
apply() {
if (this.nodes.length == 0) {
- this.message.create('warning', '组织机构初始化中,请稍后重试');
+ this.message.create('warning', '组织机构为空,请稍后重试');
+ return
+ }
+ if (this.supervisorList.length == 0) {
+ this.message.create('warning', '检查员名单为空,请稍后重试');
return
}
const modal = this.modal.create({
@@ -114,17 +267,23 @@ export class StationTaskApplyComponent implements OnInit {
nzWidth: 660,
nzMaskClosable: false,
nzComponentParams: {
- title: "熟悉演练",
- nodes: this.nodes,
+ title: this.isSupervisor ? ["联络指导", "双随机"] : ["熟悉演练"],
+ supervisorList: JSON.parse(JSON.stringify(this.supervisorList)),
+ organizationList: JSON.parse(JSON.stringify(this.organizationList)),
+ users: JSON.parse(JSON.stringify(this.users)),
+ nodes: JSON.parse(JSON.stringify(this.nodes))
},
nzOnOk: async () => {
+ console.log(instance.validateForm.value)
if (instance.validateForm.valid) {
await new Promise((resolve, reject) => {
let body = {
- organizationId: this.OrganizationId,
- taskName: "联络指导",
+ taskName: instance.validateForm.value.taskname,
+ taskType: instance.validateForm.value.taskname,
companyId: instance.validateForm.value.unitname,
- assitantOrganizationId: instance.validateForm.value.organization,
+ organizationId: this.OrganizationId,
+ supervisorIds: instance.validateForm.value.organization,
+ approvalStatus: '待处理'
}
this.http.post('/api/PlanTasks', body).subscribe({
next: (data) => {
@@ -150,6 +309,8 @@ export class StationTaskApplyComponent implements OnInit {
modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
}
+
+
look(item) {
const modal = this.modal.create({
nzTitle: '详情',
@@ -160,39 +321,29 @@ export class StationTaskApplyComponent implements OnInit {
nzComponentParams: {
data: item,
},
- nzFooter: null,
- nzOnOk: async () => {
- if (instance.validateForm.valid) {
- await new Promise(resolve => {
- let roleNames = [...instance.validateForm.value.role, ...instance.validateForm.value.role2]
- let body = {
- userName: instance.validateForm.value.account,
- name: instance.validateForm.value.name,
- organizationUnitId: Number(instance.validateForm.value.organization),
- roleNames: roleNames,
- phoneNumber: instance.validateForm.value.phonenum,
- isActive: true
- }
- // this.http.post(this.addUrl, body).subscribe(data => {
- // resolve(data)
- // this.message.create('success', '创建成功！');
- // this.SkipCount = 0
- // this.getAllUsers()
- // return true
- // }, err => {
- // resolve(err)
- // this.message.create('warning', err.error.error.message);
- // return false
- // })
- })
- } else {
- this.message.create('warning', '请填写完整！');
- return false
- }
- }
+ nzFooter: null
});
const instance = modal.getContentComponent();
modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
}
+
+}
+
+export enum ApprovalStatus {
+ 未派发 = 0,
+ 待处理 = 1,
+ 通过 = 2,
+ 驳回 = 3,
+ 待检查 = 4,
+ 已检查 = 5,
}
+export enum TaskType {
+ 双随机,
+ 熟悉演练,
+ 投诉举报,
+ 行政许可,
+ 联络指导,
+ 消防宣传,
+ 火灾调查
+}
\ No newline at end of file
diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
index 46471af..86ff1f1 100644
--- a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
+++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
@@ -1,60 +1,242 @@
-
+ 通知播报:
+ 
+ 
+ {{i.name}}
+
+
+ 
+ 
+ 待处理
+
+
+ 结果
+
+ 
+ {{item.name}}
+ 
+ 重大活动
+