elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into yantai_master

feature
dai 3 years ago
parent
6ac964d805 762efafd8d
commit
8de21f47df
6 changed files with 212 additions and 313 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/assets/scss/pages/loginWork.scss
  2. 173
      src/utils/index.js
  3. 149
      src/views/main-navbar-update-password-work.vue
  4. 148
      src/views/main-shuju/main-navbar-update-password-work.vue
  5. 2
      src/views/main-shuju/main-navbar.vue
  6. 52
      src/views/pages/login.vue

1
src/assets/scss/pages/loginWork.scss
View File

@ -64,6 +64,7 @@
.input {
width: 85%;
margin-bottom: 0;
input {
display: block;

173
src/utils/index.js
View File

@ -1,17 +1,18 @@
import store from '@/js/store'
import store from "@/js/store";
import JSEncrypt from "jsencrypt"; //引入加密
/**
* 获取字典数据列表
* @param dictType 字典类型
*/
export function getDictDataList(dictType) {
const type = window.SITE_CONFIG['dictList'].find(
const type = window.SITE_CONFIG["dictList"].find(
(element) => element.dictType === dictType
)
);
if (type) {
return type.dataList
return type.dataList;
} else {
return []
return [];
}
}
@ -21,20 +22,20 @@ export function getDictDataList(dictType) {
* @param dictValue 字典值
*/
export function getDictLabel(dictType, dictValue) {
const type = window.SITE_CONFIG['dictList'].find(
const type = window.SITE_CONFIG["dictList"].find(
(element) => element.dictType === dictType
)
);
if (type) {
const val = type.dataList.find(
(element) => element.dictValue === dictValue.toString()
)
);
if (val) {
return val.dictLabel
return val.dictLabel;
} else {
return dictValue
return dictValue;
}
} else {
return dictValue
return dictValue;
}
}
@ -42,29 +43,31 @@ export function getDictLabel(dictType, dictValue) {
* 清除登录信息
*/
export function clearLoginInfo() {
store.commit('resetStore')
localStorage.removeItem('token')
window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false
store.commit("resetStore");
localStorage.removeItem("token");
window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false;
}
/**
* 获取uuid
*/
export function getUUID() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
return (c === 'x' ? (Math.random() * 16) | 0 : 'r&0x3' | '0x8').toString(16)
})
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
return (c === "x" ? (Math.random() * 16) | 0 : "r&0x3" | "0x8").toString(
16
);
});
}
/**
* 获取svg图标(id)列表
*/
export function getIconList() {
var res = []
document.querySelectorAll('svg symbol').forEach((item) => {
res.push(item.id)
})
return res
var res = [];
document.querySelectorAll("svg symbol").forEach((item) => {
res.push(item.id);
});
return res;
}
/**
@ -73,46 +76,49 @@ export function getIconList() {
* @param {*} id
* @param {*} pid
*/
export function treeDataTranslate(data, id = 'id', pid = 'pid') {
var res = []
var temp = {}
export function treeDataTranslate(data, id = "id", pid = "pid") {
var res = [];
var temp = {};
for (var i = 0; i < data.length; i++) {
temp[data[i][id]] = data[i]
temp[data[i][id]] = data[i];
}
for (var k = 0; k < data.length; k++) {
if (!temp[data[k][pid]] || data[k][id] === data[k][pid]) {
res.push(data[k])
continue
res.push(data[k]);
continue;
}
if (!temp[data[k][pid]]['children']) {
temp[data[k][pid]]['children'] = []
if (!temp[data[k][pid]]["children"]) {
temp[data[k][pid]]["children"] = [];
}
temp[data[k][pid]]['children'].push(data[k])
data[k]['_level'] = (temp[data[k][pid]]._level || 0) + 1
temp[data[k][pid]]["children"].push(data[k]);
data[k]["_level"] = (temp[data[k][pid]]._level || 0) + 1;
}
return res
return res;
}
// 时间格式化
export function dateFormats(fmt, date) {
let ret
const _date = new Date(date)
let ret;
const _date = new Date(date);
const opt = {
'Y+': _date.getFullYear().toString(), // 年
'm+': (_date.getMonth() + 1).toString(), // 月
'd+': _date.getDate().toString(), // 日
'H+': _date.getHours().toString(), // 时
'M+': _date.getMinutes().toString(), // 分
'S+': _date.getSeconds().toString() // 秒
"Y+": _date.getFullYear().toString(), // 年
"m+": (_date.getMonth() + 1).toString(), // 月
"d+": _date.getDate().toString(), // 日
"H+": _date.getHours().toString(), // 时
"M+": _date.getMinutes().toString(), // 分
"S+": _date.getSeconds().toString(), // 秒
// 有其他格式化字符需求可以继续添加，必须转化成字符串
}
};
for (const k in opt) {
ret = new RegExp('(' + k + ')').exec(fmt)
ret = new RegExp("(" + k + ")").exec(fmt);
if (ret) {
fmt = fmt.replace(ret[1], (ret[1].length === 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, '0')))
fmt = fmt.replace(
ret[1],
ret[1].length === 1 ? opt[k] : opt[k].padStart(ret[1].length, "0")
);
}
}
return fmt
return fmt;
}
// 根据身份证计算出生日期，性别，年龄
export function computedCard(idCard) {
@ -123,49 +129,78 @@ export function computedCard(idCard) {
let day = myDate.getDate();
let age = 0;
if(idCard.length===18){
if (idCard.length === 18) {
age = myDate.getFullYear() - idCard.substring(6, 10) - 1;
sex = idCard.substring(16,17);
birth = idCard.substring(6,10)+"-"+idCard.substring(10,12)+"-"+idCard.substring(12,14);
if (idCard.substring(10, 12) < month || idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day) age++;
sex = idCard.substring(16, 17);
birth =
idCard.substring(6, 10) +
"-" +
idCard.substring(10, 12) +
"-" +
idCard.substring(12, 14);
if (
idCard.substring(10, 12) < month ||
(idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day)
)
age++;
}
if(idCard.length===15){
if (idCard.length === 15) {
age = myDate.getFullYear() - idCard.substring(6, 8) - 1901;
sex = idCard.substring(13,14);
birth = "19"+idCard.substring(6,8)+"-"+idCard.substring(8,10)+"-"+idCard.substring(10,12);
if (idCard.substring(8, 10) < month || idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day) age++;
sex = idCard.substring(13, 14);
birth =
"19" +
idCard.substring(6, 8) +
"-" +
idCard.substring(8, 10) +
"-" +
idCard.substring(10, 12);
if (
idCard.substring(8, 10) < month ||
(idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day)
)
age++;
}
if(sex%2 === 0)
sex = '0'; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
else
sex = '1';
return {age , sex, birth}
if (sex % 2 === 0)
sex = "0"; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
else sex = "1";
return { age, sex, birth };
}
// 将数组分成小块数组的集合
export function spliceIntoChunks(arr, chunkSize) {
const res = [];
while (arr.length > 0) {
const chunk = arr.splice(0, chunkSize);
res.push(chunk);
const chunk = arr.splice(0, chunkSize);
res.push(chunk);
}
return res;
}
// 获取当前时间 如果有指定time则按指定的来
export function getCurrentDate(hour,min,sec) {
console.log(hour,min,sec)
export function getCurrentDate(hour, min, sec) {
console.log(hour, min, sec);
let date = new Date();
if (hour){
if (hour) {
date.setHours(hour);
console.log(hour)
}if (min!==undefined){
console.log(hour);
}
if (min !== undefined) {
date.setMinutes(min);
console.log(min)
}if (sec!==undefined){
console.log(min);
}
if (sec !== undefined) {
date.setSeconds(sec);
console.log(sec)
console.log(sec);
}
return date;
}
// 加密
export function encryptedData(key, data) {
// 新建JSEncrypt对象
let encryptor = new JSEncrypt();
// 设置公钥
encryptor.setPublicKey(key);
// 加密数据
return encryptor.encrypt(data);
}

149
src/views/main-navbar-update-password-work.vue
View File

@ -16,13 +16,13 @@
<el-form-item :label="$t('updatePassword.username')">
<span>{{ $store.state.user.realName }}</span>
</el-form-item>
<!-- <el-form-item prop="password" :label="$t('updatePassword.password')">
<el-form-item prop="password" :label="$t('updatePassword.password')">
<el-input
v-model="dataForm.password"
type="password"
:placeholder="$t('updatePassword.password')"
></el-input>
</el-form-item> -->
</el-form-item>
<el-form-item
prop="newPassword"
:label="$t('updatePassword.newPassword')"
@ -30,7 +30,7 @@
<el-input
v-model="dataForm.newPassword"
type="password"
:placeholder="$t('updatePassword.newPassword')"
placeholder="密码必须8-20个字符，而且同时包含大小写字母和数字"
></el-input>
</el-form-item>
<el-form-item
@ -45,104 +45,143 @@
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button @click="visible = false">{{ $t("cancel") }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{
$t('confirm')
$t("confirm")
}}</el-button>
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
import { clearLoginInfo } from '@/utils'
import debounce from "lodash/debounce";
import { clearLoginInfo, encryptedData } from "@/utils";
export default {
data() {
return {
visible: false,
pubKey: "",
dataForm: {
password: '',
newPassword: '',
confirmPassword: ''
}
}
password: "",
newPassword: "",
confirmPassword: "",
},
};
},
computed: {
dataRule() {
var validateConfirmPassword = (rule, value, callback) => {
if (this.dataForm.newPassword !== value) {
return callback(
new Error(this.$t('updatePassword.validate.confirmPassword'))
)
new Error(this.$t("updatePassword.validate.confirmPassword"))
);
}
callback()
}
callback();
};
return {
// password: [
// {
// required: true,
// message: this.$t('validate.required'),
// trigger: 'blur'
// }
// ],
password: [
{
required: true,
message: this.$t("validate.required"),
trigger: "blur",
},
],
newPassword: [
{
required: true,
message: this.$t('validate.required'),
trigger: 'blur'
}
message: this.$t("validate.required"),
trigger: "blur",
},
],
confirmPassword: [
{
required: true,
message: this.$t('validate.required'),
trigger: 'blur'
message: this.$t("validate.required"),
trigger: "blur",
},
{ validator: validateConfirmPassword, trigger: 'blur' }
]
}
}
{ validator: validateConfirmPassword, trigger: "blur" },
],
};
},
},
methods: {
init() {
this.visible = true
this.visible = true;
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
this.$refs["dataForm"].resetFields();
});
//获取公钥
this.getPubKey();
},
// 获取公钥
getPubKey() {
this.$http
.post("/auth/govweb/getKey")
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
}
this.pubKey = res.data; // 获取到公钥;
})
.catch(() => {});
},
validateComplexity(pwd) {
let regex = new RegExp("(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z]).{8,20}");
if (!regex.test(pwd)) {
this.$message({
message:
"密码必须8-20个字符，而且同时包含大小写字母和数字",
type: "error",
});
return false;
}
return true;
},
// 表单提交
dataFormSubmitHandle: debounce(
function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$refs["dataForm"].validate((valid) => {
if (!valid) return false;
if (!this.validateComplexity(this.dataForm.newPassword)) return false;
const { pubKey } = this;
this.$http
.post('/gov/mine/mine/resetpassword', {
newPassword: this.dataForm.newPassword,
confirmNewPassword: this.dataForm.confirmPassword
.post("/gov/mine/mine/resetpassword", {
oldPassword: encryptedData(pubKey, this.dataForm.password),
newPassword: encryptedData(pubKey, this.dataForm.newPassword),
confirmNewPassword: encryptedData(
pubKey,
this.dataForm.confirmPassword
),
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
return this.$message.error(res.msg);
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
message: this.$t("prompt.success"),
type: "success",
duration: 500,
onClose: () => {
this.visible = false
clearLoginInfo()
this.$router.replace({ name: 'loginWork' })
}
})
this.visible = false;
clearLoginInfo();
this.$router.replace({ name: "login" });
},
});
})
.catch(() => {})
})
.catch(() => {});
});
},
1000,
{ leading: true, trailing: false }
)
}
}
),
},
};
</script>

