diff --git a/public/img/bwg_icon.png b/public/img/bwg_icon.png new file mode 100644 index 0000000..2babbd4 Binary files /dev/null and b/public/img/bwg_icon.png differ diff --git a/public/img/tsg_icon.png b/public/img/tsg_icon.png new file mode 100644 index 0000000..8924865 Binary files /dev/null and b/public/img/tsg_icon.png differ diff --git a/public/img/tyc_icon.png b/public/img/tyc_icon.png new file mode 100644 index 0000000..4f75e4b Binary files /dev/null and b/public/img/tyc_icon.png differ diff --git a/public/img/tyg_icon.png b/public/img/tyg_icon.png new file mode 100644 index 0000000..6174fcc Binary files /dev/null and b/public/img/tyg_icon.png differ diff --git a/public/img/whg_icon.png b/public/img/whg_icon.png new file mode 100644 index 0000000..09976df Binary files /dev/null and b/public/img/whg_icon.png differ diff --git a/public/img/yyg_icon.png b/public/img/yyg_icon.png new file mode 100644 index 0000000..87f28c7 Binary files /dev/null and b/public/img/yyg_icon.png differ diff --git a/src/assets/wh/右2-借书.png b/src/assets/wh/wh_right1.png similarity index 100% rename from src/assets/wh/右2-借书.png rename to src/assets/wh/wh_right1.png diff --git a/src/assets/wh/右2-还书.png b/src/assets/wh/wh_right2.png similarity index 100% rename from src/assets/wh/右2-还书.png rename to src/assets/wh/wh_right2.png diff --git a/src/assets/wh/右2-办证.png b/src/assets/wh/wh_right3.png similarity index 100% rename from src/assets/wh/右2-办证.png rename to src/assets/wh/wh_right3.png diff --git a/src/views/cultrue/index.vue b/src/views/cultrue/index.vue index 5caec63..e56c708 100644 --- a/src/views/cultrue/index.vue +++ b/src/views/cultrue/index.vue @@ -94,12 +94,12 @@ export default { this.cultrue_bar1(); this.cultrue_bar2(); this.cultrue_bar3(); - this.addNumber(0,234098,'insv') - this.addNumber(0,234098,'insv2') - this.addNumber(0,234098,'insv3') - this.addNumber(0,890098,'cmdval1') - this.addNumber(0,890098,'cmdval2') - this.addNumber(0,234098,'cmdval3') + this.addNumber(0, 234098, 'insv') + this.addNumber(0, 234098, 'insv2') + this.addNumber(0, 234098, 'insv3') + this.addNumber(0, 890098, 'cmdval1') + this.addNumber(0, 890098, 'cmdval2') + this.addNumber(0, 234098, 'cmdval3') this.getTsgInfoDatas() // var name = ['图书馆', '文化馆', '博物馆'] }, @@ -331,17 +331,21 @@ export default { // backgroundColor: "#141f56", legend: { top: 0, - left:0, - itemGap: 25, - itemWidth: 0, - itemHeight:18, + left: 0, + itemGap: 20, + itemWidth: 20, + itemHeight: 20, textStyle: { color: '#fff', fontSize: '14', - padding: [1, 12] + // padding: [1, 12] }, - data: name + data: [ + { icon: 'image://img/tyc_icon.png', name: '图书馆' }, + { icon: 'image://img/tyg_icon.png', name: '文化馆' }, + { icon: 'image://img/yyg_icon.png', name: '博物馆' }, + ] }, title: { // text: "负面言论分领域趋势", @@ -373,8 +377,8 @@ export default { borderWidth: 0, top: 250, bottom: 250, - right:15, - left:30, + right: 15, + left: 30, textStyle: { color: "#fff" } @@ -439,52 +443,19 @@ export default { var data = [{ name: '今日办证人数', - icon:'../../assets/wh/右2-借书.png', + icon: '../../assets/wh/wh_right3.png', value: 323, }, { name: '今日还书册数', - icon:'../../assets/wh/右2-还书.png', + icon: '../../assets/wh/wh_right2.png', value: 209, }, { name: '今日借书册数', - icon:'../../assets/wh/右2-办证.png', + icon: '../../assets/wh/wh_right1.png', value: 323, }, - // { - // name: 'user4', - // value: 44, - // sum: 60 - // }, { - // name: 'user1', - // value: 10, - // sum: 10 - // }, - // { - // name: 'user2', - // value: 20, - // sum: 10 - // }, - // { - // name: 'user3', - // value: 53, - // sum: 50 - // }, - // { - // name: 'user4', - // value: 24, - // sum: 60 - // }, { - // name: 'user1', - // value: 10, - // sum: 10 - // }, - // { - // name: 'user2', - // value: 20, - // sum: 10 - // } ]; var getArrByKey = (data, k) => { let key = k || "value"; @@ -642,9 +613,22 @@ export default { textStyle: { fontSize: 16 }, - formatter: function (a) { - return a.name - } + rich: { + img1: { + backgroundColor: { + image: '../../assets/wh/wh_right1.png' + } + } + }, + formatter: function (param) { + var res = ''; + res += '{img1|}' + param.name + + return res; + }, + // formatter: function (a) { + // return a.name + // } } } }] @@ -722,18 +706,19 @@ export default { } .leftbox .lb_wht .wh_big_tit { - font-size: 0.68rem; + font-size: 0.48rem; /* line-height: 4.2rem; */ text-align: right; - padding-top: 120px; + padding-top: 2rem; + margin-right: 1.05rem; /* padding-top: 3.2rem; */ } .leftbox .lb_wht .wh_small { padding-top: 12px; - font-size: 12px; + font-size: 14px; text-align: right; - padding-right: 10px; + padding-right: 0.2rem; } /* 总计进馆人数 */ diff --git a/src/views/ty/index.vue b/src/views/ty/index.vue index b936773..8568d4b 100644 --- a/src/views/ty/index.vue +++ b/src/views/ty/index.vue @@ -663,15 +663,20 @@ export default { option = { // backgroundColor: "#141f56", legend: { - top: 270, + top: 260, right: 0, - itemGap: 15, - itemWidth: 15, + itemGap: 35, + itemWidth: 20, + itemHeight: 20, textStyle: { color: '#fff', fontSize: '14' }, - data: name + data: [ + { icon: 'image://img/tyc_icon.png', name: '体育场' }, + { icon: 'image://img/tyg_icon.png', name: '体育馆' }, + { icon: 'image://img/yyg_icon.png', name: '游泳场馆' }, + ] }, title: { // text: "负面言论分领域趋势",