diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index cc307d0..40a8a30 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -46,6 +46,7 @@ import { NzCollapseModule } from 'ng-zorro-antd/collapse'; import { NzPopoverModule } from 'ng-zorro-antd/popover'; import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; import { ScrollingModule } from '@angular/cdk/scrolling'; +import { NzGridModule } from 'ng-zorro-antd/grid'; @NgModule({ declarations: [ NavComponent, @@ -97,7 +98,8 @@ import { ScrollingModule } from '@angular/cdk/scrolling'; NzCollapseModule, NzPopoverModule, NzCheckboxModule, - ScrollingModule + ScrollingModule, + NzGridModule ], entryComponents: [AddroleComponent, EditroleComponent, AdduserComponent, EdituserComponent, AddorComponent, EditorComponent] }) diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html index 484b08a..ccd94f4 100644 --- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html +++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.html @@ -1 +1,66 @@ -

da-oneself-plan works!

+ +
+
+ + + + +
+ {{item.name}} +
+
+
+
+ 本级部署 + + {{isExpand ? '收起' :'展开'}} + + +
+
+
+
+
+
+ + {{item.name}} +
+
+

+ 任务分配 + +

+

5/9

+
+ +
+
+ + +
+
+
+

+ {{item.name}} + 返回 +

+
+
+

+ 济南历下森豪室内娱乐场 + + 派发 + +

+

A消防救援站

