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

Merge branch 'dev-yjl' into 'shenzhen-dev'

Browse Source 
项目版-高支模功能完善

See merge request !113
This commit is contained in:
袁晶琳 2023-03-13 17:57:40 +08:00
commit 119d93e1b6
8 changed files with 235 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -1,4 +1,4 @@
// var COMPANY = ''; //通用 var COMPANY = ''; //通用
// var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
// var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='hezhan'; //合展-宿迁
// var COMPANY='nanchang'; //南昌地铁、衢州 // var COMPANY='nanchang'; //南昌地铁、衢州
@ -7,7 +7,7 @@
// var COMPANY='shenbai'; //沈白高铁 // var COMPANY='shenbai'; //沈白高铁
// COMPANY = 'henan' // 河南春笋 // COMPANY = 'henan' // 河南春笋
// COMPANY = 'xingxuan' // COMPANY = 'xingxuan'
COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'hengtong'//瑞士恒通

3
src/assets/js/api/highModulus.js
View File

@ -30,3 +30,6 @@ export const selectHighFormworkPlaneFigureListApi = data => post('xmgl/highFormw
export const updateFigureCoordinateApi = data => post('xmgl/highFormworkPlaneFigureCoordinate/updateFigureCoordinate', data); export const updateFigureCoordinateApi = data => post('xmgl/highFormworkPlaneFigureCoordinate/updateFigureCoordinate', data);
// 查询点位 // 查询点位
export const selecthighFormworkPlaneFigureCoordinateListApi = data => post('xmgl/highFormworkPlaneFigureCoordinate/selectList',data); export const selecthighFormworkPlaneFigureCoordinateListApi = data => post('xmgl/highFormworkPlaneFigureCoordinate/selectList',data);
//分页列表查询高支模报警数据信息
export const getHighFormworkAlarmDataApi = data => get('/xmgl/highFormworkAlarmData/list', data);

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

@ -72,8 +72,9 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456 // axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789 // axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789
// axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789 // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789
axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
// axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上 // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上
axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地
} else if (process.env.NODE_ENV == 'debug') { } else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com' axios.defaults.baseURL = 'https://www.ceshi.com'

3
src/components/account.vue
View File

@ -127,7 +127,8 @@
</p> </p>
<!-- <p class="color_fff">{{$store.state.ACCOUNTTYPE[$store.state.userInfo.accountType-1]}}</p> --> <!-- <p class="color_fff">{{$store.state.ACCOUNTTYPE[$store.state.userInfo.accountType-1]}}</p> -->
<p class="color_fff" v-if="COMPANY == 'hengtong'"> <p class="color_fff" v-if="COMPANY == 'hengtong'">
{{ $store.state.userInfo.menuAuthority.roleName }} <!-- {{ $store.state.userInfo.menuAuthority.roleName }} -->
公司管理员
</p> </p>
<p class="color_fff" v-else> <p class="color_fff" v-else>
{{ headerConfiguration }} {{ headerConfiguration }}

10
src/store/index.js
View File

