+
+
diff --git a/src/views/Ptjs/Czdbl/qsOption.js b/src/views/Ptjs/Czdbl/qsOption.js
new file mode 100644
index 0000000..4aab4c4
--- /dev/null
+++ b/src/views/Ptjs/Czdbl/qsOption.js
@@ -0,0 +1,153 @@
+
+import moment from "moment"
+export default function qsOption(timeList, listObj, hbobj) {
+ const chartTimeList = JSON.parse(JSON.stringify(timeList));
+ let itemStyle = {
+ normal: {
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
+ labelLine: {
+ show: true
+ }
+ }
+ }
+ let minY = 100;
+ let hbSeriseData = [];
+ const totalSerise = [
+ {
+ name: "湖北省",
+ type: 'line',
+ itemStyle: itemStyle,
+ data: hbSeriseData
+ }
+ ]
+ const legendName = ['湖北省'];
+ let addSerise = {
+ name: "",
+ type: 'line',
+ itemStyle: itemStyle,
+ data: []
+ }
+ // 湖北省
+ for (let d = chartTimeList.length - 1; d > -1; d--) {
+ let yval = parseFloat((hbobj[chartTimeList[d]]?.rate * 100).toFixed(2));
+ hbSeriseData.push(yval);
+ }
+ // 市
+ for (let d = chartTimeList.length - 1; d > -1; d--) {
+ let yval = parseFloat((listObj[chartTimeList[d]]?.rate * 100).toFixed(2));
+ addSerise.name = listObj?.adnm;
+ addSerise.data.push(yval);
+
+ if (yval < minY) {
+ minY = yval;
+ }
+ minY = Math.ceil(minY) - 5;
+ minY = minY < 0 ? 0 : minY;
+
+ }
+ if (addSerise.name && addSerise.name != '湖北省') {
+ totalSerise.push(addSerise)
+ legendName.push(addSerise.name);
+ }
+
+ chartTimeList.sort(function (o1, o2) {
+ if (moment(o1).isBefore(moment(o2))) {
+ return -1;
+ } else {
+ return 1;
+ }
+ });
+ chartTimeList.forEach(function (str, idx) {
+ chartTimeList[idx] = str.substring(5, 10);
+ });
+
+
+
+ return {
+ title: {
+ text: '到报率变化趋势',
+ textStyle: {
+ fontSize: 16
+ },
+ left: 'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ formatter: '{a}, {b}, {c}%'
+ },
+ legend: {
+ data: legendName,
+ top:30
+ },
+ toolbox: {
+ show: true,
+ orient: 'vertical',
+ feature: {
+ dataZoom: {
+ show: true,
+ title: {
+ zoom: '区域缩放',
+ back: '区域缩放还原',
+ }
+ },
+ magicType: {
+ show: true,
+ title: {
+ line: '切换为折线图',
+ bar: '切换为柱状图',
+ },
+ type: ['line', 'bar']
+ },
+ restore: {
+ show: true,
+ title: '还原'
+ },
+ saveAsImage: {
+ show: true,
+ title: '保存为图片'
+ }
+ }
+ },
+ // dataZoom: [{
+ // type: 'inside',
+ // start: 0,
+ // end: 100
+ // }, {
+ // start: 0,
+ // end: 10,
+ // handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+ // handleSize: '80%',
+ // handleStyle: {
+ // color: '#fff',
+ // shadowBlur: 3,
+ // shadowColor: 'rgba(0, 0, 0, 0.6)',
+ // shadowOffsetX: 2,
+ // shadowOffsetY: 2
+ // }
+ // }],
+ xAxis: {
+ type: 'category',
+ data: chartTimeList,
+ axisLabel: {
+ interval: 0
+ }
+ },
+ yAxis: {
+ type: 'value',
+ axisLabel: {
+ formatter: '{value}%'
+ },
+ min: minY,
+ axisLine: {
+ show: true,
+ },
+ axisTick: {
+ show: true,
+ }
+ },
+ series:totalSerise
+ }
+}
\ No newline at end of file
diff --git a/src/views/Ptjs/Czdbl/toolBottom.js b/src/views/Ptjs/Czdbl/toolBottom.js
index 234af8a..7474edd 100644
--- a/src/views/Ptjs/Czdbl/toolBottom.js
+++ b/src/views/Ptjs/Czdbl/toolBottom.js
@@ -2,35 +2,49 @@ import React, { useEffect,useState } from 'react';
import { Form, Input, Button, DatePicker } from 'antd';
import NormalSelect from '../../../components/Form/NormalSelect';
import dayjs from 'dayjs';
-const ToolBottom = ({ setToolVal }) => {
- const [form] = Form.useForm();
- const onFinish = (values) => {
- if (values.operTime) {
- values.operTime = values.operTime ? dayjs(values.operTime).format('YYYY-MM-DD') : "";
+import moment from 'moment';
+const ToolBottom = ({ setToolVal, searchVal }) => {
+ console.log("searchVal",searchVal);
+
+ const [form] = Form.useForm();
+ const [timeOptions, setTimeOptions] = useState([])
+ const onValuesChange = (changedValues, allValues) => {
+ setToolVal(changedValues)
+ }
+ const generateDateRange = (startDate, endDate) => {
+ let dates = [];
+ let currentDate = moment(startDate);
+ let end = moment(endDate);
+
+ while (currentDate.isSameOrBefore(end)) {
+ dates.push(currentDate.format('YYYY-MM-DD'));
+ currentDate.add(1, 'days');
}
- setToolVal(values);
- }
-
- useEffect(() => {
- const defaultValue = dayjs()
- form.setFieldsValue({ operTime: defaultValue })
- setToolVal({operTime:defaultValue.format('YYYY-MM-DD')})
- }, []);
+ return dates.map(item => ({
+ label: item,
+ value: item,
+ }));
+}
+// useEffect(() => {
+// const defaultValue = dayjs().subtract(1,'days').format('YYYY-MM-DD')
+// form.setFieldsValue({ operTime: defaultValue })
+// setToolVal({operTime:defaultValue})
+// }, []);
+ useEffect(() => {
+ if (searchVal) {
+ const timeOptions = generateDateRange(searchVal.stm, searchVal.etm)
+ setTimeOptions(timeOptions)
+ form.setFieldsValue({ operTime: searchVal.etm })
+ setToolVal({operTime:searchVal.etm})
+ }
+ }, [searchVal])
+
return (
+ })
+ 测站到报率
+
+ 测站到报率
+
- {
- !loading ?
-
:
-
-
- {
- newDetailsColumns &&
-
}
-
+
+
+
+ {
+ !loading ?
+ <>
+
+
+ : null}
+
+
+
+
+ {!loading &&
+
}
+
+ {
+ !loading ?
+ <>
+
+ :
+
+
+
+
-