diff --git a/src/pages/authority/addroles.vue b/src/pages/authority/addroles.vue
index 71fa9909e6b627ea63ad29671fa19cb42e564fd5..0b83d0184451f916364bf5d73259122787fa5623 100644
--- a/src/pages/authority/addroles.vue
+++ b/src/pages/authority/addroles.vue
@@ -17,12 +17,16 @@
       <el-form ref="form" :rules="rules" :model="form" label-width="0px">
         <el-form-item prop="name">
           <p class="formname">角色名称：</p>
-          <el-input v-model="form.name" :disabled="edit_flag==3"></el-input>
+          <el-input v-model="form.name" :disabled="edit_flag == 3"></el-input>
         </el-form-item>
 
         <el-form-item prop="desc">
           <p class="formname">角色描述：</p>
-          <el-input type="textarea" v-model="form.desc" :disabled="edit_flag==3"></el-input>
+          <el-input
+            type="textarea"
+            v-model="form.desc"
+            :disabled="edit_flag == 3"
+          ></el-input>
         </el-form-item>
 
         <el-form-item prop="person">
@@ -60,7 +64,7 @@
 </template>
 
 <script>
-import { getRole } from "@/utils/common";
+import { getRolegetRole, formatDateTime_date } from "@/utils/common";
 import menuPermission from "@/components/menu-permission";
 export default {
   props: {},
@@ -72,8 +76,8 @@ export default {
       form: {
         name: "",
         desc: "",
-        person: "",
-        date: "",
+        person: this.$store.state.userInfo.user_name,
+        date: formatDateTime_date(new Date()),
       },
       now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员
       permissionData: [],
@@ -84,15 +88,15 @@ export default {
           { max: 200, message: "长度小于200个字符", trigger: "blur" },
         ],
       },
-      edit_flag:0,
-      service_node:[],
-      permission_arr:[]
+      edit_flag: 0,
+      service_node: [],
+      permission_arr: [],
     };
   },
   watch: {},
   computed: {},
   created() {
-    this.get_now_page()
+    this.get_now_page();
     console.log(this.$route);
   },
   mounted() {},
