diff --git a/src/views/sponeScreen/Echarts/SewageBODEchaer.vue b/src/views/sponeScreen/Echarts/SewageBODEchaer.vue index 44295d3..b94e10e 100644 --- a/src/views/sponeScreen/Echarts/SewageBODEchaer.vue +++ b/src/views/sponeScreen/Echarts/SewageBODEchaer.vue @@ -41,7 +41,7 @@ }, yAxis: item.value, label: { - formatter: `${item.typeName}:${item.value}`, + formatter: `${item.typeName}:${item.value}` + '(mg/L)', color: item.color, }, }; diff --git a/src/views/sponeScreen/Echarts/SewageBODEchaer.vue b/src/views/sponeScreen/Echarts/SewageBODEchaer.vue index 44295d3..b94e10e 100644 --- a/src/views/sponeScreen/Echarts/SewageBODEchaer.vue +++ b/src/views/sponeScreen/Echarts/SewageBODEchaer.vue @@ -41,7 +41,7 @@ }, yAxis: item.value, label: { - formatter: `${item.typeName}:${item.value}`, + formatter: `${item.typeName}:${item.value}` + '(mg/L)', color: item.color, }, }; diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue index 6111070..ea793c4 100644 --- a/src/views/sponeScreen/longYW/ManualSampling.vue +++ b/src/views/sponeScreen/longYW/ManualSampling.vue @@ -19,9 +19,9 @@

采样地点

-

渗透系数

-

孔隙度

-

土壤容重

+

渗透系数(m/d)

+

孔隙度(%)

+

土壤容重(g/cm³)

采样时间

@@ -102,8 +102,8 @@ activedname.value = val.name; if (activedname.value == '土壤') { tableData.value = [ - { start: '惠济河1号', num: '2', porosity: '1.3', Soilbulk: '12', time: '2024-04-10', id: 1 }, - { start: '马家河2号', num: '2.4', porosity: '0.6', Soilbulk: '23', time: '2024-04-10', id: 1 }, + { start: '惠济河1号', num: '0.4', porosity: '30', Soilbulk: '1', time: '2024-04-10', id: 1 }, + { start: '马家河2号', num: '0.14', porosity: '35', Soilbulk: '1.2', time: '2024-04-18', id: 1 }, ]; } else if (activedname.value == '下垫面') { tableData.value = [ diff --git a/src/views/sponeScreen/Echarts/SewageBODEchaer.vue b/src/views/sponeScreen/Echarts/SewageBODEchaer.vue index 44295d3..b94e10e 100644 --- a/src/views/sponeScreen/Echarts/SewageBODEchaer.vue +++ b/src/views/sponeScreen/Echarts/SewageBODEchaer.vue @@ -41,7 +41,7 @@ }, yAxis: item.value, label: { - formatter: `${item.typeName}:${item.value}`, + formatter: `${item.typeName}:${item.value}` + '(mg/L)', color: item.color, }, }; diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue index 6111070..ea793c4 100644 --- a/src/views/sponeScreen/longYW/ManualSampling.vue +++ b/src/views/sponeScreen/longYW/ManualSampling.vue @@ -19,9 +19,9 @@

采样地点

-

渗透系数

-

孔隙度

-

土壤容重

+

渗透系数(m/d)

+

孔隙度(%)

+

土壤容重(g/cm³)

采样时间