@ -48,9 +48,9 @@ export default new Vuex.Store({
BASEURL: baseUrl BASEURL: baseUrl
? baseUrl ? baseUrl
: window.location.protocol + "//" + window.location.host + "/", // : window.location.protocol + "//" + window.location.host + "/", //
UPLOADURL: // UPLOADURL:
window.location.protocol + "//" + window.location.host + "/upload/image", // // window.location.protocol + "//" + window.location.host + "/upload/image", //
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //测试 // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //测试
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */ /* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码 // tag: 部署河南项目时，需要打开这两行代码
@ -63,8 +63,8 @@ export default new Vuex.Store({
// BASEURL:'http://192.168.34.116:6023/', // BASEURL:'http://192.168.34.116:6023/',
// UPLOADURL: 'http://192.168.34.116:6023/upload/image', // UPLOADURL: 'http://192.168.34.116:6023/upload/image',
// FILEURL: 'http://192.168.34.116:6023/image/', // FILEURL: 'http://192.168.34.116:6023/image/',
// UPLOADURL: 'http://124.71.67.160:8088/upload/image', UPLOADURL: 'http://124.71.67.160:8088/upload/image',
// FILEURL: 'http://124.71.67.160:8088/image/', FILEURL: 'http://124.71.67.160:8088/image/',
//--- //---
// UPLOADURL: 'http://192.168.34.125:6023/upload/i·mage', // UPLOADURL: 'http://192.168.34.125:6023/upload/i·mage',
// FILEURL: 'http://192.168.34.125:6023/image/', // FILEURL: 'http://192.168.34.125:6023/image/',

0
src/assets/images/zjsj/blueH.png → src/views/projectAdmin/fourEngin/assets/images/common/blueH.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

2
src/views/projectAdmin/fourEngin/command/rightTwo.vue
View File

@ -132,7 +132,7 @@ export default {
.woria { .woria {
width: 100%; width: 100%;
height: calc(115% - 92px); height: calc(115% - 92px);
background: url(/img/blueH.da444a96.png) no-repeat; background: url(../assets/images/common/blueH.png) no-repeat;
background-size: 99% 101%; background-size: 99% 101%;
// margin-top: 10px; // margin-top: 10px;
.woriaTwo { .woriaTwo {

373
src/views/projectFront/highModulus/alarmInfo.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="alarm_box"> <div class="alarm_box">
<!-- <div class="search_box"> <!-- <div class="search_box">
<div class="search_item"> <div class="search_item">
<span>报警时间：</span> <span>报警时间：</span>
<el-date-picker <el-date-picker
@ -15,170 +15,235 @@
<el-button type="warning" plain>刷新</el-button> <el-button type="warning" plain>刷新</el-button>
<el-button type="primary" plain>查询</el-button> <el-button type="primary" plain>查询</el-button>
</div> --> </div> -->
<el-table :data="tableData" class="tables" height="660"> <el-table :data="tableData" class="tables" height="660">
<!-- 姓名 --> <!-- 姓名 -->
<el-table-column <el-table-column
prop="name" prop="measurePointName"
label="姓名" label="测量点编号"
> align="center"
</el-table-column> >
<!-- 时间 --> </el-table-column>
<el-table-column <el-table-column prop="alarmType" label="类型" align="center">
prop="createTime" <template slot-scope="scope" v-if="scope.row.alarmType === 1">
label="时间" <span class="color1">{{ getStatus(scope.row.alarmType) }}</span>
> </template>
</el-table-column> <template slot-scope="scope" v-else>
<!-- 备注 --> <span class="color2">{{ getStatus(scope.row.alarmType) }}</span>
<el-table-column </template>
prop="note" </el-table-column>
label="备注"> <el-table-column prop="type" label="报警类型" align="center">
</el-table-column> <template slot-scope="scope">
<!-- 操作 --> {{ getStatusTwo(scope.row.type) }}
<el-table-column </template>
prop="status" </el-table-column>
label="操作" <!-- 时间 -->
width="200"> <el-table-column prop="createTime" label="时间" align="center">
<template slot-scope="scope"> </el-table-column>
<div v-if="scope.row.status == '0'" class="status_item status_1">确认误报</div> <!-- 备注 -->
<div v-else-if="scope.row.status == '1'" class="status_item status_2">确认真实</div> <!-- <el-table-column prop="note" label="备注" align="center">
<div v-else-if="scope.row.status == '2'" class="status_item status_3">正在处理</div> </el-table-column> -->
<div v-else-if="scope.row.status == '3'" class="status_item status_4">申请销警</div> <!-- 操作 -->
<div v-else-if="scope.row.status == '4'" class="status_item status_5">确认消警</div> <!-- <el-table-column prop="status" label="操作" width="200" align="center">
</template> <template slot-scope="scope">
</el-table-column> <div v-if="scope.row.status == '0'" class="status_item status_1">
</el-table> 确认误报
<el-pagination </div>
class="pagerBox" <div v-else-if="scope.row.status == '1'" class="status_item status_2">
@size-change="handleSizeChange" 确认真实
@current-change="handleCurrentChange" </div>
:current-page="filterForm.pageNo" <div v-else-if="scope.row.status == '2'" class="status_item status_3">
:page-sizes="$store.state.PAGESIZRS" 正在处理
:page-size="filterForm.pageSize" </div>
layout="total, sizes, prev, pager, next" <div v-else-if="scope.row.status == '3'" class="status_item status_4">
:total="pageTotal" 申请销警
background </div>
></el-pagination> <div v-else-if="scope.row.status == '4'" class="status_item status_5">
确认消警
</div>
</template>
</el-table-column> -->
</el-table>
<el-pagination
class="pagerBox"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="formData.pageNo"
:page-sizes="$store.state.PAGESIZRS"
:page-size="formData.pageSize"
layout="total, sizes, prev, pager, next"
:total="Number(formData.total)"
background
></el-pagination>
</div> </div>
</template> </template>
<script> <script>
import { getHighFormworkAlarmDataApi } from '@/assets/js/api/highModulus.js'
export default { export default {
data(){ data() {
return{ return {
tableData:[{ // tableData: [
name: '管理员', // {
createTime: '2021-11-23 11:00:20', // name: '管理员',
status: 0, // createTime: '2021-11-23 11:00:20',
note: '警情确认：误报；报警测点：["A01"]；报警原因：试验测试' // status: 0,
},{ // note: '警情确认：误报；报警测点：["A01"]；报警原因：试验测试'
name: '管理员', // },
createTime: '2021-11-23 10:35:22', // {
status: 2, // name: '管理员',
note: '警情确认：真实警情；报警测点：["A03"]；报警原因：设备故障' // createTime: '2021-11-23 10:35:22',
},{ // status: 2,
name: '管理员', // note: '警情确认：真实警情；报警测点：["A03"]；报警原因：设备故障'
createTime: '2021-11-22 18:55:10', // },
status: 3, // {
note: '警情确认：真实警情；报警测点：["A05"]；报警原因：超出控制值' // name: '管理员',
},{ // createTime: '2021-11-22 18:55:10',
name: '管理员', // status: 3,
createTime: '2021-11-22 16:00:10', // note: '警情确认：真实警情；报警测点：["A05"]；报警原因：超出控制值'
status: 1, // },
note: '警情确认：真实警情；报警测点：["B01"]；报警原因：超出预警值' // {
}, // name: '管理员',
{ // createTime: '2021-11-22 16:00:10',
name: '管理员', // status: 1,
createTime: '2021-11-22 14:00:10', // note: '警情确认：真实警情；报警测点：["B01"]；报警原因：超出预警值'
status: 1, // },
note: '警情确认：真实警情；报警测点：["A06"]；报警原因：超出预警值' // {
}, // name: '管理员',
{ // createTime: '2021-11-22 14:00:10',
name: '管理员', // status: 1,
createTime: '2021-11-22 12:01:21', // note: '警情确认：真实警情；报警测点：["A06"]；报警原因：超出预警值'
status: 1, // },
note: '警情确认：真实警情；报警测点：["B05"]；报警原因：超出预警值' // {
}, // name: '管理员',
{ // createTime: '2021-11-22 12:01:21',
name: '管理员', // status: 1,
createTime: '2021-11-22 11:50:30', // note: '警情确认：真实警情；报警测点：["B05"]；报警原因：超出预警值'
status: 1, // },
note: '警情确认：真实警情；报警测点：["A06"]；报警原因：超出预警值' // {
}, // name: '管理员',
{ // createTime: '2021-11-22 11:50:30',
name: '管理员', // status: 1,
createTime: '2021-11-22 10:06:11', // note: '警情确认：真实警情；报警测点：["A06"]；报警原因：超出预警值'
status: 1, // },
note: '警情确认：真实警情；报警测点：["B11"]；报警原因：超出预警值' // {
}, // name: '管理员',
{ // createTime: '2021-11-22 10:06:11',
name: '管理员', // status: 1,
createTime: '2021-11-22 08:00:00', // note: '警情确认：真实警情；报警测点：["B11"]；报警原因：超出预警值'
status: 1, // },
note: '警情确认：真实警情；报警测点：["A06"]；报警原因：超出报警值' // {
},{ // name: '管理员',
name: '管理员', // createTime: '2021-11-22 08:00:00',
createTime: '2021-11-21 17:06:53', // status: 1,
status: 4, // note: '警情确认：真实警情；报警测点：["A06"]；报警原因：超出报警值'
note: '警情确认：真实警情；报警测点：["A16"]；报警原因：超出预警值' // },
}], // {
filterForm:{ // name: '管理员',
pageNo: 1, // createTime: '2021-11-21 17:06:53',
pageSize: 10, // status: 4,
}, // note: '警情确认：真实警情；报警测点：["A16"]；报警原因：超出预警值'
timeData: [], // }
pageTotal: 0 // ],
} tableData: [],
}, formData: {
created(){ pageNo: 1,
this.pageTotal = this.tableData.length pageSize: 10,
}, total: 0,
methods:{ projectSn: ''
handleSizeChange(){ },
}, timeData: []
handleCurrentChange(){
}
} }
},
created() {
this.formData.projectSn = this.$store.state.projectSn
this.getData()
// this.pageTotal = this.tableData.length
},
methods: {
//数据转换
getStatus(alarmType) {
if (alarmType === 1) {
return '报警'
} else {
return '预警'
}
},
getStatusTwo(type) {
if (type === 1) {
return '电量(%)'
} else if (type === 2) {
return 'X轴( °)'
} else if (type === 3) {
return 'Y轴( °)'
} else if (type === 4) {
return '压力(kN)'
} else if (type === 5) {
return '沉降(mm)'
}
},
//查询高支模-报警信息
getData() {
getHighFormworkAlarmDataApi(this.formData).then((res) => {
console.log('查询高支模', res)
this.tableData = res.result.records
this.formData.total = res.result.total
})
},
handleSizeChange(val) {
this.pageSize = val
this.getData()
},
handleCurrentChange(val) {
this.pageNo = val
this.getData()
}
}
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.alarm_box{ .alarm_box {
height: 100%; height: 100%;
width: 100%; width: 100%;
background: #fff; background: #fff;
.status_item{ .status_item {
padding: 2px 10px; padding: 2px 10px;
display: inline-block; display: inline-block;
border-radius: 2px; border-radius: 2px;
} }
.status_1{ .status_1 {
background: #18bc9c; background: #18bc9c;
color: #fff; color: #fff;
} }
.status_2{ .status_2 {
background: #f39c12; background: #f39c12;
color: #fff; color: #fff;
} }
.status_3{ .status_3 {
background: #909399; background: #909399;
color: #fff; color: #fff;
} }
.status_4{ .status_4 {
background: #3498db; background: #3498db;
color: #fff; color: #fff;
} }
.status_5{ .status_5 {
background: #18bc9c; background: #18bc9c;
color: #fff; color: #fff;
} }
.search_box{ .search_box {
display: flex; display: flex;
padding: 20px; padding: 20px;
.search_item{ .search_item {
margin-right: 20px; margin-right: 20px;
}
} }
}
.color1 {
color: red;
}
.color2 {
color: orange;
}
} }
</style> </style>