时间字段修改

PHM-admin/phm-netty/src/main/java/com/phm/netty/client/handler/NettyUdpClientHandler.java

@@ -46,7 +46,7 @@ public class NettyUdpClientHandler extends SimpleChannelInboundHandler<DatagramP
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket packet) throws Exception {
         // 通过ResourceUtil获取资源
-        String data = ResourceUtil.readUtf8Str("data/output.json");
+        String data = ResourceUtil.readUtf8Str("data/origin.json");
         // TODO 这里测试数据
         Message message = new Message();
         message.setType(OrderEnum.ORDER_CONFIG.getType()).setTarget("GPHM").setSource("SPHM")

PHM-web/src/router/index.js

@@ -136,7 +136,7 @@ export const dynamicRoutes = [
     ]
   },
   {
-    path: '/manage/integratedDataManage/sortie',
+    path: '/manage/sortie',
     component: Layout,
     hidden: true,
     permissions: ['manage:sortie:edit'],

PHM-web/src/views/manage/sortie/dataPlayBack.vue

@@ -101,13 +101,13 @@ export default {
         })
         return keys
       }, [])
-      this.showParamsKey = allKeys.filter(item => item !== '时间');
+      this.showParamsKey = allKeys.filter(item => item !== 'Time');
       this.times = this.parameterData.map(
-        item => item[allKeys.find(key => key.includes('时间'))]
+        item => item[allKeys.find(key => key.includes('Time'))]
       )
       // 获取其他数据列
       this.series = allKeys
-        .filter(key => !key.includes('时间'))
+        .filter(key => !key.includes('Time'))
         .map(name => ({
           name: name,
           type: 'line',
@@ -177,7 +177,7 @@ export default {
       this.option.xAxis.data = xAxisData;
       this.option.series.forEach(serie => {
         serie.data = this.parameterData.filter(item => {
-          const timestamp = new Date(item['时间']).getTime();
+          const timestamp = new Date(item['Time']).getTime();
           return timestamp >= startTime && timestamp <= endTime;
         }).map(item => parseFloat(item[serie.name]));
       });

PHM-web/src/views/manage/sortie/index.vue

@@ -47,12 +47,18 @@
     <el-table v-loading="loading" border :data="sortieList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="机号" align="center" prop="aircraftNumber" />
-      <el-table-column label="架次号" align="center" prop="sortieNumber">
+      <!-- <el-table-column label="架次号" align="center" prop="sortieNumber">
         <template slot-scope="scope">
           <el-button @click.native.prevent="detail(scope.row)" type="success" plain :span="1.5" size="mini">
             {{ scope.row.sortieNumber }}
           </el-button>
         </template>
+      </el-table-column> -->
+      <el-table-column label="架次号" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="detail(scope.row)"
+            v-hasPermi="['manage:sortie:edit']">{{ scope.row.sortieNumber }}</el-button>
+        </template>
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
@@ -324,11 +330,7 @@ export default {
     // 架次详情
     detail(row) {
       const sortieId = row.id
-      this.$router.push({
-        name: 'SortieDetail',
-        params: {
-          id: sortieId,
-        },
+      this.$router.push({path: '/manage/sortie/sortieDetail/' + sortieId
       })
     },
     /** 下载模板操作 */

PHM-web/src/views/manage/sortie/selectParameters.vue

@@ -47,7 +47,7 @@ export default {
       loading: true,
       // 判断选择参数为空时
       isDisable:true,
-      value:['时间'],
+      value:['Time'],
       // 最后选择的参数
       selectData:[],
       dialogVisible: false,

PHM-web/src/views/manage/sortie/sortieDetail.vue

@@ -34,7 +34,7 @@ export default {
   },
   methods: {
     init(){
-      this.sortieId=this.$route.params.id
+      this.sortieId=this.$route.params.sortieId
       getSortie(this.sortieId).then(response => {
         this.sortieDetail=response.data
       })