@@ -102,8 +102,8 @@ activedname.value = val.name; if (activedname.value == '土壤') { tableData.value = [ - { start: '惠济河1号', num: '2', porosity: '1.3', Soilbulk: '12', time: '2024-04-10', id: 1 }, - { start: '马家河2号', num: '2.4', porosity: '0.6', Soilbulk: '23', time: '2024-04-10', id: 1 }, + { start: '惠济河1号', num: '0.4', porosity: '30', Soilbulk: '1', time: '2024-04-10', id: 1 }, + { start: '马家河2号', num: '0.14', porosity: '35', Soilbulk: '1.2', time: '2024-04-18', id: 1 }, ]; } else if (activedname.value == '下垫面') { tableData.value = [ diff --git a/src/views/sponeScreen/longYW/SewageBOD.vue b/src/views/sponeScreen/longYW/SewageBOD.vue index 1de6979..fdacdee 100644 --- a/src/views/sponeScreen/longYW/SewageBOD.vue +++ b/src/views/sponeScreen/longYW/SewageBOD.vue @@ -33,29 +33,17 @@ const dateYear = ref(proxy.moment(new Date()).format('YYYY')); const ListBod = ref([ - { - name: '东区污水厂', - value: '1', - }, - { - name: '西区污水厂', - value: '2', - }, - { - name: '老马家污水厂', - value: '3', - }, - { - name: '包公湖污水厂', - value: '4', - }, + { name: '东区污水厂', value: '1' }, + { name: '西区污水厂', value: '2' }, + { name: '老马家污水厂', value: '3' }, + { name: '包公湖污水厂', value: '4' }, ]); const refresh1 = ref(1); const chartData3 = ref({ XName: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'], data1: [200, 150, 200, 220, 240, 110, 135, 140, 130, 240, 180, 150], - controlMarkLine: [{ typeName: '考核达标(mg/L)', value: '130', Opacity: 1, color: '#e15a6b' }], + controlMarkLine: [{ typeName: '考核达标', value: '135', Opacity: 1, color: '#e15a6b' }], refresh1: 1, }); const AllData = reactive({ diff --git a/src/views/sponeScreen/Echarts/SewageBODEchaer.vue b/src/views/sponeScreen/Echarts/SewageBODEchaer.vue index 44295d3..b94e10e 100644 --- a/src/views/sponeScreen/Echarts/SewageBODEchaer.vue +++ b/src/views/sponeScreen/Echarts/SewageBODEchaer.vue @@ -41,7 +41,7 @@ }, yAxis: item.value, label: { - formatter: `${item.typeName}:${item.value}`, + formatter: `${item.typeName}:${item.value}` + '(mg/L)', color: item.color, }, }; diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue index 6111070..ea793c4 100644 --- a/src/views/sponeScreen/longYW/ManualSampling.vue +++ b/src/views/sponeScreen/longYW/ManualSampling.vue @@ -19,9 +19,9 @@

采样地点

-

渗透系数

-

孔隙度

-

土壤容重

+

渗透系数(m/d)

+

孔隙度(%)

+

土壤容重(g/cm³)

采样时间

@@ -102,8 +102,8 @@ activedname.value = val.name; if (activedname.value == '土壤') { tableData.value = [ - { start: '惠济河1号', num: '2', porosity: '1.3', Soilbulk: '12', time: '2024-04-10', id: 1 }, - { start: '马家河2号', num: '2.4', porosity: '0.6', Soilbulk: '23', time: '2024-04-10', id: 1 }, + { start: '惠济河1号', num: '0.4', porosity: '30', Soilbulk: '1', time: '2024-04-10', id: 1 }, + { start: '马家河2号', num: '0.14', porosity: '35', Soilbulk: '1.2', time: '2024-04-18', id: 1 }, ]; } else if (activedname.value == '下垫面') { tableData.value = [ diff --git a/src/views/sponeScreen/longYW/SewageBOD.vue b/src/views/sponeScreen/longYW/SewageBOD.vue index 1de6979..fdacdee 100644 --- a/src/views/sponeScreen/longYW/SewageBOD.vue +++ b/src/views/sponeScreen/longYW/SewageBOD.vue @@ -33,29 +33,17 @@ const dateYear = ref(proxy.moment(new Date()).format('YYYY')); const ListBod = ref([ - { - name: '东区污水厂', - value: '1', - }, - { - name: '西区污水厂', - value: '2', - }, - { - name: '老马家污水厂', - value: '3', - }, - { - name: '包公湖污水厂', - value: '4', - }, + { name: '东区污水厂', value: '1' }, + { name: '西区污水厂', value: '2' }, + { name: '老马家污水厂', value: '3' }, + { name: '包公湖污水厂', value: '4' }, ]); const refresh1 = ref(1); const chartData3 = ref({ XName: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'], data1: [200, 150, 200, 220, 240, 110, 135, 140, 130, 240, 180, 150], - controlMarkLine: [{ typeName: '考核达标(mg/L)', value: '130', Opacity: 1, color: '#e15a6b' }], + controlMarkLine: [{ typeName: '考核达标', value: '135', Opacity: 1, color: '#e15a6b' }], refresh1: 1, }); const AllData = reactive({ diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue index bb38b27..9540472 100644 --- a/src/views/sponeScreen/waterFlood/rainCaldar.vue +++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue @@ -8,7 +8,7 @@ v-model="dateDay" value-format="YYYY-MM-DD" placeholder="请选择日期" - style="float: right; width: 130px; margin: 10px 60px 0px 0px" + class="dateCal" size="small" v-if="dateIndex == 'day'" /> @@ -17,8 +17,8 @@ v-model="dateMonth" value-format="YYYY-MM" placeholder="请选择日期" - style="float: right; width: 130px; margin: 10px 60px 0px 0px" size="small" + class="dateCal" v-if="dateIndex == 'month'" />
@@ -44,11 +44,11 @@

日期

-

06-12
2024

+

{{ monDay }}
{{ yearDay }}

累计降雨量

-

1.2
mm/24h

+

15
mm/24h

雨强

@@ -72,6 +72,8 @@ import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue'; const { proxy } = getCurrentInstance(); +const monDay = ref(proxy.moment(new Date()).format('MM-DD')); +const yearDay = ref(proxy.moment(new Date()).format('YYYY')); const dateDay = ref(proxy.moment(new Date()).format('YYYY-MM-DD')); const dateMonth = ref(proxy.moment(new Date()).format('YYYY-MM')); const dateYear = ref(proxy.moment(new Date()).format('YYYY-MM')); @@ -105,10 +107,15 @@ onMounted(() => {}); -