allen 1 tahun lalu
induk
melakukan
44d683fab4

+ 19 - 0
tfis-admin/src/main/java/com/tfis/system/domain/AircraftSubsystem.java

@@ -18,6 +18,25 @@ public class AircraftSubsystem extends BaseEntity
     /** 编号 */
     private Long id;
 
+    private String aircraftSystemName;
+    private  String aircraftSubsystemName;
+
+    public String getAircraftSystemName() {
+        return aircraftSystemName;
+    }
+
+    public void setAircraftSystemName(String aircraftSystemName) {
+        this.aircraftSystemName = aircraftSystemName;
+    }
+
+    public String getAircraftSubsystemName() {
+        return aircraftSubsystemName;
+    }
+
+    public void setAircraftSubsystemName(String aircraftSubsystemName) {
+        this.aircraftSubsystemName = aircraftSubsystemName;
+    }
+
     /** 系统 */
     @Excel(name = "系统")
     private Long aircraftSystemId;

+ 21 - 5
tfis-admin/src/main/java/com/tfis/system/domain/AircraftSystem.java

@@ -22,10 +22,29 @@ public class AircraftSystem extends BaseEntity
     @Excel(name = "机型")
     private Long aircraftTypeId;
 
+    public void setAircraftTypeName(String aircraftTypeName) {
+        this.aircraftTypeName = aircraftTypeName;
+    }
+
     /** 系统名称 */
     @Excel(name = "系统名称")
     private String aircraftTypeName;
 
