页面状态更新样式修改

@@ -35,7 +35,7 @@
       >
         <div class="userName-wrapper">
           <!-- <img :src="avatar" class="user-avatar" /> -->
-          <span>欢迎！{{userName}}</span>
+          <span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎！{{userName}}</span>
         </div>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="logout">
@@ -212,6 +212,14 @@ export default {
     .avatar-container {
       text-align: center;
       margin-right: 15px;
+      font-weight: 700;
+      i{
+        display: inline-block;
+        height: 50px;
+        margin-right:5px;
+        font-size: 24px;
+        line-height: 50px;
+      }
       .userName-wrapper {
         position: relative;
         font-size:14px;

@@ -847,12 +847,16 @@ export default {
   },
   created() {
     this.seleData();
+    if(this.$store.state.tagsView.cachedViews.length == 0){
       this.select();
+    }
+  },
+  activated(){
+    this.select();
+  },
+  deactivated(){
+    this.tableData = []
   },
-  // activated(){
-  //   this.seleData();
-  //   this.select();
-  // },
   mounted() {
     window.addEventListener("keydown", (code) => {
       if (code.keyCode === 16 && code.shiftKey) {

@@ -152,9 +152,17 @@ export default {
       loading: false,
     };
   },
+  created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.getList();
+    }
+  },
   activated(){
     this.getList()
   },
+  deactivated(){
+    this.flyList = []
+  },
   methods: {
     getList() {
       this.queryParams.limit = this.limit;

@@ -443,15 +443,16 @@ export default {
   },
   created() {
     this.queryParams.portName = this.$store.state.user.activePortName;
-    this.findSourceFlightRules();
     this.portNameList = this.$store.state.user.portNames;
-    this.form.portName = this.$store.state.user.activePortName;
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.findSourceFlightRules();
+    }
   },
   activated(){
-    this.queryParams.portName = this.$store.state.user.activePortName;
     this.findSourceFlightRules();
-    this.portNameList = this.$store.state.user.portNames;
-    this.form.portName = this.$store.state.user.activePortName;
+  },
+  deactivated(){
+    this.sourceFlightRulesList = []
   },
   watch:{
     open(val,oldVal){
@@ -499,7 +500,7 @@ export default {
       this.title = "添加原航班顺位规则";
       this.form.id = -1;
       this.dayOfWeek = [];
-      // this.form.portName = this.$store.state.user.activePortName;
+      this.form.portName = this.$store.state.user.activePortName;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

@@ -116,9 +116,6 @@
         this.uploadExcel(file);
       },
     },
-    created() {
-
-    },
   };
 </script>
 <style rel="stylesheet/scss" lang="scss">

@@ -768,18 +768,19 @@ export default {
     });
   },
 
-  // activated(){
-  //   findConditionData().then((res) => {
-  //     if (res.code == 200) {
-  //       this.findConditionData = res.data;
-  //     } else {
-  //       this.$message({
-  //         message: "查询条件不存在",
-  //         type: "warning",
-  //       });
-  //     }
-  //   });
-  // },
+  activated() {
+    if(this.$store.state.tagsView.cachedViews.length > 0 ){
+      this.$store.state.tagsView.cachedViews.forEach(item=>{
+        if(item === 'QueryCargo'){
+          this.totalCount>0?this.select():''
+        }
+      })
+    }
+  },
+
+  deactivated(){
+    this.tableData = []
+  },
 
   mounted() {
     window.addEventListener("keydown", (code) => {

@@ -120,6 +120,13 @@ export default {
   updated() {
     this.menuForm = this.menuData;
   },
+  watch:{
+    dialogVisible(val,oldVal){
+      if(val){
+        this.menuForm = this.menuData;
+      }
+    }
+  },
   methods: {
     handleClose() {
       this.$emit("handleClose", false);

@@ -106,7 +106,7 @@ import dictLabels from "@/assets/languages/dictLabels.js";
 import Drawer from "./drawer.vue";
 import { MessageBox } from "element-ui";
 export default {
-  name:"menuConfig",
+  name:"MenuConfig",
   components: {
     Drawer,
   },
@@ -163,6 +163,11 @@ export default {
     };
   },
   created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.menuAll();
+    }
+  },
+  activated(){
     this.menuAll();
   },
   methods: {

@@ -26,6 +26,7 @@
                 v-model.trim="roleForm.name"
                 :disabled="roleFormDisabled"
                 v-if="!roleFormDisabled"
+                clearable
               ></el-input>
               <div v-else>{{ roleData.name }}</div>
             </el-form-item>
@@ -38,6 +39,7 @@
                 placeholder="请输入角色描述"
                 :disabled="roleFormDisabled"
                 v-if="!roleFormDisabled"
+                clearable
               ></el-input>
               <div v-else>{{ roleData.remark }}</div>
             </el-form-item>
@@ -152,9 +154,11 @@ export default {
     roleFormDisabled(){
       this.treeData = this.treeDisabled(this.treeData)
     },
-    drawer(){
+    drawer(val,oldVal){
+      if(val){
         this.roleForm = this.roleData;
       } 
+    }
   },
   methods: {
     //关闭

@@ -7,6 +7,7 @@
             <el-input
               v-model="formData.name"
               placeholder="请输入角色名称"
+              clearable
             ></el-input>
           </el-form-item>
         </el-col>
@@ -18,13 +19,14 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              clearable
             >
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="状态">
-            <el-select v-model="formData.valid" placeholder="角色状态">
+            <el-select v-model="formData.valid" placeholder="角色状态" clearable>
               <el-option label="开启" value="1"> </el-option>
               <el-option label="关闭" value="1"> </el-option>
             </el-select>
@@ -32,7 +34,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <div style="margin: 0 20px">
+    <div style="margin:20px">
       <el-button
         type="primary"
         icon="el-icon-search"
@@ -52,8 +54,10 @@
       :totalCount="total"
       :limitSize="formData.size"
       :page="formData.page"
+      :pageSizes="[20,30,40,50]"
       :loading="tableLoading"
       height="600"
+       @sizeChange="sizeChange"
       @currentChange="currentChange"
     >
       <template>
@@ -188,6 +192,11 @@ export default {
     };
   },
   created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.selectRoleList();
+    }
+  },
+  activated(){
     this.selectRoleList();
   },
   methods: {
@@ -351,6 +360,10 @@ export default {
       this.formData.page = val.page;
       this.selectRoleList();
     },
+    sizeChange(val){
+      this.formData.size = val;
+      this.selectRoleList()
+    }
   },
 };
 </script>

 <template>
   <div class="userDrawer">
     <el-drawer
-      :data="userData"
       :title="drawerTitle"
       :visible.sync="drawer"
       direction="rtl"
@@ -25,7 +24,8 @@
                 v-model.trim="userForm.loginName"
                 v-if="!userFormDisabled"
                 :disabled="drawerTitle != '新增用户'"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.loginName }}</div>
             </el-form-item>
@@ -37,7 +37,8 @@
                 :disabled="userFormDisabled"
                 v-model.trim="userForm.username"
                 v-if="!userFormDisabled"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.username }}</div>
             </el-form-item>
@@ -61,7 +62,8 @@
                 v-model.trim="userForm.phone"
                 :disabled="userFormDisabled"
                 v-if="!userFormDisabled"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.phone }}</div>
             </el-form-item>
