Merge remote-tracking branch 'origin/gzb' into wzl

src/api/admin.js

@@ -1,10 +1,10 @@
-import { admin_url } from "@/utils/httpRequest";
+import { setRequest } from "@/utils/httpRequest";
 
 /**
  * 1.0.1管理员--账号登录
  */
-export const login = (data) => admin_url("admin/login", data);
+export const admin_login = (data) => setRequest("admin/login", data);
 /**
  * 1.0.4管理员--生成图片验证码
  */
-export const img_code = (data) => admin_url("admin/img_code", data);
+export const admin_img_code = (data) => setRequest("admin/img_code", data);

src/store/index.js

@@ -1,40 +1,11 @@
 import Vue from "vue";
 import Vuex from "vuex";
-import { login } from "../api/admin";
-import { clearStore, setStore } from "../utils/store";
 Vue.use(Vuex);
 
 export default new Vuex.Store({
   state: {
     userInfo: {}
   },
-  mutations: {
-    // 设置个人信息
-    SET_USERIFNO: (state, userInfo) => {
-      state.userInfo = userInfo;
-      setStore({ name: "xh-control-userInfo", content: userInfo });
-    }
-  },
-  actions: {
-    // 登陆
-    login_username({ commit }, userInfo) {
-      return new Promise((resolve, reject) => {
-        login(userInfo).then((res) => {
-          if (res.code == 0) {
-            const userInfo = res.obj;
-            commit("SET_USERIFNO", userInfo);
-          }
-          resolve(res);
-        });
-      });
-    },
-    // 登出
-    loginOut({ commit }) {
-      return new Promise((resolve, reject) => {
-        commit("SET_USERIFNO", []);
-        clearStore();
-        resolve("请重新登录！");
-      });
-    }
-  }
+  mutations: {},
+  actions: {}
 });

src/utils/httpRequest.js

