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

3 years ago · b7e330d756
parent eaa014cc71 06a90a548c
commit b7e330d756
10 changed files with 2242 additions and 2186 deletions
--- a/report-ui/config/dev.env.js
+++ b/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://10.108.26.197:9095"'
+  // BASE_API: '"http://127.0.0.1:9095"'
+  BASE_API: '"http://10.108.26.197:9095"'
 })
--- a/report-ui/src/assets/iconfont/demo_index.html
+++ b/report-ui/src/assets/iconfont/demo_index.html
@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <html>
-
 <head>
  <meta charset="utf-8"/>
  <title>iconfont Demo</title>
-  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico"
-    type="image/x-icon" />
-  <link rel="icon" type="image/svg+xml"
-    href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg" />
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
  <link rel="stylesheet" href="demo.css">
  <link rel="stylesheet" href="iconfont.css">
@ -37,12 +34,10 @@
    }
  </style>
 </head>
-
 <body>
  <div class="main">
    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
-        <img width="200"
-          src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
      
    </a></h1>
    <div class="nav-tabs">
@ -52,14 +47,25 @@
        <li class="dib"><span>Symbol</span></li>
      </ul>
      
-      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=1513211" target="_blank"
-        class="nav-more">查看项目</a>
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=1513211" target="_blank" class="nav-more">查看项目</a>
      
    </div>
    <div class="tab-container">
      <div class="content unicode" style="display: block;">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+              <span class="icon iconfont">&#xe72e;</span>
+                <div class="name">仪表盘-抄表</div>
+                <div class="code-name">&amp;#xe72e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe851;</span>
+                <div class="name">南丁格尔玫瑰图</div>
+                <div class="code-name">&amp;#xe851;</div>
+              </li>
+          
            <li class="dib">
              <span class="icon iconfont">&#xe631;</span>
                <div class="name">展 开 </div>
@ -672,9 +678,9 @@
 <pre><code class="language-css"
 >@font-face {
  font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1624613153423') format('woff2'),
-       url('iconfont.woff?t=1624613153423') format('woff'),
-       url('iconfont.ttf?t=1624613153423') format('truetype');
+  src: url('iconfont.woff2?t=1624933667537') format('woff2'),
+       url('iconfont.woff?t=1624933667537') format('woff'),
+       url('iconfont.ttf?t=1624933667537') format('truetype');
 }
 </code></pre>
          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@ -700,6 +706,24 @@
      <div class="content font-class">
        <ul class="icon_lists dib-box">
          
+          <li class="dib">
+            <span class="icon iconfont iconyibiaopan-chaobiao"></span>
+            <div class="name">
+              仪表盘-抄表
+            </div>
+            <div class="code-name">.iconyibiaopan-chaobiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconnandinggeermeiguitu"></span>
+            <div class="name">
+              南丁格尔玫瑰图
+            </div>
+            <div class="code-name">.iconnandinggeermeiguitu
+            </div>
+          </li>
+          
          <li class="dib">
            <span class="icon iconfont iconzhankai"></span>
            <div class="name">
@ -1618,6 +1642,22 @@
      <div class="content symbol">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconyibiaopan-chaobiao"></use>
+                </svg>
+                <div class="name">仪表盘-抄表</div>
+                <div class="code-name">#iconyibiaopan-chaobiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconnandinggeermeiguitu"></use>
+                </svg>
+                <div class="name">南丁格尔玫瑰图</div>
+                <div class="code-name">#iconnandinggeermeiguitu</div>
+            </li>
+          
            <li class="dib">
                <svg class="icon svg-icon" aria-hidden="true">
                  <use xlink:href="#iconzhankai"></use>
@ -2468,5 +2508,4 @@
    })
  </script>
 </body>
-
 </html>
--- a/report-ui/src/assets/iconfont/iconfont.css
+++ b/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'),
-       url('iconfont.woff?t=1624613153423') format('woff'),
-       url('iconfont.ttf?t=1624613153423') format('truetype');
+  src: url('iconfont.woff2?t=1624933667537') format('woff2'),
+       url('iconfont.woff?t=1624933667537') format('woff'),
+       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";
 }
--- a/report-ui/src/assets/iconfont/iconfont.js
+++ b/report-ui/src/assets/iconfont/iconfont.js
--- a/report-ui/src/assets/iconfont/iconfont.json
+++ b/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": "展 开 ",
--- a/report-ui/src/assets/iconfont/iconfont.ttf
+++ b/report-ui/src/assets/iconfont/iconfont.ttf
--- a/report-ui/src/assets/iconfont/iconfont.woff
+++ b/report-ui/src/assets/iconfont/iconfont.woff
--- a/report-ui/src/assets/iconfont/iconfont.woff2
+++ b/report-ui/src/assets/iconfont/iconfont.woff2
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@ -4315,8 +4315,8 @@ const widgetTools = [
  {
    code: 'WidgetPieNightingaleRoseArea',
    type: 'chart',
-    label: '饼图-南丁格尔-面积',
-    icon: 'iconicon_tubiao_bingtu',
+    label: '南丁格尔玫瑰图',
+    icon: 'iconnandinggeermeiguitu',
    options: {
      // 配置
      setup: [
--- a/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieNightingaleRoseArea.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPieNightingaleRoseArea.vue
@ -22,17 +22,14 @@ export default {
        toolbox: {
          show: true,
          feature: {
-            mark: { show: true },
-            dataView: { show: true, readOnly: false },
-            restore: { show: true },
-            saveAsImage: { show: true }
+            mark: { 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>