深基坑系统(基坑配置):测点管理新增查询接口对接
This commit is contained in:
骆乐
parent
7bafcd94a6
commit
d5dfbd12f9
@ -40,8 +40,8 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
|
||||
// tag: 本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地
|
||||
axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
|
||||
// axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
|
||||
axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
|
||||
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
|
||||
// axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
|
||||
|
||||
@ -45,16 +45,16 @@ export default new Vuex.Store({
|
||||
// UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
|
||||
// FILEURL:'http://10.0.1.43:6023/image/',//测试
|
||||
BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
|
||||
UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
|
||||
FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
|
||||
// UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
|
||||
// FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
|
||||
/* 2022-05-16 */
|
||||
// tag: 部署河南项目时，需要打开这两行代码
|
||||
// UPLOADURL: 'http://124.71.178.44:100/upload/image',
|
||||
// FILEURL: 'http://124.71.178.44:100/image/',
|
||||
|
||||
/* 2022-06-06 杨意本地的*/ // BASEURL:'http://192.168.34.174:6023/',
|
||||
// UPLOADURL: 'http://192.168.34.125:6023/upload/image',
|
||||
// FILEURL: 'http://192.168.34.125:6023/image/',
|
||||
UPLOADURL: 'http://192.168.34.125:6023/upload/image',
|
||||
FILEURL: 'http://192.168.34.125:6023/image/',
|
||||
// 邱平毅的
|
||||
// UPLOADURL: 'http://192.168.34.216:6023/upload/image',
|
||||
// FILEURL: 'http://192.168.34.216:6023/image/',
|
||||
|
||||
@ -343,8 +343,8 @@
|
||||
<el-table-column prop="measurePointName" :label="$t('message.deepFoundConfig.pointName')"></el-table-column>
|
||||
<!-- 测点位置 -->
|
||||
<el-table-column prop="measurePointAddr" :label="$t('message.deepFoundConfig.pointLocation')"></el-table-column>
|
||||
<!-- 采集仪编号 -->
|
||||
<el-table-column prop="acquisitionInstrumentNumber" :label="$t('message.deepFoundConfig.devNo')"></el-table-column>
|
||||
<!-- 传感器编号 -->
|
||||
<!-- <el-table-column prop="sensorSn" label="传感器编号"></el-table-column> -->
|
||||
<!-- <el-table-column label="工作状态">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.workStatus ? scope.row.workStatus == 1 ? "正常":"异常":""}}</span>
|
||||
@ -476,7 +476,7 @@
|
||||
@close="closeDialog2">
|
||||
<div class="dialog-content">
|
||||
<div class="form-wrap">
|
||||
<vue-scroll style="height: 100%;margin-bottom: 50px;">
|
||||
<vue-scroll style="height: 90%;margin-bottom: 50px;">
|
||||
<el-form
|
||||
size="medium"
|
||||
class="formBox"
|
||||
@ -498,12 +498,12 @@
|
||||
<el-input :disabled="isPreview" v-model="testPointForm.measurePointAddr" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 采集仪编号 -->
|
||||
<!-- <el-form-item :label="$t('message.deepFoundConfig.devNo')" prop="acquisitionInstrumentNumber">
|
||||
<el-input :disabled="isPreview" v-model="testPointForm.acquisitionInstrumentNumber" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
<!-- <el-form-item :label="$t('message.deepFoundConfig.devNo')" prop="sensorSn">
|
||||
<el-input :disabled="isPreview" v-model="testPointForm.sensorSn" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</el-form-item> -->
|
||||
<!-- 传感器编号 -->
|
||||
<!-- <el-form-item :label="'传感器编号'" prop="acquisitionInstrumentNumber">
|
||||
<el-input :disabled="isPreview" v-model="testPointForm.acquisitionInstrumentNumber" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
<!-- <el-form-item :label="'传感器编号'" prop="sensorSn">
|
||||
<el-input :disabled="isPreview" v-model="testPointForm.sensorSn" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</el-form-item> -->
|
||||
<!-- 传感器类型 -->
|
||||
<!-- <el-form-item :label="$t('message.deepFoundConfig.devType')" prop="sensorTypeId"> -->
|
||||
@ -517,13 +517,14 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<div v-for="(item,index) in sensorList" :key="index">
|
||||
<el-form-item :label="`传感器编号${index +1}`" prop="acquisitionInstrumentNumber">
|
||||
<el-input :disabled="isPreview" v-model="item.acquisitionInstrumentNumber" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
<div class="sensor" v-for="(item,index) in testPointForm.sensorList" :key="index">
|
||||
<div class="sensorDel"><i v-if="testPointForm.sensorList.length > 1" @click="deleteRow(index)" class="el-icon-close"></i></div>
|
||||
<el-form-item :label="`传感器编号${index +1}`" :prop ="item.sensorSn"
|
||||
:rules="{ required: true, message: '请输入传感器编号', trigger: 'blur'}">
|
||||
<el-input :disabled="isPreview" v-model="item.sensorSn" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 传感器类型 -->
|
||||
<el-form-item :label="`传感器类型${index +1}`" prop="sensorTypeId">
|
||||
<!-- <el-input v-model="testPointForm.sensorTypeId"></el-input> -->
|
||||
<el-form-item :label="`传感器类型${index +1}`" :prop="item.sensorTypeId"
|
||||
:rules="{ required: true, message: '请输入传感器类型', trigger: 'blur'}">
|
||||
<el-select style="width: 100%" :disabled="isPreview" v-model="item.sensorTypeId" :placeholder="$t('message.deepFoundConfig.placeholderText2')">
|
||||
<el-option
|
||||
v-for="item in typeOptions"
|
||||
@ -533,61 +534,33 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label-width="120px" :label="`预警${index +1}`" :prop ="item.earlyWarningValue"
|
||||
:rules="{ required: true, message: '请输入预警数', trigger: 'blur'}">
|
||||
<el-input maxlength="10" :disabled="isPreview" v-model="item.earlyWarningValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item :label="`报警${index +1}`" :prop ="item.alarmValue"
|
||||
:rules="{ required: true, message: '请输入报警数', trigger: 'blur'}">
|
||||
<el-input :disabled="isPreview" v-model="item.alarmValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item :label="`控制${index +1}`" :prop ="item.controlValue"
|
||||
:rules="{ required: true, message: '请输入控制数', trigger: 'blur'}">
|
||||
<el-input :disabled="isPreview" v-model="item.controlValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
<el-button type="primary" @click="addRow()" size="medium" plain>添加</el-button>
|
||||
<el-button type="primary" v-if="sensorList.length > 1" @click="deleteRow()" size="medium" plain>删除</el-button>
|
||||
<!-- 警情设置 -->
|
||||
<el-form-item :label="$t('message.deepFoundConfig.alarmConfig')" prop="devType">
|
||||
</el-form-item>
|
||||
<el-table class="tables" :data="testPointData">
|
||||
<!-- 对象 -->
|
||||
<el-table-column
|
||||
:label="$t('message.deepFoundConfig.obj')"
|
||||
prop="targetName"
|
||||
>
|
||||
</el-table-column>
|
||||
<!-- 开启 -->
|
||||
<el-table-column
|
||||
:label="$t('message.deepFoundConfig.open')"
|
||||
width="100px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
:disabled="isPreview"
|
||||
v-model="scope.row.openType"
|
||||
:active-value="1"
|
||||
:inactive-value="2"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#9598A0">
|
||||
</el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 预警 -->
|
||||
<el-table-column
|
||||
:label="$t('message.deepFoundConfig.warning')"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input type="Number" :disabled="isPreview" v-model="scope.row.warningValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 报警 -->
|
||||
<el-table-column
|
||||
:label="$t('message.deepFoundConfig.alarm')"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input type="Number" :disabled="isPreview" v-model="scope.row.alarmValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 控制 -->
|
||||
<el-table-column
|
||||
:label="$t('message.deepFoundConfig.control')"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input type="Number" :disabled="isPreview" v-model="scope.row.controlValue" :placeholder="$t('message.deepFoundConfig.placeholderText')"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- v-if="testPointForm.sensorList.length > 1" -->
|
||||
<!-- <el-button type="primary" v-if="testPointForm.sensorList.length > 1" @click="deleteRow()" size="medium" plain>删除</el-button> -->
|
||||
|
||||
|
||||
</el-form>
|
||||
</vue-scroll>
|
||||
<div class="btn-box" v-if="!isPreview">
|
||||
@ -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 {
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.sensor{
|
||||
border: 1px solid #e7e8eb;
|
||||
margin-bottom: 10px;
|
||||
padding: 20px 30px 10px 25px ;
|
||||
border-radius: 10px;
|
||||
.sensorDel{
|
||||
position: absolute;
|
||||
right:60px;
|
||||
}
|
||||
}
|
||||
.foundationPit-config{
|
||||
// background: #fff;
|
||||
width: 100%;
|
||||
@ -2027,12 +2028,12 @@ export default {
|
||||
}
|
||||
}
|
||||
.dialog-content{
|
||||
height: 680px;
|
||||
height: 650px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
.btn-box{
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
.backText{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user