|
|
@@ -107,7 +107,7 @@ export const testBeltLaneFire: Config[] = [
|
|
|
complex_list: [
|
|
|
{
|
|
|
type: 'C',
|
|
|
- readFrom: 'devTypeMap',
|
|
|
+ readFrom: 'devJSONAarry',
|
|
|
mapFromData: true,
|
|
|
pagetype: 'Belt',
|
|
|
items: [
|
|
|
@@ -116,7 +116,7 @@ export const testBeltLaneFire: Config[] = [
|
|
|
contents: [
|
|
|
{
|
|
|
label: '${name}',
|
|
|
- value: '${alarmLevel}',
|
|
|
+ value: '${value}',
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
@@ -261,7 +261,7 @@ export const testBeltLaneFire: Config[] = [
|
|
|
table: [
|
|
|
{
|
|
|
type: 'C',
|
|
|
- readFrom: 'gateMap',
|
|
|
+ readFrom: 'gateArray',
|
|
|
pageType: 'Belt',
|
|
|
columns: [
|
|
|
{
|
|
|
@@ -443,7 +443,7 @@ export const testYjkf: Config[] = [
|
|
|
export const testBeltNew: Config[] = [
|
|
|
// ==================== 左侧栏:火灾监测设备状态 ====================
|
|
|
{
|
|
|
- deviceType: 'fire_risk_warn',
|
|
|
+ deviceType: 'fire_risk_warn_mma',
|
|
|
moduleName: '火灾监测设备报警与分析',
|
|
|
pageType: 'fireMonitorLeft',
|
|
|
moduleData: {
|
|
|
@@ -482,7 +482,7 @@ export const testBeltNew: Config[] = [
|
|
|
list: [],
|
|
|
preset: [
|
|
|
{
|
|
|
- readFrom: 'fire_risk_warn',
|
|
|
+ readFrom: 'fire_risk_warn_mma',
|
|
|
list: [
|
|
|
{
|
|
|
title: '光纤测温传感器',
|
|
|
@@ -562,50 +562,6 @@ export const testBeltNew: Config[] = [
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
- {
|
|
|
- title: '火焰传感器',
|
|
|
- contentTop: [
|
|
|
- { label: '平均值', code: '${modelsensor_fire.avg}', color: 'white' },
|
|
|
- { label: '最大值', code: '${modelsensor_fire.max}', color: 'white' },
|
|
|
- { label: '最小值', code: '${modelsensor_fire.min}', color: 'white' },
|
|
|
- ],
|
|
|
- contents: [
|
|
|
- {
|
|
|
- label: '是否报警',
|
|
|
- code: '${modelsensor_fire.flag}',
|
|
|
- trans: { true: '报警', false: '正常' },
|
|
|
- color: 'green',
|
|
|
- },
|
|
|
- {
|
|
|
- label: '最大值产生于',
|
|
|
- code: '${modelsensor_fire.time}',
|
|
|
- color: 'white',
|
|
|
- info: { code: '${modelsensor_fire.position}' },
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- {
|
|
|
- title: '烟雾传感器',
|
|
|
- contentTop: [
|
|
|
- { label: '平均值', code: '${modelsensor_smoke.avg}', color: 'white' },
|
|
|
- { label: '最大值', code: '${modelsensor_smoke.max}', color: 'white' },
|
|
|
- { label: '最小值', code: '${modelsensor_smoke.min}', color: 'white' },
|
|
|
- ],
|
|
|
- contents: [
|
|
|
- {
|
|
|
- label: '是否报警',
|
|
|
- code: '${modelsensor_smoke.flag}',
|
|
|
- trans: { true: '报警', false: '正常' },
|
|
|
- color: 'green',
|
|
|
- },
|
|
|
- {
|
|
|
- label: '最大值产生于',
|
|
|
- code: '${modelsensor_smoke.time}',
|
|
|
- color: 'white',
|
|
|
- info: { code: '${modelsensor_smoke.position}' },
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
{
|
|
|
title: '温度传感器',
|
|
|
contentTop: [
|
|
|
@@ -682,7 +638,7 @@ export const testBeltNew: Config[] = [
|
|
|
{
|
|
|
readFrom: '',
|
|
|
type: 'C',
|
|
|
- tableReadFrom: '',
|
|
|
+ tableReadFrom: 'warn_result',
|
|
|
columns: [
|
|
|
{
|
|
|
name: '时间',
|
|
|
@@ -692,19 +648,22 @@ export const testBeltNew: Config[] = [
|
|
|
{
|
|
|
name: '区域',
|
|
|
prop: 'area',
|
|
|
- width: '120px',
|
|
|
+ width: '130px',
|
|
|
},
|
|
|
{
|
|
|
name: '预警类型',
|
|
|
- prop: 'type',
|
|
|
+ prop: 'status',
|
|
|
},
|
|
|
{
|
|
|
name: '状态',
|
|
|
prop: 'status',
|
|
|
+ align: 'center',
|
|
|
+ width: '80px',
|
|
|
},
|
|
|
{
|
|
|
name: '处置意见',
|
|
|
prop: 'advice',
|
|
|
+ width: '180px',
|
|
|
},
|
|
|
{
|
|
|
name: '操作',
|
|
|
@@ -724,7 +683,7 @@ export const testBeltNew: Config[] = [
|
|
|
showStyle: {
|
|
|
size: 'width:1030px;height:300px;',
|
|
|
version: '原版',
|
|
|
- position: 'bottom:25px;left:445px;',
|
|
|
+ position: 'bottom:70px;left:445px;',
|
|
|
},
|
|
|
},
|
|
|
|
|
|
@@ -770,36 +729,6 @@ export const testBeltNew: Config[] = [
|
|
|
{
|
|
|
readFrom: 'fire_risk_warn',
|
|
|
config: [
|
|
|
- {
|
|
|
- title: '光纤测温传感器',
|
|
|
- items: [
|
|
|
- {
|
|
|
- label: '是否报警',
|
|
|
- code: '${fiber_v1.flag}',
|
|
|
- trans: { true: '报警', false: '正常' },
|
|
|
- },
|
|
|
- {
|
|
|
- label: '最大值产生于',
|
|
|
- code: '${fiber_v1.time}',
|
|
|
- info: { code: '${fiber_v1.position}' },
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- {
|
|
|
- title: 'CO传感器',
|
|
|
- items: [
|
|
|
- {
|
|
|
- label: '是否报警',
|
|
|
- code: '${modelsensor_co.flag}',
|
|
|
- trans: { true: '报警', false: '正常' },
|
|
|
- },
|
|
|
- {
|
|
|
- label: '最大值产生于',
|
|
|
- code: '${modelsensor_co.time}',
|
|
|
- info: { code: '${modelsensor_co.position}' },
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
{
|
|
|
title: '火焰传感器',
|
|
|
items: [
|
|
|
@@ -815,21 +744,6 @@ export const testBeltNew: Config[] = [
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
- {
|
|
|
- title: '温度传感器',
|
|
|
- items: [
|
|
|
- {
|
|
|
- label: '是否报警',
|
|
|
- code: '${modelsensor_temp.flag}',
|
|
|
- trans: { true: '报警', false: '正常' },
|
|
|
- },
|
|
|
- {
|
|
|
- label: '最大值产生于',
|
|
|
- code: '${modelsensor_temp.time}',
|
|
|
- info: { code: '${modelsensor_temp.position}' },
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
{
|
|
|
title: '烟雾传感器',
|
|
|
items: [
|