热力图
@@ -1974,6 +1989,14 @@
+ 雷达图2
+ #iconleidatu
+
+
+
+
热力图
diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css
index 316b974..b96a7a6 100644
--- a/src/assets/iconfont/iconfont.css
+++ b/src/assets/iconfont/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 1513211 */
- src: url('iconfont.woff2?t=1650520683161') format('woff2'),
- url('iconfont.woff?t=1650520683161') format('woff'),
- url('iconfont.ttf?t=1650520683161') format('truetype');
+ src: url('iconfont.woff2?t=1666946350865') format('woff2'),
+ url('iconfont.woff?t=1666946350865') format('woff'),
+ url('iconfont.ttf?t=1666946350865') format('truetype');
}
.iconfont {
@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
+.iconleidatu:before {
+ content: "\e640";
+}
+
.iconrelitu:before {
content: "\e683";
}
diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js
index af8bb01..9e6532b 100644
--- a/src/assets/iconfont/iconfont.js
+++ b/src/assets/iconfont/iconfont.js
@@ -1 +1 @@
-!function(c){var l,h,a,z,i,v='',o=(o=document.getElementsByTagName("script"))[o.length-1].getAttribute("data-injectcss"),m=function(c,l){l.parentNode.insertBefore(c,l)};if(o&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function t(){i||(i=!0,a())}function s(){try{z.documentElement.doScroll("left")}catch(c){return void setTimeout(s,50)}t()}l=function(){var c,l=document.createElement("div");l.innerHTML=v,v=null,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?m(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),l()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(a=l,z=c.document,i=!1,s(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,t())})}(window);
\ No newline at end of file
+window._iconfont_svg_string_1513211='',function(h){var c=(c=document.getElementsByTagName("script"))[c.length-1],l=c.getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var a,z,i,v,o,m=function(c,l){l.parentNode.insertBefore(c,l)};if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}a=function(){var c,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_1513211,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?m(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(z=function(){document.removeEventListener("DOMContentLoaded",z,!1),a()},document.addEventListener("DOMContentLoaded",z,!1)):document.attachEvent&&(i=a,v=h.document,o=!1,s(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,t())})}function t(){o||(o=!0,i())}function s(){try{v.documentElement.doScroll("left")}catch(c){return void setTimeout(s,50)}t()}}(window);
\ No newline at end of file
diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json
index 25611cb..a027765 100644
--- a/src/assets/iconfont/iconfont.json
+++ b/src/assets/iconfont/iconfont.json
@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
+ "icon_id": "9013588",
+ "name": "雷达图2",
+ "font_class": "leidatu",
+ "unicode": "e640",
+ "unicode_decimal": 58944
+ },
+ {
"icon_id": "19004935",
"name": "热力图",
"font_class": "relitu",
diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
index bd67196..37410f7 100644
--- a/src/assets/iconfont/iconfont.ttf
+++ b/src/assets/iconfont/iconfont.ttf
diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff
index 70c2c21..81f53ab 100644
--- a/src/assets/iconfont/iconfont.woff
+++ b/src/assets/iconfont/iconfont.woff
diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2
index d84bc62..3e05ef9 100644
--- a/src/assets/iconfont/iconfont.woff2
+++ b/src/assets/iconfont/iconfont.woff2
diff --git a/src/mixins/queryform.js b/src/mixins/queryform.js
index bf7a2e9..08d3414 100644
--- a/src/mixins/queryform.js
+++ b/src/mixins/queryform.js
@@ -111,6 +111,7 @@ export default {
// widget-stackchart 堆叠图
// widget-heatmap 热力图
// widget-mapline 中国地图-路线图
+ // widget-radar 雷达图
const chartType = params.chartType
if (
chartType == "widget-barchart" ||
@@ -131,6 +132,8 @@ export default {
return this.coordChartFn(params.chartProperties, data)
} else if (chartType == "widget-linemap") {
return this.linemapChartFn(params.chartProperties, data)
+ } else if (chartType == "widget-radar") {
+ return this.radarChartFn(params.chartProperties, data)
} else {
return data
}
@@ -269,6 +272,25 @@ export default {
}
return ananysicData;
},
+ radarChartFn(chartProperties, data) {
+ const ananysicData = {};
+ // 字段名
+ const radarField = [];
+ let nameField;
+ for(const key in chartProperties) {
+ if (chartProperties[key] == 'radar') {
+ radarField.push(key)
+ }
+ if (chartProperties[key] == 'name') {
+ nameField = key;
+ }
+ }
+ // 拿到数值
+ ananysicData["name"] = nameField;
+ ananysicData["keys"] = radarField;
+ ananysicData["value"] = data;
+ return ananysicData;
+ },
setUnique(arr) {
let newArr = [];
arr.forEach(item => {
diff --git a/src/views/bigscreenDesigner/designer/components/dynamicAddRadar.vue b/src/views/bigscreenDesigner/designer/components/dynamicAddRadar.vue
new file mode 100644
index 0000000..168dca4
--- /dev/null
+++ b/src/views/bigscreenDesigner/designer/components/dynamicAddRadar.vue
@@ -0,0 +1,178 @@
+
+
+
新增
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+