gxwebsoft/jczxw-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大气

Browse Source
This commit is contained in:
weicw
2021-10-06 06:07:11 +08:00
parent dffbbb2763
commit 2a59762ef5
12 changed files with 1357 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
src/views/atmosphere/acid-rain/collect/index.vue
View File

@@ -41,89 +41,89 @@ export default {
},
methods: {
/* 导入本地excel文件 */
importFileCity(file) {
async importFileCity(file) {
const hide = this.$message.loading("导入中..", 0);
let reader = new FileReader();
reader.onload = (e) => {
try {
let data = new Uint8Array(e.target.result);
let workbook = XLSX.read(data, {
type: "array",
});
let sheetNames = workbook.SheetNames;
// 解析成二维数组
let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
header: 1,
});
const reportDate = aoa[2][0].replace(/[^\d]+/g, "-");
const acidList = aoa.filter((item) => {
return item.length >= 16 && item[0] && !item[0].includes("编号");
});
// 解析成对象数组
const billName = aoa[0][0] + aoa[1][0];
const billData = utils.toObjData(acidList, new Date(reportDate).getFullYear());
if (
!billData ||
billData.length == 0
// (!billData2 || billData2.length == 0)
) {
hide();
Modal.error({
title: "导入失败",
content: "找不到数据",
});
return;
}
const tasks = [];
if (billData.length > 0) {
tasks.push(
saveAcidRainBill({
// reportTime: new Date(reportDate).getTime(),
billName: billName,
regionLevel: "市级",
acidRainList: billData,
})
);
}
// 上传到服务器
Promise.all(tasks)
.then((res) => {
if (res[0].data.code == 0) {
Modal.success({
title: "导入成功",
content: `成功导入${billData.length}条数据`,
});
this.$refs.rain && this.$refs.rain.reload();
} else {
Modal.error({
title: "导入失败",
content: "数据上传出错",
});
}
})
.catch(() => {
Modal.error({
title: "导入失败",
content: "数据上传出错",
});
})
.finally(() => {
hide();
reader.onload = async (e) => {
try {
let data = new Uint8Array(e.target.result);
let workbook = XLSX.read(data, {
type: "array",
});
} catch (error) {
hide();
Modal.error({
title: "导入失败",
content: error.message,
});
}
// console.log(billData);
let sheetNames = workbook.SheetNames;
// 解析成二维数组
let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
header: 1,
});
const reportDate = aoa[2][0].replace(/[^\d]+/g, "-");
const acidList = aoa.filter((item) => {
return item.length >= 16 && item[0] && !item[0].includes("编号");
});
// 解析成对象数组
const billName = aoa[0][0] + aoa[1][0];
const billData = await utils.toObjData(acidList, new Date(reportDate).getFullYear());
if (
!billData ||
billData.length == 0
// (!billData2 || billData2.length == 0)
) {
hide();
Modal.error({
title: "导入失败",
content: "找不到数据",
});
return;
}
const tasks = [];
if (billData.length > 0) {
tasks.push(
saveAcidRainBill({
// reportTime: new Date(reportDate).getTime(),
billName: billName,
regionLevel: "市级",
acidRainList: billData,
})
);
}
// 上传到服务器
Promise.all(tasks)
.then((res) => {
if (res[0].data.code == 0) {
Modal.success({
title: "导入成功",
content: `成功导入${billData.length}条数据`,
});
this.$refs.rain && this.$refs.rain.reload();
} else {
Modal.error({
title: "导入失败",
content: "数据上传出错",
});
}
})
.catch(() => {
Modal.error({
title: "导入失败",
content: "数据上传出错",
});
})
.finally(() => {
hide();
});
} catch (error) {
hide();
Modal.error({
title: "导入失败",
content: error.message,
});
}
// console.log(billData);
};
reader.readAsArrayBuffer(file);

12
src/views/atmosphere/acid-rain/collect/utils.js
View File

@@ -1,6 +1,13 @@
import moment from "moment";
import moment from "moment"
import axios from "axios";
import {listAllUrl} from "@/api/ecology/atmosphere/acid-rain-plcae"
export default {
toObjData(excelData,monitorYear) {
async toObjData(excelData,monitorYear) {
const res = await axios.get(listAllUrl,{params:{year:monitorYear}})
if(res.data.code !=0){
return Promise.reject(monitorYear +"点位字典未设置");
}
const dict = res.data.data;
return excelData.map(item => {
const monitorTime = moment(monitorYear + "."+item[1],"Y.M.D");
const monitorStartTime = moment(`${monitorYear}.${item[2]}.${item[3]} ${item[4]}:${item[5]}`,"Y.M.D H:m");
@@ -8,6 +15,7 @@ export default {
console.log(item);
const row = {
city: "南宁市",
place: dict.find(p=>p.placeCode = item[0].split("~")[0]).place,
code: item[0],
precipitationType:item[10],
precipitation:item[11],

114
src/views/atmosphere/acid-rain/dict/place.vue
View File

@@ -44,13 +44,13 @@
:wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
>
<a-form-item label="新年份" name="nYear">
<a-input-number id="inputNumber" v-model:value="nYear" :min="1970" :max="2050" />
<a-input-number id="inputNumber" v-model:value="nYear" :min="1970" :max="2050"/>
</a-form-item>
</a-form>
</a-modal>
<a-modal
v-model:visible="showEdit"
:title="form.roadNoisePlaceId !== undefined ? '修改' : '添加'"
:title="form.acidRainPlaceBaseInfoDictId !== undefined ? '修改' : '添加'"
:confirm-loading="loading"
:width="800"
:body-style="{ paddingBottom: '8px' }"
@@ -64,55 +64,25 @@
:wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
>
<a-form-item label="年份" name="year">
<a-input-number v-model:value="form.year" :min="1970" :max="2050" />
<a-input-number v-model:value="form.year" :min="1970" :max="2050"/>
</a-form-item>
<a-form-item label="测点名称" name="placeName">
<a-input v-model:value="form.placeName" placeholder="请输入测点名称" allow-clear/>
<a-form-item label="点位名称" name="place">
<a-input v-model:value="form.place" placeholder="请输入点位名称" allow-clear/>
</a-form-item>
<a-form-item label="测点经度" name="placeLng">
<a-input v-model:value="form.placeLng" placeholder="请输入测点经度" allow-clear/>
<a-form-item label="属性" name="attribute">
<a-input v-model:value="form.attribute" placeholder="请输入点位属性" allow-clear/>
</a-form-item>
<a-form-item label="测点纬度" name="placeLat">
<a-input v-model:value="form.placeLat" placeholder="请输入测点纬度" allow-clear/>
<a-form-item label="ph限值" name="ph">
<a-input type="number" v-model:value="form.ph" placeholder="请输入ph限值" allow-clear/>
</a-form-item>
<a-form-item label="机动车车道数" name="motorway">
<a-input type="number" v-model:value="form.motorway" placeholder="请输入机动车车道数" allow-clear/>
<a-form-item label="点位编号" name="placeCode">
<a-input v-model:value="form.placeCode" placeholder="请输入点位编号" allow-clear/>
</a-form-item>
<a-form-item label="车道类别" name="motorwayType">
<a-input v-model:value="form.motorwayType" placeholder="请输入车道类别" allow-clear/>
<a-form-item label="点位经度" name="longitude">
<a-input type="number" v-model:value="form.longitude" placeholder="请输入点位经度" allow-clear/>
</a-form-item>
<a-form-item label="道路等级" name="motorwayLevel">
<a-input v-model:value="form.motorwayLevel" placeholder="请输入道路等级" allow-clear/>
</a-form-item>
<a-form-item label="测点参照物" name="refObj">
<a-input v-model:value="form.refObj" placeholder="请输入测点参照物" allow-clear/>
</a-form-item>
<a-form-item label="道路覆盖人口（万人）" name="people">
<a-input v-model:value="form.people" placeholder="请输入道路覆盖人口（万人）" allow-clear/>
</a-form-item>
<a-form-item label="监测站名" name="station">
<a-input v-model:value="form.station" placeholder="请输入监测站名" allow-clear/>
</a-form-item>
<a-form-item label="监测仪器型号" name="monitorInstrumentModel">
<a-input v-model:value="form.monitorInstrumentModel" placeholder="请输入测监测仪器型号" allow-clear/>
</a-form-item>
<a-form-item label="监测仪器编号" name="monitorInstrumentCode">
<a-input v-model:value="form.monitorInstrumentCode" placeholder="请输入监测仪器编号" allow-clear/>
</a-form-item>
<a-form-item label="监测前校准值" name="beforeMonitorValue">
<a-input v-model:value="form.beforeMonitorValue" placeholder="请输入监测前校准值" allow-clear/>
</a-form-item>
<a-form-item label="监测后校准值" name="afterMonitorValue">
<a-input v-model:value="form.afterMonitorValue" placeholder="请输入监测后校准值" allow-clear/>
</a-form-item>
<a-form-item label="声校准器测量声压值" name="soundPressureValue">
<a-input v-model:value="form.soundPressureValue" placeholder="请输入声校准器测量声压值" allow-clear/>
</a-form-item>
<a-form-item label="声校准仪器型号" name="soundInstrumentModel">
<a-input v-model:value="form.soundInstrumentModel" placeholder="请输入声校准仪器型号" allow-clear/>
</a-form-item>
<a-form-item label="声校准仪器编号" name="soundInstrumentCode">
<a-input v-model:value="form.soundInstrumentCode" placeholder="请输入声校准仪器编号" allow-clear/>
<a-form-item label="点位纬度" name="latitude">
<a-input type="number" v-model:value="form.latitude" placeholder="请输入点位纬度" allow-clear/>
</a-form-item>
</a-form>
</a-modal>
@@ -120,13 +90,13 @@
<ele-pro-table
v-model:selection="selectionList"
ref="table"
row-key="roadNoisePlaceId"
:datasource="url"
:columns="columns"
:where="where"
:scroll="{ x: 'max-content' }"
:need-page="false"
@done="(d) => (data = d.data)"
>
<template #toolbar>
<a-space>
@@ -211,6 +181,8 @@ export default {
data() {
return {
data: [],
// 表格数据接口
url: listAllUrl,
selection: [],
@@ -226,6 +198,21 @@ export default {
dataIndex: "place",
sorter: true,
},
{
title: "点位编号",
dataIndex: "placeCode",
sorter: true,
},
{
title: "属性",
dataIndex: "attribute",
sorter: true,
},
{
title: "ph限值",
dataIndex: "ph",
sorter: true,
},
{
title: "经度",
dataIndex: "longitude",
@@ -254,17 +241,17 @@ export default {
selectionList: [],
// 是否显示编辑弹窗
showEdit: false,
showNYear:false,
showNYear: false,
cYear: undefined,
nYear:undefined,
nYear: undefined,
// 表单数据
form: {},
loading: false,
rules: {
year: [{required: true, message: '请输入年份'}],
placeName: [{required: true, message: '请选择测点名称'}],
placeLng: [{required: true, message: '请输入测点经度',},],
placeLat: [{required: true, message: '请输入测点纬度',},],
placeName: [{required: true, message: '请选择点位名称'}],
placeLng: [{required: true, message: '请输入点位经度',},],
placeLat: [{required: true, message: '请输入点位纬度',},],
},
};
},
@@ -272,6 +259,10 @@ export default {
this.getOptions();
},
methods: {
parseData:(res)=>{
console.log(res)
return [];
},
/* 刷新表格 */
reload() {
@@ -279,7 +270,7 @@ export default {
where: this.where,
});
},
getOptions(){
getOptions() {
getColumnOptions("year").then(res => {
console.log(res)
if (res.data.code == 0) {
@@ -306,11 +297,12 @@ export default {
this.$refs.form.clearValidate(); // 清除表单验证信息
});
},
async save() {
await this.$refs.form.validate();
const hide = this.$message.loading('请求中..', 0);
const form = this.form;
if (form.roadNoisePlaceId) {
if (form.acidRainPlaceBaseInfoDictId) {
updatePlace(form)
.then((res) => {
if (res.data.code == 0) {
@@ -351,7 +343,7 @@ export default {
/* 删除单个 */
remove(row) {
const hide = this.$message.loading('请求中..', 0);
removePlace(row.roadNoisePlaceId).then((res) => {
removePlace(row.acidRainPlaceBaseInfoDictId).then((res) => {
hide();
if (res.data.code === 0) {
this.$message.success(res.data.msg);
@@ -367,7 +359,7 @@ export default {
/* 批量删除 */
removeBatch() {
const hide = this.$message.loading('请求中..', 0);
const ids = this.selectionList.map((item) => item.roadNoisePlaceId);
const ids = this.selectionList.map((item) => item.acidRainPlaceBaseInfoDictId);
removeBatchPlace(ids).then((res) => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
@@ -381,13 +373,13 @@ export default {
hide();
})
},
setCYear(e){
setCYear(e) {
this.cYear = e.key;
this.showNYear = true;
},
copyBatch(){
copyBatch() {
const hide = this.$message.loading('请求中..', 0);
copyBatchPlace({cyear:Number(this.cYear),nyear:this.nYear}).then(res=>{
copyBatchPlace({cyear: Number(this.cYear), nyear: this.nYear}).then(res => {
if (res.data.code === 0) {
this.$message.success(res.data.msg);
this.reload();
@@ -402,12 +394,12 @@ export default {
hide();
})
},
exportData(){
const columns = this.columns.filter(item=>item.dataIndex);
exportData() {
const columns = this.columns.filter(item => item.dataIndex);
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
this.data.forEach((d) => {
this.data.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});

85
src/views/atmosphere/acid-rain/statistic/city.vue
View File

@@ -9,21 +9,21 @@
: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-select v-model:value="where.regionLevel">-->
<!-- <a-select-option-->
<!-- v-for="(item) in modelOptions"-->
<!-- :key="item.value"-->
<!-- >{{ item.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 v-model:value="where.regionLevel">-->
<!-- <a-select-option-->
<!-- v-for="(item) in modelOptions"-->
<!-- :key="item.value"-->
<!-- >{{ item.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-range-picker v-model:value="time"/>
<a-range-picker format="YYYY-MM" :mode="mode" @panelChange="handlePanelChange" @change="handleChange" v-model:value="time"/>
</a-form-item>
</a-col>
</a-row>
@@ -49,6 +49,7 @@
:scroll="{ x: 'max-content' }"
:init-load="false"
@done="(d) => (data = d.data)"
:parseData="parseData"
method="POST"
>
@@ -62,7 +63,7 @@
import _ from "lodash";
import XLSX from "xlsx";
import {statisticCity, getColumnOptions} from "@/api/ecology/acid";
import { Modal } from "ant-design-vue";
import {Modal} from "ant-design-vue";
import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
import moment from "moment";
@@ -73,6 +74,7 @@ export default {
data() {
return {
data: [],
mode:['month', 'month'],
locale,
bill: {},
// 表格数据接口
@@ -82,17 +84,22 @@ export default {
{label: "市", value: "city"},
{label: "县", value: "county"},
{label: "站点", value: "place"},
],
// 表格列配置
columns: [
{title: "xx", dataIndex: "place",align:"center"},
{title: "县城", dataIndex: "place", align: "center"},
{title: "项目", dataIndex: "periodType", align: "center"},
{title: "降水样品（个）", dataIndex: "precipitationSampleAcount", align: "center"},
{title: "酸雨样品（个）", dataIndex: "acidRainSampleAcount", align: "center"},
{title: "最小pH值", dataIndex: "minPh", align: "center"},
{title: "最大pH值", dataIndex: "maxPh", align: "center"},
{title: "酸雨频率（%）", dataIndex: "acidRainFrequency", align: "center"},
{title: "降水pH值（无量纲）", dataIndex: "precipitationPh", align: "center"},
],
regionLevelOptions: [],
time: undefined,
// 表格搜索条件
where: {
},
where: {},
// 表格选中数据
selectionList: [],
};
@@ -102,6 +109,29 @@ export default {
this.reload();
},
methods: {
parseData(res) {
if (res.code == 0) {
const list = [];
console.log(res.data[0])
res.data.forEach(item => {
const key = Object.keys(item)[0]
list.push(...item[key])
})
res.data = list;
return res;
}
},
handleChange(val){
this.time = val;
},
handlePanelChange(val,mode){
this.time = val;
this.mode = [
mode[0] === 'date' ? 'month' : mode[0],
mode[1] === 'date' ? 'month' : mode[1],
]
},
/**获取下来框数据 */
loadOptionData() {
getColumnOptions("region_level").then((res) => {
@@ -121,15 +151,15 @@ export default {
where.timeStart = `${year}-01-01 00:00:00`;
where.timeEnd = moment(Date.now()).format("YYYY-MM-DD 00:00:00")
} else {
if(this.time[0].year() != this.time[1].year()){
if (this.time[0].year() != this.time[1].year()) {
Modal.error({
title: "查询失败",
content: "开始时间与结束时间年份不一致",
})
return;
}
where.timeStart = this.time[0].format("YYYY-MM-DD 00:00:00");
where.timeEnd = this.time[1].format("YYYY-MM-DD 00:00:00");
where.timeStart = this.time[0].format("YYYY-MM-01 00:00:00");
where.timeEnd = this.time[1].format("YYYY-MM-01 00:00:00");
}
this.$refs.table.reload({
where
@@ -137,8 +167,7 @@ export default {
},
/* 重置搜索 */
reset() {
this.where = {
};
this.where = {};
this.time = undefined;
this.reload();
},
@@ -148,22 +177,22 @@ export default {
const th2 = [];
const merges = []; // 合并
const columnsTemp = []; // 树形结构整理成list
this.columns.forEach((item,index)=>{
if(item.children){
item.children.forEach((citem)=>{
this.columns.forEach((item, index) => {
if (item.children) {
item.children.forEach((citem) => {
th1.push(item.title)
th2.push(citem.title)
columnsTemp.push(citem)
})
merges.push({s: {r: 0, c: th1.length-item.children.length}, e: {r: 0, c: th1.length-1}})
}else{
merges.push({s: {r: 0, c: th1.length - item.children.length}, e: {r: 0, c: th1.length - 1}})
} else {
th1.push(item.title)
th2.push("")
columnsTemp.push(item)
merges.push({s: {r: 0, c: index}, e: {r: 1, c: index}})
}
})
arr.push(th1,th2);
arr.push(th1, th2);
this.data.forEach((d) => {
const td = columnsTemp.map((item) => d[item.dataIndex]);
arr.push(td);

39
src/views/atmosphere/acid-rain/statistic/county.vue
View File

@@ -23,7 +23,7 @@
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="时间范围:">
<a-range-picker v-model:value="time"/>
<a-range-picker format="YYYY-MM" :mode="mode" @panelChange="handlePanelChange" @change="handleChange" v-model:value="time"/>
</a-form-item>
</a-col>
</a-row>
@@ -50,6 +50,7 @@
:init-load="false"
@done="(d) => (data = d.data)"
method="POST"
:parseData="parseData"
>
</ele-pro-table>
@@ -86,7 +87,14 @@ export default {
],
// 表格列配置
columns: [
{title: "xx", dataIndex: "place",align:"center"},
{title: "县城", dataIndex: "place", align: "center"},
{title: "项目", dataIndex: "periodType", align: "center"},
{title: "降水样品（个）", dataIndex: "precipitationSampleAcount", align: "center"},
{title: "酸雨样品（个）", dataIndex: "acidRainSampleAcount", align: "center"},
{title: "最小pH值", dataIndex: "minPh", align: "center"},
{title: "最大pH值", dataIndex: "maxPh", align: "center"},
{title: "酸雨频率（%）", dataIndex: "acidRainFrequency", align: "center"},
{title: "降水pH值（无量纲）", dataIndex: "precipitationPh", align: "center"},
],
regionLevelOptions: [],
time: undefined,
@@ -113,6 +121,29 @@ export default {
});
});
},
parseData(res) {
if (res.code == 0) {
const list = [];
console.log(res.data[0])
res.data.forEach(item => {
const key = Object.keys(item)[0]
list.push(...item[key])
})
res.data = list;
return res;
}
},
handleChange(val){
this.time = val;
},
handlePanelChange(val,mode){
this.time = val;
this.mode = [
mode[0] === 'date' ? 'month' : mode[0],
mode[1] === 'date' ? 'month' : mode[1],
]
},
/* 刷新表格 */
reload() {
const where = _.cloneDeep(this.where);
@@ -128,8 +159,8 @@ export default {
})
return;
}
where.timeStart = this.time[0].format("YYYY-MM-DD 00:00:00");
where.timeEnd = this.time[1].format("YYYY-MM-DD 00:00:00");
where.timeStart = this.time[0].format("YYYY-MM-01 00:00:00");
where.timeEnd = this.time[1].format("YYYY-MM-01 00:00:00");
}
this.$refs.table.reload({
where