Merge branch 'dev-rmd2' of Rmengdi/LQBZ_web into master

src/layout/components/NavBar/index.scss

@@ -216,6 +216,7 @@
       box-sizing: border-box;
       height: auto !important;
       background: transparent !important;
+      font-size: 1.1rem;
     }
     > li:hover {
       color: #30daff !important;
@@ -227,6 +228,7 @@
     .el-submenu__title {
       color: #fff !important;
       background: rgb(15, 79, 99) !important;
+      font-size: 1.1rem;
       .el-icon-arrow-right {
         display: none !important;
       }
@@ -370,6 +372,7 @@
   width: 130px;
   height: 50px;
   line-height: 50px;
+  font-size: 1.2rem !important;
   color: #fff;
   background-color: transparent;
 }
@@ -383,4 +386,5 @@
   line-height: 50px;
   color: #fff;
   background-color: transparent;
+  font-size: 1.2rem !important;
 }

src/router/modules/faultStatistics.js

@@ -20,15 +20,6 @@ export default [
         component: () => import('@/views/als/faultStatistics/index.vue'),
         meta: {
           // roleMenuHide: true,
-          parent: 'Fault',
-          title: '故障数据'
-        }
-      },
-      {
-        name: 'faultStatisticsEcharts',
-        path: '/faultStatisticsEcharts',
-        component: () => import('@/views/als/faultStatistics/echarts.vue'),
-        meta: {
           parent: 'Fault',
           title: '故障统计'
         }

src/router/modules/system.js

@@ -236,15 +236,15 @@ export default [
           title: '判故逻辑管理'
         }
       },
-      {
-        name: 'TrainingData',
-        path: '/dataManage/trainingData',
-        component: () => import('@/views/als/trainingData/index.vue'),
-        meta: {
-          parent: 'BasicData',
-          title: '故障数据统计'
-        }
-      },
+      // {
+      //   name: 'TrainingData',
+      //   path: '/dataManage/trainingData',
+      //   component: () => import('@/views/als/trainingData/index.vue'),
+      //   meta: {
+      //     parent: 'BasicData',
+      //     title: '故障数据统计'
+      //   }
+      // },
       /**
        * ----------------------------基础数据(定检任务)-----------------------------
        */

src/views/als/faultDiagnosis/index.vue

@@ -29,7 +29,7 @@
             <el-input v-model="form.flightDate" disabled />
           </el-form-item>
           <el-form-item label="部件" prop="partId">
-            <treeselect :value="form.partId" :normalizer="normalizer" :options="partsData" :show-count="true" placeholder="请选择部件" @select="partIdSelect" />
+            <treeselect :value="form.partId" :normalizer="normalizer" :options="partsData" :show-count="true" noOptionsText="该机型暂无构型信息，请在构型管理中添加" placeholder="请选择部件" @select="partIdSelect" />
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">

src/views/als/faultStatistics/echarts.vue

@@ -4,7 +4,7 @@
       <div class="view-carrierFlightMission-FlightMission-btn-right">
         <div class="input-with-select">
           <span>日期</span>
-          <el-date-picker type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" v-model="statisticsDate" placeholder="选择日期"> </el-date-picker>
+          <el-date-picker type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" v-model="statisticsDate" placeholder="选择日期" placement="bottom-start"> </el-date-picker>
         </div>
         <div class="input-with-select">
           <span>地区</span>

src/views/als/faultStatistics/index.vue

@@ -18,7 +18,8 @@
           <div class="view-carrierFlightMission-FlightMission-btn-right">
             <div class="input-with-select">
               <span>日期</span>
-              <el-date-picker type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" v-model="statisticsDate" placeholder="选择日期"> </el-date-picker>
+              <el-date-picker type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" v-model="statisticsDate" placement="bottom-start" placeholder="选择日期">
+              </el-date-picker>
             </div>
             <div class="input-with-select">
               <span>地区</span>
@@ -65,7 +66,7 @@
             <el-row>
               <el-col v-bind="{ span: 12 }">
                 <el-form-item label="日期" prop="statisticsDate">
-                  <el-date-picker clearable v-model="form.statisticsDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"></el-date-picker>
+                  <el-date-picker placement="bottom-start" clearable v-model="form.statisticsDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"></el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col v-bind="{ span: 12 }">
@@ -250,7 +251,7 @@
               </el-col>
               <el-col v-bind="{ span: 12 }">
                 <el-form-item label="故障件装机日期" prop="faultyPartsInstallDate">