+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss index e69de29..535f92c 100644 --- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss +++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.scss @@ -0,0 +1,186 @@ +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.timebox { + width: 100%; + height: 68px; + box-sizing: border-box; + padding: 0 20px; + display: flex; + align-items: center; + + border-bottom: 1px dashed #C7CAD0; + + 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; + } +} + +.instrumentpanel { + box-sizing: border-box; + padding: 15px 20px; + color: #303133; + + .instrumentpanelheader { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 15px; + } + + .instrumentpanelopen { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + } + + .instrumentpanelopenitem { + width: 24.3%; + height: 260px; + background: #FFFFFF; + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + display: flex; + margin-bottom: 18px; + + .itemone { + width: 100%; + height: 100%; + display: flex; + + .instrumentpanelopenitemleft { + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: flex-start; + flex: 1; + box-sizing: border-box; + padding: 26px 0 26px 10%; + + .panelheadername { + width: 80%; + height: 46px; + line-height: 46px; + text-align: center; + box-sizing: border-box; + border-radius: 6px 0px 6px 6px; + color: #fff; + + img { + vertical-align: text-top; + } + } + + .tasknum { + margin-left: 8px; + + p { + margin: 0; + } + } + + .btn { + margin-left: 8px; + width: 60%; + max-width: 96px; + height: 36px; + border-radius: 4px 4px 4px 4px; + background: #42B983; + color: white; + cursor: pointer; + } + } + + .instrumentpanelopenitemright { + flex: 1; + display: flex; + align-items: center; + + nz-progress { + margin-top: 65px; + } + } + } + + .itemtwo { + width: 100%; + height: 100%; + display: flex; + box-sizing: border-box; + padding: 16px; + flex-direction: column; + overflow: hidden; + + .itemtwotitle { + display: flex; + justify-content: space-between; + + .back { + cursor: pointer; + + i { + margin-right: 3px; + } + } + + margin-bottom: 0; + } + + .itemtwocontent { + flex: 1; + overflow-y: auto; + display: flex; + flex-direction: column; + + .itemtwocontentitem { + border-bottom: 1px dashed #C7CAD0; + height: 70px; + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: flex-start; + box-sizing: border-box; + padding: 8px 0; + p{ + margin-bottom: 0; + } + .itemtwocontentitemp1{ + width: 100%; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding-right: 5px; + } + } + } + } + } + +} diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts index 62983a4..b7fbb90 100644 --- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts +++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts @@ -11,5 +11,45 @@ export class DaOneselfPlanComponent implements OnInit { ngOnInit(): void { } + months = [ + { name: '1月', isable: true }, + { name: '2月', isable: true }, + { name: '3月', isable: true }, + { name: '4月', isable: true }, + { name: '5月', isable: true }, + { name: '6月', isable: true }, + { name: '7月', isable: true }, + { name: '8月', isable: true }, + { name: '9月', isable: true }, + { name: '10月', isable: true }, + { name: '11月', isable: true }, + { name: '12月', isable: true } + ] + selectedMonth + selectMonth(item) { + this.selectedMonth = item.name + } + + isExpand = true + expand() { + this.isExpand = !this.isExpand + } + + formatOne = (percent: number): string => `${percent}%\n完成率`; + + cardData = [ + { name: '重大活动', isDetails: false, background: '#FF9203', icon: 'huodong.png' }, + { name: '双随机', isDetails: false, background: '#1D9DFF', icon: 'suiji.png' }, + { name: '行政许可', isDetails: false, background: '#42B983', icon: 'xuke.png' }, + { name: '熟悉演练', isDetails: false, background: '#9D80FF', icon: 'yanlian.png' }, + { name: '联络指导', isDetails: false, background: '#5483EA', icon: 'zhidao.png' }, + { name: '消防宣传', isDetails: false, background: '#FF5D2A', icon: 'xuanchuan.png' }, + { name: '投诉举报', isDetails: false, background: '#5087FF', icon: 'tousu.png' }, + { name: '火灾调查', isDetails: false, background: '#FF404D', icon: 'huozai.png' } + ] + + openDetails(data, type) { + data.isDetails = type + } } diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html index f4ff38b..8fa5aeb 100644 --- a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html +++ b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.html @@ -1 +1,87 @@ -

da-subordinate-audit works!

+ +
+
+ + + + +
+ {{item.name}} +
+
+
+
+
+
+ 熟悉演练任务 + + 已审批: 6/8 +
+
+
+
+ 联络指导任务 + + 已审批: 6/8 +
+
+
+
+
+
+ + 上海雅特酒店管理有限公司济南泺文路分公司 +
+
+ + + 未分配 + + + + 未分配 + + 分配 + | + 申请人: 历下区A消防救援站 + 修改 +
+
+ + +
+ + +
+
+
+
+
+ + 上海雅特酒店管理有限公司济南泺文路分公司 +
+
+ + + 未分配 + + + + 未分配 + + 分配 + | + 申请人: 历下区A消防救援站 + 修改 +
+
+ + +
+ + +
+
+
+
\ No newline at end of file diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss index e69de29..fa7430c 100644 --- a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss +++ b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.scss @@ -0,0 +1,146 @@ +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.timebox { + width: 100%; + height: 68px; + box-sizing: border-box; + padding: 0 20px; + display: flex; + align-items: center; + + 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; + } +} + +.content { + flex: 1; + overflow: hidden; + margin: 20px; + margin-top: 0px; + background: #fff; + box-shadow: 0px 3px 8px 1px rgba(0, 0, 0, 0.0800); + border-radius: 4px 4px 4px 4px; + opacity: 1; + border: 1px solid #E4E7EC; + color: #303133; + text-align: left; + display: flex; + flex-direction: column; + + .tabheader { + width: 100%; + height: 52px; + background: #E4E7EC; + display: flex; + + .tabtitle { + width: 205px; + height: 52px; + line-height: 52px; + text-align: center; + display: flex; + justify-content: center; + cursor: pointer; + + div { + border-top: 2px solid #E4E7EC; + } + } + + .selectedTab { + background: #fff; + + div { + border-top: 2px solid #2C4DC0; + } + } + } + + .tabbody { + flex: 1; + overflow-y: auto; + color: #000; + box-sizing: border-box; + padding: 18px; + + .card { + color: #303133; + width: 100%; + height: 70px; + border-radius: 4px 4px 4px 4px; + opacity: 1; + display: flex; + margin-bottom: 18px; + box-sizing: border-box; + padding: 0 20px; + position: relative; + div { + display: flex; + align-items: center; + + img { + margin-top: -3px; + } + } + + .unitname { + flex: 3; + } + + .info { + flex: 6; + + span { + margin-right: 20px; + } + } + + .btn { + flex: 1; + } + + .auditimg { + position: absolute; + right: 18%; + top: 9%; + } + } + + .greencard { + background: rgba(66, 185, 131, 0.0400); + border: 1px solid rgba(66, 185, 131, 0.1600); + } + + .redcard { + background: rgba(255, 0, 0, 0.0200); + border: 1px solid rgba(255, 0, 0, 0.1000); + } + } +} diff --git a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts index 7e4f904..aa8aa9e 100644 --- a/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts +++ b/src/app/home/task/da-subordinate-audit/da-subordinate-audit.component.ts @@ -11,5 +11,28 @@ export class DaSubordinateAuditComponent implements OnInit { ngOnInit(): void { } + months = [ + { name: '1月', isable: true }, + { name: '2月', isable: true }, + { name: '3月', isable: true }, + { name: '4月', isable: true }, + { name: '5月', isable: true }, + { name: '6月', isable: true }, + { name: '7月', isable: true }, + { name: '8月', isable: true }, + { name: '9月', isable: true }, + { name: '10月', isable: true }, + { name: '11月', isable: true }, + { name: '12月', isable: true } + ] + selectedMonth + selectMonth(item) { + this.selectedMonth = item.name + } + + selectedTab = 1 + selectTab(item) { + this.selectedTab = item + } } diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.scss b/src/app/home/task/zhi-indicators/zhi-indicators.component.scss index 1bbddb2..aca7a11 100644 --- a/src/app/home/task/zhi-indicators/zhi-indicators.component.scss +++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.scss @@ -95,33 +95,7 @@ } } -.panelheadernameblue { - background-color: #1D9DFF; -} - -.panelheadernamepurple { - background-color: #9D80FF; -} - -.panelheadernameblue2 { - background-color: #5087FF; -} - -.panelheadernamegreen { - background-color: #42B983; -} - -.panelheadernameor { - background-color: #FF9203; -} -.panelheadernameor2 { - background-color: #FF5D2A; -} - -.panelheadernamered { - background-color: #FF404D; -} .selectUnitPopover { width: 550px; diff --git a/src/assets/images/icon/assist.png b/src/assets/images/icon/assist.png new file mode 100644 index 0000000..6f45dc9 Binary files /dev/null and b/src/assets/images/icon/assist.png differ diff --git a/src/assets/images/icon/main.png b/src/assets/images/icon/main.png new file mode 100644 index 0000000..c69d276 Binary files /dev/null and b/src/assets/images/icon/main.png differ diff --git a/src/assets/images/icon/unit.png b/src/assets/images/icon/unit.png new file mode 100644 index 0000000..e3a124d Binary files /dev/null and b/src/assets/images/icon/unit.png differ diff --git a/src/assets/images/icon/zhidao.png b/src/assets/images/icon/zhidao.png new file mode 100644 index 0000000..ae0c445 Binary files /dev/null and b/src/assets/images/icon/zhidao.png differ diff --git a/src/styles.scss b/src/styles.scss index 50fa3d0..6275361 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -98,7 +98,7 @@ textarea { /* 滚动条样式 */ // ::-webkit-scrollbar:horizontal { width: 5px; background-color: white; } ::-webkit-scrollbar-thumb { - background-color: #999; + background: #E4E7EC; } ::-webkit-scrollbar { @@ -115,17 +115,17 @@ app-root { .blue { cursor: pointer; - color: #2C4DC0!important; + color: #2C4DC0 !important; } .green { cursor: pointer; - color: #42B983!important; + color: #42B983 !important; } .red { cursor: pointer; - color: #FF0000!important; + color: #FF0000 !important; } @@ -179,3 +179,31 @@ app-root { } } + +.panelheadernameblue { + background-color: #1D9DFF; +} + +.panelheadernamepurple { + background-color: #9D80FF; +} + +.panelheadernameblue2 { + background-color: #5087FF; +} + +.panelheadernamegreen { + background-color: #42B983; +} + +.panelheadernameor { + background-color: #FF9203; +} + +.panelheadernameor2 { + background-color: #FF5D2A; +} + +.panelheadernamered { + background-color: #FF404D; +} diff --git a/src/theme.less b/src/theme.less index 401ee93..e9ad8a7 100644 --- a/src/theme.less +++ b/src/theme.less @@ -6,12 +6,18 @@ .ant-table-thead { .ant-table-cell { - background-color: #EEF1F6!important; + background-color: #EEF1F6 !important; } } -.ant-table-cell{ - height: 44px; - box-sizing: border-box; - padding: 0 20px!important; - color: #606266; + +.ant-table-cell { + height: 44px; + box-sizing: border-box; + padding: 0 20px !important; + color: #606266; +} + +.ant-progress-circle .ant-progress-text { + white-space: pre; + font-size: 18px; }