dev

src/api/ledger/airModel.js

@@ -42,3 +42,11 @@ export function delAirModel(id) {
     method: 'delete'
   })
 }
+
+export function getAirOption() {
+  return request({
+    url: '/ledger/airModel/getOption',
+    method: 'get'
+  })
+}
+

src/api/ledger/airRecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询飞机履历列表
+export function listAirRecord(query) {
+  return request({
+    url: '/ledger/airRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询飞机履历详细
+export function getAirRecord(id) {
+  return request({
+    url: '/ledger/airRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增飞机履历
+export function addAirRecord(data) {
+  return request({
+    url: '/ledger/airRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改飞机履历
+export function updateAirRecord(data) {
+  return request({
+    url: '/ledger/airRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除飞机履历
+export function delAirRecord(id) {
+  return request({
+    url: '/ledger/airRecord/' + id,
+    method: 'delete'
+  })
+}

src/components/DictTag/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <span>
     <template v-for="(item, index) in options">
       <template v-if="values.includes(item.value)">
         <span
@@ -21,7 +21,7 @@
         </el-tag>
       </template>
     </template>
-  </div>
+  </span>
 </template>
 
 <script>

src/components/Echarts/graph.vue

@@ -182,7 +182,8 @@ export default {
 </script>
 <style scoped>
 .chart {
-  width: 800px;
+  width: 900px;
   height: 600px;
+  border: 1px solid wheat;
 }
 </style>

src/views/ledger/airModel/index.vue

@@ -9,10 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="型号" prop="modelNumber">
+      <el-form-item label="机型" prop="modelNumber">
         <el-input
           v-model="queryParams.modelNumber"
-          placeholder="请输入型号"
+          placeholder="请输入机型"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -97,7 +97,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="机号" align="center" prop="airNumber" />
-      <el-table-column label="型号" align="center" prop="modelNumber" />
+      <el-table-column label="机型" align="center" prop="modelNumber" />
       <el-table-column label="编号" align="center" prop="serial" />
       <el-table-column label="出厂日期" align="center" prop="productionDate" width="180">
         <template slot-scope="scope">
@@ -139,8 +139,8 @@
         <el-form-item label="机号" prop="airNumber">
           <el-input v-model="form.airNumber" placeholder="请输入机号" />
         </el-form-item>
-        <el-form-item label="型号" prop="modelNumber">
-          <el-input v-model="form.modelNumber" placeholder="请输入型号" />
+        <el-form-item label="机型" prop="modelNumber">
+          <el-input v-model="form.modelNumber" placeholder="请输入机型" />
         </el-form-item>
         <el-form-item label="编号" prop="serial">
           <el-input v-model="form.serial" placeholder="请输入编号" />

src/views/ledger/airPart/index.vue

@@ -1,30 +1,40 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="型号" prop="modelNumber">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
+      <el-form-item label="部件名称" prop="name">
         <el-input
-          v-model="queryParams.modelNumber"
-          placeholder="请输入型号"
+          v-model="queryParams.name"
+          placeholder="请输入部件名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="机号" prop="airNumber">
+      <el-form-item label="型号" prop="modelNumber">
         <el-input
-          v-model="queryParams.airNumber"
-          placeholder="请输入机号"
+          v-model="queryParams.modelNumber"
+          placeholder="请输入型号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="编号" prop="serial">
+      <el-form-item label="部件编号" prop="serial">
         <el-input
           v-model="queryParams.serial"
-          placeholder="请输入编号"
+          placeholder="请输入部件编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="安装飞机号" prop="airModelId">
+        <el-select v-model="queryParams.airModelId" filterable clearable placeholder="请选择安装飞机号">
+            <el-option
+              v-for="item in airOption"
+              :key="item.id"
+              :label="item.airNumber"
+              :value="item.id">
+            </el-option>
+          </el-select>
+      </el-form-item>
       <el-form-item label="出厂日期" prop="productionDate">
         <el-date-picker clearable
           v-model="queryParams.productionDate"
@@ -104,9 +114,10 @@
     <el-table v-loading="loading" :data="airPartList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="部件名称" align="center" prop="name" />
       <el-table-column label="型号" align="center" prop="modelNumber" />
-      <el-table-column label="机号" align="center" prop="airNumber" />
-      <el-table-column label="编号" align="center" prop="serial" />
+      <el-table-column label="部件编号" align="center" prop="serial" />
+      <el-table-column label="安装飞机号" align="center" prop="airNumber" />
       <el-table-column label="出厂日期" align="center" prop="productionDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
@@ -144,15 +155,25 @@
 
     <!-- 添加或修改部件基本信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="85px">
+        <el-form-item label="部件名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入部件名称" />
+        </el-form-item>
         <el-form-item label="型号" prop="modelNumber">
           <el-input v-model="form.modelNumber" placeholder="请输入型号" />
         </el-form-item>
-        <el-form-item label="机号" prop="airNumber">
-          <el-input v-model="form.airNumber" placeholder="请输入机号" />
+        <el-form-item label="部件编号" prop="serial">
+          <el-input v-model="form.serial" placeholder="请输入部件编号" />
         </el-form-item>
-        <el-form-item label="编号" prop="serial">
-          <el-input v-model="form.serial" placeholder="请输入编号" />
+        <el-form-item label="安装飞机号" prop="airNumber">
+          <el-select v-model="form.airModelId" filterable clearable placeholder="请选择安装飞机号">
+            <el-option
+              v-for="item in airOption"
+              :key="item.id"
+              :label="item.airNumber"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="出厂日期" prop="productionDate">
           <el-date-picker clearable
@@ -179,6 +200,7 @@
 
 <script>
 import { listAirPart, getAirPart, delAirPart, addAirPart, updateAirPart } from "@/api/ledger/airPart";
+import { getAirOption } from "@/api/ledger/airModel";
 
 export default {
   name: "AirPart",
@@ -206,6 +228,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        name: null,
         modelComponentId: null,
         modelNumber: null,
         airModelId: null,
@@ -224,6 +247,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getAirOption();
   },
   methods: {
     /** 查询部件基本信息列表 */
@@ -244,6 +268,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        name: null,
         modelComponentId: null,
         modelNumber: null,
         airModelId: null,
@@ -314,7 +339,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除部件基本信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除部件基本信息序号为"' + ids + '"的数据项？').then(function() {
         return delAirPart(ids);
       }).then(() => {
         this.getList();
@@ -326,7 +351,12 @@ export default {
       this.download('ledger/airPart/export', {
         ...this.queryParams
       }, `airPart_${new Date().getTime()}.xlsx`)
-    }
+    },
+    getAirOption(){
+      getAirOption().then(resp => {
+        this.airOption = resp.data
+      })
+    },
   }
 };
 </script>

src/views/ledger/airRecord/index.vue

@@ -0,0 +1,418 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <!-- <el-form-item label="飞机id" prop="airModelId">
+        <el-input
+          v-model="queryParams.airModelId"
+          placeholder="请输入飞机id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="型号" prop="modelNumber">
+        <el-input
+          v-model="queryParams.modelNumber"
+          placeholder="请输入型号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="机号id" prop="airId">
+        <el-input
+          v-model="queryParams.airId"
+          placeholder="请输入机号id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="机号" prop="airNumber">
+        <el-input
+          v-model="queryParams.airNumber"
+          placeholder="请输入机号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="飞机编号" prop="serial">
+        <el-input
+          v-model="queryParams.serial"
+          placeholder="请输入飞机编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="版本号" prop="version">
+        <el-input
+          v-model="queryParams.version"
+          placeholder="请输入版本号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出厂日期" prop="productionDate">
+        <el-date-picker clearable
+          v-model="queryParams.productionDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择出厂日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="厂家信息" prop="productionInfo">
+        <el-input
+          v-model="queryParams.productionInfo"
+          placeholder="请输入厂家信息"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="升级日期" prop="versionUpdateDate">
+        <el-date-picker clearable
+          v-model="queryParams.versionUpdateDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择版本升级日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="维修次数" prop="repairTimes">
+        <el-input
+          v-model="queryParams.repairTimes"
+          placeholder="请输入维修次数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="维修时间" prop="repairDate">
+        <el-date-picker clearable
+          v-model="queryParams.repairDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择维修时间">
+        </el-date-picker>
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ledger:airRecord:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['ledger:airRecord:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['ledger:airRecord:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['ledger:airRecord:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="airRecordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <!-- <el-table-column label="飞机id" align="center" prop="airModelId" /> -->
+      <el-table-column label="型号" align="center" prop="modelNumber" />
+      <!-- <el-table-column label="机号id" align="center" prop="airId" /> -->
+      <el-table-column label="机号" align="center" prop="airNumber" />
+      <el-table-column label="飞机编号" align="center" prop="serial" />
+      <el-table-column label="版本号" align="center" prop="version" />
+      <el-table-column label="出厂日期" align="center" prop="productionDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="厂家信息" align="center" prop="productionInfo" />
+      
+      <!-- <el-table-column label="版本升级日期" align="center" prop="versionUpdateDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.versionUpdateDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修次数" align="center" prop="repairTimes" />
+      <el-table-column label="维修时间" align="center" prop="repairDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.repairDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ledger:airRecord:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ledger:airRecord:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改飞机履历对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <!-- <el-form-item label="飞机id" prop="airModelId">
+          <el-input v-model="form.airModelId" placeholder="请输入飞机id" />
+        </el-form-item> -->
+        <el-form-item label="型号" prop="modelNumber">
+          <el-input v-model="form.modelNumber" placeholder="请输入型号" />
+        </el-form-item>
+        <!-- <el-form-item label="机号id" prop="airId">
+          <el-input v-model="form.airId" placeholder="请输入机号id" />
+        </el-form-item> -->
+        <el-form-item label="机号" prop="airNumber">
+          <el-input v-model="form.airNumber" placeholder="请输入机号" />
+        </el-form-item>
+        <el-form-item label="飞机编号" prop="serial">
+          <el-input v-model="form.serial" placeholder="请输入飞机编号" />
+        </el-form-item>
+        <el-form-item label="版本号" prop="version">
+          <el-input v-model="form.version" placeholder="请输入版本号" />
+        </el-form-item>
+        <el-form-item label="出厂日期" prop="productionDate">
+          <el-date-picker clearable
+            v-model="form.productionDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择出厂日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="厂家信息" prop="productionInfo">
+          <el-input v-model="form.productionInfo" placeholder="请输入厂家信息" />
+        </el-form-item>
+        <!-- <el-form-item label="版本升级日期" prop="versionUpdateDate">
+          <el-date-picker clearable
+            v-model="form.versionUpdateDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择版本升级日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="维修次数" prop="repairTimes">
+          <el-input v-model="form.repairTimes" placeholder="请输入维修次数" />
+        </el-form-item>
+        <el-form-item label="维修时间" prop="repairDate">
+          <el-date-picker clearable
+            v-model="form.repairDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择维修时间">
+          </el-date-picker>
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAirRecord, getAirRecord, delAirRecord, addAirRecord, updateAirRecord } from "@/api/ledger/airRecord";
+
+export default {
+  name: "AirRecord",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 飞机履历表格数据
+      airRecordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        airModelId: null,
+        modelNumber: null,
+        airId: null,
+        airNumber: null,
+        serial: null,
+        productionDate: null,
+        productionInfo: null,
+        version: null,
+        versionUpdateDate: null,
+        repairTimes: null,
+        repairDate: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      airOption:[]
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询飞机履历列表 */
+    getList() {
+      this.loading = true;
+      listAirRecord(this.queryParams).then(response => {
+        this.airRecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        airModelId: null,
+        modelNumber: null,
+        airId: null,
+        airNumber: null,
+        serial: null,
+        productionDate: null,
+        productionInfo: null,
+        version: null,
+        versionUpdateDate: null,
+        repairTimes: null,
+        repairDate: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加飞机履历";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAirRecord(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改飞机履历";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAirRecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAirRecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除飞机履历编号为"' + ids + '"的数据项？').then(function() {
+        return delAirRecord(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ledger/airRecord/export', {
+        ...this.queryParams
+      }, `airRecord_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/ledger/airSystem/index.vue

@@ -1,30 +1,40 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="型号" prop="modelNumber">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
+      <el-form-item label="系统名称" prop="name">
         <el-input
-          v-model="queryParams.modelNumber"
-          placeholder="请输入型号"
+          v-model="queryParams.name"
+          placeholder="请输入系统名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="机号" prop="airNumber">
+      <el-form-item label="型号" prop="modelNumber">
         <el-input
-          v-model="queryParams.airNumber"
-          placeholder="请输入机号"
+          v-model="queryParams.modelNumber"
+          placeholder="请输入型号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="编号" prop="serial">
+      <el-form-item label="系统编号" prop="serial">
         <el-input
           v-model="queryParams.serial"
-          placeholder="请输入编号"
+          placeholder="请输入系统编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="安装飞机号" prop="airModelId">
+        <el-select v-model="queryParams.airModelId" filterable clearable placeholder="请选择安装飞机号">
+            <el-option
+              v-for="item in airOption"
+              :key="item.id"
+              :label="item.airNumber"
+              :value="item.id">
+            </el-option>
+          </el-select>
+      </el-form-item>
       <el-form-item label="出厂日期" prop="productionDate">
         <el-date-picker clearable
           v-model="queryParams.productionDate"
@@ -104,9 +114,10 @@
     <el-table v-loading="loading" :data="airSystemList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="系统名称" align="center" prop="name" />
       <el-table-column label="型号" align="center" prop="modelNumber" />
-      <el-table-column label="机号" align="center" prop="airNumber" />
-      <el-table-column label="编号" align="center" prop="serial" />
+      <el-table-column label="系统编号" align="center" prop="serial" />
+      <el-table-column label="安装飞机号" align="center" prop="airNumber" />
       <el-table-column label="出厂日期" align="center" prop="productionDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
@@ -144,15 +155,25 @@
 
     <!-- 添加或修改系统基本信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="系统名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入系统名称" />
+        </el-form-item>
         <el-form-item label="型号" prop="modelNumber">
           <el-input v-model="form.modelNumber" placeholder="请输入型号" />
         </el-form-item>
-        <el-form-item label="机号" prop="airNumber">
-          <el-input v-model="form.airNumber" placeholder="请输入机号" />
+        <el-form-item label="系统编号" prop="serial">
+          <el-input v-model="form.serial" placeholder="请输入系统编号" />
         </el-form-item>
-        <el-form-item label="编号" prop="serial">
-          <el-input v-model="form.serial" placeholder="请输入编号" />
+        <el-form-item label="安装飞机号" prop="airModelId">
+          <el-select v-model="form.airModelId" filterable clearable placeholder="请选择安装飞机号">
+            <el-option
+              v-for="item in airOption"
+              :key="item.id"
+              :label="item.airNumber"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="出厂日期" prop="productionDate">
           <el-date-picker clearable
@@ -179,6 +200,7 @@
 
 <script>
 import { listAirSystem, getAirSystem, delAirSystem, addAirSystem, updateAirSystem } from "@/api/ledger/airSystem";
+import { getAirOption } from "@/api/ledger/airModel";
 
 export default {
   name: "AirSystem",
@@ -206,6 +228,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        name: null,
         modelComponentId: null,
         modelNumber: null,
         airModelId: null,
@@ -219,11 +242,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      airOption:[],
     };
   },
   created() {
     this.getList();
+    this.getAirOption();
   },
   methods: {
     /** 查询系统基本信息列表 */
@@ -244,6 +269,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        name: null,
         modelComponentId: null,
         modelNumber: null,
         airModelId: null,
@@ -314,7 +340,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除系统基本信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除系统基本信序号为"' + ids + '"的数据项？').then(function() {
         return delAirSystem(ids);
       }).then(() => {
         this.getList();
@@ -326,7 +352,12 @@ export default {
       this.download('ledger/airSystem/export', {
         ...this.queryParams
       }, `airSystem_${new Date().getTime()}.xlsx`)
-    }
+    },
+    getAirOption(){
+      getAirOption().then(resp => {
+        this.airOption = resp.data
+      })
+    },
   }
 };
 </script>

src/views/ledger/baseModel/index.vue

@@ -62,7 +62,11 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column label="类型" prop="type" />
+      <el-table-column label="类型" prop="type" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.air_base_model" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="父id" align="center" prop="parentId" /> -->
       <el-table-column label="型号" align="center" prop="modelNumber" />
       <el-table-column label="名称" align="center" prop="name" />
@@ -121,6 +125,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "BaseModel",
+  dicts: ['air_base_model'],
   components: {
     Treeselect
   },

src/views/ledger/baseSubsystem/index.vue

@@ -1,30 +1,40 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="型号" prop="modelNumber">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
+      <el-form-item label="分系统名称" prop="name">
         <el-input
-          v-model="queryParams.modelNumber"
-          placeholder="请输入型号"
+          v-model="queryParams.name"
+          placeholder="请输入分系统名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="机号" prop="airNumber">
+      <el-form-item label="型号" prop="modelNumber">
         <el-input
-          v-model="queryParams.airNumber"
-          placeholder="请输入机号"
+          v-model="queryParams.modelNumber"
+          placeholder="请输入型号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="编号" prop="serial">
+      <el-form-item label="分系统编号" prop="serial">
         <el-input
           v-model="queryParams.serial"
-          placeholder="请输入编号"
+          placeholder="请输入分系统编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="安装飞机号" prop="airModelId">
+        <el-select v-model="queryParams.airModelId" filterable clearable placeholder="请选择安装飞机号">
+            <el-option
+              v-for="item in airOption"
+              :key="item.id"
+              :label="item.airNumber"
+              :value="item.id">
+            </el-option>
+          </el-select>
+      </el-form-item>
       <el-form-item label="出厂日期" prop="productionDate">
         <el-date-picker clearable
           v-model="queryParams.productionDate"
@@ -104,9 +114,10 @@
     <el-table v-loading="loading" :data="baseSubsystemList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="分系统名称" align="center" prop="name" />
       <el-table-column label="型号" align="center" prop="modelNumber" />
-      <el-table-column label="机号" align="center" prop="airNumber" />
-      <el-table-column label="编号" align="center" prop="serial" />
+      <el-table-column label="分系统编号" align="center" prop="serial" />
+      <el-table-column label="安装飞机号" align="center" prop="airNumber" />
       <el-table-column label="出厂日期" align="center" prop="productionDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
@@ -144,15 +155,25 @@
 
     <!-- 添加或修改分系统基本信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <el-form-item label="分系统名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入分系统名称" />
+        </el-form-item>
         <el-form-item label="型号" prop="modelNumber">
           <el-input v-model="form.modelNumber" placeholder="请输入型号" />
         </el-form-item>
-        <el-form-item label="机号" prop="airNumber">
-          <el-input v-model="form.airNumber" placeholder="请输入机号" />
+        <el-form-item label="分系统编号" prop="serial">
+          <el-input v-model="form.serial" placeholder="请输入分系统编号" />
         </el-form-item>
-        <el-form-item label="编号" prop="serial">
-          <el-input v-model="form.serial" placeholder="请输入编号" />
+        <el-form-item label="安装飞机号" prop="airNumber">
+          <el-select v-model="form.airModelId" filterable clearable placeholder="请选择安装飞机号">
+            <el-option
+              v-for="item in airOption"
+              :key="item.id"
+              :label="item.airNumber"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="出厂日期" prop="productionDate">
           <el-date-picker clearable
@@ -179,6 +200,7 @@
 
 <script>
 import { listBaseSubsystem, getBaseSubsystem, delBaseSubsystem, addBaseSubsystem, updateBaseSubsystem } from "@/api/ledger/baseSubsystem";
+import { getAirOption } from "@/api/ledger/airModel";
 
 export default {
   name: "BaseSubsystem",
@@ -206,6 +228,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        name: null,
         modelComponentId: null,
         modelNumber: null,
         airModelId: null,
@@ -219,11 +242,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      airOption:[]
     };
   },
   created() {
     this.getList();
+    this.getAirOption();
   },
   methods: {
     /** 查询分系统基本信息列表 */
@@ -244,6 +269,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        name: null,
         modelComponentId: null,
         modelNumber: null,
         airModelId: null,
@@ -314,7 +340,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除分系统基本信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除分系统基本信序号为"' + ids + '"的数据项？').then(function() {
         return delBaseSubsystem(ids);
       }).then(() => {
         this.getList();
@@ -326,7 +352,12 @@ export default {
       this.download('ledger/baseSubsystem/export', {
         ...this.queryParams
       }, `baseSubsystem_${new Date().getTime()}.xlsx`)
-    }
+    },
+    getAirOption(){
+      getAirOption().then(resp => {
+        this.airOption = resp.data
+      })
+    },
   }
 };
 </script>

src/views/ledger/partRecord/index.vue

@@ -33,20 +33,20 @@
           placeholder="请选择出厂日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="版本号" prop="version">
+      <el-form-item label="版本升级" prop="version">
         <el-input
           v-model="queryParams.version"
-          placeholder="请输入版本号"
+          placeholder="请输入版本升级"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出厂日期" prop="versionUpdateDate">
+      <el-form-item label="升级时间" prop="versionUpdateDate">
         <el-date-picker clearable
           v-model="queryParams.versionUpdateDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择出厂日期">
+          placeholder="请选择升级时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="维修次数" prop="repairTimes">
@@ -128,8 +128,8 @@
           <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="出厂日期" align="center" prop="versionUpdateDate" width="180">
+      <el-table-column label="版本升级" align="center" prop="version" />
+      <el-table-column label="升级时间" align="center" prop="versionUpdateDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.versionUpdateDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -188,15 +188,15 @@
             placeholder="请选择出厂日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
+        <el-form-item label="版本升级" prop="version">
+          <el-input v-model="form.version" placeholder="请输入版本升级" />
         </el-form-item>
-        <el-form-item label="出厂日期" prop="versionUpdateDate">
+        <el-form-item label="升级时间" prop="versionUpdateDate">
           <el-date-picker clearable
             v-model="form.versionUpdateDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择出厂日期">
+            placeholder="请选择升级时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="维修次数" prop="repairTimes">

src/views/ledger/subsystemRecord/index.vue

@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="型号" prop="modelNumber">
-        <el-input
-          v-model="queryParams.modelNumber"
-          placeholder="请输入型号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="编号" prop="serial">
         <el-input
           v-model="queryParams.serial"
@@ -33,20 +25,20 @@
           placeholder="请选择出厂日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="版本号" prop="version">
+      <el-form-item label="版本升级" prop="version">
         <el-input
           v-model="queryParams.version"
-          placeholder="请输入版本号"
+          placeholder="请输入版本升级"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出厂日期" prop="versionUpdateDate">
+      <el-form-item label="升级时间" prop="versionUpdateDate">
         <el-date-picker clearable
           v-model="queryParams.versionUpdateDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择出厂日期">
+          placeholder="请选择升级时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="维修次数" prop="repairTimes">
@@ -128,8 +120,8 @@
           <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="出厂日期" align="center" prop="versionUpdateDate" width="180">
+      <el-table-column label="版本升级" align="center" prop="version" />
+      <el-table-column label="升级时间" align="center" prop="versionUpdateDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.versionUpdateDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -188,15 +180,15 @@
             placeholder="请选择出厂日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
+        <el-form-item label="版本升级" prop="version">
+          <el-input v-model="form.version" placeholder="请输入版本升级" />
         </el-form-item>
-        <el-form-item label="出厂日期" prop="versionUpdateDate">
+        <el-form-item label="升级时间" prop="versionUpdateDate">
           <el-date-picker clearable
             v-model="form.versionUpdateDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择出厂日期">
+            placeholder="请选择升级时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="维修次数" prop="repairTimes">

src/views/ledger/systemRecord/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="型号" prop="modelNumber">
+      <el-form-item label="机号" prop="airNumber">
         <el-input
-          v-model="queryParams.modelNumber"
-          placeholder="请输入型号"
+          v-model="queryParams.airNumber"
+          placeholder="请输入机号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="机号" prop="airNumber">
+      <el-form-item label="型号" prop="modelNumber">
         <el-input
-          v-model="queryParams.airNumber"
-          placeholder="请输入机号"
+          v-model="queryParams.modelNumber"
+          placeholder="请输入型号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -33,20 +33,20 @@
           placeholder="请选择出厂日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="版本号" prop="version">
+      <el-form-item label="版本升级" prop="version">
         <el-input
           v-model="queryParams.version"
-          placeholder="请输入版本号"
+          placeholder="请输入版本升级"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出厂日期" prop="versionUpdateDate">
+      <el-form-item label="升级时间" prop="versionUpdateDate">
         <el-date-picker clearable
           v-model="queryParams.versionUpdateDate"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择出厂日期">
+          placeholder="请选择升级时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="维修次数" prop="repairTimes">
@@ -128,8 +128,8 @@
           <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="出厂日期" align="center" prop="versionUpdateDate" width="180">
+      <el-table-column label="版本升级" align="center" prop="version" />
+      <el-table-column label="升级时间" align="center" prop="versionUpdateDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.versionUpdateDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -188,10 +188,10 @@
             placeholder="请选择出厂日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
+        <el-form-item label="版本升级" prop="version">
+          <el-input v-model="form.version" placeholder="请输入版本升级" />
         </el-form-item>
-        <el-form-item label="出厂日期" prop="versionUpdateDate">
+        <el-form-item label="升级时间" prop="versionUpdateDate">
           <el-date-picker clearable
             v-model="form.versionUpdateDate"
             type="date"

src/views/searchV2/breakdown/base.vue

@@ -23,6 +23,12 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item prop="length">
+          <el-radio-group v-model="queryParams.length">
+            <el-radio-button :label="0">最短</el-radio-button>
+            <el-radio-button :label="10">所有</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
             >搜索</el-button

src/views/searchV2/question/index.vue

@@ -41,7 +41,7 @@ export default {
         sendMessage(msg) {
             let inputMessage = msg ? msg :this.inputMessage.trim()
             if (!inputMessage) return;
-            this.isWaitingForResponse = true;
+            // this.isWaitingForResponse = true;
 
             if(!msg){
               this.messages.push({
@@ -52,7 +52,6 @@ export default {
 
             // 获取最后一行的焦点
             const aiBubbles = this.$refs.aiBubble;
-            console.info(aiBubbles)
             aiBubbles.focus();
 
             let oldMsg = inputMessage;