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

public/config.js

@@ -3,10 +3,9 @@ window._config = window.isTest
   ? {
       // 测试环境
       webUrl: "https://xhbitest.xhkjedu.com/",
-      baseUrl: "https://xhbiapitest.xhkjedu.com/",
+      baseUrl: "http://49.4.26.249:8331/",
       baseImageUrl: "https://xhbifiletest.xhkjedu.com/",
       showImageUrl: "https://xhbistatictest.xhkjedu.com/",
-      useMicroservice: true, // 是否使用微服务
       axiosApiTimeout: 60, // 接口超时时间 单位秒
       axiosFileTimeout: 120, // 上传文件超时时间 单位秒
       // 开发者
@@ -22,7 +21,6 @@ window._config = window.isTest
       baseUrl: "https://xhbiapi.xhkjedu.com/",
       baseImageUrl: "https://xhbifile.xhkjedu.com/",
       showImageUrl: "https://xhbistatic.xhkjedu.com/",
-      useMicroservice: true, // 是否使用微服务
       axiosApiTimeout: 20, // 接口超时时间 单位秒
       axiosFileTimeout: 30, // 上传文件超时时间 单位秒
       // 开发者

src/api/admin.js

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

src/api/appgroup.js

@@ -0,0 +1,6 @@
+import { appgroup_url } from "@/utils/httpRequest";
+
+/**
+ * 1.0.1管理员--账号登录
+ */
+export const admin_login = (data) => appgroup_url("admin/login", data);

src/api/region.js

@@ -0,0 +1,6 @@
+import { region_url } from "@/utils/httpRequest";
+
+/**
+ * 1.0.1管理员--账号登录
+ */
+export const admin_login = (data) => region_url("admin/login", data);

src/api/system.js

@@ -1,279 +0,0 @@
-import { ssystem_url } from "@/utils/httpRequest";
-
-/**
- * 用户登录
- */
-export const login_login = (data) => ssystem_url("login/login", data);
-/**
- * 用户退出/断开连接
- */
-export const login_out = (data) => ssystem_url("login/out", data);
-/**
- *1.2.6分组--用户列表（分享用）
- */
-export const group_list_gu = (data) => ssystem_url("group/list_gu", data);
-/**
- * 1.3.1角色--选择列表（分享用）
- */
-export const role_list_sel = (data) => ssystem_url("role/list_sel", data);
-/**
- * 4.1.2参数--保存
- */
-export const dict_add_dict = (data) => ssystem_url("dict/add_dict", data);
-/**
- * 4.1.3参数--详情
- */
-export const dict_detail = (data) => ssystem_url("dict/detail", data);
-/**
- * 4.1.3.2参数--属性
- */
-export const dict_property = (data) => ssystem_url("dict/property", data);
-/**
- * 4.1.3.3参数--更新
- */
-export const dict_edit = (data) => ssystem_url("dict/edit", data);
-/**
- * 4.1.2.2参数--保存参数详情
- */
-export const dict_add_detail = (data) => ssystem_url("dict/add_detail", data);
-/**
- * 4.1.1参数--列表
- */
-export const dict_list_sel = (data) => ssystem_url("dict/list_sel", data);
-/**
- * 4.1.4参数--数据列表
- */
-export const dict_list_data = (data) => ssystem_url("dict/list_data", data);
-/**
- * 4.1.6参数--分页列表
- */
-export const dict_list = (data) => ssystem_url("dict/list", data);
-/**
- * 4.1.7参数--删除
- */
-export const dict_delete = (data) => ssystem_url("dict/delete", data);
-/**
- * 4.1.8参数--移动
- */
-export const dict_move = (data) => ssystem_url("dict/move", data);
-/**
- * 4.2.3地区--根据名称获取编码
- */
-export const areazone_get_code = (data) =>
-  ssystem_url("areazone/get_code", data);
-/**
- * 1.1.1用户--列表
- */
-export const user_list = (data) => ssystem_url("user/list", data);
-/**
- * 1.1.2用户--添加
- */
-export const user_add = (data) => ssystem_url("user/add", data);
-/**
- * 1.1.3用户--更新
- */
-export const user_edit = (data) => ssystem_url("user/edit", data);
-/**
- * 1.1.3.2用户--改头像
- */
-export const user_edit_userpic = (data) =>
-  ssystem_url("user/edit_userpic", data);
-/**
- * 1.1.4用户--删除
- */
-export const user_delete = (data) => ssystem_url("user/delete", data);
-/**
- * 1.1.5用户--移除分组
- */
-export const user_remove_group = (data) =>
-  ssystem_url("user/remove_group", data);
-/**
- * 1.1.5.2用户--分组列表
- */
-export const user_list_group = (data) => ssystem_url("user/list_group", data);
-/**
- * 1.1.6.2用户--角色列表
- */
-export const user_list_role = (data) => ssystem_url("user/list_role", data);
-/**
- * 1.1.7用户--修改手机号
- */
-export const user_edit_phone = (data) => ssystem_url("user/edit_phone", data);
-/**
- * 1.1.8用户--修改密码
- */
-export const user_edit_pwd = (data) => ssystem_url("user/edit_pwd", data);
-/**
- * 1.1.9用户--获取验证码
- */
-export const user_get_code = (data) => ssystem_url("user/get_code", data);
-/**
- * 1.1.10用户--功能菜单
- */
-export const power_list_user = (data) => ssystem_url("power/list_user", data);
-/**
- * 1.2.1分组--列表
- */
-export const group_list = (data) => ssystem_url("group/list", data);
-/**
- * 1.2.2分组--添加
- */
-export const group_add = (data) => ssystem_url("group/add", data);
-/**
- * 1.2.3分组--更新
- */
-export const group_edit = (data) => ssystem_url("group/edit", data);
-/**
- * 1.2.4分组--删除
- */
-export const group_delete = (data) => ssystem_url("group/delete", data);
-/**
- * 1.3.1角色--列表
- */
-export const role_list = (data) => ssystem_url("role/list", data);
-/**
- * 1.3.2角色--添加
- */
-export const role_add = (data) => ssystem_url("role/add", data);
-/**
- * 1.3.2.2角色--添加角色分组用户
- */
-export const role_add_group_user = (data) =>
-  ssystem_url("role/add_group_user", data);
-/**
- * 1.3.2.3角色--获取角色分组用户
- */
-export const role_list_gu = (data) => ssystem_url("role/list_gu", data);
-/**
- * 1.3.2.4角色--角色分组用户选择列表
- */
-export const role_list_gu_sel = (data) => ssystem_url("role/list_gu_sel", data);
-/**
- * 1.3.2.5角色--权限选择列表
- */
-export const power_list_sel = (data) => ssystem_url("power/list_sel", data);
-/**
- * 1.3.2.6角色--角色权限列表
- */
-export const role_list_power = (data) => ssystem_url("role/list_power", data);
-/**
- * 1.3.2.7角色--保存角色权限
- */
-export const role_add_power = (data) => ssystem_url("role/add_power", data);
-/**
- * 1.3.2.9 角色--角色资源保存
- */
-export const roletree_add = (data) => ssystem_url("roletree/add", data);
-/**
- * 1.3.2.10 角色--角色资源
- */
-export const roletree_list_role = (data) =>
-  ssystem_url("roletree/list_role", data);
-/**
- * 1.3.3角色--更新
- */
-export const role_edit = (data) => ssystem_url("role/edit", data);
-/**
- * 1.3.4角色--删除
- */
-export const role_delete = (data) => ssystem_url("role/delete", data);
-/**
- * 1.3.5角色--添加分组
- */
-export const role_add_group = (data) => ssystem_url("role/add_group", data);
-/**
- * 1.3.6角色--添加用户
- */
-export const role_add_user = (data) => ssystem_url("role/add_user", data);
-/**
- * 1.4.0会话--列表
- */
-export const user_session_list = (data) =>
-  ssystem_url("user_session/list", data);
-/**
- * 1.4.1会话--单独断开
- */
-export const user_login_out = (data) => ssystem_url("login/out", data);
-/**
- * 1.4.2会话--批量断开
- */
-export const user_session_batch_out = (data) =>
-  ssystem_url("user_session/batch_out", data);
-/**
- * 1.4.3用户--校验用户登录状态
- */
-export const user_check_login = (data) => ssystem_url("user/check_login", data);
-/**
- * 1.4.4消息推送--列表
- */
-export const notice_list = (data) => ssystem_url("notice/list", data);
-/**
- * 1.4.5消息推送--发送
- */
-export const notice_send = (data) => ssystem_url("notice/send", data);
-/**
- * 1.4.6消息推送--删除
- */
-export const notice_delete = (data) => ssystem_url("notice/delete", data);
-/**
- * 1.4.7消息推送--置顶
- */
-export const notice_toped = (data) => ssystem_url("notice/toped", data);
-/**
- * 1.4.8消息推送--取消置顶
- */
-export const notice_untoped = (data) => ssystem_url("notice/untoped", data);
-/**
- * 1.4.9消息推送--批量删除
- */
-export const notice_deletebatch = (data) =>
-  ssystem_url("notice/deletebatch", data);
-/**
- * 1.4.9消息推送--新增
- */
-export const notice_add = (data) => ssystem_url("notice/add", data);
-/**
- * 1.4.10消息推送--编辑
- */
-export const notice_edit = (data) => ssystem_url("notice/edit", data);
-/**
- * 1.4.11消息推送--详情
- */
-export const notice_detail = (data) => ssystem_url("notice/detail", data);
-/**
- * 1.4.12消息推送--用户列表
- */
-export const notice_list_user = (data) => ssystem_url("notice/list_user", data);
-/**
- * 1.4.13消息推送--用户详情
- */
-export const notice_detail_user = (data) =>
-  ssystem_url("notice/detail_user", data);
-/**
- * 9.1.1 脱敏规则--列表
- */
-export const tm_list = (data) => ssystem_url("tm/list", data);
-/**
- * 9.1.2 脱敏规则--添加
- */
-export const tm_add = (data) => ssystem_url("tm/add", data);
-/**
- * 9.1.3 脱敏规则--修改
- */
-export const tm_edit = (data) => ssystem_url("tm/edit", data);
-/**
- * 9.1.4 脱敏规则--删除
- */
-export const tm_delete = (data) => ssystem_url("tm/delete", data);
-/**
- * 9.1.5 脱敏规则--详情
- */
-export const tm_detail = (data) => ssystem_url("tm/detail", data);
-/**
- * 9.1.6 脱敏规则--移动
- */
-export const tm_move = (data) => ssystem_url("tm/move", data);
-/**
- * 9.1.7 脱敏规则--属性
- */
-export const tm_attr = (data) => ssystem_url("tm/attr", data);

src/assets/img/login/close.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1651715334338" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6028" width="600" height="600" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M512.022187 546.417778c-184.177778 0-368.071111-55.921778-499.114667-167.537778a37.575111 37.575111 0 0 1-3.498667-53.162667 37.944889 37.944889 0 0 1 53.418667-3.470222c231.082667 198.826667 668.302222 198.826667 898.389333 0a37.944889 37.944889 0 0 1 53.418667 3.470222c13.767111 15.644444 12.231111 39.452444-3.498667 53.191111C880.093298 490.496 696.199964 546.417778 512.022187 546.417778z m-136.760889 164.522666a30.833778 30.833778 0 0 1-6.741334 0c-10.325333-1.422222-19.626667-7.111111-25.543111-15.644444-5.944889-8.561778-7.964444-19.228444-5.632-29.354667l24.945778-146.631111a37.973333 37.973333 0 0 1 43.918222-30.805333 37.831111 37.831111 0 0 1 30.947556 43.747555l-24.945778 146.602667a37.376 37.376 0 0 1-36.949333 32.085333z m561.009778-74.581333c-9.955556 0-19.512889-4.039111-26.453334-11.178667l-123.022222-124.245333a37.176889 37.176889 0 0 1 16.042667-64.455111 37.546667 37.546667 0 0 1 37.091555 12.259556l123.050667 124.245333c14.592 14.563556 14.592 38.144 0 52.707555-7.224889 6.826667-16.782222 10.638222-26.737778 10.666667z m-848.497778 0a38.997333 38.997333 0 0 1-24.945778-10.666667 37.176889 37.176889 0 0 1 0-52.707555l123.022222-124.245333a37.518222 37.518222 0 0 1 67.470222 14.136888 37.205333 37.205333 0 0 1-15.815111 38.058667l-123.022222 124.245333a37.006222 37.006222 0 0 1-26.709333 11.178667z m562.744889 74.581333a37.376 37.376 0 0 1-36.693334-30.833777l-24.945777-146.631111a37.176889 37.176889 0 0 1 9.756444-38.826667 37.546667 37.546667 0 0 1 39.424-7.68c13.539556 5.319111 22.755556 17.92 23.694222 32.341333l24.945778 146.631111c1.820444 9.728-0.341333 19.768889-6.030222 27.904-5.688889 8.135111-14.364444 13.653333-24.177778 15.36a30.805333 30.805333 0 0 1-5.973333 1.706667z" p-id="6029" fill="#999999"></path></svg>

src/assets/img/login/open.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1651715361431" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6231" xmlns:xlink="http://www.w3.org/1999/xlink" width="600" height="600"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M1018.737778 480.711111s-4.266667-12.8-8.533334-17.066667l-21.333333-42.666666c-21.333333-34.133333-51.2-76.8-93.866667-123.733334C813.937778 207.644444 685.937778 113.777778 511.004444 113.777778s-302.933333 93.866667-384 183.466666c-42.666667 46.933333-72.533333 89.6-93.866666 123.733334-8.533333 17.066667-17.066667 29.866667-21.333334 42.666666-4.266667 4.266667-8.533333 17.066667-8.533333 17.066667-4.266667 12.8-4.266667 25.6 0 34.133333 0 0 4.266667 12.8 8.533333 17.066667l21.333334 42.666667c21.333333 34.133333 51.2 76.8 93.866666 123.733333 81.066667 89.6 209.066667 183.466667 384 183.466667s302.933333-93.866667 384-183.466667c42.666667-46.933333 72.533333-89.6 93.866667-123.733333 8.533333-17.066667 17.066667-29.866667 21.333333-42.666667 4.266667-4.266667 8.533333-17.066667 8.533334-17.066667 4.266667-12.8 4.266667-21.333333 0-34.133333z m-102.4 46.933333c-17.066667 29.866667-46.933333 72.533333-81.066667 110.933334-76.8 81.066667-183.466667 157.866667-324.266667 157.866666s-247.466667-76.8-324.266666-157.866666c-38.4-38.4-64-81.066667-81.066667-110.933334-8.533333-12.8-12.8-21.333333-17.066667-29.866666 4.266667-8.533333 8.533333-17.066667 17.066667-29.866667 21.333333-29.866667 46.933333-72.533333 81.066667-110.933333C263.537778 275.911111 370.204444 199.111111 511.004444 199.111111s247.466667 76.8 324.266667 157.866667c38.4 38.4 64 81.066667 81.066667 110.933333 8.533333 12.8 12.8 21.333333 17.066666 29.866667-4.266667 8.533333-12.8 17.066667-17.066666 29.866666z" p-id="6232" fill="#999999"></path><path d="M511.004444 344.177778c-76.8 0-145.066667 68.266667-145.066666 153.6 0 85.333333 68.266667 153.6 145.066666 153.6 76.8 0 145.066667-68.266667 145.066667-153.6 0-85.333333-68.266667-153.6-145.066667-153.6z m-230.4 153.6c0-128 102.4-238.933333 230.4-238.933334s230.4 110.933333 230.4 238.933334-102.4 238.933333-230.4 238.933333-230.4-110.933333-230.4-238.933333z" p-id="6233" fill="#999999"></path></svg>

src/store/index.js

@@ -1,9 +1,40 @@
 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: {},
-  mutations: {},
-  actions: {}
+  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("请重新登录！");
+      });
+    }
+  }
 });