@@ -74,7 +76,8 @@
                 v-model.trim="userForm.email"
                 :disabled="userFormDisabled"
                 v-if="!userFormDisabled"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.email }}</div>
             </el-form-item>
@@ -104,19 +107,11 @@
               label="所属口岸:"
               prop="portName"
             >
-              <!-- <el-checkbox-group v-model="port" :disabled="userFormDisabled">
-                <el-checkbox
-                  v-for="item in portNameList"
-                  :label="item.englishName"
-                  :key="item.id"
-                  >{{ item.englishName }}</el-checkbox
-                >
-              </el-checkbox-group> -->
               <el-select
                 placeholder="不限"
                 v-model="port"
                 :disabled="userFormDisabled"
-                size="mini"
+                size="small"
                 style="width: 100%"
                 multiple
                 clearable
@@ -155,7 +150,8 @@
                 placeholder="备注"
                 :disabled="userFormDisabled"
                 v-if="!userFormDisabled"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.remark }}</div>
             </el-form-item>
@@ -266,9 +262,11 @@ export default {
       getRoleList({ size: null, page: null })
         .then((res) => {
           if (res.code === 200) {
+            res.data.list.map(item=>{
               if(item.valid == 1){
                 this.roleList.push(item)
               }
+            })
           } else {
             this.$message({
               message: res.msg,

@@ -7,6 +7,7 @@
             <el-input
               placeholder="请输入用户名称"
               v-model="formData.username"
+              clearable
             ></el-input>
           </el-form-item>
         </el-col>
@@ -15,12 +16,13 @@
             <el-input
               placeholder="请输入用户名称"
               v-model="formData.phone"
+              clearable
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="状态">
-            <el-select placeholder="用户状态" v-model="formData.isValid">
+            <el-select placeholder="用户状态" v-model="formData.isValid" clearable>
               <el-option label="开启" value="1"> </el-option>
               <el-option label="关闭" value="2"> </el-option>
             </el-select>
@@ -48,7 +50,9 @@
       :totalCount="total"
       :loading="loading"
       :page="formData.page"
+      :pageSizes="[20,30,40,50]"
       height="600"
+      @sizeChange="sizeChange"
       @currentChange="currentChange"
     >
       <template>
@@ -236,6 +240,11 @@ export default {
     };
   },
   created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.selectUser();
+    }
+  },
+  activated(){
     this.selectUser();
   },
   methods: {
@@ -376,6 +385,11 @@ export default {
       this.formData.page = val.page;
       this.selectUser();
     },
+
+    sizeChange(val){
+      this.formData.size = val;
+      this.selectUser()
+    }
   },
 };
 </script>