-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -841,11 +814,20 @@ export default {
total: 1
},
testPointForm:{
- measurePointNumber: '',
- measurePointName: '',
- measurePointAddr: '',
- acquisitionInstrumentNumber: '',
- sensorTypeId: ''
+ measurePointNumber: '',// 测点编号
+ measurePointName: '',// 测点名称
+ measurePointAddr: '', // 测点位置
+ // sensorSn: '',
+ // sensorTypeId: '',
+ sensorList:[
+ {
+ sensorSn:'', // 传感器编号
+ sensorTypeId:'', // 传感器类型
+ earlyWarningValue:'', // 预警
+ alarmValue:'', //报警
+ controlValue:'',//控制
+ }
+ ], // 传感器编号类型数组
},
dialogVisible: false,
dialogVisible2: false,
@@ -895,19 +877,13 @@ export default {
measurePointAddr: [
{ required: true, message: '请输入测点位置', trigger: 'blur' }
],
- acquisitionInstrumentNumber: [
+ sensorSn: [
{ required: true, message: '请输入采集仪编号', trigger: 'blur' }
],
sensorTypeId: [
{ required: true, message: '请选择传感器类型', trigger: 'change' }
],
},
- sensorList:[
- {
- acquisitionInstrumentNumber:'',
- sensorTypeId:'',
- }
- ], // 传感器编号类型数组
dialogdata:{
engineeringName: "",
// projectAddress: "",
@@ -976,13 +952,17 @@ export default {
methods:{
addRow(){
let obj = {
- acquisitionInstrumentNumber:'',
+ sensorSn:'',
sensorTypeId:'',
+ earlyWarningValue:'', // 预警
+ alarmValue:'', //报警
+ controlValue:'',//控制
}
- this.sensorList.push(obj)
+ // console.log('--------------',this.testPointForm.sensorList)
+ this.testPointForm.sensorList.push(obj)
},
- deleteRow(){
- this.sensorList.pop();
+ deleteRow(index){
+ this.testPointForm.sensorList.splice(index, 1);
},
checkMsg(){
// 1、布置图 2、测点
@@ -1253,25 +1233,27 @@ export default {
this.$refs['testPointForm'].validate((valid) => {
if (valid) {
let data = this.testPointForm
- this.testPointData.forEach(item=>{
- if(item.alarmValue == " "){
+ this.testPointForm.sensorList.forEach(item=>{
+ if(item.alarmValue == ""){
item.alarmValue = 0
}
- if(item.warningValue == " "){
- item.warningValue = 0
+ if(item.earlyWarningValue == ""){
+ item.earlyWarningValue = 0
}
- if(item.controlValue == " "){
+ if(item.controlValue == ""){
item.controlValue = 0
}
})
- data.thresholdList = this.testPointData
- data.deepExcavationId = this.deepExcavationList[this.activeDeep].id
+ // data.thresholdList = this.testPointData
+ // data.deepExcavationId = this.deepExcavationList[this.activeDeep].id
data.monitorTypeId = this.monitorTypeId
- console.log(data)
+ // console.log(data)
+ // data.sensorList = this.testPointForm
+ console.log('新增参数',data)
addDeepExcavationMeasurePointApi(data).then(res=>{
- console.log(res)
+ console.log('新增成功没',res)
if(res.code == 200 && res.success){
// 新增成功！
this.$message.success(this.$t('message.deepFoundConfig.addSuccess2'))
@@ -1307,16 +1289,22 @@ export default {
measurePointNumber: '',
measurePointName: '',
measurePointAddr: '',
- acquisitionInstrumentNumber: '',
- sensorTypeId: ''
- }
+ sensorList:[
+ {
+ sensorSn:'', // 传感器编号
+ sensorTypeId:'', // 传感器类型
+ earlyWarningValue:'', // 预警
+ alarmValue:'', //报警
+ controlValue:"",//控制
+ }
+ ],
+ },
this.isPreview = false
this.$refs['testPointForm'].resetFields()
- this.testPointData.forEach(item=>{
- item.alarmValue = 0
- item.warningValue = 0
- item.controlValue = 0
- item.openType = 2
+ this.testPointForm.sensorList.forEach(item=>{
+ item.alarmValue = ''
+ item.earlyWarningValue = ''
+ item.controlValue = ''
})
this.selectMeasurePointList()
// this.testPointData = this.testPointData
@@ -1695,13 +1683,16 @@ export default {
let data = {
alarmState: this.alarmStatus ? this.alarmStatus:"",
measurePointNumber: this.devNum,
- monitorTypeId: this.monitorTypeId
+ monitorTypeId: this.monitorTypeId,
+ pageNo: this.pagInfo.pageNo,
+ pageSize: this.pagInfo.pageSize,
}
+
selectMeasurePointListApi(data).then(res=>{
console.log(res)
if(res.code == 200){
- // surveyPointDetail
- this.surveyPointDetail = res.result
+ console.log('====查询测点管理的列表',res)
+ this.surveyPointDetail = res.result.records
}
})
},
@@ -1848,6 +1839,16 @@ export default {