From c1665e4af65742fb4e0c7c794c9aa38518073540 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Wed, 21 Aug 2024 16:10:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0=E4=BC=81=E4=B8=9A=E8=8D=A3=E8=AA=89=E8=B5=84=E8=B4=A8?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E7=94=B3=E6=8A=A5=E6=97=B6=E9=97=B4=E3=80=81?= =?UTF-8?q?echarts=E5=88=B7=E6=96=B0=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- package.json | 2 +- src/assets/styles/public.scss | 19 ++- src/views/dataCloudMap/index.vue | 4 +- src/views/home/index.vue | 12 +- .../workbench/components/TopEchart/index.vue | 112 ++++++++++++------ .../capitalAppropriateAnalyse/index.vue | 23 ---- .../components/statisticsAnalyse/index.vue | 4 +- .../components/statisticsNew/index.vue | 5 +- src/views/workbench/index.vue | 8 +- 10 files changed, 116 insertions(+), 75 deletions(-) diff --git a/.env.development b/.env.development index 710cf5d..231ebb7 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -# VUE_APP_BASE_API = 'http://192.168.0.110:9040' +# VUE_APP_BASE_API = 'http://192.168.0.108:9040' # 测试环境数据库 VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 脱敏三方测试用数据库 diff --git a/package.json b/package.json index 2543c09..46d64ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408210855", + "version": "1.0.202408211604", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index a8c0ba0..721cfa7 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -2480,14 +2480,17 @@ flex-direction: column; overflow-y: scroll; .table-items { - display: flex; - align-items: center; - justify-content: space-between; + // display: flex; + // align-items: center; + // justify-content: space-between; + display: grid; + grid-template-columns: 1fr 1.5fr 1fr; padding: 10px 20px; margin-bottom: 10px; background-color: #fff; .two-left { font-family: AlibabaPuHuiTiM; + // flex: 1; font-size: 16px; color: #1890FF; font-style: normal; @@ -2496,6 +2499,7 @@ cursor: pointer; } .two-right { + // flex: 1; display: flex; align-items: center; font-size: 14px; @@ -2507,6 +2511,15 @@ font-family: AlibabaPuHuiTiM; } } + .promoteProject-bottom-right { + font-family: AlibabaPuHuiTiR; + // flex: 1; + font-size: 14px; + color: #666666; + .span-three { + font-family: ArialB; + } + } } } // 往年专项资金申报 diff --git a/src/views/dataCloudMap/index.vue b/src/views/dataCloudMap/index.vue index dcbf98a..2dedf99 100644 --- a/src/views/dataCloudMap/index.vue +++ b/src/views/dataCloudMap/index.vue @@ -121,7 +121,7 @@
亿
- +
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 599c6df..498d9bb 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -51,6 +51,10 @@ 项目类别：
+
+ 申报时间： + {{ parseTime(item.createTime, '{y}-{m}-{d}') }} +
@@ -136,7 +140,7 @@
{{ item.alertTime }}
-
已发送短信、已发送邮件
+
已发送短信
@@ -148,7 +152,7 @@
{{ item.alertTime }}
-
已发送短信、已发送邮件
+
已发送短信
@@ -160,7 +164,7 @@
{{ item.alertTime }}
-
已发送短信、已发送邮件
+
已发送短信
@@ -171,7 +175,7 @@
{{ item.alertTime }}
-
已发送短信、已发送邮件
+
已发送短信
diff --git a/src/views/workbench/components/TopEchart/index.vue b/src/views/workbench/components/TopEchart/index.vue index f8ef042..9ffef89 100644 --- a/src/views/workbench/components/TopEchart/index.vue +++ b/src/views/workbench/components/TopEchart/index.vue @@ -6,14 +6,6 @@ import * as echarts from "echarts"; export default { data() { - let colors = ['#EE462A','#FF8929', '#FFBB00', '#5CBC69', '#00AEFF'] - let dataSource = [ - { value: 48, name: 'TOP1',entprice: "苏州众汇聚合信息科技有限公司1"}, - { value: 36, name: 'TOP2',entprice: "苏州众司2"}, - { value: 30, name: 'TOP3',entprice: "苏州众汇聚合信息科技有限公司3"}, - { value: 22, name: 'TOP4',entprice: "苏州众汇聚合信息科技有限公司4"}, - { value: 16, name: 'TOP5',entprice: "苏州众汇聚合信息科技有限公司5"}, - ]; // 公用调整 let itemStyle = { // normal: { @@ -28,8 +20,42 @@ export default { return { myChartFive: false, sum: 5000, - dataSource:dataSource, - option: { + dataSource:[ + { value: 48, name: 'TOP1',entprice: "苏州众汇聚合信息科技有限公司1"}, + { value: 36, name: 'TOP2',entprice: "苏州众司2"}, + { value: 30, name: 'TOP3',entprice: "苏州众汇聚合信息科技有限公司3"}, + { value: 22, name: 'TOP4',entprice: "苏州众汇聚合信息科技有限公司4"}, + { value: 16, name: 'TOP5',entprice: "苏州众汇聚合信息科技有限公司5"}, + ], + } + }, + mounted(){ + this.$nextTick(()=>{ + setTimeout(()=>{ + this.initEchart(); + },200) + }) + window.addEventListener('resize', this.cancalDebounce); + }, + beforeDestroy() { + window.removeEventListener('resize', this.cancalDebounce); + }, + methods:{ + cancalDebounce(){ + window.onresize = this.myChartFive.resize(); + }, + initEchart(){ + var chartDom = document.getElementById("echartsFive"); + this.myChartFive = echarts.init(chartDom); + let colors = ['#EE462A','#FF8929', '#FFBB00', '#5CBC69', '#00AEFF'] + let dataSource = [ + { value: 48, name: 'TOP1',entprice: "苏州众汇聚合信息科技有限公司1"}, + { value: 36, name: 'TOP2',entprice: "苏州众司2"}, + { value: 30, name: 'TOP3',entprice: "苏州众汇聚合信息科技有限公司3"}, + { value: 22, name: 'TOP4',entprice: "苏州众汇聚合信息科技有限公司4"}, + { value: 16, name: 'TOP5',entprice: "苏州众汇聚合信息科技有限公司5"}, + ]; + let option = { grid: { left: '8%', right: '32%', @@ -130,7 +156,7 @@ export default { verticalAlign: 'middle', align: 'left', padding: [0, 0, 0, 20], - formatter: (value) => { + formatter: (value,index) => { let name; for (let index = 0; index < this.dataSource.length; index++) { if(this.dataSource[index].value == value) { @@ -138,7 +164,7 @@ export default { } } - return "{entprice|" + name + "}{value|" + value + "}{unit|%}" + return "{entprice|" + name + "}{entpriceValue|" + value + `}{entpriceUnit${index}|%}` }, rich: { entprice:{ @@ -147,7 +173,7 @@ export default { color: "#666", align:"left" }, - value:{ + entpriceValue:{ fontFamily: "DINCondensed", fontSize: "24px", color: "#0086FF", @@ -156,13 +182,49 @@ export default { padding: [3,0,0,10], fontStyle: "italic", }, - unit:{ + entpriceUnit0:{ + fontFamily: "Arial", + fontSize: "12px", + color: "#0086FF", + fontWeight: "bold", + align:"left", + padding: [3,0,0,5], + fontStyle: "italic", + }, + entpriceUnit1:{ + fontFamily: "Arial", + fontSize: "12px", + color: "#0086FF", + fontWeight: "bold", + align:"left", + padding: [3,0,0,5], + fontStyle: "italic", + }, + entpriceUnit2:{ fontFamily: "Arial", fontSize: "12px", color: "#0086FF", fontWeight: "bold", align:"left", - padding: [3,0,0,-10], + padding: [3,0,0,5], + fontStyle: "italic", + }, + entpriceUnit3:{ + fontFamily: "Arial", + fontSize: "12px", + color: "#0086FF", + fontWeight: "bold", + align:"left", + padding: [3,0,0,5], + fontStyle: "italic", + }, + entpriceUnit4:{ + fontFamily: "Arial", + fontSize: "12px", + color: "#0086FF", + fontWeight: "bold", + align:"left", + padding: [3,0,0,5], fontStyle: "italic", }, } @@ -195,25 +257,7 @@ export default { }, ] } - } - }, - mounted(){ - this.$nextTick(()=>{ - this.initEchart(); - }) - window.addEventListener('resize', this.cancalDebounce); - }, - beforeDestroy() { - window.removeEventListener('resize', this.cancalDebounce); - }, - methods:{ - cancalDebounce(){ - window.onresize = this.myChartFive.resize(); - }, - initEchart(){ - var chartDom = document.getElementById("echartsFive"); - this.myChartFive = echarts.init(chartDom); - this.myChartFive.setOption(this.option) + this.myChartFive.setOption(option) // this.legendselectchanged(this.myChartFive) }, // legendselectchanged(myChart){ diff --git a/src/views/workbench/components/capitalAppropriateAnalyse/index.vue b/src/views/workbench/components/capitalAppropriateAnalyse/index.vue index ce0bb7e..1e96b25 100644 --- a/src/views/workbench/components/capitalAppropriateAnalyse/index.vue +++ b/src/views/workbench/components/capitalAppropriateAnalyse/index.vue @@ -25,36 +25,13 @@ export default { mounted(){ this.$nextTick(()=>{ this.initEchart(); - // this.getList(); }) - setTimeout(()=>{ - // this.getList(); - },200) window.addEventListener('resize', this.cancalDebounce); }, beforeDestroy() { window.removeEventListener('resize', this.cancalDebounce); }, methods:{ - getList(){ - fundStatistics().then(res=>{ - let colors = ['#FFBB00', '#5CBC69', '#00AEFF'] - let arr = []; - let sum = 0; - res.data.forEach((element,index) => { - let obj = {}; - obj.label = {}; - obj.name = element.type; - obj.value = element.fundSum; - obj.label.color = colors[index]; - sum += element.fundSum; - arr.push(obj); - }); - this.sums = sum; - this.option.legend.data = arr; - this.option.series[0].data = arr; - }) - }, cancalDebounce(){ window.onresize = this.myChartFour.resize(); }, diff --git a/src/views/workbench/components/statisticsAnalyse/index.vue b/src/views/workbench/components/statisticsAnalyse/index.vue index bc12b51..7e16424 100644 --- a/src/views/workbench/components/statisticsAnalyse/index.vue +++ b/src/views/workbench/components/statisticsAnalyse/index.vue @@ -142,7 +142,9 @@ export default { }, mounted(){ this.$nextTick(()=>{ - this.initEchart(); + setTimeout(()=>{ + this.initEchart(); + },200) }) window.addEventListener('resize', this.cancalDebounce); }, diff --git a/src/views/workbench/components/statisticsNew/index.vue b/src/views/workbench/components/statisticsNew/index.vue index 0b9e149..29f64c0 100644 --- a/src/views/workbench/components/statisticsNew/index.vue +++ b/src/views/workbench/components/statisticsNew/index.vue @@ -143,7 +143,9 @@ export default { }, mounted(){ this.$nextTick(()=>{ - this.initEchart(); + setTimeout(()=>{ + this.initEchart(); + },200) }) window.addEventListener('resize', this.cancalDebounce); }, @@ -152,7 +154,6 @@ export default { }, methods:{ cancalDebounce(){ - console.log("走了吗"); window.onresize = this.myChartTwo.resize(); }, initEchart(){ diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index e9fa910..3efacd0 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -80,7 +80,7 @@
{{ item.alertTime }}
-
已发送短信、已发送邮件
+
已发送短信
@@ -94,7 +94,7 @@
{{ item.alertTime }}
-
已发送短信、已发送邮件
+
已发送短信
@@ -105,7 +105,7 @@
{{ item.alertContent }}
{{ item.alertTime }}
-
已发送短信、已发送邮件
+
已发送短信
@@ -117,7 +117,7 @@
{{ item.alertTime }}
-
已发送短信、已发送邮件
+
已发送短信