日志备注显示变更，提示语增加，文本修正

jinhui.wang
Commit a797f94fbf4a3524310b383152144c6993a26cff a797f94f 1 parent 679b1879
Showing 6 changed files with 22 additions and 13 deletions
src/assets/languages/tableHeaders.js
src/router/index.js
src/views/allocationConfig/flightRandConfig/index.vue
src/views/basicInformation/flightInformationMaintenance/index.vue
src/views/systemConfig/dictionaryConfig/dialog.vue
src/views/systemLog/operationLog/index.vue
--- a/src/assets/languages/tableHeaders.js
View file @a797f94
+++ b/src/assets/languages/tableHeaders.js
View file @a797f94
@@ -2196,7 +2196,7 @@ let tableHeaders = {
         {
             columnChineseName: "备注",
             columnName: "remark",
-            columnWidth: "100",
+            columnWidth: "500",
             ext1: "slot",
             status: 1
         },
--- a/src/router/index.js
View file @a797f94
+++ b/src/router/index.js
View file @a797f94
@@ -73,7 +73,7 @@ export const constantRoutes = [
     hidden: true,
     children: [
       {
-        path: '/info/:handle/:id|:routeStatus|:fltNo|:route|:fltDate|:status',
+        path: '/info/:handle/id=:id;routeStatus=:routeStatus;fltNo=:fltNo;route=:route;fltDate=:fltDate;status=:status',
         component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
         name: 'FlightAllocConfigInfo',
         meta: { title: '航班配舱', icon: 'user' }
--- a/src/views/allocationConfig/flightRandConfig/index.vue
View file @a797f94
+++ b/src/views/allocationConfig/flightRandConfig/index.vue
View file @a797f94
@@ -114,7 +114,7 @@
           <el-col :span="24" style="margin-bottom: 5%">
             <span style="color: #ff4949; margin-left: 10%">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
             <span
-              style="color: #ff4949; margin-left: 10%">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span>
+              style="color: #ff4949; margin-left: 10%">提示:如果需要设置配载航班延迟或提前可以直接在目的航班后加减【+-】天数。如:CA1053+1;CZ433-1</span>
           </el-col>
           <el-col :span="24">
             <el-form-item label="配载航班" prop="flightRank">
--- a/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @a797f94
+++ b/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @a797f94
@@ -142,6 +142,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <div class="formTips" v-if="title == '修改航班信息' && routeMultiple">注意!:移除航线，相对应日期级别航线维度会同时删除</div>
           </el-col>
           <el-col :span="12">
             <el-form-item label="航班类型" prop="typeId">
@@ -201,20 +202,20 @@
           <el-col :span="12">
             <el-form-item label="高价百分比" prop="highPriceWeightPercent">
               <el-input-number class="wid80" :disabled="ishighPriceWeightPercent" @change="LowHighAvailable"
-                placeholder="开启高地价后可修改" v-model="form.highPriceWeightPercent"></el-input-number>
+                placeholder="开启高低价后可修改" v-model="form.highPriceWeightPercent"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
-              <el-input-number class="wid80" :disabled="true" placeholder="开启高地价后计算"
+              <el-input-number class="wid80" :disabled="true" placeholder="开启高低价后计算"
                 v-model="form.lowPriceWeightPercent"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="高价可配重量" prop="highAvailableWeight">
-              <el-input-number class="wid80" :disabled="true" placeholder="开启高地价后计算" v-model="form.highAvailableWeight"
+              <el-input-number class="wid80" :disabled="true" placeholder="开启高低价后计算" v-model="form.highAvailableWeight"
                 :precision="2"></el-input-number>
             </el-form-item>
           </el-col>
@@ -222,7 +223,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="低价可配重量" prop="lowAvailableWeight">
-              <el-input-number class="wid80" :disabled="true" placeholder="开启高地价后计算" v-model="form.lowAvailableWeight"
+              <el-input-number class="wid80" :disabled="true" placeholder="开启高低价后计算" v-model="form.lowAvailableWeight"
                 :precision="2"></el-input-number>
             </el-form-item>
           </el-col>
@@ -1087,4 +1088,9 @@ export default {
 .el-table__body tr.hover-row>td {
   background-color: #d9ecff !important;
 }
+
+.formTips {
+  color: #ff4949;
+  margin-left: 110px;
+}
 </style>
--- a/src/views/systemConfig/dictionaryConfig/dialog.vue
View file @a797f94
+++ b/src/views/systemConfig/dictionaryConfig/dialog.vue
View file @a797f94
@@ -33,6 +33,9 @@
                             <el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40">
                             </el-input>
                         </el-form-item>
+                        <el-form-item>
+                            <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
+                        </el-form-item>
                     </div>
                     <div v-else-if="status == 'sort'">
                         <el-form-item label="航班号" prop="fltNo">
@@ -42,9 +45,6 @@
                             <Drag :routes="routeList" @drag="drag"></Drag>
                         </el-form-item>
                     </div>
-                    <el-form-item>
-                        <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
-                    </el-form-item>
                 </div>
                 <!-- 新增数据字典 -->
                 <div v-else>
--- a/src/views/systemLog/operationLog/index.vue
View file @a797f94
+++ b/src/views/systemLog/operationLog/index.vue
View file @a797f94
@@ -36,7 +36,7 @@
             </el-button>
         </div>
         <Tables ref="operationLogTables" ductName="operationLogTables" :order="true" :border='false' :data="data"
-            :headerData="tableHeader" tableAlign="center" :showOverflowTooltip="true" :height="tableHeight"
+            :headerData="tableHeader" tableAlign="center" :showOverflowTooltip="false" :height="tableHeight"
             :page="selectForm.page" :limitSize="selectForm.size" :pageSizes="[100]" :totalCount="total"
             :loading="loading" @currentChange="currentChange">
             <template v-slot:result="scope">
@@ -48,14 +48,17 @@
                 </span>
             </template>
             <template v-slot:remark="scope">
-                <el-popover placement="top" width="400" trigger="hover"
+                <!-- <el-popover placement="top" width="400" trigger="hover"
                     v-if="scope.row.remark != null && scope.row.remark != ''">
                     <ul style="height:300px;overflow-y:scroll;">
                         <li v-for="(item, index) in scope.row.remark.split('\n')" :key="index"
                             style="border-bottom:1px solid #E4E7ED;margin-bottom:5px">{{ item }}</li>
                     </ul>
                     <el-button type="text" slot="reference">查 看</el-button>
-                </el-popover>
+                </el-popover> -->
+                <div>
+                    {{ scope.row.remark }}
+                </div>
             </template>
             <template v-slot:requestParameters="scope">
                 <el-popover placement="top" width="400" trigger="hover"