diff --git a/src/assets/images/topic/anabry.png b/src/assets/images/topic/anabry.png
new file mode 100644
index 0000000..9c79fe2
Binary files /dev/null and b/src/assets/images/topic/anabry.png differ
diff --git a/src/assets/images/topic/anclzd.png b/src/assets/images/topic/anclzd.png
new file mode 100644
index 0000000..0cd1af9
Binary files /dev/null and b/src/assets/images/topic/anclzd.png differ
diff --git a/src/assets/images/topic/andzmc.png b/src/assets/images/topic/andzmc.png
new file mode 100644
index 0000000..8f6dbb8
Binary files /dev/null and b/src/assets/images/topic/andzmc.png differ
diff --git a/src/assets/images/topic/anjjbj.png b/src/assets/images/topic/anjjbj.png
new file mode 100644
index 0000000..3361199
Binary files /dev/null and b/src/assets/images/topic/anjjbj.png differ
diff --git a/src/assets/images/topic/anlydj.png b/src/assets/images/topic/anlydj.png
new file mode 100644
index 0000000..0a9119d
Binary files /dev/null and b/src/assets/images/topic/anlydj.png differ
diff --git a/src/assets/images/topic/anpieb.png b/src/assets/images/topic/anpieb.png
new file mode 100644
index 0000000..8ae4f40
Binary files /dev/null and b/src/assets/images/topic/anpieb.png differ
diff --git a/src/assets/images/topic/anrfb.png b/src/assets/images/topic/anrfb.png
new file mode 100644
index 0000000..ce10dd6
Binary files /dev/null and b/src/assets/images/topic/anrfb.png differ
diff --git a/src/assets/images/topic/anrlmj.png b/src/assets/images/topic/anrlmj.png
new file mode 100644
index 0000000..7d5cb65
Binary files /dev/null and b/src/assets/images/topic/anrlmj.png differ
diff --git a/src/assets/images/topic/anrlsxt.png b/src/assets/images/topic/anrlsxt.png
new file mode 100644
index 0000000..9226c94
Binary files /dev/null and b/src/assets/images/topic/anrlsxt.png differ
diff --git a/src/assets/images/topic/anrxzj.png b/src/assets/images/topic/anrxzj.png
new file mode 100644
index 0000000..cb11218
Binary files /dev/null and b/src/assets/images/topic/anrxzj.png differ
diff --git a/src/assets/images/topic/anspjk.png b/src/assets/images/topic/anspjk.png
new file mode 100644
index 0000000..e558246
Binary files /dev/null and b/src/assets/images/topic/anspjk.png differ
diff --git a/src/assets/images/topic/anxlr.png b/src/assets/images/topic/anxlr.png
new file mode 100644
index 0000000..02045dc
Binary files /dev/null and b/src/assets/images/topic/anxlr.png differ
diff --git a/src/assets/images/topic/anycdw.png b/src/assets/images/topic/anycdw.png
new file mode 100644
index 0000000..6f9b344
Binary files /dev/null and b/src/assets/images/topic/anycdw.png differ
diff --git a/src/assets/images/topic/anyjr.png b/src/assets/images/topic/anyjr.png
new file mode 100644
index 0000000..bdd3f20
Binary files /dev/null and b/src/assets/images/topic/anyjr.png differ
diff --git a/src/assets/images/topic/anzbr.png b/src/assets/images/topic/anzbr.png
new file mode 100644
index 0000000..fe7669c
Binary files /dev/null and b/src/assets/images/topic/anzbr.png differ
diff --git a/src/assets/images/topic/anzjbj.png b/src/assets/images/topic/anzjbj.png
new file mode 100644
index 0000000..07bc7a4
Binary files /dev/null and b/src/assets/images/topic/anzjbj.png differ
diff --git a/src/assets/images/topic/anzwsb.png b/src/assets/images/topic/anzwsb.png
new file mode 100644
index 0000000..73693d1
Binary files /dev/null and b/src/assets/images/topic/anzwsb.png differ
diff --git a/src/assets/images/topic/zlhzsg.png b/src/assets/images/topic/zlhzsg.png
new file mode 100644
index 0000000..0ac64d6
Binary files /dev/null and b/src/assets/images/topic/zlhzsg.png differ
diff --git a/src/assets/images/topic/zlqtsg.png b/src/assets/images/topic/zlqtsg.png
new file mode 100644
index 0000000..ace2c8b
Binary files /dev/null and b/src/assets/images/topic/zlqtsg.png differ
diff --git a/src/assets/images/topic/zlrypx.png b/src/assets/images/topic/zlrypx.png
new file mode 100644
index 0000000..09ef473
Binary files /dev/null and b/src/assets/images/topic/zlrypx.png differ
diff --git a/src/assets/images/topic/zlxfwg.png b/src/assets/images/topic/zlxfwg.png
new file mode 100644
index 0000000..ea790e6
Binary files /dev/null and b/src/assets/images/topic/zlxfwg.png differ
diff --git a/src/assets/images/topic/zlxzbj.png b/src/assets/images/topic/zlxzbj.png
new file mode 100644
index 0000000..0c811d9
Binary files /dev/null and b/src/assets/images/topic/zlxzbj.png differ
diff --git a/src/assets/images/topic/zlyxcs.png b/src/assets/images/topic/zlyxcs.png
new file mode 100644
index 0000000..5e0441f
Binary files /dev/null and b/src/assets/images/topic/zlyxcs.png differ
diff --git a/src/assets/images/topic/zlzyzx.png b/src/assets/images/topic/zlzyzx.png
new file mode 100644
index 0000000..35bfced
Binary files /dev/null and b/src/assets/images/topic/zlzyzx.png differ
diff --git a/src/loveflow/assets/index.less b/src/loveflow/assets/index.less
index 0d3903a..9d8033b 100644
--- a/src/loveflow/assets/index.less
+++ b/src/loveflow/assets/index.less
@@ -34,6 +34,9 @@
.mr14 {
margin-right: 14px;
}
+.mr16 {
+ margin-right: 16px;
+}
.mr18 {
margin-right: 18px;
}
diff --git a/src/loveflow/components/echart/pie/five.vue b/src/loveflow/components/echart/pie/five.vue
index 5275626..4a6f64d 100644
--- a/src/loveflow/components/echart/pie/five.vue
+++ b/src/loveflow/components/echart/pie/five.vue
@@ -25,6 +25,9 @@ export default {
},
methods: {
setOption() {
+ let temp = this.getHeight();
+ let height = parseInt(temp / 3) - 20;
+ console.log(height);
let total = 0;
let data = [];
let barChartList = this.chartObj.data;
@@ -72,8 +75,8 @@ export default {
legend: {
data: legend,
orient: "vertical",
- bottom: "2%",
- left: "10%",
+ bottom: "10%",
+ left: "center",
icon: "diamond",
itemHeight: 8,
itemWidth: 8,
@@ -87,12 +90,11 @@ export default {
fontSize: 12,
rich: {
name: {
- width: 80,
+ width: parseInt(height) - 20,
},
rate: {
- width: 60,
color: "#FFFFFF;",
- fontSize: 16,
+ fontSize: 14,
},
},
},
@@ -109,12 +111,12 @@ export default {
type: "image",
style: {
image: bgImg,
- width: 110,
- height: 110,
+ width: parseInt(height),
+ height: parseInt(height),
zIndex: 1,
},
left: "center",
- top: 50,
+ top: parseInt(height / 2),
},
],
},
@@ -122,10 +124,8 @@ export default {
{
name: this.chartObj.name,
type: "pie",
- radius: [60, 80],
- width: 220,
- height: 220,
- center: ["center", 105],
+ radius: [parseInt(height / 2) + 10, parseInt(height / 2) + 20],
+ center: ["center", parseInt(height)],
clockWise: false,
hoverAnimation: false,
left: "center",
@@ -142,7 +142,7 @@ export default {
color: "#D0DEEE",
},
c_style: {
- fontSize: 20,
+ fontSize: 18,
fontWeight: 500,
color: "#D0DEEE",
},
diff --git a/src/loveflow/components/echart/pie/four.vue b/src/loveflow/components/echart/pie/four.vue
index 204ca86..8606d80 100644
--- a/src/loveflow/components/echart/pie/four.vue
+++ b/src/loveflow/components/echart/pie/four.vue
@@ -25,6 +25,9 @@ export default {
},
methods: {
setOption() {
+ let temp = this.getHeight();
+ let height = parseInt(temp / 3) - 20;
+ console.log(height);
let total = 0;
let data = [];
let barChartList = this.chartObj.data;
@@ -72,8 +75,8 @@ export default {
legend: {
data: legend,
orient: "vertical",
- bottom: "2%",
- left: "10%",
+ bottom: "10%",
+ left: "center",
icon: "diamond",
itemHeight: 8,
itemWidth: 8,
@@ -87,12 +90,11 @@ export default {
fontSize: 12,
rich: {
name: {
- width: 80,
+ width: parseInt(height) - 20,
},
rate: {
- width: 60,
color: "#FFFFFF;",
- fontSize: 16,
+ fontSize: 14,
},
},
},
@@ -109,23 +111,23 @@ export default {
type: "image",
style: {
image: bgImg,
- width: 110,
- height: 110,
+ width: parseInt(height),
+ height: parseInt(height),
zIndex: 1,
},
left: "center",
- top: 50,
+ top: parseInt(height / 2),
},
{
type: "image",
style: {
image: iconImg,
- width: 60,
- height: 60,
+ width: parseInt(height / 2),
+ height: parseInt(height / 2),
zIndex: 2,
},
left: "center",
- top: 74,
+ top: parseInt(height) - 20,
},
],
},
@@ -133,10 +135,9 @@ export default {
{
name: this.chartObj.name,
type: "pie",
- radius: [60, 80],
- width: 220,
- height: 220,
- center: ["center", 105],
+ radius: [parseInt(height / 2) + 10, parseInt(height / 2) + 20],
+
+ center: ["center", parseInt(height)],
clockWise: false,
hoverAnimation: false,
left: "center",
diff --git a/src/loveflow/components/echart/radar/three.vue b/src/loveflow/components/echart/radar/three.vue
index 8bf7d5e..cfb5912 100644
--- a/src/loveflow/components/echart/radar/three.vue
+++ b/src/loveflow/components/echart/radar/three.vue
@@ -33,7 +33,7 @@ export default {
},
radar: {
center: ["50%", "50%"], // 外圆的位置
- radius: "55%",
+ radius: "45%",
name: {
textStyle: {
color: "#D0DEEE",
diff --git a/src/views/enterpriseTopic/antiAttack/bar.vue b/src/views/enterpriseTopic/antiAttack/bar.vue
new file mode 100644
index 0000000..8dd7653
--- /dev/null
+++ b/src/views/enterpriseTopic/antiAttack/bar.vue
@@ -0,0 +1,219 @@
+
+