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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
710356044
2022-01-04 21:04:46 +08:00
parent 5f90df0716 e15b3197fd
commit bf4a31a4a1
12 changed files with 285 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/template/专项湖库数据报送表.xlsx Normal file
View File

Binary file not shown.

BIN
public/template/五象湖水质监测报告表.xlsx Normal file
View File

Binary file not shown.

BIN
public/template/其它内湖水质监测报告表.xls Normal file
View File

Binary file not shown.

18
src/views/sound/road/trend/index.vue
View File

@@ -29,6 +29,13 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="4" :md="8" :sm="24" :xs="24">
<a-form-item label="昼夜">
<a-select v-model:value="queryParams.timeSlot" allowClear>
<a-select-option v-for="(item) in timeSlotOptions" :key="item.value">{{ item.label }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :lg="4" :md="8" :sm="24" :xs="24">
<a-form-item label="横坐标:">
<a-select v-model:value="queryParams.xco" :options="xOptions" allowClear placeholder="请选择横坐标">
@@ -70,10 +77,12 @@
areaList: ['南宁市'],
placeList: [],
regionLevel: '市级', // 区域等级
timeSlot: '昼',
xco: '年度' // 横坐标
},
trendData: [],
regionLevelOptions: [],
timeSlotOptions: [],
placeOptions: [],
areaOptions: [],
yearOptions: [],
@@ -112,6 +121,14 @@
};
});
});
getColumnOptions("time_slot").then((res) => {
this.timeSlotOptions = res.data.data.map((item) => {
return {
label: item,
value: item,
};
});
});
this.getArea()
this.getPlace('市级')
},
@@ -136,6 +153,7 @@
value: item.dictDataName,
};
});
this.areaOptions.unshift({ label: '所有县', value: '所有县'})
})
},
// 测点名称下拉列表

1
src/views/sound/zone/trend/index.vue
View File

@@ -153,6 +153,7 @@
value: item.dictDataName,
};
});
this.areaOptions.unshift({ label: '所有县', value: '所有县'})
})
},
// 测点名称下拉列表

50
src/views/water/drinking-water-village/collect/water-bill.vue
View File

