From c8a6ae71e1df0cd338dbf59890f0eeb5e9d78721 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Thu, 16 Apr 2026 15:54:02 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=B0=B4=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages.json | 9 +- pages/hdDetail/jcsj/chartOption.js | 8 +- pages/hdDetail/jcsj/jcsj.vue | 2 +- pages/simpleResviror/aqjc/index.vue | 57 + pages/simpleResviror/aqjc/sljc.vue | 169 +++ pages/simpleResviror/aqjc/syjc.vue | 155 +++ pages/simpleResviror/aqjc/wyjc.vue | 131 ++ pages/simpleResviror/index.vue | 158 +++ pages/simpleResviror/jbxx/index.vue | 52 + pages/simpleResviror/jbxx/jbzz/index.vue | 161 +++ .../simpleResviror/jbxx/krqx/chartOptions.js | 80 ++ pages/simpleResviror/jbxx/krqx/index.vue | 81 ++ pages/simpleResviror/jbxx/krqx/jcsjTable.vue | 77 ++ pages/simpleResviror/spjk/spjk.vue | 127 ++ pages/simpleResviror/ysqxx/index.vue | 195 +++ pages/simpleResviror/ysqxx/mock.js | 1178 +++++++++++++++++ pages/simpleResviror/ysqxx/sssw.vue | 78 ++ pages/simpleResviror/ysqxx/ssyl.vue | 133 ++ pages/simpleResviror/ysqxx/swOption.js | 193 +++ pages/simpleResviror/ysqxx/txjc.vue | 92 ++ pages/simpleResviror/ysqxx/ylOption.js | 99 ++ pages/simpleResviror/zrtx/card.vue | 161 +++ pages/simpleResviror/zrtx/zrtx.vue | 55 + pages/utils/tool.js | 13 + static/empty.png | Bin 0 -> 9552 bytes static/images/first.jpg | Bin 0 -> 887 bytes static/images/second.jpg | Bin 0 -> 1151 bytes 28 files changed, 3459 insertions(+), 7 deletions(-) create mode 100644 pages/simpleResviror/aqjc/index.vue create mode 100644 pages/simpleResviror/aqjc/sljc.vue create mode 100644 pages/simpleResviror/aqjc/syjc.vue create mode 100644 pages/simpleResviror/aqjc/wyjc.vue create mode 100644 pages/simpleResviror/index.vue create mode 100644 pages/simpleResviror/jbxx/index.vue create mode 100644 pages/simpleResviror/jbxx/jbzz/index.vue create mode 100644 pages/simpleResviror/jbxx/krqx/chartOptions.js create mode 100644 pages/simpleResviror/jbxx/krqx/index.vue create mode 100644 pages/simpleResviror/jbxx/krqx/jcsjTable.vue create mode 100644 pages/simpleResviror/spjk/spjk.vue create mode 100644 pages/simpleResviror/ysqxx/index.vue create mode 100644 pages/simpleResviror/ysqxx/mock.js create mode 100644 pages/simpleResviror/ysqxx/sssw.vue create mode 100644 pages/simpleResviror/ysqxx/ssyl.vue create mode 100644 pages/simpleResviror/ysqxx/swOption.js create mode 100644 pages/simpleResviror/ysqxx/txjc.vue create mode 100644 pages/simpleResviror/ysqxx/ylOption.js create mode 100644 pages/simpleResviror/zrtx/card.vue create mode 100644 pages/simpleResviror/zrtx/zrtx.vue create mode 100644 static/empty.png create mode 100644 static/images/first.jpg create mode 100644 static/images/second.jpg diff --git a/manifest.json b/manifest.json index e139baf..e42ed1b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "赤壁水利", "appid" : "__UNI__1AC9CFD", "description" : "", - "versionName" : "1.0.0", + "versionName" : "1.0.2", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/pages.json b/pages.json index 2916b29..896b08a 100644 --- a/pages.json +++ b/pages.json @@ -2,7 +2,14 @@ "easycom": { "^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue" }, - "pages": [{ + "pages": [ + { + "path": "pages/simpleResviror/index", + "style": { + "navigationBarTitleText": "" + } + }, + { "path": "pages/login/login", "style": { "navigationBarTitleText": "" diff --git a/pages/hdDetail/jcsj/chartOption.js b/pages/hdDetail/jcsj/chartOption.js index 1407b80..8f4ccfb 100644 --- a/pages/hdDetail/jcsj/chartOption.js +++ b/pages/hdDetail/jcsj/chartOption.js @@ -179,7 +179,7 @@ export default function DrpOption(data=[],wrz,grz) { lineStyle: { type: "dashed" }, - data: data.map(o => grz), + data: data.map(o => Number(grz)), symbol: 'none' // 设置标记点为'none',即去掉圆点 }, { @@ -189,7 +189,7 @@ export default function DrpOption(data=[],wrz,grz) { type: 'line', color: "#F59A23", barWidth: '60%', - data: data.map(o => wrz), + data: data.map(o => Number(wrz)), lineStyle: { type: "dashed" }, @@ -199,7 +199,7 @@ export default function DrpOption(data=[],wrz,grz) { name: '降雨量', type: 'bar', barWidth: '60%', - data: data.map(o => o.drp).reverse(), + data: data.map(o => Number(o.drp)).reverse(), itemStyle: { color: "#007AFD", }, @@ -231,7 +231,7 @@ export default function DrpOption(data=[],wrz,grz) { label: { show: false, }, - data: data.map(o => o.tq), + data: data.map(o => Number(o.tq)), } ] } diff --git a/pages/hdDetail/jcsj/jcsj.vue b/pages/hdDetail/jcsj/jcsj.vue index 7338c07..b018660 100644 --- a/pages/hdDetail/jcsj/jcsj.vue +++ b/pages/hdDetail/jcsj/jcsj.vue @@ -26,7 +26,7 @@ - + diff --git a/pages/simpleResviror/aqjc/index.vue b/pages/simpleResviror/aqjc/index.vue new file mode 100644 index 0000000..6bda40b --- /dev/null +++ b/pages/simpleResviror/aqjc/index.vue @@ -0,0 +1,57 @@ + + + \ No newline at end of file diff --git a/pages/simpleResviror/aqjc/sljc.vue b/pages/simpleResviror/aqjc/sljc.vue new file mode 100644 index 0000000..903ce0b --- /dev/null +++ b/pages/simpleResviror/aqjc/sljc.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/pages/simpleResviror/aqjc/syjc.vue b/pages/simpleResviror/aqjc/syjc.vue new file mode 100644 index 0000000..e8061e1 --- /dev/null +++ b/pages/simpleResviror/aqjc/syjc.vue @@ -0,0 +1,155 @@ + + + + + \ No newline at end of file diff --git a/pages/simpleResviror/aqjc/wyjc.vue b/pages/simpleResviror/aqjc/wyjc.vue new file mode 100644 index 0000000..34f2146 --- /dev/null +++ b/pages/simpleResviror/aqjc/wyjc.vue @@ -0,0 +1,131 @@ + + + + + \ No newline at end of file diff --git a/pages/simpleResviror/index.vue b/pages/simpleResviror/index.vue new file mode 100644 index 0000000..8b58a4d --- /dev/null +++ b/pages/simpleResviror/index.vue @@ -0,0 +1,158 @@ + + + + + \ No newline at end of file diff --git a/pages/simpleResviror/jbxx/index.vue b/pages/simpleResviror/jbxx/index.vue new file mode 100644 index 0000000..792bdad --- /dev/null +++ b/pages/simpleResviror/jbxx/index.vue @@ -0,0 +1,52 @@ + + + \ No newline at end of file diff --git a/pages/simpleResviror/jbxx/jbzz/index.vue b/pages/simpleResviror/jbxx/jbzz/index.vue new file mode 100644 index 0000000..547afbf --- /dev/null +++ b/pages/simpleResviror/jbxx/jbzz/index.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/pages/simpleResviror/jbxx/krqx/chartOptions.js b/pages/simpleResviror/jbxx/krqx/chartOptions.js new file mode 100644 index 0000000..ec35c9f --- /dev/null +++ b/pages/simpleResviror/jbxx/krqx/chartOptions.js @@ -0,0 +1,80 @@ +import {GetInterval} from "../../../utils/tool" +export default function DrpOption(data) { + const maxVal = Math.ceil(Math.max(...data.map(obj => obj.rz))) + const minVal = Math.floor(Math.min(...data.map(obj => obj.rz))) + const maxValX = Math.max(...data.map(obj => obj.w)) + const minValX = Math.min(...data.map(obj => obj.w)) + let arr = [] + + data.forEach(item=>{ + arr.push([item.w,item.rz]) + }) + let eopts = { + tooltip: { + trigger: 'axis', + }, + grid: [ + { + top: "12%", + left: "12%", + right: "18%", + bottom: "8%" + }, + ], + xAxis: [ + { + name: "库容(万m³)", + nameGap: 5, + type: 'value', + min:Math.floor(minValX / 5) *5, + max:Math.ceil(maxValX / 5) *5, + interval:GetInterval(minValX,maxValX), + data: data.map(o => o.w), + splitLine: { + show: false + }, + } + ], + yAxis: [ + { + type: 'value', + name: "库水位(m)", + minInterval:1, + splitLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.25, + type: 'dotted' + } + }, + axisLabel: { + color: '#333', + fontSize: 12, + }, + axisLine: { + show: true + }, + axisTick: { + show: true, + }, + min: minVal, + max: maxVal + } + ], + }; + let chartData = { + series: [ + { + type: 'line', + color: "#007AFD", + data: arr, + smooth: true + }, + ] + }; + return { + eopts, + chartData + } +} \ No newline at end of file diff --git a/pages/simpleResviror/jbxx/krqx/index.vue b/pages/simpleResviror/jbxx/krqx/index.vue new file mode 100644 index 0000000..cd772e5 --- /dev/null +++ b/pages/simpleResviror/jbxx/krqx/index.vue @@ -0,0 +1,81 @@ + + + \ No newline at end of file diff --git a/pages/simpleResviror/jbxx/krqx/jcsjTable.vue b/pages/simpleResviror/jbxx/krqx/jcsjTable.vue new file mode 100644 index 0000000..b1ac060 --- /dev/null +++ b/pages/simpleResviror/jbxx/krqx/jcsjTable.vue @@ -0,0 +1,77 @@ + + + + + \ No newline at end of file diff --git a/pages/simpleResviror/spjk/spjk.vue b/pages/simpleResviror/spjk/spjk.vue new file mode 100644 index 0000000..02a1713 --- /dev/null +++ b/pages/simpleResviror/spjk/spjk.vue @@ -0,0 +1,127 @@ + + + + + + + diff --git a/pages/simpleResviror/ysqxx/index.vue b/pages/simpleResviror/ysqxx/index.vue new file mode 100644 index 0000000..78993e0 --- /dev/null +++ b/pages/simpleResviror/ysqxx/index.vue @@ -0,0 +1,195 @@ + + + + \ No newline at end of file diff --git a/pages/simpleResviror/ysqxx/mock.js b/pages/simpleResviror/ysqxx/mock.js new file mode 100644 index 0000000..97063ad --- /dev/null +++ b/pages/simpleResviror/ysqxx/mock.js @@ -0,0 +1,1178 @@ +export const sw = [ + { + "stcd": "3061", + "tm": "2026-04-15 09:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-15 08:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-15 07:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-15 06:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-15 05:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-15 04:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-15 03:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-15 02:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-15 01:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-15 00:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 23:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 22:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 21:00:00", + "drp": 0.5, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 20:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 19:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 18:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 17:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 16:00:00", + "drp": 0.5, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 15:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 14:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 13:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 12:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-14 11:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 10:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 09:00:00", + "drp": 0.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 08:00:00", + "drp": 3.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 07:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 06:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 05:00:00", + "drp": 0.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 04:00:00", + "drp": 0.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 03:00:00", + "drp": 0.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 02:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 01:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-14 00:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 23:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 22:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 21:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 20:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 19:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-13 18:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 17:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-13 16:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-13 15:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-13 14:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-13 13:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 12:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 11:00:00", + "drp": 0.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 10:00:00", + "drp": 1, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 09:00:00", + "drp": 1.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 08:00:00", + "drp": 2.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 07:00:00", + "drp": 1.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 06:00:00", + "drp": 0.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 05:00:00", + "drp": 0.5, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 04:00:00", + "drp": 0, + "rz": 840.45, + "w": 7.63 + }, + { + "stcd": "3061", + "tm": "2026-04-13 03:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-13 02:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-13 01:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-13 00:00:00", + "drp": 0, + "rz": 840.36, + "w": 7.4 + }, + { + "stcd": "3061", + "tm": "2026-04-12 23:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-12 22:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-12 21:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-12 20:00:00", + "drp": 0, + "rz": 840.36, + "w": 7.4 + }, + { + "stcd": "3061", + "tm": "2026-04-12 19:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-12 18:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-12 17:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-12 16:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-12 15:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-12 14:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-12 13:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-12 12:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-12 11:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-12 10:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-12 09:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-12 08:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-12 07:00:00", + "drp": 0, + "rz": 840.4, + "w": 7.5 + }, + { + "stcd": "3061", + "tm": "2026-04-12 06:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-12 05:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-12 04:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-12 03:00:00", + "drp": 0, + "rz": 840.36, + "w": 7.4 + }, + { + "stcd": "3061", + "tm": "2026-04-12 02:00:00", + "drp": 0, + "rz": 840.4, + "w": 7.5 + }, + { + "stcd": "3061", + "tm": "2026-04-12 01:00:00", + "drp": 0, + "rz": 840.36, + "w": 7.4 + }, + { + "stcd": "3061", + "tm": "2026-04-12 00:00:00", + "drp": 0, + "rz": 840.36, + "w": 7.4 + }, + { + "stcd": "3061", + "tm": "2026-04-11 23:00:00", + "drp": 0, + "rz": 840.36, + "w": 7.4 + }, + { + "stcd": "3061", + "tm": "2026-04-11 22:00:00", + "drp": 0, + "rz": 840.39, + "w": 7.48 + }, + { + "stcd": "3061", + "tm": "2026-04-11 21:00:00", + "drp": 0, + "rz": 840.38, + "w": 7.45 + }, + { + "stcd": "3061", + "tm": "2026-04-11 20:00:00", + "drp": 0, + "rz": 840.41, + "w": 7.53 + }, + { + "stcd": "3061", + "tm": "2026-04-11 19:00:00", + "drp": 0, + "rz": 840.34, + "w": 7.35 + }, + { + "stcd": "3061", + "tm": "2026-04-11 18:00:00", + "drp": 0, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-11 17:00:00", + "drp": 0.5, + "rz": 840.35, + "w": 7.38 + }, + { + "stcd": "3061", + "tm": "2026-04-11 16:00:00", + "drp": 0, + "rz": 840.36, + "w": 7.4 + }, + { + "stcd": "3061", + "tm": "2026-04-11 15:00:00", + "drp": 0, + "rz": 840.37, + "w": 7.43 + }, + { + "stcd": "3061", + "tm": "2026-04-11 14:00:00", + "drp": 1, + "rz": 840.38, + "w": 7.45 + }, + { + "stcd": "3061", + "tm": "2026-04-11 13:00:00", + "drp": 1, + "rz": 840.32, + "w": 7.3 + }, + { + "stcd": "3061", + "tm": "2026-04-11 12:00:00", + "drp": 1, + "rz": 840.32, + "w": 7.3 + }, + { + "stcd": "3061", + "tm": "2026-04-11 11:00:00", + "drp": 1.5, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-11 10:00:00", + "drp": 4, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-11 09:00:00", + "drp": 3.5, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-11 08:00:00", + "drp": 1.5, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-11 07:00:00", + "drp": 1.5, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-11 06:00:00", + "drp": 2.5, + "rz": 840.28, + "w": 7.2 + }, + { + "stcd": "3061", + "tm": "2026-04-11 05:00:00", + "drp": 1, + "rz": 840.28, + "w": 7.2 + }, + { + "stcd": "3061", + "tm": "2026-04-11 04:00:00", + "drp": 1, + "rz": 840.28, + "w": 7.2 + }, + { + "stcd": "3061", + "tm": "2026-04-11 03:00:00", + "drp": 1, + "rz": 840.28, + "w": 7.2 + }, + { + "stcd": "3061", + "tm": "2026-04-11 02:00:00", + "drp": 1, + "rz": 840.28, + "w": 7.2 + }, + { + "stcd": "3061", + "tm": "2026-04-11 01:00:00", + "drp": 0.5, + "rz": 840.4, + "w": 7.5 + }, + { + "stcd": "3061", + "tm": "2026-04-11 00:00:00", + "drp": 0, + "rz": 840.28, + "w": 7.2 + }, + { + "stcd": "3061", + "tm": "2026-04-10 23:00:00", + "drp": 0, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-10 22:00:00", + "drp": 0.5, + "rz": 840.28, + "w": 7.2 + }, + { + "stcd": "3061", + "tm": "2026-04-10 21:00:00", + "drp": 1, + "rz": 840.33, + "w": 7.33 + }, + { + "stcd": "3061", + "tm": "2026-04-10 20:00:00", + "drp": 0.5, + "rz": null, + "w": null + }, + { + "stcd": "3061", + "tm": "2026-04-10 19:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 18:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 17:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 16:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 15:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 14:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 13:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 12:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 11:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 10:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 09:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 08:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 07:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 06:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 05:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 04:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 03:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-10 02:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-10 01:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-10 00:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-09 23:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-09 22:00:00", + "drp": 0, + "rz": 840.29, + "w": 7.23 + }, + { + "stcd": "3061", + "tm": "2026-04-09 21:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 20:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 19:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 18:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 17:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 16:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 15:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 14:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 13:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 12:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 11:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 10:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 09:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 08:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 07:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 06:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 05:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 04:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 03:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 02:00:00", + "drp": 0, + "rz": 840.3, + "w": 7.25 + }, + { + "stcd": "3061", + "tm": "2026-04-09 01:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-09 00:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 23:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 22:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 21:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 20:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 19:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 18:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 17:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 16:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 15:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 14:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 13:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 12:00:00", + "drp": 0, + "rz": 840.31, + "w": 7.28 + }, + { + "stcd": "3061", + "tm": "2026-04-08 11:00:00", + "drp": 0, + "rz": 840.32, + "w": 7.3 + }, + { + "stcd": "3061", + "tm": "2026-04-08 10:00:00", + "drp": 0, + "rz": 840.32, + "w": 7.3 + } +] \ No newline at end of file diff --git a/pages/simpleResviror/ysqxx/sssw.vue b/pages/simpleResviror/ysqxx/sssw.vue new file mode 100644 index 0000000..5139043 --- /dev/null +++ b/pages/simpleResviror/ysqxx/sssw.vue @@ -0,0 +1,78 @@ + + + + \ No newline at end of file diff --git a/pages/simpleResviror/ysqxx/ssyl.vue b/pages/simpleResviror/ysqxx/ssyl.vue new file mode 100644 index 0000000..6d9a2dd --- /dev/null +++ b/pages/simpleResviror/ysqxx/ssyl.vue @@ -0,0 +1,133 @@ + + + + \ No newline at end of file diff --git a/pages/simpleResviror/ysqxx/swOption.js b/pages/simpleResviror/ysqxx/swOption.js new file mode 100644 index 0000000..4220ddd --- /dev/null +++ b/pages/simpleResviror/ysqxx/swOption.js @@ -0,0 +1,193 @@ +import echarts from 'echarts/lib/echarts'; +import { sw } from './mock' +export default function DrpOption( + data = sw, + afsltdz, + flLowLimLev = 840.3, + desFloodLev = 843.23, + calFloodLev = 844.12) { + const maxVal = Math.max(...data.map(obj => obj.drp)) + const maxSw = Math.ceil(Math.max(...data.map(obj => obj.rz))) + const minSw = Math.floor(Math.min(...data.map(obj => obj.rz))) + const maxKr = Math.max(...data.map(obj => obj.w)) + const minKr = Math.min(...data.map(obj => obj.w)) + console.log('desFloodLev', desFloodLev); + let eopts = { + tooltip: { + trigger: 'axis', + + appendToBody: false, + className: 'echarts-tooltip' + }, + grid: { + top: "15%", + left: "10%", + right: "10%", + bottom: "15%" + }, + legend: { + show: true, + data: ["校核水位", '设计水位', '汛限水位', '水位', '库容'], + left: 'center', + top: 0, + itemWidth: 10, + padding: 0 + }, + xAxis: [ + { + type: 'category', + data: data.map(o => o.tm.substr("2020-".length, 11)), + inverse: true, + splitLine: { + show: false + }, + axisLabel: { + color: '#333', + fontSize: 12, + formatter: val => val.substr('2020-'.length, 11) + }, + axisLine: { + lineStyle: { + color: '#07a6ff', + width: 0.5 + } + }, + axisTick: { + show: false + } + } + ], + yAxis: [ + { + type: 'value', + position: 'left', + name: '水位(m)', + splitLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.25, + type: 'dotted' + } + }, + axisLabel: { + color: '#333', + fontSize: 10 + }, + axisLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.5 + } + }, + axisTick: { + show: true + }, + min: minSw, + max: maxSw + }, + { + type: 'value', + position: 'right', + name: '库容(万m³)', + splitLine: { + show: false + }, + axisLabel: { + color: '#333', + fontSize: 10 + }, + axisLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.5 + } + }, + axisTick: { + show: true + }, + min: minKr, + max: maxKr + } + ], + } + let chartData = { + series: [ + { + yAxisIndex: 0, + name: '校核水位', + type: 'line', + color: '#D9001B', + lineStyle: { + type: 'dashed' + }, + data: data.map(o => calFloodLev), + symbol: 'none', + showSymbol: false, + label: { + show: false + }, + }, + { + yAxisIndex: 0, + name: '设计水位', + type: 'line', + color: '#F59A23', + data: data.map(o => desFloodLev), + lineStyle: { + type: 'dashed' + }, + symbol: 'none', + showSymbol: false, + label: { + show: false + }, + }, + { + yAxisIndex: 0, + name: '汛限水位', + type: 'line', + color: '#FDDC9F', + data: data.map(o => flLowLimLev), + lineStyle: { + type: 'dashed' + }, + symbol: 'none', + showSymbol: false, + label: { + show: false + }, + }, + { + yAxisIndex: 0, + name: '水位', + type: 'line', + symbol: 'none', + showSymbol: false, + color: '#0AE0B5', + label: { + show: false + }, + data: data.map(o => o.rz ? o.rz.toFixed(2) : null) + }, + { + yAxisIndex: 1, + name: '库容', + type: 'line', + color: '#007AFD', + symbol: 'none', + showSymbol: false, + label: { + show: false + }, + data: data.map(o => o.w) + } + ], + } + return { + eopts, + chartData + } +} diff --git a/pages/simpleResviror/ysqxx/txjc.vue b/pages/simpleResviror/ysqxx/txjc.vue new file mode 100644 index 0000000..b18b07a --- /dev/null +++ b/pages/simpleResviror/ysqxx/txjc.vue @@ -0,0 +1,92 @@ + + + + + \ No newline at end of file diff --git a/pages/simpleResviror/ysqxx/ylOption.js b/pages/simpleResviror/ysqxx/ylOption.js new file mode 100644 index 0000000..9e5d03e --- /dev/null +++ b/pages/simpleResviror/ysqxx/ylOption.js @@ -0,0 +1,99 @@ +import echarts from 'echarts/lib/echarts'; +import { sw } from './mock' +export default function DrpOption(data = sw) { + const maxVal = Math.max(...data.map(obj => obj.drp)) + let eopts = { + tooltip: { + trigger: 'axis', + }, + grid: { + top: "15%", + left: "10%", + right: "10%", + bottom: "15%" + }, + legend: { + show: true, + data: ['降雨量'], + left: 'center', + top: 0, + itemWidth: 10, + padding: 0 + }, + xAxis: [ + { + type: 'category', + data: data.map(o => o.tm.substr("2020-".length, 11)), + inverse: true, + splitLine: { + show: false + }, + axisLabel: { + color: '#333', + fontSize: 12, + formatter: val => val.substr('2020-'.length, 11) + }, + axisLine: { + lineStyle: { + color: '#07a6ff', + width: 0.5 + } + }, + axisTick: { + show: false + } + } + ], + yAxis: [ + { + type: 'value', + position: 'left', + name: '降雨量(mm)', + splitLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.25, + type: 'dotted' + } + }, + axisLabel: { + color: '#333', + fontSize: 10 + }, + axisLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.5 + } + }, + axisTick: { + show: true + }, + min: 0, + max: maxVal + }, + ], + } + let chartData = { + series: [ + { + name: '降雨量', + type: 'bar', + barWidth: '60%', + data: data.map(o => o.drp).reverse(), + itemStyle: { + color: '#007AFD' + }, + label: { + show: false + } + }, + ], + } + return { + eopts, + chartData + } +} diff --git a/pages/simpleResviror/zrtx/card.vue b/pages/simpleResviror/zrtx/card.vue new file mode 100644 index 0000000..b471ace --- /dev/null +++ b/pages/simpleResviror/zrtx/card.vue @@ -0,0 +1,161 @@ + + + + + diff --git a/pages/simpleResviror/zrtx/zrtx.vue b/pages/simpleResviror/zrtx/zrtx.vue new file mode 100644 index 0000000..ddd08a9 --- /dev/null +++ b/pages/simpleResviror/zrtx/zrtx.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/pages/utils/tool.js b/pages/utils/tool.js index 9de8188..7d3d0ed 100644 --- a/pages/utils/tool.js +++ b/pages/utils/tool.js @@ -51,6 +51,19 @@ export function restm (e) { } return index } + +export const GetInterval=(min,max,step=10)=>{ + const distance = Math.ceil(max) - Math.floor(min) + console.log(distance); + let s = (distance / step); + console.log(s); + if (s > 5){ + s = Math.ceil(s / 5) *5; + return s; + }else{ + return Math.ceil(s) + } +} export const adnmZhen = adcd => { if (!adcd || !nameMap) { return undefined diff --git a/static/empty.png b/static/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..9acfed66322d96ac99bb5f76e29a34173633b083 GIT binary patch literal 9552 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 literal 0 HcmV?d00001 diff --git a/static/images/second.jpg b/static/images/second.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b7b95953098512aea39de78f458c7cbca7f4b1bb GIT binary patch literal 1151 zcmex=la-ZIgqNFFgkbFC}Pw& zaUqAY)5e3MK^H%$7$+4qadL@?OGrwos;O&eYMGdtnOj&|IlH*JxqEne1&4%&g-1k2 zC8wmOrDtSj6_=Ejl~+_&HMg|3wRd!OO`1Gq>a^)IX3ko)c*)Xb%U7&iwQ2K~t=qQm z*tzS_;UhlG{sQ@nk%1ZF zEx6Cn{3QtV7ZVE$GYdP&UyMxUK+G)2!m4P(ZXWYowZ;xuvL#)F*7#z7xM zlZq~KiK&=8RQ(9@8rWyVd8~;npTRwb@YgK{9%e>hr;bAM(Nc~sz}#x4=r*QZl&me((Qx%k`MeZSMKQup87{O{VEy3#jw z>>sc8_n90l&A6Qsr_wPmf|J3DvIYzjcm(=zTz=&GPnCDlO}`4VUw)KvZC@z8WB1Etb4%^*4i=bM zO9s07YTUj1I#+hS{|-C$7v@p&&C1amLZ4Y5GXK!^MawmyOVoj(fZ?ro{FF!8r$wVe zm+qN+{>7jD>^%E9{W;l7StbNt>(ZX`h2zn-E~aA^SGi>-u}4kn(%fEqWKxvEqApFI G|2F}BAlB^w literal 0 HcmV?d00001