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-09-10 13:06:20 +08:00
parent 03815d04b6
commit c18e732ef4
3 changed files with 157 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/water/drinking-water-village/collect/index.vue
View File

@@ -20,7 +20,7 @@
</a-space>
</template>
<a-tabs v-model:activeKey="activeKey">
<a-tab-pane tab="农村引用水" key="water">
<a-tab-pane tab="农村饮用水" key="water">
<water-bill ref="water"></water-bill>
</a-tab-pane>
</a-tabs>

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

@@ -97,19 +97,46 @@ export default {
waterQualityGoal: item[11],
dataSources: item[12],
sectionName: item[13],
samplingTime:item[14]? moment(item[14],"M月D日").valueOf():new Date().getTime(),
permanganateIndex: item[15],
ammonia: item[15],
totalPhosphorus: item[17],
ffeWaterFunctionAreaWaterQualityCategory: item[18],
lprlCompliantEvaluationConclusion: item[19],
ffeCompliantEvaluationConclusion: item[20],
ffeMajorOverStandardItemsMultiples: item[21],
lprlWaterFunctionAreaWaterQualityCategory: item[22],
// lprlCompliantEvaluationConclusion: item[14],
lprlMajorOverStandardItemsMultiples: item[23],
remark: item[24],
systemCode: item[25],
samplingTime: item[14] ? moment(item[14], "Y年M月D日").valueOf() : null,
wTemp: item[15],
ph: item[16],
dissolvedOxygen: item[17],
permanganateIndex: item[18],
cod: item[19],
fiveDayBod: item[20],
ammonia: item[21],
pTotal: item[22],
cu: item[23],
zn: item[24],
f: item[25],
se: item[26],
as: item[27],
hg: item[28],
cd: item[29],
cr6: item[30],
pb: item[31],
cyanide: item[32],
vPhen: item[33],
oils: item[34],
anSaa: item[35],
s: item[36],
coloOrg: item[37],
so4: item[38],
cl: item[39],
nitrateNitrogen: item[40],
fe: item[41],
mn: item[42],
nTotal: item[43],
transp: item[44],
chla: item[45],
ffeWaterFunctionAreaWaterQualityCategory: item[46],
ffeCompliantEvaluationConclusion: item[47],
ffeMajorOverStandardItemsMultiples: item[48],
lprlWaterFunctionAreaWaterQualityCategory: item[49],
lprlCompliantEvaluationConclusion: item[50],
lprlMajorOverStandardItemsMultiples: item[51],
remark: item[52],
systemCode: item[53],
}
return row;

27
src/views/water/water-function-area/collect/colums.js
View File

@@ -4,13 +4,36 @@ const tableColumns = [
{title: "水质目标", dataIndex: "waterQualityGoal", sorter: true,},
{title: "数据来源", dataIndex: "dataSources", sorter: true,},
{title: "断面名称", dataIndex: "sectionName", sorter: true,},
// {title: "采样时间", dataIndex: "samplingTime", sorter: true,},
{title: "水温", dataIndex: "wTemp", sorter: true,},
{title: "pH", dataIndex: "ph", sorter: true,},
{title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,},
{title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,},
{title: "化学需氧量", dataIndex: "cod", sorter: true,},
{title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,},
{title: "氨氮", dataIndex: "ammonia", sorter: true,},
{title: "总磷", dataIndex: "totalPhosphorus", sorter: true,},
{title: "铜", dataIndex: "cu", sorter: true,},
{title: "锌", dataIndex: "zn", sorter: true,},
{title: "氟化物", dataIndex: "f", sorter: true,},
{title: "硒", dataIndex: "se", sorter: true,},
{title: "砷", dataIndex: "as", sorter: true,},
{title: "汞", dataIndex: "hg", sorter: true,},
{title: "镉", dataIndex: "cd", sorter: true,},
{title: "六价铬", dataIndex: "cr6", sorter: true,},
{title: "铅", dataIndex: "pb", sorter: true,},
{title: "氰化物", dataIndex: "cyanide", sorter: true,},
{title: "挥发酚", dataIndex: "vPhen", sorter: true,},
{title: "石油类", dataIndex: "oils", sorter: true,},
{title: "阴离子表面活性剂", dataIndex: "anSaa", sorter: true,},
{title: "硫化物", dataIndex: "s", sorter: true,},
{title: "粪大肠菌群", dataIndex: "coloOrg", sorter: true,},
{title: "硫酸盐", dataIndex: "so4", sorter: true,},
{title: "氯化物", dataIndex: "cl", sorter: true,},
{title: "硝酸盐氮", dataIndex: "nitrateNitrogen", sorter: true,},
{title: "铁", dataIndex: "fe", sorter: true,},
{title: "锰", dataIndex: "mn", sorter: true,},
{title: "总氮", dataIndex: "nTotal", sorter: true,},
{title: "透明度", dataIndex: "transp", sorter: true,},
{title: "叶绿素", dataIndex: "chla", sorter: true,},
{
title: "全因子评价", children: [
{title: "水功能区水质类别", dataIndex: "ffeWaterFunctionAreaWaterQualityCategory"},