feat: 合并武汉代码

src/api/carrierStandard/carrierListMachineryPreparation.js

@@ -50,9 +50,9 @@ export const exportExcel = async (data) => {
 }
 //下载航材使用登记模板
 export const downLoadUseRegisterFile = async (data) => {
-  window.open(process.env.VUE_APP_BASE_API + '/carryingtask/taskExecondRegister/downLoadUseRegisterFile')
+  window.open(process.env.VUE_APP_BASE_API + '/basicdata/carryingAvmatUseRegister/downLoadUseRegisterFile')
 }
 //航材使用登记导出
 export const exportUseRegisterExcel = async (data) => {
-  window.open(process.env.VUE_APP_BASE_API + `/carryingtask/taskExecondRegister/exportUseRegisterExcel?taskId=${data.taskId}&queryParam=${data.queryParam}`)
+  window.open(process.env.VUE_APP_BASE_API + `/basicdata/carryingAvmatUseRegister/exportUseRegisterExcel?taskId=${data.taskId}&queryParam=${data.queryParam}`)
 }

src/router/modules/carrierStandard.js

@@ -1,29 +1,24 @@
 import Layout from '@/layout/index.vue'
 
 /**
+ *
+ * carrierListMachineryPreparation           携行清单机务编修
+ * carrierAllAudit                           机务清单总体审核
+ * carrierListShipping                       携行清单航材编修
+ * carrierListExecutionRegistration          任务执行情况登记
+ * useRegistration                           携行航材使用登记
  * carrierComputationalModel                 携行计算模型管理
  * carrierComputationalModelVersion          携行计算模型版本管理
- * carrierSailingMaterialConsumeRecord       航材历年消耗管理
  * carrierSailingMaterialConsumeRegularities 航材消耗规律管理
- * carrierFlightMission                      飞行任务管理
- * carrierListExecutionRegistration          携行清单执行登记
- * carrierListMachineryPreparation           携行清单机务编修
- *
- * 携行清单机务编修 carrierListMachineryPreparation
- * 携行清单航材编修 carrierListShipping
- * 任务执行情况登记 carrierListExecutionRegistration
- * 携行航材使用登记 useRegistration
- * 携行计算模型管理 carrierComputationalModel
- * 航材消耗规律管理 carrierSailingMaterialConsumeRegularities
- * 历年航材消耗数据 carrierSailingMaterialConsumeRecord
- * 社会化保障参考   safeguardCost
+ * carrierSailingMaterialConsumeRecord       航材历年消耗管理
+ * safeguardCost                             社会化保障参考
  *
  */
 
 //携行清单机务编修
 export const carrierListMachineryPreparation = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'CarrierListMachineryPreparation',
   meta: {
@@ -62,7 +57,7 @@ export const carrierListMachineryPreparation = {
 //机务清单总体审核
 export const carrierAllAudit = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'CarrierAllAudit',
   meta: {
@@ -93,7 +88,7 @@ export const carrierAllAudit = {
 //携行清单航材编修
 export const carrierListShipping = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'CarrierListShipping',
   meta: {
@@ -129,33 +124,10 @@ export const carrierListShipping = {
   ]
 }
 
-// //机务领用航材申请
-// export const maintenanceUseMaterialApply = {
-//   path: '/carrierStandard',
-//   redirect: '/carrierStandard/carrierComputationalModel',
-//   component: Layout,
-//   name: 'MaintenanceUseMaterialApply',
-//   meta: {
-//     title: '航材管理',
-//     icon: 'el-icon-s-platform'
-//   },
-//   sort: 9,
-//   children: [
-//     {
-//       path: '/carrierStandard/carrierListShipping',
-//       component: () => import('@/views/carrierStandard/carrierListShipping/index.vue'),
-//       meta: {
-//         title: '机务领用航材申请'
-//       },
-//       sort: 4
-//     }
-//   ]
-// }
-
 //任务执行情况登记
 export const carrierListExecutionRegistration = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'CarrierListExecutionRegistration',
   meta: {
@@ -219,7 +191,7 @@ export const carrierListExecutionRegistration = {
 //携行航材使用登记
 export const useRegistration = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'UseRegistration',
   meta: {
@@ -258,7 +230,7 @@ export const useRegistration = {
 //携行计算模型管理
 export const carrierComputationalModel = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'CarrierComputationalModel',
   meta: {
@@ -281,7 +253,7 @@ export const carrierComputationalModel = {
 //航材消耗规律管理
 export const carrierSailingMaterialConsumeRegularities = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'CarrierSailingMaterialConsumeRegularities',
   meta: {
@@ -304,7 +276,7 @@ export const carrierSailingMaterialConsumeRegularities = {
 //历年航材消耗数据
 export const carrierSailingMaterialConsumeRecord = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'CarrierSailingMaterialConsumeRecord',
   meta: {
@@ -358,7 +330,7 @@ export const carrierSailingMaterialConsumeRecord = {
 //社会化保障参考
 export const safeguardCost = {
   path: '/carrierStandard',
-  redirect: '/carrierStandard/carrierComputationalModel',
+  redirect: '/carrierStandard/carrierListMachineryPreparation',
   component: Layout,
   name: 'SafeguardCost',
   meta: {
@@ -371,8 +343,7 @@ export const safeguardCost = {
       path: '/carrierStandard/safeguardCost',
       component: () => import('@/views/carrierStandard/safeguardCost/index.vue'),
       meta: {
-        title: '社会化保障参考',
-        hide: true
+        title: '社会化保障参考'
       },
       sort: 9
     },

src/router/private-routes.js

@@ -17,9 +17,6 @@ import * as intelligentQA from './modules/als/intelligentQA'
 import * as knowledgeGraph from './modules/als/knowledgeGraph'
 import * as qualityManage from './modules/als/qualityManage'
 
-// // 社会化保障
-// import * as safeguard from './modules/safeguard'
-
 // // 统计分析
 // import * as statisticalAnalysis from './modules/statisticalAnalysis'
 

src/views/carrierStandard/carrierAllAudit/index.js

@@ -118,5 +118,5 @@ export const options = {
   initTable: true, // 是否一挂载就加载数据
   border: true,
   rowKey: 'taskId',
-  height: 'calc(100vh - 340px)'
+  height: 'calc(100vh - 240px)'
 }

src/views/carrierStandard/carrierListExecutionRegistration/components/look/index.js

@@ -37,15 +37,24 @@ export const columns = (_this) => [
   },
   {
     prop: 'aircraftIntactRatio',
-    label: '装备完好率（%）'
+    label: '装备完好率',
+    render: (h, params) => {
+      return h('span', {}, params.row.aircraftIntactRatio + '%')
+    }
   },
   {
     prop: 'lackMaterStopFlyRatio',
-    label: '缺材停飞率（%）'
+    label: '缺材停飞率',
+    render: (h, params) => {
+      return h('span', {}, params.row.lackMaterStopFlyRatio + '%')
+    }
   },
   {
     prop: 'guaranteedRatio',
-    label: '保障良好率（%）'
+    label: '保障良好率',
+    render: (h, params) => {
+      return h('span', {}, params.row.guaranteedRatio + '%')
+    }
   }
 ]
 

src/views/carrierStandard/carrierListExecutionRegistration/components/registering/index.js

@@ -61,15 +61,24 @@ export const columns = (_this) => [
   },
   {
     prop: 'aircraftIntactRatio',
-    label: '装备完好率（%）'
+    label: '装备完好率（%）',
+    render: (h, params) => {
+      return h('span', {}, params.row.aircraftIntactRatio + '%')
+    }
   },
   {
     prop: 'lackMaterStopFlyRatio',
-    label: '缺材停飞率（%）'
+    label: '缺材停飞率（%）',
+    render: (h, params) => {
+      return h('span', {}, params.row.lackMaterStopFlyRatio + '%')
+    }
   },
   {
     prop: 'guaranteedRatio',
-    label: '保障良好率（%）'
+    label: '保障良好率（%）',
+    render: (h, params) => {
+      return h('span', {}, params.row.guaranteedRatio + '%')
+    }
   }
 ]
 

src/views/carrierStandard/carrierListShipping/index.js

@@ -122,5 +122,5 @@ export const options = {
   initTable: true, // 是否一挂载就加载数据
   border: true,
   rowKey: 'taskId',
-  height: 'calc(100vh - 340px)'
+  height: 'calc(100vh - 240px)'
 }

src/views/carrierStandard/carrierUseRegistration/components/importDialog/index.vue

@@ -22,7 +22,7 @@ export default {
     return {
       dialogtitle: '导入携行航材使用登记',
       dialogVisible: false,
-      fileApi: process.env.VUE_APP_BASE_API + '/carryingtask/taskExecondRegister/importUseRegisterExcel',
+      fileApi: process.env.VUE_APP_BASE_API + '/basicdata/carryingAvmatUseRegister/importUseRegisterExcel',
       fileList: [],
       fileData: {
         userName: '',

src/views/carrierStandard/carrierUseRegistration/components/look/index.vue

@@ -6,7 +6,7 @@
 
       <div class="view-common-header">
         <div class="view-common-header-left">
-          <el-button type="primary">导出</el-button>
+          <el-button type="primary" :disabled="tableData.length == 0" @click="allExport">导出</el-button>
         </div>
         <div class="view-common-header-right">
           <el-input @keyup.enter.native="fetchTableData('search')" placeholder="请输入内容" v-model="searchValue" class="input-select">
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import { queryFlyTaskAircraft, queryCarryingMainteOrgan } from '@/api/carrierStandard/carrierListMachineryPreparation'
+import { queryFlyTaskAircraft, queryCarryingMainteOrgan, exportUseRegisterExcel } from '@/api/carrierStandard/carrierListMachineryPreparation'
 
 export default {
   name: 'SailingMaterial',
@@ -104,6 +104,14 @@ export default {
     handleSizeChange(val) {
       this.pagination.pageSize = val
       this.fetchTableData()
+    },
+    //导出全部
+    async allExport() {
+      let params = {
+        queryParam: this.searchValue,
+        taskId: this.$route.params.id
+      }
+      await exportUseRegisterExcel(params)
     }
   }
 }

src/views/home/index.js

@@ -2,7 +2,7 @@ export const setTopOptions = {
   legend: {
     data: ['任务航材保障良好率', '装备完好率', '非任务携行航材利用率', '任务携行航材利用率'],
     textStyle: {
-      fontSize: 16,
+      fontSize: 13,
       color: '#fff'
     }
   },
@@ -31,7 +31,8 @@ export const setTopOptions = {
         }
       },
       axisLabel: {
-        fontSize: 16
+        fontSize: 13,
+        rotate: 45
       },
       triggerEvent: true
     }
@@ -39,7 +40,7 @@ export const setTopOptions = {
   yAxis: [
     {
       type: 'value',
-      axisLabel: { formatter: '{value} %', fontSize: 16 },
+      axisLabel: { formatter: '{value} %', fontSize: 13 },
       axisLine: {
         lineStyle: {
           color: '#fff'
@@ -104,7 +105,7 @@ export const bottomLeftOptions = {
   legend: {
     data: ['非任务携行航材利用率', '任务携行航材利用率'],
     textStyle: {
-      fontSize: 16,
+      fontSize: 13,
       color: '#fff'
     }
   },
@@ -118,7 +119,7 @@ export const bottomLeftOptions = {
   grid: {
     left: '5%',
     right: '5%',
-    bottom: '10%',
+    bottom: '15%',
     containLabel: true
   },
   xAxis: [
@@ -132,7 +133,8 @@ export const bottomLeftOptions = {
         }
       },
       axisLabel: {
-        fontSize: 16
+        fontSize: 13,
+        rotate: 45
       },
       triggerEvent: true
     }
@@ -140,7 +142,7 @@ export const bottomLeftOptions = {
   yAxis: [
     {
       type: 'value',
-      axisLabel: { formatter: '{value} %', fontSize: 16 },
+      axisLabel: { formatter: '{value} %', fontSize: 13 },
       axisLine: {
         lineStyle: {
           color: '#fff'
@@ -180,7 +182,7 @@ export const bottomCenterOptions = {
   legend: {
     data: ['非任务携行航材利用率', '任务携行航材利用率'],
     textStyle: {
-      fontSize: 16,
+      fontSize: 13,
       color: '#fff'
     }
   },
@@ -208,7 +210,8 @@ export const bottomCenterOptions = {
         }
       },
       axisLabel: {
-        fontSize: 16
+        fontSize: 13,
+        rotate: 45
       },
       triggerEvent: true
     }
@@ -216,7 +219,7 @@ export const bottomCenterOptions = {
   yAxis: [
     {
       type: 'value',
-      axisLabel: { formatter: '{value} %', fontSize: 16 },
+      axisLabel: { formatter: '{value} %', fontSize: 13 },
       axisLine: {
         lineStyle: {
           color: '#fff'
@@ -257,7 +260,7 @@ export const bottomRightOptions = {
   legend: {
     data: ['非任务携行航材利用率', '任务携行航材利用率'],
     textStyle: {
-      fontSize: 16,
+      fontSize: 13,
       color: '#fff'
     }
   },
@@ -285,7 +288,8 @@ export const bottomRightOptions = {
         }
       },
       axisLabel: {
-        fontSize: 16
+        fontSize: 13,
+        rotate: 45
       },
       triggerEvent: true
     }
@@ -293,7 +297,7 @@ export const bottomRightOptions = {
   yAxis: [
     {
       type: 'value',
-      axisLabel: { formatter: '{value} %', fontSize: 16 },
+      axisLabel: { formatter: '{value} %', fontSize: 13 },
       axisLine: {
         lineStyle: {
           color: '#fff'

src/views/task/carrierFlightMission/components/aircraft/index.vue

@@ -212,6 +212,7 @@ export default {
       let postData = {
         taskId: this.taskId,
         aircaftCatalogId: this.tableData[index].aircaftCatalogId,
+        aircaftCatalogCode: this.tableData[index].aircaftCatalogCode,
         planFlyDuration: this.tableData[index].planFlyDuration
       }
       const { code, data } = await addFlyTaskAircraft([postData])
@@ -227,6 +228,7 @@ export default {
       let postData = {
         taskId: this.taskId,
         aircaftCatalogId: this.tableData[index].aircaftCatalogId,
+        aircaftCatalogCode: this.tableData[index].aircaftCatalogCode,
         planFlyDuration: this.tableData[index].planFlyDuration,
         flyTaskAircaftId: this.tableData[index].flyTaskAircaftId
       }