@@ -7,33 +7,60 @@
<!-- 搜索表单 -->
<a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="区域等级:">
<a-select v-model:value="where.regionLevel" allowClear placeholder="未选择">
<a-select-option :value="'市级'">市级</a-select-option>
<a-select-option :value="'县级'">县级</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.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-form-item label="上报时间:">
</a-col>
<!-- <a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-form-item> -->
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="起始时间:" name="reportTimeStart" >
<a-date-picker
v-model:value="where.reportTimeStart"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
placeholder="请输入起始时间"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="结束时间:" name="reportTimeEnd">
<a-date-picker
v-model:value="where.reportTimeEnd"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
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-form>
</template>
<template #toolkit>
@@ -248,12 +275,12 @@
/* 刷新表格 */
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.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
});
@@ -388,6 +415,9 @@
</script>
<style lang="less">
.ant-col{
margin-top: 10px;
}
.editable-cell {
position: relative;

58
src/views/water/drinking-water/collect/water-bill.vue
View File

@@ -13,6 +13,7 @@
<template #toolbar>
<!-- 搜索表单 -->
<a-form layout="inline" :model="where" :labelCol="{ offset: 1 }">
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="区域等级:">
<a-select
v-model:value="where.regionLevel"
@@ -23,6 +24,8 @@
<a-select-option :value="'县级'">县级</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.checked"
@@ -33,7 +36,8 @@
<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"
@@ -41,17 +45,41 @@
allow-clear
/>
</a-form-item>
<a-form-item label="上报时间:">
</a-col>
<!-- <a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-form-item>
</a-form-item> -->
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="起始时间:" name="reportTimeStart" >
<a-date-picker
v-model:value="where.reportTimeStart"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
placeholder="请输入起始时间"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="结束时间:" name="reportTimeEnd">
<a-date-picker
v-model:value="where.reportTimeEnd"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
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-form>
</template>
<template #toolkit>
@@ -423,14 +451,14 @@ export default {
},
/* 刷新表格 */
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.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,
});
@@ -567,6 +595,12 @@ export default {
</script>
<style lang="less">
.ant-col{
margin-top: 10px;
}
.ant-calendar-picker{
width: 100%;
}
.editable-cell {
position: relative;

27
src/views/water/lake/collect/index.vue
View File

@@ -46,6 +46,19 @@
>
<a-button>专项湖库导入</a-button>
</a-upload>
<a-dropdown>
<template #overlay>
<a-menu style="word-spacing:10px;">
<a-menu-item @click="download('专项湖库数据报送表','/template/专项湖库数据报送表.xlsx')" > <a ref=""></a>专项湖库数据报送表 </a-menu-item>
<a-menu-item @click="download('五象湖水质监测报告表','/template/五象湖水质监测报告表.xlsx')" > 五象湖水质监测报告表 </a-menu-item>
<a-menu-item @click="download('其它内湖水质监测报告表','/template/其它内湖水质监测报告表.xls')" > 其它内湖水质监测报告表 </a-menu-item>
</a-menu>
</template>
<a-button type="primary" style="left: 60px">
模板下载
<DownOutlined />
</a-button>
</a-dropdown>
</a-space>
</template>
<a-tabs v-model:activeKey="activeKey">
@@ -66,6 +79,7 @@
import {Modal} from "ant-design-vue";
import WaterBill from "./water-bill.vue";
import SpecialBill from "./special-bill.vue";
import { DownOutlined } from "@ant-design/icons-vue";
// import {saveLakeBill} from "@/api/ecology/lake";
// import {saveLakeBill as saveSpecialLake} from "@/api/ecology/special-lake";
import {importCityOther,importCppointCity,importSpecial} from "@/api/ecology/water/lake/import";
@@ -74,7 +88,8 @@ export default {
name: "LakeCollectIndex",
components: {
WaterBill,
SpecialBill
SpecialBill,
DownOutlined
},
data() {
return {
@@ -82,6 +97,16 @@ export default {
};
},
methods: {
// 模板下载
download (name,url){
var a = document.createElement("a");
a.href = url;
a.download = `${name}-导入模板`;
a.style.display = "none";
document.body.appendChild(a);
a.click();
a.remove();
},
handleMenuClick(e) {
document.getElementById(e.key).click()
},

37
src/views/water/lake/collect/special-bill.vue
View File

@@ -17,10 +17,33 @@
<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-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="起始时间:" name="reportTimeStart" >
<a-date-picker
v-model:value="where.reportTimeStart"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
placeholder="请输入起始时间"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="结束时间:" name="reportTimeEnd">
<a-date-picker
v-model:value="where.reportTimeEnd"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
placeholder="请输入结束时间"
allow-clear
/>
</a-form-item>
</a-col>
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
@@ -216,12 +239,12 @@
/* 刷新表格 */
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.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
});

37
src/views/water/lake/collect/water-bill.vue
View File

@@ -18,9 +18,32 @@
<a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
</a-form-item>
<a-form-item label="上报时间:">
<!-- <a-form-item label="上报时间:">
<a-range-picker separator="~" v-model:value="reportTimeScope" />
</a-form-item> -->
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="起始时间:" name="reportTimeStart" >
<a-date-picker
v-model:value="where.reportTimeStart"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
placeholder="请输入起始时间"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item label="结束时间:" name="reportTimeEnd">
<a-date-picker
v-model:value="where.reportTimeEnd"
valueFormat="YYYY-MM-DD HH:mm:ss"
:locale="locale"
placeholder="请输入结束时间"
allow-clear
/>
</a-form-item>
</a-col>
<a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
<a-space>
@@ -216,12 +239,12 @@
/* 刷新表格 */
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.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
});

46
src/views/water/lake/dict/inner.vue
View File

@@ -50,7 +50,18 @@
<a-form-item label="点位名称" name="sectionName">
<a-input v-model:value="form.sectionName" placeholder="请输入点位名称" allow-clear />
</a-form-item>
<a-form-item label="经度" name="longitude">
<a-input v-model:value="form.longitude" placeholder="请输入点位经度" allow-clear />
</a-form-item>
<a-form-item label="纬度" name="latitude">
<a-input v-model:value="form.latitude" placeholder="请输入点位纬度" allow-clear />
</a-form-item>
<a-form-item label="类别" name="type">
<a-input v-model:value="form.type" placeholder="请输入类别" allow-clear />
</a-form-item>
<a-form-item label="排序" name="sort">
<a-input-number v-model:value="form.sort" placeholder="请输入排序" allow-clear />
</a-form-item>
</a-form>
</a-modal>
<!-- 表格 -->
@@ -136,6 +147,23 @@
title: "点位名称",
dataIndex: "sectionName",
sorter: true,
},
{
title: "点位经度",
dataIndex: "longitude",
},
{
title: "点位纬度",
dataIndex: "latitude",
},
{
title: "类别",
dataIndex: "type",
},
{
title: "排序",
dataIndex: "sort",
sorter: true,
},
{
title: "操作",
@@ -171,6 +199,22 @@
required: true,
message: '请输入点位名称'
}],
longitude: [{
required: true,
message: '请输入点位经度'
}],
latitude: [{
required: true,
message: '请输入点位纬度'
}],
type: [{
required: true,
message: '请输入类型'
}],
sort: [{
required: true,
message: '请输入排序'
}],
},
yearOptions: [],
showNYear: false,

48
src/views/water/lake/dict/special.vue
View File

@@ -107,7 +107,18 @@
<a-form-item label="水期代码" name="waterCode">
<a-input v-model:value="form.waterCode" placeholder="请输入水期代码" allow-clear />
</a-form-item>
<a-form-item label="经度" name="longitude">
<a-input v-model:value="form.longitude" placeholder="请输入点位经度" allow-clear />
</a-form-item>
<a-form-item label="纬度" name="latitude">
<a-input v-model:value="form.latitude" placeholder="请输入点位纬度" allow-clear />
</a-form-item>
<a-form-item label="类别" name="type">
<a-input v-model:value="form.type" placeholder="请输入类别" allow-clear />
</a-form-item>
<a-form-item label="排序" name="sort">
<a-input-number v-model:value="form.sort" placeholder="请输入排序" allow-clear />
</a-form-item>
</a-form>
</a-modal>
<!-- 表格 -->
@@ -251,6 +262,23 @@ export default {
title: "水期代码",
dataIndex: "waterCode",
},
{
title: "点位经度",
dataIndex: "longitude",
},
{
title: "点位纬度",
dataIndex: "latitude",
},
{
title: "类别",
dataIndex: "type",
},
{
title: "排序",
dataIndex: "sort",
sorter: true,
},
{
title: "操作",
key: "action",
@@ -276,7 +304,23 @@ export default {
year: [{required: true, message: '请输入年份'}],
sectionName:[{
required:true,message: "请输入点位名称",
}]
}],
longitude: [{
required: true,
message: '请输入点位经度'
}],
latitude: [{
required: true,
message: '请输入点位纬度'
}],
type: [{
required: true,
message: '请输入类型'
}],
sort: [{
required: true,
message: '请输入排序'
}],
},
yearOptions: [],
showNYear:false,