diff --git a/src/api/monitorDataPreview/index.js b/src/api/monitorDataPreview/index.js new file mode 100644 index 0000000..514c22f --- /dev/null +++ b/src/api/monitorDataPreview/index.js @@ -0,0 +1,11 @@ +// 监测接入数据 +import request from '@/utils/request' + +// 获取监测数据 +export function getMonitorData(data) { + return request({ + url: '/cz/monitor/page', + method: 'post', + data + }) +} diff --git a/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue b/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue index ac7d8d6..5316b50 100644 --- a/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue +++ b/src/views/dike/runManage/waterRainReport/smartAnalyse/index.vue @@ -1,8 +1,8 @@ \ No newline at end of file + components: { Layout }, +}; + diff --git a/src/views/reservoir/safeOperation/components/EngineSafe.vue b/src/views/reservoir/safeOperation/components/EngineSafe.vue new file mode 100644 index 0000000..09bc063 --- /dev/null +++ b/src/views/reservoir/safeOperation/components/EngineSafe.vue @@ -0,0 +1,237 @@ + + + + diff --git a/src/views/reservoir/safeOperation/components/EnvirQuality.vue b/src/views/reservoir/safeOperation/components/EnvirQuality.vue new file mode 100644 index 0000000..9923704 --- /dev/null +++ b/src/views/reservoir/safeOperation/components/EnvirQuality.vue @@ -0,0 +1,148 @@ + + + diff --git a/src/views/reservoir/safeOperation/components/MonitorWarning.vue b/src/views/reservoir/safeOperation/components/MonitorWarning.vue new file mode 100644 index 0000000..31415f5 --- /dev/null +++ b/src/views/reservoir/safeOperation/components/MonitorWarning.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/views/reservoir/safeOperation/components/ProjectDetail.vue b/src/views/reservoir/safeOperation/components/ProjectDetail.vue index b147ff3..59415b3 100644 --- a/src/views/reservoir/safeOperation/components/ProjectDetail.vue +++ b/src/views/reservoir/safeOperation/components/ProjectDetail.vue @@ -1,26 +1,46 @@ + diff --git a/src/views/reservoir/safeOperation/index.vue b/src/views/reservoir/safeOperation/index.vue index 3539350..ded9c26 100644 --- a/src/views/reservoir/safeOperation/index.vue +++ b/src/views/reservoir/safeOperation/index.vue @@ -94,7 +94,7 @@ export default { components: { ProjectDetail }, data() { return { - showDialog: false, + showDialog: true, mapSceneType: 2, // 2: 2D, 3: 3D showTreeBox: false, defaultProps: { @@ -295,7 +295,6 @@ export default { // 点击 handleClickTree(data, node) { - console.log("data >>>>> ", data, node); if (node.isLeaf && !data.children) { let resId = this.checkList.find((v) => v === data.id); if (resId) { diff --git a/src/views/reservoir/safeOperation/js/initEcharts.js b/src/views/reservoir/safeOperation/js/initEcharts.js index 28ef4de..2b7abb9 100644 --- a/src/views/reservoir/safeOperation/js/initEcharts.js +++ b/src/views/reservoir/safeOperation/js/initEcharts.js @@ -1,5 +1,5 @@ -// 倒立柱状图,y轴inverse -export const initReverseLineOptions = () => { +// 单个xy轴折线图 +export const initLineOptions = () => { return { title: { // text: "统计", @@ -9,10 +9,10 @@ export const initReverseLineOptions = () => { top: "2%", }, grid: { - left: "10%", - right: "10%", + left: "5%", + right: "5%", bottom: "10%", - top: '10%', + top: '20%', containLabel: true, }, tooltip: { @@ -42,9 +42,9 @@ export const initReverseLineOptions = () => { yAxis: [ { type: "value", - inverse: true, + // inverse: true, name: "降雨量(mm)", - nameLocation: 'start', + nameLocation: 'end', }, ], series: [ @@ -60,17 +60,17 @@ export const initReverseLineOptions = () => { }; }; -// 双y轴柱状图 +// 双y轴折线图 export const doubleYAxisOptions = () => { return { title: { // text: "统计", }, grid: { - left: "10%", - right: "10%", + left: "5%", + right: "5%", bottom: "10%", - top: '10%', + top: '20%', containLabel: true, }, tooltip: { @@ -81,13 +81,14 @@ export const doubleYAxisOptions = () => { backgroundColor: "#283b56", }, }, + formatter: '{b}
{a0}: {c0}mm
{a1}: {c1}℃' }, xAxis:[ { type: 'category', - name: '时间', + // name: '时间', nameLocation: 'middle', - nameGap: 30, + nameGap: 30, data: ['00:00','02:00','04:00','06:00','08:00','10:00','12:00', '14:00','16:00','18:00','20:00','22:00'], } diff --git a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue index f043e00..a1d63fc 100644 --- a/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue +++ b/src/views/sluice/runManage/waterRainReport/smartAnalyse/index.vue @@ -1,8 +1,8 @@