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

fix: 修改机械设备定位和智能安全帽模块bug

Browse Source
This commit is contained in:
Vce 2024-03-25 11:06:28 +08:00
parent 01cfac30b0
commit 03b9230d80
5 changed files with 28 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,10 +85,10 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址

5
src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
View File

@ -4,8 +4,8 @@
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<!-- 机械设备名称 -->
<el-form-item label="机械设备名称" prop="equipmentName">
<el-select v-model="searchForm.equipmentName" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.equipmentName" ></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.devSn" ></el-option>
</el-select>
</el-form-item>
<!-- 设备序号 -->
@ -123,6 +123,7 @@ export default {
},
refresh() {
this.searchForm = {}
this.daterange = []
this.pageInfo.pageNo = 1 //页数
this.pageInfo.pageSize = 10 //条数
this.getPage()

33
src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
View File

@ -4,21 +4,21 @@
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<!-- 机械设备名称 -->
<el-form-item label="机械设备名称" prop="equipmentName">
<el-select v-model="searchForm.equipmentName" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.equipmentName" ></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.devSn"></el-option>
</el-select>
</el-form-item>
<!-- 设备序号 -->
<el-form-item label="设备序号" prop="devSn">
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.devSn" :value="item.devSn" ></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.devSn" :value="item.devSn"></el-option>
</el-select>
</el-form-item>
<!-- 时间 -->
<el-form-item label="时间">
<el-date-picker size="medium" v-model="daterange" type="datetimerange" :default-time="['00:00:00', '23:59:59']"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" :start-placeholder="'开始日期'" :end-placeholder="'结束日期'"
@change="changeDate">
<el-date-picker size="medium" v-model="daterange" type="datetimerange"
:default-time="['00:00:00', '23:59:59']" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
:start-placeholder="'开始日期'" :end-placeholder="'结束日期'" @change="changeDate">
</el-date-picker>
</el-form-item>
<!-- 条件查询按钮 -->
@ -32,7 +32,7 @@
<vue-scroll style="height: 80%">
<el-table class="tables" v-loading="loading" :data="tableData">
<el-table-column label="机械设备名称" align="center" prop="equipmentName" />
<el-table-column label="设备序号" align="center" prop="devSn" width="180"/>
<el-table-column label="设备序号" align="center" prop="devSn" width="180" />
<el-table-column label="当前位置" align="center" width="180">
<template slot-scope="scope">
{{ '经度：' + scope.row.longitude + ' 纬度：' + scope.row.latitude }}
@ -60,20 +60,12 @@
{{ scope.row.equipmentVoltage + ' '}}伏特
</template>
</el-table-column>
<el-table-column label="上传时间" align="center" prop="uploadTime" width="180"/>
<el-table-column label="上传时间" align="center" prop="uploadTime" width="180" />
</el-table>
</vue-scroll>
<el-pagination
class="pagerBox"
@size-change="SizeChange"
@current-change="CurrentChange"
:current-page="pageInfo.pageNo"
:page-sizes="$store.state.PAGESIZRS"
:page-size="pageInfo.pageSize"
layout="total, sizes, prev, pager, next"
:total="Number(pageInfo.total)"
background
></el-pagination>
<el-pagination class="pagerBox" @size-change="SizeChange" @current-change="CurrentChange"
:current-page="pageInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pageInfo.pageSize"
layout="total, sizes, prev, pager, next" :total="Number(pageInfo.total)" background></el-pagination>
</div>
</div>
</template>
@ -149,6 +141,7 @@ export default {
},
refresh() {
this.searchForm = {}
this.daterange = []
this.pageInfo.pageNo = 1 //页数
this.pageInfo.pageSize = 10 //条数
this.getPage()

6
src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
View File

@ -4,8 +4,9 @@
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<!-- 人员名称 -->
<el-form-item label="人员名称" prop="workerInfoId">
<el-select v-model="searchForm.workerInfoId" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
<el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
</el-select>
</el-form-item>
<!-- 设备序号 -->
@ -143,6 +144,7 @@ export default {
},
refresh() {
this.searchForm = {}
this.daterange = []
this.pageInfo.pageNo = 1 //页数
this.pageInfo.pageSize = 10 //条数
this.getPage()

30
src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
View File

@ -9,34 +9,15 @@
>
<!-- 人员名称 -->
<el-form-item label="人员名称" prop="workerInfoId">
<el-select
v-model="searchForm.workerInfoId"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in workerList"
:key="index"
:label="item.workerName"
:value="item.id"
></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
<el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
</el-select>
</el-form-item>
<!-- 设备序号 -->
<el-form-item label="设备序号" prop="devSn">
<el-select
v-model="searchForm.devSn"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in devSnList"
:key="index"
:label="item.devSn"
:value="item.devSn"
></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in devSnList" :key="index" :label="item.devSn" :value="item.devSn" ></el-option>
</el-select>
</el-form-item>
<!-- 时间 -->
@ -181,6 +162,7 @@ export default {
},
refresh() {
this.searchForm = {};
this.daterange = []
this.pageInfo.pageNo = 1; //页数
this.pageInfo.pageSize = 10; //条数
this.getPage();