Skip to content

V
V3-TailingPond
Commit c6927552 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

fix: 页面字段修改 exp：报警等级

parent 461278fc
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 29 deletions
.env.production
View file @ c6927552
...@@ -5,8 +5,8 @@ ENV = 'production' ...@@ -5,8 +5,8 @@ ENV = 'production'
# 如果接口是 http 形式， wss 需要改为 ws # 如果接口是 http 形式， wss 需要改为 ws
# 山西柳林安泰洗煤边坡 ------------------------ # 山西柳林安泰洗煤边坡 ------------------------
VUE_APP_BASE_API = 'http://192.168.26.8:9045' # VUE_APP_BASE_API = 'http://192.168.26.8:9045'
VUE_APP_LOCAL_API = 'http://192.168.26.8:9001' # VUE_APP_LOCAL_API = 'http://192.168.26.8:9001'
# 冯克贞 ------------------------ # 冯克贞 ------------------------
#VUE_APP_BASE_API = 'http://192.168.27.147:9045' #VUE_APP_BASE_API = 'http://192.168.27.147:9045'
...@@ -25,4 +25,8 @@ VUE_APP_LOCAL_API = 'http://192.168.26.8:9001' ...@@ -25,4 +25,8 @@ VUE_APP_LOCAL_API = 'http://192.168.26.8:9001'
#VUE_APP_LOCAL_API = 'http://192.168.4.61:9000' #VUE_APP_LOCAL_API = 'http://192.168.4.61:9000'
#VUE_APP_LOCAL_API2 = 'http://192.168.4.61:9000' #VUE_APP_LOCAL_API2 = 'http://192.168.4.61:9000'
#VUE_APP_LOCAL_b3dms = 'http://192.168.1.3:8045' #VUE_APP_LOCAL_b3dms = 'http://192.168.1.3:8045'
\ No newline at end of file
# 马力沟 ------------------------
VUE_APP_BASE_API = 'http://192.168.10.10:9045'
VUE_APP_LOCAL_API = 'http://192.168.10.10:9001'
\ No newline at end of file
src/assets/js/httpApi.js
View file @ c6927552
...@@ -405,9 +405,14 @@ var reqApis = function () { ...@@ -405,9 +405,14 @@ var reqApis = function () {
baseInfo: { baseInfo: {
"sensorname": { name: "设备名称" }, "sensorname": { name: "设备名称" },
"sensorid": { name: "设备ID" }, "sensorid": { name: "设备ID" },
"dispx": { name: "x变化量(mm)" }, // "velocityx": { name: "x形变速率(mm/h)" },
"dispy": { name: "y变化量(mm)" }, // "dispx": { name: "x累计位移(mm)" },
"disph": { name: "z变化量(mm)" },
// "velocityy": { name: "y形变速率(mm/h)" },
// "dispy": { name: "y累计位移(mm)" },
// "velocityh": { name: "z形变速率(mm/h)" },
// "disph": { name: "z累计位移(mm)" },
"disph": { name: "监测值(mm)" },
/* "cartesianX": { name: "大地坐标X" }, /* "cartesianX": { name: "大地坐标X" },
"cartesianY": { name: "大地坐标Y" }, "cartesianY": { name: "大地坐标Y" },
"cartesianZ": { name: "大地坐标Z" }, */ "cartesianZ": { name: "大地坐标Z" }, */
...@@ -529,8 +534,8 @@ var reqApis = function () { ...@@ -529,8 +534,8 @@ var reqApis = function () {
"sensorname": { name: "设备名称" }, "sensorname": { name: "设备名称" },
"sensorid": { name: "设备ID" }, "sensorid": { name: "设备ID" },
"lenth": { name: "长度(m)" }, "lenth": { name: "长度(m)" },
"safeheight": { name: "坡度(度)" }, // "safeheight": { name: "坡度(度)" },
"angle": { name: "高程(m)" }, // "angle": { name: "高程(m)" },
"time": { "time": {
name: "监测时间", form: 0, type: "tableFormat", tableFormat: function (val) { name: "监测时间", form: 0, type: "tableFormat", tableFormat: function (val) {
return Tools.Dates.format.call(new Date(val), 'yyyy-MM-dd HH:mm:ss') return Tools.Dates.format.call(new Date(val), 'yyyy-MM-dd HH:mm:ss')
...@@ -1001,8 +1006,14 @@ var reqApis = function () { ...@@ -1001,8 +1006,14 @@ var reqApis = function () {
baseInfo: { baseInfo: {
"sensorname": { name: "设备名称" }, "sensorname": { name: "设备名称" },
"sensorid": { name: "设备ID" }, "sensorid": { name: "设备ID" },
"rainfall": { name: "监测值" }, // "rainfall": { name: "监测值" },
"danwei": { name: "单位" }, // "danwei": { name: "单位" },
"rainfall": { name: "瞬时雨量(mm/h)" },
"threerainfall": { name: "3小时内雨量(mm)" },
"sixrainfall": { name: "6小时内雨量(mm)" },
"twelverainfall": { name: "12小时内雨量(mm)" },
"dayrainfall": { name: "日累计雨量" },
"state": { name: "是否报警", type: 'select', }, "state": { name: "是否报警", type: 'select', },
"time": { "time": {
name: "监测时间", form: 0, type: "tableFormat", tableFormat: function (val) { name: "监测时间", form: 0, type: "tableFormat", tableFormat: function (val) {
...@@ -1197,9 +1208,9 @@ var reqApis = function () { ...@@ -1197,9 +1208,9 @@ var reqApis = function () {
baseInfo: { baseInfo: {
"sensorname": { name: "设备名称" }, "sensorname": { name: "设备名称" },
"sensorid": { name: "设备ID" }, "sensorid": { name: "设备ID" },
"dispA": { name: "a轴变化量(mm)" }, // "dispA": { name: "a轴变化量(mm)" },
"dispB": { name: "b轴变化量(mm)" }, "dispB": { name: "监测值(mm)" },
"cjvalue": { name: "沉降(mm)" }, // "cjvalue": { name: "沉降(mm)" },
"state": { name: "是否报警", type: 'select' }, "state": { name: "是否报警", type: 'select' },
"time": { "time": {
name: "监测时间", form: 0, type: "tableFormat", tableFormat: function (val) { name: "监测时间", form: 0, type: "tableFormat", tableFormat: function (val) {
...@@ -1407,8 +1418,8 @@ var reqApis = function () { ...@@ -1407,8 +1418,8 @@ var reqApis = function () {
baseInfo: { baseInfo: {
"sensorname": { name: "设备名称" }, "sensorname": { name: "设备名称" },
"sensorid": { name: "设备ID" }, "sensorid": { name: "设备ID" },
"pslvalue": { name: "监测值(m³)" }, "pslvalue": { name: "流速(m³/h)" },
"psssvalue": { name: "瞬时流量(m³)" }, // "psssvalue": { name: "瞬时流量(m³)" },
"state": { name: "是否报警", type: 'select', }, "state": { name: "是否报警", type: 'select', },
"time": { "time": {
name: "监测时间", form: 0, type: "tableFormat", tableFormat: function (val) { name: "监测时间", form: 0, type: "tableFormat", tableFormat: function (val) {
...@@ -2239,28 +2250,110 @@ var reqApis = function () { ...@@ -2239,28 +2250,110 @@ var reqApis = function () {
name: '历史记录', name: '历史记录',
Dict: { Dict: {
baseInfo: { baseInfo: {
"equipname": { name: "设备名称", must: true, disabled: true }, "equipname": { name: "类别", must: true, disabled: true },
"equipno": { name: "设备ID", must: true, disabled: true }, // "equipno": { name: "设备ID", must: true, disabled: true },
"onelevelalarm": { // "bluealarm": {
name: "红色报警", must: true, type: 'tableFormat', tableFormat: function (val) { // name: "蓝色报警", must: true, type: 'tableFormat', tableFormat: function (val) {
return val + ' (' + this.unit + ')' // return val
} // }
}, // },
"twolevelalarm": { // "yellowalarm": {
name: "橙色报警", must: true, type: 'tableFormat', tableFormat: function (val) { // name: "黄色报警", must: true, type: 'tableFormat', tableFormat: function (val) {
return val + ' (' + this.unit + ')' // return val
// }
// },
// "orangealarm": {
// name: "橙色报警", must: true, type: 'tableFormat', tableFormat: function (val) {
// return val
// }
// },
// "redalarm": {
// name: "红色报警", must: true, type: 'tableFormat', tableFormat: function (val) {
// return val
// }
// },
"fourlevelalarm": {
name: "蓝色报警", must: true, type: 'tableFormat', tableFormat: function (val) {
return val
} }
}, },
"threelevelalarm": { "threelevelalarm": {
name: "黄色报警", must: true, type: 'tableFormat', tableFormat: function (val) { name: "黄色报警", must: true, type: 'tableFormat', tableFormat: function (val) {
return val + ' (' + this.unit + ')' return val
} }
}, },
"fourlevelalarm": { "twolevelalarm": {
name: "蓝色报警", must: true, type: 'tableFormat', tableFormat: function (val) { name: "橙色报警", must: true, type: 'tableFormat', tableFormat: function (val) {
return val + ' (' + this.unit + ')' return val
} }
}, },
"onelevelalarm": {
name: "红色报警", must: true, type: 'tableFormat', tableFormat: function (val) {
return val
}
},
// "fivedayone": {
// name: "5天位移速率红色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "fivedaytwo": {
// name: "5天位移速率橙色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "fivedaythree": {
// name: "5天位移速率黄色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "fivedayfour": {
// name: "5天位移速率蓝色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "dayone": {
// name: "1天位移速率红色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "daytwo": {
// name: "1天位移速率橙色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "daythree": {
// name: "1天位移速率黄色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "dayfour": {
// name: "1天位移速率蓝色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "hone": {
// name: "1小时位移速率红色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "htwo": {
// name: "1小时位移速率橙色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "hthree": {
// name: "1小时位移速率黄色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
// "hfour": {
// name: "1小时位移速率蓝色报警", must: false, type: 'tableFormat', tableFormat: function (val) {
// return val ? (val + ' (' + this.unit + ')') : ''
// }
// },
}, },
selectList: {}, selectList: {},
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment