功能区数据采集

This commit is contained in:
weicw
2021-08-10 18:19:36 +08:00
parent 4542c10045
commit 5c1b9dd682
19 changed files with 1624 additions and 1635 deletions

View File

@@ -0,0 +1,71 @@
import axios from 'axios';
// ----------------------列表-----------------------
const pageBillUrl = '/sound/function/place/bill/page';
// 添加
const saveFunctionPlaceBill = function (data) {
return axios.post("/sound/function/place/bill",data)
}
// 删除
const removeFunctionPlaceBill = function (id) {
return axios.delete(`/sound/function/place/bill/${id}`,)
}
// 批量删除
const removeBatchFunctionPlaceBill = function (ids) {
return axios.delete("/sound/function/place/bill/batch",{data:ids})
}
// 修改
const updateFunctionPlaceBill = function (data) {
return axios.put("/sound/function/place/bill",data)
}
// 审核
const verifyFunctionPlaceBill = function (data) {
return axios.put("/sound/function/place/bill/verify",data);
}
const getFunctionPlaceBill = function (id) {
return axios.get(`/sound/function/place/bill/${id}`)
}
// -------------------------数据---------------------
const pageFunctionPlaceUrl = '/sound/function/place/page';
// 添加
const saveFunctionPlace = function (data) {
return axios.post("/sound/function/place",data)
}
// 删除
const removeFunctionPlace = function (id) {
return axios.delete(`/sound/function/place/${id}`,)
}
// 批量删除
const removeBatchFunctionPlace = function (ids) {
return axios.delete("/sound/function/place/batch",{data:ids})
}
// 修改
const updateFunctionPlace = function (data) {
return axios.put("/sound/function/place",data)
}
// -------------------------统计---------------------
const pageFunctionPlaceStatisticUrl = '/sound/function/place/statistic';
const getHistoryyears = function () {
return axios.get("/sound/function/place/history-year")
}
export {
pageBillUrl,
saveFunctionPlaceBill,
removeFunctionPlaceBill,
updateFunctionPlaceBill,
removeBatchFunctionPlaceBill,
verifyFunctionPlaceBill,
getFunctionPlaceBill,
pageFunctionPlaceUrl,
saveFunctionPlace,
removeFunctionPlace,
updateFunctionPlace,
removeBatchFunctionPlace,
pageFunctionPlaceStatisticUrl,
getHistoryyears
}

View File

@@ -0,0 +1,71 @@
import axios from 'axios';
// ----------------------列表-----------------------
const pageBillUrl = '/sound/function/noise/bill/page';
// 添加
const saveFunctionNoiseBill = function (data) {
return axios.post("/sound/function/noise/bill",data)
}
// 删除
const removeFunctionNoiseBill = function (id) {
return axios.delete(`/sound/function/noise/bill/${id}`,)
}
// 批量删除
const removeBatchFunctionNoiseBill = function (ids) {
return axios.delete("/sound/function/noise/bill/batch",{data:ids})
}
// 修改
const updateFunctionNoiseBill = function (data) {
return axios.put("/sound/function/noise/bill",data)
}
// 审核
const verifyFunctionNoiseBill = function (data) {
return axios.put("/sound/function/noise/bill/verify",data);
}
const getFunctionNoiseBill = function (id) {
return axios.get(`/sound/function/noise/bill/${id}`)
}
// -------------------------数据---------------------
const pageFunctionNoiseUrl = '/sound/function/noise/page';
// 添加
const saveFunctionNoise = function (data) {
return axios.post("/sound/function/noise",data)
}
// 删除
const removeFunctionNoise = function (id) {
return axios.delete(`/sound/function/noise/${id}`,)
}
// 批量删除
const removeBatchFunctionNoise = function (ids) {
return axios.delete("/sound/function/noise/batch",{data:ids})
}
// 修改
const updateFunctionNoise = function (data) {
return axios.put("/sound/function/noise",data)
}
// -------------------------统计---------------------
const pageFunctionNoiseStatisticUrl = '/sound/function/noise/statistic';
const getHistoryyears = function () {
return axios.get("/sound/function/noise/history-year")
}
export {
pageBillUrl,
saveFunctionNoiseBill,
removeFunctionNoiseBill,
updateFunctionNoiseBill,
removeBatchFunctionNoiseBill,
verifyFunctionNoiseBill,
getFunctionNoiseBill,
pageFunctionNoiseUrl,
saveFunctionNoise,
removeFunctionNoise,
updateFunctionNoise,
removeBatchFunctionNoise,
pageFunctionNoiseStatisticUrl,
getHistoryyears
}

View File

@@ -5,6 +5,7 @@ const pageBillUrl = '/sound/road/place/bill/page';
const saveRoadPlaceBill = function (data) {
return axios.post("/sound/road/place/bill",data)
}
// 删除
const removeRoadPlaceBill = function (id) {
return axios.delete(`/sound/road/place/bill/${id}`,)
@@ -25,12 +26,46 @@ const verifyRoadPlaceBill = function (data) {
const getRoadPlaceBill = function (id) {
return axios.get(`/sound/road/place/bill/${id}`)
}
// -------------------------数据---------------------
const pageRoadPlaceUrl = '/sound/road/place/page';
// 添加
const saveRoadPlace = function (data) {
return axios.post("/sound/road/place",data)
}
// 删除
const removeRoadPlace = function (id) {
return axios.delete(`/sound/road/place/${id}`,)
}
// 批量删除
const removeBatchRoadPlace = function (ids) {
return axios.delete("/sound/road/place/batch",{data:ids})
}
// 修改
const updateRoadPlace = function (data) {
return axios.put("/sound/road/place",data)
}
// -------------------------统计---------------------
const pageRoadPlaceStatisticUrl = '/sound/road/place/statistic';
const getHistoryyears = function () {
return axios.get("/sound/road/place/history-year")
}
export {
pageBillUrl,
saveRoadPlaceBill,
removeRoadPlaceBill,
removeBatchRoadPlaceBill,
updateRoadPlaceBill,
removeBatchRoadPlaceBill,
verifyRoadPlaceBill,
getRoadPlaceBill
getRoadPlaceBill,
pageRoadPlaceUrl,
saveRoadPlace,
removeRoadPlace,
updateRoadPlace,
removeBatchRoadPlace,
pageRoadPlaceStatisticUrl,
getHistoryyears
}

View File

@@ -0,0 +1,115 @@
<template>
<div class="ele-body">
<a-card style="width: 100%" :bordered="false">
<template #title>
<a-space>
<a-upload :before-upload="importFile" :showUploadList="false" accept=".xls,.xlsx,.csv">
<a-button>导入excel</a-button>
</a-upload>
</a-space>
</template>
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane tab="噪声信息" key="noise">
<noise-bill ref="noise"></noise-bill>
</a-tab-pane>
<a-tab-pane tab="其他信息" key="place">
<place-bill ref="place"></place-bill>
</a-tab-pane>
</a-tabs>
</a-card>
</div>
</template>
<script>
import XLSX from 'xlsx';
import utils from "./utils";
import NoiseBill from "./noise-bill.vue";
import PlaceBill from "./place-bill.vue";
import {
saveFunctionNoiseBill,
} from "@/api/ecology/function-sound";
import {
saveFunctionPlaceBill
} from "@/api/ecology/function-place";
export default {
components: {
NoiseBill,
PlaceBill
},
data() {
return {
activeKey: 'noise'
}
},
methods: {
/* 导入本地excel文件 */
importFile(file) {
let reader = new FileReader();
reader.onload = (e) => {
let data = new Uint8Array(e.target.result);
let workbook = XLSX.read(data, {
type: 'array'
});
//0.数据录入 1.其他信息
let sheetNames = workbook.SheetNames;
// 解析成二维数组
let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
header: 1,
});
let aoa2 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[1]], {
header: 1,
});
const reportDate = aoa[1][0].replace(/[^\d]+/g, "-")
const reportDate2 = new Date();
const functionNoiseList = aoa.filter(item => {
return item.length >= 15 && typeof item[0] == "number";
});
const functionNoiseList2 = aoa2.filter(item => item.length == 13 && typeof item[1] == "number");
// 解析成对象数组
const billData = utils.toObjData(functionNoiseList);
const billData2 = utils.toPlaceData(functionNoiseList2);
const tasks = [];
if (billData.length > 0) {
tasks.push(saveFunctionNoiseBill({
reportTime: new Date(reportDate).getTime(),
billName: sheetNames[0] + reportDate,
functionNoiseList: billData
}))
}
if (billData2.length > 0) {
tasks.push(saveFunctionPlaceBill({
reportTime: reportDate2.getTime(),
billName: sheetNames[1] + reportDate2.getTime(),
functionPlaceList: billData2
}))
}
// 上传到服务器
Promise.all(tasks).then(() => {
this.$refs.noise.reload();
this.$refs.place.reload();
}).catch(() => {
this.$message.error("表格格式有误,请检查后重新上传!");
})
// console.log(billData);
};
reader.readAsArrayBuffer(file);
return false;
}
}
}
</script>
<style scoped lang="less">
</style>

View File

