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

report-ui/src/views/report/bigscreen/designer/index.vue

@@ -93,23 +93,6 @@
             </li>
           </ul>
         </span>
-        <span class="btn">
-          <ul class="nav">
-            <li><i class="el-icon-refresh"></i><i class="el-icon-arrow-down"></i>
-              <ul>
-                <li>
-                  <div><i class="el-icon-refresh-left mr10"></i>10秒</div>
-                </li>
-                <li>
-                  <div><i class="el-icon-refresh-left mr10"></i>60秒</div>
-                </li>
-                <li>
-                  <div><i class="el-icon-refresh-left mr10"></i>300秒</div>
-                </li>
-              </ul>
-            </li>
-          </ul>
-        </span>
       </div>
       <div class="workbench-container"
            :style="{
@@ -755,7 +738,7 @@ export default {
       margin-left: 9px;
       .btn {
         color: #788994;
-        width: 45px;
+        width: 55px;
         text-align: center;
         display: block;
         cursor: pointer;
@@ -820,7 +803,7 @@ export default {
           border: 0px;
         }
         .el-tabs__item.is-active {
-          background-color: #263445;
+          background-color: #31455d;
         }
       }
     }
@@ -896,7 +879,7 @@ li {
   clear: both;
 }
 .nav li {
-  width: 45px;
+  width: 55px;
   text-align: center;
   position: relative;
 }

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: '背景图片',