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 dd726b75
authored
Nov 11, 2021
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
【BUG】钉钉登录地址栏无法解析问题
1 parent
4b64e700
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
47 additions
and
14 deletions
public/js/config.js
public/js/version.json
src/App.vue
src/api/apiList.js
src/api/axios.js
src/api/baseUrl.js
src/views/Login.vue
src/views/ddlogin.vue
public/js/config.js
View file @
dd726b7
/*
* @Author: your name
* @Date: 2021-11-11 11:47:02
* @LastEditTime: 2021-11-11 12:06:22
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /fanxing_new/public/js/config.js
*/
window
.
config
=
{
"logstatus"
:
true
,
//是否开启日志收集
"hadertitle"
:
"AI视频分析平台"
,
//系统标题
...
...
@@ -5,11 +13,11 @@ window.config = {
"https"
:
false
,
"isvideo"
:
0
,
"bigtree"
:
true
,
//大数据展示树
"host"
:
"http://1
0.1.200.100
:20080"
,
"host"
:
"http://1
23.6.38.39
:20080"
,
"ddurl"
:
"http://aaa.zzgx.gov.cn"
,
"ddloginurl"
:
"http://1
0.1.200.97
:29090"
,
"ddloginurl"
:
"http://1
23.6.38.39
:29090"
,
"huasanDD"
:
'http://aaa.zzgx.gov.cn/oauth/authorize?response_type=code&scope=read&client_id=KLjmdAH0'
,
"ddwsurl"
:
"1
0.1.200.97
:29090"
,
"ddwsurl"
:
"1
23.6.38.39
:29090"
,
"isdd"
:
false
,
//是否开启钉钉登录
"version"
:
"2.1.0"
,
"encrypt"
:
false
,
//是否加密true采用sha1加密,false不加密
...
...
public/js/version.json
View file @
dd726b7
{
"commit"
:
"3ef59f66af81a9e75a2f779b3a4fc9ef8731c21e"
,
"commitDate"
:
"2021-9-13 16:11"
,
"buildDate"
:
"2021-9-27 16:26"
,
"version"
:
"2.1.0"
,
"info"
:
"【new】增加存储配置导出功能"
}
\ No newline at end of file
{
"commit"
:
"4b64e700aabddfd8a3571739b1bece4194641df5"
,
"commitDate"
:
"2021-9-27 18:45"
,
"buildDate"
:
"2021-11-11 16:23"
,
"version"
:
"2.1.0"
,
"info"
:
"【BUG】存储配置导出"
}
\ No newline at end of file
src/App.vue
View file @
dd726b7
...
...
@@ -20,10 +20,10 @@ export default {
if
(
menus
)
{
this
.
$store
.
dispatch
(
"GetMenuRole"
,
menus
).
then
(
res
=>
{});
}
let
token
=
localStorage
.
getItem
(
"atoken"
);
if
(
!
token
)
{
this
.
$router
.
push
(
"/"
).
catch
(
err
=>
{
err
});
}
//
let token = localStorage.getItem("atoken");
//
if (!token) {
//
this.$router.push("/").catch(err => {err});
//
}
},
mounted
()
{
window
.
videoEquitTableHeight
=
document
.
body
.
clientHeight
-
142
+
"px"
;
...
...
src/api/apiList.js
View file @
dd726b7
/*
* @Author: your name
* @Date: 2021-11-11 11:47:02
* @LastEditTime: 2021-11-11 12:13:31
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /fanxing_new/src/api/apiList.js
*/
import
map
from
"./map"
;
import
login
from
"./login"
;
import
task
from
"./task"
;
...
...
@@ -13,7 +21,7 @@ let wsIP = "";
let
flvIP
=
""
;
switch
(
process
.
env
.
NODE_ENV
)
{
case
"development"
:
wsIP
=
window
.
config
.
https
?
"192.168.9.227"
:
"1
92.168.9.233
:20080"
;
// 测试环境url
wsIP
=
window
.
config
.
https
?
"192.168.9.227"
:
"1
23.6.38.39:20080
:20080"
;
// 测试环境url
flvIP
=
window
.
config
.
https
?
"192.168.9.233"
:
"192.168.9.233"
;
break
;
case
"pre"
:
...
...
src/api/axios.js
View file @
dd726b7
...
...
@@ -39,7 +39,9 @@ service.interceptors.request.use(
// 判断是否存在token,如果存在的话,则每个http header都加上token
config
.
headers
.
authorization
=
atoken
;
}
else
{
router
.
push
(
"/login"
).
catch
(
err
=>
{
err
});
if
(
!
config
.
url
.
indexOf
(
"ddlogin"
)
>
-
1
)
{
router
.
push
(
"/login"
).
catch
(
err
=>
{
err
});
}
// endLoading();
}
if
(
config
.
method
==
"get"
)
{
...
...
src/api/baseUrl.js
View file @
dd726b7
/*
* @Author: your name
* @Date: 2021-08-10 14:14:27
* @LastEditTime: 2021-11-11 12:15:46
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /fanxing_new/src/api/baseUrl.js
*/
let
baseUrl
=
"/api"
;
// 本地代理
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.245:20070"
:
"http://1
92.168.9.233
:20080"
;
// 测试环境url
baseUrl
=
window
.
config
.
https
?
"https://192.168.9.245:20070"
:
"http://1
23.6.38.39
: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/views/Login.vue
View file @
dd726b7
...
...
@@ -340,6 +340,11 @@ export default {
mounted
()
{
particlesJS
(
"login"
,
particlesConfig
);
document
.
body
.
style
.
overflow
=
"hidden"
;
let
{
href
}
=
window
.
location
,
code
=
""
;
if
(
href
.
includes
(
"code"
))
{
this
.
$router
.
push
(
'/ddlogin'
)
}
},
created
()
{
this
.
logintitle
=
window
.
config
.
logintitle
;
...
...
src/views/ddlogin.vue
View file @
dd726b7
...
...
@@ -37,7 +37,7 @@ export default {
},
getLoginInfo
(
code
)
{
this
.
$api
.
login
.
ddlogin
({
"code"
:
code
.
split
(
"="
)[
1
]}).
then
(
res
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
this
.
loginMount
(
res
.
data
);
}
else
if
(
res
.
code
==
500
)
{
window
.
location
.
href
=
this
.
ddLoginUrl
;
...
...
@@ -65,7 +65,10 @@ export default {
// this.$router.push('resetpass')
// return;
// }
//算法配置列表
setTimeout
(()
=>
{
//算法配置列表
this
.
algoList
();
//存储配置列表
this
.
storeConfList
();
...
...
@@ -75,7 +78,6 @@ export default {
this
.
getCustomCode
();
this
.
getEventList
();
this
.
getDev
();
setTimeout
(()
=>
{
this
.
getMenu
(
res
.
user_unid
);
},
10
);
},
...
...
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