优化代码

ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -1,51 +1,64 @@
- /**
+/**
- * 通用css样式布局处理
+* 通用css样式布局处理
- * Copyright (c) 2019 ruoyi
+* Copyright (c) 2019 ruoyi
- */
+*/
 
- /** 基础通用 **/
+/** 基础通用 **/
 .pt5 {
   padding-top: 5px;
 }
+
 .pr5 {
   padding-right: 5px;
 }
+
 .pb5 {
   padding-bottom: 5px;
 }
+
 .mt5 {
   margin-top: 5px;
 }
+
 .mr5 {
   margin-right: 5px;
 }
+
 .mb5 {
   margin-bottom: 5px;
 }
+
 .mb8 {
   margin-bottom: 8px;
 }
+
 .ml5 {
   margin-left: 5px;
 }
+
 .mt10 {
   margin-top: 10px;
 }
+
 .mr10 {
   margin-right: 10px;
 }
+
 .mb10 {
   margin-bottom: 10px;
 }
 .ml10 {
 	margin-left: 10px;
 }
+
 .mt20 {
   margin-top: 20px;
 }
+
 .mr20 {
   margin-right: 20px;
 }
+
 .mb20 {
   margin-bottom: 20px;
 }
@@ -85,6 +98,7 @@
       font-size: 13px;
     }
   }
+
   .el-table__body-wrapper {
     .el-button [class*="el-icon-"] + span {
       margin-left: 1px;
@@ -94,11 +108,11 @@
 
 /** 表单布局 **/
 .form-header {
-    font-size:15px;
+  font-size: 15px;
-	color:#6379bb;
+  color: #6379bb;
-	border-bottom:1px solid #ddd;
+  border-bottom: 1px solid #ddd;
-	margin:8px 10px 25px 10px;
+  margin: 8px 10px 25px 10px;
-	padding-bottom:5px
+  padding-bottom: 5px
 }
 
 /** 表格布局 **/
@@ -115,7 +129,7 @@
   margin-top: 5px;
   border: 1px solid #e5e6e7;
   background: #FFFFFF none;
-    border-radius:4px;
+  border-radius: 4px;
 }
 
 .pagination-container .el-pagination {
@@ -123,7 +137,7 @@
   position: absolute;
 }
 
-@media ( max-width : 768px) {
+@media (max-width: 768px) {
   .pagination-container .el-pagination > .el-pagination__jump {
     display: none !important;
   }
@@ -265,10 +279,10 @@
 }
 
 /* 拖拽列样式 */
-.sortable-ghost{
+.sortable-ghost {
   opacity: .8;
-	color: #fff!important;
+  color: #fff !important;
-	background: #42b983!important;
+  background: #42b983 !important;
 }
 
 .top-right-btn {

ruoyi-ui/src/components/FileUpload/index.vue

@@ -142,7 +142,7 @@ export default {
     // 上传失败
     handleUploadError(err) {
       this.$modal.msgError("上传文件失败，请重试");
-      this.$modal.closeLoading()
+      this.$modal.closeLoading();
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
@@ -174,10 +174,11 @@ export default {
     },
     // 获取文件名称
     getFileName(name) {
+      // 如果是url那么取最后的名字 如果不是直接返回
       if (name.lastIndexOf("/") > -1) {
         return name.slice(name.lastIndexOf("/") + 1);
       } else {
-        return "";
+        return name;
       }
     },
     // 对象转成指定字符串分隔

ruoyi-ui/src/components/TopNav/index.vue

@@ -5,13 +5,12 @@
     @select="handleSelect"
   >
     <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
+      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
-        ><svg-icon
+        <svg-icon
         v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
-          :icon-class="item.meta.icon"
+        :icon-class="item.meta.icon"/>
-        />
+        {{ item.meta.title }}
-        {{ item.meta.title }}</el-menu-item
+      </el-menu-item>
-      >
     </template>
 
     <!-- 顶部菜单超出数量折叠 -->
@@ -21,10 +20,12 @@
         <el-menu-item
           :index="item.path"
           :key="index"
-          v-if="index >= visibleNumber"
+          v-if="index >= visibleNumber">
-          ><svg-icon :icon-class="item.meta.icon" />
+          <svg-icon
-          {{ item.meta.title }}</el-menu-item
+            v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
-        >
+            :icon-class="item.meta.icon"/>
+          {{ item.meta.title }}
+        </el-menu-item>
       </template>
     </el-submenu>
   </el-menu>

ruoyi-ui/src/views/dashboard/BarChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import * as echarts from 'echarts';
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 

ruoyi-ui/src/views/dashboard/LineChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import * as echarts from 'echarts';
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 

ruoyi-ui/src/views/dashboard/PieChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import * as echarts from 'echarts';
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 

ruoyi-ui/src/views/dashboard/RaddarChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import * as echarts from 'echarts';
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 

ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -160,7 +160,7 @@
     />
 
     <!-- 操作日志详细 -->
-    <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog title="操作日志详细" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
@@ -182,7 +182,7 @@
           <el-col :span="24">
             <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="操作状态：">
               <div v-if="form.status === 0">正常</div>
               <div v-else-if="form.status === 1">失败</div>
@@ -191,7 +191,7 @@
           <el-col :span="8">
             <el-form-item label="消耗时间：">{{ form.costTime }}毫秒</el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="8">
             <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
           </el-col>
           <el-col :span="24">