@@ -1,56 +1,45 @@
<template>
<div class="ele-body">
<a-card :bordered="false">
<div>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="functionNoiseBillId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template #toolbar>
<!-- 搜索表单 -->
<a-form :model="where" :labelCol="{ offset: 1}">
<a-row>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
<a-form-item label="审核状态:">
<a-select v-model:value="where.checked" allowClear placeholder="全部">
<a-select-option value="1">已审核</a-select-option>
<a-select-option value="0">未审核</a-select-option>
<a-select v-model:value="where.checked" allowClear placeholder="未选择">
<a-select-option :value="1">已审核</a-select-option>
<a-select-option :value="0">未审核</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="表格名称:">
<a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
<a-button @click="reset">重置</a-button>
</a-space>
</a-form-item>
</a-col>
</a-row>
</a-form>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadNoiseBillId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template #toolbar>
<a-space>
<a-upload :before-upload="importFile" :showUploadList="false" accept=".xls,.xlsx,.csv">
<a-button>导入excel</a-button>
</a-upload>
<a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`"
ok-text="Yes" cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除</a-button>
</template>
<template #toolkit>
<a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`" ok-text="Yes"
cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>批量删除</a-button>
</a-popconfirm>
</a-space>
</template>
<template #billName="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.roadNoiseBillId]" class="editable-cell-input-wrapper">
<a-input v-model:value="editableData[record.roadNoiseBillId].billName" @pressEnter="save(record)" />
<div v-if="editableData[record.functionNoiseBillId]" class="editable-cell-input-wrapper">
<a-input v-model:value="editableData[record.functionNoiseBillId].billName" @pressEnter="save(record)" />
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
@@ -61,9 +50,9 @@
</template>
<template #reportTime="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.roadNoiseBillId]" class="editable-cell-input-wrapper">
<a-date-picker v-model:value="editableData[record.roadNoiseBillId].reportTime"></a-date-picker>
<!-- <a-input v-model:value="editableData[record.roadNoiseBillId].reportTime" @pressEnter="save(record)" /> -->
<div v-if="editableData[record.functionNoiseBillId]" class="editable-cell-input-wrapper">
<a-date-picker v-model:value="editableData[record.functionNoiseBillId].reportTime"></a-date-picker>
<!-- <a-input v-model:value="editableData[record.functionNoiseBillId].reportTime" @pressEnter="save(record)" /> -->
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
@@ -78,25 +67,27 @@
<a-tag v-else color="orange">未审核</a-tag>
</span>
</template>
<template #action="{ record }">
<a-space>
<a-button @click="detail(record)" shape="round" size="small">查看</a-button>
<a-popconfirm :title="`审核通过后将无法修改,确认?`" ok-text="Yes" cancel-text="No" @confirm="verify(record)">
<span v-hasPermi="['ecology:sound:verify']">
<a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改,确认?`" ok-text="Yes" cancel-text="No"
@confirm="verify(record)">
<a-button type="primary" shape="round" size="small">审核</a-button>
</a-popconfirm>
</span>
<a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
<a-button type="primary" danger shape="round" size="small">删除</a-button>
</a-popconfirm>
</a-space>
</template>
</ele-pro-table>
</a-card>
</div>
<!-- 编辑弹窗 -->
</template>
<script>
import XLSX from 'xlsx';
import _ from "lodash"
import {
CheckOutlined,
@@ -104,16 +95,14 @@
} from '@ant-design/icons-vue';
import {
pageBillUrl,
saveRoadNoiseBill,
removeRoadNoiseBill,
removeBatchRoadNoiseBill,
updateRoadNoiseBill,
verifyRoadNoiseBill
} from "@/api/ecology/road-sound";
import utils from "./utils";
// saveFunctionNoiseBill,
removeFunctionNoiseBill,
removeBatchFunctionNoiseBill,
updateFunctionNoiseBill,
verifyFunctionNoiseBill
} from "@/api/ecology/function-sound";
import moment from "moment";
export default {
name: 'RoadNoise',
components: {
CheckOutlined,
EditOutlined
@@ -233,17 +222,19 @@
},
detail(record) {
this.$router.replace({
path: "/collect/sound/road/table/" + record.roadNoiseBillId
path: "/sound/function/collect/noise/" + record.functionNoiseBillId
})
},
edit(record) {
this.editableData[record.roadNoiseBillId] = _.cloneDeep(record);
this.editableData[record.roadNoiseBillId].reportTime = moment(this.editableData[record.roadNoiseBillId]
this.editableData[record.functionNoiseBillId] = _.cloneDeep(record);
this.editableData[record.functionNoiseBillId].reportTime = moment(this.editableData[record.functionNoiseBillId]
.reportTime)
},
verify(record) {
const hide = this.$message.loading('请求中..', 0);
verifyRoadNoiseBill({roadNoiseBillId:record.roadNoiseBillId}).then(res => {
verifyFunctionNoiseBill({
functionNoiseBillId: record.functionNoiseBillId
}).then(res => {
if (res.data.code == 0) {
record.checked = 1
this.$message.success(res.data.msg);
@@ -259,19 +250,19 @@
save(record) {
let {
roadNoiseBillId,
functionNoiseBillId,
billName,
reportTime
} = this.editableData[record.roadNoiseBillId];
if (!roadNoiseBillId || !reportTime) {
} = this.editableData[record.functionNoiseBillId];
if (!functionNoiseBillId || !reportTime) {
this.$message.error('请填写完整信息再提交')
return
}
const hide = this.$message.loading('请求中..', 0);
reportTime = reportTime.format("x")
reportTime = Number(reportTime)
updateRoadNoiseBill({
roadNoiseBillId,
updateFunctionNoiseBill({
functionNoiseBillId,
billName,
reportTime
}).then(res => {
@@ -286,7 +277,7 @@
console.log(e);
this.$message.error(e.message);
}).finally(() => {
delete this.editableData[record.roadNoiseBillId]
delete this.editableData[record.functionNoiseBillId]
hide()
})
@@ -294,7 +285,7 @@
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removeRoadNoiseBill(row.roadNoiseBillId).then(res => {
removeFunctionNoiseBill(row.functionNoiseBillId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -306,9 +297,9 @@
}).finally(() => hide());
},
removeBatch() {
const ids = this.selectionList.map(item => item.roadNoiseBillId);
const ids = this.selectionList.map(item => item.functionNoiseBillId);
const hide = this.$message.loading('请求中..', 0);
removeBatchRoadNoiseBill(ids).then(res => {
removeBatchFunctionNoiseBill(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -320,48 +311,12 @@
this.$message.error(e.msg);
}).finally(() => hide());
},
/* 导入本地excel文件 */
importFile(file) {
try {
let reader = new FileReader();
reader.onload = (e) => {
let data = new Uint8Array(e.target.result);
let workbook = XLSX.read(data, {
type: 'array'
});
let sheetNames = workbook.SheetNames;
let worksheet = workbook.Sheets[sheetNames[0]];
//
let aoa = XLSX.utils.sheet_to_json(worksheet, {
header: 1,
});
const reportDate = aoa[1][0].replace(/[^\d]+/g, "-")
const roadNoiseList = aoa.filter(item => item.length == 21 && typeof item[0] == "number");
//
const billData = utils.toObjData(roadNoiseList);
//
saveRoadNoiseBill({
reportTime: new Date(reportDate).getTime(),
billName: file.name.substr(0, file.name.lastIndexOf(".")),
roadNoiseList: billData
}).then(() => {
this.reload()
})
// console.log(billData);
};
reader.readAsArrayBuffer(file);
} catch (error) {
this.$message.error("表格格式有误,请检查后重新上传!");
}
return false;
}
}
}
</script>
<style scoped lang="less">
<style lang="less">
.editable-cell {
position: relative;

View File

@@ -11,13 +11,13 @@
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="路段:">
<a-input v-model:value.trim="where.road" placeholder="请输入路段名称" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="城区">
<a-input v-model:value.trim="where.area" placeholder="请输入城区名称" allow-clear />
<a-form-item label="功能区类别:">
<a-select v-model:value="where.functionType" placeholder="选择功能区类型">
<a-select-option value="1">1</a-select-option>
<a-select-option value="2">2</a-select-option>
<a-select-option value="4">3</a-select-option>
<a-select-option value="4">4</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -30,8 +30,8 @@
</a-col>
</a-row>
</a-form>
<a-modal v-model:visible="showEdit" :title="form.roadNoiseId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
:width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
<a-modal v-model:visible="showEdit" :title="form.functionNoiseId!==undefined?'修改用户':'添加用户'"
:confirm-loading="loading" :width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
<a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
:wrapper-col="{md: {span: 18}, sm: {span: 24}}">
<a-row>
@@ -45,14 +45,6 @@
<a-time-picker v-model:value="form.monitorTime" format="HH:mm" />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="时段" name="timeSlot">
<a-select v-model:value="form.timeSlot">
<a-select-option value="昼"></a-select-option>
<a-select-option value="夜"></a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="测点名称" name="place">
@@ -60,42 +52,14 @@
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="点" name="placeCode">
<a-input v-model:value="form.placeCode" placeholder="请输入点" allow-clear />
<a-form-item label="点位编码" name="placeCode">
<a-input v-model:value="form.placeCode" placeholder="请输入点位编码" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="所属路段" name="road">
<a-input v-model:value="form.road" placeholder="请输入测点名称" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="所属城区" name="area">
<a-input v-model:value="form.area" placeholder="请输入点号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="路长" name="roadLength">
<a-input v-model:value="form.roadLength" placeholder="请输入路长(米)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="总路宽" name="roadWidth">
<a-input v-model:value="form.roadWidth" placeholder="请输入总路宽(米)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="中小型车流量" name="smallTrafficFlow">
<a-input type="number" v-model:value="form.smallTrafficFlow" placeholder="请输入中小型车流量(辆/20分钟"
allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="大型车流量" name="largeTrafficFlow">
<a-input type="number" v-model:value="form.largeTrafficFlow" placeholder="请输入大型车流量(辆/20分钟"
allow-clear />
<a-form-item label="功能区类型" name="functionType">
<a-input v-model:value="form.functionType" placeholder="请输入功能区类型" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
@@ -139,7 +103,7 @@
</a-modal>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadNoiseId" :datasource="url"
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="functionNoiseId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template v-if="bill.checked != 1" #toolbar>
<a-space>
@@ -169,18 +133,17 @@
<script>
import _ from "lodash"
import {
pageRoadNoiseUrl,
saveRoadNoise,
removeRoadNoise,
removeBatchRoadNoise,
updateRoadNoise,
getRoadNoiseBill
} from "@/api/ecology/road-sound";
pageFunctionNoiseUrl,
saveFunctionNoise,
removeFunctionNoise,
removeBatchFunctionNoise,
updateFunctionNoise,
getFunctionNoiseBill
} from "@/api/ecology/function-sound";
import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
import moment from 'moment';
// import utils from "./utils";
export default {
name: 'RoadNoise',
components: {},
data() {
const {
@@ -191,11 +154,10 @@
locale,
bill: {},
//
url: pageRoadNoiseUrl,
url: pageFunctionNoiseUrl,
selection: [],
//
columns: [
{
columns: [{
title: '监测日期',
dataIndex: 'monitorTime',
sorter: true
@@ -206,45 +168,16 @@
sorter: true
},
{
title: '点',
title: '点位编码',
dataIndex: 'placeCode',
sorter: true
},
{
title: '所属路段',
dataIndex: 'road',
sorter: true
},
{
title: '所属城区',
dataIndex: 'area',
sorter: true
},
{
title: '路长',
dataIndex: 'roadLength',
sorter: true
},
{
title: '路宽',
dataIndex: 'roadWidth',
sorter: true
},
{
title: '中小型车流量(辆/20分钟',
dataIndex: 'smallTrafficFlow',
sorter: true
},
{
title: '大型车流量(辆/20分钟',
dataIndex: 'largeTrafficFlow',
sorter: true
},
{
title: '时段',
dataIndex: 'timeSlot',
title: '功能区类别',
dataIndex: 'functionType',
sorter: true
},
// {
// title: '',
// dataIndex: 'monitorMonth',
@@ -312,9 +245,9 @@
}
],
//
roadNoiseBillId: billId,
functionNoiseBillId: billId,
where: {
roadNoiseBillId: billId
functionNoiseBillId: billId
},
//
selectionList: [],
@@ -331,7 +264,7 @@
const {
billId
} = this.$route.params
getRoadNoiseBill(billId).then(res=>{
getFunctionNoiseBill(billId).then(res => {
this.bill = res.data.data
if (res.data.data.checked == 1) {
this.columns.splice(this.columns.length - 1, 1)
@@ -341,8 +274,6 @@
methods: {
/* 刷新表格 */
reload() {
console.log(this.$route);
console.log(this.$router);
this.$refs.table.reload({
where: this.where
});
@@ -350,7 +281,7 @@
/* 重置搜索 */
reset() {
this.where = {
roadNoiseBillId: this.roadNoiseBillId
functionNoiseBillId: this.functionNoiseBillId
};
this.reload();
},
@@ -386,8 +317,8 @@
form.monitorHour = date.getHours();
form.monitorMinute = date.getMinutes();
delete form['monitorDate']
if (form.roadNoiseId) {
updateRoadNoise(form).then(res => {
if (form.functionNoiseId) {
updateFunctionNoise(form).then(res => {
if (res.data.code == 0) {
this.showEdit = false;
this.$message.success(res.data.msg);
@@ -402,8 +333,8 @@
hide();
})
} else {
form.roadNoiseBillId = this.roadNoiseBillId;
saveRoadNoise(form).then(res => {
form.functionNoiseBillId = this.functionNoiseBillId;
saveFunctionNoise(form).then(res => {
if (res.data.code == 0) {
this.showEdit = false;
this.$message.success(res.data.msg);
@@ -423,7 +354,7 @@
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removeRoadNoise(row.roadNoiseId).then(res => {
removeFunctionNoise(row.functionNoiseId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -435,9 +366,9 @@
}).finally(() => hide());
},
removeBatch() {
const ids = this.selectionList.map(item => item.roadNoiseId);
const ids = this.selectionList.map(item => item.functionNoiseId);
const hide = this.$message.loading('请求中..', 0);
removeBatchRoadNoise(ids).then(res => {
removeBatchFunctionNoise(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();

View File

@@ -0,0 +1,361 @@
<template>
<div>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="functionPlaceBillId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template #toolbar>
<!-- 搜索表单 -->
<a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
<a-form-item label="审核状态:">
<a-select v-model:value="where.checked" allowClear placeholder="未选择">
<a-select-option :value="1">已审核</a-select-option>
<a-select-option :value="0">未审核</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="表格名称:">
<a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
</a-form-item>
<a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-form-item>
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
<a-button @click="reset">重置</a-button>
</a-space>
</a-form-item>
</a-form>
</template>
<template #toolkit>
<a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`" ok-text="Yes"
cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>批量删除</a-button>
</a-popconfirm>
</template>
<template #billName="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.functionPlaceBillId]" class="editable-cell-input-wrapper">
<a-input v-model:value="editableData[record.functionPlaceBillId].billName" @pressEnter="save(record)" />
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ text || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record)" />
</div>
</div>
</template>
<template #reportTime="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.functionPlaceBillId]" class="editable-cell-input-wrapper">
<a-date-picker v-model:value="editableData[record.functionPlaceBillId].reportTime"></a-date-picker>
<!-- <a-input v-model:value="editableData[record.functionPlaceBillId].reportTime" @pressEnter="save(record)" /> -->
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ $util.toDateString(text,'yyyy-MM-dd') || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record)" />
</div>
</div>
</template>
<template #checked="{text}">
<span>
<a-tag v-if="text" color="green">已审核</a-tag>
<a-tag v-else color="orange">未审核</a-tag>
</span>
</template>
<template #action="{ record }">
<a-space>
<a-button @click="detail(record)" shape="round" size="small">查看</a-button>
<span v-hasPermi="['ecology:sound:verify']">
<a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改,确认?`" ok-text="Yes" cancel-text="No"
@confirm="verify(record)">
<a-button type="primary" shape="round" size="small">审核</a-button>
</a-popconfirm>
</span>
<a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
<a-button type="primary" danger shape="round" size="small">删除</a-button>
</a-popconfirm>
</a-space>
</template>
</ele-pro-table>
</div>
</template>
<script>
import _ from "lodash"
import {
CheckOutlined,
EditOutlined
} from '@ant-design/icons-vue';
import {
pageBillUrl,
removeFunctionPlaceBill,
removeBatchFunctionPlaceBill,
updateFunctionPlaceBill,
verifyFunctionPlaceBill
} from "@/api/ecology/function-place";
import moment from "moment";
export default {
components: {
CheckOutlined,
EditOutlined
},
data() {
return {
// 表格数据接口
url: pageBillUrl,
selection: [],
// 表格列配置
columns: [{
key: 'index',
dataIndex: 'index',
width: 48,
align: 'center',
customRender: ({
index
}) => index + 1
},
{
title: '表格名称',
dataIndex: 'billName',
sorter: true,
slots: {
customRender: 'billName',
},
},
{
title: '条目',
dataIndex: 'recordSize',
sorter: true,
},
// {
// title: '菜单名称',
// dataIndex: 'title',
// sorter: true
// },
{
title: '上报时间',
dataIndex: 'reportTime',
sorter: true,
slots: {
customRender: 'reportTime',
},
// customRender: ({
// text
// }) => this.$util.toDateString(text)
},
{
title: '导入时间',
dataIndex: 'createTime',
sorter: true,
customRender: ({
text
}) => this.$util.toDateString(text)
},
{
title: '审核状态',
dataIndex: 'checked',
sorter: true,
slots: {
customRender: 'checked',
},
},
// {
// title: '更新时间',
// dataIndex: 'updateTime',
// sorter: true,
// customRender: ({
// text
// }) => this.$util.toDateString(text)
// },
{
title: '操作',
key: 'action',
width: 150,
align: 'center',
slots: {
customRender: 'action'
}
}
],
// 表格搜索条件
where: {},
reportTimeScope: [],
// 表格选中数据
selectionList: [],
editableData: {},
// 当前编辑数据
current: null,
};
},
methods: {
/* 刷新表格 */
reload() {
this.where.reportTimeStart = null;
this.where.reportTimeEnd = null;
if (this.reportTimeScope && this.reportTimeScope.length == 2) {
this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
}
this.$refs.table.reload({
where: this.where
});
},
/* 重置搜索 */
reset() {
this.where = {};
this.reportTimeScope = [];
this.reload();
},
detail(record) {
this.$router.replace({
path: "/sound/function/collect/place/" + record.functionPlaceBillId
})
},
edit(record) {
this.editableData[record.functionPlaceBillId] = _.cloneDeep(record);
this.editableData[record.functionPlaceBillId].reportTime = moment(this.editableData[record.functionPlaceBillId]
.reportTime)
},
verify(record) {
const hide = this.$message.loading('请求中..', 0);
verifyFunctionPlaceBill({
functionPlaceBillId: record.functionPlaceBillId
}).then(res => {
if (res.data.code == 0) {
record.checked = 1
this.$message.success(res.data.msg);
} else {
this.$message.error(res.data.msg);
}
}).catch((e) => {
this.$message.error(e.message);
}).finally(() => {
hide();
})
},
save(record) {
let {
functionPlaceBillId,
billName,
reportTime
} = this.editableData[record.functionPlaceBillId];
if (!functionPlaceBillId || !reportTime) {
this.$message.error('请填写完整信息再提交')
return
}
const hide = this.$message.loading('请求中..', 0);
reportTime = reportTime.format("x")
reportTime = Number(reportTime)
updateFunctionPlaceBill({
functionPlaceBillId,
billName,
reportTime
}).then(res => {
if (res.data.code == 0) {
this.$message.success(res.data.msg);
record.billName = billName;
record.reportTime = reportTime
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
console.log(e);
this.$message.error(e.message);
}).finally(() => {
delete this.editableData[record.functionPlaceBillId]
hide()
})
},
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removeFunctionPlaceBill(row.functionPlaceBillId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
// 批量删除
removeBatch() {
const ids = this.selectionList.map(item => item.functionPlaceBillId);
const hide = this.$message.loading('请求中..', 0);
removeBatchFunctionPlaceBill(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
}
}
</script>
<style lang="less">
.editable-cell {
position: relative;
.editable-cell-input-wrapper,
.editable-cell-text-wrapper {
padding-right: 24px;
}
.editable-cell-text-wrapper {
padding: 5px 24px 5px 5px;
}
.editable-cell-icon,
.editable-cell-icon-check {
position: absolute;
right: 0;
width: 20px;
cursor: pointer;
}
.editable-cell-icon {
margin-top: 4px;
display: none;
}
.editable-cell-icon-check {
line-height: 28px;
}
.editable-cell-icon:hover,
.editable-cell-icon-check:hover {
color: #108ee9;
}
.editable-add-btn {
margin-bottom: 8px;
}
}
.editable-cell:hover .editable-cell-icon {
display: inline-block;
}
</style>

View File

@@ -12,7 +12,7 @@
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="路段:">
<a-input v-model:value.trim="where.road" placeholder="请输入路段名称" allow-clear />
<a-input v-model:value.trim="where.function" placeholder="请输入路段名称" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -30,107 +30,89 @@
</a-col>
</a-row>
</a-form>
<a-modal v-model:visible="showEdit" :title="form.roadNoiseId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
<a-modal v-model:visible="showEdit" :title="form.functionPlaceId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
:width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
<a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
:wrapper-col="{md: {span: 18}, sm: {span: 24}}">
<a-row>
<a-col :md="12" :sm="24">
<a-form-item label="日期" name="monitorDate">
<a-date-picker v-model:value="form.monitorDate" :locale="locale" />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="时间" name="monitorTime">
<a-time-picker v-model:value="form.monitorTime" format="HH:mm" />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="时段" name="timeSlot">
<a-select v-model:value="form.timeSlot">
<a-select-option value="昼"></a-select-option>
<a-select-option value="夜"></a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="测点名称" name="place">
<a-input v-model:value="form.place" placeholder="请输入测点名称" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="点号" name="placeCode">
<a-input v-model:value="form.placeCode" placeholder="请输入点号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="所属路段" name="road">
<a-input v-model:value="form.road" placeholder="请输入测点名称" allow-clear />
<a-form-item label="道路等级" name="motorwayLevel">
<a-input v-model:value="form.motorwayLevel" placeholder="请输入道路等级" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="所属城区" name="area">
<a-input v-model:value="form.area" placeholder="请输入点号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="路长" name="roadLength">
<a-input v-model:value="form.roadLength" placeholder="请输入路长(米)" allow-clear />
<a-form-item label="车道类别" name="motorwayType">
<a-input v-model:value="form.motorwayType" placeholder="请输入车道类别" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="总路宽" name="roadWidth">
<a-input v-model:value="form.roadWidth" placeholder="请输入总路宽(米)" allow-clear />
<a-form-item label="机动车车道数" name="motorway">
<a-input v-model:value="form.motorway" placeholder="请输入机动车车道数" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="中小型车流量" name="smallTrafficFlow">
<a-input type="number" v-model:value="form.smallTrafficFlow" placeholder="请输入中小型车流量(辆/20分钟"
allow-clear />
<a-form-item label="测点参照物" name="refObj">
<a-input v-model:value="form.refObj" placeholder="请输入测点测点参照物" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="大型车流量" name="largeTrafficFlow">
<a-input type="number" v-model:value="form.largeTrafficFlow" placeholder="请输入大型车流量(辆/20分钟"
allow-clear />
<a-form-item label="测点经度" name="placeLng">
<a-input type="number" v-model:value="form.placeLng" placeholder="请输入测点经度" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="LeqdB(A)" name="indexLeq">
<a-input type="number" v-model:value="form.indexLeq" placeholder="请输入LeqdB(A)" allow-clear />
<a-form-item label="测点纬度" name="placeLat">
<a-input type="number" v-model:value="form.placeLat" placeholder="请输入测点纬度" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="SDdB(A)" name="indexSd">
<a-input type="number" v-model:value="form.indexSd" placeholder="请输入大SDdB(A)" allow-clear />
<a-form-item label="道路覆盖人口" name="people">
<a-input type="number" v-model:value="form.people" placeholder="请输入道路覆盖人口(万人)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="L10dB(A)" name="indexL10">
<a-input type="number" v-model:value="form.indexL10" placeholder="请输入L10dB(A)" allow-clear />
<a-form-item label="监测站名" name="station">
<a-input v-model:value="form.station" placeholder="请输入监测站名" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="L50dB(A)" name="indexL50">
<a-input type="number" v-model:value="form.indexL50" placeholder="请输入L50dB(A)" allow-clear />
<a-form-item label="监测仪器型号" name="monitorInstrumentModel">
<a-input v-model:value="form.monitorInstrumentModel" placeholder="请输入监测仪器型号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="L90dB(A)" name="indexL90">
<a-input type="number" v-model:value="form.indexL90" placeholder="请输入L90dB(A)" allow-clear />
<a-form-item label="监测仪器编号" name="monitorInstrumentCode">
<a-input v-model:value="form.monitorInstrumentCode" placeholder="请输入监测仪器编号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="LmindB(A)" name="indexLmin">
<a-input type="number" v-model:value="form.indexLmin" placeholder="请输入LmindB(A)" allow-clear />
<a-form-item label="监测前校准值" name="beforeMonitorValue">
<a-input v-model:value="form.beforeMonitorValue" placeholder="请输入监测前校准值" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="LmaxdB(A)" name="indexLmax">
<a-input type="number" v-model:value="form.indexLmax" placeholder="请输入LmaxdB(A)" allow-clear />
<a-form-item label="监测后校准值" name="afterMonitorValue">
<a-input v-model:value="form.afterMonitorValue" placeholder="请输入监测后校准值" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="声校准器测量声压值" name="soundPressureValue">
<a-input v-model:value="form.soundPressureValue" placeholder="请输入声校准器测量声压值" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="声校准仪器型号" name="soundInstrumentModel">
<a-input v-model:value="form.soundInstrumentModel" placeholder="请输入声校准仪器型号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="声校准仪器编号" name="soundInstrumentCode">
<a-input v-model:value="form.soundInstrumentCode" placeholder="请输入声校准仪器编号" allow-clear />
</a-form-item>
</a-col>
</a-row>
@@ -139,7 +121,7 @@
</a-modal>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadNoiseId" :datasource="url"
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="functionPlaceId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template v-if="bill.checked != 1" #toolbar>
<a-space>
@@ -148,10 +130,8 @@
ok-text="Yes" cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除</a-button>
</a-popconfirm>
</a-space>
</template>
<template #action="{ record }">
<a-space>
<a-button @click="openEdit(record)" type="primary" shape="round" size="small">修改</a-button>
@@ -169,135 +149,103 @@
<script>
import _ from "lodash"
import {
pageRoadNoiseUrl,
saveRoadNoise,
removeRoadNoise,
removeBatchRoadNoise,
updateRoadNoise,
getRoadNoiseBill
} from "@/api/ecology/road-sound";
pageFunctionPlaceUrl,
saveFunctionPlace,
removeFunctionPlace,
removeBatchFunctionPlace,
updateFunctionPlace,
getFunctionPlaceBill
} from "@/api/ecology/function-place";
import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
import moment from 'moment';
// import utils from "./utils";
export default {
name: 'RoadNoise',
components: {},
data() {
const {
billId
} = this.$route.params
return {
locale,
bill:{},
//
url: pageRoadNoiseUrl,
url: pageFunctionPlaceUrl,
selection: [],
//
columns: [
{
title: '监测日期',
dataIndex: 'monitorTime',
sorter: true
},
{
title: '测点名称',
dataIndex: 'place',
sorter: true
},
{
title: '点号',
dataIndex: 'placeCode',
title: '测点经度',
dataIndex: 'placeLng',
sorter: true
},
{
title: '所属路段',
dataIndex: 'road',
title: '测点纬度',
dataIndex: 'placeLat',
sorter: true
},
{
title: '所属城区',
dataIndex: 'area',
title: '机动车车道数',
dataIndex: 'motorway',
sorter: true
},
{
title: '路长',
dataIndex: 'roadLength',
title: '车道类别',
dataIndex: 'motorwayType',
sorter: true
},
{
title: '路宽',
dataIndex: 'roadWidth',
title: '道路等级',
dataIndex: 'motorwayLevel',
sorter: true
},
{
title: '中小型车流量(辆/20分钟',
dataIndex: 'smallTrafficFlow',
title: '测点参照物',
dataIndex: 'refObj',
sorter: true
},
{
title: '大型车流量(辆/20分钟',
dataIndex: 'largeTrafficFlow',
title: '道路覆盖人口(万人',
dataIndex: 'people',
sorter: true
},
{
title: '时段',
dataIndex: 'timeSlot',
sorter: true
},
// {
// title: '',
// dataIndex: 'monitorMonth',
// sorter: true
// },
// {
// title: '',
// dataIndex: 'monitorDay',
// sorter: true
// },
// {
// title: '',
// dataIndex: 'monitorHour',
// sorter: true
// },
// {
// title: '',
// dataIndex: 'monitorMinute',
// sorter: true
// },
{
title: 'LeqdB(A)',
dataIndex: 'indexLeq',
title: '监测站名',
dataIndex: 'station',
sorter: true
},
{
title: 'SDdB(A)',
dataIndex: 'indexSd',
title: '监测仪器型号',
dataIndex: 'monitorInstrumentModel',
sorter: true
},
{
title: 'L10dB(A)',
dataIndex: 'indexL10',
title: '监测仪器编号',
dataIndex: 'monitorInstrumentCode',
sorter: true
},
{
title: 'L50dB(A)',
dataIndex: 'indexL50',
title: '监测前校准值',
dataIndex: 'beforeMonitorValue',
sorter: true
},
{
title: 'L90dB(A)',
dataIndex: 'indexL90',
title: '声校准器测量声压值',
dataIndex: 'soundPressureValue',
sorter: true
},
{
title: 'LmindB(A)',
dataIndex: 'indexLmin',
title: '声校准仪器型号',
dataIndex: 'soundInstrumentModel',
sorter: true
},
{
title: 'LmaxdB(A)',
dataIndex: 'indexLmax',
title: '声校准仪器编号',
dataIndex: 'soundInstrumentCode',
sorter: true
},
{
@@ -312,9 +260,9 @@
}
],
//
roadNoiseBillId: billId,
functionPlaceBillId: billId,
where: {
roadNoiseBillId: billId
functionPlaceBillId: billId
},
//
selectionList: [],
@@ -328,10 +276,8 @@
};
},
mounted(){
const {
billId
} = this.$route.params
getRoadNoiseBill(billId).then(res=>{
getFunctionPlaceBill(this.functionPlaceBillId).then(res=>{
this.bill = res.data.data
if(res.data.data.checked == 1){
this.columns.splice(this.columns.length-1,1)
@@ -350,18 +296,13 @@
/* 重置搜索 */
reset() {
this.where = {
roadNoiseBillId: this.roadNoiseBillId
functionPlaceBillId: this.functionPlaceBillId
};
this.reload();
},
/* 显示编辑 */
openEdit(record) {
const cloneRecord = _.cloneDeep(record)
if (record && cloneRecord.monitorTime) {
console.log(moment(cloneRecord.monitorTime).format('YYYY MM DD'));
cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
}
// cloneRecord.mi
this.form = Object.assign({}, cloneRecord);
this.showEdit = true;
@@ -373,21 +314,9 @@
save() {
const hide = this.$message.loading('请求中..', 0);
const form = _.cloneDeep(this.form);
const date = new Date();
date.setFullYear(form.monitorDate.year());
date.setMonth(form.monitorDate.month());
date.setDate(form.monitorDate.date());
date.setHours(form.monitorTime.hour());
date.setMinutes(form.monitorTime.minutes());
form.monitorTime = date.getTime();
form.monitorYear = date.getFullYear();
form.monitorMonth = date.getMonth() + 1;
form.monitorDay = date.getDate();
form.monitorHour = date.getHours();
form.monitorMinute = date.getMinutes();
delete form['monitorDate']
if (form.roadNoiseId) {
updateRoadNoise(form).then(res => {
if (form.functionPlaceId) {
updateFunctionPlace(form).then(res => {
if (res.data.code == 0) {
this.showEdit = false;
this.$message.success(res.data.msg);
@@ -402,8 +331,8 @@
hide();
})
}else{
form.roadNoiseBillId = this.roadNoiseBillId;
saveRoadNoise(form).then(res => {
form.functionPlaceBillId = this.functionPlaceBillId;
saveFunctionPlace(form).then(res => {
if (res.data.code == 0) {
this.showEdit = false;
this.$message.success(res.data.msg);
@@ -423,7 +352,8 @@
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removeRoadNoise(row.roadNoiseId).then(res => {
console.log(row);
removeFunctionPlace(row.functionPlaceId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -435,9 +365,9 @@
}).finally(() => hide());
},
removeBatch() {
const ids = this.selectionList.map(item => item.roadNoiseId);
const ids = this.selectionList.map(item => item.functionPlaceId);
const hide = this.$message.loading('请求中..', 0);
removeBatchRoadNoise(ids).then(res => {
removeBatchFunctionPlace(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();

View File

@@ -0,0 +1,52 @@
export default {
toObjData(excelData) {
return excelData.map(item => {
const monitorTime = new Date();
monitorTime.setFullYear(item[0]);
monitorTime.setMonth(item[4]-1);
monitorTime.setDate(item[5]);
monitorTime.setHours(item[6]);
monitorTime.setMinutes(item[7]);
return {
monitorYear: item[0],
place: item[1],
placeCode: item[2],
functionType: item[3],
monitorMonth: item[4],
monitorDay: item[5],
monitorHour: item[6],
monitorMinute: item[7],
monitorTime: monitorTime.getTime(),
indexLeq: item[8],
indexSd: item[9],
indexL10: item[10],
indexL50: item[11],
indexL90: item[12],
indexLmin: item[13],
indexLmax: item[14],
}
})
},
toPlaceData(excelData) {
return excelData.map(item => {
return {
place: item[0],
placeLng: item[1],
placeLat: item[2],
placeHeight: item[3],
refObj: item[4],
functionCode: item[5],
monitorInstrumentModel: item[6],
monitorInstrumentCode: item[7],
beforeMonitorValue: item[8],
afterMonitorValue: item[9],
soundPressureValue: item[10],
soundInstrumentModel: item[11],
soundInstrumentCode: item[12],
}
})
}
}

View File

@@ -1,37 +0,0 @@
export default {
toObjData(excelData) {
return excelData.map(item => {
const monitorTime = new Date();
monitorTime.setFullYear(item[0]);
monitorTime.setMonth(item[10]-1);
monitorTime.setDate(item[11]);
monitorTime.setHours(item[12]);
monitorTime.setMinutes(item[13]);
return {
monitorYear: item[0],
place: item[1],
placeCode: item[2],
road: item[3],
area: item[4],
roadLength: item[5],
roadWidth: item[6],
smallTrafficFlow: item[7],
largeTrafficFlow: item[7],
timeSlot: item[9],
monitorMonth: item[10],
monitorDay: item[11],
monitorHour: item[12],
monitorMinute: item[13],
monitorTime: monitorTime.getTime(),
indexLeq: item[14],
indexSd: item[15],
indexL10: item[16],
indexL50: item[17],
indexL90: item[18],
indexLmin: item[19],
indexLmax: item[20],
}
})
}
}

View File

@@ -10,10 +10,10 @@
</template>
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane tab="噪声信息" key="noise">
<noise ref="noise"></noise>
<noise-bill ref="noise"></noise-bill>
</a-tab-pane>
<a-tab-pane tab="其他信息" key="place">
<place ref="place"></place>
<place-bill ref="place"></place-bill>
</a-tab-pane>
</a-tabs>
</a-card>
@@ -23,8 +23,8 @@
<script>
import XLSX from 'xlsx';
import utils from "./utils";
import Noise from "./base.vue";
import Place from "./place.vue";
import NoiseBill from "./noise-bill.vue";
import PlaceBill from "./place-bill.vue";
import {
saveRoadNoiseBill,
@@ -32,9 +32,10 @@
import {saveRoadPlaceBill} from "@/api/ecology/road-place";
export default {
name: "RoadCollectIndex",
components: {
Noise,
Place
NoiseBill,
PlaceBill
},
data() {

View File

@@ -103,7 +103,7 @@
} from "@/api/ecology/road-sound";
import moment from "moment";
export default {
name: 'RoadNoise',
name: 'RoadCollectNoiseBill',
components: {
CheckOutlined,
EditOutlined
@@ -223,7 +223,7 @@
},
detail(record) {
this.$router.replace({
path: "/sound/road/collect/table/" + record.roadNoiseBillId
path: "/sound/road/collect/noise/" + record.roadNoiseBillId
})
},
edit(record) {

View File

@@ -180,7 +180,7 @@
import moment from 'moment';
// import utils from "./utils";
export default {
name: 'RoadNoise',
name: 'RoadCollectNoise',
components: {},
data() {
const {

View File

@@ -0,0 +1,362 @@
<template>
<div>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadPlaceBillId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template #toolbar>
<!-- 搜索表单 -->
<a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
<a-form-item label="审核状态:">
<a-select v-model:value="where.checked" allowClear placeholder="未选择">
<a-select-option :value="1">已审核</a-select-option>
<a-select-option :value="0">未审核</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="表格名称:">
<a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
</a-form-item>
<a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-form-item>
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
<a-button @click="reset">重置</a-button>
</a-space>
</a-form-item>
</a-form>
</template>
<template #toolkit>
<a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`" ok-text="Yes"
cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>批量删除</a-button>
</a-popconfirm>
</template>
<template #billName="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.roadPlaceBillId]" class="editable-cell-input-wrapper">
<a-input v-model:value="editableData[record.roadPlaceBillId].billName" @pressEnter="save(record)" />
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ text || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record)" />
</div>
</div>
</template>
<template #reportTime="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.roadPlaceBillId]" class="editable-cell-input-wrapper">
<a-date-picker v-model:value="editableData[record.roadPlaceBillId].reportTime"></a-date-picker>
<!-- <a-input v-model:value="editableData[record.roadPlaceBillId].reportTime" @pressEnter="save(record)" /> -->
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ $util.toDateString(text,'yyyy-MM-dd') || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record)" />
</div>
</div>
</template>
<template #checked="{text}">
<span>
<a-tag v-if="text" color="green">已审核</a-tag>
<a-tag v-else color="orange">未审核</a-tag>
</span>
</template>
<template #action="{ record }">
<a-space>
<a-button @click="detail(record)" shape="round" size="small">查看</a-button>
<span v-hasPermi="['ecology:sound:verify']">
<a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改,确认?`" ok-text="Yes" cancel-text="No"
@confirm="verify(record)">
<a-button type="primary" shape="round" size="small">审核</a-button>
</a-popconfirm>
</span>
<a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
<a-button type="primary" danger shape="round" size="small">删除</a-button>
</a-popconfirm>
</a-space>
</template>
</ele-pro-table>
</div>
</template>
<script>
import _ from "lodash"
import {
CheckOutlined,
EditOutlined
} from '@ant-design/icons-vue';
import {
pageBillUrl,
removeRoadPlaceBill,
removeBatchRoadPlaceBill,
updateRoadPlaceBill,
verifyRoadPlaceBill
} from "@/api/ecology/road-place";
import moment from "moment";
export default {
name: 'RoadCollectPlaceBill',
components: {
CheckOutlined,
EditOutlined
},
data() {
return {
// 表格数据接口
url: pageBillUrl,
selection: [],
// 表格列配置
columns: [{
key: 'index',
dataIndex: 'index',
width: 48,
align: 'center',
customRender: ({
index
}) => index + 1
},
{
title: '表格名称',
dataIndex: 'billName',
sorter: true,
slots: {
customRender: 'billName',
},
},
{
title: '条目',
dataIndex: 'recordSize',
sorter: true,
},
// {
// title: '菜单名称',
// dataIndex: 'title',
// sorter: true
// },
{
title: '上报时间',
dataIndex: 'reportTime',
sorter: true,
slots: {
customRender: 'reportTime',
},
// customRender: ({
// text
// }) => this.$util.toDateString(text)
},
{
title: '导入时间',
dataIndex: 'createTime',
sorter: true,
customRender: ({
text
}) => this.$util.toDateString(text)
},
{
title: '审核状态',
dataIndex: 'checked',
sorter: true,
slots: {
customRender: 'checked',
},
},
// {
// title: '更新时间',
// dataIndex: 'updateTime',
// sorter: true,
// customRender: ({
// text
// }) => this.$util.toDateString(text)
// },
{
title: '操作',
key: 'action',
width: 150,
align: 'center',
slots: {
customRender: 'action'
}
}
],
// 表格搜索条件
where: {},
reportTimeScope: [],
// 表格选中数据
selectionList: [],
editableData: {},
// 当前编辑数据
current: null,
};
},
methods: {
/* 刷新表格 */
reload() {
this.where.reportTimeStart = null;
this.where.reportTimeEnd = null;
if (this.reportTimeScope && this.reportTimeScope.length == 2) {
this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
}
this.$refs.table.reload({
where: this.where
});
},
/* 重置搜索 */
reset() {
this.where = {};
this.reportTimeScope = [];
this.reload();
},
detail(record) {
this.$router.replace({
path: "/sound/road/collect/place/" + record.roadPlaceBillId
})
},
edit(record) {
this.editableData[record.roadPlaceBillId] = _.cloneDeep(record);
this.editableData[record.roadPlaceBillId].reportTime = moment(this.editableData[record.roadPlaceBillId]
.reportTime)
},
verify(record) {
const hide = this.$message.loading('请求中..', 0);
verifyRoadPlaceBill({
roadPlaceBillId: record.roadPlaceBillId
}).then(res => {
if (res.data.code == 0) {
record.checked = 1
this.$message.success(res.data.msg);
} else {
this.$message.error(res.data.msg);
}
}).catch((e) => {
this.$message.error(e.message);
}).finally(() => {
hide();
})
},
save(record) {
let {
roadPlaceBillId,
billName,
reportTime
} = this.editableData[record.roadPlaceBillId];
if (!roadPlaceBillId || !reportTime) {
this.$message.error('请填写完整信息再提交')
return
}
const hide = this.$message.loading('请求中..', 0);
reportTime = reportTime.format("x")
reportTime = Number(reportTime)
updateRoadPlaceBill({
roadPlaceBillId,
billName,
reportTime
}).then(res => {
if (res.data.code == 0) {
this.$message.success(res.data.msg);
record.billName = billName;
record.reportTime = reportTime
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
console.log(e);
this.$message.error(e.message);
}).finally(() => {
delete this.editableData[record.roadPlaceBillId]
hide()
})
},
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removeRoadPlaceBill(row.roadPlaceBillId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
// 批量删除
removeBatch() {
const ids = this.selectionList.map(item => item.roadPlaceBillId);
const hide = this.$message.loading('请求中..', 0);
removeBatchRoadPlaceBill(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
}
}
</script>
<style lang="less">
.editable-cell {
position: relative;
.editable-cell-input-wrapper,
.editable-cell-text-wrapper {
padding-right: 24px;
}
.editable-cell-text-wrapper {
padding: 5px 24px 5px 5px;
}
.editable-cell-icon,
.editable-cell-icon-check {
position: absolute;
right: 0;
width: 20px;
cursor: pointer;
}
.editable-cell-icon {
margin-top: 4px;
display: none;
}
.editable-cell-icon-check {
line-height: 28px;
}
.editable-cell-icon:hover,
.editable-cell-icon-check:hover {
color: #108ee9;
}
.editable-add-btn {
margin-bottom: 8px;
}
}
.editable-cell:hover .editable-cell-icon {
display: inline-block;
}
</style>

View File

@@ -1,290 +1,360 @@
<template>
<div>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadPlaceBillId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template #toolbar>
<div class="ele-body">
<a-card :bordered="false">
<!-- 搜索表单 -->
<a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
<a-form-item label="审核状态:">
<a-select v-model:value="where.checked" allowClear placeholder="未选择">
<a-select-option :value="1">已审核</a-select-option>
<a-select-option :value="0">未审核</a-select-option>
</a-select>
<a-form :model="where" :label-col="{md: {span: 6}, sm: {span: 24}}"
:wrapper-col="{md: {span: 18}, sm: {span: 24}}">
<a-row>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="测点名称:">
<a-input v-model:value.trim="where.place" placeholder="请输入测点名称" allow-clear />
</a-form-item>
<a-form-item label="表格名称:">
<a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="路段:">
<a-input v-model:value.trim="where.road" placeholder="请输入路段名称" allow-clear />
</a-form-item>
<a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="城区">
<a-input v-model:value.trim="where.area" placeholder="请输入城区名称" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
<a-button @click="reset">重置</a-button>
</a-space>
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
<template #toolkit>
<a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`" ok-text="Yes"
cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>批量删除</a-button>
</a-popconfirm>
</template>
<template #billName="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.roadPlaceBillId]" class="editable-cell-input-wrapper">
<a-input v-model:value="editableData[record.roadPlaceBillId].billName" @pressEnter="save(record)" />
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ text || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record)" />
</div>
</div>
</template>
<template #reportTime="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.roadPlaceBillId]" class="editable-cell-input-wrapper">
<a-date-picker v-model:value="editableData[record.roadPlaceBillId].reportTime"></a-date-picker>
<!-- <a-input v-model:value="editableData[record.roadPlaceBillId].reportTime" @pressEnter="save(record)" /> -->
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ $util.toDateString(text,'yyyy-MM-dd') || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record)" />
</div>
</div>
</template>
<template #checked="{text}">
<span>
<a-tag v-if="text" color="green">已审核</a-tag>
<a-tag v-else color="orange">未审核</a-tag>
</span>
</template>
<a-modal v-model:visible="showEdit" :title="form.roadPlaceId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
:width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
<a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
:wrapper-col="{md: {span: 18}, sm: {span: 24}}">
<a-row>
<a-col :md="12" :sm="24">
<a-form-item label="测点名称" name="place">
<a-input v-model:value="form.place" placeholder="请输入测点名称" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="道路等级" name="motorwayLevel">
<a-input v-model:value="form.motorwayLevel" placeholder="请输入道路等级" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="车道类别" name="motorwayType">
<a-input v-model:value="form.motorwayType" placeholder="请输入车道类别" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="机动车车道数" name="motorway">
<a-input v-model:value="form.motorway" placeholder="请输入机动车车道数" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="测点参照物" name="refObj">
<a-input v-model:value="form.refObj" placeholder="请输入测点测点参照物" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="测点经度" name="placeLng">
<a-input type="number" v-model:value="form.placeLng" placeholder="请输入测点经度" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="测点纬度" name="placeLat">
<a-input type="number" v-model:value="form.placeLat" placeholder="请输入测点纬度" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="道路覆盖人口" name="people">
<a-input type="number" v-model:value="form.people" placeholder="请输入道路覆盖人口(万人)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="监测站名" name="station">
<a-input v-model:value="form.station" placeholder="请输入监测站名" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="监测仪器型号" name="monitorInstrumentModel">
<a-input v-model:value="form.monitorInstrumentModel" placeholder="请输入监测仪器型号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="监测仪器编号" name="monitorInstrumentCode">
<a-input v-model:value="form.monitorInstrumentCode" placeholder="请输入监测仪器编号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="监测前校准值" name="beforeMonitorValue">
<a-input v-model:value="form.beforeMonitorValue" placeholder="请输入监测前校准值" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="监测后校准值" name="afterMonitorValue">
<a-input v-model:value="form.afterMonitorValue" placeholder="请输入监测后校准值" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="声校准器测量声压值" name="soundPressureValue">
<a-input v-model:value="form.soundPressureValue" placeholder="请输入声校准器测量声压值" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="声校准仪器型号" name="soundInstrumentModel">
<a-input v-model:value="form.soundInstrumentModel" placeholder="请输入声校准仪器型号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="声校准仪器编号" name="soundInstrumentCode">
<a-input v-model:value="form.soundInstrumentCode" placeholder="请输入声校准仪器编号" allow-clear />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadPlaceId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template v-if="bill.checked != 1" #toolbar>
<a-space>
<a-button @click="openEdit" type="primary">新增</a-button>
<a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`"
ok-text="Yes" cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除</a-button>
</a-popconfirm>
</a-space>
</template>
<template #action="{ record }">
<a-space>
<a-button @click="detail(record)" shape="round" size="small">查看</a-button>
<span v-hasPermi="['ecology:sound:verify']">
<a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改,确认?`" ok-text="Yes" cancel-text="No"
@confirm="verify(record)">
<a-button type="primary" shape="round" size="small">审核</a-button>
</a-popconfirm>
</span>
<a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
<a-button @click="openEdit(record)" type="primary" shape="round" size="small">修改</a-button>
<a-popconfirm :title="`确认删除这条数据吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
<a-button type="primary" danger shape="round" size="small">删除</a-button>
</a-popconfirm>
</a-space>
</template>
</ele-pro-table>
</a-card>
</div>
<!-- 编辑弹窗 -->
</template>
<script>
import _ from "lodash"
import {
CheckOutlined,
EditOutlined
} from '@ant-design/icons-vue';
import {
pageBillUrl,
removeRoadPlaceBill,
removeBatchRoadPlaceBill,
updateRoadPlaceBill,
verifyRoadPlaceBill
pageRoadPlaceUrl,
saveRoadPlace,
removeRoadPlace,
removeBatchRoadPlace,
updateRoadPlace,
getRoadPlaceBill
} from "@/api/ecology/road-place";
import moment from "moment";
import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
// import utils from "./utils";
export default {
name: 'RoadPlace',
components: {
CheckOutlined,
EditOutlined
},
name: 'RoadCollectPlace',
components: {},
data() {
const {
billId
} = this.$route.params
return {
locale,
bill:{},
// 表格数据接口
url: pageBillUrl,
url: pageRoadPlaceUrl,
selection: [],
// 表格列配置
columns: [{
key: 'index',
dataIndex: 'index',
width: 48,
align: 'center',
customRender: ({
index
}) => index + 1
},
{
title: '表格名称',
dataIndex: 'billName',
sorter: true,
slots: {
customRender: 'billName',
},
columns: [
{
title: '测点名称',
dataIndex: 'place',
sorter: true
},
{
title: '条目',
dataIndex: 'recordSize',
sorter: true,
},
// {
// title: '菜单名称',
// dataIndex: 'title',
// sorter: true
// },
{
title: '上报时间',
dataIndex: 'reportTime',
sorter: true,
slots: {
customRender: 'reportTime',
},
// customRender: ({
// text
// }) => this.$util.toDateString(text)
title: '测点经度',
dataIndex: 'placeLng',
sorter: true
},
{
title: '导入时间',
dataIndex: 'createTime',
sorter: true,
customRender: ({
text
}) => this.$util.toDateString(text)
title: '测点纬度',
dataIndex: 'placeLat',
sorter: true
},
{
title: '审核状态',
dataIndex: 'checked',
sorter: true,
slots: {
customRender: 'checked',
title: '机动车车道数',
dataIndex: 'motorway',
sorter: true
},
{
title: '车道类别',
dataIndex: 'motorwayType',
sorter: true
},
{
title: '道路等级',
dataIndex: 'motorwayLevel',
sorter: true
},
{
title: '测点参照物',
dataIndex: 'refObj',
sorter: true
},
{
title: '道路覆盖人口(万人)',
dataIndex: 'people',
sorter: true
},
{
title: '监测站名',
dataIndex: 'station',
sorter: true
},
{
title: '监测仪器型号',
dataIndex: 'monitorInstrumentModel',
sorter: true
},
{
title: '监测仪器编号',
dataIndex: 'monitorInstrumentCode',
sorter: true
},
{
title: '监测前校准值',
dataIndex: 'beforeMonitorValue',
sorter: true
},
{
title: '声校准器测量声压值',
dataIndex: 'soundPressureValue',
sorter: true
},
{
title: '声校准仪器型号',
dataIndex: 'soundInstrumentModel',
sorter: true
},
{
title: '声校准仪器编号',
dataIndex: 'soundInstrumentCode',
sorter: true
},
// {
// title: '更新时间',
// dataIndex: 'updateTime',
// sorter: true,
// customRender: ({
// text
// }) => this.$util.toDateString(text)
// },
{
title: '操作',
key: 'action',
width: 150,
align: 'center',
fixed: 'right',
slots: {
customRender: 'action'
}
}
],
// 表格搜索条件
where: {},
reportTimeScope: [],
roadPlaceBillId: billId,
where: {
roadPlaceBillId: billId
},
// 表格选中数据
selectionList: [],
editableData: {},
// 当前编辑数据
current: null,
// 是否显示编辑弹窗
showEdit: false,
// 表单数据
form: {},
loading: false,
rules: {}
};
},
mounted(){
getRoadPlaceBill(this.roadPlaceBillId).then(res=>{
this.bill = res.data.data
if(res.data.data.checked == 1){
this.columns.splice(this.columns.length-1,1)
}
})
},
methods: {
/* 刷新表格 */
reload() {
this.where.reportTimeStart = null;
this.where.reportTimeEnd = null;
if (this.reportTimeScope && this.reportTimeScope.length == 2) {
this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
}
console.log(this.$route);
console.log(this.$router);
this.$refs.table.reload({
where: this.where
});
},
/* 重置搜索 */
reset() {
this.where = {};
this.reportTimeScope = [];
this.where = {
roadPlaceBillId: this.roadPlaceBillId
};
this.reload();
},
detail(record) {
this.$router.replace({
path: "/sound/road/collect/table/" + record.roadPlaceBillId
})
/* 显示编辑 */
openEdit(record) {
const cloneRecord = _.cloneDeep(record)
// cloneRecord.mi
this.form = Object.assign({}, cloneRecord);
this.showEdit = true;
this.$nextTick(() => {
this.$refs.form.clearValidate(); // 清除表单验证信息
});
},
edit(record) {
this.editableData[record.roadPlaceBillId] = _.cloneDeep(record);
this.editableData[record.roadPlaceBillId].reportTime = moment(this.editableData[record.roadPlaceBillId]
.reportTime)
},
verify(record) {
save() {
const hide = this.$message.loading('请求中..', 0);
verifyRoadPlaceBill({
roadPlaceBillId: record.roadPlaceBillId
}).then(res => {
const form = _.cloneDeep(this.form);
delete form['monitorDate']
if (form.roadPlaceId) {
updateRoadPlace(form).then(res => {
if (res.data.code == 0) {
record.checked = 1
this.showEdit = false;
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch((e) => {
this.$message.error(e.message);
}).catch((error)=>{
this.$message.error(error.message);
}).finally(()=>{
console.log("finallyfinallyfinallyfinally");
hide();
})
}else{
form.roadPlaceBillId = this.roadPlaceBillId;
saveRoadPlace(form).then(res => {
if (res.data.code == 0) {
this.showEdit = false;
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch((error)=>{
this.$message.error(error.message);
}).finally(()=>{
hide();
})
},
save(record) {
}
let {
roadPlaceBillId,
billName,
reportTime
} = this.editableData[record.roadPlaceBillId];
if (!roadPlaceBillId || !reportTime) {
this.$message.error('请填写完整信息再提交')
return
}
const hide = this.$message.loading('请求中..', 0);
reportTime = reportTime.format("x")
reportTime = Number(reportTime)
updateRoadPlaceBill({
roadPlaceBillId,
billName,
reportTime
}).then(res => {
if (res.data.code == 0) {
this.$message.success(res.data.msg);
record.billName = billName;
record.reportTime = reportTime
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
console.log(e);
this.$message.error(e.message);
}).finally(() => {
delete this.editableData[record.roadPlaceBillId]
hide()
})
},
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removeRoadPlaceBill(row.roadPlaceBillId).then(res => {
console.log(row);
removeRoadPlace(row.roadPlaceId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -296,9 +366,9 @@
}).finally(() => hide());
},
removeBatch() {
const ids = this.selectionList.map(item => item.roadPlaceBillId);
const ids = this.selectionList.map(item => item.roadPlaceId);
const hide = this.$message.loading('请求中..', 0);
removeBatchRoadPlaceBill(ids).then(res => {
removeBatchRoadPlace(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -315,47 +385,6 @@
}
</script>
<style lang="less">
.editable-cell {
position: relative;
<style scoped lang="less">
.editable-cell-input-wrapper,
.editable-cell-text-wrapper {
padding-right: 24px;
}
.editable-cell-text-wrapper {
padding: 5px 24px 5px 5px;
}
.editable-cell-icon,
.editable-cell-icon-check {
position: absolute;
right: 0;
width: 20px;
cursor: pointer;
}
.editable-cell-icon {
margin-top: 4px;
display: none;
}
.editable-cell-icon-check {
line-height: 28px;
}
.editable-cell-icon:hover,
.editable-cell-icon-check:hover {
color: #108ee9;
}
.editable-add-btn {
margin-bottom: 8px;
}
}
.editable-cell:hover .editable-cell-icon {
display: inline-block;
}
</style>

View File

@@ -1,407 +0,0 @@
<template>
<div class="ele-body">
<a-card :bordered="false">
<!-- 搜索表单 -->
<a-form :model="where" :labelCol="{ offset: 1}">
<a-row>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="审核状态:">
<a-select v-model:value="where.checked" allowClear placeholder="全部">
<a-select-option value="1">已审核</a-select-option>
<a-select-option value="0">未审核</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="表格名称:">
<a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
<a-button @click="reset">重置</a-button>
</a-space>
</a-form-item>
</a-col>
</a-row>
</a-form>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadNoiseBillId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template #toolbar>
<a-space>
<a-upload :before-upload="importFile" :showUploadList="false" accept=".xls,.xlsx,.csv">
<a-button>导入excel</a-button>
</a-upload>
<a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`"
ok-text="Yes" cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除</a-button>
</a-popconfirm>
</a-space>
</template>
<template #billName="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.roadNoiseBillId]" class="editable-cell-input-wrapper">
<a-input v-model:value="editableData[record.roadNoiseBillId].billName" @pressEnter="save(record)" />
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ text || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record)" />
</div>
</div>
</template>
<template #reportTime="{ text, record }">
<div class="editable-cell">
<div v-if="editableData[record.roadNoiseBillId]" class="editable-cell-input-wrapper">
<a-date-picker v-model:value="editableData[record.roadNoiseBillId].reportTime"></a-date-picker>
<!-- <a-input v-model:value="editableData[record.roadNoiseBillId].reportTime" @pressEnter="save(record)" /> -->
<check-outlined class="editable-cell-icon-check" @click="save(record)" />
</div>
<div v-else class="editable-cell-text-wrapper">
{{ $util.toDateString(text,'yyyy-MM-dd') || ' ' }}
<edit-outlined class="editable-cell-icon" @click="edit(record)" />
</div>
</div>
</template>
<template #checked="{text}">
<span>
<a-tag v-if="text" color="green">已审核</a-tag>
<a-tag v-else color="orange">未审核</a-tag>
</span>
</template>
<template #action="{ record }">
<a-space>
<a-button @click="detail(record)" shape="round" size="small">查看</a-button>
<a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改,确认?`" ok-text="Yes" cancel-text="No" @confirm="verify(record)">
<a-button type="primary" shape="round" size="small">审核</a-button>
</a-popconfirm>
<a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
<a-button type="primary" danger shape="round" size="small">删除</a-button>
</a-popconfirm>
</a-space>
</template>
</ele-pro-table>
</a-card>
</div>
<!-- 编辑弹窗 -->
</template>
<script>
import XLSX from 'xlsx';
import _ from "lodash"
import {
CheckOutlined,
EditOutlined
} from '@ant-design/icons-vue';
import {
pageBillUrl,
saveRoadNoiseBill,
removeRoadNoiseBill,
removeBatchRoadNoiseBill,
updateRoadNoiseBill,
verifyRoadNoiseBill
} from "@/api/ecology/road-sound";
import utils from "./utils";
import moment from "moment";
export default {
name: 'RoadOther',
components: {
CheckOutlined,
EditOutlined
},
data() {
return {
// 表格数据接口
url: pageBillUrl,
selection: [],
// 表格列配置
columns: [{
key: 'index',
dataIndex: 'index',
width: 48,
align: 'center',
customRender: ({
index
}) => index + 1
},
{
title: '表格名称',
dataIndex: 'billName',
sorter: true,
slots: {
customRender: 'billName',
},
},
{
title: '条目',
dataIndex: 'recordSize',
sorter: true,
},
// {
// title: '菜单名称',
// dataIndex: 'title',
// sorter: true
// },
{
title: '上报时间',
dataIndex: 'reportTime',
sorter: true,
slots: {
customRender: 'reportTime',
},
// customRender: ({
// text
// }) => this.$util.toDateString(text)
},
{
title: '导入时间',
dataIndex: 'createTime',
sorter: true,
customRender: ({
text
}) => this.$util.toDateString(text)
},
{
title: '审核状态',
dataIndex: 'checked',
sorter: true,
slots: {
customRender: 'checked',
},
},
// {
// title: '更新时间',
// dataIndex: 'updateTime',
// sorter: true,
// customRender: ({
// text
// }) => this.$util.toDateString(text)
// },
{
title: '操作',
key: 'action',
width: 150,
align: 'center',
slots: {
customRender: 'action'
}
}
],
// 表格搜索条件
where: {},
reportTimeScope: [],
// 表格选中数据
selectionList: [],
editableData: {},
// 当前编辑数据
current: null,
};
},
methods: {
/* 刷新表格 */
reload() {
this.where.reportTimeStart = null;
this.where.reportTimeEnd = null;
if (this.reportTimeScope && this.reportTimeScope.length == 2) {
this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
}
this.$refs.table.reload({
where: this.where
});
},
/* 重置搜索 */
reset() {
this.where = {};
this.reportTimeScope = [];
this.reload();
},
detail(record) {
this.$router.replace({
path: "/sound/road/collect/table/" + record.roadNoiseBillId
})
},
edit(record) {
this.editableData[record.roadNoiseBillId] = _.cloneDeep(record);
this.editableData[record.roadNoiseBillId].reportTime = moment(this.editableData[record.roadNoiseBillId]
.reportTime)
},
verify(record) {
const hide = this.$message.loading('请求中..', 0);
verifyRoadNoiseBill({roadNoiseBillId:record.roadNoiseBillId}).then(res => {
if (res.data.code == 0) {
record.checked = 1
this.$message.success(res.data.msg);
} else {
this.$message.error(res.data.msg);
}
}).catch((e) => {
this.$message.error(e.message);
}).finally(() => {
hide();
})
},
save(record) {
let {
roadNoiseBillId,
billName,
reportTime
} = this.editableData[record.roadNoiseBillId];
if (!roadNoiseBillId || !reportTime) {
this.$message.error('请填写完整信息再提交')
return
}
const hide = this.$message.loading('请求中..', 0);
reportTime = reportTime.format("x")
reportTime = Number(reportTime)
updateRoadNoiseBill({
roadNoiseBillId,
billName,
reportTime
}).then(res => {
if (res.data.code == 0) {
this.$message.success(res.data.msg);
record.billName = billName;
record.reportTime = reportTime
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
console.log(e);
this.$message.error(e.message);
}).finally(() => {
delete this.editableData[record.roadNoiseBillId]
hide()
})
},
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removeRoadNoiseBill(row.roadNoiseBillId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
removeBatch() {
const ids = this.selectionList.map(item => item.roadNoiseBillId);
const hide = this.$message.loading('请求中..', 0);
removeBatchRoadNoiseBill(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
/* 导入本地excel文件 */
importFile(file) {
try {
let reader = new FileReader();
reader.onload = (e) => {
let data = new Uint8Array(e.target.result);
let workbook = XLSX.read(data, {
type: 'array'
});
let sheetNames = workbook.SheetNames;
let worksheet = workbook.Sheets[sheetNames[0]];
// 解析成二维数组
let aoa = XLSX.utils.sheet_to_json(worksheet, {
header: 1,
});
const reportDate = aoa[1][0].replace(/[^\d]+/g, "-")
const roadNoiseList = aoa.filter(item => item.length == 21 && typeof item[0] == "number");
// 解析成对象数组
const billData = utils.toObjData(roadNoiseList);
// 上传到服务器
saveRoadNoiseBill({
reportTime: new Date(reportDate).getTime(),
billName: file.name.substr(0, file.name.lastIndexOf(".")),
roadNoiseList: billData
}).then(() => {
this.reload()
})
// console.log(billData);
};
reader.readAsArrayBuffer(file);
} catch (error) {
this.$message.error("表格格式有误,请检查后重新上传!");
}
return false;
}
}
}
</script>
<style scoped lang="less">
.editable-cell {
position: relative;
.editable-cell-input-wrapper,
.editable-cell-text-wrapper {
padding-right: 24px;
}
.editable-cell-text-wrapper {
padding: 5px 24px 5px 5px;
}
.editable-cell-icon,
.editable-cell-icon-check {
position: absolute;
right: 0;
width: 20px;
cursor: pointer;
}
.editable-cell-icon {
margin-top: 4px;
display: none;
}
.editable-cell-icon-check {
line-height: 28px;
}
.editable-cell-icon:hover,
.editable-cell-icon-check:hover {
color: #108ee9;
}
.editable-add-btn {
margin-bottom: 8px;
}
}
.editable-cell:hover .editable-cell-icon {
display: inline-block;
}
</style>

View File

@@ -1,459 +0,0 @@
<template>
<div class="ele-body">
<a-card :bordered="false">
<!-- 搜索表单 -->
<a-form :model="where" :label-col="{md: {span: 6}, sm: {span: 24}}"
:wrapper-col="{md: {span: 18}, sm: {span: 24}}">
<a-row>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="测点名称:">
<a-input v-model:value.trim="where.place" placeholder="请输入测点名称" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="路段:">
<a-input v-model:value.trim="where.road" placeholder="请输入路段名称" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="城区">
<a-input v-model:value.trim="where.area" placeholder="请输入城区名称" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
<a-button @click="reset">重置</a-button>
</a-space>
</a-form-item>
</a-col>
</a-row>
</a-form>
<a-modal v-model:visible="showEdit" :title="form.roadNoiseId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
:width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
<a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
:wrapper-col="{md: {span: 18}, sm: {span: 24}}">
<a-row>
<a-col :md="12" :sm="24">
<a-form-item label="日期" name="monitorDate">
<a-date-picker v-model:value="form.monitorDate" :locale="locale" />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="时间" name="monitorTime">
<a-time-picker v-model:value="form.monitorTime" format="HH:mm" />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="时段" name="timeSlot">
<a-select v-model:value="form.timeSlot">
<a-select-option value="昼"></a-select-option>
<a-select-option value="夜"></a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="测点名称" name="place">
<a-input v-model:value="form.place" placeholder="请输入测点名称" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="点号" name="placeCode">
<a-input v-model:value="form.placeCode" placeholder="请输入点号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="所属路段" name="road">
<a-input v-model:value="form.road" placeholder="请输入测点名称" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="所属城区" name="area">
<a-input v-model:value="form.area" placeholder="请输入点号" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="路长" name="roadLength">
<a-input v-model:value="form.roadLength" placeholder="请输入路长(米)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="总路宽" name="roadWidth">
<a-input v-model:value="form.roadWidth" placeholder="请输入总路宽(米)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="中小型车流量" name="smallTrafficFlow">
<a-input type="number" v-model:value="form.smallTrafficFlow" placeholder="请输入中小型车流量(辆/20分钟"
allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="大型车流量" name="largeTrafficFlow">
<a-input type="number" v-model:value="form.largeTrafficFlow" placeholder="请输入大型车流量(辆/20分钟"
allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="LeqdB(A)" name="indexLeq">
<a-input type="number" v-model:value="form.indexLeq" placeholder="请输入LeqdB(A)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="SDdB(A)" name="indexSd">
<a-input type="number" v-model:value="form.indexSd" placeholder="请输入大SDdB(A)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="L10dB(A)" name="indexL10">
<a-input type="number" v-model:value="form.indexL10" placeholder="请输入L10dB(A)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="L50dB(A)" name="indexL50">
<a-input type="number" v-model:value="form.indexL50" placeholder="请输入L50dB(A)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="L90dB(A)" name="indexL90">
<a-input type="number" v-model:value="form.indexL90" placeholder="请输入L90dB(A)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="LmindB(A)" name="indexLmin">
<a-input type="number" v-model:value="form.indexLmin" placeholder="请输入LmindB(A)" allow-clear />
</a-form-item>
</a-col>
<a-col :md="12" :sm="24">
<a-form-item label="LmaxdB(A)" name="indexLmax">
<a-input type="number" v-model:value="form.indexLmax" placeholder="请输入LmaxdB(A)" allow-clear />
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-modal>
<!-- 表格 -->
<ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadNoiseId" :datasource="url"
:columns="columns" :where="where" :scroll="{x: 'max-content'}">
<template v-if="bill.checked != 1" #toolbar>
<a-space>
<a-button @click="openEdit" type="primary">新增</a-button>
<a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`"
ok-text="Yes" cancel-text="No" @confirm="removeBatch">
<a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除</a-button>
</a-popconfirm>
</a-space>
</template>
<template #action="{ record }">
<a-space>
<a-button @click="openEdit(record)" type="primary" shape="round" size="small">修改</a-button>
<a-popconfirm :title="`确认删除这条数据吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
<a-button type="primary" danger shape="round" size="small">删除</a-button>
</a-popconfirm>
</a-space>
</template>
</ele-pro-table>
</a-card>
</div>
<!-- 编辑弹窗 -->
</template>
<script>
import _ from "lodash"
import {
pageRoadNoiseUrl,
saveRoadNoise,
removeRoadNoise,
removeBatchRoadNoise,
updateRoadNoise,
getRoadNoiseBill
} from "@/api/ecology/road-sound";
import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
import moment from 'moment';
// import utils from "./utils";
export default {
name: 'RoadNoise',
components: {},
data() {
const {
billId
} = this.$route.params
return {
locale,
bill:{},
// 表格数据接口
url: pageRoadNoiseUrl,
selection: [],
// 表格列配置
columns: [
{
title: '监测日期',
dataIndex: 'monitorTime',
sorter: true
},
{
title: '测点名称',
dataIndex: 'place',
sorter: true
},
{
title: '点号',
dataIndex: 'placeCode',
sorter: true
},
{
title: '所属路段',
dataIndex: 'road',
sorter: true
},
{
title: '所属城区',
dataIndex: 'area',
sorter: true
},
{
title: '路长',
dataIndex: 'roadLength',
sorter: true
},
{
title: '路宽',
dataIndex: 'roadWidth',
sorter: true
},
{
title: '中小型车流量(辆/20分钟',
dataIndex: 'smallTrafficFlow',
sorter: true
},
{
title: '大型车流量(辆/20分钟',
dataIndex: 'largeTrafficFlow',
sorter: true
},
{
title: '时段',
dataIndex: 'timeSlot',
sorter: true
},
// {
// title: '月',
// dataIndex: 'monitorMonth',
// sorter: true
// },
// {
// title: '日',
// dataIndex: 'monitorDay',
// sorter: true
// },
// {
// title: '时',
// dataIndex: 'monitorHour',
// sorter: true
// },
// {
// title: '分',
// dataIndex: 'monitorMinute',
// sorter: true
// },
{
title: 'LeqdB(A)',
dataIndex: 'indexLeq',
sorter: true
},
{
title: 'SDdB(A)',
dataIndex: 'indexSd',
sorter: true
},
{
title: 'L10dB(A)',
dataIndex: 'indexL10',
sorter: true
},
{
title: 'L50dB(A)',
dataIndex: 'indexL50',
sorter: true
},
{
title: 'L90dB(A)',
dataIndex: 'indexL90',
sorter: true
},
{
title: 'LmindB(A)',
dataIndex: 'indexLmin',
sorter: true
},
{
title: 'LmaxdB(A)',
dataIndex: 'indexLmax',
sorter: true
},
{
title: '操作',
key: 'action',
width: 150,
align: 'center',
fixed: 'right',
slots: {
customRender: 'action'
}
}
],
// 表格搜索条件
roadNoiseBillId: billId,
where: {
roadNoiseBillId: billId
},
// 表格选中数据
selectionList: [],
// 是否显示编辑弹窗
showEdit: false,
// 表单数据
form: {},
loading: false,
rules: {}
};
},
mounted(){
const {
billId
} = this.$route.params
getRoadNoiseBill(billId).then(res=>{
this.bill = res.data.data
if(res.data.data.checked == 1){
this.columns.splice(this.columns.length-1,1)
}
})
},
methods: {
/* 刷新表格 */
reload() {
console.log(this.$route);
console.log(this.$router);
this.$refs.table.reload({
where: this.where
});
},
/* 重置搜索 */
reset() {
this.where = {
roadNoiseBillId: this.roadNoiseBillId
};
this.reload();
},
/* 显示编辑 */
openEdit(record) {
const cloneRecord = _.cloneDeep(record)
if (record && cloneRecord.monitorTime) {
console.log(moment(cloneRecord.monitorTime).format('YYYY MM DD'));
cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
}
// cloneRecord.mi
this.form = Object.assign({}, cloneRecord);
this.showEdit = true;
this.$nextTick(() => {
this.$refs.form.clearValidate(); // 清除表单验证信息
});
},
save() {
const hide = this.$message.loading('请求中..', 0);
const form = _.cloneDeep(this.form);
const date = new Date();
date.setFullYear(form.monitorDate.year());
date.setMonth(form.monitorDate.month());
date.setDate(form.monitorDate.date());
date.setHours(form.monitorTime.hour());
date.setMinutes(form.monitorTime.minutes());
form.monitorTime = date.getTime();
form.monitorYear = date.getFullYear();
form.monitorMonth = date.getMonth() + 1;
form.monitorDay = date.getDate();
form.monitorHour = date.getHours();
form.monitorMinute = date.getMinutes();
delete form['monitorDate']
if (form.roadNoiseId) {
updateRoadNoise(form).then(res => {
if (res.data.code == 0) {
this.showEdit = false;
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch((error)=>{
this.$message.error(error.message);
}).finally(()=>{
console.log("finallyfinallyfinallyfinally");
hide();
})
}else{
form.roadNoiseBillId = this.roadNoiseBillId;
saveRoadNoise(form).then(res => {
if (res.data.code == 0) {
this.showEdit = false;
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch((error)=>{
this.$message.error(error.message);
}).finally(()=>{
hide();
})
}
},
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removeRoadNoise(row.roadNoiseId).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
removeBatch() {
const ids = this.selectionList.map(item => item.roadNoiseId);
const hide = this.$message.loading('请求中..', 0);
removeBatchRoadNoise(ids).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
} else {
this.$message.error(res.data.msg);
}
}).catch(e => {
this.$message.error(e.msg);
}).finally(() => hide());
},
}
}
</script>
<style scoped lang="less">
</style>

View File

@@ -1,37 +0,0 @@
export default {
toObjData(excelData) {
return excelData.map(item => {
const monitorTime = new Date();
monitorTime.setFullYear(item[0]);
monitorTime.setMonth(item[10]-1);
monitorTime.setDate(item[11]);
monitorTime.setHours(item[12]);
monitorTime.setMinutes(item[13]);
return {
monitorYear: item[0],
place: item[1],
placeCode: item[2],
road: item[3],
area: item[4],
roadLength: item[5],
roadWidth: item[6],
smallTrafficFlow: item[7],
largeTrafficFlow: item[7],
timeSlot: item[9],
monitorMonth: item[10],
monitorDay: item[11],
monitorHour: item[12],
monitorMinute: item[13],
monitorTime: monitorTime.getTime(),
indexLeq: item[14],
indexSd: item[15],
indexL10: item[16],
indexL50: item[17],
indexL90: item[18],
indexLmin: item[19],
indexLmax: item[20],
}
})
}
}

View File

@@ -8,24 +8,24 @@
<a-row>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="年份:">
<a-select v-model:value="where.monitorYear" placeholder="年份">
<a-select v-model:value="where.monitorYear" placeholder="选择年份">
<a-select-option v-for="(o) in yearOptions" :key="o" :value="o">{{o}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="季度:">
<a-select v-model:value="where.monitorQuarter" placeholder="选择季度">
<a-select-option v-for="(o) in quarterOptions" :key="o.value" :value="o.value">{{o.label}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="昼夜:">
<a-select :options="timeSlotOptions" v-model:value="where.timeSlot" placeholder="昼夜">
</a-select>
</a-form-item>
</a-col>
<a-col :lg="8" :md="12" :sm="24" :xs="24">
<a-form-item label="时间范围:">
<!-- <a-month-picker v-model:value="timeScope" placeholder="起始" /> -->
<a-range-picker v-model:value="timeScope" format="YYYY-MM-DD" />
</a-form-item>
</a-col>
<a-col :lg="4" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
@@ -322,6 +322,21 @@
},
data() {
const quarterOptions = [{
label: "第一季度",
value: 1
},
{
label: "第二季度",
value: 2
},
{
label: "第三季度",
value: 3
},{
label: "第四季度",
value: 4
}];
return {
url: pageRoadNoiseStatisticUrl,
data: [],
@@ -344,6 +359,7 @@
label: "市"
}],
yearOptions: [],
quarterOptions,
timeSlotOptions: [{
value: "昼",
label: "昼"