src/utils/httpRequest.js

@@ -101,64 +101,38 @@ http.interceptors.response.use(
   }
 );
 /**
- * @param {*} prefix 微服务前缀
  * @param {*} url 不带前缀的url
  * @param {*} data 传参
  * @returns Promise
  */
-const setRequest = ({ prefix, url, data }) =>
+const setRequest = ({ url, data }) =>
   http({
-    url: `${window._config.baseUrl}${
-      window._config.useMicroservice ? prefix : ""
-    }${url}`,
+    url: `${window._config.baseUrl}${url}`,
     method: "post",
     data: data || {}
   });
 /**
- * 微服务前缀 sdatasource/
  * @param {*} url 不带前缀的url
  * @param {*} data 传参
  * @returns Promise
  */
-export const sdatasource_url = (url, data) =>
+//管理员
+export const admin_url = (url, data) =>
   setRequest({
-    prefix: "sdatasource/",
     url,
     data
   });
-/**
- * 微服务前缀 ssystem/
- * @param {*} url 不带前缀的url
- * @param {*} data 传参
- * @returns Promise
- */
-export const ssystem_url = (url, data) =>
-  setRequest({
-    prefix: "ssystem/",
-    url,
-    data
-  });
-/**
- * 微服务前缀 sdataintegration/
- * @param {*} url 不带前缀的url
- * @param {*} data 传参
- * @returns Promise
- */
-export const sdataintegration_url = (url, data) =>
+
+//区域
+export const region_url = (url, data) =>
   setRequest({
-    prefix: "sdataintegration/",
     url,
     data
   });
