Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
platform
/
fanxing_new
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit e9b878f7
authored
May 25, 2021
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
【BUG】修改密码验证方式
【new】增加用户显示,增加推出提示 【new】过车增加速度
1 parent
af680df9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
26 additions
and
6 deletions
public/index.html
public/js/version.json
src/api/baseUrl.js
src/api/log.js
src/assets/js/buildcodes.js
src/assets/resetElementCss/index.scss
src/views/Layout/index.vue
src/views/Resetpassword.vue
src/views/ops/user_manage.vue
src/views/sceneManage/setting/areaconfig/Behavior的副本.vue
src/views/search/vehicleSearch.vue
public/index.html
View file @
e9b878f
...
...
@@ -4,6 +4,9 @@
<meta
charset=
"utf-8"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
name=
"viewport"
content=
"width=device-width,initial-scale=1.0"
>
<meta
http-equiv=
"Cache-Control"
content=
"no-cache, no-store, must-revalidate"
/>
<meta
http-equiv=
"Pragma"
content=
"no-cache"
/>
<meta
http-equiv=
"Expires"
content=
"0"
/>
<link
rel=
"icon"
href=
"<%= BASE_URL %>favicon.png"
>
<link
rel=
"stylesheet"
href=
"<%= BASE_URL %>zTree_v3/css/zTreeStyle/zTreeStyle.css"
></link>
<title>
AI视频分析平台
</title>
...
...
public/js/version.json
View file @
e9b878f
{
"commit"
:
"633f7a4d90b06cfc5d2a4809638b6778756ea0f5"
,
"commitDate"
:
"2021-5-20 11:5"
,
"buildDate"
:
"2021-5-20 16:29"
,
"version"
:
"2.1.0"
,
"info"
:
"tijioa"
}
\ No newline at end of file
{
"commit"
:
"af680df9280d84c026e7ce21c2b21559ea924789"
,
"commitDate"
:
"2021-5-20 16:58"
,
"buildDate"
:
"2021-5-21 17:24"
,
"version"
:
"2.1.0"
,
"info"
:
"提交博关算法配置"
}
\ No newline at end of file
src/api/baseUrl.js
View file @
e9b878f
...
...
@@ -4,7 +4,7 @@ import axios from "axios";
switch
(
process
.
env
.
NODE_ENV
)
{
case
"development"
:
// baseUrl = "http://192.168.9.234:20080"; // 测试环境url
baseUrl
=
window
.
config
.
https
?
"https://192.168.9.233:20070"
:
"http://192.168.9.
17
3:20080"
;
// 测试环境url
baseUrl
=
window
.
config
.
https
?
"https://192.168.9.233:20070"
:
"http://192.168.9.
23
3:20080"
;
// 测试环境url
// baseUrl = "http://192.168.9.82:8080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086";
// baseUrl = 'http://vion-panda.51vip.biz:52510';
...
...
src/api/log.js
View file @
e9b878f
...
...
@@ -15,7 +15,6 @@ let servicename = {
const
oplogs
=
function
(
data
,
service
,
action
)
{
//开启日志模式才进行日志收集
if
(
window
.
config
.
logstatus
)
{
debugger
let
username
=
localStorage
.
getItem
(
'uname'
);
let
baseData
=
{
"dt"
:
moment
().
locale
(
'zh-cn'
),
...
...
src/assets/js/buildcodes.js
View file @
e9b878f
...
...
@@ -226,6 +226,7 @@ class Codes {
}
catch
(
e
)
{
// console.log("遮阳板无");
}
if
(
ary
.
length
)
{
this
.
result
.
RefinedFeature_text
=
ary
.
join
(
""
);
}
else
{
...
...
src/assets/resetElementCss/index.scss
View file @
e9b878f
...
...
@@ -286,6 +286,7 @@ display: table-cell!important;
}
.el-form-item--mini.el-form-item
,
.el-form-item--small.el-form-item
{
margin-bottom
:
4px
;
line-height
:
32px
;
}
/* 切换 */
.el-tabs__item
{
...
...
src/views/Layout/index.vue
View file @
e9b878f
...
...
@@ -23,6 +23,7 @@
<el-dropdown-item
command=
"dark"
>
深色主题
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span
class=
"uname-box"
>
{{
uname
}}
</span>
<img
@
click=
"resetpass"
src=
"../../assets/img/home/user.png"
alt=
""
/>
<span
class=
"exit"
@
click=
"logout()"
>
退出
<i
class=
"el-icon-arrow-down"
></i
...
...
@@ -67,7 +68,8 @@ export default {
menuwidth
:
"300px"
,
isfull
:
true
,
headertitle
:
""
,
topbarArr
:
[]
topbarArr
:
[],
uname
:
''
};
},
methods
:
{
...
...
@@ -148,6 +150,7 @@ export default {
logout
()
{
localStorage
.
removeItem
(
"menu"
);
localStorage
.
removeItem
(
"curmenu"
);
this
.
$store
.
commit
(
types
.
ATOKEN
,
""
);
this
.
$logs
.
oplogs
(
''
,
'serv_login'
,
`登出了平台`
);
if
(
window
.
config
.
isdd
)
{
...
...
@@ -168,6 +171,7 @@ export default {
},
created
()
{
this
.
headertitle
=
window
.
config
.
hadertitle
;
this
.
uname
=
localStorage
.
getItem
(
'uname'
);
this
.
$api
.
device
.
getDev
().
then
(
m
=>
{
if
(
m
.
length
<
1
)
{
this
.
$message
({
...
...
@@ -212,6 +216,10 @@ export default {
window
.
mousetimer
=
setTimeout
(()
=>
{
clearTimeout
(
window
.
mousetimer
);
window
.
mousetimer
=
null
;
this
.
$message
({
message
:
"由于您长时间未操作,将退出平台!"
,
type
:
"warning"
});
this
.
logout
();
},
600000
);
});
...
...
@@ -328,4 +336,7 @@ export default {
.timerbox
{
padding-right
30px
}
.uname-box
{
padding-right
:
10px
}
</
style
>
src/views/Resetpassword.vue
View file @
e9b878f
...
...
@@ -47,7 +47,7 @@ export default {
callback
(
new
Error
(
"新旧密码不能重复!"
));
return
}
var
pwdRegex
=
/^
(?=
^.
{8,}
$
)((?=
.*
\d)
|
(?=
.*
\W
+
))(?![
.
\n])(?=
.*
[
A-Z
])(?=
.*
[
a-z
])
.*$"/
;
var
pwdRegex
=
new
RegExp
(
'(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}'
)
;
if
(
!
pwdRegex
.
test
(
value
))
{
callback
(
new
Error
(
"您的密码复杂度太低(密码中必须包含大写和小写字母、数字、特殊字符长度大于8位),请及时修改密码!"
))
}
...
...
src/views/ops/user_manage.vue
View file @
e9b878f
...
...
@@ -196,7 +196,7 @@ export default {
}
};
var
validatePass
=
(
rule
,
value
,
callback
)
=>
{
var
pwdRegex
=
/^
(?=
^.
{8,}
$
)((?=
.*
\d)
|
(?=
.*
\W
+
))(?![
.
\n])(?=
.*
[
A-Z
])(?=
.*
[
a-z
])
.*$"/
;
;
var
pwdRegex
=
new
RegExp
(
'(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}'
)
;
if
(
!
pwdRegex
.
test
(
value
))
{
callback
(
new
Error
(
"您的密码复杂度太低(密码中必须包含大写和小写字母、数字、特殊字符长度大于8位),请及时修改密码!"
))
}
else
{
...
...
src/views/sceneManage/setting/areaconfig/Behavior的副本.vue
deleted
100644 → 0
View file @
af680df
This diff is collapsed.
Click to expand it.
src/views/search/vehicleSearch.vue
View file @
e9b878f
...
...
@@ -380,9 +380,13 @@
<el-form-item
label=
"车身颜色:"
>
<span>
{{ detailObj.vehicle_body_color_text }}
</span>
</el-form-item>
<el-form-item
label=
"车辆速度:"
>
<span
v-if=
"detailObj.event_data"
>
{{ detailObj.event_data.speed?detailObj.event_data.speed:"0" }}
</span>
</el-form-item>
<el-form-item
label=
"特殊车辆:"
>
<span>
{{ detailObj.special_text }}
</span>
</el-form-item>
<!-- <el-form-item label="标志物:">
<span>{{ detailObj.RefinedFeature_text }}</span>
</el-form-item> -->
...
...
@@ -568,6 +572,7 @@ export default {
return
false
;
}
this
.
detailObj
=
this
.
formatterData
[
this
.
currentIndex
-
1
];
console
.
log
(
this
.
detailObj
);
this
.
currentIndex
-=
1
;
this
.
getImg
(
this
.
detailObj
.
pics
[
0
].
pic_unid
);
},
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment