diff --git a/.env.production b/.env.production index 1f7a054c..d690d7ae 100644 --- a/.env.production +++ b/.env.production @@ -8,3 +8,5 @@ ENV = 'production' # VUE_APP_BASE_API = '/prod-api' # 智能机具管理系统/宏源环境 VUE_APP_BASE_API = '/iws/jiju-api' + + diff --git a/src/api/login.js b/src/api/login.js index 7ee8bdd0..fc3a3a28 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,16 +2,16 @@ import request from '@/utils/request' // 登录方法 - 调试使用 - 产线环境需注释 export function login(data) { - return false - // return request({ - // url: '/auth/login', - // headers: { - // isToken: false, - // repeatSubmit: false - // }, - // method: 'post', - // data: data - // }) + // return false + return request({ + url: '/auth/login', + headers: { + isToken: false, + repeatSubmit: false + }, + method: 'post', + data: data + }) } export function isLogin(data) { diff --git a/src/utils/aes.js b/src/utils/aes.js new file mode 100644 index 00000000..fcb5c1b7 --- /dev/null +++ b/src/utils/aes.js @@ -0,0 +1,22 @@ +import * as CryptoJS from 'crypto-js' + +/** + * @param {Object} word解密 + */ +export function bnsCloudDecrypt(word) { + var key = CryptoJS.enc.Utf8.parse('bonus@cloud@2025') + var decrypt = CryptoJS.AES.decrypt(word, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 }) + return CryptoJS.enc.Utf8.stringify(decrypt).toString() +} + +/** + * @param {Object} word加密 + */ +function bnsCloudEncrypt(word) { + var key = CryptoJS.enc.Utf8.parse('bonus@cloud@2025') + var srcs = CryptoJS.enc.Utf8.parse(word) + var encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 }) + return encrypted.toString() +} + + diff --git a/src/utils/auth.js b/src/utils/auth.js index a673d227..ce9be8b4 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,8 +1,8 @@ import Cookies from 'js-cookie' -const TokenKey = 'Admin-Token' +const TokenKey = 'Admin-jVToken' -const ExpiresInKey = 'Admin-Expires-In' +const ExpiresInKey = 'Admin-Expires-In-jV' export function getToken() { return Cookies.get(TokenKey) diff --git a/src/views/login1.vue b/src/views/login1.vue index 2e733786..4748fa17 100644 --- a/src/views/login1.vue +++ b/src/views/login1.vue @@ -168,6 +168,7 @@ import dingding from '@/assets/images/dingding.svg' import wx from '@/assets/images/wx.svg' import qq from '@/assets/images/QQ.svg' import { setToken, setExpiresIn } from '@/utils/auth' +import { bnsCloudDecrypt } from '@/utils/aes' export default { name: 'Login', @@ -330,6 +331,35 @@ export default { } else { this.isIws = false this.getCookie() + + const origin = window.location.href + if (origin.indexOf('params') !== -1) { + //获取浏览器路径 + const url = new URL(origin) + const urlParam = new URLSearchParams(url.search) + console.log(url) + console.log(urlParam) + //解析路径参数 + const params = urlParam.get('params') + console.log(params) + if (params) { + //对参数进行解密 + const jiemi = bnsCloudDecrypt(params) + //解密参数继续解析 + const logingParam = new URLSearchParams(jiemi) + //获取账号密码 + const username = logingParam.get('username') + const password = logingParam.get('password') + if (username && password) { + this.loginForm.username = username + this.loginForm.password = password + //自己系统登录的方法 有验证码的 需要去添加一个无验证码登录的方法 + this.authLogin() + } + } else { + console.log('无自动登录参数') + } + } } }, methods: { @@ -343,13 +373,58 @@ export default { }) }, getCookie() { - const username = Cookies.get('username') - const password = Cookies.get('password') - const rememberMe = Cookies.get('rememberMe') + const username = Cookies.get('jVusername') + const password = Cookies.get('jVpassword') + const rememberMe = Cookies.get('jVrememberMe') this.loginForm.username = username || '' this.loginForm.password = password ? decrypt(password) : '' this.loginForm.rememberMe = rememberMe === 'true' }, + authLogin(){ + this.loading = true + if (this.loginForm.rememberMe) { + Cookies.set('jVusername', this.loginForm.username, { expires: 30 }) + Cookies.set('jVpassword', encrypt(this.loginForm.password), { + expires: 30 + }) + Cookies.set('jVrememberMe', this.loginForm.rememberMe, { + expires: 30 + }) + } else { + Cookies.remove('jVusername') + Cookies.remove('jVpassword') + Cookies.remove('jVrememberMe') + } + this.loginForm.loginMethod = this.loginMethod + this.$store + .dispatch('Login', this.loginForm) + .then(res => { + console.log(res) + if (res.code === 200) { + if (res.isLogin) { + this.$modal + .confirm('账号已在其他地方登录是否继续登录！！！！') + .then(function () { + // return this.$router.push({ path: this.redirect || '/' }) + return this.$router.push({ path: '/' }) + }) + .then(() => { + this.loading = false + }) + .catch(() => { + this.loading = false + }) + } else { + // this.$router.push({ path: this.redirect || '/' }) + this.$router.push({ path: '/' }) + } + } + }) + .catch(() => { + this.loading = false + if (this.captchaEnabled) this.getCode() + }) + }, handleLogin() { this.$refs.loginForm.validate(valid => { if (valid) { diff --git a/src/views/material/cost/component/examHome.vue b/src/views/material/cost/component/examHome.vue index 319c0e40..96aae383 100644 --- a/src/views/material/cost/component/examHome.vue +++ b/src/views/material/cost/component/examHome.vue @@ -69,19 +69,20 @@ 总费用 + 全部 - + @@ -96,7 +97,7 @@ - 协议书 + 协议书 @@ -127,7 +128,7 @@
- {{ dialogTitle || '机具设备' }}有偿使用费结算协议书 + {{ dialogTitle }}有偿使用费结算协议书
@@ -148,35 +149,64 @@
结算项目及金额(元)
+
+
项目
+
施工机具
+
安全工器具
+
一、施工机具有偿使用费：
-
+
￥ {{ Number(agreementContent.leaseCost).toFixed(2) }}
+
+ ￥ {{ Number(agreementContent.aqLeaseCost).toFixed(2) }} +
二、施工机具维修费：
-
+
￥ {{ Number(agreementContent.repairCost).toFixed(2) }}
+
+ ￥ {{ Number(agreementContent.aqRepairCost).toFixed(2) }} +
三、施工机具丢失费：
-
+
￥ {{ Number(agreementContent.loseCost).toFixed(2) }}
+
+ ￥ {{ Number(agreementContent.aqLoseCost).toFixed(2) }} +
四、施工机具损坏赔偿费：
-
+
￥ {{ Number(agreementContent.scrapCost).toFixed(2) }}
+
+ ￥ {{ Number(agreementContent.aqScrapCost).toFixed(2) }} +
五、施工机具租赁减免费：
-
+
￥ {{ Number(agreementContent.reductionCost).toFixed(2) }}
+
+ ￥ {{ Number(agreementContent.aqReductionCost).toFixed(2) }} +
+
+
+
小计：
+
+ ￥ {{ Number(agreementContent.addMoneySafety).toFixed(2) }} +
+
+ ￥ {{ Number(agreementContent.addMoneyProject).toFixed(2) }} +
费用合计金额（大写）：
@@ -203,19 +233,23 @@ 部门负责人： - +
+
+ +
+
承租负责人： - + :style="{ transform: agreementContent.signUrlList && agreementContent.signUrlList[0].signType == 0 ? 'rotate(-90deg)' : '' }" alt="" + onerror="this.style.display='none'" v-if="agreementContent.signUrlList && agreementContent.signUrlList[0].managerSignUrl" />
@@ -224,10 +258,10 @@ 核算员： - + :style="{ transform: agreementContent.signUrlList && agreementContent.signUrlList[0].signType == 0 ? 'rotate(-90deg)' : '' }" alt="" + onerror="this.style.display='none'" v-if="agreementContent.signUrlList && agreementContent.signUrlList[0].sltSignUrl" />
@@ -246,7 +280,7 @@