Merge remote-tracking branch 'origin/yichang' into yichang

src/router/index.js

@@ -261,7 +261,8 @@ const routes = [
 			{
 				path: '/manualMeter',
 				name: '人工计量录入',
-				component: manualMeter
+				component: manualMeter,
+				meta:{keepAlive: true}
 			},
 			{
 				path: '/runningJob',