代码更新

@@ -84,7 +84,7 @@
 	padding-bottom:5px;
 	padding-bottom:5px;
 	.formItem {
 	.formItem {
 		width: 100%;
 		width: 100%;
-		max-width: 310px;
+		// max-width: 310px;
 	}
 	}
 }
 }
 
 

@@ -33,8 +33,9 @@
         class="avatar-container right-menu-item hover-effect"
         class="avatar-container right-menu-item hover-effect"
         trigger="click"
         trigger="click"
       >
       >
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar" />
+        <div class="userName-wrapper">
+          <!-- <img :src="avatar" class="user-avatar" /> -->
+          <span>欢迎！{{userName}}</span>
         </div>
         </div>
         <el-dropdown-menu slot="dropdown">
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="logout">
           <el-dropdown-item @click.native="logout">
@@ -69,12 +70,14 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      userName:"",
       portNameList: [],
       portNameList: [],
       locale: "zh",
       locale: "zh",
     };
     };
   },
   },
   created() {
   created() {
     this.portNameList = this.$store.state.user.portNames;
     this.portNameList = this.$store.state.user.portNames;
+    this.userName = this.$store.state.user.name;
   },
   },
   computed: {
   computed: {
     ...mapGetters(["sidebar", "avatar", "device"]),
     ...mapGetters(["sidebar", "avatar", "device"]),
@@ -207,12 +210,11 @@ export default {
     }
     }
 
 
     .avatar-container {
     .avatar-container {
+      text-align: center;
       margin-right: 15px;
       margin-right: 15px;
-
-      .avatar-wrapper {
-        margin-top: 5px;
+      .userName-wrapper {
         position: relative;
         position: relative;
-
+        font-size:14px;
         .user-avatar {
         .user-avatar {
           cursor: pointer;
           cursor: pointer;
           width: 40px;
           width: 40px;

@@ -28,6 +28,7 @@
           :label="item.name"
           :label="item.name"
           :key="index"
           :key="index"
           :show-overflow-tooltip="true"
           :show-overflow-tooltip="true"
+          :formatter="formatter"
         >
         >
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -210,6 +211,16 @@ export default {
       this.cleaerForm();
       this.cleaerForm();
       this.$emit("dialogBeforeClose", { close: false, reload: true });
       this.$emit("dialogBeforeClose", { close: false, reload: true });
     },
     },
+    formatter(row, column, cellValue, index){
+      if(column.property == "cargoRulesStatus"){
+        if(cellValue == 1){
+          return "手动"
+        }else{
+          return "自动"
+        }
+      }
+      return cellValue
+    }
   },
   },
   computed: {
   computed: {
     fltNo: {
     fltNo: {

@@ -241,7 +241,7 @@
       :limitStart="limitStart"
       :limitStart="limitStart"
       :page="page"
       :page="page"
       :shiftKey="shiftKey"
       :shiftKey="shiftKey"
-      height="550"
+      height="450"
       @tableSelect="tableSelect"
       @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll"
       @tableSelectAll="tableSelectAll"
       @currentChange="currentChange"
       @currentChange="currentChange"

@@ -248,11 +248,11 @@ export default {
     drawer(val,oldVal){
     drawer(val,oldVal){
       if(val){
       if(val){
         this.userForm = this.userData;
         this.userForm = this.userData;
-        if (this.userData.roleIds) {
-          this.roleid = this.userData.roleIds;
+        if (this.userForm.roleIds) {
+          this.roleid = this.userForm.roleIds;
         }
         }
-        if (this.userData.portName) {
-          this.port = this.userData.portName;
+        if (this.userForm.portName) {
+          this.port = this.userForm.portName;
         }
         }
       }
       }
     }
     }

@@ -28,7 +28,7 @@
         </el-col>
         </el-col>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
-    <div style="marginLeft: 20px">
+    <div style="margin:20px">
       <el-button
       <el-button
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
@@ -266,6 +266,8 @@ export default {
     userDetail(id) {
     userDetail(id) {
       detailUser(id)
       detailUser(id)
         .then((res) => {
         .then((res) => {
+          this.drawer = true;
+          this.drawerTitle = "查看/修改用户";
           if (res.code === 200) {
           if (res.code === 200) {
             this.userData = res.data;
             this.userData = res.data;
             this.userData.portName
             this.userData.portName
@@ -294,9 +296,6 @@ export default {
     //查询修改用户
     //查询修改用户
     buttonClick(row, status) {
     buttonClick(row, status) {
       this.userDetail(row.row.id);
       this.userDetail(row.row.id);
-      this.userData = row.row;
-      this.drawer = true;
-      this.drawerTitle = "查看/修改用户";
       status == 0
       status == 0
         ? (this.userFormDisabled = true)
         ? (this.userFormDisabled = true)
         : (this.userFormDisabled = false);
         : (this.userFormDisabled = false);