大屏logo

report-ui/src/assets/styles/index.scss

@@ -280,4 +280,4 @@ a:hover {
     color: #bfcbd9!important;
     font-weight: normal !important;
   }
-}
+}

report-ui/src/assets/styles/sidebar.scss

@@ -55,10 +55,14 @@
   }
   .hideSidebar {
     .sidebar-container {
-      width: 36px !important;
+      width: 56px !important;
+      .iconfont {
+        font-size: 24px;
+        margin-left: 5px;
+      }
     }
     .main-container {
-      margin-left: 36px;
+      margin-left:56px;
     }
     .submenu-title-noDropdown {
       padding-left: 10px !important;

report-ui/src/views/layout/components/AppMain.vue

@@ -29,5 +29,6 @@ export default {
   height: calc(100vh - 50px);
   position: relative;
   overflow: auto;
+  background: #f5f8fa;
 }
 </style>

report-ui/src/views/layout/components/Sidebar/index.vue

@@ -2,7 +2,9 @@
   <el-scrollbar wrap-class="scrollbar-wrapper">
     <div class="admin-title"
          @click="goBigScreen">
-      <b>在线大屏</b>
+      <img src="../../../../../static/logo-dp.png"
+           width="50"
+           class="mt10" />
     </div>
     <el-menu :show-timeout="200"
              :default-active="$route.path"

report-ui/src/views/login.vue

@@ -72,7 +72,7 @@
                           @keyup.native="checkCapslock" />
                 <span class="show_pwd"
                       @click="showPwd">
-                  查看
+                  <i class="el-icon-view" />
                 </span>
               </el-form-item>
             </el-tooltip>

report-ui/src/views/report/datasource/index.vue

@@ -77,7 +77,7 @@
     <!--表格渲染-->
     <el-table v-loading="listLoading"
               border
-              :data="list"
+              :data="list" class="mt10"
               element-loading-text="Loading"
               style="width: 100%">
       <el-table-column align="center"
@@ -366,7 +366,12 @@ export default {
       this.dialogForm.sourceConfig = JSON.stringify(newList)
       testConnection(this.dialogForm).then((data) => {
         if (data.code == '200') {
-          this.testReplyCode = data.code
+          this.testReplyCode = data.code;
+          this.$message({
+            message: '测试成功！',
+            type: 'success'
+          });
+
         } else {
           this.testReplyCode = null
         }

report-ui/src/views/report/resultset/index.vue

@@ -260,7 +260,7 @@
                               <!-- //自定义高级规则？ -->
                               <codemirror v-model.trim="transformScript"
                                           :options="optionsJavascript"
-                                          style="height:290px" />
+                                          style="height:190px" />
                             </div>
                           </div>
                           <div v-else>
@@ -889,12 +889,6 @@ export default {
     height: 400px !important;
   }
 }
-.codemirror {
-  width: 100%;
-  height: 200px;
-  margin: 0;
-  overflow: auto;
-}
 .title {
   width: 100%;
   display: inline-block;