소스 검색

合并武汉代码、退化分析增加时间区间

Rmengdi 3 달 전
부모
커밋
b80bbbce18

+ 27 - 0
package-lock.json

@@ -32,6 +32,7 @@
         "vue-demi": "^0.14.10",
         "vue-router": "^3.5.1",
         "vue-smooth-dnd": "^0.8.1",
+        "vuedraggable": "^2.24.3",
         "vuex": "^3.6.2"
       },
       "devDependencies": {
@@ -11351,6 +11352,11 @@
         "websocket-driver": "^0.7.4"
       }
     },
+    "node_modules/sortablejs": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
@@ -12426,6 +12432,14 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/vuedraggable": {
+      "version": "2.24.3",
+      "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "dependencies": {
+        "sortablejs": "1.10.2"
+      }
+    },
     "node_modules/vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",
@@ -21092,6 +21106,11 @@
         "websocket-driver": "^0.7.4"
       }
     },
+    "sortablejs": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
@@ -21875,6 +21894,14 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "vuedraggable": {
+      "version": "2.24.3",
+      "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+      "requires": {
+        "sortablejs": "1.10.2"
+      }
+    },
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.6.2.tgz",

+ 1 - 0
package.json

@@ -32,6 +32,7 @@
     "vue-demi": "^0.14.10",
     "vue-router": "^3.5.1",
     "vue-smooth-dnd": "^0.8.1",
