Merge branch 'master' of http://118.178.128.178/Fedex/imac-vue

@@ -89,14 +89,14 @@ export const constantRoutes = [
       {
       {
         path: '/flightAllocConfig/:handle/:id',
         path: '/flightAllocConfig/:handle/:id',
         component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
         component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
-        name: 'Info',
-        meta: { title: '航班配舱', icon: 'user' }
+        name: 'flightAllocConfigInfo',
+        meta: { title: '航班配舱', icon: 'user', breadcrumb: true }
       },
       },
       {
       {
         path: '/flightAllocConfig/:handle',
         path: '/flightAllocConfig/:handle',
         component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
         component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
-        name: 'Add',
-        meta: { title: '添加航班配舱', icon: 'user' }
+        name: 'flightAllocConfigAdd',
+        meta: { title: '添加航班配舱', icon: 'user', breadcrumb: false }
       }
       }
     ]
     ]
   }
   }
@@ -106,4 +106,4 @@ export default new Router({
   mode: 'history', // 去掉url中的#
   mode: 'history', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
   routes: constantRoutes
-})
+})
\ No newline at end of file

@@ -34,7 +34,7 @@
       type="primary"
       type="primary"
       icon="el-icon-plus"
       icon="el-icon-plus"
       size="mini"
       size="mini"
-      @click="$router.push({ name: 'Add', params: { handle: 'add' } })"
+      @click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })"
       >添加</el-button
       >添加</el-button
     >
     >
     <el-table :data="flyList" v-loading="loading" size="small">
     <el-table :data="flyList" v-loading="loading" size="small">
@@ -171,7 +171,7 @@ export default {
     //跳转到查看，修改页面
     //跳转到查看，修改页面
     handleClick(flightiId, handle) {
     handleClick(flightiId, handle) {
       this.$router.push({
       this.$router.push({
-        name: "Info",
+        name: "flightAllocConfigInfo",
         params: { handle: handle, id: flightiId },
         params: { handle: handle, id: flightiId },
       });
       });
     },
     },
@@ -228,20 +228,24 @@ export default {
     this.getList();
     this.getList();
   },
   },
   filters: {
   filters: {
-    formatTimer: function (value) {
-      let date = new Date(value);
-      let y = date.getFullYear();
-      let MM = date.getMonth() + 1;
-      MM = MM < 10 ? "0" + MM : MM;
-      let d = date.getDate();
-      d = d < 10 ? "0" + d : d;
-      let h = date.getHours();
-      h = h < 10 ? "0" + h : h;
-      let m = date.getMinutes();
-      m = m < 10 ? "0" + m : m;
-      let s = date.getSeconds();
-      s = s < 10 ? "0" + s : s;
-      return y + "-" + MM + "-" + d + " " + h + ":" + m + ":" + s;
+    formatTimer: function (time) {
+
+      let time1 = new Date(time.replace(/-/g, '/').replace('T', ' ')).toISOString() // 转为国际标准化时间
+ 
+      return time1.split('T')[0] + " " + time1.split('T')[1].substring(0,8);
+      // let date = new Date(value);
+      // let y = date.getFullYear();
+      // let MM = date.getMonth() + 1;
+      // MM = MM < 10 ? "0" + MM : MM;
+      // let d = date.getDate();
+      // d = d < 10 ? "0" + d : d;
+      // let h = date.getHours();
+      // h = h < 10 ? "0" + h : h;
+      // let m = date.getMinutes();
+      // m = m < 10 ? "0" + m : m;
+      // let s = date.getSeconds();
+      // s = s < 10 ? "0" + s : s;
+      // return y + "-" + MM + "-" + d + " " + h + ":" + m + ":" + s;
     },
     },
   },
   },
 };
 };