diff --git a/src/views/Home.vue b/src/views/Home.vue
index cfb5f5e..4dffe83 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -263,33 +263,34 @@
                 <el-dropdown-item @click.native="logout"
                   >退出登录</el-dropdown-item
                 >
-                <el-dropdown-item @click.native="editpassword">修改密码</el-dropdown-item>
+                <el-dropdown-item @click.native="editpassword"
+                  >修改密码</el-dropdown-item
+                >
               </el-dropdown-menu>
             </el-dropdown>
           </div>
-              
         </div>
-   
       </el-header>
-     <!-- 修改密码弹框 -->
-     <el-dialog
-  title="修改密码"
-  :visible.sync="dialogVisible"
-  width="30%"
- >
-<el-form :model="form" :rules="rules" ref="ruleForm" label-width="100px" >
-    <el-form-item label="旧密码" prop="oldPassWord">
-    <el-input v-model="form.oldPassWord"></el-input>
-  </el-form-item>
-      <el-form-item label="新密码" prop="newPassWord">
-    <el-input v-model="form.newPassWord"></el-input>
-  </el-form-item>
-</el-form>
-  <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false">取 消</el-button>
-    <el-button type="primary" @click="determine">确 定</el-button>
-  </span>
-</el-dialog>
+      <!-- 修改密码弹框 -->
+      <el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%">
+        <el-form
+          :model="form"
+          :rules="rules"
+          ref="ruleForm"
+          label-width="100px"
+        >
+          <el-form-item label="旧密码" prop="oldPassWord">
+            <el-input v-model="form.oldPassWord"></el-input>
+          </el-form-item>
+          <el-form-item label="新密码" prop="newPassWord">
+            <el-input v-model="form.newPassWord"></el-input>
+          </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="determine">确 定</el-button>
+        </span>
+      </el-dialog>
       <el-container>
         <!-- <el-aside :width="isCollapse ? '64px' : '220px'">
           <el-menu
@@ -507,60 +508,61 @@
 <script>
 ///api/app/item/in-filter
 import router from "@/router";
