Browse Source

表格 边框

wanggaokun 1 year ago
parent
commit
c3377e362c
45 changed files with 115 additions and 105 deletions
  1. 8 0
      PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/SortieParameterService.java
  2. 1 0
      PHM-admin/phm-manage/src/main/resources/mapper/manage/SortieParameterMapper.xml
  3. 3 3
      PHM-web/src/views/manage/afterAnalysisResult/index.vue
  4. 1 1
      PHM-web/src/views/manage/aircraft/index.vue
  5. 3 3
      PHM-web/src/views/manage/analyzeCourseLog/index.vue
  6. 8 8
      PHM-web/src/views/manage/analyzeDownLog/index.vue
  7. 4 4
      PHM-web/src/views/manage/analyzeResult/index.vue
  8. 1 1
      PHM-web/src/views/manage/dataDown/index.vue
  9. 2 2
      PHM-web/src/views/manage/deepIsolationModel/index.vue
  10. 4 4
      PHM-web/src/views/manage/deriveParameter/index.vue
  11. 1 1
      PHM-web/src/views/manage/diagnoseResult/index.vue
  12. 3 3
      PHM-web/src/views/manage/externalInterfaceLog/index.vue
  13. 1 1
      PHM-web/src/views/manage/falseAlarmRestrainModel/index.vue
  14. 1 1
      PHM-web/src/views/manage/faultCase/index.vue
  15. 3 3
      PHM-web/src/views/manage/feedbackRawData/index.vue
  16. 4 4
      PHM-web/src/views/manage/fleet/index.vue
  17. 2 2
      PHM-web/src/views/manage/forecastModel/index.vue
  18. 1 1
      PHM-web/src/views/manage/forecastResult/index.vue
  19. 7 7
      PHM-web/src/views/manage/groundDiagnosisModel/index.vue
  20. 4 4
      PHM-web/src/views/manage/importExportLog/index.vue
  21. 2 2
      PHM-web/src/views/manage/instructionInfo/index.vue
  22. 3 3
      PHM-web/src/views/manage/lifePartConfig/index.vue
  23. 3 3
      PHM-web/src/views/manage/maintenance/index.vue
  24. 3 3
      PHM-web/src/views/manage/maintenanceTestControl/index.vue
  25. 3 3
      PHM-web/src/views/manage/monitorParameterConfig/index.vue
  26. 1 1
      PHM-web/src/views/manage/orderConfig/index.vue
  27. 1 1
      PHM-web/src/views/manage/orderInfo/index.vue
  28. 5 5
      PHM-web/src/views/manage/performanceMonitorModel/index.vue
  29. 3 3
      PHM-web/src/views/manage/preHandleResult/index.vue
  30. 1 1
      PHM-web/src/views/manage/product/index.vue
  31. 3 3
      PHM-web/src/views/manage/softwareConfig/index.vue
  32. 5 5
      PHM-web/src/views/manage/sortie/index.vue
  33. 1 1
      PHM-web/src/views/monitor/job/index.vue
  34. 1 1
      PHM-web/src/views/monitor/job/log.vue
  35. 1 1
      PHM-web/src/views/system/config/index.vue
  36. 2 2
      PHM-web/src/views/system/dict/data.vue
  37. 2 2
      PHM-web/src/views/system/dict/index.vue
  38. 1 0
      PHM-web/src/views/system/menu/index.vue
  39. 1 1
      PHM-web/src/views/system/notice/index.vue
  40. 1 1
      PHM-web/src/views/system/post/index.vue
  41. 2 2
      PHM-web/src/views/system/role/authUser.vue
  42. 2 2
      PHM-web/src/views/system/role/index.vue
  43. 3 3
      PHM-web/src/views/system/user/authRole.vue
  44. 2 2
      PHM-web/src/views/system/user/index.vue
  45. 1 1
      PHM-web/src/views/tool/gen/index.vue

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

@@ -2,7 +2,9 @@ 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;
@@ -109,6 +111,9 @@ public class SortieParameterService implements ISortieParameterService {
         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()));
     }
 
@@ -118,6 +123,9 @@ public class SortieParameterService implements ISortieParameterService {
         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());
     }
 }

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

@@ -60,6 +60,7 @@
             <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>
 

+ 3 - 3
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");
     },

+ 1 - 1
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" />

+ 3 - 3
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"

+ 8 - 8
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");
     },

+ 4 - 4
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");
     },

+ 1 - 1
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="batch" />
       <el-table-column label="机型" align="center" prop="airType" />

+ 2 - 2
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"

+ 4 - 4
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"

+ 1 - 1
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" />

+ 3 - 3
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"

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

@@ -86,7 +86,7 @@
       <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" />

+ 1 - 1
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">

+ 3 - 3
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");
     },

+ 4 - 4
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");
     },

+ 2 - 2
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"

+ 1 - 1
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" />

+ 7 - 7
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");
     },

+ 4 - 4
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>

+ 2 - 2
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>

+ 3 - 3
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"

+ 3 - 3
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"

+ 3 - 3
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"

+ 3 - 3
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"

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

@@ -36,7 +36,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" >

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

@@ -27,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" />

+ 5 - 5
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");
     },

+ 3 - 3
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: {},

+ 1 - 1
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" />

+ 3 - 3
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"

+ 5 - 5
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
         },
       })

+ 1 - 1
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" />

+ 1 - 1
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" />

+ 1 - 1
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" />

+ 2 - 2
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>

+ 2 - 2
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>

+ 1 - 0
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'}"

+ 1 - 1
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

+ 1 - 1
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" />

+ 2 - 2
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>

+ 2 - 2
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>

+ 3 - 3
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>

+ 2 - 2
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>

+ 1 - 1
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">