Browse Source

[完善]完善修改文档内容

beijing
邵佳豪 2 years ago
parent
commit
13f158e8e8
  1. 2
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss
  2. 233
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts
  3. 5
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
  4. 2
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
  5. 2
      src/app/system-management/role/addrole/addrole.component.html
  6. 2
      src/app/system-management/role/editrole/editrole.component.html

2
src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss

@ -131,7 +131,7 @@
.centerContent { .centerContent {
position: absolute; position: absolute;
top: 34%; top: 40%;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 170px; width: 170px;

233
src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts

@ -156,40 +156,40 @@ export class WarningStatisticsListComponent implements OnInit {
echartsData: any echartsData: any
//一级饼图 //一级饼图
oilchartpieOption = { oilchartpieOption = {
color: ['#FF4B65', '#36A2FF'], color: ['#91CCFF', '#46DFFF', '#36A2FF', '#FF6181', '#B4C3FF', '#FF9963', '#5A9CFF', '#4BFFD4', '#46DFFF', '#91CCFF'],
tooltip: { tooltip: {
trigger: 'item'//触发类型 trigger: 'item'//触发类型
}, },
legend: { // legend: {
bottom: '12%', // bottom: '12%',
left: 'center', // left: 'center',
itemGap: 40, // itemGap: 40,
itemWidth: 8, // itemWidth: 8,
itemHeight: 8, // itemHeight: 8,
formatter: (name) => { // formatter: (name) => {
let data = this.oilchartpieOptionPieData1 // let data = this.oilchartpieOptionPieData1
let value // let value
for (var i = 0, l = data.length; i < l; i++) { // for (var i = 0, l = data.length; i < l; i++) {
if (data[i].name == name) { // if (data[i].name == name) {
value = data[i].value; // value = data[i].value;
} // }
} // }
return '{a|' + name + '}' + '{b|' + value + '}'; // return '{a|' + name + '}' + '{b|' + value + '}';
}, // },
textStyle: { // textStyle: {
color: '#fff', // color: '#fff',
rich: { // rich: {
a: { // a: {
width: 80 // width: 80
} // }
} // }
} // }
}, // },
series: [ series: [
{ {
type: 'pie', type: 'pie',
radius: ['50%', '60%'], radius: ['50%', '60%'],
bottom: '10%', // bottom: '10%',
avoidLabelOverlap: false,//防止标签重叠策略 avoidLabelOverlap: false,//防止标签重叠策略
label: {//每一个标签外网延伸的引导说明 label: {//每一个标签外网延伸的引导说明
show: false, show: false,
@ -310,185 +310,8 @@ export class WarningStatisticsListComponent implements OnInit {
} }
}; };
//二级饼图
oilchartpieOption2 = {
color: ['#36A2FF', '#FFBD4B', '#46DFFF'],
tooltip: {
trigger: 'item'//触发类型
},
legend: {
bottom: '8%',
left: 'center',
itemGap: 10,
itemWidth: 8,
itemHeight: 8,
formatter: (name) => {
let data = this.oilchartpieOptionPieData2
let value
for (var i = 0, l = data.length; i < l; i++) {
if (data[i].name == name) {
value = data[i].value;
}
}
return '{a|' + name + '}' + '{b|' + value + '}';
},
textStyle: {
color: '#fff',
rich: {
a: {
width: 60
}
}
}
},
series: [
{
type: 'pie',
radius: ['50%', '60%'],
bottom: '10%',
avoidLabelOverlap: false,//防止标签重叠策略
label: {//每二个标签外网延伸的引导说明
show: false,
position: 'outside'
},
data: [],
tooltip: {//鼠标移入提示
position: 'right',
padding: [14, 19],
backgroundColor: 'rgba(28, 129, 218, 0.4)',
textStyle: {
color: '#fff',
fontSize: 12
}
}
}
]
};
oilchartpieOptionPieData2: any
//二级柱状图
oilchartbarOption2 = {
tooltip: {
// trigger: 'axis'
},
xAxis: {
type: 'category',
data: [],
axisLine: {
show: false,
lineStyle: {
color: '#91CCFF'
}
},
axisTick: {//刻度线
show: false
},
inverse: true
},
yAxis: {
type: 'value',
nameTextStyle: {
color: '#C4E2FC'
},
splitLine: {//分割线
lineStyle: {
color: ['#0f4374'],
width: 2
}
},
axisTick: {//刻度线
show: false
},
axisLine: {//轴线
show: false,
lineStyle: {
color: '#C4E2FC'
}
}
},
legend: {
selectedMode: false, // 是否允许点击
data: ['事前准备', '事中操作', '全程监测'],
textStyle: {
color: '#fff'
},
right: 18,
top: 18,
itemWidth: 8,
itemHeight: 8,
},
series: [
{
name: '',
data: [],
type: 'bar',
itemStyle: {
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0, color: 'rgba(54, 162, 255, 1)' // 0% 处的颜色
}, {
offset: 1, color: 'rgba(54, 162, 255, 0.1)' // 100% 处的颜色
}],
global: false // 缺省为 false
}
},
barWidth: '25%'
},
{
name: '',
data: [],
type: 'bar',
itemStyle: {
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0, color: 'rgba(255, 189, 75, 1)' // 0% 处的颜色
}, {
offset: 1, color: 'rgba(255, 189, 75, 0.1)' // 100% 处的颜色
}],
global: false // 缺省为 false
}
},
barWidth: '25%'
},
{
name: '',
data: [],
type: 'bar',
itemStyle: {
color: {
type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
offset: 0, color: 'rgba(70, 223, 255, 1)' // 0% 处的颜色
}, {
offset: 1, color: 'rgba(70, 223, 255, 0.1)' // 100% 处的颜色
}],
global: false // 缺省为 false
}
},
barWidth: '25%'
}
],
grid: {
left: '42px',
right: '30px',
bottom: '38px',
top: '80px'
}
};
isgoback: boolean = false isgoback: boolean = false
//获取统计信息 //获取统计信息
chartsSpin: boolean = false chartsSpin: boolean = false

