Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
founder_vue
Commits
842f9786
Commit
842f9786
authored
Dec 11, 2021
by
米嘉伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://47.92.108.28/changchao/founder_vue
into dev_zwpt
parents
cb54832f
9764cba1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
251 additions
and
113 deletions
+251
-113
src/assets/styles/main.scss
+3
-1
src/components/Cascader.vue
+55
-1
src/plugins/axios.js
+6
-5
src/router/index.js
+1
-1
src/store/modules/loading.js
+14
-9
src/store/modules/mutations-types.js
+3
-1
src/utils/requestLoading.js
+1
-1
src/views/Home.vue
+0
-0
src/views/Home/Home.vue
+2
-2
src/views/SystemManage/GroupManage.vue
+2
-1
src/views/SystemManage/GroupPermission.vue
+1
-1
src/views/SystemManage/PermissionManage.vue
+6
-1
src/views/SystemManage/RoleManage.vue
+28
-9
src/views/SystemManage/UserManage.vue
+2
-0
src/views/SystemManage/UserPermission.vue
+1
-1
src/views/SystemManage/scss/group.scss
+6
-2
src/views/SystemManage/scss/user.scss
+5
-2
src/views/cxyrd/LL.vue
+66
-41
src/views/cxyrd/QueryConfirm.vue
+16
-6
src/views/cxyrd/TT.vue
+0
-0
src/views/cxyrd/modules/LLCandidate.vue
+3
-7
src/views/cxyrd/modules/LLSrc.vue
+1
-1
src/views/cxyrd/modules/TTPlam.vue
+14
-5
src/views/login/modules/AccountsLogin.vue
+1
-1
vue.config.js
+14
-14
No files found.
src/assets/styles/main.scss
View file @
842f9786
...
@@ -5,7 +5,9 @@
...
@@ -5,7 +5,9 @@
margin
:
0
;
margin
:
0
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
}
body
{
overflow
:
hidden
;
}
.disabel
{
.disabel
{
border
:
none
!
important
;
border
:
none
!
important
;
background-color
:
#ecedf1
!
important
;
background-color
:
#ecedf1
!
important
;
...
...
src/components/Cascader.vue
View file @
842f9786
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-1
1-30 13:45:59
* @LastEditTime: 2021-1
2-09 15:57:53
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
* @FilePath: \founder_vue\src\components\confrim.vue
-->
-->
<
template
>
<
template
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"valStr"
:disabled=
"disable"
placement=
"top-start"
:open-delay=
"1000"
>
<div
:style=
"
{ width: width + 'rem' }">
<div
:style=
"
{ width: width + 'rem' }">
<el-cascader
<el-cascader
v-model=
"form[id]"
v-model=
"form[id]"
...
@@ -23,6 +31,7 @@
...
@@ -23,6 +31,7 @@
>
>
</el-cascader>
</el-cascader>
</div>
</div>
</el-tooltip>
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
...
@@ -31,8 +40,28 @@ export default {
...
@@ -31,8 +40,28 @@ export default {
options
:
[],
options
:
[],
casVal
:
null
,
casVal
:
null
,
placeholder
:
"请选择"
,
placeholder
:
"请选择"
,
valStr
:
""
,
valTempStr
:
""
,
};
};
},
},
watch
:
{
form
:
{
handler
(
val
)
{
//保存选中的label
setTimeout
(()
=>
{
//获取提示的中文
this
.
valStr
=
$
(
this
.
$refs
.
cascader
.
$el
).
find
(
"input"
).
val
();
//如果是单位,从后截图6位中文然后赋值
if
(
!
this
.
codeName
)
{
this
.
valTempStr
=
this
.
getTemplateStr
(
this
.
valStr
);
$
(
this
.
$refs
.
cascader
.
$el
).
find
(
"input"
).
val
(
this
.
valTempStr
);
}
},
0
);
},
immediate
:
true
,
deep
:
true
,
},
},
props
:
{
props
:
{
props
:
{
props
:
{
type
:
Object
,
type
:
Object
,
...
@@ -56,13 +85,38 @@ export default {
...
@@ -56,13 +85,38 @@ export default {
},
},
codeName
:
String
,
codeName
:
String
,
},
},
computed
:
{
disable
()
{
if
(
this
.
valStr
?.
trim
()
==
""
||
this
.
form
[
this
.
id
]?.
trim
()
==
""
)
{
return
true
;
}
else
{
return
false
;
}
},
},
methods
:
{
methods
:
{
change
(
val
)
{
change
(
val
)
{
let
newVal
=
val
;
let
newVal
=
val
;
if
(
!
newVal
)
newVal
=
""
;
if
(
!
newVal
)
newVal
=
""
;
this
.
$set
(
this
.
form
,
this
.
id
,
newVal
);
this
.
$set
(
this
.
form
,
this
.
id
,
newVal
);
//选择完以后关闭下拉版
this
.
$refs
.
cascader
.
dropDownVisible
=
false
;
this
.
$refs
.
cascader
.
dropDownVisible
=
false
;
},
},
getTemplateStr
(
str
)
{
let
newStr
;
let
index
=
str
.
indexOf
(
"["
);
if
(
index
>=
0
)
{
if
(
index
>
6
)
{
newStr
=
"..."
+
str
.
slice
(
index
-
6
);
}
if
(
index
<=
6
)
{
newStr
=
str
;
}
}
else
{
newStr
=
""
;
}
return
newStr
;
},
getTreeData
(
data
)
{
getTreeData
(
data
)
{
if
(
data
&&
data
.
length
>
0
)
{
if
(
data
&&
data
.
length
>
0
)
{
return
data
.
map
((
item
)
=>
({
return
data
.
map
((
item
)
=>
({
...
...
src/plugins/axios.js
View file @
842f9786
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-
08 17:13:56
* @LastEditTime: 2021-12-
10 21:07:12
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
...
@@ -65,6 +65,10 @@ _axios.interceptors.request.use(
...
@@ -65,6 +65,10 @@ _axios.interceptors.request.use(
_axios
.
interceptors
.
response
.
use
(
_axios
.
interceptors
.
response
.
use
(
function
(
response
)
{
function
(
response
)
{
if
(
response
.
headers
.
token
)
localStorage
.
setItem
(
"token"
,
response
.
headers
.
token
);
if
(
response
.
headers
.
token
)
localStorage
.
setItem
(
"token"
,
response
.
headers
.
token
);
if
(
response
.
config
.
loading
!==
false
)
{
hideLoading
(
response
.
config
.
loadingTarget
);
// console.log(response.config.loadingTarget);
}
if
(
response
.
data
.
code
==
401
)
{
if
(
response
.
data
.
code
==
401
)
{
if
(
resTimer
)
clearTimeout
(
resTimer
)
if
(
resTimer
)
clearTimeout
(
resTimer
)
resTimer
=
setTimeout
(()
=>
{
resTimer
=
setTimeout
(()
=>
{
...
@@ -77,10 +81,7 @@ _axios.interceptors.response.use(
...
@@ -77,10 +81,7 @@ _axios.interceptors.response.use(
}).
catch
(()
=>
{
}).
catch
(()
=>
{
});
});
},
500
);
},
500
);
}
return
;
if
(
response
.
config
.
loading
!==
false
)
{
hideLoading
(
response
.
config
.
loadingTarget
);
// console.log(response.config.loadingTarget);
}
}
// NProgress.done();
// NProgress.done();
return
response
;
return
response
;
...
...
src/router/index.js
View file @
842f9786
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-
08 17:20:24
* @LastEditTime: 2021-12-
10 16:41:15
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\router\index.js
* @FilePath: \指纹系统\founder_vue\src\router\index.js
...
...
src/store/modules/loading.js
View file @
842f9786
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2021-11-04 11:12:33
* @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-12-0
5 20:34:25
* @LastEditTime: 2021-12-0
9 10:08:11
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/
*/
import
{
SET_LOADING
,
SET_JUMPROUTE
,
SET_PREROUTE
,
SET_WILLROUTE
,
SET_SMALLLOADING
,
SET_LOADINGSD
}
from
"./mutations-types"
;
import
{
SET_LOADING
,
SET_JUMPROUTE
,
SET_PREROUTE
,
SET_WILLROUTE
,
SET_SMALLLOADING
,
SET_LOADINGSD
,
SET_GLASS
}
from
"./mutations-types"
;
const
state
=
{
const
state
=
{
// 是否处于加载中
// 是否处于加载中
loading
:
false
,
loading
:
false
,
...
@@ -18,28 +18,33 @@ const state = {
...
@@ -18,28 +18,33 @@ const state = {
// 即将要跳转的路由
// 即将要跳转的路由
willRoute
:
''
,
willRoute
:
''
,
// 手动路由加载
// 手动路由加载
loading_sd
:
false
loading_sd
:
false
,
//全局毛玻璃
groundGlassBoo
:
false
,
};
};
const
mutations
=
{
const
mutations
=
{
[
SET_LOADING
]
(
state
,
content
)
{
[
SET_LOADING
](
state
,
content
)
{
state
.
loading
=
content
state
.
loading
=
content
},
},
[
SET_JUMPROUTE
]
(
state
,
content
)
{
[
SET_JUMPROUTE
](
state
,
content
)
{
state
.
jumproute
=
content
state
.
jumproute
=
content
},
},
[
SET_PREROUTE
]
(
state
,
content
)
{
[
SET_PREROUTE
](
state
,
content
)
{
state
.
preRoute
=
content
state
.
preRoute
=
content
},
},
[
SET_WILLROUTE
]
(
state
,
content
)
{
[
SET_WILLROUTE
](
state
,
content
)
{
state
.
willRoute
=
content
state
.
willRoute
=
content
},
},
[
SET_SMALLLOADING
]
(
state
,
content
)
{
[
SET_SMALLLOADING
](
state
,
content
)
{
state
.
smallLoading
=
content
state
.
smallLoading
=
content
},
},
[
SET_LOADINGSD
]
(
state
,
content
)
{
[
SET_LOADINGSD
](
state
,
content
)
{
state
.
loading_sd
=
content
state
.
loading_sd
=
content
},
},
[
SET_GLASS
](
state
,
content
)
{
state
.
groundGlassBoo
=
content
},
};
};
const
actions
=
{
const
actions
=
{
...
...
src/store/modules/mutations-types.js
View file @
842f9786
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2021-11-04 13:14:49
* @Date: 2021-11-04 13:14:49
* @LastEditTime: 2021-12-0
6 11:46:37
* @LastEditTime: 2021-12-0
9 10:07:50
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
...
@@ -43,3 +43,5 @@ export const SET_LOADINGSD = 'setLoadingSd'
...
@@ -43,3 +43,5 @@ export const SET_LOADINGSD = 'setLoadingSd'
// 是否切换到了人像
// 是否切换到了人像
export
const
SET_ISFACE
=
'setIsFace'
export
const
SET_ISFACE
=
'setIsFace'
// 记录全局毛玻璃是否开启
export
const
SET_GLASS
=
'setGlass'
src/utils/requestLoading.js
View file @
842f9786
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2021-11-26 16:37:59
* @Date: 2021-11-26 16:37:59
* @LastEditTime: 2021-12-0
7 20:15:55
* @LastEditTime: 2021-12-0
9 17:10:50
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\utils\requestLoading.js
* @FilePath: \founder_vue\src\utils\requestLoading.js
...
...
src/views/Home.vue
View file @
842f9786
This diff is collapsed.
Click to expand it.
src/views/Home/Home.vue
View file @
842f9786
...
@@ -140,7 +140,7 @@ export default {
...
@@ -140,7 +140,7 @@ export default {
},
},
logout
()
{
logout
()
{
this
.
$axios
this
.
$axios
.
get
(
"/
login/login
/logout"
)
.
get
(
"/
security
/logout"
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
if
(
res
.
data
.
code
==
200
)
{
localStorage
.
removeItem
(
"token"
);
//删除名称为“token”的信息。
localStorage
.
removeItem
(
"token"
);
//删除名称为“token”的信息。
...
@@ -158,7 +158,7 @@ export default {
...
@@ -158,7 +158,7 @@ export default {
},
},
created
()
{
created
()
{
sessionStorage
.
setItem
(
"crumbs"
,
[]);
sessionStorage
.
setItem
(
"crumbs"
,
[]);
this
.
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
))
.
user
;
this
.
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
));
console
.
log
(
this
.
userInfo
);
console
.
log
(
this
.
userInfo
);
},
},
};
};
...
...
src/views/SystemManage/GroupManage.vue
View file @
842f9786
...
@@ -1333,6 +1333,7 @@ export default {
...
@@ -1333,6 +1333,7 @@ export default {
},
},
activated
()
{
activated
()
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
this
.
search
();
this
.
search
();
});
});
},
},
...
@@ -1345,9 +1346,9 @@ export default {
...
@@ -1345,9 +1346,9 @@ export default {
mounted
()
{
mounted
()
{
this
.
search
();
this
.
search
();
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
this
.
search
();
this
.
search
();
});
});
debugger
;
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
document
.
body
.
appendChild
(
this
.
$refs
.
isShowEditGroupDialog
);
document
.
body
.
appendChild
(
this
.
$refs
.
isShowEditGroupDialog
);
document
.
body
.
appendChild
(
this
.
$refs
.
isShowAddUserDialog
);
document
.
body
.
appendChild
(
this
.
$refs
.
isShowAddUserDialog
);
...
...
src/views/SystemManage/GroupPermission.vue
View file @
842f9786
...
@@ -488,7 +488,7 @@
...
@@ -488,7 +488,7 @@
import
"@/icons/group-item.svg"
;
import
"@/icons/group-item.svg"
;
import
qs
from
"qs"
;
import
qs
from
"qs"
;
export
default
{
export
default
{
name
:
"UserPermission"
,
//
name: "UserPermission",
data
()
{
data
()
{
return
{
return
{
id
:
""
,
id
:
""
,
...
...
src/views/SystemManage/PermissionManage.vue
View file @
842f9786
...
@@ -295,7 +295,7 @@
...
@@ -295,7 +295,7 @@
ref=
"multipleTable"
ref=
"multipleTable"
:data=
"groupTableData"
:data=
"groupTableData"
:key=
"key2"
:key=
"key2"
class=
"table"
class=
"table
groupTable
"
>
>
<el-table-column
<el-table-column
prop=
"name"
prop=
"name"
...
@@ -969,6 +969,7 @@ export default {
...
@@ -969,6 +969,7 @@ export default {
},
},
activated
()
{
activated
()
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
if
(
this
.
isUser
)
{
if
(
this
.
isUser
)
{
this
.
searchUser
();
this
.
searchUser
();
}
else
{
}
else
{
...
@@ -984,6 +985,7 @@ export default {
...
@@ -984,6 +985,7 @@ export default {
},
},
mounted
()
{
mounted
()
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
if
(
this
.
isUser
)
{
if
(
this
.
isUser
)
{
this
.
searchUser
();
this
.
searchUser
();
}
else
{
}
else
{
...
@@ -1009,6 +1011,9 @@ export default {
...
@@ -1009,6 +1011,9 @@ export default {
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
@import
"scss/group"
;
@import
"scss/group"
;
@import
"scss/permission"
;
@import
"scss/permission"
;
.groupTable
{
height
:
550px
!important
;
}
.el-table
/
deep
/
{
.el-table
/
deep
/
{
.el-tooltip
{
.el-tooltip
{
width
:
100%
!important
;
width
:
100%
!important
;
...
...
src/views/SystemManage/RoleManage.vue
View file @
842f9786
...
@@ -491,7 +491,7 @@ export default {
...
@@ -491,7 +491,7 @@ export default {
if
(
item
)
{
if
(
item
)
{
let
id
=
this
.
diyRoleList
.
length
+
20
+
"copy"
;
let
id
=
this
.
diyRoleList
.
length
+
20
+
"copy"
;
var
roleitem
=
{
var
roleitem
=
{
name
:
item
.
name
+
"_copy
"
,
name
:
"请输入名称
"
,
value
:
""
,
value
:
""
,
flag
:
false
,
flag
:
false
,
code
:
this
.
diyRoleList
.
length
,
code
:
this
.
diyRoleList
.
length
,
...
@@ -520,11 +520,14 @@ export default {
...
@@ -520,11 +520,14 @@ export default {
// 保存
// 保存
save
()
{
save
()
{
let
self
=
this
;
let
self
=
this
;
//如果是添加角色
if
(
this
.
customAddUser
.
length
>
0
)
{
if
(
this
.
customAddUser
.
length
>
0
)
{
//如果选的用户不是添加的用户
if
(
this
.
diyRoleItemIndex
!==
this
.
customAddUser
[
0
].
id
)
{
if
(
this
.
diyRoleItemIndex
!==
this
.
customAddUser
[
0
].
id
)
{
let
userObj
=
this
.
diyRoleList
.
find
(
let
userObj
=
this
.
diyRoleList
.
find
(
(
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
(
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
);
);
debugger
;
//修改
//修改
let
obj
=
{
let
obj
=
{
id
:
this
.
diyRoleItemIndex
,
id
:
this
.
diyRoleItemIndex
,
...
@@ -535,7 +538,7 @@ export default {
...
@@ -535,7 +538,7 @@ export default {
return
;
return
;
}
}
console
.
log
(
this
.
customAddUser
);
console
.
log
(
this
.
customAddUser
);
//如果位置在新增的用户就新增
let
name
=
this
.
customAddUser
[
0
].
value
;
let
name
=
this
.
customAddUser
[
0
].
value
;
let
checkArr
=
this
.
checkList
;
let
checkArr
=
this
.
checkList
;
let
params
=
{
let
params
=
{
...
@@ -571,12 +574,12 @@ export default {
...
@@ -571,12 +574,12 @@ export default {
},
800
);
},
800
);
}
else
{
}
else
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
$message
.
success
(
"新增角色失败!"
);
this
.
$message
.
error
(
res
.
data
.
detail
);
},
800
);
},
800
);
}
}
});
});
}
else
{
}
else
{
//修改
//修改
角色
let
userObj
=
this
.
diyRoleList
.
find
(
let
userObj
=
this
.
diyRoleList
.
find
(
(
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
(
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
);
);
...
@@ -589,6 +592,7 @@ export default {
...
@@ -589,6 +592,7 @@ export default {
this
.
editUserRole
(
obj
);
this
.
editUserRole
(
obj
);
}
}
},
},
//选中主的全选子的,取消主的取消全部子的
handleCheckAllChange
(
boo
,
id
)
{
handleCheckAllChange
(
boo
,
id
)
{
let
obj
=
this
.
permissionDataList
.
find
((
i
)
=>
i
.
id
==
id
);
let
obj
=
this
.
permissionDataList
.
find
((
i
)
=>
i
.
id
==
id
);
let
sonArr
=
obj
.
children
.
map
((
i
)
=>
i
.
id
);
let
sonArr
=
obj
.
children
.
map
((
i
)
=>
i
.
id
);
...
@@ -619,12 +623,15 @@ export default {
...
@@ -619,12 +623,15 @@ export default {
this
.
checkList
=
[];
this
.
checkList
=
[];
}
}
}
}
//分开button,重构数据
this
.
defaultRoleBtns
=
result
.
filter
((
i
)
=>
i
.
defaultFlag
==
1
);
this
.
defaultRoleBtns
=
result
.
filter
((
i
)
=>
i
.
defaultFlag
==
1
);
this
.
diyRoleList
=
result
.
filter
((
i
)
=>
{
this
.
diyRoleList
=
JSON
.
parse
(
JSON
.
stringify
(
result
)).
filter
(
(
i
)
=>
{
i
.
value
=
i
.
name
;
i
.
value
=
i
.
name
;
i
.
name
=
"请输入名称"
;
return
i
.
defaultFlag
==
0
;
return
i
.
defaultFlag
==
0
;
});
}
);
//console.log(1111111, this.diyRoleList);
//console.log(1111111, this.diyRoleList);
let
arr
=
[...
this
.
diyRoleList
,
...
this
.
defaultRoleBtns
];
let
arr
=
[...
this
.
diyRoleList
,
...
this
.
defaultRoleBtns
];
let
obj
=
arr
.
find
((
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
);
let
obj
=
arr
.
find
((
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
);
...
@@ -644,6 +651,13 @@ export default {
...
@@ -644,6 +651,13 @@ export default {
this
.
$message
.
error
(
"请选择角色后操作"
);
this
.
$message
.
error
(
"请选择角色后操作"
);
return
;
return
;
}
}
if
(
this
.
customAddUser
.
length
>
0
&&
this
.
btnCheckList
.
includes
(
this
.
customAddUser
[
0
].
id
)
)
{
this
.
$message
.
error
(
"请保存后进行删除操作"
);
return
;
}
let
ids
=
this
.
btnCheckList
.
join
(
","
);
let
ids
=
this
.
btnCheckList
.
join
(
","
);
let
boo
=
this
.
btnCheckList
.
find
((
i
)
=>
i
==
this
.
diyRoleItemIndex
);
let
boo
=
this
.
btnCheckList
.
find
((
i
)
=>
i
==
this
.
diyRoleItemIndex
);
let
loading
=
this
.
$loading
({
let
loading
=
this
.
$loading
({
...
@@ -688,7 +702,7 @@ export default {
...
@@ -688,7 +702,7 @@ export default {
let
id
=
this
.
diyRoleList
.
length
+
20
+
"l"
;
let
id
=
this
.
diyRoleList
.
length
+
20
+
"l"
;
var
roleitem
=
{
var
roleitem
=
{
value
:
""
,
value
:
""
,
name
:
"
自定义"
+
(
this
.
diyRoleList
.
length
+
1
)
,
name
:
"
请输入名称"
,
flag
:
false
,
flag
:
false
,
code
:
this
.
diyRoleList
.
length
,
code
:
this
.
diyRoleList
.
length
,
edit
:
true
,
edit
:
true
,
...
@@ -748,6 +762,10 @@ export default {
...
@@ -748,6 +762,10 @@ export default {
this
.
$message
.
success
(
"更新成功"
);
this
.
$message
.
success
(
"更新成功"
);
},
500
);
},
500
);
this
.
resetEdit
();
this
.
resetEdit
();
}
else
{
setTimeout
(()
=>
{
this
.
$message
.
error
(
res
.
data
.
detail
);
},
500
);
}
}
});
});
},
},
...
@@ -761,6 +779,7 @@ export default {
...
@@ -761,6 +779,7 @@ export default {
this
.
viewSelect
(
item
);
this
.
viewSelect
(
item
);
this
.
diyRoleItemIndex
=
item
.
id
;
this
.
diyRoleItemIndex
=
item
.
id
;
},
},
// 选中的权限
viewSelect
(
item
)
{
viewSelect
(
item
)
{
this
.
checkList
=
this
.
checkList
=
(
item
.
permissions
&&
item
.
permissions
.
map
((
i
)
=>
i
.
id
))
||
[];
(
item
.
permissions
&&
item
.
permissions
.
map
((
i
)
=>
i
.
id
))
||
[];
...
@@ -774,7 +793,7 @@ export default {
...
@@ -774,7 +793,7 @@ export default {
this
.
diyRoleItemIndex
=
item
.
id
;
this
.
diyRoleItemIndex
=
item
.
id
;
this
.
viewSelect
(
item
);
this
.
viewSelect
(
item
);
},
},
// 编辑
// 编辑
以后出现输入框的一系列细节
editDiyRoleItem
(
item
)
{
editDiyRoleItem
(
item
)
{
let
edit
=
item
.
edit
;
let
edit
=
item
.
edit
;
let
index
=
this
.
diyRoleList
.
findIndex
((
i
)
=>
i
.
id
==
item
.
id
);
let
index
=
this
.
diyRoleList
.
findIndex
((
i
)
=>
i
.
id
==
item
.
id
);
...
...
src/views/SystemManage/UserManage.vue
View file @
842f9786
...
@@ -1118,6 +1118,7 @@ export default {
...
@@ -1118,6 +1118,7 @@ export default {
},
},
activated
()
{
activated
()
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
;
this
.
search
();
this
.
search
();
});
});
},
},
...
@@ -1130,6 +1131,7 @@ export default {
...
@@ -1130,6 +1131,7 @@ export default {
mounted
()
{
mounted
()
{
this
.
search
();
this
.
search
();
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
;
this
.
search
();
this
.
search
();
});
});
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
...
...
src/views/SystemManage/UserPermission.vue
View file @
842f9786
...
@@ -412,7 +412,7 @@
...
@@ -412,7 +412,7 @@
<
script
>
<
script
>
export
default
{
export
default
{
name
:
"UserPermission"
,
//
name: "UserPermission",
data
()
{
data
()
{
return
{
return
{
id
:
""
,
id
:
""
,
...
...
src/views/SystemManage/scss/group.scss
View file @
842f9786
...
@@ -223,9 +223,12 @@
...
@@ -223,9 +223,12 @@
}
}
}
}
.table-data
{
.table-data
/
deep
/
{
height
:
5
8
0px
;
height
:
5
3
0px
;
width
:
100%
;
width
:
100%
;
.el-table
{
height
:
510px
!
important
;
}
.tagsBox
{
.tagsBox
{
display
:
flex
;
display
:
flex
;
.el-tooltip
{
.el-tooltip
{
...
@@ -329,6 +332,7 @@
...
@@ -329,6 +332,7 @@
}
}
}
}
.el-table
/
deep
/
{
.el-table
/
deep
/
{
.is-checked
{
.is-checked
{
.el-checkbox__inner
{
.el-checkbox__inner
{
background
:
#055fe7
;
background
:
#055fe7
;
...
...
src/views/SystemManage/scss/user.scss
View file @
842f9786
...
@@ -181,9 +181,12 @@
...
@@ -181,9 +181,12 @@
}
}
}
}
}
}
.table-data
{
.table-data
/
deep
/
{
height
:
5
8
0px
;
height
:
5
3
0px
;
width
:
100%
;
width
:
100%
;
.el-table
{
height
:
510px
!
important
;
}
.tagsBox
{
.tagsBox
{
display
:
flex
;
display
:
flex
;
.el-tooltip
{
.el-tooltip
{
...
...
src/views/cxyrd/LL.vue
View file @
842f9786
...
@@ -13,6 +13,11 @@
...
@@ -13,6 +13,11 @@
<div
class=
"lt_main_left"
>
<div
class=
"lt_main_left"
>
<LLSrc
<LLSrc
:src-data=
"qid"
:src-data=
"qid"
@
sourceObj=
"
(val) =>
{
sourceObj = val;
}
"
@switchName="
@switchName="
(val) => {
(val) => {
fingerShowType = val;
fingerShowType = val;
...
@@ -27,7 +32,14 @@
...
@@ -27,7 +32,14 @@
<ImageEd></ImageEd>
<ImageEd></ImageEd>
</div>
</div>
<div
class=
"lt_main_right"
>
<div
class=
"lt_main_right"
>
<LLCandidate
:fingerShowType=
"fingerShowType"
></LLCandidate>
<LLCandidate
:fingerShowType=
"fingerShowType"
@
targetObj=
"
(val) =>
{
targetObj = val;
}
"
>
</LLCandidate>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -59,7 +71,7 @@
...
@@ -59,7 +71,7 @@
串查
串查
</div>
</div>
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
style=
"visibility: hidden"
>
<div
class=
"bzname"
>
现场勘验编号:
</div>
<div
class=
"bzname"
>
现场勘验编号:
</div>
<div
class=
"bzvalue"
>
{{
xckybh
}}
</div>
<div
class=
"bzvalue"
>
{{
xckybh
}}
</div>
</div>
</div>
...
@@ -115,30 +127,31 @@
...
@@ -115,30 +127,31 @@
<div
class=
"bz-target"
>
<div
class=
"bz-target"
>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中单位:
</div>
<div
class=
"bzname"
>
比中单位:
</div>
<div
class=
"bzvalue"
>
{{
bz
dw
}}
</div>
<div
class=
"bzvalue"
>
{{
bz
r
.
unitName
}}
</div>
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人:
</div>
<div
class=
"bzname"
>
比中人:
</div>
<div
class=
"bzvalue"
>
{{
bzr
}}
</div>
<div
class=
"bzvalue"
>
{{
bzr
.
name
}}
</div>
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
单位代码:
</div>
<div
class=
"bzname"
>
单位代码:
</div>
<div
class=
"bzvalue"
>
{{
dwdm
}}
</div>
<div
class=
"bzvalue"
>
{{
bzr
.
unitCode
}}
</div>
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人身份证号:
</div>
<div
class=
"bzname"
>
比中人身份证号:
</div>
<div
class=
"bzvalue"
>
{{
bzr
sfzh
}}
</div>
<div
class=
"bzvalue"
>
{{
bzr
.
idCard
}}
</div>
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中时间:
</div>
<div
class=
"bzname"
>
比中时间:
</div>
<div
class=
"bzvalue"
>
{{
bz
sj
}}
</div>
<div
class=
"bzvalue"
>
{{
bz
r
.
bzTime
}}
</div>
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人联系电话:
</div>
<div
class=
"bzname"
>
比中人联系电话:
</div>
<el-input
<el-input
class=
"bzphone"
class=
"bzphone"
v-model=
"
phone
"
v-model=
"
bzr.phoneNumber
"
placeholder=
"请输入内容"
placeholder=
"请输入内容"
disabled
></el-input>
></el-input>
<div
class=
"input-error"
v-show=
"isPhoneError"
>
<div
class=
"input-error"
v-show=
"isPhoneError"
>
<!--
<img
src=
"@/assets/img/inputerror.png"
alt=
""
>
-->
<!--
<img
src=
"@/assets/img/inputerror.png"
alt=
""
>
-->
...
@@ -233,10 +246,23 @@ export default {
...
@@ -233,10 +246,23 @@ export default {
xckybh
:
""
,
xckybh
:
""
,
rybh
:
""
,
rybh
:
""
,
zw
:
""
,
zw
:
""
,
//比中人信息
bzr
:
{
bzTime
:
""
,
idCard
:
""
,
phoneNumber
:
""
,
name
:
""
,
unitCode
:
""
,
unitName
:
""
,
},
// 是否展示认定完成确认框背景
// 是否展示认定完成确认框背景
isShowrdwcDialogBg
:
false
,
isShowrdwcDialogBg
:
false
,
// 是否展示认定完成确认框
// 是否展示认定完成确认框
isShowrdwcDialog
:
false
,
isShowrdwcDialog
:
false
,
//当前选中的源对象
sourceObj
:
{},
//当前选中的目标对象
targetObj
:
{},
};
};
},
},
created
()
{
created
()
{
...
@@ -336,27 +362,35 @@ export default {
...
@@ -336,27 +362,35 @@ export default {
return
;
return
;
}
}
// 3:串查
// 3:串查
let
query
type
=
3
;
let
query
Type
=
"3"
;
this
.
$axios
({
this
.
$axios
({
method
:
"post"
,
method
:
"post"
,
url
:
"/api/matchcand/affirm/hit"
,
url
:
"/api/matchcand/affirm/hit"
,
data
:
{
data
:
{
affirmstatus
,
srcseqno
:
parseInt
(
srcseqno
),
srcseqno
,
destseqno
:
parseInt
(
destseqno
),
destseqno
,
srcbarcode
,
srcbarcode
,
destbarcode
,
destbarcode
,
qqid
,
qqid
:
parseInt
(
qqid
)
,
qid
,
qid
:
parseInt
(
qid
)
,
query
t
ype
,
query
T
ype
,
affirmDescribe
:
self
.
textarea
,
affirmDescribe
:
self
.
textarea
,
userName
:
self
.
bzr
.
name
,
idCard
:
self
.
bzr
.
idCard
,
tel
:
self
.
bzr
.
phoneNumber
,
unit
:
self
.
bzr
.
unitName
,
unitCode
:
self
.
bzr
.
unitCode
,
affirmtime
:
new
Date
(
self
.
bzr
.
bzTime
),
},
},
})
})
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
if
(
response
.
data
.
code
==
0
){
// 跟新列表数据
// 跟新列表数据
self
.
$bus
.
emit
(
"updateFinderSource"
);
self
.
$bus
.
emit
(
"updateFinderSource"
);
//console.log(response);
this
.
$message
.
success
(
"比中成功!"
);
this
.
$message
.
success
(
"比中成功!"
);
}
else
{
this
.
$message
.
error
(
response
.
data
.
message
)
}
})
})
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{
this
.
$message
.
error
(
"比中失败!"
);
this
.
$message
.
error
(
"比中失败!"
);
...
@@ -398,6 +432,7 @@ export default {
...
@@ -398,6 +432,7 @@ export default {
"xh"
,
"xh"
,
sessionStorage
.
getItem
(
"destseqno"
)
||
""
sessionStorage
.
getItem
(
"destseqno"
)
||
""
);
);
this
.
$set
(
this
.
bzr
,
"bzTime"
,
result
.
time
);
}
}
});
});
},
},
...
@@ -422,33 +457,9 @@ export default {
...
@@ -422,33 +457,9 @@ export default {
}
}
}
}
this
.
$set
(
self
.
source
,
"xh"
,
sessionStorage
.
getItem
(
"zcseq"
)
||
""
);
this
.
$set
(
self
.
source
,
"xh"
,
sessionStorage
.
getItem
(
"zcseq"
)
||
""
);
this
.
$set
(
this
.
bzr
,
"bzTime"
,
result
.
time
);
}
}
});
});
// this.$axios({
// method: "post",
// url: "/api/user/searchByUserid",
// data: {
// id: id,
// },
// loading: false,
// }).then(async (res) => {
// if (res.data.code == 0) {
// let data = res.data.ret[0];
// //console.log(data);
// let dw = await self.$axios({
// method: "get",
// url: "/api/code/unit/one/" + data.userunit,
// loading: false,
// });
// let time = new Date(data.updatetime);
// self.bzsj = Utils.timeStampTurnTime2(time);
// self.bzr = data.userdesc;
// self.dwdm = dw.data.ret.code;
// self.bzdw = dw.data.ret.name;
// self.bzrsfzh = data.idcard;
// self.phone = data.telephone;
// }
// });
},
},
/**
/**
* @description: 比中
* @description: 比中
...
@@ -456,12 +467,26 @@ export default {
...
@@ -456,12 +467,26 @@ export default {
* @return {*}
* @return {*}
*/
*/
Bz
()
{
Bz
()
{
if
(
(
this
.
targetObj
.
affirmstatus
==
2
||
this
.
targetObj
.
affirmstatus
==
3
)
&&
(
this
.
sourceObj
.
affirmstatus
==
2
||
this
.
sourceObj
.
affirmstatus
==
3
)
)
{
this
.
$message
.
error
(
"已经比中过的数据无法再次比中!"
);
return
;
}
let
params
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
));
for
(
let
key
in
this
.
bzr
)
{
this
.
bzr
[
key
]
=
params
[
key
];
}
this
.
getUserInfo
();
this
.
getUserInfo
();
this
.
getUserInfo2
();
this
.
getUserInfo2
();
this
.
asjbh
=
sessionStorage
.
getItem
(
"srcbarcode"
);
this
.
asjbh
=
sessionStorage
.
getItem
(
"srcbarcode"
);
this
.
xh
=
sessionStorage
.
getItem
(
"srcseqno"
);
this
.
xh
=
sessionStorage
.
getItem
(
"srcseqno"
);
this
.
rybh
=
sessionStorage
.
getItem
(
"destbarcode"
);
this
.
rybh
=
sessionStorage
.
getItem
(
"destbarcode"
);
this
.
judgeZw
(
Number
(
sessionStorage
.
getItem
(
"destseqno"
)));
this
.
judgeZw
(
Number
(
sessionStorage
.
getItem
(
"destseqno"
)));
this
.
isShowbzDialogBg
=
true
;
this
.
isShowbzDialogBg
=
true
;
this
.
isShowbzDialog
=
true
;
this
.
isShowbzDialog
=
true
;
},
},
...
...
src/views/cxyrd/QueryConfirm.vue
View file @
842f9786
...
@@ -25,8 +25,8 @@
...
@@ -25,8 +25,8 @@
@
change=
"selectUserInfo"
@
change=
"selectUserInfo"
>
>
<el-option
<el-option
v-for=
"
item
in userOption"
v-for=
"
(item,index)
in userOption"
:key=
"i
tem.userid
"
:key=
"i
ndex
"
:label=
"item.userdesc"
:label=
"item.userdesc"
:value=
"item.userid"
:value=
"item.userid"
>
>
...
@@ -34,10 +34,10 @@
...
@@ -34,10 +34,10 @@
</el-select>
</el-select>
</div>
</div>
<div
class=
"display_style"
>
<div
class=
"display_style"
>
<span>
任务号/
查询ID:
</span>
<span>
查询ID:
</span>
<el-input
<el-input
class=
"el_input"
class=
"el_input"
placeholder=
"请输入
任务号/
查询ID"
placeholder=
"请输入查询ID"
v-model=
"reqParam.contrastCustomSearchReq.qqid"
v-model=
"reqParam.contrastCustomSearchReq.qqid"
></el-input>
></el-input>
</div>
</div>
...
@@ -62,6 +62,9 @@
...
@@ -62,6 +62,9 @@
range-separator=
"-"
range-separator=
"-"
start-placeholder=
"开始时间"
start-placeholder=
"开始时间"
end-placeholder=
"结束时间"
end-placeholder=
"结束时间"
:picker-options=
"
{
disabledDate: disabledDate,
}"
>
>
</el-date-picker>
</el-date-picker>
</div>
</div>
...
@@ -624,6 +627,13 @@ export default {
...
@@ -624,6 +627,13 @@ export default {
},
},
},
},
methods
:
{
methods
:
{
disabledDate
(
a
)
{
if
(
a
.
getTime
()
>
new
Date
().
getTime
())
{
return
true
;
}
else
{
return
false
;
}
},
// 获取认定列表
// 获取认定列表
search
()
{
search
()
{
this
.
getParam
();
this
.
getParam
();
...
@@ -637,7 +647,7 @@ export default {
...
@@ -637,7 +647,7 @@ export default {
this
.
list
=
response
.
data
.
ret
.
list
;
this
.
list
=
response
.
data
.
ret
.
list
;
this
.
reqParam
.
page
.
total
=
response
.
data
.
ret
.
total
;
this
.
reqParam
.
page
.
total
=
response
.
data
.
ret
.
total
;
//console.info("查询结果===>", this.list);
//console.info("查询结果===>", this.list);
this
.
userInfo
=
this
.
getUserInfo
(
this
.
list
);
//
this.userInfo = this.getUserInfo(this.list);
}
else
{
}
else
{
// 请求成功无返回值
// 请求成功无返回值
this
.
list
=
[];
this
.
list
=
[];
...
@@ -688,7 +698,7 @@ export default {
...
@@ -688,7 +698,7 @@ export default {
});
});
}
}
});
});
this
.
userOption
=
this
.
unique
(
userInfo
);
//
this.userOption = this.unique(userInfo);
// //console.info("用户信息==>", this.userOption);
// //console.info("用户信息==>", this.userOption);
},
},
// 用户信息去重
// 用户信息去重
...
...
src/views/cxyrd/TT.vue
View file @
842f9786
This diff is collapsed.
Click to expand it.
src/views/cxyrd/modules/LLCandidate.vue
View file @
842f9786
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
</div>
</div>
<div
class=
"lt_candidate_number"
>
<div
class=
"lt_candidate_number"
>
<el-table
<el-table
highlight-current-row
:highlight-current-row=
"isDelete ? false : true"
@
current-change=
"handleCurrentChange"
@
current-change=
"handleCurrentChange"
class=
"lt_candidate_table"
class=
"lt_candidate_table"
:data=
"tableData"
:data=
"tableData"
...
@@ -1037,13 +1037,9 @@ export default {
...
@@ -1037,13 +1037,9 @@ export default {
* @return {*}
* @return {*}
*/
*/
handleCurrentChange
(
val
,
old
)
{
handleCurrentChange
(
val
,
old
)
{
debugger
;
if
(
!
val
)
return
;
if
(
!
val
)
return
;
// document
if
(
this
.
isDelete
)
return
;
// .getElementsByClassName("lcurrte")[0]
this
.
$emit
(
"targetObj"
,
val
);
// .parentElement.parentElement.parentElement.classList.remove(
// "current-row"
// );
this
.
targetBh
=
val
.
destbarcode
;
this
.
targetBh
=
val
.
destbarcode
;
let
self
=
this
;
let
self
=
this
;
if
(
val
.
removeFlag
==
"1"
)
{
if
(
val
.
removeFlag
==
"1"
)
{
...
...
src/views/cxyrd/modules/LLSrc.vue
View file @
842f9786
...
@@ -470,12 +470,12 @@ export default {
...
@@ -470,12 +470,12 @@ export default {
},
},
// 指纹部分 增加边框
// 指纹部分 增加边框
changeStyle
(
index
,
imageInfo
)
{
changeStyle
(
index
,
imageInfo
)
{
console
.
log
(
imageInfo
);
let
self
=
this
;
let
self
=
this
;
this
.
isActive
=
index
;
this
.
isActive
=
index
;
//console.log(this.isActive);
//console.log(this.isActive);
// 存储源数据序号
// 存储源数据序号
if
(
imageInfo
)
{
if
(
imageInfo
)
{
this
.
$emit
(
"sourceObj"
,
imageInfo
);
// 改变数据为点击状态
// 改变数据为点击状态
self
.
$set
(
imageInfo
,
"clickLog"
,
"1"
);
self
.
$set
(
imageInfo
,
"clickLog"
,
"1"
);
sessionStorage
.
setItem
(
"srcseqno"
,
imageInfo
.
seq
);
sessionStorage
.
setItem
(
"srcseqno"
,
imageInfo
.
seq
);
...
...
src/views/cxyrd/modules/TTPlam.vue
View file @
842f9786
<!--
<!--
* @Author: your name
* @Author: your name
* @Date: 2021-10-23 17:43:14
* @Date: 2021-10-23 17:43:14
* @LastEditTime: 2021-12-0
6 10:01:49
* @LastEditTime: 2021-12-0
9 17:28:43
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
</p>
</p>
<el-carousel
<el-carousel
@
mousewheel
.
native=
"rollScroll($event)"
@
mousewheel
.
native=
"rollScroll($event)"
@
change=
"change"
direction=
"vertical"
direction=
"vertical"
ref=
"carousel"
ref=
"carousel"
:autoplay=
"false"
:autoplay=
"false"
...
@@ -144,6 +145,7 @@ export default {
...
@@ -144,6 +145,7 @@ export default {
return
{
return
{
zwName
:
"222"
,
zwName
:
"222"
,
loadingIndex
:
0
,
loadingIndex
:
0
,
changeIndex
:
0
,
sourceSrc
:
""
,
sourceSrc
:
""
,
targetSrc
:
""
,
targetSrc
:
""
,
isShowDetail
:
false
,
isShowDetail
:
false
,
...
@@ -179,6 +181,9 @@ export default {
...
@@ -179,6 +181,9 @@ export default {
});
});
},
},
methods
:
{
methods
:
{
change
(
val
)
{
this
.
changeIndex
=
val
;
},
rollScroll
(
event
)
{
rollScroll
(
event
)
{
let
_that
=
this
;
let
_that
=
this
;
// chrome、ie使用的wheelDelta,火狐使用detail
// chrome、ie使用的wheelDelta,火狐使用detail
...
@@ -187,16 +192,17 @@ export default {
...
@@ -187,16 +192,17 @@ export default {
if
(
!
_that
.
timeOut
)
{
if
(
!
_that
.
timeOut
)
{
_that
.
timeOut
=
setTimeout
(()
=>
{
_that
.
timeOut
=
setTimeout
(()
=>
{
_that
.
timeOut
=
null
;
_that
.
timeOut
=
null
;
scrollVal
>
0
if
(
scrollVal
>
0
&&
_that
.
changeIndex
>
0
)
{
?
_that
.
$refs
.
carousel
.
prev
()
_that
.
$refs
.
carousel
.
prev
();
:
_that
.
$refs
.
carousel
.
next
();
}
else
if
(
scrollVal
<=
0
&&
_that
.
changeIndex
<
3
)
{
_that
.
$refs
.
carousel
.
next
();
}
},
300
);
},
300
);
}
else
{
}
else
{
}
}
},
},
showDetail
(
item
)
{
showDetail
(
item
)
{
this
.
checkItem
=
item
;
this
.
checkItem
=
item
;
console
.
log
(
this
.
checkItem
);
this
.
isShowDetail
=
true
;
this
.
isShowDetail
=
true
;
this
.
$emit
(
"logbg"
,
true
);
this
.
$emit
(
"logbg"
,
true
);
},
},
...
@@ -205,6 +211,9 @@ export default {
...
@@ -205,6 +211,9 @@ export default {
$
(
".plamDetail"
).
remove
();
$
(
".plamDetail"
).
remove
();
},
},
watch
:
{
watch
:
{
isPlam
(
val
)
{
if
(
val
)
this
.
changeIndex
=
0
;
},
plamDetail
(
val
)
{
plamDetail
(
val
)
{
this
.
isShowDetail
=
false
;
this
.
isShowDetail
=
false
;
},
},
...
...
src/views/login/modules/AccountsLogin.vue
View file @
842f9786
...
@@ -83,7 +83,7 @@ export default {
...
@@ -83,7 +83,7 @@ export default {
let
me
=
this
;
let
me
=
this
;
me
.
btnLoading
=
true
;
me
.
btnLoading
=
true
;
this
.
$axios
({
this
.
$axios
({
url
:
"/
login
/login/myLoginForm"
,
url
:
"/
security
/login/myLoginForm"
,
method
:
"post"
,
method
:
"post"
,
data
:
qs
.
stringify
(
userinfo
),
data
:
qs
.
stringify
(
userinfo
),
headers
:
{
headers
:
{
...
...
vue.config.js
View file @
842f9786
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-
08 18:09:43
* @LastEditTime: 2021-12-
10 21:10:28
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
@@ -90,8 +90,8 @@ module.exports = {
...
@@ -90,8 +90,8 @@ module.exports = {
proxy
:
{
proxy
:
{
"/api"
:
{
"/api"
:
{
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
//
target: "http://192.168.128.166:8099/", // 张 认定
target
:
"http://192.168.128.166:8099/"
,
// 张 认定
// target: "http://192.168.128.1
08:8099
", // 湖南-张
// target: "http://192.168.128.1
24:8099/
", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://192.168.128.118:8764", // 湖南-张呈光
...
@@ -107,17 +107,17 @@ module.exports = {
...
@@ -107,17 +107,17 @@ module.exports = {
"^/api"
:
"/api"
"^/api"
:
"/api"
}
}
},
},
"/login"
:
{
//
"/login": {
// target: "http://www.meetfood.cn:2390/", // 登录
//
// target: "http://www.meetfood.cn:2390/", // 登录
target
:
"http://192.168.128.124:8764/"
,
// 登录
//
target: "http://192.168.128.124:8764/", // 登录
// target: "http://192.168.128.114:8099", // 登录-马
//
// target: "http://192.168.128.114:8099", // 登录-马
ws
:
true
,
//
ws: true,
changeOrigin
:
true
,
//
changeOrigin: true,
pathRewrite
:
{
//
pathRewrite: {
"^/login"
:
""
//本地
//
"^/login": "" //本地
// "^/login": "/login" //线上
//
// "^/login": "/login" //线上
}
//
}
},
//
},
// "/system": {
// "/system": {
// target: "http://192.168.128.106:8765/security", // 湖南-王
// target: "http://192.168.128.106:8765/security", // 湖南-王
// // target: "http://www.meetfood.cn:2390/system", // 湖南-王
// // target: "http://www.meetfood.cn:2390/system", // 湖南-王
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment