From a14471ea100db9d9386e01b47881a95f73e5f1a2 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 5 Jun 2023 09:47:44 +0800 Subject: [PATCH 1/5] 2023-6-5 --- .../src/layout/components/AppMain.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/supervise-customer-ui/src/layout/components/AppMain.vue b/supervise-customer-ui/src/layout/components/AppMain.vue index 1053e710..940cbbfd 100644 --- a/supervise-customer-ui/src/layout/components/AppMain.vue +++ b/supervise-customer-ui/src/layout/components/AppMain.vue @@ -281,8 +281,8 @@ display: -webkit-box; }, created() { - // this.drawLine1(); - // this.drawLine2(); + this.drawLine1(); + this.drawLine2(); }, methods: { @@ -331,11 +331,11 @@ display: -webkit-box; height: 220 }, legend: { - data: ['Evaporation', 'Precipitation', 'Temperature'] + data: ['仓库货值', '在途货值', '阀值'] }, xAxis: [{ type: 'category', - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], + data: ['1-1', '1-2', '1-3', '1-4', '1-5', '1-6', '1-7'], axisPointer: { type: 'shadow' } @@ -352,7 +352,7 @@ display: -webkit-box; }, { type: 'value', - name: '百分比', + name: '百分比%', min: 0, max: 25, interval: 5, @@ -362,7 +362,7 @@ display: -webkit-box; } ], series: [{ - name: 'Evaporation', + name: '仓库货值', type: 'bar', tooltip: { valueFormatter: function(value) { @@ -374,7 +374,7 @@ display: -webkit-box; ] }, { - name: 'Precipitation', + name: '在途货值', type: 'bar', tooltip: { valueFormatter: function(value) { @@ -386,7 +386,7 @@ display: -webkit-box; ] }, { - name: 'Temperature', + name: '阀值', type: 'line', yAxisIndex: 1, tooltip: { @@ -436,7 +436,7 @@ display: -webkit-box; trigger: "item" }, series: [{ - name: 'Nightingale Chart', + name: '在途货物分析', type: 'pie', radius: [20, 100], center: ['50%', '40%'], From 8d394fbd8b2d2bc9c976f4012f86665ff8d1a07c Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 5 Jun 2023 10:32:59 +0800 Subject: [PATCH 2/5] 111 --- supervise-customer-ui/src/layout/components/AppMain.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/supervise-customer-ui/src/layout/components/AppMain.vue b/supervise-customer-ui/src/layout/components/AppMain.vue index 940cbbfd..ec7b5ba6 100644 --- a/supervise-customer-ui/src/layout/components/AppMain.vue +++ b/supervise-customer-ui/src/layout/components/AppMain.vue @@ -98,7 +98,7 @@
阀值分析 -
+
@@ -106,7 +106,7 @@
在途货物分析 -
+
@@ -280,7 +280,7 @@ display: -webkit-box; } }, - created() { + mounted() { this.drawLine1(); this.drawLine2(); }, @@ -292,6 +292,7 @@ display: -webkit-box; }, drawLine1() { + // let mychart = echarts.init(this.$refs.main1) var myChart = echarts.init(document.getElementById('main1')); // 绘制图表 myChart.setOption({ @@ -403,6 +404,7 @@ display: -webkit-box; // 饼状图图初始化 drawLine2() { // 基于准备好的dom，初始化echarts实例 + // let mychart = echarts.init(this.$refs.main2) var myChart = echarts.init(document.getElementById('main2')); // 绘制图表 // console.log('option', obj) From 87c6bc3e80b9d7b433ba8f5c298f051e0365dcdc Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 5 Jun 2023 10:51:16 +0800 Subject: [PATCH 3/5] 2222 --- .../src/layout/components/AppMain.vue | 6 +- supervise-customer-ui/src/views/index.vue | 516 +++++++++++++++++- 2 files changed, 498 insertions(+), 24 deletions(-) diff --git a/supervise-customer-ui/src/layout/components/AppMain.vue b/supervise-customer-ui/src/layout/components/AppMain.vue index ec7b5ba6..e54465dc 100644 --- a/supervise-customer-ui/src/layout/components/AppMain.vue +++ b/supervise-customer-ui/src/layout/components/AppMain.vue @@ -1,6 +1,6 @@ diff --git a/supervise-customer-ui/src/views/index.vue b/supervise-customer-ui/src/views/index.vue index 32f742ca..6c6a6523 100644 --- a/supervise-customer-ui/src/views/index.vue +++ b/supervise-customer-ui/src/views/index.vue @@ -1,33 +1,453 @@ +
@@ -36,8 +456,62 @@ .imgDemo { width: 100%; height: 100%; - background: radial-gradient(#fff,#f5f7f4, #fff); + background: radial-gradient(#fff, #f5f7f4, #fff); + } + + .middle { + justify-content: center; + width: 100%; + height: 300px; + } - canvas { + + .index { + padding: 40px 80px; + background: #FFFFFF; + + .index_top { + + display: flex; + flex-direction: row; + align-items: center; + + .index_top_text { + font-size: 25px; + font-weight: bold; + color: #000; + margin-right: 20px; + } + + .index_top_right { + font-size: 14px; + font-weight: bold; + color: #FF5046; + } + } + + .index_content { + display: flex; + flex-direction: column; + margin-top: 30px; + + .index_content_top { + display: flex; + flex-direction: row; + } + + .index_content_bottom { + display: flex; + flex-direction: row; + margin-top: 30px; + } + } + + .index_bottom { + margin-top: 20px; + display: flex; + } } + + canvas {} From a795034a7b13156bd99c15985c06f5658a231d72 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 5 Jun 2023 11:49:57 +0800 Subject: [PATCH 4/5] 111 --- supervise-business-ui/src/layout/components/Navbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervise-business-ui/src/layout/components/Navbar.vue b/supervise-business-ui/src/layout/components/Navbar.vue index b8433534..cdff898a 100644 --- a/supervise-business-ui/src/layout/components/Navbar.vue +++ b/supervise-business-ui/src/layout/components/Navbar.vue @@ -1,7 +1,7 @@