5
src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html

@ -49,13 +49,14 @@
<div class="btn"> <div class="btn">
<span *ngIf="!data.handleTime && isMisinformation" <span *ngIf="!data.handleTime && isMisinformation"
style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="misinformation()">误报</span> style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="misinformation()">误报</span>
<span *ngIf="!data.handleTime" style="color: #36A2FF;cursor: pointer;" (click)="submit()">提交</span> <span *ngIf="!data.handleTime && isOilStationUser" style="color: #36A2FF;cursor: pointer;"
(click)="submit()">提交</span>
<span *ngIf="data.handleTime" style="color: #4BFFD4;cursor: default;">已处置</span> <span *ngIf="data.handleTime" style="color: #4BFFD4;cursor: default;">已处置</span>
</div> </div>
</ng-template> </ng-template>
</div> </div>
<div class="disposeContent"> <div class="disposeContent">
<textarea *ngIf="!data.handleTime" [(ngModel)]="content"></textarea> <textarea *ngIf="!data.handleTime && isOilStationUser" [(ngModel)]="content"></textarea>
<span *ngIf="data.handleTime">{{content}}</span> <span *ngIf="data.handleTime">{{content}}</span>
</div> </div>
<div class="disposeTime" *ngIf="data.handleTime"> <div class="disposeTime" *ngIf="data.handleTime">

2
src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

@ -66,8 +66,10 @@ export class GetOutOfLineDetailsComponent implements OnInit {
let loginUserInfo let loginUserInfo
if (sessionStorage.getItem('isGasStation') == 'true') { if (sessionStorage.getItem('isGasStation') == 'true') {
loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation')) loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
this.isOilStationUser = true
} else { } else {
loginUserInfo = JSON.parse(sessionStorage.getItem('userdata')) loginUserInfo = JSON.parse(sessionStorage.getItem('userdata'))
this.isOilStationUser = false
} }
if (loginUserInfo.roles.find((item) => { if (loginUserInfo.roles.find((item) => {

2
src/app/system-management/role/addrole/addrole.component.html

@ -22,7 +22,7 @@
<nz-form-item> <nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="菜单">菜单</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="菜单">菜单</nz-form-label>
<nz-form-control> <nz-form-control>
<nz-tree-select [nzCheckStrictly]="true" #nzTreeComponent formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单" <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [nzCheckStrictly]="true" #nzTreeComponent formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单"
[nzExpandedIcon]="multiExpandedIconTpl"> [nzExpandedIcon]="multiExpandedIconTpl">
</nz-tree-select> </nz-tree-select>
</nz-form-control> </nz-form-control>

2
src/app/system-management/role/editrole/editrole.component.html

@ -19,7 +19,7 @@
<nz-form-item> <nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="菜单">菜单</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="菜单">菜单</nz-form-label>
<nz-form-control> <nz-form-control>
<nz-tree-select [nzCheckStrictly]="true" #nzTreeComponent formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单" <nz-tree-select [nzDropdownClassName]="'maxHeightTreeSelect'" [nzCheckStrictly]="true" #nzTreeComponent formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单"
[nzExpandedIcon]="multiExpandedIconTpl"> [nzExpandedIcon]="multiExpandedIconTpl">
</nz-tree-select> </nz-tree-select>
</nz-form-control> </nz-form-control>

Loading…
Cancel
Save