admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-xiaole' into shenzhen-dev

Browse Source
This commit is contained in:
骆乐 2022-08-26 18:18:10 +08:00
commit 248b54a115
8 changed files with 160 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/menu/saosao_active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

2
src/assets/js/api/deepFoundationPitManage.js
View File

@ -25,6 +25,8 @@ export const selectDeepExcavationCurrentDataApi = data => post('xmgl/deepExcavat
// 添加基坑平面图
export const addDeepExcavationPlaneFigureApi = data => post('xmgl/deepExcavationPlaneFigure/add', data);
// 编辑基坑平面图
export const editDeepExcavationPlaneFigureApi = data => post('xmgl/deepExcavationPlaneFigure/edit', data);
// 删除基坑平面图
export const deleteDeepExcavationPlaneFigureApi = data => post('xmgl/deepExcavationPlaneFigure/delete', data);
// 列表查询基坑平面图

4
src/assets/js/http.js
View File

@ -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://139.9.66.234:8/';

8
src/store/index.js
View File

@ -45,8 +45,8 @@ 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',
@ -56,8 +56,8 @@ export default new Vuex.Store({
// 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/',
// UPLOADURL: 'http://192.168.34.216:6023/upload/image',
// FILEURL: 'http://192.168.34.216:6023/image/',
// UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
// FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式

155
src/views/projectFront/deepFoundationPitManage/dataConfig.vue
View File

@ -489,7 +489,7 @@
? $t('message.deepFoundConfig.warning'):scope.row.alarmState == 1
? $t('message.deepFoundConfig.alarm'):scope.row.alarmState == 3
? $t('message.deepFoundConfig.control'):""}}
</span> -->
</span>-->
<span
:class="{'alarm_status1': scope.row.alarmState == 1,
'alarm_status2': scope.row.alarmState == 2,
@ -786,7 +786,7 @@
<el-input
maxlength="10"
:disabled="isPreview"
v-model="item.earlyWarningValue"
v-model.trim="item.earlyWarningValue"
:placeholder="$t('message.deepFoundConfig.placeholderText')"
></el-input>
</el-form-item>
@ -799,7 +799,7 @@
>
<el-input
:disabled="isPreview"
v-model="item.alarmValue"
v-model.trim="item.alarmValue"
:placeholder="$t('message.deepFoundConfig.placeholderText')"
></el-input>
</el-form-item>
@ -812,7 +812,7 @@
>
<el-input
:disabled="isPreview"
v-model="item.controlValue"
v-model.trim="item.controlValue"
:placeholder="$t('message.deepFoundConfig.placeholderText')"
></el-input>
</el-form-item>
@ -867,13 +867,21 @@
<img :src="item.imageUrl" @click="checkImg(item,index)" />
<div class="actions-box">
<span>{{item.planeFigureName}}</span>
<!-- 编辑 -->
<el-button
type="text"
style="color: #84b2fa;"
icon="el-icon-edit"
@click="editDeepimg(item)"
></el-button>
<!-- 删除 -->
<el-button
type="text"
icon="el-icon-delete"
style="color: #F56C6C"
@click="deleteDeepImg(item)"
>{{$t('message.deepFoundConfig.remove')}}</el-button>
></el-button>
<!-- {{$t('message.deepFoundConfig.remove')}} -->
</div>
</li>
</ul>
@ -934,7 +942,7 @@
<p>传感器编号：{{item2.sensorSn}}</p>
<p>传感器名称：{{item2.sensorTypeName == null ? '无' : item2.sensorTypeName }}</p>
<p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p>
</div> -->
</div>-->
<p
v-for="(item2,index2) in item.detailList"
:key="index2"
@ -976,9 +984,10 @@
</div>
</el-dialog>
<!-- 添加平面图 -->
<!-- :title="$t('message.deepFoundConfig.addImg')" -->
<el-dialog
width="35%"
:title="$t('message.deepFoundConfig.addImg')"
:title="title"
class="dialog-center"
:visible.sync="showAddImg"
@close="closeAddImg"
@ -1043,15 +1052,15 @@
</el-form-item>
</el-form>
<div class="btn-box">
<el-button
icon="el-icon-circle-close"
@click="closeAddImg"
>{{$t('message.deepFoundConfig.cancel')}}</el-button>
<el-button
type="primary"
icon="el-icon-circle-check"
@click="submitImgConfig"
>{{$t('message.deepFoundConfig.confirm')}}</el-button>
<el-button
icon="el-icon-circle-close"
@click="closeAddImg"
>{{$t('message.deepFoundConfig.cancel')}}</el-button>
</div>
</div>
</el-dialog>
@ -1093,6 +1102,7 @@ import {
selectDeepExcavationCurrentDataListApi,
selectDeepExcavationCurrentDataApi,
addDeepExcavationPlaneFigureApi,
editDeepExcavationPlaneFigureApi,
selectDeepExcavationPlaneFigureListApi,
selectDeepExcavationPlaneFigureCoordinateApi,
selectDeepExcavationAllMeasurePointListApi,
@ -1321,7 +1331,10 @@ export default {
removeType: "",
total: 0,
pageNo: 1,
pageSize: 10
pageSize: 10,
title: "",
dialogType: 1, // 1添加 2 编辑
id: ""
};
},
created() {
@ -1468,44 +1481,7 @@ export default {
};
this.$refs["testPointImgForm"].resetFields();
},
// 删除布置图
deleteDeepImg(val) {
// deleteDeepExcavationPlaneFigureApi({id: val.id}).then(res=>{
// if(res.code == 200){
// this.$message.success('删除成功！')
// this.activeImgUrl = ''
// this.pointList = []
// this.selectDeepExcavationPlaneFigureList()
// }
// })
this.removeType = 1;
this.removeData = val;
this.deleteInfo = true;
},
submitImgConfig() {
this.$refs["testPointImgForm"].validate(valid => {
if (valid) {
let data = {
planeFigureName: this.testPointImgForm.planeFigureName,
pointIds: this.testPointImgForm.pointIds.join(","),
imageUrl: this.testPointImgForm.fileList[0].url,
projectSn: this.projectSn,
deepExcavationId: this.deepExcavationId
};
console.log(data);
addDeepExcavationPlaneFigureApi(data).then(res => {
console.log(res);
if (res.code == 200) {
this.$message.success(
this.$t("message.deepFoundConfig.addSuccess")
);
this.selectDeepExcavationPlaneFigureList();
this.showAddImg = false;
}
});
}
});
},
// 列表查询所有测点
selectDeepExcavationAllMeasurePointList() {
selectDeepExcavationAllMeasurePointListApi({
@ -1517,17 +1493,81 @@ export default {
}
});
},
// 添加布置图
openAddImgDialog() {
this.title = "添加平面图";
this.dialogType = 1;
this.showAddImg = true;
this.selectDeepExcavationAllMeasurePointList();
},
// 编辑布置图
editDeepimg(val) {
console.log("编辑", val);
this.title = "编辑平面图";
this.dialogType = 2;
this.showAddImg = true;
this.id = val.id;
this.selectDeepExcavationAllMeasurePointList();
this.testPointImgForm.planeFigureName = val.planeFigureName;
this.testPointImgForm.pointIds = val.pointIds.split(",");
this.testPointImgForm.fileList = [{ url: val.imageUrl }];
},
// 添加编辑保存
submitImgConfig() {
this.$refs["testPointImgForm"].validate(valid => {
if (valid) {
let data = {
planeFigureName: this.testPointImgForm.planeFigureName,
pointIds: this.testPointImgForm.pointIds.join(","),
imageUrl: this.testPointImgForm.fileList[0].url,
projectSn: this.projectSn,
deepExcavationId: this.deepExcavationId
};
console.log(data);
if (this.dialogType == 1) {
addDeepExcavationPlaneFigureApi(data).then(res => {
console.log(res);
if (res.code == 200) {
this.$message.success(
this.$t("message.deepFoundConfig.addSuccess")
);
this.selectDeepExcavationPlaneFigureList();
this.showAddImg = false;
}
});
} else {
(data.id = this.id),
editDeepExcavationPlaneFigureApi(data).then(res => {
// console.log("--------编辑成功了吗", res);
if (res.code == 200) {
this.$message.success("编辑成功");
this.showAddImg = false;
this.testPointImgForm.pointIds = [];
console.log('编辑旺盛之后',this.testPointImgForm.pointIds)
let val = {
id: res.result.id,
deepExcavationId: res.result.deepExcavationId
};
this.selectDeepExcavationPlaneFigureCoordinate(val);
}
});
}
}
});
},
// 删除布置图
deleteDeepImg(val) {
this.removeType = 1;
this.removeData = val;
this.deleteInfo = true;
},
// 获取点位位置信息
selectDeepExcavationPlaneFigureCoordinate(val) {
selectDeepExcavationPlaneFigureCoordinateApi({
planeFigureId: val.id,
deepExcavationId: val.deepExcavationId
}).then(res => {
console.log('点点点',res);
console.log("点点点", res);
if (res.code == 200) {
res.result.forEach(item => {
item.status = "block";
@ -1541,7 +1581,6 @@ export default {
// keyName: obj[key]
// });
// }
item.detailList = arr;
});
this.pointList = res.result;
@ -1568,7 +1607,7 @@ export default {
};
selectDeepExcavationPlaneFigureListApi(data).then(res => {
if (res.code == 200) {
console.log(res);
console.log("布点图的信息", res);
this.deepImgList = res.result;
if (this.deepImgList.length > 0) {
this.checkImg(this.deepImgList[0], 0);
@ -1653,10 +1692,9 @@ export default {
data.deepExcavationId = this.deepExcavationId; // 深基坑id
// console.log(data)
// data.sensorList = this.testPointForm
console.log("新增参数", data);
// console.log("新增参数", data);
addDeepExcavationMeasurePointApi(data).then(res => {
console.log("新增成功没", res);
// console.log("新增成功没", res);
if (res.code == 200 && res.success) {
// 新增成功！
this.$message.success(
@ -1677,6 +1715,7 @@ export default {
let data = {};
// this.testPointForm = val
data.measurePointNumber = val.measurePointNumber;
data.relaId = val.relaId
getDetailDeepExcavationApi(data).then(res => {
console.log("--------------查询的结果", res.result);
res.result.sensorList.map(item => {
@ -2150,7 +2189,7 @@ export default {
pageNo: this.pageNo,
pageSize: this.pageSize
};
console.log('参数',data)
console.log("参数", data);
selectMeasurePointListApi(data).then(res => {
console.log(res);
if (res.code == 200) {
@ -2168,7 +2207,7 @@ export default {
this.pageNo = val;
this.selectMeasurePointList();
},
// 获取基坑布置图图片大小
getNaturalSize(callback) {
let Domlement = this.$refs["map"];

11
src/views/projectFront/deepFoundationPitManage/monitorData.vue
View File

@ -626,7 +626,7 @@ export default {
options: [],
getSensorList: [], // 传感器列表
checkList: "",
checkList2: {},
checkList2: "",
firstSelect: "",
dateTime: [],
searchDate: 1,
@ -1641,6 +1641,7 @@ export default {
console.log("当前点击行的值", val);
this.relaId = val.id;
this.checkList = "";
this.checkList2 = "";
// let arr = []
// for(let key in JSON.parse(val.dataField)){
// arr.push({
@ -1731,14 +1732,14 @@ export default {
},
checkNum(val) {
this.firstSelect = val;
console.log("当前选择", val);
// console.log("当前选择", val);
getSensorListApi({ measurePointNumber: this.firstSelect }).then(res => {
if (res.code == 200 && res.result) {
console.log("---------", res);
// console.log("---------", res);
this.getSensorList = res.result;
if (this.getSensorList.length != 0) {
if (this.getSensorList.length != 0) {
this.checkList2 = this.getSensorList[0].sensorSn;
this.getEchartsData();
this.getEchartsData(this.checkList2);
}
}
});

2
src/views/projectFront/inspecPoint/inspection.vue
View File

@ -34,7 +34,7 @@
<div class="tableBtns">
<div class="operationText">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<a download="preview" class="download" target="_blank" :href="$store.state.FILEURL + scope.row.qrCode">下载</a>
<a class="download" target="_blank" :href="$store.state.FILEURL + scope.row.qrCode" download>下载</a>
</div>
<div @click="toDelete(scope.row)" class="operationText">
<img src="@/assets/images/icon-delete.png" width="15px" height="15px" />

61
src/views/projectFront/lifter/alarmInfo.vue
View File

@ -98,14 +98,20 @@
<el-table-column prop="bottomAlarm" :label="$t('message.lifter.lowerLimitAlarm')">
<template slot-scope="scope">
<!-- normal 正常 alarm 报警 earlyWarning 预警 -->
{{ scope.row.bottomAlarm == 0? $t('message.lifter.normal') : scope.row.bottomAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.bottomAlarm == 1 }" >
{{ scope.row.bottomAlarm == 0? $t('message.lifter.normal') : scope.row.bottomAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 防坠器报警 -->
<el-table-column prop="fallAlarm" :label="$t('message.lifter.fallArresterAlarm')">
<template slot-scope="scope">
<span :class="{ 'alarm_statu2' : scope.row.fallAlarm == 1 }" >
{{ scope.row.fallAlarm == 0? $t('message.lifter.normal') : scope.row.fallAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
<!-- normal 正常 alarm 报警 earlyWarning 预警 -->
{{ scope.row.fallAlarm == 0? $t('message.lifter.normal') : scope.row.fallAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</template>
</el-table-column>
<!-- <el-table-column prop="name2" label="力矩"> </el-table-column>
@ -114,26 +120,35 @@
<!-- 高度报警 -->
<el-table-column prop="heightAlarm" :label="$t('message.lifter.altitudeAlarm')">
<template slot-scope="scope">
{{ scope.row.heightAlarm == 0? $t('message.lifter.normal') : scope.row.heightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.heightAlarm == 1 }" >
{{ scope.row.heightAlarm == 0? $t('message.lifter.normal') : scope.row.heightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 1号电机报警 -->
<el-table-column prop="motor1Alarm" :label="$t('message.lifter.firstAlarm')">
<template slot-scope="scope">
<!-- normal 正常 alarm 报警 earlyWarning 预警 -->
{{ scope.row.motor1Alarm == 0? $t('message.lifter.normal') : scope.row.motor1Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.motor1Alarm == 1 }" >
{{ scope.row.motor1Alarm == 0? $t('message.lifter.normal') : scope.row.motor1Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 2号电机报警 -->
<el-table-column prop="motor2Alarm" :label="$t('message.lifter.secondAlarm')">
<template slot-scope="scope">
{{ scope.row.motor2Alarm == 0? $t('message.lifter.normal') : scope.row.motor2Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.motor2Alarm == 1 }" >
{{ scope.row.motor2Alarm == 0? $t('message.lifter.normal') : scope.row.motor2Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 3号电机报警 -->
<el-table-column prop="motor3Alarm" :label="$t('message.lifter.thirdAlarm')">
<template slot-scope="scope">
{{ scope.row.motor3Alarm == 0? $t('message.lifter.normal') : scope.row.motor3Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.motor3Alarm == 1 }" >
{{ scope.row.motor3Alarm == 0? $t('message.lifter.normal') : scope.row.motor3Alarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- <el-table-column prop="speed" label="运行时刻"> </el-table-column> -->
@ -141,46 +156,63 @@
<!-- 倾角X报警 -->
<el-table-column prop="obliguityXAlarm" :label="$t('message.lifter.inclinationXAlarm')">
<template slot-scope="scope">
{{ scope.row.obliguityXAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityXAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.obliguityXAlarm == 1 }" >
{{ scope.row.obliguityXAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityXAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 倾角Y报警 -->
<el-table-column prop="obliguityYAlarm" :label="$t('message.lifter.inclinationYAlarm')">
<template slot-scope="scope">
{{ scope.row.obliguityYAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityYAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.obliguityYAlarm == 1 }" >
{{ scope.row.obliguityYAlarm == 0? $t('message.lifter.normal') : scope.row.obliguityYAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 人数报警 -->
<el-table-column prop="peopleCntAlarm" :label="$t('message.lifter.numberAlarm')">
<template slot-scope="scope">
<!-- normal 正常 alarm 报警 earlyWarning 预警 -->
{{ scope.row.peopleCntAlarm == 0? $t('message.lifter.normal') : scope.row.peopleCntAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.peopleCntAlarm == 1 }" >
{{ scope.row.peopleCntAlarm == 0? $t('message.lifter.normal') : scope.row.peopleCntAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 速度报警 -->
<el-table-column prop="speedAlarm" :label="$t('message.lifter.speedAlarm')">
<template slot-scope="scope">
<!-- normal 正常 alarm 报警 earlyWarning 预警 -->
<span :class="{ 'alarm_statu2' : scope.row.speedAlarm == 1 }" >
{{ scope.row.speedAlarm == 0? $t('message.lifter.normal') : scope.row.speedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
<!-- normal 正常 alarm 报警 earlyWarning 预警 -->
</template>
</el-table-column>
<!-- 防冲顶报警 -->
<el-table-column prop="topAlarm" :label="$t('message.lifter.antiImpactRoofAlarm')">
<template slot-scope="scope">
{{ scope.row.topAlarm == 0? $t('message.lifter.normal') : scope.row.topAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.topAlarm == 1 }" >
{{ scope.row.topAlarm == 0? $t('message.lifter.normal') : scope.row.topAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 载重报警 -->
<el-table-column prop="weightAlarm" :label="$t('message.lifter.loadAlarm')">
<template slot-scope="scope">
{{ scope.row.weightAlarm == 0? $t('message.lifter.normal') : scope.row.weightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
<span :class="{ 'alarm_statu2' : scope.row.weightAlarm == 1 }" >
{{ scope.row.weightAlarm == 0? $t('message.lifter.normal') : scope.row.weightAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
</template>
</el-table-column>
<!-- 风速报警 -->
<el-table-column prop="windSpeedAlarm" :label="$t('message.lifter.windSpeedAlarm')">
<template slot-scope="scope">
<span :class="{ 'alarm_statu2' : scope.row.windSpeedAlarm == 1 }" >
{{ scope.row.windSpeedAlarm == 0? $t('message.lifter.normal') : scope.row.windSpeedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</span>
<!-- normal 正常 alarm 报警 earlyWarning 预警 -->
{{ scope.row.windSpeedAlarm == 0? $t('message.lifter.normal') : scope.row.windSpeedAlarm == 1? $t('message.lifter.alarm') : $t('message.lifter.earlyWarning')}}
</template>
</el-table-column>
<!-- <el-table-column prop="name2" label="正常工作预警状态"> </el-table-column>
@ -389,5 +421,8 @@ export default {
height: 720px;
background-color: #ffffff;
}
.alarm_statu2{
color: #f76462;
}
}
</style>