-import {postapi} from '@/api/api'
-import { mapState } from 'vuex';
+import { postapi } from "@/api/api";
+import { mapState } from "vuex";
 export default {
   data() {
     return {
       index: 1,
       isCollapse: false,
       user: "",
-      dialogVisible:false,
-      password:'',
-      form:{
-        oldPassWord:'',
-        newPassWord:'',
+      dialogVisible: false,
+      password: "",
+      form: {
+        oldPassWord: "",
+        newPassWord: "",
       },
-      rules:{
-        oldPassWord:[
-            { required: true, message: '请输入旧密码', trigger: 'blur' },
+      rules: {
+        oldPassWord: [
+          { required: true, message: "请输入旧密码", trigger: "blur" },
+        ],
+        newPassWord: [
+          { required: true, message: "请输入新密码", trigger: "blur" },
         ],
-          newPassWord:[
-            { required: true, message: '请输入新密码', trigger: 'blur' },
-        ]
-      }
+      },
     };
   },
-  computed:{
-   ...mapState(['changepassword'])
+  computed: {
+    ...mapState(["changepassword"]),
   },
   created() {
-    this.password=this.changepassword
+    this.password = this.changepassword;
     console.log(this.password);
-    console.log(this.$store.state.changepassword,'ssssssssssss');
+    console.log(this.$store.state.changepassword, "ssssssssssss");
     this.user = localStorage.getItem("user");
   },
   methods: {
     //确定修改密码按钮
-    determine(){
-      this.$refs.ruleForm.validate(valid=>{
-          if(valid){
-               if(this.form.oldPassWord!=this.password){
-                 this.$message.warning('旧密码输入错误')
-               }else{
-                  postapi('/api/identity/users/updatepassword',this.form).then(res=>{
-                      this.$message.success('修改成功')
-                      this.dialogVisible=false
-                  })
-               }
+    determine() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          if (this.form.oldPassWord != this.password) {
+            this.$message.warning("旧密码输入错误");
+          } else {
+            postapi("/api/identity/users/updatepassword", this.form).then(
+              (res) => {
+                this.$message.success("修改成功");
+                this.dialogVisible = false;
+              }
+            );
           }
-      })
-      
+        }
+      });
     },
     //修改密码
-    editpassword(){
-     this.dialogVisible=true
-     console.log(this.password);
+    editpassword() {
+      this.dialogVisible = true;
+      console.log(this.password);
     },
     //退出登录
     logout() {
@@ -569,7 +571,6 @@ export default {
       // localStorage.removeItem(['expires_in','tokentype','refresh_token','user','token'])
       localStorage.clear();
       this.$router.push({ path: "/login" });
-       
     },
     aa(aa) {
       console.log(aa);
@@ -579,7 +580,7 @@ export default {
 };
 </script>
 <style scoped>
-.el-dropdown-item{
+.el-dropdown-item {
   text-align: center;
 }
 .el-dropdown-menu {
diff --git a/src/views/basic-dictionary/Nation.vue b/src/views/basic-dictionary/Nation.vue
index 65af654..fbffaf2 100644
--- a/src/views/basic-dictionary/Nation.vue
+++ b/src/views/basic-dictionary/Nation.vue
@@ -309,12 +309,16 @@ export default {
       const result = [];
       this.tableData.forEach((item, index) => {
         // index 从0开始的， 你的displayOrder从大到小排
-        console.log(item.id);
+        console.log(item.nationId);
         // const currentDisplayOrder = this.tableData.length -1
         const currentDisplayOrder = this.initTableData[index].displayOrder;
+        // console.log(currentDisplayOrder,'小到大');
         if (item.displayOrder != currentDisplayOrder) {
           // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置
-          result.push({ nationId: item.nationId, displayOrder: currentDisplayOrder });
+          result.push({
+            id: item.nationId,
+            displayOrder: currentDisplayOrder,
+          });
         }
       });
       // console.log('assertion', result);
@@ -364,10 +368,10 @@ export default {
     },
     //置底
     toppings() {
-      if (this.form.id == undefined) {
+      if (this.form.nationId == undefined) {
         this.$message.warning("请选择操作的数据");
       } else {
-        opBottomtheFamousclan(this.form.id, 2).then((res) => {
+        opBottomtheFamousclan(this.form.nationId, 2).then((res) => {
           this.$message.success("操作成功");
           this.getlist();
         });
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index a225680..e45cbd0 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -39,6 +39,7 @@ import { lognis } from "@/request/ruquset";
 import { yzstr } from "@/utlis/validate.js";
 import { yztoken, writetoken } from "@/utlis/istoken";
 import mm from "@/utlis/mm";
+import { getapi, postapi } from "@/api/api";
 
 export default {
   data() {
@@ -60,65 +61,164 @@ export default {
     };
   },
   methods: {
-  async  onSubmit() {
+    onSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          // lognis({
-          //   client_id: "Peis_App",
-          //   grant_type: "password",
-          //   username: "admin",
-          //   password: "1q2w3E*",
-          //   scope: "Peis",
-          // }).then(res=>{
-          //   console.log(res,'222')
-          // })
-          // lognis({
-          //   client_id: "Peis_App",
-          //   grant_type: "password",
-          //   username: "admin",
-          //   password: "1q2w3E*",
-          //   scope: "Peis",
-          // }).then((res) => {
-          //   console.log(res);
-          // });  "http://81.70.217.145:9529/connect/token",
-          this.$axios
-            .post(
-              mm.apiurl + "/connect/token",
-              {
-                client_id: "Peis_App",
-                grant_type: "password",
-                username: this.form.Username, //admin
-                password: this.form.Password, //1q2w3E
-                scope: "Peis offline_access",
-              },
-              {
-                headers: {
-                  "Content-Type": "application/x-www-form-urlencoded",
-                },
-              }
-            )
-            .then((res) => {
-              console.log(res, "222222");
-              
-              if (res.status == 200) {
-                //console.log(res.data)
-                writetoken(res.data.expires_in);
-                window.localStorage.setItem("token", res.data.access_token);
-                window.localStorage.setItem(
-                  "refresh_token",
-                  res.data.refresh_token
+          // let res = await getapi("/api/identity/users/login", {
+          //   username: this.form.Username,
+          //   password: this.form.Password,
+          // });
+          var msgs = "";
+          getapi("/api/identity/users/login", {
+            username: this.form.Username,
+            password: this.form.Password,
+          })
+            .then((ret) => {
+              msgs = ret.data.msg;
+              if (ret.code != -1 && ret.data.code == 1 && ret.code == 1) {
+                return this.$axios.post(
+                  mm.apiurl + "/connect/token",
+                  {
+                    client_id: "Peis_App",
+                    grant_type: "password",
+                    username: this.form.Username,
+                    password: this.form.Password,
+                    scope: "Peis offline_access",
+                  },
+                  {
+                    headers: {
+                      "Content-Type": "application/x-www-form-urlencoded",
+                    },
+                  }
                 );
-                // window.localStorage.setItem("expires_in", res.data.expires_in);
-                window.localStorage.setItem("tokentype", res.data.token_type);
-                window.localStorage.setItem("user", this.form.Username);
-                this.$message.success("登录成功");
-                this.$router.push({ path: "home" });
-                // this.$store.dispatch('changepassword',this.form.Password)
-                this.$store.state.changepassword = this.form.Password;
               } else {
-                this.$message.warning("用户名或密码错误");
+                this.$message.warning(ret.data.msg);
               }
-            });
+            })
+            .then((res) => {
+              writetoken(res.data.expires_in);
+              window.localStorage.setItem("token", res.data.access_token);
+              window.localStorage.setItem(
+                "refresh_token",
+                res.data.refresh_token
+              );
+              window.localStorage.setItem("tokentype", res.data.token_type);
+              window.localStorage.setItem("user", this.form.Username);
+              this.$message.success(msgs,+"登录成功");
+              this.$router.push({ path: "home" });
+            })
+            .catch((err) => {});
+
+          //   console.log(res);
+          //   if (res.data.code == 1 && res.code == 1) {
+          //     console.log(res.data.msg);
+          //     postapi()
+          //     let ress = await this.$axios.post(
+          //       mm.apiurl + "/connect/token",
+          //       {
+          //         client_id: "Peis_App",
+          //         grant_type: "password",
+          //         username: this.form.Username,
+          //         password: this.form.Password,
+          //         scope: "Peis offline_access",
+          //       },
+          //       {
+          //         headers: {
+          //           "Content-Type": "application/x-www-form-urlencoded",
+          //         },
+          //       }
+          //     );
+          //     if (ress.status == 200) {
+          //       writetoken(ress.data.expires_in);
+          //       window.localStorage.setItem("token", ress.data.access_token);
+          //       window.localStorage.setItem(
+          //         "refresh_token",
+          //         ress.data.refresh_token
+          //       );
+          //       window.localStorage.setItem("tokentype", ress.data.token_type);
+          //       window.localStorage.setItem("user", this.form.Username);
+          //       this.$message.success(res.data.msg, "登录成功");
+          //       this.$router.push({ path: "home" });
+          //     }
+          //   } else {
+          //     console.log();
+          //     this.$message.warning(res.data.msg);
+          //   }
+          // } catch (err) {
+          //   console.log(err);
+          // }
+
+          // await getapi("/api/identity/users/login", {
+          //   username: this.form.Username,
+          //   password: this.form.Password,
+          // }).then((ress) => {
+          //   if (ress.data.code == 1 && ress.code == 1) {
+          //     // console.log(msg);
+          //     postapi(mm.apiurl + "/connect/token", {
+          //       client_id: "Peis_App",
+          //       grant_type: "password",
+          //       username: this.form.Username,
+          //       password: this.form.Password,
+          //       scope: "Peis offline_access",
+          //     }).then((res) => {
+          //       console.log(res);
+
+          //       writetoken(res.data.expires_in);
+          //       window.localStorage.setItem("token", res.data.access_token);
+          //       window.localStorage.setItem(
+          //         "refresh_token",
+          //         res.data.refresh_token
+          //       );
+          //       window.localStorage.setItem("tokentype", res.data.token_type);
+          //       window.localStorage.setItem("user", this.form.Username);
+          //       this.$message.success("登录成功");
+          //       this.$router.push({ path: "home" });
+
+          //       this.$store.state.changepassword = this.form.Password;
+          //     });
+          //   } else {
+          //     this.$message.warning(res.data.msg);
+          //   }
+          // });
+
+          // this.$axios
+          //   .post(
+          //     mm.apiurl + "/connect/token",
+          //     {
+          //       client_id: "Peis_App",
+          //       grant_type: "password",
+          //       username: this.form.Username, //admin
+          //       password: this.form.Password, //1q2w3E
+          //       scope: "Peis offline_access",
+          //     },
+          //     {
+          //       headers: {
+          //         "Content-Type": "application/x-www-form-urlencoded",
+          //       },
+          //     }
+          //   )
+          //   .then((res) => {
+          //     console.log(res, "222222");
+
+          //     if (res.status == 200) {
+          //       //console.log(res.data)
+          //       writetoken(res.data.expires_in);
+          //       window.localStorage.setItem("token", res.data.access_token);
+          //       window.localStorage.setItem(
+          //         "refresh_token",
+          //         res.data.refresh_token
+          //       );
+          //       // window.localStorage.setItem("expires_in", res.data.expires_in);
+          //       window.localStorage.setItem("tokentype", res.data.token_type);
+          //       window.localStorage.setItem("user", this.form.Username);
+          //       this.$message.success("登录成功");
+          //       this.$router.push({ path: "home" });
+          //       // this.$store.dispatch('changepassword',this.form.Password)
+          //       this.$store.state.changepassword = this.form.Password;
+          //     } else {
+          //       this.$message.warning("用户名或密码错误");
+          //     }
+          // });
         }
       });
     },