右上角用户昵称样式调整

src/layout/components/Entry.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="avatar-container" style="right: 80px;">
+  <div class="avatar-container">
+	  <!-- style="right: 80px;" -->
     <el-menu-item v-for="item in entryList" v-show="!item.hidden" :key="item.name" class="avatar-wrapper" index="" @click="item.handle">
       <span style="color: white;">{{ $t(item.name) }}</span>
     </el-menu-item>

src/layout/components/Logout.vue

@@ -84,8 +84,10 @@ export default {
         .avatar-container {
             height: $height;
             display: inline-block;
-            position: absolute;
-            right: 35px;
+            // position: absolute;
+            position: relative;
+            right: 0px;
+            // right: 35px;
 
             .avatar-wrapper {
                 cursor: pointer;

src/layout/components/Navbar.vue

@@ -68,13 +68,16 @@
         </el-submenu>
       </template>
     </template>
-    <quick-entry v-if="isShow" ref="quickEntry" />
-    <div class="avatar-container" style="right: 80px;" v-if="!isShow" @click="goToTraining">
-      <el-menu-item class="avatar-wrapper" index="">
-        <span style="color: white;">城市轨道交通实训平台</span>
-      </el-menu-item>
+    <div class="rightGroup">
+      <quick-entry v-if="isShow" ref="quickEntry" />
+      <!-- style="right: 80px;"  -->
+      <div class="avatar-container" v-if="!isShow" @click="goToTraining">
+        <el-menu-item class="avatar-wrapper" index="">
+          <span style="color: white;">城市轨道交通实训平台</span>
+        </el-menu-item>
+      </div>
+      <user-logout ref="userLogout" />
     </div>
-    <user-logout ref="userLogout" />
   </el-menu>
 </template>
 
@@ -168,6 +171,12 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
     $height: 61px;
 
+    .rightGroup{
+        position: absolute;
+        right: 35px;
+        display: inline-block;
+    }
+
     .navbar {
         height: $height;
         line-height: $height;
@@ -191,8 +200,10 @@ export default {
         .avatar-container {
             height: $height;
             display: inline-block;
-            position: absolute;
-            right: 35px;
+            position: relative;
+            margin-right:10px;
+            // position: absolute;
+            // right: 35px;
 
             .avatar-wrapper {
                 cursor: pointer;

src/views/approval/runPlan/index.vue

@@ -35,11 +35,11 @@
                                 data: []
                             }
                         },
-                        'scriptName':{
+                        'name':{
                             type: 'text',
                             label: this.$t('approval.runPlanName')
                         },
-                        'userName': {
+                        'creatorName': {
                             type: 'text',
                             label: this.$t('approval.applicant')
                         }
@@ -66,7 +66,7 @@
                         },
                         {
                             title: this.$t('approval.applicant'),
-                            prop: 'userName'
+                            prop: 'creatorName'
                         },
                         {
                             title: this.$t('approval.applyTime'),

src/views/approval/script/index.vue

@@ -1,8 +1,6 @@
 <template>
     <div>
         <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        <!-- <script-operate ref='applyPassed' @reloadTable="reloadTable" @create="handleConfirmPass" :title="$t('approval.passedScript')" type="applyPassed">
-        </script-operate> -->
         <script-operate ref='applyReject' @reloadTable="reloadTable" @create="handleConfirmReject" :title="$t('approval.rejectScript')">
         </script-operate>
     </div>
@@ -37,7 +35,7 @@
                                 data: []
                             }
                         },
-                        'scriptName':{
+                        'name':{
                             type: 'text',
                             label: this.$t('approval.scriptName')
                         },