modify

@@ -204,4 +204,3 @@ export function checkFlightRoute(data) {
         data: data
         data: data
     })
     })
 }
 }
-

@@ -33,9 +33,12 @@
                             <el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40">
                             <el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40">
                             </el-input>
                             </el-input>
                         </el-form-item>
                         </el-form-item>
+<<<<<<< HEAD
                         <!-- <el-form-item label="是否为ET86航线">
                         <!-- <el-form-item label="是否为ET86航线">
                           <el-checkbox v-model="newDictionary.isEtesRoute"></el-checkbox>
                           <el-checkbox v-model="newDictionary.isEtesRoute"></el-checkbox>
                         </el-form-item> -->
                         </el-form-item> -->
+=======
+>>>>>>> fix-issues
                         <el-form-item>
                         <el-form-item>
                             <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
                             <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
                         </el-form-item>
                         </el-form-item>
@@ -111,7 +114,7 @@ export default {
     },
     },
     data() {
     data() {
         return {
         return {
-            newDictionary: { flightNo: undefined, chineseName: undefined, route: undefined, isEtesRoute: false },
+            newDictionary: { flightNo: undefined, chineseName: undefined, route: undefined },
             rules: {
             rules: {
                 chineseName: [
                 chineseName: [
                     {
                     {
@@ -205,7 +208,6 @@ export default {
                             let obj = {
                             let obj = {
                                 fltNo: this.upCase(this.newDictionary.fltNo),
                                 fltNo: this.upCase(this.newDictionary.fltNo),
                                 route: this.upCase(this.newDictionary.route),
                                 route: this.upCase(this.newDictionary.route),
-                                // isEtesRoute: this.newDictionary.isEtesRoute == true ? "Y" : "N"
                             }
                             }
                             addRoute(obj).then(res => {
                             addRoute(obj).then(res => {
                                 this.loading = false
                                 this.loading = false

@@ -225,16 +225,6 @@ export default {
     mounted() {
     mounted() {
         this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
         this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
     },
     },
-    filters: {
-      // 是否为ET86航线
-    isEtesRoute(val) {
-        if(val == "N"){
-          return "否"
-        }else{
-          return "是"
-        }
-    },
-  },
     watch: {
     watch: {
         tableName(val, oldVal) {
         tableName(val, oldVal) {
             this.tableName = val
             this.tableName = val
@@ -343,7 +333,7 @@ export default {
             } else if (this.tableName === '虚拟航班') {
             } else if (this.tableName === '虚拟航班') {
                 this.flightDel([val.id])
                 this.flightDel([val.id])
             } else if (this.tableName === '航线') {
             } else if (this.tableName === '航线') {
-              this.routeDel({ data: [val], id: [val.id] })
+                this.routeDel({ data: [val], id: [val.id] })
             } else {
             } else {
                 this.dicDel([val.id])
                 this.dicDel([val.id])
             }
             }