-                  <el-date-picker clearable v-model="form.faultyPartsInstallDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择故障件装机日期"></el-date-picker>
+                  <el-date-picker placement="bottom-start" clearable v-model="form.faultyPartsInstallDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择故障件装机日期"></el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col v-bind="{ span: 12 }">
@@ -315,12 +316,12 @@
               </el-col>
               <el-col v-bind="{ span: 12 }">
                 <el-form-item label="审核时间" prop="examineTime">
-                  <el-date-picker clearable v-model="form.examineTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择审核时间"></el-date-picker>
+                  <el-date-picker placement="bottom-start" clearable v-model="form.examineTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择审核时间"></el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col v-bind="{ span: 12 }">
                 <el-form-item label="排除日期" prop="exclusionDate">
-                  <el-date-picker clearable v-model="form.exclusionDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择排除日期"></el-date-picker>
+                  <el-date-picker placement="bottom-start" clearable v-model="form.exclusionDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择排除日期"></el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col v-bind="{ span: 12 }">
@@ -382,7 +383,7 @@ export default {
   data() {
     // 这里存放数据
     return {
-      activeName: 'first',
+      activeName: 'second',
       dialogTitle: '新增',
       dialogVisible: false,
       keyWord: '',
@@ -1063,6 +1064,6 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 @import '../index.scss';
 </style>

src/views/als/lifePrediction/index.vue

@@ -29,7 +29,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="部件" prop="partId">
-            <treeselect :value="form.partId" :normalizer="normalizer" :options="partsData" :show-count="true" placeholder="请选择部件" @select="partIdSelect" />
+            <treeselect noOptionsText="该机型暂无构型信息，请在构型管理中添加" :value="form.partId" :normalizer="normalizer" :options="partsData" :show-count="true" placeholder="请选择部件" @select="partIdSelect" />
           </el-form-item>
         </el-form>
 

src/views/als/lifetimeSpareParts/index.vue

@@ -366,7 +366,7 @@ export default {
         data: { list, totalCount }
       } = await getLifetimeSpareParts({ pageSize, pageNum: pageIndex, keyWord, ...params })
       this.tableData = list
-      this.tableRequset.total = totalCount
+      this.tableRequset.total = total
     },
 
     fetch() {

src/views/als/model/index.vue

@@ -33,7 +33,7 @@
             <treeselect :value="form.aircraftType" :normalizer="aircraftTypeNormalizer" :options="aircraftTypeTreeData" :show-count="true" placeholder="请选择机型" @select="aircraftTypeChange" />
           </el-form-item>
           <el-form-item v-show="['5', '6'].includes(form.type)" label="部件" prop="partId">
-            <treeselect :value="form.partId" :normalizer="normalizer" :options="partsData" :show-count="true" placeholder="请选择部件" @select="partIdSelect" />
+            <treeselect noOptionsText="该机型暂无构型信息，请在构型管理中添加" :value="form.partId" :normalizer="normalizer" :options="partsData" :show-count="true" placeholder="请选择部件" @select="partIdSelect" />
             <!-- <el-select v-model="form.partId" filterable placeholder="请选择部件">
               <el-option v-for="item in partsData" :key="item.id" :label="item.devicesName" :value="item.id"> </el-option>
             </el-select> -->

src/views/home/index.scss

@@ -209,23 +209,24 @@
 }
 .airStatus{
   width: 100%;
-  height: 200px;
+  height: 260px;
   box-sizing: border-box;
   color: #fff;
+  overflow: scroll;
 
-  .firstRow,
-  .secondRow{
+  .firstRow{
     width: 100%;
     height: 100px;
     display: flex;
-    justify-content: space-around;
+    justify-content:space-around;
+    flex-wrap: wrap;
     padding: 20px 0px;
   }
 
   .cell{
     width: 9%;
     height: 100px;
-    margin: 0 auto;
+    margin: 5px;
     border: 1px solid #0c3440;
 
     .info{

src/views/home/index.vue

@@ -6,23 +6,23 @@
           <template slot="content">
             <div class="airStatus">
               <div class="firstRow">
-                <div v-for="item of 10" :key="item" class="cell">
-                  <el-image style="width: 80px; height: 80px" :src="imgUrl"></el-image>
+                <div v-for="item of aircaftCatalogAll" :key="item.aircaftCatalogId" class="cell">
+                  <el-image style="width: 80px; height: 80px; margin-top: 10px" :src="imgUrl"></el-image>
                   <div class="info">
-                    <p>轰0101</p>
+                    <p>{{ item.aircaftCatalogCode }}</p>
                     <span class="success-state">健康 </span>
                   </div>
                 </div>
               </div>
-              <div class="secondRow">
-                <div v-for="item of 10" :key="item" class="cell">
+              <!-- <div class="firstRow">
+                <div v-for="item of 15" :key="item" class="cell">
                   <el-image style="width: 80px; height: 80px" :src="imgUrl"></el-image>
                   <div class="info">
-                    <p>轰0101</p>
-                    <span class="warning-state">故障 </span>
+                    <p>{{ item }}</p>
+                    <span class="success-state">健康 </span>
                   </div>
                 </div>
-              </div>
+              </div> -->
             </div>
           </template>
         </Card>
@@ -91,6 +91,7 @@
 <script>
 import { getHomeLastMission, getAviationList, getHomeAviationProject, getHomeAviationAmount, getHomeAviationMoney } from '@/api/home'
 import { getFaultStatisticsListAll } from '@/api/als/faultStatistics'
+import { getAircaftCatalogAll } from '@/api/als/aircraft'
 
 import * as echarts from 'echarts'
 import { setTopOptions, bottomLeftOptions, bottomCenterOptions, bottomRightOptions } from './index'
@@ -117,7 +118,8 @@ export default {
       bottomLeftOptions,
       bottomCenterOptions,
       bottomRightOptions,
-      imgUrl: require('@/assets/images/飞机.png')
+      imgUrl: require('@/assets/images/飞机.png'),
+      aircaftCatalogAll: []
     }
   },
   mounted() {
@@ -129,8 +131,18 @@ export default {
       this.fetchTermChart()
       this.fetchPieceChart()
       this.fetchSumChart()
+
       // this.extension(echartTop)
     },
+
+    async getAircaftCatalogAllAPI() {
+      const { data } = await getAircaftCatalogAll({
+        keyWord: '',
+        aircaftModelIdList: []
+      })
+      this.aircaftCatalogAll = data
+    },
+
     async fetchTableData() {
       const { data } = await getHomeLastMission()
       this.tableData = data
@@ -138,7 +150,24 @@ export default {
     },
     async maintainFetchTableData() {
       const { data } = await getFaultStatisticsListAll()
-      this.maintainTableData = data
+      this.maintainTableData = data.filter((item) => {
+        return item.repairStatus !== '已完成'
+      })
+      // this.getAircaftCatalogAllAPI()
+      const { data: AircaftCatalogData } = await getAircaftCatalogAll({
+        keyWord: '',
+        aircaftModelIdList: []
+      })
+      this.aircaftCatalogAll = AircaftCatalogData
+      this.maintainTableData.forEach((item) => {
+        this.aircaftCatalogAll.forEach((airItem) => {
+          if (airItem.aircaftCatalogCode === item.aircraftNum) {
+            airItem.healthStatus = '故障'
+          } else {
+            airItem.healthStatus = '健康'
+          }
+        })
+      })
     },
     handleChange(item) {
       switch (item) {

src/views/home/table.js

@@ -58,33 +58,9 @@ export const options = {
 }
 
 export const maintainColumns = (_this) => [
-  {
-    prop: 'statisticsDate',
-    label: '日期'
-  },
-  {
-    prop: 'warZone',
-    label: '战区'
-  },
-  {
-    prop: 'army',
-    label: '军'
-  },
-  {
-    prop: 'division',
-    label: '师'
-  },
-  {
-    prop: 'groups',
-    label: '团'
-  },
-  {
-    prop: 'squadron',
-    label: '中队'
-  },
   {
     prop: 'aircraftNum',
-    label: '飞机号'
+    label: '机号'
   },
   {
     prop: 'aircraftModel',
@@ -94,14 +70,14 @@ export const maintainColumns = (_this) => [
     prop: 'factoryNum',
     label: '出厂号码'
   },
-  {
-    prop: 'machineType',
-    label: '机件类型'
-  },
   {
     prop: 'machineNum',
     label: '机件号'
   },
+  {
+    prop: 'machineType',
+    label: '机件类型'
+  },
   {
     prop: 'machineModel',
     label: '机件型别'
@@ -110,189 +86,25 @@ export const maintainColumns = (_this) => [
     prop: 'machineName',
     label: '机件名称'
   },
-  {
-    prop: 'landingGear',
-    label: '起落'
-  },
   {
     prop: 'major',
     label: '专业'
   },
+
   {
     prop: 'faultyPartsName',
     label: '故障件名称'
   },
-  {
-    prop: 'faultyPartsModel',
-    label: '故障件型别'
-  },
-  {
-    prop: 'faultyPartsNum',
-    label: '故障件号码'
-  },
-  {
-    prop: 'engineModel',
-    label: '故障件所属发动机型别'
-  },
-  {
-    prop: 'engineNum',
-    label: '故障件所属发动机号码'
-  },
-  {
-    prop: 'engineSerialNum',
-    label: '故障件所属发动机号码'
-  },
-  {
-    prop: 'faultyPartsPosition',
-    label: '故障件位置'
-  },
-  {
-    prop: 'faultyPhenomenon',
-    label: '故障现象'
-  },
-  {
-    prop: 'faultyPlace',
-    label: '故障发生地点'
-  },
   {
     prop: 'findOpportunity',
     label: '发现时机'
   },
   {
-    prop: 'systems',
-    label: '系统'
-  },
-  {
-    prop: 'timingType',
-    label: '计时类型'
-  },
-  {
-    prop: 'faultyPartsManufacturer',
-    label: '故障件制造厂'
-  },
-  {
-    prop: 'faultyPartsRenovate',
-    label: '故障件翻修厂'
-  },
-  {
-    prop: 'installationTime',
-    label: '故障件装本机工作时次'
-  },
-  {
-    prop: 'totalWorkTime',
-    label: '故障件总工作时次'
-  },
-  {
-    prop: 'repairTime',
-    label: '故障件修后时次'
-  },
-  {
-    prop: 'replacementPartsModel',
-    label: '故换件型别'
-  },
-  {
-    prop: 'replacementPartsNum',
-    label: '故换件号码'
-  },
-  {
-    prop: 'replacementPartsManufacturer',
-    label: '故换件制造厂'
-  },
-  {
-    prop: 'replacementTotalWorkTime',
-    label: '故换件总工作时次'
-  },
-  {
-    prop: 'replacementPartsRenovate',
-    label: '故换件翻修厂'
-  },
-  {
-    prop: 'replacementRepairTime',
-    label: '故换件修后时次'
-  },
-  {
-    prop: 'faultyAbnormalCode',
-    label: '故障失常码'
-  },
-  {
-    prop: 'faultyPartsInstallDate',
-    label: '故障件装机日期'
-  },
-  {
-    prop: 'faultyReason',
-    label: '故障原因'
-  },
-  {
-    prop: 'faultyNature',
-    label: '故障性质'
-  },
-  {
-    prop: 'faultyResponsibility',
-    label: '故障责任'
-  },
-  {
-    prop: 'faultyConsequence',
-    label: '故障后果'
-  },
-  {
-    prop: 'handlingSuggestions',
-    label: '处理意见'
-  },
-  {
-    prop: 'influenceFrequency',
-    label: '影响次数'
-  },
-  {
-    prop: 'errorFlyFrequency',
-    label: '误飞次数'
-  },
-  {
-    prop: 'identificationMethod',
-    label: '判明方法'
-  },
-  {
-    prop: 'discoveredPeople',
-    label: '发现人'
-  },
-  {
-    prop: 'exclusionMethod',
-    label: '排除方法'
-  },
-  {
-    prop: 'exclusionPeople',
-    label: '排故人'
-  },
-  {
-    prop: 'examinePeople',
-    label: '审核人'
-  },
-  {
-    prop: 'examineTime',
-    label: '审核时间'
-  },
-  {
-    prop: 'exclusionDate',
-    label: '排除日期'
-  },
-  {
-    prop: 'exclusionWorkTime',
-    label: '排故工时'
-  },
-  {
-    prop: 'exclusionPeopleNum',
-    label: '排故人数'
-  },
-  {
-    prop: 'exclusionTime',
-    label: '排故时间'
-  },
-  {
-    prop: 'isAchievement',
-    label: '是否立功'
-  },
-  {
-    prop: 'needTestFly',
-    label: '需要试飞'
+    prop: 'repairStatus',
+    label: '维修状态',
+    render: (h, params) => {
+      return h('span', { class: 'warning-state' }, params.row.repairStatus)
+    }
   }
 ]