haozq
/
ah_jjzhgd_webservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit

This commit is contained in:
sliang 2024-03-23 18:54:35 +08:00
parent 33f5f713b0
commit 3fc268b8cd
7 changed files with 129 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ah-jjzhgd-web/src/api/constructionQuality/earlyWarningRecord.js
View File

@ -17,6 +17,15 @@ return request({
})
}
function updEarly(data) {
return request({
url: '/background/constructionQuality/earlyWarningRecord/updEarly',
method: 'post',
data
})
}
export {
getEarlyWarningRecordLists,exportProject
getEarlyWarningRecordLists,exportProject,updEarly
}

4
ah-jjzhgd-web/src/api/towerDetection/earlyWarningRecord.js
View File

@ -2,7 +2,7 @@ import request from '@/utils/request'
function getEarlyWarningRecordLists(data) {
return request({
url: '/background/towerDetection/towerRecord/getTowerRecordLists',
url: '/background/towerDetection/earlyWarningRecord/getEarlyWarningRecordLists',
method: 'get',
params: data
})
@ -10,7 +10,7 @@ function getEarlyWarningRecordLists(data) {
function exportProject(data) {
return request({
url: '/background/towerDetection/towerRecord/exportProData',
url: '/background/towerDetection/earlyWarningRecord/exportProData',
method: 'get',
responseType: 'blob',
data

85
ah-jjzhgd-web/src/views/constructionQuality/earlyWarningsRecord/index.vue
View File

@ -1,14 +1,14 @@
<template>
<div class="app-container">
<div class="filter-container">
<el-input
v-model="listQuery.keyWord"
placeholder="请输入关键字"
style="width: 200px"
class="filter-item"
:maxlength="30"
@keyup.enter.native="handleFilter"
/>
<el-date-picker
v-model="listQuery.date"
style="width: 200px; margin-left: 20px"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
class="filter-item"
/>
<el-button
v-waves
style="margin-left: 40px"
@ -40,8 +40,19 @@
<span>{{ (listQuery.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column key="deviceName" label="告警内容" prop="deviceName" align="center" />
<el-table-column key="areaName" label="预警时间" prop="areaName" align="center" />
<el-table-column label="告警内容" prop="warnContent" align="center" />
<el-table-column label="预警时间" prop="warnTime" align="center" />
<!-- <el-table-column label="预警处置" prop="status" align="center"/> -->
<el-table-column label="预警处置" align="center">
<template slot-scope="{ row}">
<el-button v-if="row.status == '未处理'" v-waves type="text" size="mini" @click="getEarly(row)">未处理</el-button>
<el-button v-if="row.status == '预警正确'" v-waves type="text" size="mini">预警正确</el-button>
<el-button v-if="row.status == '预警错误'" v-waves type="text" size="mini" >预警错误</el-button>
</template>
</el-table-column>
</el-table>
<pagination
@ -51,6 +62,28 @@
:limit.sync="listQuery.pageSize"
@pagination="getList"
/>
<el-dialog
title="提示"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose">
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="" prop="status">
<el-radio-group v-model="ruleForm.status">
<el-radio label="1">预警正确</el-radio>
<el-radio label="2">预警错误</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="getAdd()">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
@ -58,12 +91,13 @@
import waves from '@/directive/waves'
import {
getEarlyWarningRecordLists,exportProject
getEarlyWarningRecordLists,exportProject,updEarly
} from '@/api/constructionQuality/earlyWarningRecord'
import _ from 'lodash/fp'
import { downloadFile } from '@/utils/download'
import Pagination from '@/components/Pagination'
export default {
// components: { Pagination, BuildSelect, ProcessTable },
components: { Pagination},
directives: { waves },
data() {
return {
@ -73,7 +107,7 @@
listQuery: {
pageNum: 1,
pageSize: 10,
keyWord: ''
date: ''
},
tableHeight: 650,
showReviewer: false,
@ -83,6 +117,11 @@
dialogPvVisible: false,
completeModalVisible: false,
processModalVisible: false,
dialogVisible:false,
ruleForm:{
status:'1',
},
warnId:''
}
},
created() {
@ -110,6 +149,26 @@
downloadFile({ fileName: ' 预警记录.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
})
},
getEarly(row){
console.log(row)
this.dialogVisible = true
this.warnId = row.warnId;
},
getAdd(){
this.ruleForm.warnId= this.warnId;
updEarly(this.ruleForm).then(response => {
this.$message({
showClose: true,
message: response.msg,
type: 'success',
duration: 2000
})
this.dialogVisible = false
this.getList()
})
}
}
}
</script>

58
ah-jjzhgd-web/src/views/constructionQuality/qualityRecord/index.vue
View File

@ -1,14 +1,24 @@
<template>
<div class="app-container">
<div class="filter-container">
<ProjectSelect :bind-type="''" :bind-value.sync="listQuery.proIds" style="width: 200px;" class="filter-item" />
<el-date-picker
v-model="listQuery.date"
style="width: 200px; margin-left: 20px"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
class="filter-item"
/>
<el-input
v-model="listQuery.keyWord"
placeholder="请输入关键字"
style="width: 200px"
placeholder="请输入设备名称"
style="width: 200px;margin-left: 20px"
class="filter-item"
:maxlength="30"
@keyup.enter.native="handleFilter"
/>
<el-button
v-waves
style="margin-left: 40px"
@ -40,13 +50,13 @@
<span>{{ (listQuery.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column key="deviceName" label="设备名称" prop="deviceName" align="center" />
<el-table-column key="areaName" label="区域名称" prop="areaName" align="center" />
<el-table-column key="areaName" label="施工工艺" prop="areaName" align="center" />
<el-table-column key="modeName" label="标准值" prop="modeName" align="center" />
<el-table-column key="val" label="检测值" prop="val" align="center" />
<el-table-column prop="createTime" label="监测时间" align="center" />
<el-table-column prop="isWarn" label="状态" align="center" />
<el-table-column label="设备名称" prop="deviceName" align="center" />
<el-table-column label="区域名称" prop="areaName" align="center" />
<el-table-column label="施工工艺" prop="modeName" align="center" />
<el-table-column label="标准值" prop="standardValue" align="center" />
<el-table-column label="检测值" prop="val" align="center" />
<el-table-column label="监测时间" prop="createTime" align="center" />
<el-table-column label="状态" prop="isWarn" align="center" />
</el-table>
<pagination
v-show="total > 0"
@ -67,8 +77,10 @@
import _ from 'lodash/fp'
import { downloadFile } from '@/utils/download'
import ProjectSelect from '@/views/basic/sideband/components/ProjectSelect.vue'
import Pagination from '@/components/Pagination'
export default {
// components: { Pagination, BuildSelect, ProcessTable },
components: { Pagination, ProjectSelect },
directives: { waves },
data() {
return {
@ -78,11 +90,12 @@
listQuery: {
pageNum: 1,
pageSize: 10,
keyWord: ''
keyWord: '',
proIds:'',
date:'',
},
tableHeight: 650,
showReviewer: false,
// temp: _.cloneDeep(defaultTmp),
dialogFormVisible: false,
dialogStatus: '',
downloadLoading: false,
@ -94,24 +107,7 @@
completeModalVisible: false,
processModalVisible: false,
processType: '',
bidCode: '',
// completeForm: _.cloneDeep(defaultCompleteTmp),
rules: {
// org: [{ required: true, message: '请选择', trigger: 'change' }],
// proName: [{ required: true, message: '不能为空', trigger: 'blur' }],
// proType: [{ required: true, message: '请选择', trigger: 'change' }],
// proScale: [{ required: true, message: '不能为空', trigger: 'blur' }],
// jlUnit: [{ required: true, message: '不能为空', trigger: 'blur' }],
// sgUnit: [{ required: true, message: '不能为空', trigger: 'blur' }],
// manager: [{ required: true, message: '不能为空', trigger: 'blur' }],
// planStartTime: [{ required: true, message: '不能为空', trigger: 'blur' }],
// planEndTime: [{ required: true, message: '不能为空', trigger: 'blur' }],
// proCost: [{ required: true, message: '不能为空', trigger: 'blur' }],
// imageList2: [{ type: 'array', required: true, validator: this.validateImageNum, trigger: 'change' }],
// signCode: [{ required: true, message: '不能为空', trigger: 'blur' }],
// proCode: [{ required: true, message: '不能为空', trigger: 'blur' }],
// bidCode: [{ required: true, message: '不能为空', trigger: 'blur' }]
}
bidCode: ''
}
},
created() {
@ -136,7 +132,7 @@
// 导出
handleExport() {
exportProject().then(res => {
downloadFile({ fileName: ' 检测记录.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
downloadFile({ fileName: ' 质量检测记录.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
})
},
}

25
ah-jjzhgd-web/src/views/towerDetection/earlyWarningRecord/index.vue
View File

@ -1,14 +1,14 @@
<template>
<div class="app-container">
<div class="filter-container">
<el-input
v-model="listQuery.keyWord"
placeholder="请输入关键字"
style="width: 200px"
class="filter-item"
:maxlength="30"
@keyup.enter.native="handleFilter"
/>
<el-date-picker
v-model="listQuery.date"
style="width: 200px; margin-left: 20px"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
class="filter-item"
/>
<el-button
v-waves
style="margin-left: 40px"
@ -40,8 +40,8 @@
<span>{{ (listQuery.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column key="deviceName" label="告警内容" prop="deviceName" align="center" />
<el-table-column key="areaName" label="预警时间" prop="areaName" align="center" />
<el-table-column label="告警内容" prop="warnContent" align="center" />
<el-table-column label="预警时间" prop="warnTime" align="center" />
</el-table>
<pagination
@ -63,8 +63,9 @@
import _ from 'lodash/fp'
import { downloadFile } from '@/utils/download'
import Pagination from '@/components/Pagination'
export default {
// components: { Pagination, BuildSelect, ProcessTable },
components: { Pagination},
directives: { waves },
data() {
return {
@ -74,7 +75,7 @@
listQuery: {
pageNum: 1,
pageSize: 10,
keyWord: ''
date: ''
},
tableHeight: 650,
showReviewer: false,

6
ah-jjzhgd-web/src/views/towerDetection/towerRecord/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="filter-container">
<ProjectSelect :bind-type="''" :bind-value.sync="listQuery.proId" style="width: 200px;" class="filter-item" />
<ProjectSelect :bind-type="''" :bind-value.sync="listQuery.proIds" style="width: 200px;" class="filter-item" />
<el-date-picker
v-model="listQuery.date"
style="width: 200px; margin-left: 20px"
@ -12,7 +12,7 @@
/>
<el-input
v-model="listQuery.keyWord"
placeholder="请输入关键字"
placeholder="请输入设备名称"
style="width: 200px;margin-left: 20px"
class="filter-item"
:maxlength="30"
@ -91,7 +91,7 @@
pageNum: 1,
pageSize: 10,
keyWord: '',
proId:'',
proIds:'',
date:'',
},
tableHeight: 650,

4
ah-jjzhgd-web/vue.config.js
View File

@ -35,8 +35,8 @@ module.exports = {
open: true,
proxy: {
[process.env.VUE_APP_BASE_API]: {
// target: `http://10.40.92.106:18080/zhgd`,
target: `http://10.40.92.42:18080/zhgd`,
target: `http://10.40.92.106:18080/zhgd`,
// target: `http://10.40.92.42:18080/zhgd`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''