@@ -100,26 +104,28 @@ export default {
     onSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if(this.edit_flag == 0){
-            this.add_role()
-          }else if(this.edit_flag == 1){
-            this.set_role()
-          }else if(this.edit_flag == 3){
-            this.deal_node(this.permissionData,this.permission_arr)
-            console.log(this.permission_arr,this.service_node);
-            var temp = this.compare_arr(this.permission_arr,this.service_node)
-            var temp_arr = []
-            if(temp[0].length){
-              temp_arr.push(this.add_node(temp[0]))
+          if (this.edit_flag == 0) {
+            this.add_role();
+          } else if (this.edit_flag == 1) {
+            this.set_role();
+          } else if (this.edit_flag == 3) {
+            this.deal_node(this.permissionData, this.permission_arr);
+            console.log(this.permission_arr, this.service_node);
+            var temp = this.compare_arr(this.permission_arr, this.service_node);
+            var temp_arr = [];
+            if (temp[0].length) {
+              temp_arr.push(this.add_node(temp[0]));
             }
-            temp[1].forEach(e => {
-              temp_arr.push(this.delete_node(e))
+            temp[1].forEach((e) => {
+              temp_arr.push(this.delete_node(e));
             });
-            Promise.all(temp_arr).then((result) => {
-              this.get_now_page()
-            }).catch((error) => {
-              console.log(error)
-            })
+            Promise.all(temp_arr)
+              .then((result) => {
+                this.get_now_page();
+              })
+              .catch((error) => {
+                console.log(error);
+              });
           }
         } else {
           console.log("error submit!!");
@@ -127,187 +133,185 @@ export default {
         }
       });
     },
-    get_now_page(){
-        console.log(this.$route);
-        if(this.$route.path.indexOf('add')!==-1){
-            this.edit_flag = 0 
-        }
-        if(this.$route.path.indexOf('edit')!==-1){
-            this.edit_flag = 1
-            this.getInfo()
-        }
-        if(this.$route.path.indexOf('detail')!==-1){
-            this.edit_flag = 2
-            this.getInfo()
-        }
-        if(this.$route.path.indexOf('allot')!==-1){
-            this.edit_flag = 3
-            this.getInfo()
-            Promise.all([this.get_tree(), this.get_use_tree()]).then((result) => {
-              console.log(result)
-              this.permissionData = result[0].data.data
-              this.service_node = result[1].data.data
-              this.permission_arr = []
-              this.deal_tree_data(result[0].data.data,result[1].data.data)
-            }).catch((error) => {
-              console.log(error)
-            })
-        }
+    get_now_page() {
+      console.log(this.$route);
+      if (this.$route.path.indexOf("add") !== -1) {
+        this.edit_flag = 0;
+      }
+      if (this.$route.path.indexOf("edit") !== -1) {
+        this.edit_flag = 1;
+        this.getInfo();
+      }
+      if (this.$route.path.indexOf("detail") !== -1) {
+        this.edit_flag = 2;
+        this.getInfo();
+      }
+      if (this.$route.path.indexOf("allot") !== -1) {
+        this.edit_flag = 3;
+        this.getInfo();
+        Promise.all([this.get_tree(), this.get_use_tree()])
+          .then((result) => {
+            console.log(result);
+            this.permissionData = result[0].data.data;
+            this.service_node = result[1].data.data;
+            this.permission_arr = [];
+            this.deal_tree_data(result[0].data.data, result[1].data.data);
+          })
+          .catch((error) => {
+            console.log(error);
+          });
+      }
     },
-    backPage(){
-        this.$router.back(-1)
+    backPage() {
+      this.$router.back(-1);
     },
-    add_role(){
+    add_role() {
       var temp = {
-          "role_name":this.form.name,
-          "detail":this.form.desc
-      }
+        role_name: this.form.name,
+        detail: this.form.desc,
+      };
       this.$http
-            .post(`/apaas/backmgt/role`,temp)
-            .then(response => {
-                console.log(response);
-                let data = response.data.data
-                if(response.data.success){
-                  this.$message.success('新增成功')
-                  this.backPage()
-                }else{
-                  this.$message.error('新增失败')
-                }
-
-            })
-            .catch((response)=> {
-                this.$message.error('新增失败')
-            });
+        .post(`/apaas/backmgt/role`, temp)
+        .then((response) => {
+          console.log(response);
+          let data = response.data.data;
+          if (response.data.success) {
+            this.$message.success("新增成功");
+            this.backPage();
+          } else {
+            this.$message.error("新增失败");
+          }
+        })
+        .catch((response) => {
+          this.$message.error("新增失败");
+        });
     },
-    set_role(){
+    set_role() {
       var temp = {
-        	"role_id":this.$route.params.id,
-          "role_name":this.form.name,
-          "detail":this.form.desc
-      }
+        role_id: this.$route.params.id,
+        role_name: this.form.name,
+        detail: this.form.desc,
+      };
       this.$http
-            .put(`/apaas/backmgt/role`,temp)
-            .then(response => {
-                console.log(response);
-                let data = response.data.data
-                if(response.data.success){
-                  this.$message.success('修改成功')
-                  this.backPage()
-                }else{
-                  this.$message.error('修改失败')
-                }
-            })
-            .catch((response)=> {
-                this.$message.error('修改失败')
-            });
+        .put(`/apaas/backmgt/role`, temp)
+        .then((response) => {
+          console.log(response);
+          let data = response.data.data;
+          if (response.data.success) {
+            this.$message.success("修改成功");
+            this.backPage();
+          } else {
+            this.$message.error("修改失败");
+          }
+        })
+        .catch((response) => {
+          this.$message.error("修改失败");
+        });
     },
-    delete_node(val){
+    delete_node(val) {
       return this.$http
-            .post(`/apaas/backmgt/role/menuDel`,{
-              	"role_id":this.$route.params.id,
-                "menu_id":val
-            })
-            .then(response => {
-                if(response.data.success){
-                  this.$message.success('删除分配菜单成功')
-                }else{
-                  this.$message.error('删除分配菜单失败')
-                }
-            })
-            .catch((response)=> {
-                this.$message.error('删除分配菜单失败')
-            });
+        .post(`/apaas/backmgt/role/menuDel`, {
+          role_id: this.$route.params.id,
+          menu_id: val,
+        })
+        .then((response) => {
+          if (response.data.success) {
+            this.$message.success("删除分配菜单成功");
+          } else {
+            this.$message.error("删除分配菜单失败");
+          }
+        })
+        .catch((response) => {
+          this.$message.error("删除分配菜单失败");
+        });
     },
-    add_node(arr){
+    add_node(arr) {
       return this.$http
-            .post(`/apaas/backmgt/role/menuAdd`,{
-              	"role_id":this.$route.params.id,
-                "menu_id":arr
-            })
-            .then(response => {
-                if(response.data.success){
-                  this.$message.success('分配菜单成功')
-                }else{
-                  this.$message.error('分配菜单失败')
-                }
-            })
-            .catch((response)=> {
-                this.$message.error('分配菜单失败')
-            });
+        .post(`/apaas/backmgt/role/menuAdd`, {
+          role_id: this.$route.params.id,
+          menu_id: arr,
+        })
+        .then((response) => {
+          if (response.data.success) {
+            this.$message.success("分配菜单成功");
+          } else {
+            this.$message.error("分配菜单失败");
+          }
+        })
+        .catch((response) => {
+          this.$message.error("分配菜单失败");
+        });
     },
-    deal_node(data,data1){
-      data.forEach(e => {
-        if(e.selected){
-          data1.push(e.menu_id)
+    deal_node(data, data1) {
+      data.forEach((e) => {
+        if (e.selected) {
+          data1.push(e.menu_id);
         }
-        if(e.Child){
-          this.deal_node(e.Child,data1)
+        if (e.Child) {
+          this.deal_node(e.Child, data1);
         }
       });
     },
-    compare_arr(arr1,arr2){
-      var nowtemp = {}
-      var oldtemp = {}
-      var increase = []
-      var reduce = []
-      arr1.forEach(e => {
-        nowtemp[e] = e
+    compare_arr(arr1, arr2) {
+      var nowtemp = {};
+      var oldtemp = {};
+      var increase = [];
+      var reduce = [];
+      arr1.forEach((e) => {
+        nowtemp[e] = e;
       });
-      arr2.forEach(e => {
-        oldtemp[e.menu_id] = e.menu_id
+      arr2.forEach((e) => {
+        oldtemp[e.menu_id] = e.menu_id;
       });
       for (const key in nowtemp) {
         if (!oldtemp.hasOwnProperty(key)) {
-          increase.push(key)
+          increase.push(key);
         }
       }
       for (const key in oldtemp) {
         if (!nowtemp.hasOwnProperty(key)) {
-          reduce.push(key)
+          reduce.push(key);
         }
       }
-      return [increase,reduce]
-
+      return [increase, reduce];
     },
     getInfo() {
       this.$http
-            .get(`/apaas/backmgt/role/id/${this.$route.params.id}`)
-            .then(response => {
-                console.log(response);
-                let data = response.data.data
-                this.form={
-                  name: data.role_name,
-                  desc: data.detail,
-                  person: data.create_user,
-                  date: data.create_date,
-                }
-            })
-            .catch((response)=> {
-                
-            });
+        .get(`/apaas/backmgt/role/id/${this.$route.params.id}`)
+        .then((response) => {
+          console.log(response);
+          let data = response.data.data;
+          this.form = {
+            name: data.role_name,
+            desc: data.detail,
+            person: data.create_user,
+            date: data.create_date,
+          };
+        })
+        .catch((response) => {});
     },
     get_tree() {
-      return this.$http
-            .get(`/apaas/backmgt/menu/list`)
+      return this.$http.get(`/apaas/backmgt/menu/list`);
     },
     get_use_tree() {
-      return this.$http
-            .get(`/apaas/backmgt/role/menu/id/${this.$route.params.id}`)
+      return this.$http.get(
+        `/apaas/backmgt/role/menu/id/${this.$route.params.id}`
+      );
     },
-    deal_tree_data(data1,data2){
-      var temp = {}
-      data2.forEach(e => {
-        temp[e.menu_id] = e.menu_id
+    deal_tree_data(data1, data2) {
+      var temp = {};
+      data2.forEach((e) => {
+        temp[e.menu_id] = e.menu_id;
       });
-      this.merge_data(data1,temp)
+      this.merge_data(data1, temp);
     },
-    merge_data(data,temp){
-      data.forEach(e => {
-        if(temp[e.menu_id]){
-          e.selected = true
+    merge_data(data, temp) {
+      data.forEach((e) => {
+        if (temp[e.menu_id]) {
+          e.selected = true;
         }
-        if(e.Child){
-          this.merge_data(e.Child,temp)
+        if (e.Child) {
+          this.merge_data(e.Child, temp);
         }
       });
     },
diff --git a/src/pages/authority/organizationedit.vue b/src/pages/authority/organizationedit.vue
index 0a800d7c8700e2a084f1bd291731e8c3490f0ba2..4dda5d3fa5fe5fe13d3a12acbd0e918f0600f19b 100644
--- a/src/pages/authority/organizationedit.vue
+++ b/src/pages/authority/organizationedit.vue
@@ -65,7 +65,7 @@
 
 <script>
 import uploadFile from "@/components/upload_file";
-import { getRole } from "@/utils/common";
+import { getRole, formatDateTime_date } from "@/utils/common";
 export default {
   props: {},
   components: {
@@ -162,17 +162,12 @@ export default {
       }
     },
     get_now_user() {
-      this.$http
-        .get(`/apaas/backmgt/user/getCurrentUser`)
-        .then((response) => {
-          console.log(response);
-          let data = response.data.data;
-          this.form = {
-            person: data.user_name,
-            date: data.create_date.replace("T", " ").replace("Z", " "),
-          };
-        })
-        .catch((response) => {});
+      let userName = this.$store.state.userInfo.user_name;
+
+      this.form = {
+        person: userName,
+        date: formatDateTime_date(new Date()),
+      };
     },
     get_user() {
       this.$http
diff --git a/src/pages/authority/organizationuser.vue b/src/pages/authority/organizationuser.vue
index 13f8cb3efc098804598385e3891c47bdf38a8204..d4789df63dda3b829c3fd41a078c621ce089c6c7 100644
--- a/src/pages/authority/organizationuser.vue
+++ b/src/pages/authority/organizationuser.vue
@@ -1,8 +1,18 @@
 <template>
   <div class="detail_contain">
     <p class="now_page_title">
-      {{$route.name =='organizationuser'?'权限管理  /  组织管理  /  组织详情  /':'权限管理  /  用户管理  /' }}  
-      <span>{{$route.name =='organizationuser'?'用户管理':$route.name =='usersadd'?'新增用户':'用户详情'}}</span>
+      {{
+        $route.name == "organizationuser"
+          ? "权限管理  /  组织管理  /  组织详情  /"
+          : "权限管理  /  用户管理  /"
+      }}
+      <span>{{
+        $route.name == "organizationuser"
+          ? "用户管理"
+          : $route.name == "usersadd"
+          ? "新增用户"
+          : "用户详情"
+      }}</span>
     </p>
     <div class="info_contain">
       <el-form ref="form" :rules="rules" :model="form" label-width="0px">
@@ -10,10 +20,15 @@
           <p class="formname">用户账号：</p>
           <el-input v-model="form.account"></el-input>
         </el-form-item>
-        <el-form-item prop="password" :class="{'shortpass':edit_flag}">
+        <el-form-item prop="password" :class="{ shortpass: edit_flag }">
           <p class="formname">登录密码：</p>
-          <el-input v-model="form.password" :disabled="tranform_flag(edit_flag)"></el-input>
-          <div v-if="edit_flag" class="fixpass" @click="change_pass()">修改密码</div>
+          <el-input
+            v-model="form.password"
+            :disabled="tranform_flag(edit_flag)"
+          ></el-input>
+          <div v-if="edit_flag" class="fixpass" @click="change_pass()">
+            修改密码
+          </div>
         </el-form-item>
         <el-form-item prop="nickname">
           <p class="formname">昵称：</p>
@@ -23,10 +38,11 @@
           <p class="formname">用户类型：</p>
           <el-select v-model="form.type" placeholder="请选择">
             <el-option
-                v-for="item in typeoptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+              v-for="item in typeoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -58,10 +74,11 @@
           <p class="formname">用户组织机构：</p>
           <el-select v-model="form.origin" placeholder="请选择">
             <el-option
-                v-for="item in originoptions"
-                :key="item.value+100"
-                :label="item.label"
-                :value="item.value">
+              v-for="item in originoptions"
+              :key="item.value + 100"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -69,10 +86,11 @@
           <p class="formname">是否禁用：</p>
           <el-select v-model="form.able" placeholder="请选择">
             <el-option
-                v-for="item in ableoptions"
-                :key="item.value+200"
-                :label="item.label"
-                :value="item.value">
+              v-for="item in ableoptions"
+              :key="item.value + 200"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -91,23 +109,27 @@
           <p class="formname">登记日期：</p>
           <el-input v-model="form.date" disabled></el-input>
         </el-form-item>
-        
+
         <el-form-item>
-          <el-button @click="resetForm('form')" class="left" v-if="$route.name =='usersadd'">重置</el-button>
-          <el-button type="primary" @click="onSubmit('form')" class="right">保存</el-button>
+          <el-button
+            @click="resetForm('form')"
+            class="left"
+            v-if="$route.name == 'usersadd'"
+            >重置</el-button
+          >
+          <el-button type="primary" @click="onSubmit('form')" class="right"
+            >保存</el-button
+          >
           <el-button class="right" @click="backPage">取消</el-button>
         </el-form-item>
       </el-form>
-
-      
-    </div> 
-
+    </div>
   </div>
 </template>
 
 <script>
-import uploadFile from '@/components/upload_file'
-import { getRole } from "@/utils/common";
+import uploadFile from "@/components/upload_file";
+import { getRole, formatDateTime_date } from "@/utils/common";
 export default {
   props: {},
   components: {
@@ -115,288 +137,267 @@ export default {
   },
   data() {
     var checkip = (rule, value, callback) => {
-      var reg = /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g
-        setTimeout(() => {
-          if (!reg.test(value)) {
-            callback(new Error('请使用;隔开ip地址'));
-          } else {
-            callback();
-          }
-        }, 1000);
-      };
+      var reg = /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g;
+      setTimeout(() => {
+        if (!reg.test(value)) {
+          callback(new Error("请使用;隔开ip地址"));
+        } else {
+          callback();
+        }
+      }, 1000);
+    };
     return {
-        form: {
-          account:'',
-          password:'',
-          nickname:'',
-          type:'',
-          systemname:'',
-          contact:'',
-          phone:'',
-          email:'',
-          origin:'',
-          able:'',
-          desc:'',
-          person:'',
-          date:'',
-          ip:'',
-          domain:''
+      form: {
+        account: "",
+        password: "",
+        nickname: "",
+        type: "",
+        systemname: "",
+        contact: "",
+        phone: "",
+        email: "",
+        origin: "",
+        able: "",
+        desc: "",
+        person: this.$store.state.userInfo.user_name,
+        date: formatDateTime_date(new Date()),
+        ip: "",
+        domain: "",
+      },
+      now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
+      typeoptions: [
+        {
+          label: "普通用户",
+          value: 3,
         },
-        now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
-        typeoptions:[
-          {
-            label:'普通用户',
-            value:3,
-          },
-          {
-            label:'组织管理员',
-            value:2,
-          },
-          {
-            label:'超级管理员',
-            value:1,
-          },
-          {
-            label:'开发者',
-            value:4,
-          }
-        ],
-        originoptions:[
-            {
-                label:'贵阳水利局',
-                value:0,
-            },
-            {
-                label:'云上贵州',
-                value:1,
-            },
-            {
-                label:'迪艾斯',
-                value:2,
-            },
+        {
+          label: "组织管理员",
+          value: 2,
+        },
+        {
+          label: "超级管理员",
+          value: 1,
+        },
+        {
+          label: "开发者",
+          value: 4,
+        },
+      ],
+      originoptions: [],
+      ableoptions: [
+        {
+          label: "是",
+          value: 0,
+        },
+        {
+          label: "否",
+          value: 1,
+        },
+      ],
+      origin_arr: [],
+      rules: {
+        able: [
+          { required: true, message: "请选择是否禁用", trigger: "change" },
         ],
-        ableoptions:[
-            {
-                label:'是',
-                value:0,
-            },
-            {
-                label:'否',
-                value:1,
-            },
+        // domain:[
+        //     { required: true, message: '请输入域名', trigger: 'blur' }
+        // ],
+        ip: [
+          // { required: true, message: '请输入ip地址', trigger: 'blur' }
         ],
-        origin_arr:[],
-        rules:{
-          able:[
-              { required: true, message: '请选择是否禁用', trigger: 'change' }
-          ],
-          // domain:[
-          //     { required: true, message: '请输入域名', trigger: 'blur' }
-          // ],
-          ip:[
-              // { required: true, message: '请输入ip地址', trigger: 'blur' }
-          ],
-        },
-        edit_flag:0,
+      },
+      edit_flag: 0,
     };
   },
   watch: {},
   computed: {},
   created() {
-    this.getOriginArr()
-    this.get_now_page()
+    this.getOriginArr();
+    this.get_now_page();
   },
   mounted() {},
   methods: {
-     get_now_page(){
-        console.log(this.$route);
-        if(this.$route.path.indexOf('add')!==-1){
-            this.edit_flag = 0 
-        }
-        if(this.$route.path.indexOf('edit')!==-1){
-            this.edit_flag = 1
-            this.get_user()
-        }
-        if(this.$route.path.indexOf('detail')!==-1){
-            this.edit_flag = 2
-            this.get_user()
-        }
-        
+    get_now_page() {
+      console.log(this.$route);
+      if (this.$route.path.indexOf("add") !== -1) {
+        this.edit_flag = 0;
+      }
+      if (this.$route.path.indexOf("edit") !== -1) {
+        this.edit_flag = 1;
+        this.get_user();
+      }
+      if (this.$route.path.indexOf("detail") !== -1) {
+        this.edit_flag = 2;
+        this.get_user();
+      }
     },
-    tranform_flag(val){
-      return val?true:false
+    tranform_flag(val) {
+      return val ? true : false;
     },
-    change_pass(){
+    change_pass() {
       this.$http
-            .put(`/apaas/backmgt/user/initalPasswd/${this.$route.params.id}`)
-            .then(response => {
-                console.log(response);
-                this.$message.success('修改成默认密码成功 默认密码：123456')
-            })
-            .catch((response)=> {
-                
-            });
+        .put(`/apaas/backmgt/user/initalPasswd/${this.$route.params.id}`)
+        .then((response) => {
+          console.log(response);
+          this.$message.success("修改成默认密码成功 默认密码：123456");
+        })
+        .catch((response) => {});
     },
-     get_user(){
-        this.$http
-            .get(`/apaas/backmgt/user/detail/${this.$route.params.id}`)
-            .then(response => {
-                console.log(response);
-                let data = response.data.data
-                this.form={
-                  account:data.user_id,
-                  password:'******',
-                  nickname:data.user_name,
-                  type:data.is_admin,
-                  systemname:data.system_name,
-                  contact:data.link_man,
-                  phone:data.phone+'',
-                  email:data.email,
-                  origin:data.department_id,
-                  able:data.state,
-                  desc:data.description,
-                  person:data.create_user,
-                  date:data.create_date,
-                  ip:this.transform_func(data.ip_whitelist),
-                  domain:data.domain_name
-                }
-            })
-            .catch((response)=> {
-                
-            });
+    get_user() {
+      this.$http
+        .get(`/apaas/backmgt/user/detail/${this.$route.params.id}`)
+        .then((response) => {
+          console.log(response);
+          let data = response.data.data;
+          this.form = {
+            account: data.user_id,
+            password: "******",
+            nickname: data.user_name,
+            type: data.is_admin,
+            systemname: data.system_name,
+            contact: data.link_man,
+            phone: data.phone + "",
+            email: data.email,
+            origin: data.department_id,
+            able: data.state,
+            desc: data.description,
+            person: data.create_user,
+            date: data.create_date,
+            ip: this.transform_func(data.ip_whitelist),
+            domain: data.domain_name,
+          };
+        })
+        .catch((response) => {});
     },
-    transform_func(arr){
-      var temp = ''
-      arr.forEach(e => {
-        temp = temp + e + ';'
+    transform_func(arr) {
+      var temp = "";
+      arr.forEach((e) => {
+        temp = temp + e + ";";
       });
-      return temp
+      return temp;
     },
-    getOriginArr(){
-      this.originoptions = []
+    getOriginArr() {
+      this.originoptions = [];
       this.$http
-            .get('/apaas/backmgt/department/list')
-            .then(response => {
-                let data = response.data.data
-                // this.originoptions = data
-                data.forEach(e => {
-                  this.originoptions.push({
-                    label:e.department_name,
-                    value:e.department_id
-                  })
-                });
-            })
-            .catch(function(response) {
-                
+        .get("/apaas/backmgt/department/list")
+        .then((response) => {
+          let data = response.data.data;
+          // this.originoptions = data
+          data.forEach((e) => {
+            this.originoptions.push({
+              label: e.department_name,
+              value: e.department_id,
             });
+          });
+        })
+        .catch(function(response) {});
     },
-    removepic(){
-      this.$refs.servicepic.handleRemove()
+    removepic() {
+      this.$refs.servicepic.handleRemove();
     },
-    backPage(){
-        this.$router.back(-1)
+    backPage() {
+      this.$router.back(-1);
     },
-    add_user(){
+    add_user() {
       var temp = {
-        "user_id":this.form.account,   // 用户名
-        "user_name":this.form.nickname,  // 昵称
-        "system_name":this.form.systemname,//系统名称
-        "phone":this.form.phone+'',  // 电话号
-        "email":this.form.email, // 邮箱
-        "department_id":this.form.origin, // 组织id
-        "is_admin":this.form.type,
-        "state":this.form.able,  // 用户状态，1——启用，0 禁用
-        "domain_name":this.form.domain,//
-        "ip_whitelist":this.form.ip.split(';'),//
-        "description":this.form.desc, //描述
-        "link_man":this.form.contact
-      }
-          this.$http
-            .post(`/apaas/backmgt/user/register`,temp)
-            .then(response => {
-                console.log(response);
-                this.backPage()
-                this.$message.success('新增成功')
-            })
-            .catch((response)=> {
-                this.$message.error('新增失败')
-            });
+        user_id: this.form.account, // 用户名
+        user_name: this.form.nickname, // 昵称
+        system_name: this.form.systemname, //系统名称
+        phone: this.form.phone + "", // 电话号
+        email: this.form.email, // 邮箱
+        department_id: this.form.origin, // 组织id
+        is_admin: this.form.type,
+        state: this.form.able, // 用户状态，1——启用，0 禁用
+        domain_name: this.form.domain, //
+        ip_whitelist: this.form.ip.split(";"), //
+        description: this.form.desc, //描述
+        link_man: this.form.contact,
+      };
+      this.$http
+        .post(`/apaas/backmgt/user/register`, temp)
+        .then((response) => {
+          console.log(response);
+          this.backPage();
+          this.$message.success("新增成功");
+        })
+        .catch((response) => {
+          this.$message.error("新增失败");
+        });
     },
-    set_user(){
+    set_user() {
       var temp = {
-        "user_id":this.form.account,   // 用户名
-        "user_name":this.form.nickname,  // 昵称
-        "system_name":this.form.systemname,//系统名称
-        "phone":this.form.phone+'',  // 电话号
-        "email":this.form.email, // 邮箱
-        "department_id":this.form.origin, // 组织id
-        "is_admin":this.form.type,
-        "state":this.form.able,  // 用户状态，1——启用，0 禁用
-        "domain_name":this.form.domain,//
-        "ip_whitelist":this.form.ip&&this.form.ip.length?this.form.ip.split(';'):[],//
-        "description":this.form.desc, //描述
-        "link_man":this.form.contact
-      }
-          this.$http
-            .put(`/apaas/backmgt/user/put`,temp)
-            .then(response => {
-                console.log(response);
-                this.backPage()
-                this.$message.success('修改成功')
-            })
-            .catch((response)=> {
-                this.$message.error('修改失败')
-            });
+        user_id: this.form.account, // 用户名
+        user_name: this.form.nickname, // 昵称
+        system_name: this.form.systemname, //系统名称
+        phone: this.form.phone + "", // 电话号
+        email: this.form.email, // 邮箱
+        department_id: this.form.origin, // 组织id
+        is_admin: this.form.type,
+        state: this.form.able, // 用户状态，1——启用，0 禁用
+        domain_name: this.form.domain, //
+        ip_whitelist:
+          this.form.ip && this.form.ip.length ? this.form.ip.split(";") : [], //
+        description: this.form.desc, //描述
+        link_man: this.form.contact,
+      };
+      this.$http
+        .put(`/apaas/backmgt/user/put`, temp)
+        .then((response) => {
+          console.log(response);
+          this.backPage();
+          this.$message.success("修改成功");
+        })
+        .catch((response) => {
+          this.$message.error("修改失败");
+        });
     },
-      onSubmit(formName) {
-        console.log('submit!');
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            if(this.edit_flag == 0){
-                this.add_user()
-              }else{
-                this.set_user()
-              }
-              
+    onSubmit(formName) {
+      console.log("submit!");
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.edit_flag == 0) {
+            this.add_user();
           } else {
-            console.log('error submit!!');
-            return false;
+            this.set_user();
           }
-        });
-      },
-      resetForm(formName) {
-        this.$refs[formName].resetFields();
-      }
-  }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    },
+  },
 };
 </script>
 
-
 <style>
-.info_contain .el-input__inner{
+.info_contain .el-input__inner {
   background-color: #f7f8f9;
   width: 1022px;
 }
-.shortpass .el-input__inner{
+.shortpass .el-input__inner {
   background-color: #f7f8f9;
   width: 888px;
 }
-.shortpass .el-input{
+.shortpass .el-input {
   width: 888px;
 }
-.info_contain .el-textarea__inner{
+.info_contain .el-textarea__inner {
   background-color: #f7f8f9;
   width: 1022px;
 }
-.limitsd .timeslect .el-input__inner{
+.limitsd .timeslect .el-input__inner {
   width: 150px;
   border-radius: 0 8px 8px 0;
   background-color: rgba(15, 38, 131, 1);
   color: rgba(248, 249, 253, 1);
   border: 0;
 }
-.info_contain .el-input.is-disabled .el-input__inner{
-    background-color: #e3e4e6;
+.info_contain .el-input.is-disabled .el-input__inner {
+  background-color: #e3e4e6;
 }
 </style>
 
@@ -413,8 +414,8 @@ export default {
   box-shadow: 0px 3px 6px 0px #f4f7fc;
   border-radius: 12px;
   min-height: calc(100% - 20px);
-    margin-bottom: 20px;
-    position: relative;
+  margin-bottom: 20px;
+  position: relative;
 }
 .now_page_title {
   margin: 15px 0;
@@ -423,17 +424,17 @@ export default {
 .now_page_title span {
   color: #242c43;
 }
-.formname{
+.formname {
   color: #58617a;
 }
-.right{
+.right {
   float: right;
   margin-left: 20px;
 }
-.left{
+.left {
   float: left;
 }
-.removepic{
+.removepic {
   display: inline-block;
   margin-top: -40px;
   float: left;
@@ -447,16 +448,16 @@ export default {
   color: #e6ebfe;
   cursor: pointer;
 }
-.edit_change{
+.edit_change {
   width: 100%;
   border-bottom: 2px solid #f4f7fc;
   overflow: hidden;
 }
-.edit_change_box{
+.edit_change_box {
   width: 163px;
   height: 48px;
   line-height: 48px;
-	background-color: #e3e5ef;
+  background-color: #e3e5ef;
   border-radius: 8px;
   color: #8890a7;
   text-align: center;
@@ -467,81 +468,81 @@ export default {
   font-size: 16px;
   cursor: pointer;
 }
-.edit_change_box img{
+.edit_change_box img {
   vertical-align: -3px;
   margin-right: 5px;
 }
-.safe_title{
-    width: 100%;
-    height: 65px;
-    line-height: 65px;
-    border-bottom: 2px solid #f4f7fc;
+.safe_title {
+  width: 100%;
+  height: 65px;
+  line-height: 65px;
+  border-bottom: 2px solid #f4f7fc;
 }
-.safe_select{
-    float: left;
-    width: auto;
-    margin-right: 40px;
-    height: 65px;
-    cursor: pointer;
+.safe_select {
+  float: left;
+  width: auto;
+  margin-right: 40px;
+  height: 65px;
+  cursor: pointer;
 }
-.safe_box_select{
-    padding: 30px 10px 10px 10px;
-    width: 100%;
-    height: 100%;
+.safe_box_select {
+  padding: 30px 10px 10px 10px;
+  width: 100%;
+  height: 100%;
 }
-.openbgc{
+.openbgc {
   width: 56px;
-	height: 23px;
-  background-image: url('~@/assets/imgs/btn_on_hov.png');
-  background-size:contain;
+  height: 23px;
+  background-image: url("~@/assets/imgs/btn_on_hov.png");
+  background-size: contain;
   cursor: pointer;
 }
-.formtitle{
+.formtitle {
   color: #58617a;
   margin: 15px 0;
 }
 
-.savebtn{
+.savebtn {
   position: absolute;
   right: 20px;
-  bottom:20px;
+  bottom: 20px;
   width: 278px;
   overflow: hidden;
 }
-.btnsty{
+.btnsty {
   width: 124px;
-	height: 44px;
+  height: 44px;
   line-height: 44px;
-	background-color: rgba(195, 202, 248, 0.5);
-	border-radius: 8px;
+  background-color: rgba(195, 202, 248, 0.5);
+  border-radius: 8px;
   color: rgba(15, 38, 131, 1);
   text-align: center;
   float: left;
   margin-right: 30px;
   cursor: pointer;
 }
-.savebtn .btnsty:nth-last-of-type(1){
+.savebtn .btnsty:nth-last-of-type(1) {
   margin-right: 0px;
   background-color: rgba(15, 38, 131, 1);
   color: rgba(248, 249, 253, 1);
 }
-.limitsd{
+.limitsd {
   position: relative;
   width: 1022px;
 }
-.limitsd .timeslect{
+.limitsd .timeslect {
   position: absolute;
   right: 0;
 }
-.fixpass{
+.fixpass {
   width: 124px;
-	height: 44px;
+  height: 44px;
   line-height: 44px;
   text-align: center;
   font-size: 16px;
   color: #fff;
-	background-color: #495feb;
-	border-radius: 8px;
+  background-color: #495feb;
+  border-radius: 8px;
   display: inline-block;
   margin-left: 5px;
   cursor: pointer;
diff --git a/src/utils/common.js b/src/utils/common.js
index 66354f37c6aec4723a92d64118a04290ae30c4d8..3ecd008877656b66b98541bab866cec2c32cc7f4 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -10,7 +10,6 @@ function getRole(){
 
  //时间戳转时间格式
  var formatDateTime_date = function (date) {
-     debugger
     var y = date.getFullYear();
     var M = date.getMonth() + 1;
     M = M < 10 ? ('0' + M) : M;