配置id

public/config.js

@@ -13,9 +13,15 @@ PLATFROM_CONFIG.appId = "q7kdjmmaf0kerwpf"; //appid
 PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
 
 const DATACONTENT_ID = {
+  /***-----登录------***/
+  loginId: 205, //登录-获取权限-id
+
+  /***-----系统设置------***/
   sysSourceId: 13, //系统设置-数据源-id
   sysProtoTabId: 1, //系统设置-协议管理-表格-id
   sysServiceTabId: 2, //系统设置-服务管理-表格-id
+  sysServiceOutTabId: 7, //系统设置-服务管理-编辑-输出-表格-id
+  sysServiceJqTabId: 3, //系统设置-服务管理-编辑-部署机器-表格-id
   sysQueryTabId: 4, //系统设置-查询模板-表格-id
   sysQueryEditId: 24, //系统设置-查询模板-编辑-根据id获取服务
   sysQueryChildTabId: 25, //系统设置-查询模板-列设置-表格-id
@@ -28,7 +34,34 @@ const DATACONTENT_ID = {
   sysServiceEditId: 23, //系统设置-服务管理-编辑服务-根据id获取服务
   sysServiceTopId: 32, //系统设置-服务管理-服务拓扑-根据id获取拓扑图
   sysServiceTopTableId: 31, //系统设置-服务管理-服务拓扑-查看日志id
-  // sysDatasTructureId:
+
+  /***-----进港管理------***/
+  arrivalAirId: 67, //进港管理-机场选择-id
+  arrivalTableId: 38, //进港管理-表格-id
+
+  /***-----离港管理------***/
+  departureAirMainId: 65, //离港管理-机场选择-id
+  departureTableMainId: 66, //离港管理-表格-id
+
+  /***-----离港管理===>中转进港------***/
+  departureAirId: 72, //离港管理-机场选择-id
+  departureAviJoinId: 71, //离港管理-进港承运航司-id
+  departureAviLeaveId: 74, //离港管理-离港承运航司-id
+  departureTableId: 69, //离港管理-表格-id
+
+  /***-----离港管理===>中转离港------***/
+  departureAirLtId: 72, //离港管理-机场选择-id
+  departureAviJoinLtId: 71, //离港管理-进港承运航司-id
+  departureAviLeaveLtId: 74, //离港管理-离港承运航司-id
+  departureTableLtId: 68, //离港管理-表格-id
+
+  /***-----基础数据------***/
+  deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id
+  deployNodeThreeId: 64, //基础数据-节点信息维护-获取三级节点-id
+  airlineTableId: 52, //基础数据-航司信息维护-表格-id
+  airportTableId: 57, //基础数据-机场信息维护-表格-id
+  airportTreeId: 58, //基础数据-机场信息维护-公司列表-id
+  bagTableId: 55, //基础数据-特殊行李维护-表格-id
 };
 
 const SERVICE_ID = {

src/views/BasicsData/views/BaggageType/BaggageType.vue

@@ -9,13 +9,7 @@
 <template>
   <div class="airportInfo">
     <div class="wrap">
-      <DataTable
-        data-id="55"
-        :rows="12"
-        labelWidth="100px"
-        :minHeight="70"
-        width="800px"
-      />
+      <DataTable :data-id="dataId" :rows="12" labelWidth="100px" :minHeight="70" width="800px" />
     </div>
   </div>
 </template>
@@ -34,8 +28,9 @@ import { GeneralDataReception, Query } from "@/api/dataIntegration";
 export default {
   name: "AirportInfo",
   components: { Search, Dialog, DataTable },
-  data() {
+  data () {
     return {
+      dataId: DATACONTENT_ID.bagTableId,
       arr: [], //内容数据
       flag: false, //删除弹框开关
       addFlag: false, //新增机场信息弹框开关
@@ -73,12 +68,12 @@ export default {
       modid: "",
     };
   },
-  created() {
+  created () {
     // this.getAirlines();
     // this.exceptionlist();
   },
   computed: {
-    serachBox() {
+    serachBox () {
       if (this.searchInfo) {
         return this.arr.filter((data) => {
           return Object.keys(data).some((key) => {
@@ -93,7 +88,7 @@ export default {
   },
   methods: {
     //异常列表查询
-    async exceptionlist() {
+    async exceptionlist () {
       let params = {
         id: "",
       };
@@ -103,7 +98,7 @@ export default {
       }
     },
     //搜索
-    getSearchData(val) {
+    getSearchData (val) {
       let that = this;
       that.exceptionlist().then(function (data) {
         if (val) {
@@ -115,7 +110,7 @@ export default {
       // console.log(this.searchInfo);
     },
     //删除信息
-    handleMove(item) {
+    handleMove (item) {
       // this.ids = item.id;
       this.listDate = item;
       this.flag = true;
@@ -124,12 +119,12 @@ export default {
       };
     },
     //编辑
-    airEdit(item) {
+    airEdit (item) {
       this.EditForm = item;
       this.EditFlag = true;
     },
     //编辑机场信息-弹框-提交
-    async EditSubmit() {
+    async EditSubmit () {
       let arr = 0;
       this.$refs["ruleFormall"].validate((valid) => {
         if (valid) {
@@ -159,11 +154,11 @@ export default {
         this.EditFlag = false;
       }
     },
-    closeForm() {
+    closeForm () {
       this.$refs.ruleForm.resetFields();
     },
     //获取航司信息列表
-    async getAirlines() {
+    async getAirlines () {
       try {
         const res = await Query({
           id: 78,
@@ -180,11 +175,11 @@ export default {
     },
 
     //新增机场信息-弹框
-    handleAdd() {
+    handleAdd () {
       this.addFlag = true;
     },
     //新增机场信息-弹框-提交
-    async addSubmit() {
+    async addSubmit () {
       let arr = 0;
       this.$refs["ruleForms"].validate((valid) => {
         if (valid) {
@@ -214,7 +209,7 @@ export default {
       }
     },
     //新增机场信息-弹框-取消
-    resetForm() {
+    resetForm () {
       this.addFlag = false;
       this.EditFlag = false;
       this.ruleForm.name = "";
@@ -223,7 +218,7 @@ export default {
       this.EditForm = {};
     },
     //删除
-    async remove() {
+    async remove () {
       this.listDate.operate = "3";
       try {
         const res = await GeneralDataReception({

src/views/BasicsData/views/airlineCompany/airlineCompanyInfo.vue

@@ -9,13 +9,7 @@
 <template>
   <div class="airportInfo">
     <div class="wrap">
-      <DataTable
-        data-id="52"
-        :rows="12"
-        labelWidth="100px"
-        :minHeight="70"
-        width="800px"
-      />
+      <DataTable :data-id="dataId" :rows="12" labelWidth="100px" :minHeight="70" width="800px" />
     </div>
   </div>
 </template>
@@ -34,8 +28,9 @@ import {
 export default {
   name: "AirportInfo",
   components: { Search, Dialog, DataTable },
-  data() {
+  data () {
     return {
+      dataId: DATACONTENT_ID.airlineTableId,
       arr: [], //内容数据
       flag: false, //删除弹框开关
       addFlag: false, //新增机场信息弹框开关
@@ -81,11 +76,11 @@ export default {
       },
     };
   },
-  mounted() {
+  mounted () {
     // this.getAirlines();
   },
   computed: {
-    serachBox() {
+    serachBox () {
       if (this.searchInfo) {
         return this.arr.filter((data) => {
           return Object.keys(data).some((key) => {
@@ -100,7 +95,7 @@ export default {
   },
   methods: {
     //删除信息
-    handleMove(item) {
+    handleMove (item) {
       this.eleForm = item;
       this.eleForm["operate"] = "3";
       this.ids = item.id;
@@ -110,7 +105,7 @@ export default {
       };
     },
     //编辑-航司信息（存储信息）
-    airEdit(item) {
+    airEdit (item) {
       this.EditForm.ID = item.ID;
       this.EditForm.Name = item.Name;
       this.EditForm.FullName = item.FullName;
@@ -118,7 +113,7 @@ export default {
       this.EditFlag = true;
     },
     //编辑机场信息-弹框-提交
-    async EditSubmit() {
+    async EditSubmit () {
       let arr = 0;
       this.$refs["ruleFormer"].validate((valid) => {
         if (valid) {
@@ -147,11 +142,11 @@ export default {
       }
     },
     //清空内容
-    closeForm() {
+    closeForm () {
       this.$refs.ruleForm.resetFields();
     },
     //获取航司信息列表
-    async getAirlines() {
+    async getAirlines () {
       try {
         const res = await Query({
           id: 22,
@@ -168,11 +163,11 @@ export default {
     },
 
     //新增机场信息-弹框
-    handleAdd() {
+    handleAdd () {
       this.addFlag = true;
     },
     //新增机场信息-弹框-提交
-    async addSubmit() {
+    async addSubmit () {
       let arr = 0;
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
@@ -202,7 +197,7 @@ export default {
       }
     },
     //新增机场信息-弹框-取消
-    resetForm() {
+    resetForm () {
       this.addFlag = false;
       this.EditFlag = false;
       this.EditForm.Name = null;
@@ -211,7 +206,7 @@ export default {
       this.ruleForm.code = "";
     },
     //删除
-    async remove() {
+    async remove () {
       try {
         const res = await GeneralDataReception({
           serviceId: "15",

src/views/BasicsData/views/airport/airportInfo.vue

@@ -27,27 +27,13 @@
           <div class="tree_left">
             <el-scrollbar style="height: 100%">
               <div class="corporate">{{ company }}</div>
-              <el-tree
-                :data="data"
-                :props="defaultProps"
-                accordion
-                @node-click="handleNodeClick"
-              >
+              <el-tree :data="data" :props="defaultProps" accordion @node-click="handleNodeClick">
               </el-tree>
             </el-scrollbar>
           </div>
         </el-col>
         <el-col :span="18">
-          <DataTable
-            data-id="57"
-            style="min-height: 71.8vh"
-            :rows="12"
-            labelWidth="100px"
-            :minHeight="70"
-            width="800px"
-            :withlodSet="true"
-            :data-content="{ companyID }"
-          />
+          <DataTable :data-id="dataId" style="min-height: 71.8vh" :rows="12" labelWidth="100px" :minHeight="70" width="800px" :withlodSet="true" :data-content="{ companyID }" />
         </el-col>
       </el-row>
     </div>
@@ -64,16 +50,8 @@
           ？
         </div>
         <div class="DelFoot right t30">
-          <el-button
-            size="medium"
-            @click="remove"
-            class="r25 buwitch"
-            type="danger"
-            >删除</el-button
-          >
-          <el-button size="medium" class="r26" @click="flag = false"
-            >取消</el-button
-          >
+          <el-button size="medium" @click="remove" class="r25 buwitch" type="danger">删除</el-button>
+          <el-button size="medium" class="r26" @click="flag = false">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -90,16 +68,8 @@
           ？
         </div>
         <div class="DelFoot right t30">
-          <el-button
-            size="medium"
-            @click="removeflaghall"
-            class="r25 buwitch"
-            type="danger"
-            >删除</el-button
-          >
-          <el-button size="medium" class="r26" @click="flaghall = false"
-            >取消</el-button
-          >
+          <el-button size="medium" @click="removeflaghall" class="r25 buwitch" type="danger">删除</el-button>
+          <el-button size="medium" class="r26" @click="flaghall = false">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -108,69 +78,30 @@
       <div class="airportInfoDialog dialog-public-background">
         <div class="flx">新增机场信息</div>
         <div class="content">
-          <el-form
-            :model="ruleForm"
-            :rules="rules"
-            ref="ruleForm"
-            label-width="100px"
-            class="demo-ruleForm"
-          >
+          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <el-form-item label="所属公司" prop="upname">
-              <el-input
-                size="medium"
-                :disabled="true"
-                placeholder=""
-                v-model="ruleForm.upname"
-              ></el-input>
+              <el-input size="medium" :disabled="true" placeholder="" v-model="ruleForm.upname"></el-input>
             </el-form-item>
             <el-form-item label="机场中文名称" prop="name">
-              <el-input
-                size="medium"
-                placeholder="请输入机场中文名称（必填）"
-                v-model="ruleForm.name"
-              ></el-input>
+              <el-input size="medium" placeholder="请输入机场中文名称（必填）" v-model="ruleForm.name"></el-input>
             </el-form-item>
             <el-form-item label="机场英文简称" prop="name">
-              <el-input
-                size="medium"
-                placeholder="请输入机场英文简称（必填）"
-                v-model="ruleForm.name"
-              ></el-input>
+              <el-input size="medium" placeholder="请输入机场英文简称（必填）" v-model="ruleForm.name"></el-input>
             </el-form-item>
             <el-form-item label="机场全称">
-              <el-input
-                size="medium"
-                placeholder="请输入机场全称（必填）"
-                v-model="ruleForm.fullName"
-              ></el-input>
+              <el-input size="medium" placeholder="请输入机场全称（必填）" v-model="ruleForm.fullName"></el-input>
             </el-form-item>
             <el-form-item label="机场三字码">
-              <el-input
-                size="medium"
-                placeholder="请输入机场三字码（必填）"
-                v-model="ruleForm.code3"
-              ></el-input>
+              <el-input size="medium" placeholder="请输入机场三字码（必填）" v-model="ruleForm.code3"></el-input>
             </el-form-item>
             <el-form-item label="机场四字码">
-              <el-input
-                size="medium"
-                placeholder="请输入机场四字码（必填）"
-                v-model="ruleForm.code3"
-              ></el-input>
+              <el-input size="medium" placeholder="请输入机场四字码（必填）" v-model="ruleForm.code3"></el-input>
             </el-form-item>
           </el-form>
         </div>
         <div class="foot center t30">
-          <el-button
-            size="medium"
-            type="primary"
-            @click="addSubmit()"
-            class="r25 r26"
-            >提交</el-button
-          >
-          <el-button class="r26" size="medium" @click="resetForm()"
-            >取消</el-button
-          >
+          <el-button size="medium" type="primary" @click="addSubmit()" class="r25 r26">提交</el-button>
+          <el-button class="r26" size="medium" @click="resetForm()">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -178,43 +109,21 @@
       <div class="airportInfoDialog dialog-public-background">
         <div class="flx">新增航站楼信息</div>
         <div class="content">
-          <el-form
-            :model="taForm"
-            :rules="ruleta"
-            ref="taForm"
-            label-width="100px"
-            class="demo-ruleForm"
-          >
+          <el-form :model="taForm" :rules="ruleta" ref="taForm" label-width="100px" class="demo-ruleForm">
             <el-form-item label="航站楼名称" prop="name">
-              <el-input
-                size="medium"
-                placeholder="请输入航站楼名称（必填）"
-                v-model="ruleForm.name"
-              ></el-input>
+              <el-input size="medium" placeholder="请输入航站楼名称（必填）" v-model="ruleForm.name"></el-input>
             </el-form-item>
             <el-form-item label="航站楼标识" prop="name">
-              <el-input
-                size="medium"
-                placeholder="请输入航站楼标识（必填）"
-                v-model="ruleForm.name"
-              ></el-input>
+              <el-input size="medium" placeholder="请输入航站楼标识（必填）" v-model="ruleForm.name"></el-input>
             </el-form-item>
           </el-form>
         </div>
         <div class="foot center t30">
-          <el-button
-            size="medium"
-            type="primary"
-            @click="addter()"
-            class="r25 r26"
-            >提交</el-button
-          >
-          <el-button class="r26" size="medium" @click="addta = false"
-            >取消</el-button
-          >
+          <el-button size="medium" type="primary" @click="addter()" class="r25 r26">提交</el-button>
+          <el-button class="r26" size="medium" @click="addta = false">取消</el-button>
         </div>
-      </div></Dialog
-    >
+      </div>
+    </Dialog>
   </div>
 </template>
 
@@ -229,8 +138,9 @@ import DataTable from "@/components/Table";
 export default {
   name: "AirportInfo",
   components: { Search, Dialog, DataTable },
-  data() {
+  data () {
     return {
+      dataId: DATACONTENT_ID.airportTableId,
       data: [],
       defaultProps: {
         children: "children",
@@ -288,23 +198,23 @@ export default {
       company: "所属公司",
     };
   },
-  mounted() {
+  mounted () {
     this.getAirlines();
   },
   methods: {
     //新增航站楼
-    newterminal() {
+    newterminal () {
       this.addta = true;
     },
     //点击树状图
-    handleNodeClick(data) {
+    handleNodeClick (data) {
       this.companyID = data.companyID;
       this.company = data.companyName;
     },
-    closeForm() {
+    closeForm () {
       this.$refs.ruleForm.resetFields();
     },
-    closeta() {
+    closeta () {
       this.$refs.taForm.resetFields();
     },
     // //模糊查询
@@ -330,7 +240,7 @@ export default {
     //   }
     //   return arr;
     // },
-    getSearchData(val) {
+    getSearchData (val) {
       if (val) {
         this.arr = findarrays(this.arr, "name", val);
       } else {
@@ -338,7 +248,7 @@ export default {
       }
     },
     // 内容跳转
-    toTink(item) {
+    toTink (item) {
       this.$router.push({
         path: "/BasicsData/airportInfoDetails",
         query: {
@@ -350,10 +260,10 @@ export default {
       });
     },
     //公司列表
-    async getAirlines() {
+    async getAirlines () {
       try {
         const res = await Query({
-          id: 58,
+          id: DATACONTENT_ID.airportTreeId,
           dataContent: [],
         });
         if (res.code === "0") {
@@ -376,7 +286,7 @@ export default {
       }
     },
     //删除信息
-    handleMove(item) {
+    handleMove (item) {
       this.ids = item.id;
       this.flag = true;
       this.rmObj = {
@@ -384,22 +294,22 @@ export default {
       };
     },
     //删除航站楼
-    Tinkhall(res) {
+    Tinkhall (res) {
       this.flaghall = true;
       this.rmhall = {
         name: res.name,
       };
     },
     //搜索
-    removeflaghall() {
+    removeflaghall () {
       this.flaghall = false;
     },
     //提交新增航站楼
-    addter() {
+    addter () {
       this.addta = false;
     },
     //新增机场信息-弹框
-    handleAdd() {
+    handleAdd () {
       if (this.newUp) {
         this.addFlag = true;
       } else {
@@ -407,7 +317,7 @@ export default {
       }
     },
     //新增机场信息-弹框-提交
-    async addSubmit() {
+    async addSubmit () {
       let arr = 0;
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
@@ -439,11 +349,11 @@ export default {
       }
     },
     //新增机场信息-弹框-取消
-    resetForm() {
+    resetForm () {
       this.addFlag = false;
     },
     //删除
-    async remove() {
+    async remove () {
       const result = await DelAriports({
         id: this.ids,
       });

src/views/BasicsData/views/deployNode/deployNodeHome.vue

@@ -1,13 +1,6 @@
 <template>
   <div class="airportInfo">
-    <DataTable
-      data-id="54"
-      :rows="12"
-      :withnodeSet="true"
-      labelWidth="100px"
-      :minHeight="70"
-      width="800px"
-    />
+    <DataTable :data-id="dataId" :rows="12" :withnodeSet="true" labelWidth="100px" :minHeight="70" width="800px" />
   </div>
 </template>
 
@@ -19,8 +12,9 @@ import DataTable from "@/components/Table";
 export default {
   name: "NodeLnformation",
   components: { orgTree, Dialog, DataTable },
-  data() {
+  data () {
     return {
+      dataId: DATACONTENT_ID.deployNodeId,
       dataList: {
         id: 0,
         nodeCode: "BSM",
@@ -54,12 +48,12 @@ export default {
       typeObj: {},
     };
   },
-  created() {
+  created () {
     // this.getTreeData();
   },
   methods: {
     //渲染节点
-    renderContent(h, data) {
+    renderContent (h, data) {
       return (
         <div
           onClick={() => this.renderSub(data)}
@@ -105,15 +99,15 @@ export default {
         </div>
       );
     },
-    onNodeClick(data, e) {
+    onNodeClick (data, e) {
       e.stopPropagation();
       this.rmObj = data;
       this.removeDialogVisible = true;
     },
-    renderSub(data) {
+    renderSub (data) {
       console.log(data, "click");
     },
-    onNodeSub(data, e) {
+    onNodeSub (data, e) {
       e.stopPropagation();
       const { Type, nodeCode } = data;
       this.editDialogTitle = "新增节点信息";
@@ -130,7 +124,7 @@ export default {
       this.ruleForm.locationCode = "";
       this.ruleForm.locationCodeDescribe = "";
     },
-    onNodeEdit(data, e) {
+    onNodeEdit (data, e) {
       e.stopPropagation();
       this.editDialogTitle = "编辑节点信息";
       this.editDialogVisible = true;
@@ -140,7 +134,7 @@ export default {
       this.disFlag = true;
     },
     // 新增/编辑-确认
-    submitClickHandler() {
+    submitClickHandler () {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           const { Type } = this.typeObj;
@@ -166,7 +160,7 @@ export default {
       });
     },
     // 重置
-    resetForm(formName) {
+    resetForm (formName) {
       // this.ruleForm = {}
       // if (this.type == 'add') {
       //   this.$refs[formName].resetFields()
@@ -174,12 +168,12 @@ export default {
       this.editDialogVisible = false;
     },
     // 删除-弹框
-    showRemoveDialog(item) {
+    showRemoveDialog (item) {
       this.rmObj = item;
       this.removeDialogVisible = true;
     },
     // 确认删除
-    removeSubmit() {
+    removeSubmit () {
       this.ruleForm = this.rmObj;
       this.ruleForm.operate = "3";
       this.nodeTreeData(21, this.ruleForm);
@@ -187,10 +181,10 @@ export default {
       // this.$message.success('删除成功')
     },
     // 获取二级节点
-    async getTreeData() {
+    async getTreeData () {
       try {
         const { returnData, message } = await getQuery({
-          id: 54,
+          id: DATACONTENT_ID.deployNodeId,
           dataContent: [],
         });
         if (returnData && returnData.length) {
@@ -207,7 +201,7 @@ export default {
       }
     },
     //节点操作
-    async nodeTreeData(serviceId, dataContent) {
+    async nodeTreeData (serviceId, dataContent) {
       try {
         const { message, code } = await generalDataReception({
           serviceId: `${serviceId}`,
@@ -224,10 +218,10 @@ export default {
       }
     },
     //三级展开获取数据
-    async expandData(data) {
+    async expandData (data) {
       try {
         const { returnData, message } = await getQuery({
-          id: 64,
+          id: DATACONTENT_ID.deployNodeThreeId,
           dataContent: [data.nodeCode],
         });
         if (returnData && returnData.length) {

src/views/baggageManagement/components/arrival/index.vue

@@ -8,17 +8,8 @@
 <template>
   <div class="arrival-one">
     <!--功能区-表单-->
-    <div
-      ref="formWrap"
-      class="terminal-form-wrap"
-    >
-      <el-form
-        ref="form"
-        :inline="true"
-        :model="formData"
-        :rules="rules"
-        class="form"
-      >
+    <div ref="formWrap" class="terminal-form-wrap">
+      <el-form ref="form" :inline="true" :model="formData" :rules="rules" class="form">
         <div class="form-left">
           <el-form-item prop="currentAirport">
             <!-- <el-cascader
@@ -33,20 +24,8 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select
-              v-model="formData.currentAirport"
-              class="input-shadow"
-              size="small"
-              filterable
-              placeholder="请选择机场"
-              @change="airPortChange"
-            >
-              <el-option
-                v-for="(item, index) in AirportList"
-                :key="index"
-                :label="item.PlanLandingApt"
-                :value="item.PlanLandingApt"
-              />
+            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" filterable placeholder="请选择机场" @change="airPortChange">
+              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.PlanLandingApt" :value="item.PlanLandingApt" />
             </el-select>
           </el-form-item>
           <!-- <el-form-item prop="startDate">
@@ -73,136 +52,48 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item
-            prop="FlightDate"
-            label="航班日期"
-          >
-            <el-date-picker
-              v-model="formData.FlightDate"
-              size="small"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="dateRangePickerOptions"
-              @change="dateChangeHandler"
-            />
+          <el-form-item prop="FlightDate" label="航班日期">
+            <el-date-picker v-model="formData.FlightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChangeHandler" />
           </el-form-item>
           <el-form-item>
             <div class="box-item">
               <p>预计装载总数：</p>
-              <li
-                v-for="(item, index) in orderNum"
-                :key="index"
-                :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }"
-              >
+              <li v-for="(item, index) in orderNum" :key="index" :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }">
                 <span v-if="!isNaN(item)">
                   <i ref="numberItem">0123456789</i>
                 </span>
-                <span
-                  v-else
-                  class="comma"
-                >{{ item }}</span>
+                <span v-else class="comma">{{ item }}</span>
               </li>
             </div>
           </el-form-item>
         </div>
-        <div
-          class="form-right"
-          @keyup.enter="onSubmit(1)"
-        >
+        <div class="form-right" @keyup.enter="onSubmit(1)">
           <el-form-item prop="search">
-            <el-popover
-              :value="popoverVisible"
-              placement="bottom"
-              trigger="manual"
-            >
+            <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
               <span>请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）</span>
-              <el-input
-                slot="reference"
-                v-model="formData.search"
-                class="input-shadow"
-                style="width: 240px; margin-left: 105px"
-                size="small"
-                placeholder="请输入内容"
-                prefix-icon="el-icon-search"
-                clearable
-                @focus="popoverVisible = true"
-                @blur="popoverVisible = false"
-              />
+              <el-input slot="reference" v-model="formData.search" class="input-shadow" style="width: 240px; margin-left: 105px" size="small" placeholder="请输入内容" prefix-icon="el-icon-search" clearable @focus="popoverVisible = true" @blur="popoverVisible = false" />
             </el-popover>
           </el-form-item>
           <el-form-item>
-            <el-button
-              class="btn-shadow"
-              size="mini"
-              type="primary"
-              @click="onSubmit(1)"
-            >搜索</el-button>
+            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(1)">搜索</el-button>
           </el-form-item>
           <el-form-item v-is="['i_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item>
-            <img
-              class="btn-img btn-shadow"
-              src="../../../../assets/baggage/ic_setting.png"
-              @click="show"
-            >
+            <img class="btn-img btn-shadow" src="../../../../assets/baggage/ic_setting.png" @click="show">
           </el-form-item>
         </div>
       </el-form>
     </div>
     <!--表格-->
-    <div
-      v-loading="loading"
-      class="terminal-table"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-    >
-      <el-table
-        ref="table"
-        class="table"
-        :height="computedTableHeight"
-        :data="dealedTableData"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        show-summary
-        :summary-method="summaryMethod"
-        border
-        stripe
-        fit
-        @cell-click="cellClickHandler"
-      >
-        <el-table-column
-          v-for="col in tableColsCopy"
-          :key="col.prop"
-          :prop="col.prop"
-          :label="col.label"
-          :width="col.width"
-          :fixed="col.fixed"
-        >
-          <el-table-column
-            v-for="childCol in col.children"
-            :key="childCol.prop"
-            :prop="childCol.prop"
-            :label="childCol.label"
-            :width="childCol.width"
-          >
+    <div v-loading="loading" class="terminal-table" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-table ref="table" class="table" :height="computedTableHeight" :data="dealedTableData" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" show-summary :summary-method="summaryMethod" border stripe fit @cell-click="cellClickHandler">
+        <el-table-column v-for="col in tableColsCopy" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed">
+          <el-table-column v-for="childCol in col.children" :key="childCol.prop" :prop="childCol.prop" :label="childCol.label" :width="childCol.width">
             <template #header>
-              <el-tooltip
-                :content="childCol.disc"
-                placement="top"
-              >
-                <TableHeaderCell
-                  :label="childCol.label"
-                  :filter-options="tableDataFilters[childCol.prop]"
-                  :filter-values.sync="filterValues[childCol.prop]"
-                  :sortable="childCol.sortable"
-                  :sort-rule.sync="tableDataSortRules[childCol.prop]"
-                />
+              <el-tooltip :content="childCol.disc" placement="top">
+                <TableHeaderCell :label="childCol.label" :filter-options="tableDataFilters[childCol.prop]" :filter-values.sync="filterValues[childCol.prop]" :sortable="childCol.sortable" :sort-rule.sync="tableDataSortRules[childCol.prop]" />
               </el-tooltip>
             </template>
           </el-table-column>
@@ -210,38 +101,18 @@
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog
-      :flag="dialogFlag"
-      class="dialog-check-cols"
-    >
+    <Dialog :flag="dialogFlag" class="dialog-check-cols">
       <div class="col-dialog">
         <div class="title">列设置</div>
         <div class="content">
-          <el-tree
-            :data="tableCols"
-            :class="colsCheckClass"
-            show-checkbox
-            node-key="index"
-            :default-expand-all="true"
-            :props="{
+          <el-tree :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
               label: 'label',
               children: 'children'
-            }"
-            :default-checked-keys="checkedKeysTemp"
-            @check="handleCheck"
-          />
+            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
         </div>
         <div class="foot right t30">
-          <el-button
-            size="medium"
-            class="r24"
-            type="primary"
-            @click="onCheck"
-          >确定</el-button>
-          <el-button
-            size="medium"
-            @click="hide"
-          >取消</el-button>
+          <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -262,7 +133,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin],
-  data() {
+  data () {
     return {
       orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       popoverVisible: false,
@@ -277,7 +148,7 @@ export default {
             {
               prop: 'FlightNO',
               label: '航班号',
-              disc:'指航班编号',
+              disc: '指航班编号',
               width: 80,
               filterable: true,
               sortable: true
@@ -285,7 +156,7 @@ export default {
             {
               prop: 'FlightDate',
               label: '执飞日期',
-              disc:'指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
+              disc: '指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
               width: 105,
               filterable: true,
               sortable: true
@@ -293,7 +164,7 @@ export default {
             {
               prop: 'arrivalTime',
               label: '到港时间',
-              disc:'指航班预计降落时间，数据是变化的，仅显示最新结果',
+              disc: '指航班预计降落时间，数据是变化的，仅显示最新结果',
               width: 150,
               filterable: true,
               sortable: true
@@ -301,7 +172,7 @@ export default {
             {
               prop: 'departureTerminal',
               label: '起飞航站',
-              disc:'指航班执飞航段的起飞航站，以航站三字码显示',
+              disc: '指航班执飞航段的起飞航站，以航站三字码显示',
               width: 85,
               filterable: true,
               sortable: true
@@ -309,7 +180,7 @@ export default {
             {
               prop: 'arrivalTerminal',
               label: '到达航站楼',
-              disc:'指航班执飞航段的目的航站的航站楼代码',
+              disc: '指航班执飞航段的目的航站的航站楼代码',
               width: 100,
               filterable: true,
               sortable: true
@@ -317,7 +188,7 @@ export default {
             {
               prop: 'luggageCarousel',
               label: '行李转盘',
-              disc:'指航班进港，旅客提取行李转盘的代码',
+              disc: '指航班进港，旅客提取行李转盘的代码',
               width: 85,
               filterable: true,
               sortable: true
@@ -325,7 +196,7 @@ export default {
             {
               prop: 'parkingSpace',
               label: '停机位',
-              disc:'指航班的停机位代码，数据是变化的，仅显示最新信息',
+              disc: '指航班的停机位代码，数据是变化的，仅显示最新信息',
               filterable: true,
               sortable: true
             }
@@ -338,17 +209,17 @@ export default {
             {
               prop: 'checkIns',
               label: '值机',
-              disc:'指已办理值机托运的行李数量，含取消托运的行李数量，含未激活',
+              disc: '指已办理值机托运的行李数量，含取消托运的行李数量，含未激活',
             },
             {
               prop: 'projectedLoad',
               label: '预计装载',
-              disc:'指已办理值机托运的行李数量，不含取消托运的行李数量，不包含未激活',
+              disc: '指已办理值机托运的行李数量，不含取消托运的行李数量，不包含未激活',
             },
             {
               prop: 'loadedQuantity',
               label: '已装载',
-              disc:'指实际装机完成的行李数量，不包含取消托运的行李数量',
+              disc: '指实际装机完成的行李数量，不包含取消托运的行李数量',
             }
           ]
         },
@@ -359,23 +230,23 @@ export default {
             {
               prop: 'numberOfDestinationArrivals',
               label: '到达',
-              disc:'指行李到达提取转盘的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指行李到达提取转盘的行李数量，数据是变化的，仅显示最新信息',
             },
             {
               prop: 'endPointNotReached',
               label: '未到达',
-              disc:'指行李仍未到达提取转盘的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指行李仍未到达提取转盘的行李数量，数据是变化的，仅显示最新信息',
             },
             {
               prop: 'specialQuantity',
               label: '特殊',
-              disc:'指非正常行李的数量，包括（装笼动物、乘务员行李、易碎行李、VIP 行李等），参考 BSM 报文.E 项',
+              disc: '指非正常行李的数量，包括（装笼动物、乘务员行李、易碎行李、VIP 行李等），参考 BSM 报文.E 项',
               width: 65
             },
             {
               prop: 'numberOfClaims',
               label: '理赔',
-              disc:'指航班收到旅客申请理赔的行李数量',
+              disc: '指航班收到旅客申请理赔的行李数量',
               width: 65
             }
           ]
@@ -387,12 +258,12 @@ export default {
             {
               prop: 'uninstalled',
               label: '已卸载',
-              disc:'指卸机的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指卸机的行李数量，数据是变化的，仅显示最新信息',
             },
             {
               prop: 'numberToBeUninstalled',
               label: '待卸载',
-              disc:'指仍未卸机的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指仍未卸机的行李数量，数据是变化的，仅显示最新信息',
             }
           ]
         },
@@ -403,12 +274,12 @@ export default {
             {
               prop: 'terminateArrivalQuantity',
               label: '到达',
-              disc:'指旅客已到达目的站的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指旅客已到达目的站的行李数量，数据是变化的，仅显示最新信息',
             },
             {
               prop: 'terminateUnreachedQuantity',
               label: '未到达',
-              disc:'指未到达目的站的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指未到达目的站的行李数量，数据是变化的，仅显示最新信息',
             }
           ]
         },
@@ -419,12 +290,12 @@ export default {
             {
               prop: 'quantityShipped',
               label: '已交运',
-              disc:'指当前航班中转出的行李已完成交运的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指当前航班中转出的行李已完成交运的行李数量，数据是变化的，仅显示最新信息',
             },
             {
               prop: 'undeliveredQuantity',
               label: '未交运',
-              disc:'指当前航班中转出的行李未完成交运的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指当前航班中转出的行李未完成交运的行李数量，数据是变化的，仅显示最新信息',
             }
           ]
         },
@@ -435,12 +306,12 @@ export default {
             {
               prop: 'numberOfContainers',
               label: '容器',
-              disc:'指当前航班使用容器装载的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指当前航班使用容器装载的行李数量，数据是变化的，仅显示最新信息',
             },
             {
               prop: 'numberOfBulk',
               label: '散装',
-              disc:'指当前航班没有使用容器装载的行李数量，数据是变化的，仅显示最新信息',
+              disc: '指当前航班没有使用容器装载的行李数量，数据是变化的，仅显示最新信息',
               width: 65
             }
           ]
@@ -457,22 +328,22 @@ export default {
       hasSetTableScroll: false
     }
   },
-  mounted() {
+  mounted () {
     this.getAirPortData()
   },
-  beforeDestroy() {
+  beforeDestroy () {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   computed: {
-    singleDay() {
+    singleDay () {
       return this.startDate === this.endDate
     }
   },
   methods: {
-    resetLoopEvent() {
+    resetLoopEvent () {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -484,17 +355,17 @@ export default {
         that.getTableData()
       }, 3000)
     },
-    airPortChange() {
+    airPortChange () {
       this.resetLoopEvent()
     },
-    dateChangeHandler() {
+    dateChangeHandler () {
       this.resetLoopEvent()
     },
     // 选择机场
-    async getAirPortData() {
+    async getAirPortData () {
       try {
         const res = await getQuery({
-          id: 67,
+          id: DATACONTENT_ID.arrivalAirId,
           dataContent: []
         })
         if (Number(res.code) === 0) {
@@ -508,7 +379,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.flightStatus === 'DLY') {
         classes.push('bgl-delayed')
@@ -524,7 +395,7 @@ export default {
       }
       return classes.join(' ')
     },
-    headerCellClass({ row, column }) {
+    headerCellClass ({ row, column }) {
       const classes = []
       if (['transfer_all', 'departureAnomaly', 'riskWarning'].includes(column.property)) {
         classes.push('bgl-huang')
@@ -546,14 +417,14 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData() {
+    async getTableData () {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
       const arr = [this.formData.currentAirport, this.startDate, this.endDate]
       try {
         const res = await getQuery({
-          id: 38,
+          id: DATACONTENT_ID.arrivalTableId,
           dataContent: [...arr, ...arr, ...arr]
         })
         if (Number(res.code) === 0) {
@@ -571,7 +442,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    initTableData(tableData) {
+    initTableData (tableData) {
       this.arrivalCount = 0
       this.baggageCount = 0
       tableData.forEach(item => {
@@ -592,13 +463,13 @@ export default {
         this.setTableScroll()
       })
     },
-    hasArrived(flight) {
+    hasArrived (flight) {
       const now = new Date()
       const arrivalTime = new Date(flight.arrivalTime)
       flight['hasArrived'] = now > arrivalTime && !flight['flightCanceled']
       return flight['hasArrived']
     },
-    setTableScroll() {
+    setTableScroll () {
       if (!this.singleDay || this.hasSetTableScroll || this.arrivalCount === 0) {
         return
       }
@@ -618,7 +489,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform() {
+    setNumberTransform () {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -628,7 +499,7 @@ export default {
       }
     },
 
-    toOrderNum(num) {
+    toOrderNum (num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -666,7 +537,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-size: 14px;
       }
       .el-switch__label {
@@ -772,7 +643,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, 'Microsoft YaHei';
+      font-family: Helvetica, "Microsoft YaHei";
       letter-spacing: 0;
     }
     .cell-click {
@@ -806,7 +677,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: '';
+            content: "";
             position: absolute;
             left: 0;
             bottom: 0;

src/views/baggageManagement/components/departure/index.vue

@@ -8,17 +8,8 @@
 <template>
   <div class="departure-one">
     <!--功能区-表单-->
-    <div
-      ref="formWrap"
-      class="terminal-form-wrap"
-    >
-      <el-form
-        ref="form"
-        :inline="true"
-        :model="formData"
-        :rules="rules"
-        class="form"
-      >
+    <div ref="formWrap" class="terminal-form-wrap">
+      <el-form ref="form" :inline="true" :model="formData" :rules="rules" class="form">
         <div class="form-left">
           <el-form-item prop="currentAirport">
             <!-- <el-cascader
@@ -33,20 +24,8 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select
-              v-model="formData.currentAirport"
-              class="input-shadow"
-              size="small"
-              filterable
-              placeholder="请选择机场"
-              @change="airPortChange"
-            >
-              <el-option
-                v-for="(item, index) in AirportList"
-                :key="index"
-                :label="item.PlanDepartureApt"
-                :value="item.PlanDepartureApt"
-              />
+            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" filterable placeholder="请选择机场" @change="airPortChange">
+              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.PlanDepartureApt" :value="item.PlanDepartureApt" />
             </el-select>
           </el-form-item>
           <!-- <el-form-item prop="startDate">
@@ -73,168 +52,65 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item
-            prop="FlightDate"
-            label="航班日期"
-          >
-            <el-date-picker
-              v-model="formData.FlightDate"
-              size="small"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="dateRangePickerOptions"
-              @change="dateChangeHandler"
-            />
+          <el-form-item prop="FlightDate" label="航班日期">
+            <el-date-picker v-model="formData.FlightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChangeHandler" />
           </el-form-item>
           <el-form-item>
             <div class="box-item">
               <p>预计装载总数：</p>
-              <li
-                v-for="(item, index) in orderNum"
-                :key="index"
-                :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }"
-              >
+              <li v-for="(item, index) in orderNum" :key="index" :class="{ 'number-item': !isNaN(item), 'mark-item': isNaN(item) }">
                 <span v-if="!isNaN(item)">
                   <i ref="numberItem">0123456789</i>
                 </span>
-                <span
-                  v-else
-                  class="comma"
-                >{{ item }}</span>
+                <span v-else class="comma">{{ item }}</span>
               </li>
             </div>
           </el-form-item>
         </div>
-        <div
-          class="form-right"
-          @keyup.enter="onSubmit(0)"
-        >
+        <div class="form-right" @keyup.enter="onSubmit(0)">
           <el-form-item prop="search">
-            <el-popover
-              :value="popoverVisible"
-              placement="bottom"
-              trigger="manual"
-            >
+            <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
               <span>请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）</span>
-              <el-input
-                slot="reference"
-                v-model="formData.search"
-                class="input-shadow"
-                style="width: 240px; margin-left: 105px"
-                size="small"
-                placeholder="请输入内容"
-                prefix-icon="el-icon-search"
-                clearable
-                @focus="popoverVisible = true"
-                @blur="popoverVisible = false"
-              />
+              <el-input slot="reference" v-model="formData.search" class="input-shadow" style="width: 240px; margin-left: 105px" size="small" placeholder="请输入内容" prefix-icon="el-icon-search" clearable @focus="popoverVisible = true" @blur="popoverVisible = false" />
             </el-popover>
           </el-form-item>
           <el-form-item>
-            <el-button
-              class="btn-shadow"
-              size="mini"
-              type="primary"
-              @click="onSubmit(0)"
-            >搜索</el-button>
+            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(0)">搜索</el-button>
           </el-form-item>
           <el-form-item v-is="['i_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item>
-            <img
-              class="btn-img btn-shadow"
-              src="../../../../assets/baggage/ic_setting.png"
-              @click="show"
-            >
+            <img class="btn-img btn-shadow" src="../../../../assets/baggage/ic_setting.png" @click="show">
           </el-form-item>
         </div>
       </el-form>
     </div>
     <!--表格-->
-    <div
-      v-loading="loading"
-      class="terminal-table"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-    >
-      <el-table
-        ref="table"
-        class="table"
-        :height="computedTableHeight"
-        :data="dealedTableData"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        show-summary
-        :summary-method="summaryMethod"
-        border
-        stripe
-        fit
-        @cell-click="cellClickHandler"
-      >
-        <el-table-column
-          v-for="col in tableColsCopy"
-          :key="col.prop"
-          :prop="col.prop"
-          :label="col.label"
-          :width="col.width"
-          :fixed="col.fixed"
-          :formatter="tableFormat"
-        >
+    <div v-loading="loading" class="terminal-table" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-table ref="table" class="table" :height="computedTableHeight" :data="dealedTableData" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" show-summary :summary-method="summaryMethod" border stripe fit @cell-click="cellClickHandler">
+        <el-table-column v-for="col in tableColsCopy" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed" :formatter="tableFormat">
           <template #header>
-            <el-tooltip
-              :content="col.disc"
-              placement="top"
-            >
-              <TableHeaderCell
-                :label="col.label"
-                :filter-options="tableDataFilters[col.prop]"
-                :filter-values.sync="filterValues[col.prop]"
-                :sortable="col.sortable"
-                :sort-rule.sync="tableDataSortRules[col.prop]"
-              />
+            <el-tooltip :content="col.disc" placement="top">
+              <TableHeaderCell :label="col.label" :filter-options="tableDataFilters[col.prop]" :filter-values.sync="filterValues[col.prop]" :sortable="col.sortable" :sort-rule.sync="tableDataSortRules[col.prop]" />
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog
-      :flag="dialogFlag"
-      class="dialog-check-cols"
-    >
+    <Dialog :flag="dialogFlag" class="dialog-check-cols">
       <div class="col-dialog">
         <div class="title">列设置</div>
         <div class="content">
-          <el-tree
-            :data="tableCols"
-            :class="colsCheckClass"
-            show-checkbox
-            node-key="index"
-            :default-expand-all="true"
-            :props="{
+          <el-tree :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
               label: 'label',
               children: 'children'
-            }"
-            :default-checked-keys="checkedKeysTemp"
-            @check="handleCheck"
-          />
+            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
         </div>
         <div class="foot right t30">
-          <el-button
-            size="medium"
-            class="r24"
-            type="primary"
-            @click="onCheck"
-          >确定</el-button>
-          <el-button
-            size="medium"
-            @click="hide"
-          >取消</el-button>
+          <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -256,7 +132,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
-  data() {
+  data () {
     return {
       orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
       popoverVisible: false,
@@ -265,7 +141,7 @@ export default {
         {
           prop: 'FlightNO',
           label: '航班号',
-          disc:'指航班编号',
+          disc: '指航班编号',
           width: 80,
           fixed: 'left',
           filterable: true,
@@ -274,7 +150,7 @@ export default {
         {
           prop: 'FlightDate',
           label: '执飞日期',
-          disc:'指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
+          disc: '指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
           width: 105,
           fixed: 'left',
           filterable: true,
@@ -283,7 +159,7 @@ export default {
         {
           prop: 'PlanDepartureTime',
           label: '预计起飞时间',
-          disc:'指航班预计起飞时间，数据是变化的，仅显示最新结果',
+          disc: '指航班预计起飞时间，数据是变化的，仅显示最新结果',
           width: 150,
           filterable: true,
           sortable: true
@@ -291,105 +167,105 @@ export default {
         {
           prop: 'TargetAirport',
           label: '目的站',
-          disc:'指航班执飞航段的目的航站，以航站三字码显示',
+          disc: '指航班执飞航段的目的航站，以航站三字码显示',
           filterable: true,
           sortable: true
         },
         {
           prop: 'DepartureBuild',
           label: '航站楼',
-          disc:'指航班执飞航段的目的航站楼',
+          disc: '指航班执飞航段的目的航站楼',
           filterable: true,
           sortable: true
         },
         {
           prop: 'BordingGate',
           label: '登机口',
-          disc:'指航班的登机口代码，数据是变化的，仅显示最新信息',
+          disc: '指航班的登机口代码，数据是变化的，仅显示最新信息',
           filterable: true,
           sortable: true
         },
         {
           prop: 'StandForDepartrue',
           label: '停机位',
-          disc:'指航班的停机位代码，数据是变化的，仅显示最新信息',
+          disc: '指航班的停机位代码，数据是变化的，仅显示最新信息',
           filterable: true,
           sortable: true
         },
         {
           prop: 'checkInTravellerNumber',
           label: '托运旅客',
-          disc:'指航班已办理行李托运业务的旅客人数，含取消托运的旅客人数',
+          disc: '指航班已办理行李托运业务的旅客人数，含取消托运的旅客人数',
         },
         {
           prop: 'checkInNumber',
           label: '值机数',
-          disc:'指已办理值机托运的行李数量，含取消托运的行李数量，含未激活',
+          disc: '指已办理值机托运的行李数量，含取消托运的行李数量，含未激活',
         },
         {
           prop: 'unActive',
           label: '未激活',
-          disc:'指最后的 BSM 报文“.S”中行李状态为“I”的行李数量，含取消托运的行李数量',
+          disc: '指最后的 BSM 报文“.S”中行李状态为“I”的行李数量，含取消托运的行李数量',
         },
         {
           prop: 'preLoad',
           label: '预计装载',
-          disc:'指已办理值机托运的行李数量，不含取消托运的行李数量，不包含未激活',
+          disc: '指已办理值机托运的行李数量，不含取消托运的行李数量，不包含未激活',
         },
         {
           prop: 'checkNumber',
           label: '安检',
-          disc:'指进行安检的行李数量，含取消托运的行李数量',
+          disc: '指进行安检的行李数量，含取消托运的行李数量',
         },
         {
           prop: 'sortNumber',
           label: '分拣',
-          disc:'指已分拣完成的行李数量，含取消托运的行李数量',
+          disc: '指已分拣完成的行李数量，含取消托运的行李数量',
         },
         {
           prop: 'loadNumber',
           label: '装车',
-          disc:'指已在分拣口装车完成的行李数量，含取消托运的行李数量',
+          disc: '指已在分拣口装车完成的行李数量，含取消托运的行李数量',
         },
         {
           prop: 'landingNumber',
           label: '装机',
-          disc:'指装机完成的行李数量，不含取消托运的行李数量',
+          disc: '指装机完成的行李数量，不含取消托运的行李数量',
         },
         {
           prop: 'tounLoad',
           label: '待翻减',
-          disc:'指旅客在办理行李托运后，旅客取消该行李的托运并且行李此时已经过装车节点，而没有完成翻减的行李数量（须翻减总数减去已翻减数）',
+          disc: '指旅客在办理行李托运后，旅客取消该行李的托运并且行李此时已经过装车节点，而没有完成翻减的行李数量（须翻减总数减去已翻减数）',
         },
         {
           prop: 'unLoad',
           label: '已翻减',
-          disc:'指旅客在办理行李托运后，旅客取消该行李的托运并且行李此时已经过装车节点，且已完成翻减的行李数量',
+          disc: '指旅客在办理行李托运后，旅客取消该行李的托运并且行李此时已经过装车节点，且已完成翻减的行李数量',
         },
         {
           prop: 'noCheckInNumber',
           label: '取消托运',
-          disc:'指旅客在办理行李托运后，又取消托运的行李总数量',
+          disc: '指旅客在办理行李托运后，又取消托运的行李总数量',
         },
         {
           prop: 'noBSM',
           label: '无BSM',
-          disc:'行李有处理信息（BPM）但无值机信息(BSM)的行李数量',
+          disc: '行李有处理信息（BPM）但无值机信息(BSM)的行李数量',
         },
         {
           prop: 'riskWarning',
           label: '风险预警',
-          disc:'指依据航班信息中预计起飞时间和当前时间差，与根据分拣到停机位设置的报警阈值对比，超过阈值的为风险行李，本项显示风险预警行李数量',
+          disc: '指依据航班信息中预计起飞时间和当前时间差，与根据分拣到停机位设置的报警阈值对比，超过阈值的为风险行李，本项显示风险预警行李数量',
         },
         {
           prop: 'departureAnomaly',
           label: '离港异常',
-          disc:'指航班关闭货仓门后，应装而未装的行李数量',
+          disc: '指航班关闭货仓门后，应装而未装的行李数量',
         },
         {
           prop: 'midIn',
           label: '中转进行李',
-          disc:'指从其他航班中转到当前航班的行李数量',
+          disc: '指从其他航班中转到当前航班的行李数量',
         }
       ],
       tableDataSortRules: {
@@ -403,22 +279,22 @@ export default {
       hasSetTableScroll: false
     }
   },
-  mounted() {
+  mounted () {
     this.getAirPortData()
   },
-  beforeDestroy() {
+  beforeDestroy () {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   computed: {
-    singleDay() {
+    singleDay () {
       return this.startDate === this.endDate
     }
   },
   methods: {
-    resetLoopEvent() {
+    resetLoopEvent () {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -430,16 +306,16 @@ export default {
         that.getTableData()
       }, 3000)
     },
-    airPortChange() {
+    airPortChange () {
       this.resetLoopEvent()
     },
-    dateChangeHandler() {
+    dateChangeHandler () {
       this.resetLoopEvent()
     },
-    async getAirPortData() {
+    async getAirPortData () {
       try {
         const res = await getQuery({
-          id: 65,
+          id: DATACONTENT_ID.departureAirMainId,
           dataContent: []
         })
         if (Number(res.code) === 0) {
@@ -453,7 +329,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.flightStatus === 'DLY') {
         classes.push('bgl-delayed')
@@ -469,7 +345,7 @@ export default {
       }
       return classes.join(' ')
     },
-    headerCellClass({ row, column }) {
+    headerCellClass ({ row, column }) {
       const classes = []
       if (['riskWarning', 'departureAnomaly', 'midIn'].includes(column.property)) {
         classes.push('bgl-huang')
@@ -491,14 +367,14 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData() {
+    async getTableData () {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
       const arr = [this.formData.currentAirport, this.startDate, this.endDate]
       try {
         const res = await getQuery({
-          id: 66,
+          id: DATACONTENT_ID.departureTableMainId,
           dataContent: [...arr, ...arr, ...arr]
         })
         if (Number(res.code) === 0) {
@@ -516,7 +392,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    initTableData(tableData) {
+    initTableData (tableData) {
       this.leaveCount = 0
       this.baggageCount = 0
       tableData.forEach(item => {
@@ -538,7 +414,7 @@ export default {
         this.setTableScroll()
       })
     },
-    setTableScroll() {
+    setTableScroll () {
       if (!this.singleDay || this.hasSetTableScroll || this.leaveCount === 0) {
         return
       }
@@ -558,7 +434,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform() {
+    setNumberTransform () {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -568,7 +444,7 @@ export default {
       }
     },
 
-    toOrderNum(num) {
+    toOrderNum (num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -606,7 +482,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-size: 14px;
       }
       .el-switch__label {
@@ -712,7 +588,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, 'Microsoft YaHei';
+      font-family: Helvetica, "Microsoft YaHei";
       letter-spacing: 0;
     }
     .cell-click {
@@ -745,7 +621,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: '';
+            content: "";
             position: absolute;
             left: 0;
             bottom: 0;
@@ -765,7 +641,7 @@ export default {
         background: lightcoral !important;
         position: relative;
         &::after {
-          content: '';
+          content: "";
           display: block;
           width: 100%;
           height: 100%;

src/views/baggageManagement/components/transferArrival/index.vue

@@ -8,17 +8,8 @@
 <template>
   <div class="transfer-in">
     <!--功能区-表单-->
-    <div
-      ref="formWrap"
-      class="terminal-form-wrap"
-    >
-      <el-form
-        ref="form"
-        :inline="true"
-        :model="formData"
-        :rules="rules"
-        class="form"
-      >
+    <div ref="formWrap" class="terminal-form-wrap">
+      <el-form ref="form" :inline="true" :model="formData" :rules="rules" class="form">
         <div class="form-left">
           <el-form-item prop="currentAirport">
             <!-- <el-cascader
@@ -33,51 +24,15 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select
-              v-model="formData.currentAirport"
-              class="input-shadow"
-              size="small"
-              filterable
-              placeholder="请选择机场"
-              @change="airPortChange"
-            >
-              <el-option
-                v-for="(item, index) in AirportList"
-                :key="index"
-                :label="item.PlanDepartureApt"
-                :value="item.PlanDepartureApt"
-              />
+            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" filterable placeholder="请选择机场" @change="airPortChange">
+              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.PlanDepartureApt" :value="item.PlanDepartureApt" />
             </el-select>
           </el-form-item>
           <el-form-item prop="inboundCarrier">
-            <el-cascader
-              v-model="formData.inboundCarrier"
-              class="input-shadow"
-              style="width: 164px"
-              size="small"
-              :options="carrierProps"
-              :props="optionProps"
-              placeholder="进港承运航司"
-              collapse-tags
-              clearable
-              filterable
-              @change="resetLoopEvent"
-            />
+            <el-cascader v-model="formData.inboundCarrier" class="input-shadow" style="width: 164px" size="small" :options="carrierProps" :props="optionProps" placeholder="进港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
           </el-form-item>
           <el-form-item prop="outgoingAirline">
-            <el-cascader
-              v-model="formData.outgoingAirline"
-              class="input-shadow"
-              style="width: 164px"
-              size="small"
-              :options="carrierPropsop"
-              :props="optionPropser"
-              placeholder="离港承运航司"
-              collapse-tags
-              clearable
-              filterable
-              @change="resetLoopEvent"
-            />
+            <el-cascader v-model="formData.outgoingAirline" class="input-shadow" style="width: 164px" size="small" :options="carrierPropsop" :props="optionPropser" placeholder="离港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
           </el-form-item>
           <!-- <el-form-item prop="startDate">
             <el-date-picker
@@ -103,20 +58,8 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item
-            prop="FlightDate"
-            label="航班日期"
-          >
-            <el-date-picker
-              v-model="formData.FlightDate"
-              size="small"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="dateRangePickerOptions"
-              @change="dateChangeHandler"
-            />
+          <el-form-item prop="FlightDate" label="航班日期">
+            <el-date-picker v-model="formData.FlightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChangeHandler" />
           </el-form-item>
         </div>
         <!-- <el-form-item>
@@ -134,112 +77,36 @@
             </li>
           </div>
         </el-form-item> -->
-        <div
-          class="form-right"
-          @keyup.enter="onSubmit(1)"
-        >
+        <div class="form-right" @keyup.enter="onSubmit(1)">
           <el-form-item prop="search">
-            <el-popover
-              :value="popoverVisible"
-              placement="bottom"
-              trigger="manual"
-            >
+            <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
               <span>请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）</span>
-              <el-input
-                slot="reference"
-                v-model="formData.search"
-                class="input-shadow"
-                style="width: 240px;"
-                size="small"
-                placeholder="请输入内容"
-                prefix-icon="el-icon-search"
-                clearable
-                @focus="popoverVisible = true"
-                @blur="popoverVisible = false"
-              />
+              <el-input slot="reference" v-model="formData.search" class="input-shadow" style="width: 240px;" size="small" placeholder="请输入内容" prefix-icon="el-icon-search" clearable @focus="popoverVisible = true" @blur="popoverVisible = false" />
             </el-popover>
           </el-form-item>
           <el-form-item>
-            <el-button
-              class="btn-shadow"
-              size="mini"
-              type="primary"
-              @click="onSubmit(1)"
-            >搜索</el-button>
+            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(1)">搜索</el-button>
           </el-form-item>
           <el-form-item v-is="['ti_showTransit']">
-            <el-button
-              class="btn-shadow"
-              size="mini"
-              type="primary"
-              @click="changeView"
-            >切换视角</el-button>
+            <el-button class="btn-shadow" size="mini" type="primary" @click="changeView">切换视角</el-button>
           </el-form-item>
           <el-form-item v-is="['i_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item>
-            <img
-              class="btn-img btn-shadow"
-              src="../../../../assets/baggage/ic_setting.png"
-              @click="show"
-            >
+            <img class="btn-img btn-shadow" src="../../../../assets/baggage/ic_setting.png" @click="show">
           </el-form-item>
         </div>
       </el-form>
     </div>
     <!--表格-->
-    <div
-      v-loading="loading"
-      class="terminal-table"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-    >
-      <el-table
-        ref="table"
-        class="table"
-        :data="dealedTableData"
-        :height="computedTableHeight"
-        show-summary
-        :summary-method="summaryMethod"
-        :span-method="arraySpanMethod"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        border
-        stripe
-        fit
-        @cell-click="cellClickHandler"
-      >
-        <el-table-column
-          v-for="col in tableColsCopy"
-          :key="col.prop"
-          :prop="col.prop"
-          :label="col.label"
-          :width="col.width"
-          :fixed="col.fixed"
-        >
-          <el-table-column
-            v-for="childCol in col.children"
-            :key="childCol.prop"
-            :prop="childCol.prop"
-            :label="childCol.label"
-            :width="childCol.width"
-            :formatter="tableFormat"
-          >
+    <div v-loading="loading" class="terminal-table" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-table ref="table" class="table" :data="dealedTableData" :height="computedTableHeight" show-summary :summary-method="summaryMethod" :span-method="arraySpanMethod" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" border stripe fit @cell-click="cellClickHandler">
+        <el-table-column v-for="col in tableColsCopy" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed">
+          <el-table-column v-for="childCol in col.children" :key="childCol.prop" :prop="childCol.prop" :label="childCol.label" :width="childCol.width" :formatter="tableFormat">
             <template #header>
-              <el-tooltip
-                :content="childCol.disc"
-                placement="top"
-              >
-                <TableHeaderCell
-                  :label="childCol.label"
-                  :filter-options="tableDataFilters[childCol.prop]"
-                  :filter-values.sync="filterValues[childCol.prop]"
-                  :sortable="childCol.sortable"
-                  :sort-rule.sync="tableDataSortRules[childCol.prop]"
-                />
+              <el-tooltip :content="childCol.disc" placement="top">
+                <TableHeaderCell :label="childCol.label" :filter-options="tableDataFilters[childCol.prop]" :filter-values.sync="filterValues[childCol.prop]" :sortable="childCol.sortable" :sort-rule.sync="tableDataSortRules[childCol.prop]" />
               </el-tooltip>
             </template>
           </el-table-column>
@@ -247,38 +114,18 @@
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog
-      :flag="dialogFlag"
-      class="dialog-check-cols"
-    >
+    <Dialog :flag="dialogFlag" class="dialog-check-cols">
       <div class="col-dialog">
         <div class="title">列设置</div>
         <div class="content">
-          <el-tree
-            :data="tableCols"
-            :class="colsCheckClass"
-            show-checkbox
-            node-key="index"
-            :default-expand-all="true"
-            :props="{
+          <el-tree :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
               label: 'label',
               children: 'children',
-            }"
-            :default-checked-keys="checkedKeysTemp"
-            @check="handleCheck"
-          />
+            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
         </div>
         <div class="foot right t30">
-          <el-button
-            size="medium"
-            class="r24"
-            type="primary"
-            @click="onCheck"
-          >确定</el-button>
-          <el-button
-            size="medium"
-            @click="hide"
-          >取消</el-button>
+          <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -300,7 +147,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
-  data() {
+  data () {
     return {
       optionProps: {
         value: 'inAicompanyCode2',
@@ -323,7 +170,7 @@ export default {
             {
               prop: 'PreFlightNO',
               label: '航班号',
-              disc:'进港航班编号',
+              disc: '进港航班编号',
               width: 80,
               filterable: true,
               sortable: true
@@ -331,13 +178,13 @@ export default {
             {
               prop: 'PreFlightDate',
               label: '航班日期',
-              disc:'指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
+              disc: '指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
               width: 100
             },
             {
               prop: 'PreAirport',
               label: '起飞航站',
-              disc:'指进港航班的起飞机场三字码',
+              disc: '指进港航班的起飞机场三字码',
               width: 100,
               filterable: true,
               sortable: true
@@ -345,13 +192,13 @@ export default {
             {
               prop: 'ActualLandingTime',
               label: '降落时间',
-              disc:'指航班预计到达时间，数据是变化的，仅显示最新结果',
+              disc: '指航班预计到达时间，数据是变化的，仅显示最新结果',
               width: 100
             },
             {
               prop: 'LandingBuild',
               label: '降落航站楼',
-              disc:'指航班降落后位于机场的哪个航站楼',
+              disc: '指航班降落后位于机场的哪个航站楼',
               width: 98,
               filterable: true,
               sortable: true
@@ -359,7 +206,7 @@ export default {
             {
               prop: 'Carousel',
               label: '行李转盘',
-              disc:'指航班到达后行李提取的地方，仅显示最新信息',
+              disc: '指航班到达后行李提取的地方，仅显示最新信息',
               width: 100,
               filterable: true,
               sortable: true
@@ -367,7 +214,7 @@ export default {
             {
               prop: 'StandForLanding',
               label: '降落停机位',
-              disc:'指航班的停机位代码，数据是变化的，仅显示最新信息',
+              disc: '指航班的停机位代码，数据是变化的，仅显示最新信息',
               width: 98,
               filterable: true,
               sortable: true
@@ -375,13 +222,13 @@ export default {
             {
               prop: 'inTransferBaggageCount',
               label: '中转行李数',
-              disc:'指航班在本航站预计需要中转至对应航班的行李数量',
+              disc: '指航班在本航站预计需要中转至对应航班的行李数量',
 
             },
             {
               prop: 'inTransferredBaggageCount',
               label: '已中转行李数',
-              disc:'指航班在本航站实际已经中转至对应航班的行李数量',
+              disc: '指航班在本航站实际已经中转至对应航班的行李数量',
               width: 100
             }
           ]
@@ -393,7 +240,7 @@ export default {
             {
               prop: 'FlightNO',
               label: '航班号',
-              disc:'指航班编号',
+              disc: '指航班编号',
               width: 80,
               filterable: true,
               sortable: true
@@ -401,26 +248,26 @@ export default {
             {
               prop: 'FlightDate',
               label: '航班日期',
-              disc:'指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
+              disc: '指航班计划起飞日期（不变的，机票上），不是预计起飞日期（预计起飞时间可能多个），也不是实际起飞日期（实际起飞等于最后预计）',
               width: 100
             },
             {
               prop: 'ActualDepartureTime',
               label: '起飞时间',
-              disc:'指航班预计起飞时间，数据是变化的，仅显示最新结果',
+              disc: '指航班预计起飞时间，数据是变化的，仅显示最新结果',
               width: 100
             },
             {
               prop: 'TargetAirport',
               label: '目的站',
-              disc:'指航班执飞航段的目的航站，以航站三字码+航站简称显示',
+              disc: '指航班执飞航段的目的航站，以航站三字码+航站简称显示',
               filterable: true,
               sortable: true
             },
             {
               prop: 'DepartureBuild',
               label: '起飞航站楼',
-              disc:'指航班执飞航段的起飞航站的航站楼',
+              disc: '指航班执飞航段的起飞航站的航站楼',
               width: 98,
               filterable: true,
               sortable: true
@@ -428,7 +275,7 @@ export default {
             {
               prop: 'BordingGate',
               label: '起飞登机口',
-              disc:'指航班的登机口代码，数据是变化的，仅显示最新信息',
+              disc: '指航班的登机口代码，数据是变化的，仅显示最新信息',
               width: 98,
               filterable: true,
               sortable: true
@@ -436,7 +283,7 @@ export default {
             {
               prop: 'StandForDepartrue',
               label: '起飞停机位',
-              disc:'指航班的停机位代码，数据是变化的，仅显示最新信息',
+              disc: '指航班的停机位代码，数据是变化的，仅显示最新信息',
               width: 98,
               filterable: true,
               sortable: true
@@ -444,19 +291,19 @@ export default {
             {
               prop: 'outTransferBaggageCount',
               label: '中转进行李数',
-              disc:'指其它航班预计中转至本航班的行李数量',
+              disc: '指其它航班预计中转至本航班的行李数量',
               width: 100
             },
             {
               prop: 'outTransferredBaggageCount',
               label: '已中转进行李数',
-              disc:'指其它航班实际已中转至本航班的行李数量',
+              disc: '指其它航班实际已中转至本航班的行李数量',
               width: 120
             },
             {
               prop: 'timeDifference',
               label: '转运时间',
-              disc:'指中转动作完成时间',
+              disc: '指中转动作完成时间',
             }
           ]
         }
@@ -474,7 +321,7 @@ export default {
       flag: 0
     }
   },
-  created() {
+  created () {
     // this.getAirPortData()
     const { startDate, endDate } = this.$route.query
     Object.entries(this.$route.query).forEach(([key, value]) => {
@@ -489,23 +336,23 @@ export default {
       this.formData.FlightDate[1] = endDate
     }
   },
-  mounted() {
+  mounted () {
     this.$refs['form'].validateField('FlightDate')
     this.getAirPortData()
   },
-  beforeDestroy() {
+  beforeDestroy () {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   computed: {
-    singleDay() {
+    singleDay () {
       return this.startDate === this.endDate
     }
   },
   methods: {
-    resetLoopEvent() {
+    resetLoopEvent () {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -517,7 +364,7 @@ export default {
         that.getTableData()
       }, 3000)
     },
-    headerCellClass({ row, column }) {
+    headerCellClass ({ row, column }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -525,7 +372,7 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.hasArrived) {
         classes.push('bgl-hui')
@@ -535,7 +382,7 @@ export default {
       }
       return classes.join(' ')
     },
-    changeView() {
+    changeView () {
       const query = {
         ...this.formData,
         startDate: this.startDate,
@@ -547,21 +394,21 @@ export default {
         query
       })
     },
-    airPortChange() {
+    airPortChange () {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
-    dateChangeHandler() {
+    dateChangeHandler () {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
     // 选择机场
-    async getAirPortData() {
+    async getAirPortData () {
       try {
         const res = await getQuery({
-          id: 72,
+          id: DATACONTENT_ID.departureAirId,
           dataContent: []
         })
         if (Number(res.code) === 0) {
@@ -578,10 +425,10 @@ export default {
       }
     },
     // 选择航司
-    async getAviationData() {
+    async getAviationData () {
       try {
         const res = await getQuery({
-          id: 71,
+          id: DATACONTENT_ID.departureAviJoinId,
           dataContent: [this.formData.currentAirport]
         })
         if (Number(res.code) === 0) {
@@ -594,10 +441,10 @@ export default {
       }
     },
     // 选择航司
-    async upAviationData() {
+    async upAviationData () {
       try {
         const res = await getQuery({
-          id: 74,
+          id: DATACONTENT_ID.departureAviLeaveId,
           dataContent: [this.formData.currentAirport]
         })
         if (Number(res.code) === 0) {
@@ -620,7 +467,7 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData() {
+    async getTableData () {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
@@ -643,7 +490,7 @@ export default {
       ]
       try {
         const res = await getQuery({
-          id: 69,
+          id: DATACONTENT_ID.departureTableId,
           dataContent: [...arr]
         })
         if (Number(res.code) === 0) {
@@ -661,7 +508,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    initTableData(tableData) {
+    initTableData (tableData) {
       this.arrivalCount = 0
       // this.baggageCount = 0
       tableData.forEach(item => {
@@ -686,13 +533,13 @@ export default {
         this.setTableScroll()
       })
     },
-    hasArrived(flight) {
+    hasArrived (flight) {
       const now = new Date()
       const ActualLandingTime = new Date(flight.ActualLandingTime.replace('T', ' '))
       flight['hasArrived'] = now > ActualLandingTime && !flight['flightCanceled']
       return flight['hasArrived']
     },
-    setTableScroll() {
+    setTableScroll () {
       if (!this.singleDay || this.hasSetTableScroll || this.arrivalCount === 0) {
         return
       }
@@ -713,7 +560,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform() {
+    setNumberTransform () {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -723,7 +570,7 @@ export default {
       }
     },
 
-    toOrderNum(num) {
+    toOrderNum (num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -736,7 +583,7 @@ export default {
       }
       this.setNumberTransform()
     },
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
       for (let i = 0; i < 7; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
@@ -773,7 +620,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-size: 14px;
       }
       .el-switch__label {
@@ -879,7 +726,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, 'Microsoft YaHei';
+      font-family: Helvetica, "Microsoft YaHei";
       letter-spacing: 0;
     }
     .cell-click {
@@ -913,7 +760,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: '';
+            content: "";
             position: absolute;
             left: 0;
             bottom: 0;

src/views/baggageManagement/components/transferDeparture/index.vue

@@ -8,17 +8,8 @@
 <template>
   <div class="transfer-out">
     <!--功能区-表单-->
-    <div
-      ref="formWrap"
-      class="terminal-form-wrap"
-    >
-      <el-form
-        ref="form"
-        :inline="true"
-        :model="formData"
-        :rules="rules"
-        class="form"
-      >
+    <div ref="formWrap" class="terminal-form-wrap">
+      <el-form ref="form" :inline="true" :model="formData" :rules="rules" class="form">
         <div class="form-left">
           <el-form-item prop="currentAirport">
             <!-- <el-cascader
@@ -33,51 +24,15 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-            <el-select
-              v-model="formData.currentAirport"
-              class="input-shadow"
-              size="small"
-              filterable
-              placeholder="请选择机场"
-              @change="airPortChange"
-            >
-              <el-option
-                v-for="(item, index) in AirportList"
-                :key="index"
-                :label="item.PlanDepartureApt"
-                :value="item.PlanDepartureApt"
-              />
+            <el-select v-model="formData.currentAirport" class="input-shadow" size="small" filterable placeholder="请选择机场" @change="airPortChange">
+              <el-option v-for="(item, index) in AirportList" :key="index" :label="item.PlanDepartureApt" :value="item.PlanDepartureApt" />
             </el-select>
           </el-form-item>
           <el-form-item prop="inboundCarrier">
-            <el-cascader
-              v-model="formData.inboundCarrier"
-              class="input-shadow"
-              style="width: 164px"
-              size="small"
-              :options="carrierProps"
-              :props="optionProps"
-              placeholder="进港承运航司"
-              collapse-tags
-              clearable
-              filterable
-              @change="resetLoopEvent"
-            />
+            <el-cascader v-model="formData.inboundCarrier" class="input-shadow" style="width: 164px" size="small" :options="carrierProps" :props="optionProps" placeholder="进港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
           </el-form-item>
           <el-form-item prop="outgoingAirline">
-            <el-cascader
-              v-model="formData.outgoingAirline"
-              class="input-shadow"
-              style="width: 164px"
-              size="small"
-              :options="carrierPropsop"
-              :props="optionPropser"
-              placeholder="离港承运航司"
-              collapse-tags
-              clearable
-              filterable
-              @change="resetLoopEvent"
-            />
+            <el-cascader v-model="formData.outgoingAirline" class="input-shadow" style="width: 164px" size="small" :options="carrierPropsop" :props="optionPropser" placeholder="离港承运航司" collapse-tags clearable filterable @change="resetLoopEvent" />
           </el-form-item>
           <!-- <el-form-item prop="startDate">
             <el-date-picker
@@ -103,20 +58,8 @@
               @change="endDateChangeHandler"
             />
           </el-form-item> -->
-          <el-form-item
-            prop="FlightDate"
-            label="航班日期"
-          >
-            <el-date-picker
-              v-model="formData.FlightDate"
-              size="small"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="dateRangePickerOptions"
-              @change="dateChangeHandler"
-            />
+          <el-form-item prop="FlightDate" label="航班日期">
+            <el-date-picker v-model="formData.FlightDate" size="small" type="daterange" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="dateRangePickerOptions" @change="dateChangeHandler" />
           </el-form-item>
         </div>
         <!-- <el-form-item>
@@ -134,112 +77,36 @@
             </li>
           </div>
         </el-form-item> -->
-        <div
-          class="form-right"
-          @keyup.enter="onSubmit(0)"
-        >
+        <div class="form-right" @keyup.enter="onSubmit(0)">
           <el-form-item prop="search">
-            <el-popover
-              :value="popoverVisible"
-              placement="bottom"
-              trigger="manual"
-            >
+            <el-popover :value="popoverVisible" placement="bottom" trigger="manual">
               <span>请输入航班号（示例：CA1234）或行李牌号（示例：1234567890）</span>
-              <el-input
-                slot="reference"
-                v-model="formData.search"
-                class="input-shadow"
-                style="width: 240px;"
-                size="small"
-                placeholder="请输入内容"
-                prefix-icon="el-icon-search"
-                clearable
-                @focus="popoverVisible = true"
-                @blur="popoverVisible = false"
-              />
+              <el-input slot="reference" v-model="formData.search" class="input-shadow" style="width: 240px;" size="small" placeholder="请输入内容" prefix-icon="el-icon-search" clearable @focus="popoverVisible = true" @blur="popoverVisible = false" />
             </el-popover>
           </el-form-item>
           <el-form-item>
-            <el-button
-              class="btn-shadow"
-              size="mini"
-              type="primary"
-              @click="onSubmit(0)"
-            >搜索</el-button>
+            <el-button class="btn-shadow" size="mini" type="primary" @click="onSubmit(0)">搜索</el-button>
           </el-form-item>
           <el-form-item v-is="['ti_showTransit']">
-            <el-button
-              class="btn-shadow"
-              size="mini"
-              type="primary"
-              @click="changeView"
-            >切换视角</el-button>
+            <el-button class="btn-shadow" size="mini" type="primary" @click="changeView">切换视角</el-button>
           </el-form-item>
           <el-form-item v-is="['i_timeIcon']">
             <TimeZoneSelector />
           </el-form-item>
           <el-form-item>
-            <img
-              class="btn-img btn-shadow"
-              src="../../../../assets/baggage/ic_setting.png"
-              @click="show"
-            >
+            <img class="btn-img btn-shadow" src="../../../../assets/baggage/ic_setting.png" @click="show">
           </el-form-item>
         </div>
       </el-form>
     </div>
     <!--表格-->
-    <div
-      v-loading="loading"
-      class="terminal-table"
-      element-loading-text="拼命加载中"
-      element-loading-spinner="el-icon-loading"
-      element-loading-background="rgba(0, 0, 0, 0.8)"
-    >
-      <el-table
-        ref="table"
-        class="table"
-        :data="dealedTableData"
-        :height="computedTableHeight"
-        show-summary
-        :summary-method="summaryMethod"
-        :span-method="arraySpanMethod"
-        :header-cell-class-name="headerCellClass"
-        :row-class-name="tableRowClassName"
-        :cell-class-name="cellClass"
-        border
-        stripe
-        fit
-        @cell-click="cellClickHandler"
-      >
-        <el-table-column
-          v-for="col in tableColsCopy"
-          :key="col.prop"
-          :prop="col.prop"
-          :label="col.label"
-          :width="col.width"
-          :fixed="col.fixed"
-        >
-          <el-table-column
-            v-for="childCol in col.children"
-            :key="childCol.prop"
-            :prop="childCol.prop"
-            :label="childCol.label"
-            :width="childCol.width"
-            :formatter="tableFormat"
-          >
+    <div v-loading="loading" class="terminal-table" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
+      <el-table ref="table" class="table" :data="dealedTableData" :height="computedTableHeight" show-summary :summary-method="summaryMethod" :span-method="arraySpanMethod" :header-cell-class-name="headerCellClass" :row-class-name="tableRowClassName" :cell-class-name="cellClass" border stripe fit @cell-click="cellClickHandler">
+        <el-table-column v-for="col in tableColsCopy" :key="col.prop" :prop="col.prop" :label="col.label" :width="col.width" :fixed="col.fixed">
+          <el-table-column v-for="childCol in col.children" :key="childCol.prop" :prop="childCol.prop" :label="childCol.label" :width="childCol.width" :formatter="tableFormat">
             <template #header>
-              <el-tooltip
-                :content="childCol.label"
-                placement="top"
-              >
-                <TableHeaderCell
-                  :label="childCol.label"
-                  :filter-options="tableDataFilters[childCol.prop]"
-                  :filter-values.sync="filterValues[childCol.prop]"
-                  :sortable="childCol.sortable"
-                  :sort-rule.sync="tableDataSortRules[childCol.prop]"
-                />
+              <el-tooltip :content="childCol.label" placement="top">
+                <TableHeaderCell :label="childCol.label" :filter-options="tableDataFilters[childCol.prop]" :filter-values.sync="filterValues[childCol.prop]" :sortable="childCol.sortable" :sort-rule.sync="tableDataSortRules[childCol.prop]" />
               </el-tooltip>
             </template>
           </el-table-column>
@@ -247,38 +114,18 @@
       </el-table>
     </div>
     <!--列设置-->
-    <Dialog
-      :flag="dialogFlag"
-      class="dialog-check-cols"
-    >
+    <Dialog :flag="dialogFlag" class="dialog-check-cols">
       <div class="col-dialog">
         <div class="title">列设置</div>
         <div class="content">
-          <el-tree
-            :data="tableCols"
-            :class="colsCheckClass"
-            show-checkbox
-            node-key="index"
-            :default-expand-all="true"
-            :props="{
+          <el-tree :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
               label: 'label',
               children: 'children',
-            }"
-            :default-checked-keys="checkedKeysTemp"
-            @check="handleCheck"
-          />
+            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
         </div>
         <div class="foot right t30">
-          <el-button
-            size="medium"
-            class="r24"
-            type="primary"
-            @click="onCheck"
-          >确定</el-button>
-          <el-button
-            size="medium"
-            @click="hide"
-          >取消</el-button>
+          <el-button size="medium" class="r24" type="primary" @click="onCheck">确定</el-button>
+          <el-button size="medium" @click="hide">取消</el-button>
         </div>
       </div>
     </Dialog>
@@ -300,7 +147,7 @@ export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
   mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
-  data() {
+  data () {
     return {
       optionProps: {
         value: 'inAicompanyCode2',
@@ -454,7 +301,7 @@ export default {
       flag: 0
     }
   },
-  created() {
+  created () {
     // this.getAirPortData()
     const { startDate, endDate } = this.$route.query
     Object.entries(this.$route.query).forEach(([key, value]) => {
@@ -469,23 +316,23 @@ export default {
       this.formData.FlightDate[1] = endDate
     }
   },
-  mounted() {
+  mounted () {
     this.$refs['form'].validateField('FlightDate')
     this.getAirPortData()
   },
-  beforeDestroy() {
+  beforeDestroy () {
     if (this.loopEvent) {
       clearInterval(this.loopEvent)
       this.loopEvent = null
     }
   },
   computed: {
-    singleDay() {
+    singleDay () {
       return this.startDate === this.endDate
     }
   },
   methods: {
-    resetLoopEvent() {
+    resetLoopEvent () {
       this.loading = true
       this.hasSetTableScroll = false
       if (this.loopEvent) {
@@ -497,7 +344,7 @@ export default {
         that.getTableData()
       }, 3000)
     },
-    headerCellClass({ row, column }) {
+    headerCellClass ({ row, column }) {
       const classes = []
       const rule = this.tableDataSortRules[column.property]
       if (rule) {
@@ -505,7 +352,7 @@ export default {
       }
       return classes.join(' ')
     },
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName ({ row, rowIndex }) {
       const classes = []
       if (row.hasTakenOff) {
         classes.push('bgl-hui')
@@ -515,7 +362,7 @@ export default {
       }
       return classes.join(' ')
     },
-    changeView() {
+    changeView () {
       const query = {
         ...this.formData,
         startDate: this.startDate,
@@ -527,21 +374,21 @@ export default {
         query
       })
     },
-    airPortChange() {
+    airPortChange () {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
-    dateChangeHandler() {
+    dateChangeHandler () {
       this.getAviationData()
       this.upAviationData()
       this.resetLoopEvent()
     },
     // 选择机场
-    async getAirPortData() {
+    async getAirPortData () {
       try {
         const res = await getQuery({
-          id: 72,
+          id: DATACONTENT_ID.departureAirLtId,
           dataContent: []
         })
         if (Number(res.code) === 0) {
@@ -558,10 +405,10 @@ export default {
       }
     },
     // 选择航司
-    async getAviationData() {
+    async getAviationData () {
       try {
         const res = await getQuery({
-          id: 71,
+          id: DATACONTENT_ID.departureAviJoinLtId,
           dataContent: [this.formData.currentAirport]
         })
         if (Number(res.code) === 0) {
@@ -574,10 +421,10 @@ export default {
       }
     },
     // 选择航司
-    async upAviationData() {
+    async upAviationData () {
       try {
         const res = await getQuery({
-          id: 74,
+          id: DATACONTENT_ID.departureAviLeaveLtId,
           dataContent: [this.formData.currentAirport]
         })
         if (Number(res.code) === 0) {
@@ -600,7 +447,7 @@ export default {
     //   this.flightAttrQuery(params)
     // },
     // 获取表格数据
-    async getTableData() {
+    async getTableData () {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
@@ -630,7 +477,7 @@ export default {
       ]
       try {
         const res = await getQuery({
-          id: 68,
+          id: DATACONTENT_ID.departureTableLtId,
           dataContent: [...arr]
         })
         if (Number(res.code) === 0) {
@@ -648,7 +495,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    initTableData(tableData) {
+    initTableData (tableData) {
       this.leaveCount = 0
       // this.baggageCount = 0
       tableData.forEach(item => {
@@ -673,13 +520,13 @@ export default {
         this.setTableScroll()
       })
     },
-    hasTakenOff(flight) {
+    hasTakenOff (flight) {
       const now = new Date()
       const ActualDepartureTime = new Date(flight.ActualDepartureTime.replace('T', ' '))
       flight['hasTakenOff'] = now > ActualDepartureTime && !flight['flightCanceled']
       return flight['hasTakenOff']
     },
-    setTableScroll() {
+    setTableScroll () {
       if (!this.singleDay || this.hasSetTableScroll || this.leaveCount === 0) {
         return
       }
@@ -700,7 +547,7 @@ export default {
       }, 0)
       this.hasSetTableScroll = true
     },
-    setNumberTransform() {
+    setNumberTransform () {
       const numberItems = this.$refs.numberItem // 拿到数字的ref，计算元素数量
       const numberArr = this.orderNum.filter(item => !isNaN(item))
       // 结合CSS 对数字字符进行滚动,显示订单数量
@@ -710,7 +557,7 @@ export default {
       }
     },
 
-    toOrderNum(num) {
+    toOrderNum (num) {
       num = num.toString()
       if (num.length < 6) {
         num = '0' + num // 如未满八位数，添加"0"补位
@@ -723,7 +570,7 @@ export default {
       }
       this.setNumberTransform()
     },
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
       for (let i = 0; i < 9; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex]
@@ -760,7 +607,7 @@ export default {
       optgroup,
       select,
       textarea {
-        font-family: Helvetica, 'Microsoft YaHei';
+        font-family: Helvetica, "Microsoft YaHei";
         font-size: 14px;
       }
       .el-switch__label {
@@ -866,7 +713,7 @@ export default {
       padding: 0;
       text-align: center;
       font-size: 14px;
-      font-family: Helvetica, 'Microsoft YaHei';
+      font-family: Helvetica, "Microsoft YaHei";
       letter-spacing: 0;
     }
     .cell-click {
@@ -900,7 +747,7 @@ export default {
         &.redBorder {
           position: relative;
           &::after {
-            content: '';
+            content: "";
             position: absolute;
             left: 0;
             bottom: 0;

src/views/login/index.vue

@@ -184,7 +184,7 @@ export default {
                 const UserId = this.$store.getters.UserId;
                 // const UserType = this.$store.getters.UserType;
                 Query({
-                  id: 205,
+                  id: DATACONTENT_ID.loginId,
                   dataContent: [UserId]
                 }).then(res => {
                   if (res.code == 0) {

src/views/systemSettings/views/machineManagement/machineHome.vue

@@ -10,13 +10,7 @@
 <template>
   <div class="protocol-home">
     <div class="wrap">
-      <DataTable
-        data-id="3"
-        :rows="12"
-        labelWidth="100px"
-        :minHeight="70"
-        width="800px"
-      />
+      <DataTable data-id="3" :rows="12" labelWidth="100px" :minHeight="70" width="800px" />
       <!-- <div class="protocol-header flex">
         <div class="status flex-wrap">
           <div class="manageTitle">机器维护</div>
@@ -64,42 +58,18 @@
         <div class="airportInfoDialog dialog-public-background">
           <div class="title">{{ editDialogTitle }}</div>
           <div class="content">
-            <el-form
-              ref="ruleForm"
-              :model="ruleForm"
-              :rules="rules"
-              label-width="130px"
-              class="demo-ruleForm"
-            >
+            <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="130px" class="demo-ruleForm">
               <el-form-item label="机器名称" prop="deployNodeName">
-                <el-input
-                  v-model="ruleForm.deployNodeName"
-                  size="small"
-                  placeholder="请输入机器名称"
-                />
+                <el-input v-model="ruleForm.deployNodeName" size="small" placeholder="请输入机器名称" />
               </el-form-item>
               <el-form-item label="机器描述">
-                <el-input
-                  v-model="ruleForm.deployNodeDescribe"
-                  size="small"
-                  type="textarea"
-                  :rows="2"
-                  placeholder="请输入描述"
-                />
+                <el-input v-model="ruleForm.deployNodeDescribe" size="small" type="textarea" :rows="2" placeholder="请输入描述" />
               </el-form-item>
               <el-form-item label="服务地址" prop="serviceURL">
-                <el-input
-                  v-model="ruleForm.serviceURL"
-                  size="small"
-                  placeholder="请输入服务器地址信息"
-                />
+                <el-input v-model="ruleForm.serviceURL" size="small" placeholder="请输入服务器地址信息" />
               </el-form-item>
               <el-form-item label="机器类型" prop="nodeType">
-                <el-select
-                  v-model="ruleForm.nodeType"
-                  size="small"
-                  placeholder="请选择机器类型"
-                >
+                <el-select v-model="ruleForm.nodeType" size="small" placeholder="请选择机器类型">
                   <el-option label="物理机" value="物理机"></el-option>
                   <el-option label="虚拟机" value="虚拟机"></el-option>
                   <el-option label="Docker" value="Docker"></el-option>
@@ -108,16 +78,8 @@
             </el-form>
           </div>
           <div class="foot center t30">
-            <el-button
-              size="medium"
-              type="primary"
-              class="r25 r26"
-              @click="submitClickHandler()"
-              >提交</el-button
-            >
-            <el-button size="medium" class="r26" @click="resetForm('ruleForm')"
-              >取消</el-button
-            >
+            <el-button size="medium" type="primary" class="r25 r26" @click="submitClickHandler()">提交</el-button>
+            <el-button size="medium" class="r26" @click="resetForm('ruleForm')">取消</el-button>
           </div>
         </div>
       </Dialog>
@@ -129,19 +91,8 @@
             <div class="log">你是否确认删除{{ rmObj.deployNodeName }}？</div>
           </div>
           <div class="DelFoot right t30">
-            <el-button
-              size="medium"
-              class="r25 r26"
-              type="danger"
-              @click="removeSubmit()"
-              >删除</el-button
-            >
-            <el-button
-              size="medium"
-              class="r26"
-              @click="removeDialogVisible = false"
-              >取消</el-button
-            >
+            <el-button size="medium" class="r25 r26" type="danger" @click="removeSubmit()">删除</el-button>
+            <el-button size="medium" class="r26" @click="removeDialogVisible = false">取消</el-button>
           </div>
         </div>
       </Dialog>
@@ -158,7 +109,7 @@ import DataTable from "@/components/Table";
 export default {
   name: "ProtocolHome",
   components: { Dialog, DataTable },
-  data() {
+  data () {
     return {
       dataList: [],
       editDialogVisible: false,
@@ -191,11 +142,11 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     // this.getList();
   },
   methods: {
-    async getList() {
+    async getList () {
       try {
         const res = await Query({
           id: 2,
@@ -211,18 +162,18 @@ export default {
       }
     },
     // 新增-弹框
-    showAddDialog() {
+    showAddDialog () {
       this.editDialogTitle = "新增机器";
       this.editDialogVisible = true;
     },
     // 编辑-弹框
-    showEditDialog(item) {
+    showEditDialog (item) {
       this.editDialogTitle = "编辑机器";
       this.ruleForm = JSON.parse(JSON.stringify(item));
       this.editDialogVisible = true;
     },
     // 新增/编辑-确认
-    submitClickHandler() {
+    submitClickHandler () {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (!this.ruleForm.deployNodeID) {
@@ -235,18 +186,18 @@ export default {
       });
     },
     // 重置
-    resetForm(formName) {
+    resetForm (formName) {
       this.ruleForm = {};
       this.$refs[formName].resetFields();
       this.editDialogVisible = false;
     },
     // 删除-弹框
-    showRemoveDialog(item) {
+    showRemoveDialog (item) {
       this.rmObj = item;
       this.removeDialogVisible = true;
     },
     // 确认删除
-    async removeSubmit() {
+    async removeSubmit () {
       this.rmObj["operate"] = "3";
       try {
         const res = await GeneralDataReception({
@@ -264,7 +215,7 @@ export default {
         console.log("错误", error);
       }
     },
-    async addSubmit() {
+    async addSubmit () {
       this.ruleForm["operate"] = "1";
       try {
         const res = await GeneralDataReception({
@@ -281,7 +232,7 @@ export default {
         console.log("错误", error);
       }
     },
-    async editSubmit() {
+    async editSubmit () {
       this.ruleForm["operate"] = "2";
       try {
         const res = await GeneralDataReception({

src/views/systemSettings/views/serviceManagement/mixins/operate.js

@@ -23,6 +23,12 @@ export default {
         ...this.serviceForm,
         event: 2
       }
+      if (!params.serviceOutputID) {
+        params.serviceOutputID = null
+      }
+      if (!params.dataSourceID) {
+        params.dataSourceID = null
+      }
       try {
         const result = await GeneralDataReception({
           serviceId: SERVICE_ID.sysServiceAddId,

src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -141,7 +141,7 @@
             <el-button size="small" type="primary" class="btn-white" @click="btnAddClickHandler(1)">新增</el-button>
           </header>
           <main class="content">
-            <DataTable ref="serviceOutputTable" data-id="7" :data-content="{ serviceID: serviceID }" :rows="12" :table-height="computedTableHeight" margin-top="0" :is-btn="false" :is-dialog="true" />
+            <DataTable ref="serviceOutputTable" :data-id="outId" :data-content="{ serviceID: serviceID }" :rows="12" :table-height="computedTableHeight" margin-top="0" :is-btn="false" :is-dialog="true" />
           </main>
         </div>
         <div class="service-table-wrapper service-edit-wrapper">
@@ -150,7 +150,7 @@
             <el-button size="small" type="primary" class="btn-white" @click="btnAddClickHandler(2)">新增</el-button>
           </header>
           <main class="content">
-            <DataTable ref="serviceMachineTable" data-id="3" :data-content="{ serviceID: serviceID }" :rows="12" :table-height="computedTableHeight" margin-top="0" :is-btn="false" :is-dialog="true" :selection-enable="true" @selection-change="machineSelectionChangeHandler" />
+            <DataTable ref="serviceMachineTable" :data-id="jqId" :data-content="{ serviceID: serviceID }" :rows="12" :table-height="computedTableHeight" margin-top="0" :is-btn="false" :is-dialog="true" :selection-enable="true" @selection-change="machineSelectionChangeHandler" />
           </main>
         </div>
       </div>
@@ -203,6 +203,8 @@ export default {
   ],
   data () {
     return {
+      outId: DATACONTENT_ID.sysServiceOutTabId,
+      jqId: DATACONTENT_ID.sysServiceJqTabId,
       serviceID: Number(this.$route.query.serviceID),
       operateDialogType: null,
       delObj: {},
@@ -211,7 +213,7 @@ export default {
       tempCheckedKeys: [],
       serviceForm: {
         serviceName: '',
-        serviceOutputID: '',
+        serviceOutputID: null,
         serviceType: null,
         dataSourceID: null,
         lifeCycleCol: '',

src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -189,7 +189,7 @@ export default {
       dataId: DATACONTENT_ID.sysServiceTabId,
       serviceForm: {
         serviceName: '',
-        serviceOutputID: '',
+        serviceOutputID: null,
         serviceType: null,
         dataSourceID: null,
         lifeCycleCol: '',
@@ -287,6 +287,12 @@ export default {
       }
     },
     async createService () {
+      if (!this.serviceForm.serviceOutputID) {
+        this.serviceForm.serviceOutputID = null
+      }
+      if (!this.serviceForm.dataSourceID) {
+        this.serviceForm.dataSourceID = null
+      }
       try {
         this.serviceForm['event'] = 1
         const res = await GeneralDataReception({