Merge branch 'develop' of http://47.108.150.237:10000/allen/gphm into develop-rmd

PHM-admin/phm-admin/src/main/resources/application-local.yml

@@ -4,6 +4,13 @@ easy-es:
   username: #es用户名,若无则删去此行配置
   password: #es密码,若无则删去此行配置
 # 数据源配置
+udp:
+  airborne:
+    host: 127.0.0.1
+    port: 19000
+  simulation:
+    host: 127.0.0.1
+    port: 1900
 spring:
   redis:
     host: localhost

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/SortieController.java

@@ -8,6 +8,7 @@ import com.phm.common.core.page.TableDataInfo;
 import com.phm.common.enums.BusinessType;
 import com.phm.common.utils.poi.ExcelUtil;
 import com.phm.manage.domain.Sortie;
+import com.phm.manage.service.ISortieParameterService;
 import com.phm.manage.service.ISortieService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/SortieParameterController.java

@@ -1,14 +1,30 @@
 package com.phm.manage.controller;
 
-import com.phm.manage.service.ISortieParameterService;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.phm.manage.domain.dto.DataParameterRequest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.phm.common.annotation.Log;
+import com.phm.common.core.controller.BaseController;
+import com.phm.common.core.domain.AjaxResult;
+import com.phm.common.core.page.TableDataInfo;
+import com.phm.common.enums.BusinessType;
+import com.phm.common.utils.poi.ExcelUtil;
 import com.phm.manage.domain.SortieParameter;
 import com.phm.manage.domain.common.CommonResult;
+import com.phm.manage.service.ISortieParameterService;
 
 /**
  * @Description SortieParameterController
@@ -17,13 +33,93 @@ import com.phm.manage.domain.common.CommonResult;
  */
 @RestController
 @RequestMapping("/manage/sortieParameter")