+    "vuedraggable": "^2.24.3",
     "vuex": "^3.6.2"
   },
   "devDependencies": {

+ 1 - 1
src/components/FittingsModal/index.js

@@ -19,7 +19,7 @@ export const columns = (_this) => [
 
   {
     prop: 'mechanician',
-    label: '驾驶员'
+    label: '机械师'
   },
   {
     button: true,

+ 337 - 3
src/components/LTable/index.vue

@@ -1,5 +1,10 @@
 <template>
   <div class="table-page">
+    <!-- 添加列设置按钮 -->
+    <div class="table-settings" v-if="showColumnSetting">
+      <el-button type="text" @click="showColumnSettings"> <i class="el-icon-setting"></i> 列设置 </el-button>
+    </div>
+
     <el-table
       :key="renderKey"
       ref="elTablet"
@@ -15,19 +20,22 @@
       @row-click="handleRowClick"
       @selection-change="handleSelectionChange"
       @current-change="handleCurrentChange"
+      @header-dragend="handleHeaderDragend"
       highlight-current-row
       default-expand-all
       :cell-style="cellStyle"
       :header-cell-style="{ color: '#515a6e', background: '#f5f5f5' }"
       :tree-props="options.treeProps"
       :row-style="{ cursor: options.cursor || '' }"
+      :resizable="true"
+      :fit="true"
     >
       <!--selection选择框-->
       <el-table-column v-if="options.mutiSelect" type="selection" :reserve-selection="true" style="width: 50px" align="center"> </el-table-column>
       <!--序号-->
       <el-table-column v-if="options.index" label="序号" type="index" width="100" align="center"> </el-table-column>
       <!--数据列-->
-      <template v-for="(column, index) in columns">
+      <template v-for="(column, index) in localTableColumns">
         <el-table-column :key="index" :prop="column.prop" :label="column.label" :align="column.align || 'center'" :width="column.width" :fixed="column.fixed" show-overflow-tooltip v-if="!column.isHidden">
           <template slot-scope="scope">
             <!--  含有click函数 -->
@@ -122,10 +130,34 @@
       @current-change="handleIndexChange"
       style="padding: 20px; text-align: center"
     ></el-pagination>
+
+    <!-- 添加列设置弹窗 -->
+    <el-dialog v-if="showColumnSetting" title="列设置" :visible.sync="columnSettingsVisible" width="500px">
+      <div class="dialog-header">
+        <el-checkbox v-model="showAllColumns" @change="toggleAllColumns">全选</el-checkbox>
+        <el-button type="text" @click="handleInitConfig">初始化配置</el-button>
+      </div>
+      <el-divider></el-divider>
+      <draggable v-model="localColumns" handle=".drag-handle" @end="handleDragEnd">
+        <div v-for="(col, index) in localColumns" :key="index" class="column-item">
+          <i class="el-icon-rank drag-handle"></i>
+          <el-checkbox v-model="col.isShow" @change="handleColumnChange">
+            {{ col.label }}
+          </el-checkbox>
+        </div>
+      </draggable>
+      <span slot="footer">
+        <el-button @click="columnSettingsVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveColumnSettings">确定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 import { deepClone } from '@/utils'
+import draggable from 'vuedraggable'
+import { post } from '@/http/index'
+
 export default {
   name: 'LTable',
   components: {
@@ -150,7 +182,8 @@ export default {
         if (data.props.column) params.column = data.props.column
         return data.props.render(h, params)
       }
-    }
+    },
+    draggable
   },
   props: {
     dictData: Object, //字典对象
@@ -170,6 +203,17 @@ export default {
     RowKey: {
       type: String,
       default: 'id'
+    },
+    tableId: {
+      // 表格唯一标识,用于保存和获取表格配置,为空时使用当前组件路径
+      type: String,
+      required: false, // 改为非必填
+      default: '' // 默认为空字符串
+    },
+    showColumnSetting: {
+      type: Boolean,
+      required: false,
+      default: true // 默认显示
     }
   },
   computed: {
@@ -198,7 +242,12 @@ export default {
       renderKey: Math.random(),
       logo: require('@/assets/logo.png'),
       checkedKeys: false,
-      editStatusMap: {}
+      editStatusMap: {},
+      columnSettingsVisible: false, // 控制列设置弹窗的显示/隐藏
+      localColumns: [], // 用于列设置弹窗
+      localTableColumns: [], // 用于实际表格渲染
+      showAllColumns: true,
+      currentTableId: ''
     }
   },
   filters: {
@@ -208,13 +257,64 @@ export default {
     }
   },
   created() {
+    // 初始化本地表格数据
+    this.localTableColumns = this.columns.map((col) => ({
+      ...col,
+      isHidden: false
+    }))
+    this.initTableId()
+
     if (this.defaultFetch) {
       this.options.initTable && this.fetch()
     } else {
       this.options.initTable
     }
+    this.initColumnSettings()
   },
   methods: {
+    /**
+     * 初始化表格ID
+     * 使用父组件路由路径和当前组件name生成唯一标识
+     */
+    initTableId() {
+      if (this.tableId) {
+        this.currentTableId = this.tableId
+      } else {
+        // 获取父组件实例
+        const parent = this.$parent
+        let parentPath = ''
+
+        // 获取父组件的路由路径
+        if (parent && parent.$route) {
+          parentPath = parent.$route.path
+        }
+
+        // 获取当前组件的name
+        const componentName = parent.$options.name || ''
+
+        // 生成唯一标识:父组件路径-组件名称-索引
+        let instanceId = `${parentPath}-${componentName}`
+
+        // 如果同一个父组件中有多个相同的表格组件,添加索引区分
+        if (parent) {
+          const siblings = parent.$children.filter((child) => child.$options.name === componentName)
+          const index = siblings.indexOf(this)
+          if (index > 0) {
+            instanceId += `-${index}`
+          }
+        }
+
+        this.currentTableId = instanceId
+          .replace(/^\//, '') // 移除开头的斜杠
+          .replace(/\//g, '-') // 将路径分隔符替换为横杠
+          .replace(/[^a-zA-Z0-9\-_]/g, '-') // 只保留字母、数字、横杠和下划线
+          .replace(/\-+/g, '-') // 将多个连续横杠替换为单个
+          .replace(/^\-|\-$/g, '') // 移除首尾的横杠
+          .toLowerCase() // 转为小写
+      }
+
+      console.log('当前表格ID:', this.currentTableId)
+    },
     hasChildren(row, showType) {
       //父级显示
       if (showType && showType == '0') {
@@ -348,10 +448,244 @@ export default {
     },
     flattenArray(arr) {
       return [].concat(...arr.map((item) => (Array.isArray(item.children) ? this.flattenArray(item.children) : item)))
+    },
+    /**
+     * 初始化列设置
+     * 从后端获取用户保存的表格配置
+     */
+    async initColumnSettings() {
+      try {
+        const response = await post('/tableConfig/userTableConfig/getUserTableConfig', {
+          tableName: this.currentTableId
+        })
+
+        if (response.data) {
+          const columnConfig = JSON.parse(response.data.columnConfig)
+
+          // 更新 localColumns 和 localTableColumns
+          this.localColumns = this.columns.map((col) => {
+            const savedCol = columnConfig.columns.find((c) => c.prop === col.prop)
+            return {
+              ...col,
+              isShow: savedCol ? savedCol.isShow : true,
+              width: savedCol ? savedCol.width : col.width
+            }
+          })
+
+          // 更新表格显示列
+          this.updateTableColumns()
+        } else {
+          // 没有保存的配置,使用默认配置
+          this.localColumns = this.columns.map((col) => ({
+            ...col,
+            isShow: true
+          }))
+          this.localTableColumns = [...this.columns]
+        }
+
+        this.$nextTick(() => {
+          this.renderKey = Math.random()
+        })
+      } catch (error) {
+        console.error('获取表格配置失败:', error)
+        // 使用默认配置
+        this.localColumns = this.columns.map((col) => ({
+          ...col,
+          isShow: true
+        }))
+        this.localTableColumns = [...this.columns]
+      }
+    },
+
+    /**
+     * 显示列设置弹窗
+     */
+    showColumnSettings() {
+      this.columnSettingsVisible = true
+      this.checkShowAllStatus()
+    },
+
+    /**
+     * 切换全选状态
+     * @param {Boolean} val - 是否全选
+     */
+    toggleAllColumns(val) {
+      this.localColumns.forEach((col) => {
+        col.isShow = val
+      })
+    },
+
+    /**
+     * 处理单个列显示状态变化
+     */
+    handleColumnChange() {
+      this.checkShowAllStatus()
+    },
+
+    /**
+     * 检查是否所有列都被选中,更新全选状态
+     */
+    checkShowAllStatus() {
+      this.showAllColumns = this.localColumns.every((col) => col.isShow)
+    },
+
+    /**
+     * 处理拖拽排序完成事件
+     * 仅更新 localColumns 的顺序,不立即应用到表格
+     */
+    handleDragEnd() {
+      // 拖拽排序时只记录新的顺序,不立即更新表格显示
+      console.log('列顺序已更改,点击确定后生效')
+    },
+
+    /**
+     * 保存列设置到后端
+     * 包括列的显示状态、顺序和宽度
+     */
+    async saveColumnSettings() {
+      const columnConfig = {
+        columns: this.localColumns.map(({ prop, isShow, width }, index) => ({
+          prop,
+          isShow,
+          width,
+          order: index
+        }))
+      }
+
+      try {
+        await post('/tableConfig/userTableConfig/save', {
+          tableName: this.currentTableId,
+          columnConfig: JSON.stringify(columnConfig)
+        })
+
+        // 更新表格显示列
+        this.updateTableColumns()
+
+        this.columnSettingsVisible = false
+        this.$nextTick(() => {
+          this.renderKey = Math.random()
+        })
+
+        this.$message.success('配置保存成功')
+      } catch (error) {
+        console.error('保存表格配置失败:', error)
+        this.$message.error('配置保存失败')
+      }
+    },
+
+    /**
+     * 初始化列配置
+     * 重置为系统默认配置
+     */
+    async handleInitConfig() {
+      try {
+        await this.$confirm('确定要初始化列配置吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+
+        await post('/tableConfig/userTableConfig/initUserTableConfig', {
+          tableName: this.currentTableId
+        })
+
+        // 重新获取配置
+        await this.initColumnSettings()
+
+        this.$message.success('初始化配置成功')
+      } catch (error) {
+        if (error !== 'cancel') {
+          // 排除取消操作的错误
+          console.error('初始化配置失败:', error)
+          this.$message.error('初始化配置失败')
+        }
+      }
+    },
+
+    // 新增方法:根据 localColumns 更新表格显示列
+    updateTableColumns() {
+      this.localTableColumns = this.localColumns.map((col) => ({
+        ...col,
+        isHidden: !col.isShow
+      }))
+    },
+
+    /**
+     * 处理列宽拖动结束事件
+     * @param {Number} newWidth - 新的宽度
+     * @param {Number} oldWidth - 旧的宽度
+     * @param {Object} column - 列对象
+     */
+    handleHeaderDragend(newWidth, oldWidth, column) {
+      // 如果宽度没有变化,不处理
+      if (newWidth === oldWidth) return
+
+      // 更新本地配置
+      const targetColumn = this.localColumns.find((col) => col.prop === column.property)
+      if (targetColumn) {
+        targetColumn.width = newWidth
+      }
+
+      // 更新表格显示列
+      this.updateTableColumns()
+
+      // 保存到后台
+      this.saveColumnSettings()
+    }
+  },
+  // 可选:添加 watch 来监听原始 columns 的变化
+  watch: {
+    columns: {
+      handler(newColumns) {
+        // 当原始列变化时,更新本地列
+        this.localTableColumns = newColumns.map((col) => ({
+          ...col,
+          isHidden: false
+        }))
+      },
+      deep: true
     }
   }
 }
 </script>
 <style lang="scss" scoped>
 @import './index.scss';
+
+.table-settings {
+  margin-bottom: 10px;
+  text-align: right;
+}
+
+.column-item {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border-bottom: 1px solid #ebeef5;
+
+  .drag-handle {
+    cursor: move; // 显示移动光标
+    margin-right: 10px;
+    color: #909399;
+  }
+}
+
+.table-page {
+  .el-table {
+    // 添加过渡效果使宽度变化更平滑
+    ::v-deep .el-table__header-wrapper,
+    ::v-deep .el-table__body-wrapper {
+      th,
+      td {
+        transition: width 0.2s;
+      }
+    }
+  }
+}
+
+.dialog-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 5px;
+}
 </style>

+ 23 - 4
src/views/als/lifePrediction/index.vue

@@ -135,11 +135,11 @@ export default {
           label: '部件编码'
         },
         {
-          prop: 'timeInterval',
+          prop: 'timeRange',
           label: '时间区间'
         },
         {
-          prop: 'sortieNum',
+          prop: 'sortiesCount',
           label: '架次数量'
         },
         {
@@ -243,7 +243,9 @@ export default {
         methodType: '',
         status: '',
         resultContent: '',
-        ossIds: []
+        ossIds: [],
+        timeRange: '',
+        sortiesCount: ''
       },
       debounceFn: debounce(this.fetch, 500),
       aircaftCatalogAll: [],
@@ -405,7 +407,9 @@ export default {
         methodType: '',
         status: '',
         resultContent: '',
-        ossIds: []
+        ossIds: [],
+        timeRange: '',
+        sortiesCount: ''
       }
     },
 
@@ -432,6 +436,21 @@ export default {
         })
         return
       }
+      if (this.sortieNoCheckItems.length == 1) {
+        this.form.timeRange = this.sortieNoCheckItems[0].flightDate
+      } else {
+        let minDate = this.sortieNoCheckItems[0].flightDate
+        let maxDate = this.sortieNoCheckItems[0].flightDate
+        for (let i = 1; i < this.sortieNoCheckItems.length; i++) {
+          let currentDate = this.sortieNoCheckItems[i].flightDate
+          if (currentDate < minDate) {
+            minDate = currentDate
+          } else if (currentDate > maxDate) {
+            maxDate = currentDate
+          }
+        }
+        this.form.timeRange = `${minDate} 至 ${maxDate}`
+      }
       this.progressVisible = true
 
       let myTimer = setInterval(() => {

+ 1 - 1
src/views/basicData/dataAircraftCataloging/index.js

@@ -11,7 +11,7 @@ export const columns = (_this) => [
   },
   {
     prop: 'mechanician',
-    label: '驾驶员'
+    label: '机械师'
   },
 
   {

+ 1 - 1
src/views/basicData/dataAircraftCataloging/index.vue

@@ -31,7 +31,7 @@
           <el-form-item label="飞机编号">
             <el-input v-model="form.aircaftCatalogCode"></el-input>
           </el-form-item>
-          <el-form-item label="驾驶员">
+          <el-form-item label="机械师">
             <el-input v-model="form.mechanician"></el-input>
           </el-form-item>
           <el-form-item label="所属机型">

+ 1 - 1
src/views/carrierStandard/carrierListExecutionRegistration/components/look/index.js

@@ -13,7 +13,7 @@ export const columns = (_this) => [
   },
   {
     prop: 'mechanician',
-    label: '驾驶员'
+    label: '机械师'
   },
   {
     prop: 'planFlyDuration',

+ 1 - 1
src/views/carrierStandard/carrierListExecutionRegistration/components/registering/index.js

@@ -13,7 +13,7 @@ export const columns = (_this) => [
   },
   {
     prop: 'mechanician',
-    label: '驾驶员'
+    label: '机械师'
   },
   {
     prop: 'planFlyDuration',

+ 3 - 3
src/views/carrierStandard/carrierListMachineryPreparation/components/compile/index.vue

@@ -4,7 +4,7 @@
       <MenuTree ref="tree" nodeKey="flyTaskAircaftId" :currentNodeKey="currentNodeKey" :treedata="menuTreeData" @TreeNodeclick="treeNodeClick" v-bind="treeObj"> </MenuTree>
     </div>
     <div class="view-AerospaceCompileLineList-right">
-      <MissionDetail :detail="detail" />
+      <!-- <MissionDetail :detail="detail" /> -->
       <div class="view-AerospaceCompileLineList-right-btn">
         <div class="view-AerospaceCompileLineList-right-btn-left">
           <el-button type="primary" @click="varietyRecommendation">品种推荐</el-button>
@@ -23,7 +23,7 @@
       </div>
 
       <div class="view-AerospaceCompileLineList-right-table">
-        <el-table :data="tableData" border style="width: 100%" height="calc(100vh - 420px)">
+        <el-table :data="tableData" border style="width: 100%" height="calc(100vh - 350px)">
           <el-table-column prop="avmatCatalogCode" label="航材编码" width="150px">
             <template slot-scope="scope">
               <i class="el-icon-edit cell-edit" @click="sparePartsCodingClick(scope.$index, scope.row)"></i>
@@ -161,7 +161,7 @@ export default {
       tableData: [],
       pagination: {
         total: 100,
-        pageSize: 10,
+        pageSize: 20,
         pageIndex: 1
       },
 

+ 3 - 3
src/views/carrierStandard/carrierListMachineryPreparation/components/look/index.vue

@@ -4,7 +4,7 @@
       <MenuTree ref="tree" nodeKey="flyTaskAircaftId" :currentNodeKey="currentNodeKey" :treedata="menuTreeData" @TreeNodeclick="treeNodeClick" v-bind="treeObj"> </MenuTree>
     </div>
     <div class="view-AerospaceCompileLineList-right">
-      <MissionDetail :detail="detail" />
+      <!-- <MissionDetail :detail="detail" /> -->
       <div class="view-AerospaceCompileLineList-right-btn">
         <div class="view-AerospaceCompileLineList-right-btn-left"></div>
         <div class="view-AerospaceCompileLineList-right-btn-right">
@@ -15,7 +15,7 @@
       </div>
 
       <div class="view-AerospaceCompileLineList-right-table">
-        <el-table :data="tableData" border style="width: 100%" height="calc(100vh - 420px)">
+        <el-table :data="tableData" border style="width: 100%" height="calc(100vh - 350px)">
           <el-table-column prop="avmatCatalogCode" label="航材编码"> </el-table-column>
           <el-table-column prop="avmatCatalogName" label="航材名称" align="center"> </el-table-column>
           <el-table-column prop="specification" label="航材型号" align="center"> </el-table-column>
@@ -120,7 +120,7 @@ export default {
       tableData: [],
       pagination: {
         total: 100,
-        pageSize: 10,
+        pageSize: 20,
         pageIndex: 1
       },
       cache: 'fdz',

+ 1 - 1
src/views/carrierStandard/carrierUseRegistration/components/look/index.vue

@@ -16,7 +16,7 @@
       </div>
 
       <div class="view-dataType-table">
-        <el-table :data="tableData" border style="width: 100%" height="calc(100vh - 420px)">
+        <el-table :data="tableData" border style="width: 100%" height="calc(100vh - 350px)">
           <el-table-column prop="avmatCatalogName" label="航材名称" align="center"> </el-table-column>
           <el-table-column prop="avmatCatalogCode" label="航材编码" align="center"> </el-table-column>
           <el-table-column prop="specification" label="规格型号" align="center"> </el-table-column>

+ 2 - 2
src/views/home/index.vue

@@ -32,7 +32,7 @@
       <el-col :span="24" style="margin-bottom: 65px">
         <Card title="维修状态">
           <template slot="content">
-            <LTable ref="maintainTable" :defaultFetch="true" :columns="maintainColumns" :dataSource="maintainTableData" :options="maintainOptions" :fetch="maintainFetchTableData" :pagination="tableRequset" class="tabl-box" />
+            <LTable ref="maintainTable" :defaultFetch="true" :columns="maintainColumns" :showColumnSetting="false" :dataSource="maintainTableData" :options="maintainOptions" :fetch="maintainFetchTableData" :pagination="tableRequset" class="tabl-box" />
           </template>
         </Card>
       </el-col>
@@ -41,7 +41,7 @@
       <el-col :span="12" style="margin-bottom: 15px">
         <Card title="历年任务">
           <template slot="content">
-            <LTable ref="table" :defaultFetch="true" :columns="columns" :dataSource="tableData" :options="options" :fetch="fetchTableData" class="tabl-box" />
+            <LTable ref="table" :defaultFetch="true" :showColumnSetting="false" :columns="columns" :dataSource="tableData" :options="options" :fetch="fetchTableData" class="tabl-box" />
           </template>
         </Card>
       </el-col>

+ 1 - 1
src/views/statisticalAnalysis/statisticalAnalysisSafeguardSynthesize/index.vue

@@ -4,7 +4,7 @@
       <el-col :span="12" style="margin-bottom: 15px">
         <Card title="历年任务">
           <template slot="content">
-            <LTable ref="table" :defaultFetch="true" :columns="columns" :dataSource="tableData" :options="options" :fetch="fetchTableData" @handleRowClick="handleRowClick" class="tabl-box" />
+            <LTable ref="table" :defaultFetch="true" :showColumnSetting="false" :columns="columns" :dataSource="tableData" :options="options" :fetch="fetchTableData" @handleRowClick="handleRowClick" class="tabl-box" />
           </template>
         </Card>
       </el-col>

+ 1 - 1
src/views/statisticalAnalysis/statisticalAnalysisSailingMaterialSpareParts/index.vue

@@ -4,7 +4,7 @@
       <el-col :span="12" style="margin-bottom: 15px">
         <Card title="历年任务">
           <template slot="content">
-            <LTable ref="table" :defaultFetch="true" :columns="columns" :dataSource="tableData" :options="options" :fetch="fetchTableData" @handleRowClick="handleRowClick" class="tabl-box" />
+            <LTable ref="table" :defaultFetch="true" :showColumnSetting="false" :columns="columns" :dataSource="tableData" :options="options" :fetch="fetchTableData" @handleRowClick="handleRowClick" class="tabl-box" />
           </template>
         </Card>
       </el-col>

+ 2 - 2
src/views/task/carrierFlightMission/components/aircraft/index.vue

@@ -19,7 +19,7 @@
         </el-table-column>
         <el-table-column prop="aircaftModelName" label="机型" align="center"> </el-table-column>
         <el-table-column prop="aircaftTypeName" label="机种" align="center"> </el-table-column>
-        <el-table-column prop="mechanician" label="驾驶员" align="center"> </el-table-column>
+        <el-table-column prop="mechanician" label="机械师" align="center"> </el-table-column>
         <el-table-column prop="planFlyDuration" label="计划飞行时长/小时" align="center">
           <template slot-scope="scope">
             <template v-if="scope.row.planFlyDuration.value || scope.row.planFlyDuration.value == ''">
@@ -73,7 +73,7 @@ export default {
       ],
       pagination: {
         total: 100,
-        pageSize: 10,
+        pageSize: 20,
         pageIndex: 1
       },
       tableData: [],