system-clients 3.3.3 → 3.3.4-v3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.info +1 -0
- package/package.json +103 -103
- package/src/LodopFuncs.js +71 -103
- package/src/components/Main.vue +15 -27
- package/src/components/Util.js +15 -0
- package/src/components/equipment/PcAdd.vue +1 -1
- package/src/components/equipment/PcList.vue +3 -3
- package/src/components/equipment/PhoneAdd.vue +1 -1
- package/src/components/equipment/PhoneList.vue +2 -2
- package/src/components/equipment/PosAdd.vue +11 -7
- package/src/components/equipment/PosList.vue +5 -3
- package/src/components/equipment/PosManage.vue +1 -1
- package/src/components/equipment/PosParamAdd.vue +2 -2
- package/src/components/equipment/PosParamList.vue +2 -2
- package/src/components/materialManage/materialList.vue +1 -1
- package/src/components/parammanage/ParamPage.vue +12 -12
- package/src/components/parammanage/ParamPages.vue +2 -2
- package/src/components/parammanage/SinglePage.vue +8 -8
- package/src/components/parammanage/SinglePages.vue +2 -2
- package/src/components/server/AddChangeMsg.vue +1 -1
- package/src/components/server/ChangeDeclare.vue +1 -1
- package/src/components/server/Login.vue +51 -67
- package/src/components/server/ModifyPw.vue +105 -35
- package/src/components/server/PcdBuildingSelect.vue +6 -8
- package/src/components/server/ResSelect.vue +0 -3
- package/src/components/server/ResSelectGroup.vue +1 -1
- package/src/components/server/RoleSelector.vue +2 -3
- package/src/components/server/TestResSelectGroup.vue +1 -1
- package/src/filiale/baole/Login.vue +24 -21
- package/src/filiale/chengtou/Login.vue +24 -21
- package/src/filiale/dongguan/Login.vue +24 -21
- package/src/filiale/dongguan/Main.vue +3 -5
- package/src/filiale/furuike/Login.vue +25 -24
- package/src/filiale/furuike/Main.vue +26 -39
- package/src/filiale/gehua/Main.vue +3 -5
- package/src/filiale/konggang/Login.vue +24 -21
- package/src/filiale/qianneng/Login.vue +24 -21
- package/src/filiale/qianneng/Main.vue +3 -5
- package/src/filiale/qianneng/ModifyPw.vue +105 -32
- package/src/filiale/rizhao/Login.vue +23 -20
- package/src/filiale/rizhao/Main.vue +3 -3
- package/src/filiale/shiquan/Login.vue +24 -21
- package/src/filiale/tianyi/Login.vue +24 -21
- package/src/filiale/tongchuan/Login.vue +24 -21
- package/src/filiale/tongchuan/Main.vue +6 -8
- package/src/filiale/weinan/Main.vue +6 -7
- package/src/filiale/wenxi/Login.vue +24 -21
- package/src/filiale/wenxi/Main.vue +3 -5
- package/src/filiale/wuhai/Main.vue +3 -6
- package/src/filiale/yuchuan/Login.vue +25 -22
- package/src/filiale/yuchuan/Main.vue +3 -5
- package/src/filiale/zhoukou/Main.vue +3 -5
- package/src/plugins/EncryptUtil.js +1 -1
- package/src/plugins/GetLoginInfoService.js +85 -20
- package/src/plugins/validation.js +12 -8
- package/src/stores/AppData.js +2 -1
- package/src/util/password-validation.js +185 -0
- package/build.gradle +0 -6
- package/src/filiale/ruihua/Login.vue +0 -576
- package/src/filiale/ruihua/system.js +0 -5
- package/static/ruihua/logo.jpg +0 -0
|
@@ -212,8 +212,7 @@ let getwartermakr = async function (self) {
|
|
|
212
212
|
tablename: 't_singlevalue',
|
|
213
213
|
condition: " 1=1 and name=\'水印内容\'"
|
|
214
214
|
};
|
|
215
|
-
|
|
216
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
215
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
217
216
|
if (result && result.data.length > 0) {
|
|
218
217
|
self.showwatermakeflag = true;
|
|
219
218
|
createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
|
|
@@ -377,7 +376,6 @@ let createWaterMark = function (userName) {
|
|
|
377
376
|
this.model.f_stopgas_id = this.notices.id
|
|
378
377
|
this.model.f_user_id = this.$login.f.id
|
|
379
378
|
console.log('保存', this.model)
|
|
380
|
-
// todo v4
|
|
381
379
|
this.$resetpost('rs/logic/savenoticenotarize', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
|
|
382
380
|
this.model.f_stopgas_id = ''
|
|
383
381
|
this.model.f_user_id = ''
|
|
@@ -495,7 +493,7 @@ let createWaterMark = function (userName) {
|
|
|
495
493
|
this.OrderDaiBan = ''
|
|
496
494
|
this.AppDaiBan = ''
|
|
497
495
|
let http = new HttpResetClass()
|
|
498
|
-
await http.load('POST', '/
|
|
496
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
499
497
|
tablename:'t_order_center',
|
|
500
498
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
501
499
|
}}, {
|
|
@@ -543,7 +541,7 @@ let createWaterMark = function (userName) {
|
|
|
543
541
|
async getExpireDate(){
|
|
544
542
|
// 获取分公司的表品牌id
|
|
545
543
|
let http = new HttpResetClass()
|
|
546
|
-
await http.load('POST', '/
|
|
544
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
547
545
|
tablename:'t_gasbrand_orgid',
|
|
548
546
|
condition:`f_using_orgid ='${this.$login.f.orgid}'`
|
|
549
547
|
}}, {
|
|
@@ -557,7 +555,7 @@ let createWaterMark = function (userName) {
|
|
|
557
555
|
}
|
|
558
556
|
if (this.gasbrandIdData.length > 0) {
|
|
559
557
|
// 获取卡表到期时间
|
|
560
|
-
http.load('POST', '/
|
|
558
|
+
http.load('POST', '/rs/sql/singleTable', {data: {
|
|
561
559
|
tablename:'t_gasbrand',
|
|
562
560
|
condition:`id in (${this.gasbrandIdData}) and f_meter_type like '%卡表%'`
|
|
563
561
|
}}, {
|
|
@@ -568,6 +566,7 @@ let createWaterMark = function (userName) {
|
|
|
568
566
|
res.data.forEach(itre => {
|
|
569
567
|
let band = null
|
|
570
568
|
if ('f_dynamic_expire' in itre) {
|
|
569
|
+
console.log(itre.f_dynamic_expire)
|
|
571
570
|
if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
|
|
572
571
|
let todayold = new Date(itre.f_dynamic_expire)
|
|
573
572
|
todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
|
|
@@ -618,7 +617,7 @@ let createWaterMark = function (userName) {
|
|
|
618
617
|
}
|
|
619
618
|
},
|
|
620
619
|
openUrl() {
|
|
621
|
-
var url = `
|
|
620
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
622
621
|
window.open(url, '_blank')
|
|
623
622
|
},
|
|
624
623
|
hindsetting() {
|
|
@@ -697,7 +696,6 @@ let createWaterMark = function (userName) {
|
|
|
697
696
|
username: this.$login.f.name,
|
|
698
697
|
usertelephone: this.$login.f.f_user_telephone
|
|
699
698
|
}
|
|
700
|
-
// todo v4
|
|
701
699
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
702
700
|
window.location.reload()
|
|
703
701
|
}
|
|
@@ -189,8 +189,7 @@ let getwartermakr = async function (self) {
|
|
|
189
189
|
tablename: 't_singlevalue',
|
|
190
190
|
condition: " 1=1 and name=\'水印内容\'"
|
|
191
191
|
};
|
|
192
|
-
|
|
193
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
192
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
194
193
|
if (result && result.data.length > 0) {
|
|
195
194
|
self.showwatermakeflag = true;
|
|
196
195
|
createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
|
|
@@ -398,7 +397,7 @@ export default {
|
|
|
398
397
|
this.OrderDaiBan = ''
|
|
399
398
|
this.AppDaiBan = ''
|
|
400
399
|
let http = new HttpResetClass()
|
|
401
|
-
await http.load('POST', '/
|
|
400
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
402
401
|
tablename:'t_order_center',
|
|
403
402
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
404
403
|
}}, {
|
|
@@ -446,7 +445,7 @@ export default {
|
|
|
446
445
|
async getExpireDate(){
|
|
447
446
|
// 获取分公司的表品牌id
|
|
448
447
|
let http = new HttpResetClass()
|
|
449
|
-
await http.load('POST', '/
|
|
448
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
450
449
|
tablename:'t_gasbrand_orgid',
|
|
451
450
|
condition:`f_using_orgid ='${this.$login.f.orgid}'`
|
|
452
451
|
}}, {
|
|
@@ -460,7 +459,7 @@ export default {
|
|
|
460
459
|
}
|
|
461
460
|
if (this.gasbrandIdData.length > 0) {
|
|
462
461
|
// 获取卡表到期时间
|
|
463
|
-
http.load('POST', '/
|
|
462
|
+
http.load('POST', '/rs/sql/singleTable', {data: {
|
|
464
463
|
tablename:'t_gasbrand',
|
|
465
464
|
condition:`id in (${this.gasbrandIdData}) and f_meter_type like '%卡表%'`
|
|
466
465
|
}}, {
|
|
@@ -471,6 +470,7 @@ export default {
|
|
|
471
470
|
res.data.forEach(itre => {
|
|
472
471
|
let band = null
|
|
473
472
|
if ('f_dynamic_expire' in itre) {
|
|
473
|
+
console.log(itre.f_dynamic_expire)
|
|
474
474
|
if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
|
|
475
475
|
let todayold = new Date(itre.f_dynamic_expire)
|
|
476
476
|
todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
|
|
@@ -521,7 +521,7 @@ export default {
|
|
|
521
521
|
}
|
|
522
522
|
},
|
|
523
523
|
openUrl() {
|
|
524
|
-
var url = `
|
|
524
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
525
525
|
window.open(url, '_blank')
|
|
526
526
|
},
|
|
527
527
|
hindsetting() {
|
|
@@ -600,7 +600,6 @@ export default {
|
|
|
600
600
|
username: this.$login.f.name,
|
|
601
601
|
usertelephone: this.$login.f.f_user_telephone
|
|
602
602
|
}
|
|
603
|
-
// todo v4
|
|
604
603
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
605
604
|
window.location.reload()
|
|
606
605
|
}
|
|
@@ -138,9 +138,11 @@
|
|
|
138
138
|
|
|
139
139
|
<script>
|
|
140
140
|
import co from 'co'
|
|
141
|
+
import { isStrongPassword } from '../../util/password-validation'
|
|
141
142
|
import $ from 'jquery'
|
|
142
143
|
import Vue from 'vue'
|
|
143
144
|
import {HttpResetClass} from 'vue-client'
|
|
145
|
+
import {isPasswordModificationExpired} from '../../components/Util'
|
|
144
146
|
|
|
145
147
|
let daibanJson = require('../../util/Daiban.json')
|
|
146
148
|
|
|
@@ -171,7 +173,6 @@ let saveGen = function *(self) {
|
|
|
171
173
|
console.log('登录配置', self.config)
|
|
172
174
|
if (self.config.isMac) {
|
|
173
175
|
// 获取该登录人分公司下的mac配置
|
|
174
|
-
// todo v4
|
|
175
176
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
|
176
177
|
resolveMsg: null,
|
|
177
178
|
rejectMsg: null
|
|
@@ -201,12 +202,15 @@ let saveGen = function *(self) {
|
|
|
201
202
|
}
|
|
202
203
|
}
|
|
203
204
|
console.log(self.$login.depPrompt)
|
|
204
|
-
//
|
|
205
|
-
|
|
206
|
-
if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
205
|
+
// 弱口令验证(默认开启,跳转过来的不进行验证)
|
|
206
|
+
if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
|
|
207
207
|
self.$showMessage('登录系统: 此账户的密码过于简单,请修改密码后重新登陆!!!', ['confirm']).then((res) => {
|
|
208
208
|
self.modifyPwShow = true
|
|
209
209
|
})
|
|
210
|
+
} else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
|
|
211
|
+
self.$showMessage('登录系统: 您的密码已超过两个半月未修改,请修改密码后重新登录!!!', ['confirm']).then((res) => {
|
|
212
|
+
self.modifyPwShow = true
|
|
213
|
+
})
|
|
210
214
|
} else if ((!self.otherLogin) && self.$login.depPrompt) {
|
|
211
215
|
self.depPromptShow = true
|
|
212
216
|
if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
|
|
@@ -232,6 +236,8 @@ let saveGen = function *(self) {
|
|
|
232
236
|
|
|
233
237
|
} catch (ret) {
|
|
234
238
|
console.error('登录失败', ret)
|
|
239
|
+
self.$login.s = null
|
|
240
|
+
self.$login['v3-session-key'] = null
|
|
235
241
|
let msg
|
|
236
242
|
if (ret instanceof Error) {
|
|
237
243
|
msg = ret
|
|
@@ -258,19 +264,19 @@ export default {
|
|
|
258
264
|
this.titleShow = this.$appdata.getSingleValue('关于我们')
|
|
259
265
|
window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
|
|
260
266
|
this.vTime = this.format(new Date(window.versionTime));
|
|
261
|
-
try{
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
}catch(e){}
|
|
267
|
+
// try{
|
|
268
|
+
// let http = new HttpResetClass()
|
|
269
|
+
// let res = await http.load('POST', 'rs/sql/singleTable',
|
|
270
|
+
// {data:{
|
|
271
|
+
// tablename: 't_changedeclare',
|
|
272
|
+
// condition: ` f_type ='变更通知' `
|
|
273
|
+
// }
|
|
274
|
+
// }, {resolveMsg: null, rejectMsg: null})
|
|
275
|
+
// if(res.data.length>0){
|
|
276
|
+
// console.log("---------------获取通知",res.data[0].f_change_message)
|
|
277
|
+
// this.notice=res.data[0].f_change_message
|
|
278
|
+
// }
|
|
279
|
+
// }catch(e){}
|
|
274
280
|
|
|
275
281
|
this.loginother();
|
|
276
282
|
$('#login-button').click(function (event) {
|
|
@@ -279,10 +285,8 @@ export default {
|
|
|
279
285
|
})
|
|
280
286
|
if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
|
|
281
287
|
const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
|
|
282
|
-
console.log(subUrl)
|
|
283
288
|
this.model.ename = window.atob(subUrl[0])
|
|
284
289
|
this.model.password = window.atob(subUrl[1])
|
|
285
|
-
console.log('this.model.ename',this.model.ename)
|
|
286
290
|
this.otherLogin = true
|
|
287
291
|
this.confirm()
|
|
288
292
|
}else{
|
|
@@ -360,7 +364,7 @@ export default {
|
|
|
360
364
|
} else {
|
|
361
365
|
condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
|
|
362
366
|
}
|
|
363
|
-
await http.load('POST', '/
|
|
367
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
364
368
|
tablename:'t_order_center',
|
|
365
369
|
condition:condition
|
|
366
370
|
}}, {
|
|
@@ -436,7 +440,6 @@ export default {
|
|
|
436
440
|
if (this.config.distanceLogin) {
|
|
437
441
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
|
438
442
|
let ename = this.$login.getUrlParames('name');
|
|
439
|
-
// todo v4
|
|
440
443
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
|
441
444
|
if(logininfo.data){
|
|
442
445
|
if(logininfo.data.ename && logininfo.data.password){
|
|
@@ -165,8 +165,7 @@ let getwartermakr = async function (self) {
|
|
|
165
165
|
tablename: 't_singlevalue',
|
|
166
166
|
condition: " 1=1 and name=\'水印内容\'"
|
|
167
167
|
};
|
|
168
|
-
|
|
169
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
168
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
170
169
|
if (result && result.data.length > 0) {
|
|
171
170
|
self.showwatermakeflag = true;
|
|
172
171
|
createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
|
|
@@ -312,7 +311,7 @@ export default {
|
|
|
312
311
|
this.OrderDaiBan = ''
|
|
313
312
|
this.AppDaiBan = ''
|
|
314
313
|
let http = new HttpResetClass()
|
|
315
|
-
await http.load('POST', '/
|
|
314
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
316
315
|
tablename:'t_order_center',
|
|
317
316
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
318
317
|
}}, {
|
|
@@ -384,7 +383,7 @@ export default {
|
|
|
384
383
|
}
|
|
385
384
|
},
|
|
386
385
|
openUrl() {
|
|
387
|
-
var url = `
|
|
386
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
388
387
|
window.open(url, '_blank')
|
|
389
388
|
},
|
|
390
389
|
hindsetting() {
|
|
@@ -463,7 +462,6 @@ export default {
|
|
|
463
462
|
username: this.$login.f.name,
|
|
464
463
|
usertelephone: this.$login.f.f_user_telephone
|
|
465
464
|
}
|
|
466
|
-
// todo v4
|
|
467
465
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
468
466
|
window.location.reload()
|
|
469
467
|
}
|
|
@@ -165,8 +165,7 @@ let getwartermakr = async function (self) {
|
|
|
165
165
|
tablename: 't_singlevalue',
|
|
166
166
|
condition: " 1=1 and name=\'水印内容\'"
|
|
167
167
|
};
|
|
168
|
-
|
|
169
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
168
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
170
169
|
if (result && result.data.length > 0) {
|
|
171
170
|
self.showwatermakeflag = true;
|
|
172
171
|
createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
|
|
@@ -317,7 +316,7 @@ export default {
|
|
|
317
316
|
this.OrderDaiBan = ''
|
|
318
317
|
this.AppDaiBan = ''
|
|
319
318
|
let http = new HttpResetClass()
|
|
320
|
-
await http.load('POST', '/
|
|
319
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
321
320
|
tablename:'t_order_center',
|
|
322
321
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
323
322
|
}}, {
|
|
@@ -389,7 +388,7 @@ export default {
|
|
|
389
388
|
}
|
|
390
389
|
},
|
|
391
390
|
openUrl() {
|
|
392
|
-
var url = `
|
|
391
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
393
392
|
window.open(url, '_blank')
|
|
394
393
|
},
|
|
395
394
|
hindsetting() {
|
|
@@ -468,7 +467,6 @@ export default {
|
|
|
468
467
|
username: this.$login.f.name,
|
|
469
468
|
usertelephone: this.$login.f.f_user_telephone
|
|
470
469
|
}
|
|
471
|
-
// todo v4
|
|
472
470
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
473
471
|
window.location.reload()
|
|
474
472
|
}
|
|
@@ -477,7 +475,6 @@ export default {
|
|
|
477
475
|
// 微信统计投诉和咨询的条数
|
|
478
476
|
async WechatOfComplaintAndConsult () {
|
|
479
477
|
console.log('开始执行')
|
|
480
|
-
// todo v4
|
|
481
478
|
let WeChatData = await this.$resetpost('rs/sql/singleTable_OrderBy',{
|
|
482
479
|
data:{
|
|
483
480
|
items: 'f_isreply',
|
|
@@ -137,9 +137,11 @@
|
|
|
137
137
|
|
|
138
138
|
<script>
|
|
139
139
|
import co from 'co'
|
|
140
|
+
import { isStrongPassword } from '../../util/password-validation'
|
|
140
141
|
import $ from 'jquery'
|
|
141
142
|
import Vue from 'vue'
|
|
142
143
|
import {HttpResetClass} from 'vue-client'
|
|
144
|
+
import {isPasswordModificationExpired} from '../../components/Util'
|
|
143
145
|
|
|
144
146
|
let daibanJson = require('../../util/Daiban.json')
|
|
145
147
|
|
|
@@ -170,7 +172,6 @@ let saveGen = function *(self) {
|
|
|
170
172
|
console.log('登录配置', self.config)
|
|
171
173
|
if (self.config.isMac) {
|
|
172
174
|
// 获取该登录人分公司下的mac配置
|
|
173
|
-
// todo v4
|
|
174
175
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
|
175
176
|
resolveMsg: null,
|
|
176
177
|
rejectMsg: null
|
|
@@ -200,12 +201,15 @@ let saveGen = function *(self) {
|
|
|
200
201
|
}
|
|
201
202
|
}
|
|
202
203
|
console.log(self.$login.depPrompt)
|
|
203
|
-
//
|
|
204
|
-
|
|
205
|
-
if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
204
|
+
// 弱口令验证(默认开启,跳转过来的不进行验证)
|
|
205
|
+
if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
|
|
206
206
|
self.$showMessage('登录系统: 此账户的密码过于简单,请修改密码后重新登陆!!!', ['confirm']).then((res) => {
|
|
207
207
|
self.modifyPwShow = true
|
|
208
208
|
})
|
|
209
|
+
} else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
|
|
210
|
+
self.$showMessage('登录系统: 您的密码已超过两个半月未修改,请修改密码后重新登录!!!', ['confirm']).then((res) => {
|
|
211
|
+
self.modifyPwShow = true
|
|
212
|
+
})
|
|
209
213
|
} else if ((!self.otherLogin) && self.$login.depPrompt) {
|
|
210
214
|
self.depPromptShow = true
|
|
211
215
|
if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
|
|
@@ -231,6 +235,8 @@ let saveGen = function *(self) {
|
|
|
231
235
|
|
|
232
236
|
} catch (ret) {
|
|
233
237
|
console.error('登录失败', ret)
|
|
238
|
+
self.$login.s = null
|
|
239
|
+
self.$login['v3-session-key'] = null
|
|
234
240
|
let msg
|
|
235
241
|
if (ret instanceof Error) {
|
|
236
242
|
msg = ret
|
|
@@ -255,19 +261,19 @@ export default {
|
|
|
255
261
|
title: '登录',
|
|
256
262
|
async ready () {
|
|
257
263
|
this.titleShow = this.$appdata.getSingleValue('关于我们')
|
|
258
|
-
try{
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
}catch(e){}
|
|
264
|
+
// try{
|
|
265
|
+
// let http = new HttpResetClass()
|
|
266
|
+
// let res = await http.load('POST', 'rs/sql/singleTable',
|
|
267
|
+
// {data:{
|
|
268
|
+
// tablename: 't_changedeclare',
|
|
269
|
+
// condition: ` f_type ='变更通知' `
|
|
270
|
+
// }
|
|
271
|
+
// }, {resolveMsg: null, rejectMsg: null})
|
|
272
|
+
// if(res.data.length>0){
|
|
273
|
+
// console.log("---------------获取通知",res.data[0].f_change_message)
|
|
274
|
+
// this.notice=res.data[0].f_change_message
|
|
275
|
+
// }
|
|
276
|
+
// }catch(e){}
|
|
271
277
|
|
|
272
278
|
this.loginother();
|
|
273
279
|
$('#login-button').click(function (event) {
|
|
@@ -276,10 +282,8 @@ export default {
|
|
|
276
282
|
})
|
|
277
283
|
if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
|
|
278
284
|
const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
|
|
279
|
-
console.log(subUrl)
|
|
280
285
|
this.model.ename = window.atob(subUrl[0])
|
|
281
286
|
this.model.password = window.atob(subUrl[1])
|
|
282
|
-
console.log('this.model.ename',this.model.ename)
|
|
283
287
|
this.otherLogin = true
|
|
284
288
|
this.confirm()
|
|
285
289
|
}else{
|
|
@@ -303,7 +307,7 @@ export default {
|
|
|
303
307
|
isMac: false,
|
|
304
308
|
depPrompt: false,
|
|
305
309
|
weakPassword: false,
|
|
306
|
-
title: '
|
|
310
|
+
title: '燃气客服系统',
|
|
307
311
|
distanceLogin: false,
|
|
308
312
|
// 那些角色可以定时获取预约提示
|
|
309
313
|
isTip : false,
|
|
@@ -344,7 +348,7 @@ export default {
|
|
|
344
348
|
} else {
|
|
345
349
|
condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
|
|
346
350
|
}
|
|
347
|
-
await http.load('POST', '/
|
|
351
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
348
352
|
tablename:'t_order_center',
|
|
349
353
|
condition:condition
|
|
350
354
|
}}, {
|
|
@@ -420,7 +424,6 @@ export default {
|
|
|
420
424
|
if (this.config.distanceLogin) {
|
|
421
425
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
|
422
426
|
let ename = this.$login.getUrlParames('name');
|
|
423
|
-
// todo v4
|
|
424
427
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
|
425
428
|
if(logininfo.data){
|
|
426
429
|
if(logininfo.data.ename && logininfo.data.password){
|
|
@@ -155,8 +155,7 @@ let getwartermakr = async function (self) {
|
|
|
155
155
|
tablename: 't_singlevalue',
|
|
156
156
|
condition: " 1=1 and name=\'水印内容\'"
|
|
157
157
|
};
|
|
158
|
-
|
|
159
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
158
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
160
159
|
if (result && result.data.length > 0) {
|
|
161
160
|
self.showwatermakeflag = true;
|
|
162
161
|
createWaterMark(result.data[0].value);
|
|
@@ -391,7 +390,7 @@ export default {
|
|
|
391
390
|
this.OrderDaiBan = ''
|
|
392
391
|
this.AppDaiBan = ''
|
|
393
392
|
let http = new HttpResetClass()
|
|
394
|
-
await http.load('POST', '/
|
|
393
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
395
394
|
tablename:'t_order_center',
|
|
396
395
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
397
396
|
}}, {
|
|
@@ -463,7 +462,7 @@ export default {
|
|
|
463
462
|
}
|
|
464
463
|
},
|
|
465
464
|
openUrl() {
|
|
466
|
-
var url = `
|
|
465
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
467
466
|
window.open(url, '_blank')
|
|
468
467
|
},
|
|
469
468
|
hindsetting() {
|
|
@@ -542,7 +541,6 @@ export default {
|
|
|
542
541
|
username: this.$login.f.name,
|
|
543
542
|
usertelephone: this.$login.f.f_user_telephone
|
|
544
543
|
}
|
|
545
|
-
// todo v4
|
|
546
544
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
547
545
|
window.location.reload()
|
|
548
546
|
}
|
|
@@ -151,8 +151,7 @@ let getwartermakr = async function (self) {
|
|
|
151
151
|
tablename: 't_singlevalue',
|
|
152
152
|
condition: " 1=1 and name=\'水印内容\'"
|
|
153
153
|
};
|
|
154
|
-
|
|
155
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
154
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
156
155
|
if (result && result.data.length > 0) {
|
|
157
156
|
self.showwatermakeflag = true;
|
|
158
157
|
createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
|
|
@@ -292,7 +291,7 @@ export default {
|
|
|
292
291
|
this.OrderDaiBan = ''
|
|
293
292
|
this.AppDaiBan = ''
|
|
294
293
|
let http = new HttpResetClass()
|
|
295
|
-
await http.load('POST', '/
|
|
294
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
296
295
|
tablename:'t_order_center',
|
|
297
296
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
298
297
|
}}, {
|
|
@@ -364,7 +363,7 @@ export default {
|
|
|
364
363
|
}
|
|
365
364
|
},
|
|
366
365
|
openUrl() {
|
|
367
|
-
var url = `
|
|
366
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
368
367
|
window.open(url, '_blank')
|
|
369
368
|
},
|
|
370
369
|
hindsetting() {
|
|
@@ -423,7 +422,6 @@ export default {
|
|
|
423
422
|
username: this.$login.f.name,
|
|
424
423
|
usertelephone: this.$login.f.f_user_telephone
|
|
425
424
|
}
|
|
426
|
-
// todo v4
|
|
427
425
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
428
426
|
window.location.reload()
|
|
429
427
|
}
|
|
@@ -48,6 +48,6 @@ export default {
|
|
|
48
48
|
let encrypt = new RsaEncryptJS();
|
|
49
49
|
encrypt.setPrivateKey('MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKo++i9J9dzAFtbxwowKDCo2mxi7MXxE8A8VvssaydWjjgmEz/HHMPLOhi1182a1si4pWL0/MizKnquD7T2Bu4jpQbAFnkNYEMEyq/kw904Xl0JCQHYFuvnI99RE8Q3KlTP6kEUGDjV34EL6vBGJcQvArLtj1xoP8y0nIfJ2Pw5TAgMBAAECgYAGGB8IllMwxceLhjf6n1l0IWRH7FuHIUieoZ6k0p6rASHSgWiYNRMxfecbtX8zDAoG0QAWNi7rn40ygpR5gS1fWDAKhmnhKgQIT6wW0VmD4hraaeyP78iy8BLhlvblri2nCPIhDH5+l96v7D47ZZi3ZSOzcj89s1eS/k7/N4peEQJBAPEtGGJY+lBoCxQMhGyzuzDmgcS1Un1ZE2pt+XNCVl2b+T8fxWJH3tRRR8wOY5uvtPiK1HM/IjT0T5qwQeH8Yk0CQQC0tcv3d/bDb7bOe9QzUFDQkUSpTdPWAgMX2OVPxjdq3Sls9oA5+fGNYEy0OgyqTjde0b4iRzlD1O0OhLqPSUMfAkEAh5FIvqezdRU2/PsYSR4yoAdCdLdT+h/jGRVefhqQ/6eYUJJkWp15tTFHQX3pIe9/s6IeT/XyHYAjaxmevxAmlQJBAKSdhvQjf9KAjZKDEsa7vyJ/coCXuQUWSCMNHbcR5aGfXgE4e45UtUoIE1eKGcd6AM6LWhx3rR6xdFDpb9je8BkCQB0SpevGfOQkMk5i8xkEt9eeYP0fi8nv6eOUcK96EXbzs4jV2SAoQJ9oJegPtPROHbhIvVUmNQTbuP10Yjg59+8=');
|
|
50
50
|
let resdata = encrypt.decrypt(word);
|
|
51
|
-
return
|
|
51
|
+
return resdata.toString();
|
|
52
52
|
},
|
|
53
53
|
}
|