Merge remote-tracking branch 'gitee/master' into gitee-master

2026-04-13 10:38:34 +08:00 · 2021-06-30 16:05:41 +08:00
parent b35337bd88 23394eb3c6
commit cfb44fdb8f
11 changed files with 146 additions and 67 deletions
--- a/report-ui/src/assets/iconfont/demo_index.html
+++ b/report-ui/src/assets/iconfont/demo_index.html
@@ -54,6 +54,12 @@
      <div class="content unicode" style="display: block;">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+              <span class="icon iconfont">&#xe738;</span>
+                <div class="name">中国地图</div>
+                <div class="code-name">&amp;#xe738;</div>
+              </li>
+          
            <li class="dib">
              <span class="icon iconfont">&#xe625;</span>
                <div class="name">表格</div>
@@ -690,9 +696,9 @@
 <pre><code class="language-css"
 >@font-face {
  font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1625020835610') format('woff2'),
-       url('iconfont.woff?t=1625020835610') format('woff'),
-       url('iconfont.ttf?t=1625020835610') format('truetype');
+  src: url('iconfont.woff2?t=1625038596365') format('woff2'),
+       url('iconfont.woff?t=1625038596365') format('woff'),
+       url('iconfont.ttf?t=1625038596365') format('truetype');
 }
 </code></pre>
          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -718,6 +724,15 @@
      <div class="content font-class">
        <ul class="icon_lists dib-box">
          
+          <li class="dib">
+            <span class="icon iconfont iconzhongguoditu"></span>
+            <div class="name">
+              中国地图
+            </div>
+            <div class="code-name">.iconzhongguoditu
+            </div>
+          </li>
+          
          <li class="dib">
            <span class="icon iconfont iconbiaoge"></span>
            <div class="name">
@@ -1672,6 +1687,14 @@
      <div class="content symbol">
          <ul class="icon_lists dib-box">
          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconzhongguoditu"></use>
+                </svg>
+                <div class="name">中国地图</div>
+                <div class="code-name">#iconzhongguoditu</div>
+            </li>
+          
            <li class="dib">
                <svg class="icon svg-icon" aria-hidden="true">
                  <use xlink:href="#iconbiaoge"></use>