-/**
- * 微服务前缀 sanalysis/
- * @param {*} url 不带前缀的url
- * @param {*} data 传参
- * @returns Promise
- */
-export const sanalysis_url = (url, data) =>
+
+//应用
+export const appgroup_url = (url, data) =>
   setRequest({
-    prefix: "sanalysis/",
     url,
     data
   });

src/utils/store.js

@@ -0,0 +1,99 @@
+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

@@ -0,0 +1,304 @@
+/**
+ * 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

@@ -1,14 +1,500 @@
 <template>
-  <div></div>
+  <div class="wrap">
+    <div class="logo">
+      <img class="logo_img" src="../../assets/img/login/logo.png" />
+      <span class="logo_title">星火云鸽管控平台</span>
+    </div>
+    <div class="loginInner">
+      <div class="welcome">欢迎登录</div>
+      <!--      <div class="login_type">-->
+      <!--        <div @click="usertype = 1" :class="[usertype == 1 ? 'active' : '']">-->
+      <!--          账号登录-->
+      <!--        </div>-->
+      <!--        <div @click="usertype = 2" :class="[usertype == 2 ? 'active' : '']">-->
+      <!--          验证码登录-->
+      <!--        </div>-->
+      <!--      </div>-->
+      <Form ref="loginForm" :model="loginForm" :rules="formRules">
+        <FormItem prop="loginname">
+          <img class="img" src="../../assets/img/login/user.png" alt="" />
+          <Input
+            v-model="loginForm.loginname"
+            clearable
+            @keyup.enter.native="login_by_username('loginForm')"
+            placeholder="请输入账号"
+          />
+        </FormItem>
+        <FormItem prop="loginpwd">
+          <img class="img" src="../../assets/img/login/pw.png" alt="" />
+          <Input
+            type="password"
+            class="show_input"
+            oncopy="return false"
+            onpaste="return false"
+            oncut="return false"
+            v-model="loginForm.loginpwd"
+            @keyup.enter.native="login_by_username('loginForm')"
+            placeholder="请输入密码"
+          />
+          <div class="pwd">
+            <img
+              v-if="show_pw"
+              @click="togglePw"
+              src="../../assets/img/login/open.svg"
+              alt=""
+            />
+            <img
+              v-else
+              @click="togglePw"
+              src="../../assets/img/login/close.svg"
+              alt=""
+            />
+          </div>
+        </FormItem>
+        <FormItem prop="msgcode" class="changecode">
+          <img class="img" src="../../assets/img/login/code.png" alt="" />
+          <Input
+            v-model="loginForm.msgcode"
+            class="input"
+            @keyup.enter.native="login_by_username('loginForm')"
+            v-noFill
+            readonly
+            placeholder="请输入验证码"
+          />
+          <img
+            v-if="code_info.base64Str"
+            class="code_img"
+            :src="code_info.base64Str"
+            @click="getCodeImg()"
+            title="点击刷新验证码"
+          />
+          <span class="emit_code" v-else @click="getCodeImg()">获取验证码</span>
+        </FormItem>
+        <FormItem class="btn_bottom">
+          <Checkbox v-model="pwd">记住密码</Checkbox>
+        </FormItem>
+      </Form>
+      <Button
+        :loading="wait_flag"
+        type="primary"
+        @click.enter="login_by_username('loginForm')"
+        >登&nbsp;录</Button
+      >
+    </div>
+  </div>
 </template>
 
 <script>
+import { img_code } from "@/api/admin";
+
+const Base64 = require("js-base64").Base64;
 export default {
   data() {
-    return {};
+    // 手机号验证
+    const phoneCheck = async (rule, value, callback) => {
+      var filter = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+      this.isemit = false;
+      if (!value) {
+        return callback(new Error("手机号码不能为空"));
+      }
+      let blnTest = filter.test(value);
+      if (!blnTest) {
+        return callback(new Error("手机号码格式不正确"));
+      } else {
+        this.isemit = true;
+      }
+    };
+    return {
+      code_info: {
+        base64Str: "",
+        code: ""
+      },
+      usertype: 1,
+      time1: null,
+      isemit: false,
+      userInfo: {},
+      wait_flag: false,
+      loginForm: {
+        loginname: "",
+        loginpwd: "",
+        msgcode: "",
+        phone: ""
+      },
+      formRules: {
+        loginname: [
+          { required: true, message: "账号不能为空", trigger: "blur" },
+          {
+            min: 4,
+            max: 18,
+            message: "账号长度为4~18个字符"
+          }
+        ],
+        loginpwd: [
+          { required: true, message: "密码不能为空", trigger: "blur" },
+          {
+            min: 6,
+            max: 16,
+            message: "密码长度为6~16个字符"
+          }
+        ],
+        phone: [{ required: true, validator: phoneCheck, trigger: "blur" }],
+        msgcode: [
+          { required: true, message: "短信验证码不能为空", trigger: "blur" }
+        ]
+      },
+      pwd: false,
+      show_pw: false,
+      time: 0
+    };
+  },
+  directives: {
+    // 防止input输入框自动填充
+    noFill: {
+      inserted: (el) => {
+        let inputEl = el.getElementsByTagName("input")[0];
+        if (inputEl) {
+          inputEl.addEventListener("focus", () => {
+            inputEl.removeAttribute("readonly");
+          });
+          inputEl.addEventListener("blur", () => {
+            inputEl.setAttribute("readonly", "readonly");
+          });
+        }
+      }
+    }
+  },
+  created() {
+    // this.$removeEncodeStorage("userInfo");
+    // 在页面加载时从cookie获取登录信息
+    let loginname = this.getCookie("loginname");
+    let loginpwd = Base64.decode(this.getCookie("loginpwd"));
+    // 如果存在赋值给表单，并且将记住密码勾选
+    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);
+        }
+      }
+    }
+  },
+  mounted() {
+    window.addEventListener("copy", this.inputHandle);
+    window.addEventListener("paste", this.inputHandle);
+    window.addEventListener("cut", this.inputHandle);
+  },
+  beforeDestroy() {
+    window.removeEventListener("copy", this.inputHandle);
+    window.removeEventListener("paste", this.inputHandle);
+    window.removeEventListener("cut", this.inputHandle);
+    clearInterval(this.time1);
   },
-  methods: {}
+  methods: {
+    //获取验证码
+    getCodeImg() {
+      if (!this.loginForm.loginname) {
+        this.$Message.error("请输入账号");
+        return;
+      }
+      img_code({
+        loginname: this.loginForm.loginname
+      }).then((data) => {
+        if (data.code === 0) {
+          this.code_info = data.obj;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    inputHandle() {
+      let edit = document.querySelector(".show_input");
+      edit.oncopy = function () {
+        return false;
+      };
+      edit.onpaste = function () {
+        return false;
+      };
+      edit.oncut = function () {
+        return false;
+      };
+    },
+    //切换眼睛
+    togglePw() {
+      this.show_pw = !this.show_pw;
+      let input = document.querySelector(".show_input input");
+      if (this.show_pw) {
+        input.setAttribute("type", "text");
+      } else {
+        input.setAttribute("type", "password");
+      }
+    },
+    //登录
+    login_by_username(name) {
+      let that = this;
+      console.log(name);
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          if (
+            that.loginForm.msgcode.toLowerCase() !==
+            that.code_info.code.toLowerCase()
+          ) {
+            this.$Message.error("验证码不正确");
+            return;
+          }
+          that.wait_flag = true;
+          let loginForm = that.loginForm;
+          that.$store.dispatch("login_username", loginForm).then((res) => {
+            that.wait_flag = false;
+            if (res.code == 0) {
+              that.$Message.success(res.msg);
+              //1平台管理员2区域管理员3学校管理员
+              console.log(res.obj);
+              let atype = res.obj.atype;
+              atype = 2;
+              if (atype === 1) {
+              } else if (atype === 2) {
+                this.$router.replace({ name: "region" });
+              } else if (atype === 3) {
+              }
+              that.set_userInfo();
+            } else {
+              that.$Message.error(res.msg);
+              that.wait_flag = false;
+            }
+          });
+        }
+      });
+    },
+    // 记住密码功能
+    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));
+        }
+      }
+      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());
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.wrap {
+  height: 100%;
+  background: url("../../assets/img/login/bj.png") no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  .logo {
+    position: absolute;
+    top: 70px;
+    left: 60px;
+    width: 300px;
+    height: 50px;
+    display: flex;
+    align-items: center;
+    .logo_img {
+      width: 45px;
+      height: 45px;
+      margin-right: 10px;
+    }
+    .logo_title {
+      color: #414354;
+      font-size: 20px;
+      font-weight: 700;
+      font-family: "HarmonyOSSansSC";
+    }
+  }
+  .loginInner {
+    width: 400px;
+    height: 440px;
+    padding: 40px;
+    border-radius: 20px;
+    opacity: 0.88;
+    background: #ffffff;
+    box-shadow: 0 0 18px 0 #deeaffe0;
+    position: absolute;
+    right: 160px;
+    bottom: 160px;
+    .welcome {
+      height: 30px;
+      color: #000000;
+      font-size: 24px;
+      font-family: "AlibabaPuHuiTi";
+      text-align: center;
+    }
+    .login_type {
+      height: 40px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-bottom: 10px;
+      div {
+        color: #7c8db5;
+        font-size: 16px;
+        font-family: "SourceHanSansCN";
+        cursor: pointer;
+        &:first-of-type {
+          margin-right: 20px;
+        }
+      }
+      .active {
+        color: #253a70;
+        position: relative;
+        &::after {
+          display: block;
+          content: "";
+          height: 2px;
+          width: 30px;
+          background-color: #339dff;
+          position: absolute;
+          top: 24px;
+          left: 30%;
+        }
+      }
+    }
+    /deep/ .ivu-form {
+      .ivu-form-item {
+        .ivu-form-item-content {
+          position: relative;
+          .img {
+            position: absolute;
+            z-index: 33;
+            width: 16px;
+            height: 16px;
+            top: 12px;
+            left: 15px;
+          }
+          .ivu-input-wrapper {
+            width: 100%;
+            // height: 47px;
+            input {
+              &:-moz-placeholder {
+                color: #999 !important;
+              }
+            }
+            .ivu-input {
+              height: 40px;
+              padding-left: 40px;
+            }
+            .ivu-input-icon {
+              line-height: 50px;
+            }
+            .ivu-input-icon-clear {
+              line-height: 50px;
+            }
+            // padding-left: 20px;
+          }
+          .ivu-checkbox-wrapper {
+            span {
+              font-size: 15px;
+              font-family: "Microsoft YaHei";
+              font-weight: 400;
+              color: rgba(136, 136, 136, 1);
+              line-height: 17px;
+            }
+          }
+          .pwd {
+            position: absolute;
+            z-index: 33;
+            width: 16px;
+            height: 16px;
+            top: 12px;
+            right: 15px;
+          }
+          .pwd img {
+            width: 16px;
+            height: 16px;
+            vertical-align: top;
+            cursor: pointer;
+          }
+        }
+      }
+      .btn_bottom {
+        height: 32px;
+        .ivu-form-item-content {
+          display: flex;
+          justify-content: space-between;
+          a {
+            //color: @theme_color;
+          }
+        }
+      }
+    }
+    /deep/ .ivu-btn {
+      width: 100%;
+      height: 40px;
+      span {
+        font-size: 18px;
+        font-family: "Microsoft YaHei";
+        font-weight: 400;
+        color: rgba(255, 255, 255, 1);
+      }
+    }
+    .changecode {
+      display: flex;
+      /deep/ .ivu-form-item-content {
+        width: 100%;
+        .input {
+          width: calc(100% - 120px) !important;
+          margin-right: 10px;
+        }
+        .emit_code {
+          display: inline-block;
+          width: 110px;
+          line-height: 40px;
+          height: 40px;
+          text-align: center;
+          border: 1px solid #339dff;
+          border-radius: 6px;
+          cursor: pointer;
+          color: #339dff;
+          vertical-align: bottom;
+        }
+        .code_img {
+          width: 110px;
+          height: 40px;
+          cursor: pointer;
+          vertical-align: bottom;
+        }
+      }
+    }
+  }
+}
+</style>