148
src/views/main-shuju/main-navbar-update-password-work.vue
View File

@ -1,148 +0,0 @@
<template>
<el-dialog
:visible.sync="visible"
:title="$t('updatePassword.title')"
:close-on-click-modal="false"
:close-on-press-escape="false"
:append-to-body="true"
>
<el-form
:model="dataForm"
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
label-width="120px"
>
<el-form-item :label="$t('updatePassword.username')">
<span>{{ $store.state.user.realName }}</span>
</el-form-item>
<!-- <el-form-item prop="password" :label="$t('updatePassword.password')">
<el-input
v-model="dataForm.password"
type="password"
:placeholder="$t('updatePassword.password')"
></el-input>
</el-form-item> -->
<el-form-item
prop="newPassword"
:label="$t('updatePassword.newPassword')"
>
<el-input
v-model="dataForm.newPassword"
type="password"
:placeholder="$t('updatePassword.newPassword')"
></el-input>
</el-form-item>
<el-form-item
prop="confirmPassword"
:label="$t('updatePassword.confirmPassword')"
>
<el-input
v-model="dataForm.confirmPassword"
type="password"
:placeholder="$t('updatePassword.confirmPassword')"
></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{
$t('confirm')
}}</el-button>
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
import { clearLoginInfo } from '@/utils'
export default {
data() {
return {
visible: false,
dataForm: {
password: '',
newPassword: '',
confirmPassword: ''
}
}
},
computed: {
dataRule() {
var validateConfirmPassword = (rule, value, callback) => {
if (this.dataForm.newPassword !== value) {
return callback(
new Error(this.$t('updatePassword.validate.confirmPassword'))
)
}
callback()
}
return {
// password: [
// {
// required: true,
// message: this.$t('validate.required'),
// trigger: 'blur'
// }
// ],
newPassword: [
{
required: true,
message: this.$t('validate.required'),
trigger: 'blur'
}
],
confirmPassword: [
{
required: true,
message: this.$t('validate.required'),
trigger: 'blur'
},
{ validator: validateConfirmPassword, trigger: 'blur' }
]
}
}
},
methods: {
init() {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
})
},
// 表单提交
dataFormSubmitHandle: debounce(
function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http
.post('/gov/mine/mine/resetpassword', {
newPassword: this.dataForm.newPassword,
confirmNewPassword: this.dataForm.confirmPassword
})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
clearLoginInfo()
this.$router.replace({ name: 'loginWork' })
}
})
})
.catch(() => {})
})
},
1000,
{ leading: true, trailing: false }
)
}
}
</script>