--- 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=1625020835610') format('woff2'),
-       url('iconfont.woff?t=1625020835610') format('woff'),
-       url('iconfont.ttf?t=1625020835610') format('truetype');
+  src: url('iconfont.woff2?t=1625038596365') format('woff2'),
+       url('iconfont.woff?t=1625038596365') format('woff'),
+       url('iconfont.ttf?t=1625038596365') format('truetype');
 }

 .iconfont {
@@ -13,6 +13,10 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.iconzhongguoditu:before {
+  content: "\e738";
+}
+
 .iconbiaoge:before {
  content: "\e625";
 }
--- 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,13 @@
  "css_prefix_text": "icon",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "22378736",
+      "name": "中国地图",
+      "font_class": "zhongguoditu",
+      "unicode": "e738",
+      "unicode_decimal": 59192
+    },
    {
      "icon_id": "21338828",
      "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/index.vue
+++ b/report-ui/src/views/report/bigscreen/designer/index.vue
@@ -46,15 +46,34 @@
    <div class="layout-left-fold"
         :style="{ width: widthLeftForToolsHideButton + 'px' }"
         @click="toolIsShow = !toolIsShow">
-      <i class="iconfont iconzhankai" />
+      <i class="el-icon-arrow-right" />
    </div>

    <div class="layout-middle"
         :style="{ width: middleWidth + 'px', height: middleHeight + 'px' }">
      <div class="top-button">
-        <span class="btn border-right">
+
+        <span class="btn">
+          <el-tooltip class="item"
+                      effect="dark"
+                      content="保存"
+                      placement="bottom">
+            <i class="iconfont iconsave"
+               @click="saveData"></i>
+          </el-tooltip>
+        </span>
+        <span class="btn">
+          <el-tooltip class="item"
+                      effect="dark"
+                      content="预览"
+                      placement="bottom">
+            <i class="iconfont iconyulan"
+               @click="viewScreen"></i>
+          </el-tooltip>
+        </span>
+        <span class="btn border-left">
          <ul class="nav">
-            <li><i class="el-icon-brush"></i>
+            <li><i class="el-icon-brush"></i><i class="el-icon-arrow-down"></i>
              <ul>
                <li>
                  <div><i class="el-icon-full-screen mr10"></i>边框 <i class="el-icon-arrow-right ml20"></i></div>
@@ -74,24 +93,6 @@
            </li>
          </ul>
        </span>
-        <span class="btn">
-          <el-tooltip class="item"
-                      effect="dark"
-                      content="保存"
-                      placement="bottom">
-            <i class="iconfont iconsave"
-               @click="saveData"></i>
-          </el-tooltip>
-        </span>
-        <span class="btn">
-          <el-tooltip class="item"
-                      effect="dark"
-                      content="预览"
-                      placement="bottom">
-            <i class="iconfont iconyulan"
-               @click="viewScreen"></i>
-          </el-tooltip>
-        </span>
      </div>
      <div class="workbench-container"
           :style="{
@@ -640,7 +641,13 @@ export default {
  margin-left: 20px;
 }
 .border-right {
-  border-right: 1px solid #566876;
+  border-right: 1px solid #273b4d;
+}
+.border-left {
+  border-left: 1px solid #273b4d;
+}
+.el-icon-arrow-down {
+  font-size: 10px;
 }
 .is-active {
  background: #31455d !important;
@@ -697,24 +704,18 @@ export default {
    display: -ms-flexbox;
    display: flex;
    height: 100%;
-    -webkit-box-align: bottom;
-    -ms-flex-align: bottom;
-    align-items: bottom;
+
    font-size: 12px;
    overflow: hidden;
-    background-color: #455766;
+    background-color: #242a30;
    cursor: pointer;
+    padding-top: 26%;
    i {
-      font-size: 22px;
+      font-size: 18px;
      width: 18px;
      height: 23px;
      margin-left: 0px;
-      color: #5a83bb;
-      transform: rotate(180deg);
-      -ms-transform: rotate(180deg); /* IE 9 */
-      -moz-transform: rotate(180deg); /* Firefox */
-      -webkit-transform: rotate(180deg); /* Safari 和 Chrome */
-      -o-transform: rotate(180deg); /* Opera */
+      color: #bfcbd9;
    }
  }

@@ -723,10 +724,10 @@ export default {
    position: relative;
    //width: calc(100% - 445px);
    height: 100%;
-    background-color: #455766;
+    background-color: rgb(36, 42, 48);
    box-sizing: border-box;
    -webkit-box-sizing: border-box;
-    border: 1px solid #455766;
+    border: 1px solid rgb(36, 42, 48);
    align-items: center;
    vertical-align: middle;
    .top-button {
@@ -736,11 +737,30 @@ export default {
      line-height: 40px;
      margin-left: 9px;
      .btn {
-        color: #cde8ff;
-        width: 36px;
+        color: #788994;
+        width: 55px;
        text-align: center;
        display: block;
        cursor: pointer;
+        .el-icon-arrow-down {
+          transform: rotate(0deg);
+          -ms-transform: rotate(0deg); /* IE 9 */
+          -moz-transform: rotate(0deg); /* Firefox */
+          -webkit-transform: rotate(0deg); /* Safari 和 Chrome */
+          -o-transform: rotate(0deg); /* Opera */
+          transition: all 0.4s ease-in-out;
+        }
+        &:hover {
+          background: rgb(25, 29, 34);
+          .el-icon-arrow-down {
+            transform: rotate(180deg);
+            -ms-transform: rotate(180deg); /* IE 9 */
+            -moz-transform: rotate(180deg); /* Firefox */
+            -webkit-transform: rotate(180deg); /* Safari 和 Chrome */
+            -o-transform: rotate(180deg); /* Opera */
+            transition: all 0.4s ease-in-out;
+          }
+        }
      }
    }
    .workbench-container {
@@ -779,16 +799,16 @@ export default {
    .el-tabs__header {
      .el-tabs__nav {
        .el-tabs__item {
-          background-color: #31455d;
+          background-color: #242f3b;
          border: 0px;
        }
        .el-tabs__item.is-active {
-          background-color: #263445;
+          background-color: #31455d;
        }
      }
    }
    .el-tabs__content {
-      background-color: #263445;
+      background-color: #242a30;
      height: calc(100vh - 39px);
      overflow-x: hidden;
      overflow-y: auto;
@@ -859,7 +879,7 @@ li {
  clear: both;
 }
 .nav li {
-  width: 40px;
+  width: 55px;
  text-align: center;
  position: relative;
 }
@@ -871,7 +891,7 @@ li {
  text-decoration: none;
 }
 .nav li:hover {
-  color: #6dc5ff;
+  color: #788994;
 }
 .nav li ul {
  visibility: hidden;
@@ -881,7 +901,7 @@ li {
  top: 38px;
  left: 0;
  padding: 0;
-  background-color: #263445;
+  background-color: rgb(36, 42, 48);
  opacity: 0;
  _margin: 0;
  width: 120px;
@@ -891,6 +911,9 @@ li {
  opacity: 1;
  visibility: visible;
  margin: 0;
+  li:hover {
+    background-color: rgb(25, 29, 34);
+  }
 }
 .nav ul li {
  float: left;
@@ -906,6 +929,7 @@ li {
  float: none;
  height: 120px;
  border: 1px solid #30445c;
+  background-color: rgb(25, 29, 34);
  transition: all 0.2s ease-in-out;
 }
 .nav ul a:hover {
@@ -921,7 +945,6 @@ li {
  height: 300px;
  overflow: auto;
  padding: 10px;
-  box-shadow: -1px 0 0 #30445c;
  _margin: 0;
 }
 .nav ul ul li {
@@ -931,4 +954,10 @@ li {
  display: block;
  float: left;
 }
+/deep/.vue-ruler-h {
+  opacity: 0.3;
+}
+/deep/.vue-ruler-v {
+  opacity: 0.3;
+}
 </style>
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -44,6 +44,21 @@ const screenConfig = {
        placeholder: '',
        value: '#000',
      },
+      {
+        type: 'el-select',
+        label: '刷新频率',
+        name: 'fontWeight',
+        required: false,
+        placeholder: '',
+        selectOptions: [
+          { code: '10', name: '10秒' },
+          { code: '30', name: '30秒' },
+          { code: '60', name: '1分' },
+          { code: '120', name: '2分' },
+          { code: '300', name: '5分' }
+        ],
+        value: '300'
+      },
      // {
      //   type: 'el-upload-picture',
      //   label: '背景图片',
@@ -4568,7 +4583,7 @@ const widgetTools = [
    code: 'widget-map',
    type: 'chart',
    label: '中国地图',
-    icon: 'chinaMapChart',
+    icon: 'iconzhongguoditu',
    options: {
      setup: [
        {
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetHollowPiechart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetHollowPiechart.vue
@@ -201,7 +201,7 @@ export default {
        }
      }
    },
-    dynamicDataFn(val) {
+    dynamicDataFn(val, refreshTime) {
      if (!val) return;
      if (this.ispreview) {
        this.getEchartData(val);
--- a/report-ui/src/views/report/report/index.vue
+++ b/report-ui/src/views/report/report/index.vue
@@ -140,14 +140,15 @@
               :model="dialogForm"
               :rules="rules"
               size="small"
+               style="min-height:200px"
               label-width="100px">
        <el-row :gutter="10">
-          <el-col :xs="24"
+          <!-- <el-col :xs="24"
                  :sm="20"
                  :md="6"
                  :lg="6"
-                  :xl="6">
-            <!-- <el-form-item label="报表类型">
+                  :xl="6"> -->
+          <!-- <el-form-item label="报表类型">
              <el-select v-model="dialogForm.reportType"
                         placeholder="报表类型"
                         clearable>
@@ -157,12 +158,12 @@
                           :value="item.id" />
              </el-select>
            </el-form-item> -->
-          </el-col>
+          <!-- </el-col> -->
          <el-col :xs="24"
                  :sm="20"
-                  :md="7"
-                  :lg="7"
-                  :xl="7">
+                  :md="12"
+                  :lg="12"
+                  :xl="12">
            <el-form-item label="名称"
                          prop="reportName">
              <el-input v-model="dialogForm.reportName" />
@@ -170,22 +171,22 @@
          </el-col>
          <el-col :xs="24"
                  :sm="20"
-                  :md="7"
-                  :lg="7"
-                  :xl="7">
+                  :md="12"
+                  :lg="12"
+                  :xl="12">
            <el-form-item label="报表编码"
                          prop="reportCode">
              <el-input v-model="dialogForm.reportCode" />
            </el-form-item>
          </el-col>
        </el-row>
-        <el-row>
+        <!-- <el-row>
          <el-col :xs="24"
                  :sm="20"
                  :md="6"
                  :lg="6"
                  :xl="6">
-            <!-- <el-form-item label="分组">
+            <el-form-item label="分组">
              <el-select v-model="dialogForm.reportGroup"
                         placeholder="请选择"
                         clearable>
@@ -194,9 +195,9 @@
                           :label="item.text"
                           :value="item.id" />
              </el-select>
-            </el-form-item> -->
+            </el-form-item>
          </el-col>
-        </el-row>
+        </el-row> -->
        <el-col :span="24">
          <el-form-item label="备注">
            <el-input v-model="dialogForm.reportDesc"