Merge branch 'master' of https://gitee.com/anji-plus/report

report-ui/config/dev.env.js

@@ -4,6 +4,6 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://127.0.0.1:9095"'
+  // BASE_API: '"http://127.0.0.1:9095"'
-  // BASE_API: '"http://10.108.26.197:9095"'
+  BASE_API: '"http://10.108.26.197:9095"'
 })

report-ui/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1513211 */
-  src: url('iconfont.woff2?t=1624613153423') format('woff2'),
+  src: url('iconfont.woff2?t=1624933667537') format('woff2'),
-       url('iconfont.woff?t=1624613153423') format('woff'),
+       url('iconfont.woff?t=1624933667537') format('woff'),
-       url('iconfont.ttf?t=1624613153423') format('truetype');
+       url('iconfont.ttf?t=1624933667537') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconyibiaopan-chaobiao:before {
+  content: "\e72e";
+}
+
+.iconnandinggeermeiguitu:before {
+  content: "\e851";
+}
+
 .iconzhankai:before {
   content: "\e631";
 }

report-ui/src/assets/iconfont/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "16466332",
+      "name": "仪表盘-抄表",
+      "font_class": "yibiaopan-chaobiao",
+      "unicode": "e72e",
+      "unicode_decimal": 59182
+    },
+    {
+      "icon_id": "15872322",
+      "name": "南丁格尔玫瑰图",
+      "font_class": "nandinggeermeiguitu",
+      "unicode": "e851",
+      "unicode_decimal": 59473
+    },
     {
       "icon_id": "11990084",
       "name": "展 开 ",

report-ui/src/views/report/bigscreen/designer/tools.js

@@ -4315,8 +4315,8 @@ const widgetTools = [
   {
     code: 'WidgetPieNightingaleRoseArea',
     type: 'chart',
-    label: '饼图-南丁格尔-面积',
+    label: '南丁格尔玫瑰图',
-    icon: 'iconicon_tubiao_bingtu',
+    icon: 'iconnandinggeermeiguitu',
     options: {
       // 配置
       setup: [

report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieNightingaleRoseArea.vue

@@ -22,17 +22,14 @@ export default {
         toolbox: {
           show: true,
           feature: {
-            mark: { show: true },
+            mark: { show: true }
-            dataView: { show: true, readOnly: false },
-            restore: { show: true },
-            saveAsImage: { show: true }
           }
         },
         series: [
           {
             name: "面积模式",
             type: "pie",
-            radius: [50, 250],
+            radius: ["10%", "50%"],
             center: ["50%", "50%"],
             roseType: "area",
             itemStyle: {
@@ -338,8 +335,6 @@ export default {
 .echarts {
   width: 100%;
   height: 100%;
-  min-width: 200px;
-  min-height: 200px;
   overflow: hidden;
 }
 </style>