@@ -105,34 +105,9 @@ http.interceptors.response.use(
  * @param {*} data 传参
  * @returns Promise
  */
-const setRequest = ({ url, data }) =>
+export const setRequest = (url, data) =>
   http({
     url: `${window._config.baseUrl}${url}`,
     method: "post",
     data: data || {}
   });
-/**
- * @param {*} url 不带前缀的url
- * @param {*} data 传参
- * @returns Promise
- */
-//管理员
-export const admin_url = (url, data) =>
-  setRequest({
-    url,
-    data
-  });
-
-//区域
-export const region_url = (url, data) =>
-  setRequest({
-    url,
-    data
-  });
-
-//应用
-export const appgroup_url = (url, data) =>
-  setRequest({
-    url,
-    data
-  });

src/utils/store.js

@@ -1,99 +0,0 @@
-import { validatenull } from "@/utils/validate";
-
-/**
- * 存储localStorage
- */
-export const setStore = (params = {}) => {
-  let { name, content, type } = params;
-  let obj = {
-    dataType: typeof content,
-    content: content,
-    type: type,
-    datetime: new Date().getTime()
-  };
-  if (type) window.sessionStorage.setItem(name, JSON.stringify(obj));
-  else window.localStorage.setItem(name, JSON.stringify(obj));
-};
-
-/**
- * 获取localStorage
- */
-export const getStore = (params = {}) => {
-  let { name, debug } = params;
-  let obj = {};
-  let content;
-  obj = window.sessionStorage.getItem(name);
-  if (validatenull(obj)) obj = window.localStorage.getItem(name);
-  if (validatenull(obj)) return;
-  try {
-    obj = JSON.parse(obj);
-  } catch {
-    return obj;
-  }
-  if (debug) {
-    return obj;
-  }
-  if (obj.dataType === "string") {
-    content = obj.content;
-  } else if (obj.dataType === "number") {
-    content = Number(obj.content);
-  } else if (obj.dataType === "boolean") {
-    content = this.eval(obj.content);
-  } else if (obj.dataType === "object") {
-    content = obj.content;
-  }
-  return content;
-};
-
-/**
- * 删除localStorage
- */
-export const removeStore = (params = {}) => {
-  let { name, type } = params;
-  if (type) {
-    window.sessionStorage.removeItem(name);
-  } else {
-    window.localStorage.removeItem(name);
-  }
-};
-
-/**
- * 获取全部localStorage
- */
-export const getAllStore = (params = {}) => {
-  let list = [];
-  let { type } = params;
-  if (type) {
-    for (let i = 0; i <= window.sessionStorage.length; i++) {
-      list.push({
-        name: window.sessionStorage.key(i),
-        content: getStore({
-          name: window.sessionStorage.key(i),
-          type: "session"
-        })
-      });
-    }
-  } else {
-    for (let i = 0; i <= window.localStorage.length; i++) {
-      list.push({
-        name: window.localStorage.key(i),
-        content: getStore({
-          name: window.localStorage.key(i)
-        })
-      });
-    }
-  }
-  return list;
-};
-
-/**
- * 清空全部localStorage
- */
-export const clearStore = (params = {}) => {
-  let { type } = params;
-  if (type) {
-    window.sessionStorage.clear();
-  } else {
-    window.localStorage.clear();
-  }
-};

src/utils/validate.js

@@ -1,304 +0,0 @@
-/**
- * Created by jiachenpan on 16/11/18.
- */
-
-export function isvalidUsername(str) {
-  const validMap = ["admin", "editor"];
-  return validMap.indexOf(str.trim()) >= 0;
-}
-
-/* 合法uri */
-export function validateURL(textval) {
-  const urlregex =
-    /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
-  return urlregex.test(textval);
-}
-/**
- * 邮箱
- * @param {*} s
- */
-export function isEmail(s) {
-  return /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(
-    s
-  );
-}
-
-/**
- * 手机号码
- * @param {*} s
- */
-export function isMobile(s) {
-  return /^1[0-9]{10}$/.test(s);
-}
-
-/**
- * 电话号码
- * @param {*} s
- */
-export function isPhone(s) {
-  return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s);
-}
-
-/**
- * URL地址
- * @param {*} s
- */
-export function isURL(s) {
-  return /^http[s]?:\/\/.*/.test(s);
-}
-
-/* 小写字母 */
-export function validateLowerCase(str) {
-  const reg = /^[a-z]+$/;
-  return reg.test(str);
-}
-
-/* 大写字母 */
-export function validateUpperCase(str) {
-  const reg = /^[A-Z]+$/;
-  return reg.test(str);
-}
-
-/* 大小写字母 */
-export function validatAlphabets(str) {
-  const reg = /^[A-Za-z]+$/;
-  return reg.test(str);
-}
-/* 验证pad还是pc */
-export const vaildatePc = function () {
-  const userAgentInfo = navigator.userAgent;
-  const Agents = [
-    "Android",
-    "iPhone",
-    "SymbianOS",
-    "Windows Phone",
-    "iPad",
-    "iPod"
-  ];
-  let flag = true;
-  for (var v = 0; v < Agents.length; v++) {
-    if (userAgentInfo.indexOf(Agents[v]) > 0) {
-      flag = false;
-      break;
-    }
-  }
-  return flag;
-};
-/**
- * validate email
- * @param email
- * @returns {boolean}
- */
-export function validateEmail(email) {
-  const re =
-    /^(([^<>()\\[\]\\.,;:\s@"]+(\.[^<>()\\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-  return re.test(email);
-}
-
-/**
- * 判断身份证号码
- */
-export function cardid(code) {
-  let list = [];
-  let result = true;
-  let msg = "";
-  var city = {
-    11: "北京",
-    12: "天津",
-    13: "河北",
-    14: "山西",
-    15: "内蒙古",
-    21: "辽宁",
-    22: "吉林",
-    23: "黑龙江 ",
-    31: "上海",
-    32: "江苏",
-    33: "浙江",
-    34: "安徽",
-    35: "福建",
-    36: "江西",
-    37: "山东",
-    41: "河南",
-    42: "湖北 ",
-    43: "湖南",
-    44: "广东",
-    45: "广西",
-    46: "海南",
-    50: "重庆",
-    51: "四川",
-    52: "贵州",
-    53: "云南",
-    54: "西藏 ",
-    61: "陕西",
-    62: "甘肃",
-    63: "青海",
-    64: "宁夏",
-    65: "新疆",
-    71: "台湾",
-    81: "香港",
-    82: "澳门",
-    91: "国外 "
-  };
-  if (!validatenull(code)) {
-    if (code.length === 18) {
-      if (!code || !/(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(code)) {
-        msg = "证件号码格式错误";
-      } else if (!city[code.substr(0, 2)]) {
-        msg = "地址编码错误";
-      } else {
-        // 18位身份证需要验证最后一位校验位
-        code = code.split("");
-        // ∑(ai×Wi)(mod 11)
-        // 加权因子
-        var factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
-        // 校验位
-        var parity = [1, 0, "X", 9, 8, 7, 6, 5, 4, 3, 2, "x"];
-        var sum = 0;
-        var ai = 0;
-        var wi = 0;
-        for (var i = 0; i < 17; i++) {
-          ai = code[i];
-          wi = factor[i];
-          sum += ai * wi;
-        }
-        if (parity[sum % 11] !== code[17]) {
-          msg = "证件号码校验位错误";
-        } else {
-          result = false;
-        }
-      }
-    } else {
-      msg = "证件号码长度不为18位";
-    }
-  } else {
-    msg = "证件号码不能为空";
-  }
-  list.push(result);
-  list.push(msg);
-  return list;
-}
-/**
- * 判断手机号码是否正确
- */
-export function isvalidatemobile(phone) {
-  let list = [];
-  let result = true;
-  let msg = "";
-  var isPhone = /^0\d{2,3}-?\d{7,8}$/;
-  // 增加134 减少|1349[0-9]{7}，增加181,增加145，增加17[678]
-  if (!validatenull(phone)) {
-    if (phone.length === 11) {
-      if (isPhone.test(phone)) {
-        msg = "手机号码格式不正确";
-      } else {
-        result = false;
-      }
-    } else {
-      msg = "手机号码格式不正确";
-    }
-  } else {
-    msg = "手机号码不能为空";
-  }
-  list.push(result);
-  list.push(msg);
-  return list;
-}
-/**
- * 判断手机号码是否正确 不是必填
- */
-export function check_phone(phone) {
-  let list = [];
-  let result = true;
-  let msg = "";
-  var isPhone = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-  if (!validatenull(phone)) {
-    if (phone.length === 11) {
-      if (!isPhone.test(phone)) {
-        msg = "手机号码格式不正确";
-      } else {
-        result = false;
-      }
-    } else {
-      msg = "手机号码格式不正确";
-    }
-  } else {
-    result = false;
-  }
-  list.push(result);
-  list.push(msg);
-  return list;
-}
-/**
- * 判断姓名是否正确
- */
-export function validatename(name) {
-  var regName = /^[\u4e00-\u9fa5]{2,4}$/;
-  if (!regName.test(name)) return false;
-  return true;
-}
-/**
- * 判断是否为整数
- */
-export function validatenum(num, type) {
-  let regName = /[^\d.]/g;
-  if (type === 1) {
-    if (!regName.test(num)) return false;
-  } else if (type === 2) {
-    regName = /[^\d]/g;
-    if (!regName.test(num)) return false;
-  }
-  return true;
-}
-/**
- * 判断是否为小数
- */
-export function validatenumord(num, type) {
-  let regName = /[^\d.]/g;
-  if (type === 1) {
-    if (!regName.test(num)) return false;
-  } else if (type === 2) {
-    regName = /[^\d.]/g;
-    if (!regName.test(num)) return false;
-  }
-  return true;
-}
-/**
- * 判断是否为空
- */
-export function validatenull(val) {
-  if (typeof val === "boolean") {
-    return false;
-  }
-  if (typeof val === "number") {
-    return false;
-  }
-  if (val instanceof Array) {
-    if (val.length === 0) return true;
-  } else if (val instanceof Object) {
-    if (JSON.stringify(val) === "{}") return true;
-  } else {
-    if (
-      val === "null" ||
-      val === null ||
-      val === "undefined" ||
-      val === undefined ||
-      val === ""
-    )
-      return true;
-    return false;
-  }
-  return false;
-}
-// 密码必须是6-16位的英文字母、数字组合
-export function isLoginPwd(val) {
-  const passRegex = new RegExp("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$");
-  return passRegex.test(val);
-}
-// 修改密码功能改为： 密码必须是8-16位大小写英文字母、数字组合 。
-export function isValidPassword(password) {
-  const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,16}$/;
-  return {
-    is: reg.test(password),
-    msg: "密码必须是8-16位大小写英文字母、数字组合"
-  };
-}

src/views/login/login.vue

@@ -71,7 +71,7 @@
           <span class="emit_code" v-else @click="getCodeImg()">获取验证码</span>
         </FormItem>
         <FormItem class="btn_bottom">
-          <Checkbox v-model="pwd">记住密码</Checkbox>
+          <Checkbox v-model="isaccount">记住密码</Checkbox>
         </FormItem>
       </Form>
       <Button
@@ -85,9 +85,7 @@
 </template>
 
 <script>
-import { img_code } from "@/api/admin";
-
-const Base64 = require("js-base64").Base64;
+import { admin_img_code, admin_login } from "@/api/admin";
 export default {
   data() {
     // 手机号验证
@@ -117,8 +115,7 @@ export default {
       loginForm: {
         loginname: "",
         loginpwd: "",
-        msgcode: "",
-        phone: ""
+        msgcode: ""
       },
       formRules: {
         loginname: [
@@ -142,7 +139,7 @@ export default {
           { required: true, message: "短信验证码不能为空", trigger: "blur" }
         ]
       },
-      pwd: false,
+      isaccount: false,
       show_pw: false,
       time: 0
     };
@@ -164,26 +161,19 @@ export default {
     }
   },
   created() {
-    // this.$removeEncodeStorage("userInfo");
-    // 在页面加载时从cookie获取登录信息
-    let loginname = this.getCookie("loginname");
-    let loginpwd = Base64.decode(this.getCookie("loginpwd"));
+    //登录前清除信息
+    localStorage.setItem("xh_control_userInfo", "");
+    // 在页面加载时获取账号信息
+    let userdata = localStorage.getItem("control_user");
     // 如果存在赋值给表单，并且将记住密码勾选
-    if (loginname) {
-      this.loginForm.loginname = loginname;
-      this.loginForm.loginpwd = loginpwd;
-      this.pwd = true;
-    }
-  },
-  watch: {
-    time() {
-      if (this.time == 0) {
-        if (this.time1) {
-          clearInterval(this.time1);
-        }
-      }
+    if (userdata) {
+      userdata = JSON.parse(userdata);
+      this.loginForm.loginname = userdata.loginname;
+      this.loginForm.loginpwd = userdata.loginpwd;
+      this.isaccount = true;
     }
   },
+  watch: {},
   mounted() {
     window.addEventListener("copy", this.inputHandle);
     window.addEventListener("paste", this.inputHandle);
@@ -193,7 +183,6 @@ export default {
     window.removeEventListener("copy", this.inputHandle);
     window.removeEventListener("paste", this.inputHandle);
     window.removeEventListener("cut", this.inputHandle);
-    clearInterval(this.time1);
   },
   methods: {
     //获取验证码
@@ -202,7 +191,7 @@ export default {
         this.$Message.error("请输入账号");
         return;
       }
-      img_code({
+      admin_img_code({
         loginname: this.loginForm.loginname
       }).then((data) => {
         if (data.code === 0) {
@@ -237,7 +226,6 @@ export default {
     //登录
     login_by_username(name) {
       let that = this;
-      console.log(name);
       this.$refs[name].validate((valid) => {
         if (valid) {
           if (
@@ -248,20 +236,29 @@ export default {
             return;
           }
           that.wait_flag = true;
-          let loginForm = that.loginForm;
-          that.$store.dispatch("login_username", loginForm).then((res) => {
+          admin_login(that.loginForm).then((res) => {
             that.wait_flag = false;
             if (res.code == 0) {
               that.$Message.success(res.msg);
-              //1平台管理员2区域管理员3学校管理员
-              console.log(res.obj);
+              localStorage.setItem(
+                "xh_control_userInfo",
+                JSON.stringify({
+                  content: res.obj,
+                  datetime: new Date().getTime()
+                })
+              );
               let atype = res.obj.atype;
               atype = 2;
+              let path = "";
+              //1平台管理员2区域管理员3学校管理员
               if (atype === 1) {
+                path = "platform";
               } else if (atype === 2) {
-                this.$router.replace({ name: "region" });
+                path = "region";
               } else if (atype === 3) {
+                path = "school";
               }
+              this.$router.replace({ name: path });
               that.set_userInfo();
             } else {
               that.$Message.error(res.msg);
@@ -273,43 +270,14 @@ export default {
     },
     // 记住密码功能
     set_userInfo() {
-      if (this.pwd) {
-        this.setCookie("loginname", this.loginForm.loginname, 86400);
-        this.setCookie("usertype", this.loginForm.usertype, 86400);
-        // base64加密密码
-        let loginpwd = Base64.encode(this.loginForm.loginpwd);
-        this.setCookie("loginpwd", loginpwd, 86400);
-      } else {
-        this.setCookie("loginname", "");
-        this.setCookie("loginpwd", "");
-      }
-    },
-    //验证码登录
-    go_type() {},
-    //忘记密码
-    tousecrt() {},
-    // 获取cookie
-    getCookie: function (key) {
-      if (document.cookie.length > 0) {
-        var start = document.cookie.indexOf(key + "=");
-        if (start !== -1) {
-          start = start + key.length + 1;
-          var end = document.cookie.indexOf(";", start);
-          if (end === -1) end = document.cookie.length;
-          return unescape(document.cookie.substring(start, end));
-        }
+      let info = "";
+      if (this.isaccount) {
+        info = JSON.stringify({
+          loginname: this.loginForm.loginname,
+          loginpwd: this.loginForm.loginpwd
+        });
       }
-      return "";
-    },
-    // 保存cookie
-    setCookie: function (cName, value, expiredays) {
-      var exdate = new Date();
-      exdate.setDate(exdate.getDate() + expiredays);
-      document.cookie =
-        cName +
-        "=" +
-        decodeURIComponent(value) +
-        (expiredays == null ? "" : ";expires=" + exdate.toGMTString());
+      localStorage.setItem("control_user", info);
     }
   }
 };

src/views/regionSection/home/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">区域首页</div>
 </template>
 
 <script>

src/views/regionSection/index.vue

@@ -21,6 +21,13 @@
               class="drop_down_list_item"
               >区域管理</router-link
             >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/region/schoolManage"
+              class="drop_down_list_item"
+              >学校管理</router-link
+            >
             <router-link
               @click.native="routeDropdownChange()"
               tag="div"

src/views/regionSection/regionManage/adminManage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">管理员</div>
 </template>
 
 <script>

src/views/regionSection/regionManage/regionManage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">区域管理</div>
 </template>
 
 <script>

src/views/regionSection/regionManage/schoolManage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">学校管理</div>
 </template>
 
 <script>