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:
gxwebsoft
2021-12-19 10:07:59 +08:00
parent a51f84d95d 26cb65165a
commit 8041a34c44
6 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/water/river/collect/utils.js
View File

@@ -122,7 +122,6 @@ export default {
},
// 国家级水功能区上报数据
toNationalLevelDataObj(excelData) {
var dataTime;
return excelData.map(item => {
// let date = new Date();
// let year = date.getFullYear(); // 年

14
src/views/water/river/dict/api-relate.vue
View File

@@ -108,6 +108,12 @@
<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="remark">
<a-input v-model:value="form.remark" placeholder="请输入备注" allow-clear />
</a-form-item>
@@ -280,6 +286,14 @@ export default {
title: "数据来源",
dataIndex: "dataSources",
},
{
title: "经度",
dataIndex: "longitude",
},
{
title: "纬度",
dataIndex: "latitude",
},
{
title: "备注",
dataIndex: "remark",

16
src/views/water/river/dict/autonomous.vue
View File

@@ -110,7 +110,12 @@
<a-form-item label="湖泊面积（km2）" name="lakeArea">
<a-input v-model:value="form.lakeArea" placeholder="请输入湖泊面积（km2）" 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="remark">
<a-input
v-model:value="form.remark"
@@ -281,7 +286,14 @@ export default {
title: "湖泊面积（km2）",
dataIndex: "lakeArea",
},
{
title: "经度",
dataIndex: "longitude",
},
{
title: "纬度",
dataIndex: "latitude",
},
{
title: "备注",
dataIndex: "remark",

15
src/views/water/river/dict/place.vue
View File

@@ -98,7 +98,12 @@
<a-form-item label="河流级别" name="riverLevel">
<a-input v-model:value="form.riverLevel" 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>
</a-modal>
<!-- 表格 -->
@@ -247,6 +252,14 @@
dataIndex: "riverLevel",
sorter: true,
},
{
title: "经度",
dataIndex: "longitude",
},
{
title: "纬度",
dataIndex: "latitude",
},
{
title: "操作",
key: "action",

15
src/views/water/river/dict/water.vue
View File

@@ -81,7 +81,12 @@
<a-form-item label="水质目标" name="waterTarget">
<a-input v-model:value="form.waterTarget" 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>
</a-modal>
<!-- 表格 -->
@@ -189,6 +194,14 @@ export default {
title: "水质目标",
dataIndex: "waterTarget",
},
{
title: "经度",
dataIndex: "longitude",
},
{
title: "纬度",
dataIndex: "latitude",
},
{
title: "操作",
key: "action",