Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

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

@@ -95,7 +95,7 @@
             <el-form-item label="分类标识符" prop="fullName">
               <el-input
                 size="medium"
-                placeholder="请输入分类code（必填）"
+                placeholder="请输入分类标识符（必填）"
                 v-model="ruleForm.fullName"
               ></el-input>
             </el-form-item>

src/views/BasicsData/views/airport/airportInfoDetails.vue

@@ -11,7 +11,7 @@
     <!--机场基本信息-->
     <div class="airportInfoDetails-head">
       <Search title="机场基本信息" :isSearch="false">
-        <button class="btnAn" @click="EditAirportInfo">保存</button>
+        <!-- <button class="btnAn" @click="EditAirportInfo">保存</button> -->
       </Search>
       <div class="airportInfoDetails-head-content dialog-public-background">
         <!-- <el-row :gutter="24">
@@ -150,6 +150,7 @@
           title="行李追踪位置信息"
           @clearSearchData="clearSearchData"
           @getSearchData="getSearchData"
+          style="padding-left: 32px; padding-right: 32px"
         />
         <div class="airportInfo-content">
           <el-row :gutter="24">
@@ -933,7 +934,7 @@ export default {
     height: 60vh;
     overflow-x: hidden;
     overflow-y: auto;
-    padding: 32px 40px 0 32px;
+    padding: 32px 0x 0 0;
     // background: #ffffff;
     // box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
     border-radius: 4px;

src/views/systemSettings/views/warningSet/warningEdit.vue

@@ -85,6 +85,7 @@
         :isChild="true"
         @clearSearchData="clearSearchData"
         @getSearchData="getSearchData"
+        style="padding-left: 16px; padding-right: 32px"
       />
 
       <div class="LBox">
@@ -715,7 +716,7 @@ export default {
   border-radius: 4px;
 }
 .headerBox {
-  padding: 16px;
+  padding: 16px 32px 16px 16px;
   display: flex;
   justify-content: space-between;
   .tltle-head {
@@ -924,7 +925,7 @@ export default {
 }
 .centerBox {
   height: 495px;
-  padding: 32px 40px 44px 32px;
+  padding: 32px 0 44px 0;
   // background: #ffffff;
   // box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
   // border-radius: 4px;