2
src/views/main-shuju/main-navbar.vue
View File

@ -139,7 +139,7 @@
import { messages } from "@/i18n";
import { mapGetters } from "vuex";
import screenfull from "screenfull";
import UpdatePasswordWork from "./main-navbar-update-password-work";
import UpdatePasswordWork from "@/views/main-navbar-update-password-work";
import { clearLoginInfo } from "@/utils";
export default {
inject: ["refresh"],

52
src/views/pages/login.vue
View File

@ -16,35 +16,35 @@
<div class="ico">
<img src="@/assets/img/login/zhanghao.png" alt="" />
</div>
<div class="input">
<el-form-item prop="phone" class="input">
<input
type="text"
v-model="dataForm.phone"
placeholder="账号"
/>
</div>
</el-form-item>
</div>
<div class="fm-item">
<div class="ico">
<img src="@/assets/img/login/mima.png" alt="" />
</div>
<div class="input">
<el-form-item prop="password" class="input">
<input
type="password"
v-model="dataForm.password"
:placeholder="$t('login.password')"
/>
</div>
</el-form-item>
</div>
<div class="fm-captcha">
<div class="fm-item">
<div class="input">
<el-form-item prop="captcha" class="input">
<input
type="text"
v-model="dataForm.captcha"
placeholder="验证码"
/>
</div>
</el-form-item>
</div>
<div class="captcha">
<img :src="captchaPath" @click="getCaptcha()" />
@ -95,9 +95,8 @@ import Cookies from "js-cookie";
import CDialog from "@c/CDialog";
import debounce from "lodash/debounce";
import { messages } from "@/i18n";
import { getUUID } from "@/utils";
import { getUUID, encryptedData } from "@/utils";
import { Loading } from "element-ui"; // 引入Loading服务
import JSEncrypt from "jsencrypt"; //引入加密
let loading; // 加载动画
export default {
@ -176,35 +175,16 @@ export default {
// 表单提交
dataFormSubmitHandle() {
this.$refs["dataForm"].validate((valid, messageObj) => {
console.log(valid, messageObj);
if (!valid) {
app.util.validateRule(messageObj);
return;
}
this.startLoading();
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/epmetuser/customerstaff/customerlist'
const url = "/epmetuser/customerstaff/customerlist";
const params = {
phone: this.dataForm.phone,
phone: encryptedData(this.pubKey, this.dataForm.phone),
};
// this.$http
// .post(url, params).then(({ data })=> {
// console.log('res--comll', data)
// if (data.data.length === 0) {
// //没有客户，提示无法登录
// this.$message.error('账号不存在')
// this.endLoading()
// } else if (data.data.length === 1) {
// this.selectCustomer(data.data[0])
// } else {
// this.endLoading()
// this.diaVisible = true
// this.$nextTick(() => {
// this.tableData = data.data
// })
// }
// }).catch((err) => {
// this.endLoading()
// this.$message.error(err)
// })
window.app.ajax.post(
url,
params,
@ -262,7 +242,8 @@ export default {
this.dataForm.customerId = row.customerId;
let param = {};
Object.assign(param, this.dataForm);
param.password = this.encryptedData(this.pubKey, this.dataForm.password);
param.phone = encryptedData(this.pubKey, this.dataForm.phone);
param.password = encryptedData(this.pubKey, this.dataForm.password);
this.$http
.post(url, param)
.then(({ data: res }) => {
@ -301,15 +282,6 @@ export default {
loading.close();
}
},
// 加密
encryptedData(key, data) {
// 新建JSEncrypt对象
let encryptor = new JSEncrypt();
// 设置公钥
encryptor.setPublicKey(key);
// 加密数据
return encryptor.encrypt(data);
},
},
};
</script>

Write Preview
Loading…
Cancel
Save