+    public String getAircraftSystemName() {
+        return aircraftSystemName;
+    }
+
+    public void setAircraftSystemName(String aircraftSystemName) {
+        this.aircraftSystemName = aircraftSystemName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    private  String aircraftSystemName;
+
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -44,12 +63,9 @@ public class AircraftSystem extends BaseEntity
     {
         return aircraftTypeId;
     }
-    public void setAircraftTypeName(String aircraftTypeName) 
-    {
-        this.aircraftTypeName = aircraftTypeName;
-    }
 
-    public String getAircraftTypeName() 
+
+    public String getAircraftTypeName()
     {
         return aircraftTypeName;
     }

+ 21 - 5
tfis-admin/src/main/resources/mapper/system/AircraftSubsystemMapper.xml

@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="aircraftSystemId"    column="aircraft_system_id"    />
         <result property="aircraftTypeName"    column="aircraft_type_name"    />
+        <result property="aircraftSystemName"    column="aircraft_system_name"    />
+        <result property="aircraftSubsystemName"    column="aircraft_subsystem_name"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -16,26 +18,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAircraftSubsystemVo">
-        select id, aircraft_system_id, aircraft_type_name, remark, create_by, create_time, update_by, update_time from biz_aircraft_subsystem
+        select basub.id,
+               basub.aircraft_system_id,
+               bat.aircraft_type_name,
+               bas.aircraft_type_name aircraft_system_name,
+               basub.aircraft_type_name aircraft_subsystem_name,
+               basub.remark,
+               basub.create_by,
+               basub.create_time,
+               basub.update_by,
+               basub.update_time
+        from
+             biz_aircraft_subsystem basub
+        LEFT JOIN biz_aircraft_system bas ON basub.aircraft_system_id = bas.id
+        LEFT JOIN biz_aircraft_type bat ON bas.aircraft_type_id = bat.id
+
     </sql>
 
 
     <select id="getSubSystemOption" parameterType="Long" resultMap="AircraftSubsystemResult">
         <include refid="selectAircraftSubsystemVo"/>
-        where aircraft_system_id = #{aircraftSystemId}
+        where basub.aircraft_system_id = #{aircraftSystemId}
     </select>
 
     <select id="selectAircraftSubsystemList" parameterType="AircraftSubsystem" resultMap="AircraftSubsystemResult">
         <include refid="selectAircraftSubsystemVo"/>
         <where>  
-            <if test="aircraftSystemId != null "> and aircraft_system_id = #{aircraftSystemId}</if>
-            <if test="aircraftTypeName != null  and aircraftTypeName != ''"> and aircraft_type_name like concat('%', #{aircraftTypeName}, '%')</if>
+            <if test="aircraftSystemId != null "> and basub.aircraft_system_id = #{aircraftSystemId}</if>
+            <if test="aircraftTypeName != null  and aircraftTypeName != ''"> and basub.aircraft_type_name like concat('%', #{aircraftTypeName}, '%')</if>
         </where>
     </select>
     
     <select id="selectAircraftSubsystemById" parameterType="Long" resultMap="AircraftSubsystemResult">
         <include refid="selectAircraftSubsystemVo"/>
-        where id = #{id}
+        where basub.id = #{id}
     </select>
         
     <insert id="insertAircraftSubsystem" parameterType="AircraftSubsystem" useGeneratedKeys="true" keyProperty="id">

+ 18 - 5
tfis-admin/src/main/resources/mapper/system/AircraftSystemMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="AircraftSystem" id="AircraftSystemResult">
         <result property="id"    column="id"    />
         <result property="aircraftTypeId"    column="aircraft_type_id"    />
+        <result property="aircraftSystemName"    column="aircraft_system_name"    />
         <result property="aircraftTypeName"    column="aircraft_type_name"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
@@ -16,25 +17,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAircraftSystemVo">
-        select id, aircraft_type_id, aircraft_type_name, remark, create_by, create_time, update_by, update_time from biz_aircraft_system
+        select bas.id,
+               bas.aircraft_type_id,
+               bat.aircraft_type_name,
+               bas.aircraft_type_name aircraft_system_name,
+               bas.remark,
+               bas.create_by,
+               bas.create_time,
+               bas.update_by,
+               bas.update_time
+        from
+        biz_aircraft_system bas
+        LEFT JOIN biz_aircraft_type bat ON bas.aircraft_type_id = bat.id
+
     </sql>
 
     <select id="selectAircraftSystemList" parameterType="AircraftSystem" resultMap="AircraftSystemResult">
         <include refid="selectAircraftSystemVo"/>
         <where>  
-            <if test="aircraftTypeId != null "> and aircraft_type_id = #{aircraftTypeId}</if>
-            <if test="aircraftTypeName != null  and aircraftTypeName != ''"> and aircraft_type_name like concat('%', #{aircraftTypeName}, '%')</if>
+            <if test="aircraftTypeId != null "> and bas.aircraft_type_id = #{aircraftTypeId}</if>
+            <if test="aircraftTypeName != null  and aircraftTypeName != ''"> and bas.aircraft_type_name like concat('%', #{aircraftTypeName}, '%')</if>
         </where>
     </select>
     
     <select id="selectAircraftSystemById" parameterType="Long" resultMap="AircraftSystemResult">
         <include refid="selectAircraftSystemVo"/>
-        where id = #{id}
+        where bas.id = #{id}
     </select>
 
     <select id="getSystemOption" parameterType="Long" resultMap="AircraftSystemResult">
         <include refid="selectAircraftSystemVo"/>
-        where aircraft_type_id = #{aircraftTypeId}
+        where bas.aircraft_type_id = #{aircraftTypeId}
     </select>
         
     <insert id="insertAircraftSystem" parameterType="AircraftSystem" useGeneratedKeys="true" keyProperty="id">

+ 11 - 98
tfis-ui/src/views/index.vue

@@ -16,7 +16,7 @@
           <el-option
             v-for="item in systemOption"
             :key="item.id"
-            :label="item.aircraftTypeName"
+            :label="item.aircraftSystemName"
             :value="item.id"
           />
         </el-select>
@@ -26,7 +26,7 @@
           <el-option
             v-for="item in subSystemOption"
             :key="item.id"
-            :label="item.aircraftTypeName"
+            :label="item.aircraftSubsystemName"
             :value="item.id"
           />
         </el-select>
@@ -39,7 +39,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="机型" prop="orderBy">
+      <el-form-item label="排序" prop="orderBy">
         <el-select v-model="queryParams.orderBy" placeholder="请选择">
           <el-option
             v-for="item in orderByOption"
@@ -57,48 +57,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:case:add']"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:case:edit']"
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:case:remove']"
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:case:export']"
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
     </el-row>
     <el-row>
@@ -146,7 +104,7 @@
         <el-row>
           <el-col :span="6"><div class="grid-content bg-purple">
             <el-form-item label="机型" prop="faultPhenomenon">
-              <el-select v-model="form.aircraftTypeId" placeholder="请选择" @change="handleaircraftChange1">
+              <el-select v-model="form.aircraftTypeId" placeholder="请选择" @change="handleaircraftChange1" readonly>
                 <el-option
                   v-for="item in typeOption1"
                   :key="item.id"
@@ -158,11 +116,11 @@
           </div></el-col>
           <el-col :span="6"><div class="grid-content bg-purple">
             <el-form-item label="系统" prop="aircraftSystemId">
-              <el-select v-model="form.aircraftSystemId" placeholder="请选择" @change="handlesystemChange1">
+              <el-select v-model="form.aircraftSystemId" placeholder="请选择" @change="handlesystemChange1" readonly>
                 <el-option
                   v-for="item in systemOption1"
                   :key="item.id"
-                  :label="item.aircraftTypeName"
+                  :label="item.aircraftSystemName"
                   :value="item.id"
                 />
               </el-select>
@@ -170,11 +128,11 @@
           </div></el-col>
           <el-col :span="6"><div class="grid-content bg-purple">
             <el-form-item label="分系统" prop="aircraftSubsystemId">
-              <el-select v-model="form.aircraftSubsystemId" placeholder="请选择">
+              <el-select v-model="form.aircraftSubsystemId" placeholder="请选择" readonly>
                 <el-option
                   v-for="item in subSystemOption1"
                   :key="item.id"
-                  :label="item.aircraftTypeName"
+                  :label="item.aircraftSubsystemName"
                   :value="item.id"
                 />
               </el-select>
@@ -190,7 +148,7 @@
                 <span>故障现象</span>
               </div>
               <div>
-                <el-input v-model="form.faultPhenomenon" type="textarea" :rows="5" placeholder="请输入内容" />
+                <el-input v-model="form.faultPhenomenon" type="textarea" :rows="5" placeholder="请输入内容" readonly/>
               </div>
             </el-card>
           </el-col>
@@ -200,7 +158,7 @@
                 <span>故障原因</span>
               </div>
               <div>
-                <el-input v-model="form.faultCause" type="textarea" :rows="5" placeholder="请输入内容" />
+                <el-input v-model="form.faultCause" type="textarea" :rows="5" placeholder="请输入内容" readonly/>
               </div>
             </el-card>
           </el-col>
@@ -211,24 +169,9 @@
               <span>故障树</span>
             </div>
             <div>
-              <el-upload
-                v-if="!form.faultTreePath"
-                ref="loadtree"
-                v-model="form.faultTreePath"
-                class="avatar-uploader"
-                :action="uploadFileUrl"
-                :multiple="false"
-                list-type="picture-card"
-                :before-upload="beforeTreeUpload"
-                :on-success="afterTreeUpload"
-                :headers="headers"
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
               <div v-if="form.faultTreePath">
                 <img :src="baseUrl+form.faultTreePath" style="max-width: 100%;" @load="showResetBtn = true;">
                 <div style="flex: 1;" /> <!-- 占位符,用于将重置按钮推到最右侧 -->
-                <el-button v-if="showResetBtn" type="danger" @click="reuploadTree">重置</el-button>
               </div>
             </div>
           </el-card>
@@ -242,46 +185,18 @@
               <el-col :span="4">
                 <span>故障图</span>
                 <div>
-                  <el-upload
-                    v-if="!form.faultPicturePath"
-                    v-model="form.faultPicturePath"
-                    class="avatar-uploader"
-                    :action="uploadFileUrl"
-                    :multiple="false"
-                    list-type="picture-card"
-                    :before-upload="beforePicUpload"
-                    :on-success="afterPicUpload"
-                    :headers="headers"
-                  >
-                    <i class="el-icon-plus" />
-                  </el-upload>
                   <div v-if="form.faultPicturePath">
                     <img :src="baseUrl+form.faultPicturePath" style="max-width: 100px;" @load="showResetBtnpic = true" @click="showModal = true;imageSrc=form.faultPicturePath">
                     <div style="flex: 1;" /> <!-- 占位符,用于将重置按钮推到最右侧 -->
-                    <el-button v-if="showResetBtnpic" type="danger" @click="reuploadPic">重置</el-button>
                   </div>
                 </div>
               </el-col>
               <el-col :span="20">
                 <span>文档</span>
                 <div>
-                  <el-upload
-                    v-if="!form.troubleshootingMethodPath"
-                    v-model="form.troubleshootingMethodPath"
-                    class="avatar-uploader"
-                    :action="uploadFileUrl"
-                    :multiple="false"
-                    list-type="picture-card"
-                    :before-upload="beforeMethodUpload"
-                    :on-success="afterMethodUpload"
-                    :headers="headers"
-                  >
-                    <i class="el-icon-plus" />
-                  </el-upload>
                   <div v-if="form.troubleshootingMethodPath">
                     <div ref="troubleshootingMethodFile" />
                     <div style="flex: 1;" /> <!-- 占位符,用于将重置按钮推到最右侧 -->
-                    <el-button type="danger" @click="reuploadMethod">重置</el-button>
                   </div>
                 </div>
               </el-col>
@@ -294,7 +209,6 @@
       </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>
@@ -312,7 +226,7 @@ import { getToken } from '@/utils/auth'
 import axios from 'axios'
 
 export default {
-  name: 'Case',
+  name: 'Index',
   data() {
     return {
       wordText: '',
@@ -635,7 +549,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(id) {
-      this.resetForm('queryForm')
       getCase(id).then(response => {
         this.form = response.data
         this.open = true

+ 6 - 17
tfis-ui/src/views/system/case/index.vue

@@ -12,34 +12,21 @@
         </el-select>
       </el-form-item>
       <el-form-item label="系统" prop="aircraftSystemId">
-        <!-- <el-input
-          v-model="queryParams.aircraftSystemId"
-          placeholder="请输入系统"
-          clearable
-          @keyup.enter.native="handleQuery"
-        /> -->
         <el-select v-model="queryParams.aircraftSystemId" placeholder="请选择" @change="handlesystemChange">
           <el-option
             v-for="item in systemOption"
             :key="item.id"
-            :label="item.aircraftTypeName"
+            :label="item.aircraftSystemName"
             :value="item.id"
           />
         </el-select>
       </el-form-item>
-
       <el-form-item label="分系统" prop="aircraftSubsystemId">
-        <!-- <el-input
-          v-model="queryParams.aircraftSubsystemId"
-          placeholder="请输入分系统"
-          clearable
-          @keyup.enter.native="handleQuery"
-        /> -->
         <el-select v-model="queryParams.aircraftSubsystemId" placeholder="请选择">
           <el-option
             v-for="item in subSystemOption"
             :key="item.id"
-            :label="item.aircraftTypeName"
+            :label="item.aircraftSubsystemName"
             :value="item.id"
           />
         </el-select>
@@ -219,7 +206,7 @@
                 <el-option
                   v-for="item in systemOption1"
                   :key="item.id"
-                  :label="item.aircraftTypeName"
+                  :label="item.aircraftSystemName"
                   :value="item.id"
                 />
               </el-select>
@@ -231,7 +218,7 @@
                 <el-option
                   v-for="item in subSystemOption1"
                   :key="item.id"
-                  :label="item.aircraftTypeName"
+                  :label="item.aircraftSubsystemName"
                   :value="item.id"
                 />
               </el-select>
@@ -657,6 +644,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
+      this.systemOption = [],
+      this.subSystemOption = [],
       this.handleQuery()
     },
     // 多选框选中数据

+ 122 - 34
tfis-ui/src/views/system/subsystem/index.vue

@@ -1,13 +1,23 @@
 <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="aircraftTypeId">
+        <el-select v-model="queryParams.aircraftTypeId" placeholder="请选择" @change="handleaircraftChange">
+          <el-option
+            v-for="item in typeOption"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="系统" prop="aircraftSystemId">
         <el-select v-model="queryParams.aircraftSystemId" placeholder="请选择" @change="handlesystemChange">
           <!--  -->
             <el-option
-              v-for="item in allsystemOption"
+              v-for="item in systemOption"
               :key="item.id"
-              :label="item.aircraft_type_name"
+              :label="item.aircraftSystemName"
               :value="item.id">
             </el-option>
           </el-select>
@@ -18,9 +28,9 @@
         <el-select v-model="queryParams.aircraftTypeName" placeholder="请选择">
             <el-option
               v-for="item in subSystemOption"
-              :key="item.id"
-              :label="item.aircraftTypeName"
-              :value="item.aircraftTypeName">
+              :key="item.aircraftSubsystemName"
+              :label="item.aircraftSubsystemName"
+              :value="item.aircraftSubsystemName">
             </el-option>
           </el-select>
       </el-form-item>
@@ -80,8 +90,9 @@
     <el-table v-loading="loading" :data="subsystemList" @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="aircraftSystemId" />
-      <el-table-column label="分系统名称" align="center" prop="aircraftTypeName" />
+      <el-table-column label="机型" align="center" prop="aircraftTypeName" />
+      <el-table-column label="系统" align="center" prop="aircraftSystemName" />
+      <el-table-column label="分系统名称" align="center" prop="aircraftSubsystemName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -114,19 +125,29 @@
     <!-- 添加或修改分系统信息管理对话框 -->
     <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="系统" prop="aircraftSystemId">
-        <el-select v-model="form.aircraftSystemId" placeholder="请选择">
-            <el-option
-              v-for="item in allsystemOption1"
-              :key="item.id"
-              :label="item.aircraft_type_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-      </el-form-item>
+        <el-form-item label="机型" prop="aircraftTypeId">
+              <el-select v-model="form.airname" placeholder="请选择" @change="handleaircraftChange1">
+                <el-option
+                  v-for="item in typeOption1"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="系统" prop="aircraftSystemId">
+              <el-select v-model="form.aircraftSystemId" placeholder="请选择">
+                <el-option
+                  v-for="item in systemOption1"
+                  :key="item.id"
+                  :label="item.aircraftSystemName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
 
-        <el-form-item label="分系统名称" prop="aircraftTypeName">
-          <el-input v-model="form.aircraftTypeName" placeholder="请输入分系统名称" />
+        <el-form-item label="分系统名称" prop="aircraftSubsystemName">
+          <el-input v-model="form.aircraftSubsystemName" placeholder="请输入分系统名称" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -141,9 +162,13 @@
 </template>
 
 <script>
+import { getSystem} from "@/api/system/system";
 import { listSubsystem, getSubsystem, delSubsystem, addSubsystem, updateSubsystem } from "@/api/system/subsystem";
+import { getTypeOption } from '@/api/system/type'
+import { getSystemOption } from '@/api/system/system'
+import { getSubSystemOption } from '@/api/system/subsystem'
 import { getSysOption } from "@/api/system/system";
-import { getSubSystemOption } from "@/api/system/subsystem"
+
 
 export default {
   name: "Subsystem",
@@ -173,50 +198,103 @@ export default {
         pageSize: 10,
         aircraftSystemId: null,
         aircraftTypeName: null,
-        aircraftSubsystemId:null
+        aircraftSubsystemId:null,
+        aircraftSubsystemName:null,
       },
       // 表单参数
       form: {
+        aircraftSystemName:null,
+        aircraftTypeId:null,
         aircraftSystemId: null,
         aircraftTypeName: null,
+        aircraftSubsystemName:null,
+        aircraftSubsystemId:null,
         remark:null,
+        airname:null,
+        
       },
       // 表单校验
       rules: {
       },
-      allsystemOption:[],
-      allsystemOption1:[],
+      typeOption:[],
+      systemOption:[],
+      typeOption1: [],
       subSystemOption:[],
       systemOption1:[],
+      subSystemOption1: [],
+      
     };
   },
   created() {
     this.getList();
-    this.getSystemOption();
-    this.getSystemOption1();
+    this.getOption()
+    this.getOption1()
   },
   activated() {
-    this.getSystemOption();
-    this.getSystemOption1();
+    this.getOption()
+    this.getOption1()
   },
   methods: {
-    getSystemOption() {
-      getSysOption().then(resp => {
-        this.allsystemOption = resp.data
+    getOption() {
+      getTypeOption().then(resp => {
+        this.typeOption = resp.data
+      })
+    },
+    // 用于获取飞机机型(放到添加功能中)
+    getOption1() {
+      getTypeOption().then(resp => {
+        this.typeOption1 = resp.data
       })
     },
-    getSystemOption1() {
-      getSysOption().then(resp => {
-        this.allsystemOption1 = resp.data
+
+    // getSystemOption() {
+    //   getSysOption().then(resp => {
+    //     this.allsystemOption = resp.data
+    //   })
+    // },
+    // getSystemOption1() {
+    //   getSysOption().then(resp => {
+    //     this.allsystemOption1 = resp.data
+    //   })
+    // },
+        // 机型变化后更新系统下拉框
+      handleaircraftChange() {
+      this.queryParams.aircraftSystemId = ''
+      this.queryParams.aircraftSubsystemId = ''
+      this.queryParams.aircraftTypeName = ''
+      // alert(this.queryParams.aircraftTypeId)
+      getSystemOption(this.queryParams.aircraftTypeId).then(resp => {
+        this.systemOption = resp.data
       })
     },
      //系统变化后更新分系统
      handlesystemChange(){
-       this.queryParams.aircraftSubsystemId = '';
+      this.queryParams.aircraftTypeName = ''
       getSubSystemOption(this.queryParams.aircraftSystemId).then(resp =>{
         this.subSystemOption = resp.data;
       })
     },
+
+    // 添加或修改对话框中机型变化后,修改系统
+    handleaircraftChange1() {
+      this.form.aircraftSystemName = ''
+      // alert(this.queryParams.aircraftTypeId)
+      this.form.aircraftTypeId = this.form.airname; 
+      getSystemOption(this.form.aircraftTypeId).then(resp => {
+        this.systemOption1 = resp.data
+      })
+    },
+
+    // 添加或修改对话框中系统变化后,修改分系统
+    handlesystemChange1() {
+      //this.form.aircraftSystemId = this.form.aircraftSystemName
+      // getSubSystemOption(this.form.aircraftSystemId).then(resp => {
+      //   this.subSystemOption1 = resp.data
+      // })
+      
+    },
+
+
     /** 查询分系统信息管理列表 */
     getList() {
       this.loading = true;
@@ -253,6 +331,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.systemOption = []
+      this.subSystemOption = []
       this.handleQuery();
     },
     // 多选框选中数据
@@ -273,6 +353,8 @@ export default {
       const id = row.id || this.ids
       getSubsystem(id).then(response => {
         this.form = response.data;
+        this.form.airname = this.form.aircraftTypeName;
+        console.log(this.form)
         this.open = true;
         this.title = "修改分系统信息管理";
       });
@@ -281,7 +363,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.aircraftTypeName = this.form.aircraftSubsystemName;
           if (this.form.id != null) {
+            this.form.aircraftTypeName = this.form.aircraftSubsystemName;
             updateSubsystem(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -289,8 +373,12 @@ export default {
             });
           } else {
             addSubsystem(this.form).then(response => {
+              console.log(this.form.aircraftSubsystemName)
+              //this.form.aircraftTypeName = this.form.aircraftSubsystemName;
               this.$modal.msgSuccess("新增成功");
+
               this.open = false;
+              
               this.queryParams.aircraftSystemId= null;
               this.queryParams.aircraftTypeName= null;
               this.queryParams.aircraftSubsystemId=null;

+ 18 - 11
tfis-ui/src/views/system/system/index.vue

@@ -11,13 +11,13 @@
             </el-option>
           </el-select>
       </el-form-item>
-      <el-form-item label="系统" prop="aircraftSystemId">
+      <el-form-item label="系统" prop="aircraftTypeName">
         <el-select v-model="queryParams.aircraftTypeName" placeholder="请选择">
             <el-option
               v-for="item in systemOption"
-              :key="item.aircraftTypeName"
-              :label="item.aircraftTypeName"
-              :value="item.aircraftTypeName">
+              :key="item.aircraftSystemName"
+              :label="item.aircraftSystemName"
+              :value="item.aircraftSystemName">
             </el-option>
           </el-select>
       </el-form-item>
@@ -76,8 +76,8 @@
     <el-table v-loading="loading" :data="systemList" @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="aircraftTypeId" />
-      <el-table-column label="系统名称" align="center" prop="aircraftTypeName" />
+      <el-table-column label="机型" align="center" prop="aircraftTypeName" />
+      <el-table-column label="系统名称" align="center" prop="aircraftSystemName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -120,9 +120,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="系统名称" prop="aircraftTypeName">
-          <el-input v-model="form.aircraftTypeName" placeholder="请输入系统名称" />
+
+        <el-form-item label="系统名称" prop="aircraftSystemName">
+          <el-input v-model="form.aircraftSystemName" placeholder="请输入系统名称" />
         </el-form-item>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -169,13 +171,14 @@ export default {
         pageSize: 10,
         aircraftTypeId: null,
         aircraftTypeName: null,
-        aircraftSystemId:null,
+//       aircraftSystemId:null,
+
       },
       // 表单参数
       form: {
         aircraftTypeId: null,
         aircraftTypeName: null,
-        aircraftSystemId:null,
+//        aircraftSystemId:null,
         remark:null
       },
       // 表单校验
@@ -212,7 +215,7 @@ export default {
     },
         //机型变化后更新系统下拉框
     handleaircraftChange() {
-      this.queryParams.aircraftSystemId = '';
+      this.queryParams.aircraftTypeName = '';
       //alert(this.queryParams.aircraftTypeId)
       getSystemOption(this.queryParams.aircraftTypeId).then(resp => {
         this.systemOption = resp.data;
@@ -246,6 +249,7 @@ export default {
         id: null,
         aircraftTypeId: null,
         aircraftTypeName: null,
+        aircraftSystemName:null,
         remark: null,
         createBy: null,
         createTime: null,
@@ -262,6 +266,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.systemOption = []
       this.handleQuery();
     },
     // 多选框选中数据
@@ -291,6 +296,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.aircraftTypeName = this.form.aircraftSystemName;
             updateSystem(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -300,6 +306,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.aircraftTypeName = this.form.aircraftSystemName;
             addSystem(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;