ly преди 2 години
родител
ревизия
94e095da7f

+ 0 - 1
master/src/main/java/com/ruoyi/project/statistics/controller/StatisticsController.java

@@ -103,7 +103,6 @@ public class StatisticsController extends BaseController {
             result.setXlcdCount(result.getPointCount());
 //            查询所有检测点的净检测值
             List<Statistics> countPfl = statisticsService.countPfl(statistics);
-
             resultList.add(getCountValue(countPfl, result));
         }
 

+ 8 - 8
ui/src/router/index.js

@@ -70,7 +70,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+        meta: {title: '首页', icon: 'dashboard', affix: true, noCache: true}
       }
     ]
   },
@@ -84,7 +84,7 @@ export const constantRoutes = [
         path: 'profile',
         component: () => import('@/views/system/user/profile/index'),
         name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
+        meta: {title: '个人中心', icon: 'user'}
       }
     ]
   }
@@ -102,7 +102,7 @@ export const dynamicRoutes = [
         path: 'role/:userId(\\d+)',
         component: () => import('@/views/system/user/authRole'),
         name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
+        meta: {title: '分配角色', activeMenu: '/system/user'}
       }
     ]
   },
@@ -116,7 +116,7 @@ export const dynamicRoutes = [
         path: 'user/:roleId(\\d+)',
         component: () => import('@/views/system/role/authUser'),
         name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
+        meta: {title: '分配用户', activeMenu: '/system/role'}
       }
     ]
   },
@@ -130,7 +130,7 @@ export const dynamicRoutes = [
         path: 'index/:dictId(\\d+)',
         component: () => import('@/views/system/dict/data'),
         name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
+        meta: {title: '字典数据', activeMenu: '/system/dict'}
       }
     ]
   },
@@ -144,7 +144,7 @@ export const dynamicRoutes = [
         path: 'index',
         component: () => import('@/views/monitor/job/log'),
         name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
+        meta: {title: '调度日志', activeMenu: '/monitor/job'}
       }
     ]
   },
@@ -158,7 +158,7 @@ export const dynamicRoutes = [
         path: 'index/:tableId(\\d+)',
         component: () => import('@/views/tool/gen/editTable'),
         name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
+        meta: {title: '修改生成配置', activeMenu: '/tool/gen'}
       }
     ]
   }
@@ -172,6 +172,6 @@ Router.prototype.push = function push(location) {
 
 export default new Router({
   mode: 'history', // 去掉url中的#
-  scrollBehavior: () => ({ y: 0 }),
+  scrollBehavior: () => ({y: 0}),
   routes: constantRoutes
 })

+ 1 - 1
ui/src/views/check/inspectionCheck/index.vue

@@ -72,7 +72,7 @@
                        width="100"/>
       <el-table-column label="完成率" align="center" width="250" prop="percentage">
         <template slot-scope="scope">
-          <el-progress :text-inside="true" :stroke-width="14" :percentage="scope.row.percentage"
+          <el-progress :text-inside="true" :stroke-width="30" :percentage="scope.row.percentage"
                        status="success"></el-progress>
         </template>
       </el-table-column>

+ 1 - 1
ui/src/views/check/repairCheck/index.vue

@@ -70,7 +70,7 @@
                        width="130"/>
       <el-table-column label="完成率" align="center" width="250" prop="percentage">
         <template slot-scope="scope">
-          <el-progress :text-inside="true" :stroke-width="14" :percentage="scope.row.percentage"
+          <el-progress :text-inside="true" :stroke-width="30" :percentage="scope.row.percentage"
                        status="success"></el-progress>
         </template>
       </el-table-column>

+ 1 - 1
ui/src/views/task/inspection/index.vue

@@ -122,7 +122,7 @@
                        width="100"/>
       <el-table-column label="完成率" align="center" width="250" prop="percentage">
         <template slot-scope="scope">
-          <el-progress :text-inside="true" :stroke-width="14" :percentage="scope.row.percentage"
+          <el-progress :text-inside="true" :stroke-width="30" :percentage="scope.row.percentage"
                        status="success"></el-progress>
         </template>
       </el-table-column>

+ 1 - 1
ui/src/views/task/repair/index.vue

@@ -120,7 +120,7 @@
                        width="130"/>
       <el-table-column label="完成率" align="center" width="250" prop="percentage">
         <template slot-scope="scope">
-          <el-progress :text-inside="true" :stroke-width="14" :percentage="scope.row.percentage"
+          <el-progress :text-inside="true" :stroke-width="30" :percentage="scope.row.percentage"
                        status="success"></el-progress>
         </template>
       </el-table-column>