-public class SortieParameterController {
+public class SortieParameterController extends BaseController {
 
     @Autowired
     private ISortieParameterService sortieParameterService;
 
-    @GetMapping(value = "/{id}")
+    @GetMapping(value = "data/{id}")
     public CommonResult<String> getSortieData(@PathVariable("id") Long id) {
         return CommonResult.success(sortieParameterService.getSortieData(id));
     }
+
+    /**
+     * 查询模型参数信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:sortieParameter:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SortieParameter sortieParameter) {
+        startPage();
+        List<SortieParameter> list = sortieParameterService.selectSortieParameterList(sortieParameter);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出模型参数信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:sortieParameter:export')")
+    @Log(title = "模型参数信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SortieParameter sortieParameter) {
+        List<SortieParameter> list = sortieParameterService.selectSortieParameterList(sortieParameter);
+        ExcelUtil<SortieParameter> util = new ExcelUtil<SortieParameter>(SortieParameter.class);
+        util.exportExcel(response, list, "模型参数信息数据");
+    }
+
+    /**
+     * 获取模型参数信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:sortieParameter:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(sortieParameterService.selectSortieParameterById(id));
+    }
+
+    /**
+     * 新增模型参数信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:sortieParameter:add')")
+    @Log(title = "模型参数信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SortieParameter sortieParameter) {
+        return toAjax(sortieParameterService.insertSortieParameter(sortieParameter));
+    }
+
+    /**
+     * 修改模型参数信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:sortieParameter:edit')")
+    @Log(title = "模型参数信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SortieParameter sortieParameter) {
+        return toAjax(sortieParameterService.updateSortieParameter(sortieParameter));
+    }
+
+    /**
+     * 删除模型参数信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:sortieParameter:remove')")
+    @Log(title = "模型参数信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(sortieParameterService.deleteSortieParameterByIds(ids));
+    }
+
+    /**
+     * 根据架次号获取全部数据
+     */
+    @PreAuthorize("@ss.hasPermi('manage:sortieParameter:query')")
+    @PostMapping("/dataByName")
+    public CommonResult<String> getData(@RequestBody DataParameterRequest request) {
+        return CommonResult.success(sortieParameterService.getSortieDataByName(request));
+    }
+
+    /**
+     * 根据架次号获取参数名称
+     */
+    @PreAuthorize("@ss.hasPermi('manage:sortieParameter:query')")
+    @GetMapping(value = "/dataName/{sortieNumber}")
+    public CommonResult<List<String>> getDataName(@PathVariable("sortieNumber") String sortieNumber) {
+        return CommonResult.success(sortieParameterService.getSortieDataNameByNo(sortieNumber));
+    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/SortieParameter.java

@@ -35,6 +35,9 @@ public class SortieParameter extends BaseEntity {
     /** 数据类型 */
     private Integer type;
 
+    /** 数据源 */
+    private Integer source;
+
     /** 参数数据路径 */
     @Excel(name = "参数数据路径")
     private String dataPath;

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/dto/DataParameterRequest.java

@@ -0,0 +1,20 @@
+package com.phm.manage.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description modelRequest
+ * @Author WGK
+ * @Date 2023/11/22 16:56
+ */
+@Data
+public class DataParameterRequest {
+    // 架次号
+    private String sortieNo;
+
+    // 批次号
+    private List<String> parameters;
+
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/SortieParameterMapper.java

@@ -57,4 +57,6 @@ public interface SortieParameterMapper {
      * @return 结果
      */
     public int deleteSortieParameterByIds(Long[] ids);
+
+    SortieParameter selectSortieParameter(SortieParameter sortieParameter);
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/ISortieParameterService.java

@@ -1,6 +1,7 @@
 package com.phm.manage.service;
 
 import com.phm.manage.domain.SortieParameter;
+import com.phm.manage.domain.dto.DataParameterRequest;
 
 import java.util.List;
 
@@ -59,4 +60,8 @@ public interface ISortieParameterService {
     public int deleteSortieParameterById(Long id);
 
     String getSortieData(Long id);
+
+    String getSortieDataByName(DataParameterRequest parameterRequest);
+
+    List<String> getSortieDataNameByNo(String no);
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/SortieParameterService.java

@@ -2,7 +2,11 @@ package com.phm.manage.service.impl;
 
 import java.util.List;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONArray;
+import com.phm.common.exception.GlobalException;
+import com.phm.manage.domain.dto.DataParameterRequest;
+import com.phm.manage.enums.DataTypeEnum;
 import com.phm.manage.util.CsvUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -100,4 +104,28 @@ public class SortieParameterService implements ISortieParameterService {
         SortieParameter sortieParameter = sortieParameterMapper.selectSortieParameterById(id);
         return CsvUtils.fileCsvToJson(sortieParameter.getDataPath()).toString();
     }
+
+    @Override
+    public String getSortieDataByName(DataParameterRequest request) {
+        SortieParameter parameter = new SortieParameter();
+        parameter.setSortieNo(request.getSortieNo());
+        parameter.setType(DataTypeEnum.SOURCE_DATA.getType());
+        parameter = sortieParameterMapper.selectSortieParameter(parameter);
+        if (ObjectUtil.isEmpty(parameter)) {
+            throw new GlobalException("此架次无数据");
+        }
+        return String.valueOf(CsvUtils.getCsvDataByHeaders(parameter.getDataPath(), request.getParameters()));
+    }
+
+    @Override
+    public List<String> getSortieDataNameByNo(String no) {
+        SortieParameter parameter = new SortieParameter();
+        parameter.setSortieNo(no);
+        parameter.setType(DataTypeEnum.SOURCE_DATA.getType());
+        parameter = sortieParameterMapper.selectSortieParameter(parameter);
+        if (ObjectUtil.isEmpty(parameter)) {
+            throw new GlobalException("此架次无数据");
+        }
+        return CsvUtils.getCsvHeaders(parameter.getDataPath());
+    }
 }

PHM-admin/phm-manage/src/main/resources/mapper/manage/SortieParameterMapper.xml

@@ -9,6 +9,7 @@
         <result property="sortieNo"    column="SORTIE_NO"    />
         <result property="batchNo"    column="BATCH_NO"    />
         <result property="type"    column="TYPE"    />
+        <result property="source"    column="SOURCE"    />
         <result property="dataPath"    column="DATA_PATH"    />
         <result property="isDelete"    column="IS_DELETE"    />
         <result property="createBy"    column="CREATE_BY"    />
@@ -22,6 +23,7 @@
                SORTIE_NO,
                BATCH_NO,
                TYPE,
+               SOURCE,
                DATA_PATH,
                IS_DELETE,
                CREATE_BY,
@@ -38,6 +40,7 @@
             <if test="sortieNo != null  and sortieNo != ''"> and SORTIE_NO = #{sortieNo}</if>
             <if test="batchNo != null  and batchNo != ''"> and BATCH_NO like concat('%', #{batchNo}, '%')</if>
             <if test="type != null "> and TYPE = #{type}</if>
+            <if test="source != null "> and SOURCE = #{source}</if>
             <if test="dataPath != null  and dataPath != ''"> and DATA_PATH = #{dataPath}</if>
             <if test="isDelete != null "> and IS_DELETE = #{isDelete}</if>
             <if test="createBy != null  and createBy != ''"> and CREATE_BY = #{createBy}</if>
@@ -47,6 +50,20 @@
         </where>
     </select>
 
+    <select id="selectSortieParameter" parameterType="SortieParameter"
+            resultMap="SortieParameterResult">
+        <include refid="selectSortieParameterVo"/>
+        <where>
+            <if test="id != null "> and ID = #{id}</if>
+            <if test="sortieNo != null  and sortieNo != ''"> and SORTIE_NO = #{sortieNo}</if>
+            <if test="batchNo != null  and batchNo != ''"> and BATCH_NO like concat('%', #{batchNo}, '%')</if>
+            <if test="type != null "> and TYPE = #{type}</if>
+            <if test="source != null "> and SOURCE = #{source}</if>
+            <if test="dataPath != null  and dataPath != ''"> and DATA_PATH = #{dataPath}</if>
+            LIMIT 1
+        </where>
+    </select>
+
     <select id="selectSortieParameterById" parameterType="Long" resultMap="SortieParameterResult">
         <include refid="selectSortieParameterVo"/>
         where ID = #{id}
@@ -59,6 +76,7 @@
             <if test="sortieNo != null">SORTIE_NO,</if>
             <if test="batchNo != null">BATCH_NO,</if>
             <if test="type != null">TYPE,</if>
+            <if test="source != null">SOURCE,</if>
             <if test="dataPath != null">DATA_PATH,</if>
             <if test="isDelete != null">IS_DELETE,</if>
             <if test="createBy != null">CREATE_BY,</if>
@@ -70,7 +88,8 @@
             <if test="id != null">#{id},</if>
             <if test="sortieNo != null">#{sortieNo},</if>
             <if test="batchNo != null">#{batchNo},</if>
-            <if test="type != null">#{TYPE},</if>
+            <if test="type != null">#{type},</if>
+            <if test="source != null">#{source},</if>
             <if test="dataPath != null">#{dataPath},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -85,7 +104,8 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="sortieNo != null">SORTIE_NO = #{sortieNo},</if>
             <if test="batchNo != null">BATCH_NO = #{batchNo},</if>
-            <if test="type != null">BATCH_NO = #{TYPE},</if>
+            <if test="type != null">TYPE = #{TYPE},</if>
+            <if test="source != null">SOURCE = #{source},</if>
             <if test="dataPath != null">DATA_PATH = #{dataPath},</if>
             <if test="isDelete != null">IS_DELETE = #{isDelete},</if>
             <if test="createBy != null">CREATE_BY = #{createBy},</if>

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

@@ -2,6 +2,7 @@ package com.phm.netty.client;
 
 import java.net.InetSocketAddress;
 
+import com.phm.netty.domain.UdpRequest;
 import org.springframework.stereotype.Component;
 
 import com.phm.common.exception.GlobalException;
@@ -28,7 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @Component
 public class NettyUdpClient {
-    public void bind(String address, int port, byte[] data, String customValue) {
+    public void bind(String address, int port, byte[] data, UdpRequest request) {
         EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
         try {
             Bootstrap clientBootstrap = new Bootstrap();
@@ -37,13 +38,13 @@ public class NettyUdpClient {
                     @Override
                     protected void initChannel(NioDatagramChannel ch) {
                         // 使用 AttributeKey 定义一个键
-                        final AttributeKey<String> key = AttributeKey.valueOf("customKey");
+                        final AttributeKey<UdpRequest> key = AttributeKey.valueOf("customKey");
 
                         // 获取 Channel 的 Attribute
-                        Attribute<String> attr = ch.attr(key);
+                        Attribute<UdpRequest> attr = ch.attr(key);
 
                         // 设置自定义值
-                        attr.set(customValue);
+                        attr.set(request);
 
                         // 在这里添加你的处理器
                         ch.pipeline().addLast(new NettyUdpClientHandler());
@@ -58,7 +59,7 @@ public class NettyUdpClient {
             // 方式er：原地等候返回消息，再关闭连接
             channel.closeFuture().sync();
         } catch (Exception e) {
-            log.error(e.getMessage());
+            log.error("异常{}", e.getMessage());
             throw new GlobalException("在线下载数据异常，请重新下载");
         } finally {
             log.info("netty client udp close!");

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

@@ -4,16 +4,17 @@ import java.util.List;
 
 import javax.annotation.PostConstruct;
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.CharsetUtil;
-import com.phm.netty.enums.OrderEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.phm.common.exception.GlobalException;
 import com.phm.netty.domain.Message;
+import com.phm.netty.domain.UdpRequest;
+import com.phm.netty.enums.OrderEnum;
 import com.phm.netty.service.IProcessService;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.CharsetUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.channel.ChannelHandler;
@@ -44,14 +45,15 @@ public class NettyUdpClientHandler extends SimpleChannelInboundHandler<DatagramP
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket packet) throws Exception {
-        String data =
-        FileUtil.readString("D:\\phm\\dataPath\\参数数据.json", CharsetUtil.CHARSET_UTF_8);
+        String data = FileUtil.readString("D:\\phm\\dataPath\\参数数据.json", CharsetUtil.CHARSET_UTF_8);
         // TODO 这里测试数据
         Message message = new Message();
         message.setType(OrderEnum.ORDER_CONFIG.getType()).setTarget("GPHM").setSource("SPHM")
-        .setData("{\"cmdId\": \"getConfig\", \"params\":" + data + "}");
-        // 获取自定义值
-        String sortieNo = ctx.channel().attr(AttributeKey.valueOf("customKey")).get().toString();
+            .setData("{\"cmdId\": \"getConfig\", \"params\":" + data + "}");
+
+        // 获取自定义属性
+        UdpRequest request = (UdpRequest) ctx.channel().attr(AttributeKey.valueOf("customKey")).get();
+        // String sortieNo = ctx.channel().attr(AttributeKey.valueOf("customKey")).get().toString();
         final ByteBuf buf = packet.content();
         try {
             log.info("channelId---:{}", ctx.channel().id().toString());
@@ -63,7 +65,7 @@ public class NettyUdpClientHandler extends SimpleChannelInboundHandler<DatagramP
                 return;
             }
             // 处理数据
-            List<String> list = nettyUdpClientHandler.processService.handleData(msg, sortieNo);
+            List<String> list = nettyUdpClientHandler.processService.handleData(msg, request);
             ctx.close();
         } catch (Exception e) {
             log.error("channelRead=={}", e.getMessage());

PHM-admin/phm-netty/src/main/java/com/phm/netty/controller/NettyUdpClientController.java

@@ -1,6 +1,8 @@
 package com.phm.netty.controller;
 
+import com.phm.netty.domain.UdpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,19 +27,34 @@ public class NettyUdpClientController extends BaseController {
     @Autowired
     private NettyUdpClient udpClient;
 
+    @Value("${udp.simulation.port}")
+    private Integer simulationPort;
+
+    @Value("${udp.simulation.host}")
+    private String simulationHost;
+
+    @Value("${udp.airborne.port}")
+    private Integer airbornePort;
+
+    @Value("${udp.airborne.host}")
+    private String airborneHost;
+
     /**
      * 获取数链仿真系统数据
      *
      * @return res
      */
-    @GetMapping("/simulation")
-    public CommonResult<String> getSimulationInfo() {
-        // TODO 这里差入参需要确定
+    @GetMapping("/simulation/{sortieNo}")
+    public CommonResult<String> getSimulationInfo(@PathVariable("sortieNo") String sortieNo) {
+        // TODO 需要确定参数
         Message message = new Message();
         message.setType(OrderEnum.ORDER_CONFIG.getType()).setTarget("GPHM").setSource("SPHM")
             .setData("{\"cmdId\": \"getConfig\"}");
+        UdpRequest request = new UdpRequest();
+        request.setSortieNo(sortieNo);
+        request.setSourceType(0);
         // udp客户端，向服务端发送获取数据请求服务
-        udpClient.bind("127.0.0.1", 19000, Message.msgToBytes(message), "JC01");
+        udpClient.bind("127.0.0.1", 19000, Message.msgToBytes(message), request);
         return CommonResult.buildSuccess();
     }
 
@@ -52,8 +69,12 @@ public class NettyUdpClientController extends BaseController {
         Message message = new Message();
         message.setType(OrderEnum.ORDER_CONFIG.getType()).setTarget("GPHM").setSource("SPHM").setData(
             "{\"cmdId\": \"getConfig\", \"params\": [{\"参数一\":0.1079,\"参数三\":0.6007,\"参数二\":0.0116,\"参数五\":0.0689,\"参数四\":1.1915,\"时间\":\"2022/6/3013:08\"},{\"参数一\":0.8088,\"参数三\":2.9169,\"参数二\":0.6541,\"参数五\":0.6229,\"参数四\":5.5326,\"时间\":\"2022/6/3013:09\"},\t{\"参数一\":0.9088,\"参数三\":2.7169,\"参数二\":0.0541,\"参数五\":0.4229,\"参数四\":3.5326,\"时间\":\"2022/6/3013:10\"}]}");
+
+        UdpRequest request = new UdpRequest();
+        request.setSortieNo(sortieNo);
+        request.setSourceType(1);
         // udp客户端，向服务端发送获取数据请求服务
-        udpClient.bind("127.0.0.1", 19000, Message.msgToBytes(message), sortieNo);
+        udpClient.bind(airborneHost, airbornePort, Message.msgToBytes(message), request);
         return CommonResult.buildSuccess();
     }
 }

PHM-admin/phm-netty/src/main/java/com/phm/netty/domain/UdpRequest.java

@@ -0,0 +1,15 @@
+package com.phm.netty.domain;
+
+import lombok.Data;
+
+/**
+ * @Description UdpRequest
+ * @Author WGK
+ * @Date 2023/12/5 9:30
+ */
+@Data
+public class UdpRequest {
+    private String sortieNo;
+
+    private Integer sourceType;
+}

PHM-admin/phm-netty/src/main/java/com/phm/netty/service/IProcessService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.phm.manage.domain.OrderConfig;
 import com.phm.netty.domain.Message;
+import com.phm.netty.domain.UdpRequest;
 
 /**
  * @Description IProcessService
@@ -42,9 +43,9 @@ public interface IProcessService {
      * 解析Data
      *
      * @param message message
-     * @param customValue customValue
+     * @param request request
      * @return res
      * @throws Exception ex
      */
-    List<String> handleData(Message message, String customValue) throws Exception;
+    List<String> handleData(Message message, UdpRequest request) throws Exception;
 }

PHM-admin/phm-netty/src/main/java/com/phm/netty/service/impl/ProcessService.java

@@ -6,6 +6,7 @@ import java.util.List;
 import cn.hutool.core.util.ObjectUtil;
 import com.phm.manage.domain.Sortie;
 import com.phm.manage.enums.DataTypeEnum;
+import com.phm.netty.domain.UdpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -113,11 +114,12 @@ public class ProcessService implements IProcessService {
     }
 
     @Override
-    public List<String> handleData(Message message, String sortieNo) throws Exception {
+    public List<String> handleData(Message message, UdpRequest request) throws Exception {
         JSONObject jsonObject = JSONUtil.parseObj(message.getData());
         short type = message.getType();
         log.info("msg---:{}", message);
         String dataJson = "";
+        String sortieNo = request.getSortieNo();
 
         // 数链仿真系统获取数据
         if (OrderEnum.SIMULATION.getType() != type) {
@@ -137,7 +139,7 @@ public class ProcessService implements IProcessService {
         CsvUtils.jsonToFileCsv(dataJson, parameterDataPath);
         SortieParameter parameter = new SortieParameter();
         parameter.setDataPath(parameterDataPath).setSortieNo(sortieNo).setBatchNo(IdUtil.getSnowflakeNextIdStr())
-                .setType(DataTypeEnum.SOURCE_DATA.getType());
+                .setType(DataTypeEnum.SOURCE_DATA.getType()).setSource(request.getSourceType());
         sortieParameterService.insertSortieParameter(parameter);
         Sortie sortie = sortieService.selectSortieByNumber(sortieNo);
         // 新增架次信息

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

@@ -30,13 +30,13 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="afterAnalysisResultList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="afterAnalysisResultList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="SNS编码" align="center" prop="SNSCode" />
       <el-table-column label="硬件信息" align="center" prop="HardwareInfo" />
       <el-table-column label="软件信息" align="center" prop="SoftwareInfo" />
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -105,7 +105,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-         
+
       };
       this.resetForm("form");
     },

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

@@ -36,7 +36,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="aircraftList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="aircraftList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="机号" align="center" prop="number" />

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

@@ -61,9 +61,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="analyzeCourseLogList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="analyzeCourseLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="模块功能名称" align="center" prop="moduleName" />
       <el-table-column label="模块功能类型" align="center" prop="moduleType" />
       <el-table-column label="过程日志" align="center" prop="courseContent" />
@@ -87,7 +87,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-       
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -78,14 +78,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="analyzeDownLogList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="analyzeDownLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="文件名称" align="center" prop="name" />
       <el-table-column label="保存路径" align="center" prop="path" />
       <el-table-column label="状态数据" align="center" prop="status" />
       <el-table-column label="故障数据" align="center" prop="fault" />
-       
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -105,7 +105,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -126,7 +126,7 @@
         <el-form-item label="故障数据" prop="fault">
           <el-input v-model="form.fault" placeholder="请输入故障数据" />
         </el-form-item>
-          
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -169,7 +169,7 @@ export default {
         path: null,
         status: null,
         fault: null,
-         
+
       },
       // 表单参数
       form: {},
@@ -204,7 +204,7 @@ export default {
         path: null,
         status: null,
         fault: null,
-         
+
       };
       this.resetForm("form");
     },

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

@@ -37,14 +37,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="analyzeResultList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="analyzeResultList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="源数据文件名称" align="center" prop="sourceName" />
       <el-table-column label="解析后文件名称" align="center" prop="name" />
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="解析后结果列表" align="center" />
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -115,7 +115,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-         
+
       },
       // 表单参数
       form: {},
@@ -157,7 +157,7 @@ export default {
       this.form = {
         name: null,
         remark: null
-         
+
       };
       this.resetForm("form");
     },

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

@@ -15,7 +15,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataDownList" border @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="dataDownList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="批次" align="center" prop="batchNo" />
       <!-- <el-table-column label="机型" align="center" prop="airType" />

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

@@ -86,7 +86,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deepIsolationModelList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="deepIsolationModelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="模型名称" align="center" prop="modelName" />
       <el-table-column label="模型Url" align="center" prop="modelUrl" />
@@ -105,7 +105,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -62,12 +62,12 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deriveParameterList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="deriveParameterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="参数名称" align="center" prop="name" />
       <el-table-column label="表达式文件" align="center" prop="expression" />
-       
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -80,7 +80,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -48,7 +48,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="diagnoseResultList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="diagnoseResultList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="故障模式" align="center" prop="faultMode" />
       <el-table-column label="故障对象" align="center" prop="faultObject" />

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

@@ -77,9 +77,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="externalInterfaceLogList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="externalInterfaceLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="接口结果" align="center" prop="result" />
       <el-table-column label="接口名称" align="center" prop="name" />
       <el-table-column label="接口路径" align="center" prop="url" />
@@ -102,7 +102,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -86,14 +86,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="falseAlarmRestrainModelList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="falseAlarmRestrainModelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="模型名称" align="center" prop="modelName" />
       <el-table-column label="模型Url" align="center" prop="modelUrl" />
       <el-table-column label="故障代码" align="center" prop="code" />
       <el-table-column label="抑制判据" align="center" prop="restrainCriteria" />
       <el-table-column label="最少持续时间" align="center" prop="minDuration" />
-       
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -106,7 +106,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -116,9 +116,8 @@
     />
 
     <!-- 添加或修改虚警抑制模型对话框 -->
-    <el-dialog :title="title" class="myDialog" :visible.sync="open" width="80vw" :close-on-click-modal="false" append-to-body>
-      <el-divider content-position="left">模型信息</el-divider>
-      <el-form ref="form" :model="form" :rules="rules" label-width="68px">
+    <el-dialog :title="title" :visible.sync="open" width="80vw" :close-on-click-modal="false" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="80">
           <el-col :span="10">
             <el-form-item label="模型名称" prop="modelName">
@@ -144,11 +143,14 @@
           </el-col>
         </el-row>
         <el-row  :gutter="80">
-          <el-col :span="12">
+          <el-col :span="10">
             <el-form-item label="最少持续时间" prop="minDuration" label-width="100px">
               <el-input v-model="form.minDuration" placeholder="请输入最少持续时间" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-divider content-position="left">模型信息</el-divider>
+        <el-row  :gutter="80">
           <el-col :span="12">
             <el-form-item>
               <el-button @click="addModelForms" icon="el-icon-plus"></el-button>
@@ -159,7 +161,7 @@
           v-for="(item, index) in form.modelParams"
           :key="item.uniqueMark"
           :prop="'modelParams.' + index + '.value'"
-          label-width="30px"
+          label-width="100px"
         >
           <div class="dynamicAdd">
             <el-input v-model="item.key" style="width: 200px" placeholder="请输入模型属性"></el-input>
@@ -175,7 +177,7 @@
             <el-button @click.prevent="removeModelForm(item)" icon="el-icon-minus" style="marginLeft:20px; border:none"></el-button>
           </div>
         </el-form-item>
-        <el-divider content-position="left" style="marginTop:20px;">数据信息</el-divider>
+        <el-divider content-position="left" >数据信息</el-divider>
         <el-form-item>
           <el-button @click="addDataForms" icon="el-icon-plus"></el-button>
         </el-form-item>
@@ -183,7 +185,7 @@
           v-for="(item, index) in form.dataParams"
           :key="item.uniqueMark"
           :prop="'dataParams.' + index + '.value'"
-          label-width="30px"
+          label-width="100px"
         >
           <div class="dynamicAdd">
             <el-input v-model="item.key" style="width: 200px" placeholder="请输入模型属性"></el-input>
@@ -271,7 +273,7 @@ export default {
           label: '参数4'
         }],
       // 新增参数的选择框绑定值
-      // addParameter:null, 
+      // addParameter:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -487,11 +489,4 @@ export default {
 .dynamicAdd{
   display: flex;
 }
-.myDialog{
-  ::v-deep {
-    .el-dialog__body{
-      padding: 3px 20px;
-    }
-  }
-} 
 </style>

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

@@ -101,7 +101,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="faultCaseList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="faultCaseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 
       <!-- <el-table-column label="案例文件" align="center">

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

@@ -27,12 +27,12 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="feedbackRawDataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="feedbackRawDataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="SNS编码" align="center" prop="SNSCode" />
       <el-table-column label="源数据" align="center" prop="source" />
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -100,7 +100,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-         
+
       };
       this.resetForm("form");
     },

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

@@ -77,9 +77,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="fleetList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="fleetList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="机队名称" align="center" prop="fleetName" />
       <el-table-column label="机队编号" align="center" prop="fleetCode" />
       <el-table-column label="飞机集合" align="center" prop="gather" />
@@ -102,7 +102,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -197,7 +197,7 @@ export default {
         fleetName: null,
         fleetCode: null,
         gather: null,
-        
+
       };
       this.resetForm("form");
     },

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

@@ -78,7 +78,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="forecastModelList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="forecastModelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="预测对象" align="center" prop="object" />
       <el-table-column label="预测方法" align="center" prop="method" />
@@ -96,7 +96,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -41,7 +41,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="forecastResultList" @selection-change="handleSelectionChange"
+    <el-table v-loading="loading" border :data="forecastResultList" @selection-change="handleSelectionChange"
       height="calc(100vh - 277px)">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column fixed label="部件名称" align="center" prop="unitName" />

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

@@ -57,7 +57,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -103,7 +103,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="groundDiagnosisModelList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="groundDiagnosisModelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="模型名称" align="center" prop="modelName" />
       <el-table-column label="模型Url" align="center" prop="modelUrl" />
@@ -112,7 +112,7 @@
       <el-table-column label="最少持续时间" align="center" prop="minDuration" />
       <el-table-column label="所属系统" align="center" prop="systemSource" />
       <el-table-column label="所属LRU" align="center" prop="lruSource" />
-      
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -125,7 +125,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -158,7 +158,7 @@
         <el-form-item label="所属LRU" prop="lruSource">
           <el-input v-model="form.lruSource" placeholder="请输入所属LRU" />
         </el-form-item>
-          
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -226,7 +226,7 @@ export default {
         minDuration: null,
         systemSource: null,
         lruSource: null,
-         
+
       },
       upload: {
         title: '',
@@ -277,7 +277,7 @@ export default {
         minDuration: null,
         systemSource: null,
         lruSource: null,
-         
+
       };
       this.resetForm("form");
     },

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

@@ -63,7 +63,7 @@
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" :data="importExportLogList">
+      <el-table v-loading="loading" border :data="importExportLogList">
         <el-table-column label="模块名称" align="center" prop="modelName" />
         <el-table-column label="文件名称" align="center" prop="name" />
         <el-table-column label="状态" align="center" prop="status" />
@@ -142,7 +142,7 @@
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" :data="importExportLogList">
+      <el-table v-loading="loading" border :data="importExportLogList">
         <el-table-column label="模块名称" align="center" prop="modelName" />
         <el-table-column label="文件名称" align="center" prop="name" />
         <el-table-column label="状态" align="center" prop="status" />
@@ -238,7 +238,7 @@ export default {
         name: null,
         error: null,
         status: null,
-        createBy:null,  
+        createBy:null,
         createTime:null
       };
       this.resetForm("form");
@@ -255,4 +255,4 @@ export default {
     },
   }
 };
-</script>
+</script>

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

@@ -31,7 +31,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="instructionInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="instructionInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="指令属性" align="center" prop="attribute" />
       <el-table-column label="指令内容" align="center" prop="title" />
@@ -62,7 +62,7 @@
     </el-dialog>
     <!-- 发送指令对话框 -->
     <el-dialog :title="title" :visible.sync="openSend" :close-on-click-modal="false" width="500px">
-      <el-table v-loading="loading" :data="sendList">
+      <el-table v-loading="loading" border :data="sendList">
         <el-table-column label="指令属性" align="center" prop="attribute" />
         <el-table-column label="指令标题" align="center" prop="title" />
       </el-table>

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

@@ -77,9 +77,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="lifePartConfigList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="lifePartConfigList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="寿命件名称" align="center" prop="name" />
       <el-table-column label="寿命监视参数名称" align="center" prop="monitorName" />
       <el-table-column label="单位" align="center" prop="unit" />
@@ -102,7 +102,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -101,9 +101,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="maintenanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="维护代码" align="center" prop="code" />
       <el-table-column label="维护信息描述" align="center" prop="description" />
       <el-table-column label="等级" align="center" prop="grade" />
@@ -129,7 +129,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -94,9 +94,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="maintenanceTestControlList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="maintenanceTestControlList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <!-- <el-table-column label="维修控制信息" align="center" prop="maintenanceControl" /> -->
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="对象" align="center" prop="object" />
@@ -115,7 +115,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -85,9 +85,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="monitorParameterConfigList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="monitorParameterConfigList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="参数名称" align="center" prop="name" />
       <el-table-column label="总线协议" align="center" prop="busRotocol" />
       <el-table-column label="数据块" align="center" prop="dataBlock" />
@@ -111,7 +111,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -40,7 +40,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="orderConfigList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="orderConfigList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="指令编码" align="center" prop="orderCode" />
       <el-table-column label="指令名称" align="center" prop="name" >

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

@@ -9,16 +9,6 @@
           <el-option v-for="dict in dict.type.order_status" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker clearable v-model="queryParams.createTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
-        <el-date-picker clearable v-model="queryParams.updateTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择更新时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -37,7 +27,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="orderInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="orderInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="指令名称" align="center" prop="orderName" />
       <el-table-column label="指令类型" align="center" prop="orderType" />

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

@@ -49,7 +49,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-       
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -95,7 +95,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="performanceMonitorModelList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="performanceMonitorModelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="监测对象" align="center" prop="object" />
       <el-table-column label="监测参数" align="center" prop="parameter" />
@@ -115,7 +115,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -145,7 +145,7 @@
         <el-form-item label="门限值" prop="thresholdValue">
           <el-input v-model="form.thresholdValue" placeholder="请输入门限值" />
         </el-form-item>
-          
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -261,7 +261,7 @@ export default {
         valueMethod: null,
         alarmValue: null,
         thresholdValue: null,
-         
+
       };
       this.resetForm("form");
     },

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

@@ -46,7 +46,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="preHandleResultList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="preHandleResultList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="源数据文件名称" align="center" prop="sourceName" />
       <el-table-column label="处理后文件名称" align="center" prop="name" />
@@ -54,7 +54,7 @@
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="处理后结果列表" align="center" />
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -165,7 +165,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-         
+
       },
       // 表单参数
       form: {},

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

@@ -24,7 +24,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="refreshTable" v-loading="loading" :data="productList" row-key="id" :default-expand-all="isExpandAll"
+    <el-table v-if="refreshTable" border  v-loading="loading" :data="productList" row-key="id" :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="SNS编号" align="center" prop="snsId" />

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

@@ -69,9 +69,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="softwareConfigList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="softwareConfigList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      
+
       <el-table-column label="软件序号" align="center" prop="serialNumber" />
       <el-table-column label="软件名称" align="center" prop="name" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -93,7 +93,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

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

@@ -44,7 +44,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="sortieList" @selection-change="handleSelectionChange">
+    <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">
@@ -224,7 +224,7 @@ export default {
                 // 日期限制
                 disabledDate: (time) => {
                     let old = this.queryParams.startTime
-                    return time.getTime() < new Date(old).getTime() - 86400000 
+                    return time.getTime() < new Date(old).getTime() - 86400000
                 },
                 // 时间限制
                 selectableRange: pickerDate? h + m  + ':00 - 23:59:59' : '00:00:00 - 23:59:59'
@@ -246,7 +246,7 @@ export default {
                 // 日期限制
                 disabledDate: (time) => {
                     let old = this.form.startTime
-                    return time.getTime() < new Date(old).getTime() - 86400000 
+                    return time.getTime() < new Date(old).getTime() - 86400000
                 },
                 // 时间限制
                 selectableRange: pickerDate? h + m  + ':00 - 23:59:59' : '00:00:00 - 23:59:59'
@@ -291,7 +291,7 @@ export default {
       // )
       this.$router.push({
         name: 'selectParameters',
-        params: { 
+        params: {
           sortieNumber: sortieNumber
         },
       })
@@ -301,7 +301,7 @@ export default {
       const sortieNumber = row.sortieNumber
       this.$router.push({
         name: 'SortieDetail',
-        params: { 
+        params: {
           sortieNumber: sortieNumber
         },
       })

PHM-web/src/views/monitor/job/index.vue

@@ -91,7 +91,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="jobList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />

PHM-web/src/views/monitor/job/log.vue

@@ -101,7 +101,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="jobLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />

PHM-web/src/views/system/config/index.vue

@@ -102,7 +102,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="configList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="参数主键" align="center" prop="configId" />
       <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />

PHM-web/src/views/system/dict/data.vue

@@ -90,7 +90,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编码" align="center" prop="dictCode" />
       <el-table-column label="字典标签" align="center" prop="dictLabel">
@@ -399,4 +399,4 @@ export default {
     }
   }
 };
-</script>
+</script>

PHM-web/src/views/system/dict/index.vue

@@ -107,7 +107,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
@@ -344,4 +344,4 @@ export default {
     }
   }
 };
-</script>
+</script>

PHM-web/src/views/system/menu/index.vue

@@ -52,6 +52,7 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="menuList"
+      border
       row-key="menuId"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"

PHM-web/src/views/system/notice/index.vue

@@ -69,7 +69,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="noticeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
       <el-table-column

PHM-web/src/views/system/post/index.vue

@@ -79,7 +79,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="postList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="岗位编号" align="center" prop="postId" />
       <el-table-column label="岗位编码" align="center" prop="postCode" />

PHM-web/src/views/system/role/authUser.vue

@@ -59,7 +59,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
@@ -196,4 +196,4 @@ export default {
     }
   }
 };
-</script>
+</script>

PHM-web/src/views/system/role/index.vue

@@ -97,7 +97,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
@@ -602,4 +602,4 @@ export default {
     }
   }
 };
-</script>
+</script>

PHM-web/src/views/system/user/authRole.vue

@@ -17,7 +17,7 @@
     </el-form>
 
     <h4 class="form-header h4">角色信息</h4>
-    <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
+    <el-table v-loading="loading" border :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
           <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
@@ -33,7 +33,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
 
     <el-form label-width="100px">
@@ -114,4 +114,4 @@ export default {
     },
   },
 };
-</script>
+</script>

PHM-web/src/views/system/user/index.vue

@@ -136,7 +136,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" border :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -667,4 +667,4 @@ export default {
     }
   }
 };
-</script>
+</script>

PHM-web/src/views/tool/gen/index.vue

@@ -80,7 +80,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="tableList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" align="center" width="55"></el-table-column>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template slot-scope="scope">