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
9d6f4dab
Commit
9d6f4dab
authored
Dec 11, 2021
by
张超军
Browse files
Options
Browse Files
Download
Plain Diff
冲突
parents
4c7bf783
2880cf39
Hide whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
1670 additions
and
697 deletions
+1670
-697
src/assets/styles/main.scss
+3
-1
src/components/Cascader.vue
+71
-17
src/plugins/axios.js
+7
-6
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/AllPersonnelBase/AllPersonnelBase.vue
+9
-3
src/views/AllPersonnelBase/dclb.vue
+183
-2
src/views/AllPersonnelBase/gzlb.vue
+68
-62
src/views/AllPersonnelBase/modules/ajxxk.vue
+18
-2
src/views/AllPersonnelBase/modules/ryxxk.vue
+15
-1
src/views/AllPersonnelBase/qbalk.vue
+8
-3
src/views/Home.vue
+137
-72
src/views/Home/Home.vue
+2
-2
src/views/SystemManage/GroupManage.vue
+35
-32
src/views/SystemManage/GroupPermission.vue
+1
-1
src/views/SystemManage/PermissionManage.vue
+75
-38
src/views/SystemManage/RoleManage.vue
+30
-11
src/views/SystemManage/UserManage.vue
+40
-25
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
+69
-44
src/views/cxyrd/QueryConfirm.vue
+16
-6
src/views/cxyrd/TT.vue
+203
-163
src/views/cxyrd/modules/LLCandidate.vue
+3
-7
src/views/cxyrd/modules/LLSrc.vue
+31
-8
src/views/cxyrd/modules/TTPlam.vue
+14
-5
src/views/drFPTX/Index.vue
+312
-103
src/views/drFPTX/RAList.vue
+275
-58
src/views/login/modules/AccountsLogin.vue
+1
-1
src/views/zljc/Index.vue
+9
-3
src/views/zljc/jcxq.vue
+3
-3
vue.config.js
+1
-1
No files found.
src/assets/styles/main.scss
View file @
9d6f4dab
...
...
@@ -5,7 +5,9 @@
margin
:
0
;
box-sizing
:
border-box
;
}
body
{
overflow
:
hidden
;
}
.disabel
{
border
:
none
!
important
;
background-color
:
#ecedf1
!
important
;
...
...
src/components/Cascader.vue
View file @
9d6f4dab
<!--
* @Author: your name
* @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
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
-->
<
template
>
<div
:style=
"
{ width: width + 'rem' }">
<el-cascader
v-model=
"form[id]"
ref=
"cascader"
:placeholder=
"placeholder"
@
focus=
"placeholder = '请输入'"
@
blur=
"placeholder = '请选择'"
:clearable=
"clearable"
:options=
"options"
:props=
"props"
:show-all-levels=
"false"
@
change=
"change"
filterable
>
</el-cascader>
</div>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"valStr"
:disabled=
"disable"
placement=
"top-start"
:open-delay=
"1000"
>
<div
:style=
"
{ width: width + 'rem' }">
<el-cascader
v-model=
"form[id]"
ref=
"cascader"
:placeholder=
"placeholder"
@
focus=
"placeholder = '请输入'"
@
blur=
"placeholder = '请选择'"
:clearable=
"clearable"
:options=
"options"
:props=
"props"
:show-all-levels=
"false"
@
change=
"change"
filterable
>
</el-cascader>
</div>
</el-tooltip>
</
template
>
<
script
>
export
default
{
...
...
@@ -31,8 +40,28 @@ export default {
options
:
[],
casVal
:
null
,
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
:
{
type
:
Object
,
...
...
@@ -56,13 +85,38 @@ export default {
},
codeName
:
String
,
},
computed
:
{
disable
()
{
if
(
this
.
valStr
?.
trim
()
==
""
||
this
.
form
[
this
.
id
]?.
trim
()
==
""
)
{
return
true
;
}
else
{
return
false
;
}
},
},
methods
:
{
change
(
val
)
{
let
newVal
=
val
;
if
(
!
newVal
)
newVal
=
""
;
this
.
$set
(
this
.
form
,
this
.
id
,
newVal
);
//选择完以后关闭下拉版
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
)
{
if
(
data
&&
data
.
length
>
0
)
{
return
data
.
map
((
item
)
=>
({
...
...
src/plugins/axios.js
View file @
9d6f4dab
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-1
0 09:46:36
* @LastEditTime: 2021-12-1
1 14:19:58
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
...
...
@@ -65,10 +65,14 @@ _axios.interceptors.request.use(
_axios
.
interceptors
.
response
.
use
(
function
(
response
)
{
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
(
resTimer
)
clearTimeout
(
resTimer
)
resTimer
=
setTimeout
(()
=>
{
MessageBox
.
confirm
(
'登陆超时请重新登录, 是否继续?'
,
'提示'
,
{
MessageBox
.
confirm
(
response
.
data
.
message
==
'未登录'
?
'登陆超时请重新登录, 是否继续?'
:
response
.
data
.
message
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
...
...
@@ -77,10 +81,7 @@ _axios.interceptors.response.use(
}).
catch
(()
=>
{
});
},
500
);
}
if
(
response
.
config
.
loading
!==
false
)
{
hideLoading
(
response
.
config
.
loadingTarget
);
// console.log(response.config.loadingTarget);
return
;
}
// NProgress.done();
return
response
;
...
...
src/router/index.js
View file @
9d6f4dab
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-11 1
1:44:03
* @LastEditTime: 2021-12-11 1
4:20:10
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\router\index.js
...
...
src/store/modules/loading.js
View file @
9d6f4dab
/*
* @Author: your name
* @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
* @Description: In User Settings Edit
* @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
=
{
// 是否处于加载中
loading
:
false
,
...
...
@@ -18,28 +18,33 @@ const state = {
// 即将要跳转的路由
willRoute
:
''
,
// 手动路由加载
loading_sd
:
false
loading_sd
:
false
,
//全局毛玻璃
groundGlassBoo
:
false
,
};
const
mutations
=
{
[
SET_LOADING
]
(
state
,
content
)
{
[
SET_LOADING
](
state
,
content
)
{
state
.
loading
=
content
},
[
SET_JUMPROUTE
]
(
state
,
content
)
{
[
SET_JUMPROUTE
](
state
,
content
)
{
state
.
jumproute
=
content
},
[
SET_PREROUTE
]
(
state
,
content
)
{
[
SET_PREROUTE
](
state
,
content
)
{
state
.
preRoute
=
content
},
[
SET_WILLROUTE
]
(
state
,
content
)
{
[
SET_WILLROUTE
](
state
,
content
)
{
state
.
willRoute
=
content
},
[
SET_SMALLLOADING
]
(
state
,
content
)
{
[
SET_SMALLLOADING
](
state
,
content
)
{
state
.
smallLoading
=
content
},
[
SET_LOADINGSD
]
(
state
,
content
)
{
[
SET_LOADINGSD
](
state
,
content
)
{
state
.
loading_sd
=
content
},
[
SET_GLASS
](
state
,
content
)
{
state
.
groundGlassBoo
=
content
},
};
const
actions
=
{
...
...
src/store/modules/mutations-types.js
View file @
9d6f4dab
/*
* @Author: your name
* @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
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
...
...
@@ -43,3 +43,5 @@ export const SET_LOADINGSD = 'setLoadingSd'
// 是否切换到了人像
export
const
SET_ISFACE
=
'setIsFace'
// 记录全局毛玻璃是否开启
export
const
SET_GLASS
=
'setGlass'
src/utils/requestLoading.js
View file @
9d6f4dab
/*
* @Author: your name
* @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
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\utils\requestLoading.js
...
...
src/views/AllPersonnelBase/AllPersonnelBase.vue
View file @
9d6f4dab
...
...
@@ -98,8 +98,8 @@
>
<span
v-html=
"' '"
></span>
<i
class=
"
el-icon-info
"
style=
"color: #055fe7; font-size: 1
5px
"
class=
"
iconfont icon-tanhao1
"
style=
"color: #055fe7; font-size: 1
6px; margin: 0 0.625rem;
"
></i>
已选择
<span
style=
"color: #055fe7"
>
{{
multipleSelection
.
length
}}
</span>
项
...
...
@@ -135,18 +135,21 @@
prop=
"ysxtAsjxgrybh"
label=
"人员编号"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"xm"
label=
"姓名"
:width=
"width2"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"zjhm"
label=
"身份证号"
:width=
"width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -505,7 +508,7 @@ export default {
width3
:
180
,
width2
:
100
,
width1
:
220
,
height
:
5
5
0
,
height
:
5
0
0
,
disabled
:
false
,
// 新增人员按钮状态
isShowTjddl
:
false
,
// 添加到队列
isShowGz
:
false
,
// 关注
...
...
@@ -1418,4 +1421,7 @@ export default {
}
}
}
/
deep
/
.el-table--enable-row-transition
.el-table__body
td
.el-table__cell
{
height
:
55px
;
}
</
style
>
src/views/AllPersonnelBase/dclb.vue
View file @
9d6f4dab
...
...
@@ -141,8 +141,8 @@
>
<span
v-html=
"' '"
></span>
<i
class=
"
el-icon-info
"
style=
"color: #055fe7; font-size: 1
5px
"
class=
"
iconfont icon-tanhao1
"
style=
"color: #055fe7; font-size: 1
6px; margin: 0 0.625rem;
"
></i>
已选择
<span
style=
"color: #055fe7"
>
{{
multipleSelection
.
length
}}
</span>
项
...
...
@@ -171,6 +171,7 @@
hasChildren: 'hasChildren',
}"
@selection-change="handleSelectionChange"
@expand-change="hadnlExpandChange1"
>
<el-table-column
type=
"selection"
...
...
@@ -220,6 +221,7 @@
prop=
"barcode"
label=
"人员编号"
:width=
"width2"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -257,12 +259,30 @@
label=
"数据类型"
:width=
"width2"
>
<
template
slot-scope=
"scope"
>
<div>
<span>
{{
scope
.
row
.
dataTypeName
}}
</span>
<span
class=
'tz'
v-if=
"scope.row.featureName"
>
特征
</span>
</div>
</
template
>
</el-table-column>
<el-table-column
prop=
"exportName"
label=
"导出模式"
width=
"auto"
>
<
template
slot-scope=
"scope"
>
<div>
<span>
{{
scope
.
row
.
exportName
}}
</span>
<span
class=
'tm'
v-if=
"scope.row.declassificationName"
>
脱密
</span>
</div>
</
template
>
</el-table-column>
</el-table>
</div>
...
...
@@ -282,6 +302,7 @@
hasChildren: 'hasChildren',
}"
@
selection-change=
"handleSelectionChange"
@
expand-change=
"hadnlExpandChange2"
>
<el-table-column
type=
"selection"
...
...
@@ -331,6 +352,7 @@
prop=
"barcode"
label=
"案事件编号"
:width=
"width4"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -344,6 +366,15 @@
label=
"导出模式"
:width=
"width1"
>
<
template
slot-scope=
"scope"
>
<div>
<span>
{{
scope
.
row
.
exportName
}}
</span>
<span
class=
'tm'
v-if=
"scope.row.declassificationName"
>
脱密
</span>
</div>
</
template
>
</el-table-column>
<el-table-column
width=
"auto"
>
</el-table-column>
...
...
@@ -418,6 +449,7 @@ export default {
multipleSelection
:
[],
// 表单选择项目
isShowTip
:
false
,
//批量操作提示
selectBoo
:
false
,
// 是否批量操作
expanded
:
false
,
// 展开标志
};
},
created
()
{
...
...
@@ -535,6 +567,116 @@ export default {
this
.
$message
.
error
(
"抱歉,复制条码号失败!"
);
}
},
// 展开或关闭行
hadnlExpandChange1
(
row
,
expanded
)
{
// console.log(row, expanded, "hadnlExpandChange1")
// let oldObj = row;
// 获取展开标志
this
.
expanded
=
expanded
;
// 获取下标
var
i
=
this
.
tableDate1
.
findIndex
((
table
)
=>
table
.
sequenceNumber
===
row
.
sequenceNumber
);
// var i = this.tableData.findIndex(table => table.id === row.id);
console
.
log
(
i
,
112233
);
if
(
expanded
)
{
this
.
tableDate1
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
personExportRecordGrandchildren
:
row
.
personExportRecordGrandchildren
,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded
:
true
,
};
this
.
$forceUpdate
();
}
else
{
//console.info("折叠时row数据", this.list[i]);
this
.
tableDate1
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
personExportRecordGrandchildren
:
row
.
personExportRecordGrandchildren
,
barcode
:
row
.
personExportRecordGrandchildren
[
0
].
barcode
,
collectIdName
:
row
.
personExportRecordGrandchildren
[
0
].
collectIdName
,
collectIdCard
:
row
.
personExportRecordGrandchildren
[
0
].
collectIdCard
,
dataType
:
row
.
personExportRecordGrandchildren
[
0
].
dataType
,
dataTypeName
:
row
.
personExportRecordGrandchildren
[
0
].
dataTypeName
,
declassificationName
:
row
.
personExportRecordGrandchildren
[
0
].
declassificationName
,
declassificationStatus
:
row
.
personExportRecordGrandchildren
[
0
].
declassificationStatus
,
exportName
:
row
.
personExportRecordGrandchildren
[
0
].
exportName
,
exportTime
:
row
.
personExportRecordGrandchildren
[
0
].
exportTime
,
exportType
:
row
.
personExportRecordGrandchildren
[
0
].
exportType
,
failReason
:
row
.
personExportRecordGrandchildren
[
0
].
failReason
,
featureName
:
row
.
personExportRecordGrandchildren
[
0
].
featureName
,
featureStatus
:
row
.
personExportRecordGrandchildren
[
0
].
featureStatus
,
id
:
row
.
personExportRecordGrandchildren
[
0
].
id
,
picCount
:
row
.
personExportRecordGrandchildren
[
0
].
picCount
,
plainCount
:
row
.
personExportRecordGrandchildren
[
0
].
plainCount
,
plamCount
:
row
.
personExportRecordGrandchildren
[
0
].
plamCount
,
rollCount
:
row
.
personExportRecordGrandchildren
[
0
].
rollCount
,
status
:
row
.
personExportRecordGrandchildren
[
0
].
status
,
statusName
:
row
.
personExportRecordGrandchildren
[
0
].
statusName
,
expanded
:
false
,
};
//console.log(this.list[i]);
this
.
$forceUpdate
();
// //console.info("塞完数据的row", this.list[i]);
}
},
// 展开或关闭行
hadnlExpandChange2
(
row
,
expanded
)
{
console
.
log
(
row
,
expanded
,
"hadnlExpandChange2"
)
// let oldObj = row;
// 获取展开标志
this
.
expanded
=
expanded
;
// 获取下标
var
i
=
this
.
tableDate2
.
findIndex
((
table
)
=>
table
.
sequenceNumber
===
row
.
sequenceNumber
);
// var i = this.tableData.findIndex(table => table.id === row.id);
console
.
log
(
i
,
112233
);
if
(
expanded
)
{
this
.
tableDate2
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
caseExportRecordGrandchildren
:
row
.
caseExportRecordGrandchildren
,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded
:
true
,
};
this
.
$forceUpdate
();
}
else
{
//console.info("折叠时row数据", this.list[i]);
this
.
tableDate2
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
caseExportRecordGrandchildren
:
row
.
caseExportRecordGrandchildren
,
barcode
:
row
.
caseExportRecordGrandchildren
[
0
].
barcode
,
collectIdName
:
row
.
caseExportRecordGrandchildren
[
0
].
collectIdName
,
collectIdCard
:
row
.
caseExportRecordGrandchildren
[
0
].
collectIdCard
,
dataType
:
row
.
caseExportRecordGrandchildren
[
0
].
dataType
,
dataTypeName
:
row
.
caseExportRecordGrandchildren
[
0
].
dataTypeName
,
declassificationName
:
row
.
caseExportRecordGrandchildren
[
0
].
declassificationName
,
declassificationStatus
:
row
.
caseExportRecordGrandchildren
[
0
].
declassificationStatus
,
exportName
:
row
.
caseExportRecordGrandchildren
[
0
].
exportName
,
exportTime
:
row
.
caseExportRecordGrandchildren
[
0
].
exportTime
,
exportType
:
row
.
caseExportRecordGrandchildren
[
0
].
exportType
,
failReason
:
row
.
caseExportRecordGrandchildren
[
0
].
failReason
,
featureName
:
row
.
caseExportRecordGrandchildren
[
0
].
featureName
,
featureStatus
:
row
.
caseExportRecordGrandchildren
[
0
].
featureStatus
,
id
:
row
.
caseExportRecordGrandchildren
[
0
].
id
,
picCount
:
row
.
caseExportRecordGrandchildren
[
0
].
picCount
,
plainCount
:
row
.
caseExportRecordGrandchildren
[
0
].
plainCount
,
plamCount
:
row
.
caseExportRecordGrandchildren
[
0
].
plamCount
,
rollCount
:
row
.
caseExportRecordGrandchildren
[
0
].
rollCount
,
status
:
row
.
caseExportRecordGrandchildren
[
0
].
status
,
statusName
:
row
.
caseExportRecordGrandchildren
[
0
].
statusName
,
expanded
:
false
,
};
//console.log(this.list[i]);
this
.
$forceUpdate
();
// //console.info("塞完数据的row", this.list[i]);
}
},
/**
* @description: 是否是批量操作
* @param {*}
...
...
@@ -661,6 +803,34 @@ export default {
};
</
script
>
<
style
scoped
lang=
"scss"
>
//
特征
.tz
{
display
:
inline-block
;
width
:
32px
;
height
:
20px
;
background
:
#ddebff
;
border-radius
:
2px
;
font-size
:
12px
;
font-family
:
MicrosoftYaHei
;
color
:
#055fe7
;
line-height
:
20px
;
text-align
:
center
;
margin-left
:
8px
;
}
//
脱密
.tm
{
display
:
inline-block
;
width
:
32px
;
height
:
20px
;
background
:
#ffebed
;
border-radius
:
2px
;
font-size
:
12px
;
font-family
:
MicrosoftYaHei
;
color
:
#e60012
;
line-height
:
20px
;
text-align
:
center
;
margin-left
:
8px
;
}
//
隐藏掉
table
多选框
.delSelection
/
deep
/
.el-table-column--selection
.cell
{
display
:
none
;
...
...
@@ -999,4 +1169,15 @@ export default {
background-repeat
:
no-repeat
;
transform
:
rotate
(
180deg
)
!important
;
}
.el-table
tr
{
height
:
55px
;
}
.el-checkbox__input.is-checked
.el-checkbox__inner
{
background-color
:
#006aff
;
border-color
:
#006aff
;
}
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
background-color
:
#006aff
;
border-color
:
#006aff
;
}
</
style
>
src/views/AllPersonnelBase/gzlb.vue
View file @
9d6f4dab
...
...
@@ -217,8 +217,8 @@
>
<span
v-html=
"' '"
></span>
<i
class=
"
el-icon-info
"
style=
"color: #055fe7; font-size: 1
5px
"
class=
"
iconfont icon-tanhao1
"
style=
"color: #055fe7; font-size: 1
6px; margin: 0 0.625rem;
"
></i>
已选择
<span
style=
"color: #055fe7"
>
{{
multipleSelection
.
length
}}
</span>
项
...
...
@@ -258,6 +258,7 @@
prop=
"followPerson.barcode"
label=
"人员编号"
:width=
"width2"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -279,6 +280,7 @@
prop=
"followPerson.idcard"
label=
"身份证号"
:width=
"width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -297,13 +299,14 @@
@
click=
"handleClick(scope.row)"
>
<div
class=
"icon
bj
"
class=
"icon
-div
"
@
click=
"handleClick(scope.row)"
>
<img
<
!--
<
img
src=
"../../assets/img/qbryk/bj.svg"
alt=
""
/>
/>
-->
<span
class=
"iconfont"
>

</span>
</div>
</el-tooltip>
<!--
<el-tooltip
...
...
@@ -331,13 +334,14 @@
:open-delay=
"500"
>
<div
class=
"icon
look
"
class=
"icon
-div
"
@
click=
"isShowFcxBtn1(scope.row)"
>
<img
<
!--
<
img
src=
"../../assets/img/qbryk/search.svg"
alt=
""
/>
/>
-->
<span
class=
"iconfont"
>

</span>
</div>
</el-tooltip>
<el-tooltip
...
...
@@ -348,13 +352,14 @@
:open-delay=
"500"
>
<div
class=
"icon
bz
"
class=
"icon
-div
"
@
click
.
stop=
"isShowFztmBtn(scope.row)"
>
<img
<
!--
<
img
src=
"../../assets/img/qbryk/bz.svg"
alt=
""
/>
/>
-->
<span
class=
"iconfont"
>

</span>
</div>
</el-tooltip>
<el-tooltip
...
...
@@ -366,21 +371,21 @@
>
<div
@
click
.
stop
class=
"icon
del
"
class=
"icon
-div
"
>
<el-popconfirm
placement=
"top-start"
:hide-icon=
"true"
confirm-button-text=
"确认"
@
confirm=
"qxgz(scope.row.followPerson.personId)"
class=
"icon del"
title=
"确认要取消关注吗?该操作无法撤消!"
>
<div
slot=
"reference"
>
<img
<
!--
<
img
src=
"../../assets/img/qbryk/qxgz.svg"
alt=
""
/>
/>
-->
<span
class=
"iconfont"
>

</span>
</div>
</el-popconfirm>
</div>
...
...
@@ -417,6 +422,7 @@
prop=
"followCase.barcode"
label=
"案事件编号"
:width=
"width6"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -430,6 +436,7 @@
prop=
"followCase.collectunitName"
label=
"提取单位"
:width=
"width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -455,13 +462,14 @@
@
click=
"handleClick(scope.row)"
>
<div
class=
"icon
bj
"
class=
"icon
-div
"
@
click=
"handleClick(scope.row)"
>
<img
<
!--
<
img
src=
"../../assets/img/qbryk/bj.svg"
alt=
""
/>
/>
-->
<span
class=
"iconfont"
>

</span>
</div>
</el-tooltip>
<!--
<el-tooltip
...
...
@@ -490,13 +498,14 @@
:open-delay=
"500"
>
<div
class=
"icon
look
"
class=
"icon
-div
"
@
click=
"isShowFcxBtn1(scope.row)"
>
<img
<
!--
<
img
src=
"../../assets/img/qbryk/search.svg"
alt=
""
/>
/>
-->
<span
class=
"iconfont"
>

</span>
</div>
</el-tooltip>
<el-tooltip
...
...
@@ -507,13 +516,14 @@
:open-delay=
"500"
>
<div
class=
"icon
bz
"
class=
"icon
-div
"
@
click
.
stop=
"isShowFztmBtn(scope.row)"
>
<img
<
!--
<
img
src=
"../../assets/img/qbryk/bz.svg"
alt=
""
/>
/>
-->
<span
class=
"iconfont"
>

</span>
</div>
</el-tooltip>
<el-tooltip
...
...
@@ -525,21 +535,21 @@
>
<div
@
click
.
stop
class=
"icon
del
"
class=
"icon
-div
"
>
<el-popconfirm
placement=
"top-start"
:hide-icon=
"true"
confirm-button-text=
"确认"
@
confirm=
"qxgzAj(scope.row.followCase.caseId)"
class=
"icon del"
title=
"确认要取消关注该数据吗?该操作无法撤消!"
>
<div
slot=
"reference"
>
<img
<
!--
<
img
src=
"../../assets/img/qbryk/qxgz.svg"
alt=
""
/>
/>
-->
<span
class=
"iconfont"
>

</span>
</div>
</el-popconfirm>
</div>
...
...
@@ -1209,40 +1219,6 @@ export default {
};
</
script
>
<
style
lang=
"scss"
>
.el-message-box__message
{
margin
:
23px
24px
17px
24px
;
font-size
:
14px
;
font-family
:
MicrosoftYaHei
;
color
:
#333333
;
}
.el-message-box__btns
{
margin-bottom
:
24px
;
padding-bottom
:
24px
;
//
交换
确定
和
取消
按钮的位置
.
el-button
:
nth-child
(
1
)
{
float
:
right
;
margin-right
:
23%
;
width
:
72px
;
height
:
40px
;
background
:
#055fe7
;
border-radius
:
4px
;
font-size
:
14px
;
font-family
:
MicrosoftYaHei
;
color
:
#ffffff
;
}
.el-button
:nth-child
(
2
)
{
float
:
left
;
margin-left
:
23%
;
width
:
72px
;
height
:
40px
;
background
:
#ffffff
;
border-radius
:
4px
;
border
:
1px
solid
#aeb5c2
;
font-size
:
14px
;
font-family
:
MicrosoftYaHei
;
color
:
#2e3846
;
}
}
.el-popconfirm__main
{
margin
:
23px
24px
17px
24px
;
font-size
:
14px
;
...
...
@@ -1461,6 +1437,25 @@ export default {
object-fit
:
fill
;
}
}
.icon-div
{
width
:
20px
;
height
:
20px
;
display
:
flex
;
overflow
:
visible
;
background
:
white
;
margin-right
:
14px
;
}
.iconfont
{
width
:
16px
;
height
:
16px
;
font-family
:
"iconfont"
!important
;
font-size
:
16px
;
font-style
:
normal
;
color
:
#055fe7
;
object-fit
:
fill
;
-webkit-font-smoothing
:
antialiased
;
-moz-osx-font-smoothing
:
grayscale
;
}
.ops
{
display
:
flex
;
}
...
...
@@ -1545,4 +1540,15 @@ export default {
}
}
}
/
deep
/
.el-table--enable-row-transition
.el-table__body
td
.el-table__cell
{
height
:
55px
;
}
/
deep
/
.el-checkbox__input.is-checked
.el-checkbox__inner
{
background-color
:
#006aff
;
border-color
:
#006aff
;
}
/
deep
/
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
background-color
:
#006aff
;
border-color
:
#006aff
;
}
</
style
>
src/views/AllPersonnelBase/modules/ajxxk.vue
View file @
9d6f4dab
...
...
@@ -30,7 +30,7 @@
<div
class=
'sjx l1'
>
<span
class=
"span1"
>
案件编号:
</span>
<span
class=
"span2"
>
{{
this
.
ysajjbxx
.
ysxtAsjbh
}}
</span>
<span
class=
"span3
"
>
比中
</span>
<span
:class=
"fcxInfo.hitStatus==1?'span3':'span3 wbz'
"
>
比中
</span>
</div>
<div
class=
'sjx l2'
>
<span
class=
"span1"
>
现勘编号:
</span>
...
...
@@ -184,6 +184,7 @@ export default {
lastQueryTime
:
''
,
queryCount
:
''
,
queryType
:
''
,
hitStatus
:
''
,
},
CaseImg
:
[
// 案件图像
],
...
...
@@ -263,6 +264,7 @@ export default {
this
.
fcxInfo
.
lastQueryTime
=
response
.
data
.
ret
.
lastQueryTime
this
.
fcxInfo
.
queryCount
=
response
.
data
.
ret
.
queryCount
this
.
fcxInfo
.
queryType
=
response
.
data
.
ret
.
queryType
this
.
fcxInfo
.
hitStatus
=
response
.
data
.
ret
.
hitStatus
//console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate);
}
else
{
...
...
@@ -332,11 +334,21 @@ export default {
}
.zwDivBody
{
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
flex-start
;
align-items
:
flex-start
;
flex-wrap
:
wrap
;
height
:
580px
;
>
div
{
&:nth-of-type(5n)
{
margin-right
:
0
;
.zw
{
margin-right
:
0
!important
;
}
}
}
.zw
{
width
:
110px
;
margin-right
:
18px
;
.zwImg
{
width
:
110px
;
height
:
110px
;
...
...
@@ -421,6 +433,10 @@ export default {
line-height
:
24px
;
margin-left
:
10px
;
}
.wbz
{
background-color
:
#ecedf1
;
color
:
#aeafb4
;
}
}
.l2
{
margin
:
15px
0
;
...
...
src/views/AllPersonnelBase/modules/ryxxk.vue
View file @
9d6f4dab
...
...
@@ -30,7 +30,7 @@
<div
class=
'sjx l1'
>
<span
class=
"span1"
>
人员编号:
</span>
<span
class=
"span2"
>
{{
ysryjbxx
.
ysxtAsjxgrybh
}}
</span>
<span
class=
"span3
"
>
比中
</span>
<span
:class=
"fcxInfo.hitStatus==1?'span3':'span3 wbz'
"
>
比中
</span>
</div>
<div
class=
'sjx l2'
>
<span
class=
"span1"
>
姓名:
</span>
...
...
@@ -400,6 +400,7 @@ export default {
lastQueryTime
:
''
,
queryCount
:
''
,
queryType
:
''
,
hitStatus
:
''
,
},
RollImgNum
:
0
,
// 滚动指纹个数
PlainImgNum
:
0
,
// 平面指纹个数
...
...
@@ -613,6 +614,7 @@ export default {
this
.
fcxInfo
.
lastQueryTime
=
response
.
data
.
ret
.
lastQueryTime
this
.
fcxInfo
.
queryCount
=
response
.
data
.
ret
.
queryCount
this
.
fcxInfo
.
queryType
=
response
.
data
.
ret
.
queryType
this
.
fcxInfo
.
hitStatus
=
response
.
data
.
ret
.
hitStatus
//console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate);
}
else
{
...
...
@@ -634,6 +636,10 @@ export default {
this
.
PlainImgfingerLoading
=
true
// 平面加载
this
.
PlamLoading
=
true
// 掌纹加载
this
.
FaceLoading
=
true
// 人像加载
this
.
RollImgNum
=
0
// 滚动指纹个数
this
.
PlainImgNum
=
0
// 平面指纹个数
this
.
PalmImgNum
=
0
// 掌纹个数
this
.
FaceImgNum
=
0
// 人像个数
this
.
radio1
=
1
this
.
RollImg
=
[
// 滚动
{
name
:
"右拇"
,
code
:
1
,
img
:
null
},
...
...
@@ -679,6 +685,10 @@ export default {
this
.
PlainImgfingerLoading
=
true
// 平面加载
this
.
PlamLoading
=
true
// 掌纹加载
this
.
FaceLoading
=
true
// 人像加载
this
.
RollImgNum
=
0
// 滚动指纹个数
this
.
PlainImgNum
=
0
// 平面指纹个数
this
.
PalmImgNum
=
0
// 掌纹个数
this
.
FaceImgNum
=
0
// 人像个数
this
.
radio1
=
1
this
.
RollImg
=
[
// 滚动
{
name
:
"右拇"
,
code
:
1
,
img
:
null
},
...
...
@@ -998,6 +1008,10 @@ export default {
line-height
:
24px
;
margin-left
:
10px
;
}
.wbz
{
background-color
:
#ecedf1
;
color
:
#aeafb4
;
}
}
.l2
{
margin
:
15px
0
;
...
...
src/views/AllPersonnelBase/qbalk.vue
View file @
9d6f4dab
...
...
@@ -90,8 +90,8 @@
>
<span
v-html=
"' '"
></span>
<i
class=
"
el-icon-info
"
style=
"color:
#055FE7;font-size:.9375rem
"
class=
"
iconfont icon-tanhao1
"
style=
"color:
#055fe7; font-size: 16px; margin: 0 0.625rem;
"
></i>
已选择
<span
style=
"color:#055FE7"
>
{{
multipleSelection
.
length
}}
</span>
项
<!--
<span
v-html=
"' '"
></span>
-->
...
...
@@ -124,6 +124,7 @@
prop=
"ysxtAsjbh"
label=
"案事件编号"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -137,6 +138,7 @@
prop=
"xckybh"
label=
"现勘编号"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -457,7 +459,7 @@ export default {
width3
:
100
,
width2
:
180
,
width1
:
220
,
height
:
5
5
0
,
height
:
5
0
0
,
isShowAjxxk
:
false
,
// 案件信息卡
disabled
:
false
,
// 新增案件按钮状态
isShowTjddl
:
false
,
// 添加到队列
...
...
@@ -1294,4 +1296,7 @@ const datas1 = [
}
}
}
/
deep
/
.el-table--enable-row-transition
.el-table__body
td
.el-table__cell
{
height
:
55px
;
}
</
style
>
src/views/Home.vue
View file @
9d6f4dab
...
...
@@ -4,19 +4,47 @@
<el-container
class=
"layout-container"
>
<transition
name=
"slide"
>
<el-aside
:width=
"isCollapse ? '4rem' : '17.5rem'"
class=
"aside"
>
<div
class=
"logo"
:class=
"
{ minLogo: isCollapse }" @click="$router.push('/index')">
<div
class=
"logo"
:class=
"
{ minLogo: isCollapse }"
@click="$router.push('/index')"
>
<img
class=
"jh"
src=
"../assets/img/Home/jh.png"
alt=
""
/>
<img
v-show=
"!isCollapse"
class=
"title"
src=
"../assets/img/Home/title.png"
alt=
""
/>
<img
v-show=
"!isCollapse"
class=
"title"
src=
"../assets/img/Home/title.png"
alt=
""
/>
</div>
<!--
<div
class=
"search"
>
<el-input
v-if=
"!isCollapse"
@
keyup
.
enter
.
native=
"goSearch()"
class=
"searchTxt"
prefix-icon=
"el-icon-search"
v-model=
"searchTxt"
placeholder=
"搜索"
></el-input>
<i
class=
"search-icon el-icon-search"
v-else
></i>
</div>
-->
<el-menu
:collapse-transition=
"false"
ref=
"menu"
:default-active=
"menuActive"
text-color=
"#CCCCCC"
active-text-color=
"#ffffff"
background-color=
"#1F2D45"
class=
"el-menu-vertical-demo"
@
open=
"handleOpen"
@
close=
"handleClose"
:collapse=
"isCollapse"
@
select=
"selectPath"
>
<el-menu
:collapse-transition=
"false"
ref=
"menu"
:default-active=
"menuActive"
text-color=
"#CCCCCC"
active-text-color=
"#ffffff"
background-color=
"#1F2D45"
class=
"el-menu-vertical-demo"
@
open=
"handleOpen"
@
close=
"handleClose"
:collapse=
"isCollapse"
@
select=
"selectPath"
>
<div
v-for=
"(menu, i) in routes"
:key=
"i"
>
<el-submenu
:index=
"menu.name"
v-if=
"menu.children && !menu.hidden"
>
<el-submenu
:index=
"menu.name"
v-if=
"menu.children && !menu.hidden"
>
<template
slot=
"title"
>
<img
v-if=
"$route.path != menu.path"
:src=
"menu.icon_d"
alt=
""
/>
<img
v-if=
"$route.path != menu.path"
:src=
"menu.icon_d"
alt=
""
/>
<img
v-else
:src=
"menu.icon_a"
alt=
""
/>
<span
v-show=
"!isCollapse"
>
{{
menu
.
meta
.
title
}}
</span>
</
template
>
...
...
@@ -26,15 +54,26 @@
}}
</el-menu-item>
</div>
</el-submenu>
<el-menu-item
:index=
"menu.name"
v-else-if=
"!menu.children && !menu.hidden"
>
<img
v-if=
"$route.path != menu.path"
:src=
"menu.icon_d"
alt=
""
/>
<el-menu-item
:index=
"menu.name"
v-else-if=
"!menu.children && !menu.hidden"
>
<img
v-if=
"$route.path != menu.path"
:src=
"menu.icon_d"
alt=
""
/>
<img
v-else
:src=
"menu.icon_a"
alt=
""
/>
<span
slot=
"title"
>
{{ menu.meta.title }}
</span>
</el-menu-item>
</div>
</el-menu>
<div
class=
"fz"
>
<img
v-if=
"!isCollapse"
src=
"../assets/img/Home/logo.png"
alt=
""
/>
<img
v-if=
"!isCollapse"
src=
"../assets/img/Home/logo.png"
alt=
""
/>
<img
v-else
src=
"../assets/img/Home/fang.png"
alt=
""
/>
</div>
</el-aside>
...
...
@@ -54,15 +93,35 @@
</div>
<div
class=
"quit"
@
click=
"$router.push('/index')"
></div>
<div
class=
"logout"
@
click=
"logout"
>
<svg-icon
v-show=
"!isHoverLogout"
icon-class=
"logout_d"
class=
"icon"
@
mouseover=
"isHoverLogout = true"
@
mouseleave=
"isHoverLogout = false"
/>
<svg-icon
v-show=
"isHoverLogout"
icon-class=
"logout_a"
class=
"icon"
/>
<svg-icon
v-show=
"!isHoverLogout"
icon-class=
"logout_d"
class=
"icon"
@
mouseover=
"isHoverLogout = true"
@
mouseleave=
"isHoverLogout = false"
/>
<svg-icon
v-show=
"isHoverLogout"
icon-class=
"logout_a"
class=
"icon"
/>
</div>
</div>
</el-header>
<el-main
class=
"main"
>
<div
class=
"contain"
>
<el-tabs
:closable=
"paths.length > 1"
v-model=
"routePath"
@
tab-click=
"handleClick"
@
tab-remove=
"tabRemove"
>
<el-tab-pane
:label=
"item.name"
:name=
"item.routeName"
v-for=
"item in paths"
:key=
"item.routeName"
></el-tab-pane>
<el-tabs
:closable=
"paths.length > 1"
v-model=
"routePath"
@
tab-click=
"handleClick"
@
tab-remove=
"tabRemove"
>
<el-tab-pane
:label=
"item.name"
:name=
"item.routeName"
v-for=
"item in paths"
:key=
"item.routeName"
></el-tab-pane>
</el-tabs>
<div
class=
"breadcrumb"
></div>
<!-- 路由出口 -->
...
...
@@ -81,7 +140,15 @@
<button @click="toAllPersonnelBase">全部人员库</button> -->
</div>
<el-dialog
class=
"jump-route"
append-to-body
:modal=
"false"
@
close=
"cancelJumpRoute"
:visible
.
sync=
"jumpRouteDialogVisible"
width=
"27.625rem"
:before-close=
"handleClose"
>
<el-dialog
class=
"jump-route"
append-to-body
:modal=
"false"
@
close=
"cancelJumpRoute"
:visible
.
sync=
"jumpRouteDialogVisible"
width=
"27.625rem"
:before-close=
"handleClose"
>
<span>
当前页面有未保存的指位特征,是否确认跳转路由?
</span>
<div
class=
"dialog-footer"
>
<button
class=
"confirm-btn"
@
click=
"confirmJumpRoute"
>
确 定
</button>
...
...
@@ -111,8 +178,12 @@
<!-- 人像 -->
<transition
name=
"el-fade-in-linear"
>
<div
class=
"face-big"
v-show=
"enLargeFace"
>
<div
class=
"face-name"
>
{{rxInfoEnlarge.name}}
</div>
<img
class=
"face-img"
:src=
"'data:image/jpeg;base64,'+rxInfoEnlarge.image"
alt=
""
>
<div
class=
"face-name"
>
{{ rxInfoEnlarge.name }}
</div>
<img
class=
"face-img"
:src=
"'data:image/jpeg;base64,' + rxInfoEnlarge.image"
alt=
""
/>
</div>
</transition>
</div>
...
...
@@ -126,7 +197,7 @@ import indexRoutes from "@/router/modules/index";
import
{
mapGetters
,
mapState
}
from
"vuex"
;
export
default
{
name
:
"Home"
,
data
()
{
data
()
{
return
{
searchTxt
:
""
,
routes
:
this
.
$store
.
getters
[
"layout/leftMenuData"
],
...
...
@@ -146,12 +217,12 @@ export default {
// 路由跳转的方式----- 1.面包屑切换。2.面包屑删除当前。3.左侧菜单跳转
routeChangeType
:
"change"
,
// 人像信息
rxInfoEnlarge
:
{}
rxInfoEnlarge
:
{}
,
};
},
mounted
()
{
mounted
()
{
console
.
log
(
this
.
loading_sd
);
this
.
$store
.
commit
(
'loading/setLoadingSd'
,
false
)
this
.
$store
.
commit
(
"loading/setLoadingSd"
,
false
);
let
self
=
this
;
this
.
menuActive
=
this
.
$route
.
name
;
...
...
@@ -159,29 +230,30 @@ export default {
this
.
$bus
.
on
(
"isBlur"
,
(
isBlur
)
=>
{
if
(
isBlur
)
{
self
.
isCropper
=
true
;
self
.
$store
.
commit
(
"loading/setGlass"
,
true
);
}
else
{
self
.
isCropper
=
false
;
self
.
$store
.
commit
(
"loading/setGlass"
,
false
);
}
});
// 初始化人像是否放大
self
.
$store
.
commit
(
'ryzwbj/setEnlargeFace'
,
false
)
document
.
querySelector
(
'.shadow'
).
addEventListener
(
'click'
,
function
(
e
)
{
self
.
$store
.
commit
(
"ryzwbj/setEnlargeFace"
,
false
);
document
.
querySelector
(
".shadow"
).
addEventListener
(
"click"
,
function
(
e
)
{
// 如果图像是处于放大状态
if
(
self
.
enLargeFace
)
{
self
.
isCropper
=
false
self
.
$store
.
commit
(
'ryzwbj/setEnlargeFace'
,
false
)
if
(
self
.
enLargeFace
)
{
self
.
isCropper
=
false
;
self
.
$store
.
commit
(
"ryzwbj/setEnlargeFace"
,
false
);
}
})
})
;
// 获取放大的人像信息
this
.
$bus
.
on
(
'setRxInfoEnlarge'
,
(
rxInfoEnlarge
)
=>
{
this
.
$bus
.
on
(
"setRxInfoEnlarge"
,
(
rxInfoEnlarge
)
=>
{
console
.
log
(
11111111111
);
self
.
rxInfoEnlarge
=
rxInfoEnlarge
})
self
.
rxInfoEnlarge
=
rxInfoEnlarge
;
});
},
updated
()
{
updated
()
{
this
.
menuActive
=
this
.
$route
.
name
;
},
computed
:
{
...
...
@@ -195,7 +267,7 @@ export default {
enLargeFace
:
(
state
)
=>
state
.
ryzwbj
.
enLargeFace
,
loading_sd
:
(
state
)
=>
state
.
loading
.
loading_sd
,
}),
cachePageName
()
{
cachePageName
()
{
return
this
.
$store
.
state
.
layout
.
cachePageName
;
},
},
...
...
@@ -206,9 +278,9 @@ export default {
* @return {*}
*/
logout
()
{
logout
()
{
this
.
$axios
.
get
(
"/
login/login
/logout"
)
.
get
(
"/
security
/logout"
)
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
localStorage
.
removeItem
(
"token"
);
//删除名称为“token”的信息。
...
...
@@ -217,7 +289,7 @@ export default {
this
.
$message
.
info
(
"退出成功!"
);
}
})
.
catch
((
err
)
=>
{
});
.
catch
((
err
)
=>
{});
},
/**
* @description: 开始搜索
...
...
@@ -225,11 +297,11 @@ export default {
* @return {*}
*/
goSearch
()
{
goSearch
()
{
this
.
searchTxt
=
""
;
//console.log(this.searchTxt);
},
handleClick
({
name
})
{
handleClick
({
name
})
{
if
(
(
this
.
$route
.
name
===
"ryzwbj"
||
this
.
$route
.
name
===
"ajzwbj"
)
&&
!
this
.
jumproute
...
...
@@ -261,7 +333,7 @@ export default {
/**
* 确认需要跳转路由
*/
confirmJumpRoute
()
{
confirmJumpRoute
()
{
this
.
isCropper
=
false
;
this
.
jumpRouteDialogVisible
=
false
;
if
(
this
.
routeChangeType
===
"change"
)
{
...
...
@@ -306,13 +378,13 @@ export default {
/**
* 取消跳转路由
*/
cancelJumpRoute
()
{
cancelJumpRoute
()
{
this
.
jumpRouteDialogVisible
=
false
;
this
.
isCropper
=
false
;
this
.
routePath
=
this
.
$route
.
name
;
this
.
menuActive
=
""
;
},
tabRemove
(
name
)
{
tabRemove
(
name
)
{
if
(
name
!=
"ryzwbj"
&&
name
!=
"ajzwbj"
)
{
let
routerObj
=
this
.
paths
.
find
((
i
)
=>
i
.
routeName
==
name
);
if
(
routerObj
)
{
...
...
@@ -379,7 +451,7 @@ export default {
}
}
},
setKeepAlive
()
{
setKeepAlive
()
{
let
cachePageName
;
if
(
JSON
.
parse
(
sessionStorage
.
getItem
(
"crumbs"
)).
length
>
0
)
{
cachePageName
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"crumbs"
))
...
...
@@ -398,7 +470,7 @@ export default {
* @param {*}
* @return {*}
*/
goManager
()
{
goManager
()
{
this
.
$router
.
push
(
"/Home/htzwcj"
);
this
.
menuActive
=
""
;
},
...
...
@@ -408,7 +480,7 @@ export default {
* @param {*} path
* @return {*}
*/
selectPath
(
index
,
path
)
{
selectPath
(
index
,
path
)
{
console
.
log
(
index
);
console
.
log
(
path
);
if
(
...
...
@@ -429,7 +501,7 @@ export default {
* @param {*}
* @return {*}
*/
closePaths
(
pathName
)
{
closePaths
(
pathName
)
{
let
res
=
this
.
paths
.
filter
((
item
)
=>
{
return
item
.
name
!=
pathName
;
});
...
...
@@ -445,7 +517,7 @@ export default {
* @param {*}
* @return {*}
*/
changeRouter
(
route
)
{
changeRouter
(
route
)
{
this
.
$router
.
push
(
route
.
path
);
this
.
menuActive
=
route
.
routeName
;
},
...
...
@@ -454,32 +526,25 @@ export default {
* @param {*}
* @return {*}
*/
switchCollapse
()
{
switchCollapse
()
{
this
.
isCollapse
=
!
this
.
isCollapse
;
},
handleOpen
(
key
,
keyPath
)
{
handleOpen
(
key
,
keyPath
)
{
//console.log(key, keyPath);
},
handleClose
(
key
,
keyPath
)
{
handleClose
(
key
,
keyPath
)
{
//console.log(key, keyPath);
},
},
beforeDestroy
()
{
beforeDestroy
()
{
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
},
watch
:
{
loading_sd
(
newValue
,
oldValue
)
{
console
.
log
(
newValue
);
},
enLargeFace
(
newValue
,
oldValue
)
{
},
menuActive
(
newValue
,
oldValue
)
{
},
loading
(
newValue
,
oldValue
)
{
},
enLargeFace
(
newValue
,
oldValue
)
{},
menuActive
(
newValue
,
oldValue
)
{},
loading
(
newValue
,
oldValue
)
{},
$route
:
{
handler
(
newValue
,
oldValue
)
{
handler
(
newValue
,
oldValue
)
{
// console.log(oldValue);
// 如果是人员指纹编辑界面或者是案件指纹编辑界面,进行判断是否跳转
// if(oldValue.name === 'ryzwbj' || oldValue.name === 'ajzwbj') {
...
...
@@ -517,7 +582,7 @@ export default {
immediate
:
true
,
},
},
created
()
{
created
()
{
this
.
paths
=
sessionStorage
.
getItem
(
"crumbs"
)
?
JSON
.
parse
(
sessionStorage
.
getItem
(
"crumbs"
))
:
[];
...
...
@@ -547,7 +612,7 @@ export default {
height
:
722px
;
box-shadow
:
0px
14px
30px
2px
rgba
(
0
,
21
,
51
,
0.16
);
border-radius
:
8px
;
border
:
1px
solid
#
CCCCCC
;
border
:
1px
solid
#
cccccc
;
background
:
#ffffff
;
}
}
...
...
@@ -579,7 +644,7 @@ export default {
}
.el-dialog
{
height
:
169px
;
background
:
#
FFFFFF
;
background
:
#
ffffff
;
box-shadow
:
0px
18px
28px
10px
rgba
(
0
,
21
,
51
,
0.08
)
!important
;
border-radius
:
6px
;
.confirm-btn
{
...
...
@@ -587,19 +652,19 @@ export default {
outline
:
none
;
width
:
72px
;
height
:
40px
;
background
:
#
FFFFFF
;
background
:
#
ffffff
;
border-radius
:
4px
;
border
:
1px
solid
#
AEB5C
2
;
border
:
1px
solid
#
aeb5c
2
;
font-size
:
14px
;
font-family
:
MicrosoftYaHei
;
color
:
#2
E
3846
;
color
:
#2
e
3846
;
&:hover
{
border
:
1px
solid
#377
FEC
;
color
:
#377
FEC
;
border
:
1px
solid
#377
fec
;
color
:
#377
fec
;
}
&
:active
{
border
:
1px
solid
#044
CB
9
;
color
:
#044
CB
9
;
border
:
1px
solid
#044
cb
9
;
color
:
#044
cb
9
;
}
}
.cancel-btn
{
...
...
@@ -607,12 +672,12 @@ export default {
outline
:
none
;
width
:
72px
;
height
:
40px
;
background
:
#055
FE
7
;
border
:
1px
solid
#055
FE
7
;
background
:
#055
fe
7
;
border
:
1px
solid
#055
fe
7
;
border-radius
:
4px
;
font-size
:
14px
;
font-family
:
MicrosoftYaHei
;
color
:
#
FFFFFF
;
color
:
#
ffffff
;
&:hover
{
background
:
#377fec
;
border
:
1px
solid
#377fec
;
...
...
src/views/Home/Home.vue
View file @
9d6f4dab
...
...
@@ -140,7 +140,7 @@ export default {
},
logout
()
{
this
.
$axios
.
get
(
"/
login/login
/logout"
)
.
get
(
"/
security
/logout"
)
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
localStorage
.
removeItem
(
"token"
);
//删除名称为“token”的信息。
...
...
@@ -158,7 +158,7 @@ export default {
},
created
()
{
sessionStorage
.
setItem
(
"crumbs"
,
[]);
this
.
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
))
.
user
;
this
.
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
));
console
.
log
(
this
.
userInfo
);
},
};
...
...
src/views/SystemManage/GroupManage.vue
View file @
9d6f4dab
...
...
@@ -42,7 +42,7 @@
></SelectCode>
</div>
<div
class=
"clear-btn"
@
click=
"clear"
v-if=
"newStr"
>
清空
</div>
<div
class=
"btn"
@
click=
"search"
>
筛选用户组
</div>
<div
class=
"btn"
@
click=
"search
('yes')
"
>
筛选用户组
</div>
</div>
<div
class=
"operation"
>
<div
class=
"btn1"
@
click=
"batch"
>
批量操作
</div>
...
...
@@ -207,7 +207,9 @@
</div>
<div
class=
"footer"
>
<span
class=
"count"
>
共{{ tableData.length }} 条记录 第{{ page.page }}/{{ Tpage }}页
</span
>
共{{ total }} 条记录 第{{
searchParams.page > countPage ? countPage : searchParams.page
}}/{{ countPage }}页
</span
>
<div
class=
"page"
>
<el-pagination
...
...
@@ -215,11 +217,11 @@
background
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrPageChange"
:current-page=
"
page
.page"
:current-page=
"
searchParams
.page"
:page-sizes=
"[10, 20, 50, 100]"
:page-size=
"
page.total
"
:page-size=
"
searchParams.size
"
layout=
"prev, pager, next"
:total=
"
page.count
"
:total=
"
total
"
>
</el-pagination>
</div>
...
...
@@ -740,16 +742,8 @@ export default {
name
:
""
,
dwCode
:
""
,
groupRole
:
[],
// usergroup.append('Id', "用户组Id");
// groupname,
// groupdesc,
// userId(多个用户id之间用逗号隔开),
// username(多个用户名之间用逗号隔开),
// roleId(多个角色id之间用逗号隔开),
// rolename(多个角色名之间用逗号隔开),
// status(激活状态:0未激活;1已激活)
// usergroup.append('page', "数据查询当前页码");//必填
// usergroup.append('total', "每页显示的数据条数");//必填
page
:
1
,
size
:
10
,
},
page
:
{
total
:
20
,
...
...
@@ -809,9 +803,13 @@ export default {
userAddCheckList
:
[],
userAddArr
:
[],
src
:
require
(
"@/assets/img/police-badge.png"
),
total
:
0
,
};
},
computed
:
{
countPage
()
{
return
Math
.
ceil
(
this
.
total
/
10
)
>
0
?
Math
.
ceil
(
this
.
total
/
10
)
:
1
;
},
// 计算总页数
Tpage
()
{
return
Math
.
floor
(
this
.
page
.
count
/
this
.
page
.
total
)
+
1
;
...
...
@@ -819,7 +817,7 @@ export default {
newStr
()
{
let
str
=
""
;
for
(
let
key
in
this
.
searchParams
)
{
if
(
key
!=
"page"
&&
key
!=
"groupRole"
)
{
if
(
key
!=
"page"
&&
key
!=
"groupRole"
&&
key
!=
"size"
)
{
str
+=
this
.
searchParams
[
key
].
trim
();
}
if
(
key
==
"groupRole"
)
{
...
...
@@ -881,14 +879,14 @@ export default {
},
clear
()
{
for
(
let
key
in
this
.
searchParams
)
{
if
(
key
!=
"page"
||
key
!=
"groupRol
e"
)
{
if
(
key
!=
"page"
&&
key
!=
"groupRole"
&&
key
!=
"siz
e"
)
{
this
.
$set
(
this
.
searchParams
,
key
,
""
);
}
if
(
key
==
"groupRole"
)
{
this
.
$set
(
this
.
searchParams
,
key
,
[]);
}
}
this
.
search
();
this
.
search
(
"yes"
);
},
//角色设置前端动效
settingPerson
(
item
,
minus
,
add
)
{
...
...
@@ -1043,7 +1041,7 @@ export default {
},
500
);
this
.
getAddUserList
();
this
.
getUserList
();
this
.
search
();
this
.
search
(
"yes"
);
}
});
})
...
...
@@ -1063,12 +1061,12 @@ export default {
},
// 当期页发生变化
handleCurrPageChange
:
function
(
val
)
{
this
.
page
.
page
=
val
;
this
.
searchParams
.
page
=
val
;
this
.
search
();
},
// 每页展示数量发生变化
handleSizeChange
:
function
(
val
)
{
this
.
page
.
total
=
val
;
this
.
searchParams
.
size
=
val
;
this
.
search
();
},
// 打开新增弹窗
...
...
@@ -1201,7 +1199,7 @@ export default {
},
800
);
this
.
isShowAddUserDialogBg
=
false
;
this
.
isShowAddUserDialog
=
false
;
this
.
search
();
this
.
search
(
"yes"
);
}
else
if
(
res
.
data
.
code
==
400
||
res
.
data
.
code
==
500
)
{
setTimeout
(()
=>
{
this
.
$message
.
error
(
res
.
data
.
detail
);
...
...
@@ -1296,7 +1294,7 @@ export default {
}),
}).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
&&
res
.
data
.
info
==
"success"
)
{
this
.
search
();
this
.
search
(
"yes"
);
setTimeout
(()
=>
{
this
.
$message
.
success
(
"删除成功"
);
this
.
offMultiple
();
...
...
@@ -1305,8 +1303,12 @@ export default {
});
},
// 搜索
search
()
{
search
(
boo
)
{
let
params
=
{};
if
(
boo
)
{
this
.
$set
(
this
.
searchParams
,
"page"
,
1
);
this
.
$set
(
this
.
searchParams
,
"size"
,
10
);
}
for
(
let
key
in
this
.
searchParams
)
{
if
(
key
==
"groupRole"
)
{
params
[
key
]
=
this
.
searchParams
[
key
].
join
();
...
...
@@ -1314,7 +1316,6 @@ export default {
params
[
key
]
=
this
.
searchParams
[
key
];
}
}
this
.
$axios
({
url
:
"/security/user-groups/search"
,
method
:
"post"
,
...
...
@@ -1324,8 +1325,10 @@ export default {
},
}).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
this
.
tableData
=
res
.
data
.
detail
;
this
.
allTableData
=
res
.
data
.
detail
;
let
result
=
res
.
data
.
detail
;
this
.
tableData
=
result
.
userGroups
;
this
.
allTableData
=
result
.
userGroups
;
this
.
total
=
result
.
total
;
this
.
key
++
;
}
});
...
...
@@ -1333,7 +1336,8 @@ export default {
},
activated
()
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
search
();
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
;
this
.
search
(
"yes"
);
});
},
deactivated
()
{
...
...
@@ -1343,11 +1347,11 @@ export default {
this
.
$bus
.
off
(
"enter"
);
},
mounted
()
{
this
.
search
();
this
.
search
(
"yes"
);
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
search
();
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
;
this
.
search
(
"yes"
);
});
debugger
;
this
.
$nextTick
(()
=>
{
document
.
body
.
appendChild
(
this
.
$refs
.
isShowEditGroupDialog
);
document
.
body
.
appendChild
(
this
.
$refs
.
isShowAddUserDialog
);
...
...
@@ -1356,7 +1360,6 @@ export default {
});
},
destroyed
()
{
debugger
;
$
(
".groupAddDialog"
).
remove
();
$
(
".groupEditDialog"
).
remove
();
$
(
".groupJueseDialog"
).
remove
();
...
...
src/views/SystemManage/GroupPermission.vue
View file @
9d6f4dab
...
...
@@ -488,7 +488,7 @@
import
"@/icons/group-item.svg"
;
import
qs
from
"qs"
;
export
default
{
name
:
"UserPermission"
,
//
name: "UserPermission",
data
()
{
return
{
id
:
""
,
...
...
src/views/SystemManage/PermissionManage.vue
View file @
9d6f4dab
...
...
@@ -74,7 +74,7 @@
></SelectCode>
</div>
<div
class=
"clear"
@
click=
"userClear"
v-if=
"newStr1"
>
清空
</div>
<div
class=
"btn"
@
click=
"searchUser"
>
筛选用户
</div>
<div
class=
"btn"
@
click=
"searchUser
('yes')
"
>
筛选用户
</div>
</div>
<!-- 用户表格-->
<div
class=
"table"
>
...
...
@@ -218,9 +218,9 @@
<!-- 用户分页-->
<div
class=
"footer"
>
<span
class=
"count"
>
共{{ userT
ableData.length }} 条记录 第{{ userPage.page }}/
{{
user
T
page
}}页
</span
>
共{{ userT
otal }} 条记录 第
{{
user
Page.page > userCont ? userCont : userPage.
page
}}
/{{ userCont }}
页
</span
>
<div
class=
"page"
>
<el-pagination
...
...
@@ -228,10 +228,10 @@
background
@
size-change=
"userHandleSizeChange"
@
current-change=
"userHandleCurrPageChange"
:current-page=
"user
Page
.page"
:page-size=
"user
Page.total
"
:current-page=
"user
SearchParams
.page"
:page-size=
"user
SearchParams.size
"
layout=
"prev, pager, next"
:total=
"user
Page.count
"
:total=
"user
Total
"
>
</el-pagination>
</div>
...
...
@@ -285,7 +285,7 @@
></SelectCode>
</div>
<div
class=
"clear"
@
click=
"groupClear"
v-if=
"newStr2"
>
清空
</div>
<div
class=
"btn"
@
click=
"searchGroup"
>
筛选用户组
</div>
<div
class=
"btn"
@
click=
"searchGroup
('yes')
"
>
筛选用户组
</div>
</div>
<!-- 用户组表格-->
<div
class=
"table"
>
...
...
@@ -295,7 +295,7 @@
ref=
"multipleTable"
:data=
"groupTableData"
:key=
"key2"
class=
"table"
class=
"table
groupTable
"
>
<el-table-column
prop=
"name"
...
...
@@ -439,9 +439,11 @@
<!-- 用户组分页-->
<div
class=
"footer"
>
<span
class=
"count"
>
共{{ groupTableData.length }} 条记录 第{{ grouppage.page }}/{{
groupTpage
}}页
</span
>
共{{ groupTotal }} 条记录 第{{
groupSearchParams.page > groupCont
? groupCont
: groupSearchParams.page
}}/{{ groupCont }}页
</span
>
<div
class=
"page"
>
<el-pagination
...
...
@@ -449,10 +451,10 @@
background
@
size-change=
"groupHandleSizeChange"
@
current-change=
"groupHandleCurrPageChange"
:current-page=
"group
page
.page"
:page-size=
"group
page.total
"
:current-page=
"group
SearchParams
.page"
:page-size=
"group
SearchParams.size
"
layout=
"prev, pager, next"
:total=
"group
page.count
"
:total=
"group
Total
"
>
</el-pagination>
</div>
...
...
@@ -591,6 +593,8 @@ export default {
unitCode
:
""
,
roleId
:
[],
permissionId
:
[],
page
:
1
,
size
:
10
,
},
userPage
:
{
total
:
20
,
...
...
@@ -614,15 +618,29 @@ export default {
name
:
""
,
dwCode
:
""
,
groupRole
:
[],
page
:
1
,
size
:
10
,
},
grouppage
:
{
total
:
20
,
count
:
0
,
page
:
1
,
},
userTotal
:
0
,
groupTotal
:
0
,
};
},
computed
:
{
userCont
()
{
return
Math
.
ceil
(
this
.
userTotal
/
10
)
>
0
?
Math
.
ceil
(
this
.
userTotal
/
10
)
:
1
;
},
groupCont
()
{
return
Math
.
ceil
(
this
.
groupTotal
/
10
)
>
0
?
Math
.
ceil
(
this
.
groupTotal
/
10
)
:
1
;
},
// 计算总页数
userTpage
()
{
return
Math
.
floor
(
this
.
userPage
.
count
/
this
.
userPage
.
total
)
+
1
;
...
...
@@ -630,7 +648,7 @@ export default {
newStr2
()
{
let
str
=
""
;
for
(
let
key
in
this
.
groupSearchParams
)
{
if
(
key
!=
"page"
&&
key
!=
"groupRole"
)
{
if
(
key
!=
"page"
&&
key
!=
"groupRole"
&&
key
!=
"size"
)
{
str
+=
this
.
groupSearchParams
[
key
].
trim
();
}
if
(
key
==
"groupRole"
)
{
...
...
@@ -646,7 +664,8 @@ export default {
key
!=
"page"
&&
key
!=
"roleId"
&&
key
!=
"userGroupId"
&&
key
!=
"permissionId"
key
!=
"permissionId"
&&
key
!=
"size"
)
{
str
+=
this
.
userSearchParams
[
key
].
trim
();
}
...
...
@@ -760,12 +779,13 @@ export default {
},
// 用户清空
userClear
()
{
// userSearchParams
debugger
;
for
(
let
key
in
this
.
userSearchParams
)
{
if
(
key
!=
"page"
||
key
!=
"userGroupId"
||
key
!=
"roleId"
||
key
!=
"page"
&&
key
!=
"size"
&&
key
!=
"userGroupId"
&&
key
!=
"roleId"
&&
key
!=
"permissionId"
)
{
this
.
$set
(
this
.
userSearchParams
,
key
,
""
);
...
...
@@ -774,36 +794,39 @@ export default {
this
.
$set
(
this
.
userSearchParams
,
key
,
[]);
}
}
this
.
searchUser
();
this
.
searchUser
(
"yes"
);
},
// 用户组清空
groupClear
()
{
for
(
let
key
in
this
.
groupSearchParams
)
{
if
(
key
!=
"page"
||
key
!=
"groupRol
e"
)
{
if
(
key
!=
"page"
&&
key
!=
"groupRole"
&&
key
!=
"siz
e"
)
{
this
.
$set
(
this
.
groupSearchParams
,
key
,
""
);
}
if
(
key
==
"groupRole"
)
{
this
.
$set
(
this
.
groupSearchParams
,
key
,
[]);
}
}
this
.
searchGroup
();
this
.
searchGroup
(
"yes"
);
},
// 用户当期页发生变化
userHandleCurrPageChange
:
function
(
val
)
{
this
.
user
Page
.
page
=
val
;
this
.
user
SearchParams
.
page
=
val
;
this
.
searchUser
();
},
// 用户每页展示数量发生变化
userHandleSizeChange
:
function
(
val
)
{
this
.
user
Page
.
total
=
val
;
this
.
user
SearchParams
.
size
=
val
;
this
.
searchUser
();
},
// 获取用户信息
searchUser
()
{
searchUser
(
boo
)
{
//console.info("搜索用户列表");
let
params
=
{};
if
(
boo
)
{
this
.
$set
(
this
.
userSearchParams
,
"page"
,
1
);
this
.
$set
(
this
.
userSearchParams
,
"size"
,
10
);
}
for
(
let
key
in
this
.
userSearchParams
)
{
if
(
key
==
"userGroupId"
||
key
==
"roleId"
||
key
==
"permissionId"
)
{
params
[
key
]
=
this
.
userSearchParams
[
key
].
join
();
...
...
@@ -820,7 +843,9 @@ export default {
},
}).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
this
.
userTableData
=
res
.
data
.
detail
;
let
result
=
res
.
data
.
detail
;
this
.
userTableData
=
result
.
users
;
this
.
userTotal
=
result
.
total
;
this
.
key1
++
;
}
});
...
...
@@ -838,18 +863,22 @@ export default {
},
// 用户组当前页发生变化
groupHandleCurrPageChange
:
function
(
val
)
{
this
.
group
page
.
page
=
val
;
this
.
group
SearchParams
.
page
=
val
;
this
.
searchGroup
();
},
// 用户组每页展示数量发生变化
groupHandleSizeChange
:
function
(
val
)
{
this
.
group
page
.
total
=
val
;
this
.
group
SearchParams
.
size
=
val
;
this
.
searchGroup
();
},
// 获取用户组信息
searchGroup
()
{
searchGroup
(
boo
)
{
let
params
=
{};
if
(
boo
)
{
this
.
$set
(
this
.
groupSearchParams
,
"page"
,
1
);
this
.
$set
(
this
.
groupSearchParams
,
"size"
,
10
);
}
for
(
let
key
in
this
.
groupSearchParams
)
{
if
(
key
==
"groupRole"
)
{
params
[
key
]
=
this
.
groupSearchParams
[
key
].
join
();
...
...
@@ -857,6 +886,7 @@ export default {
params
[
key
]
=
this
.
groupSearchParams
[
key
];
}
}
this
.
$axios
({
url
:
"/security/user-groups/search"
,
method
:
"post"
,
...
...
@@ -866,7 +896,9 @@ export default {
},
}).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
this
.
groupTableData
=
res
.
data
.
detail
;
let
result
=
res
.
data
.
detail
;
this
.
groupTableData
=
result
.
userGroups
;
this
.
groupTotal
=
result
.
total
;
this
.
key2
++
;
}
});
...
...
@@ -969,10 +1001,11 @@ export default {
},
activated
()
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
;
if
(
this
.
isUser
)
{
this
.
searchUser
();
this
.
searchUser
(
"yes"
);
}
else
{
this
.
searchGroup
();
this
.
searchGroup
(
"yes"
);
}
});
},
...
...
@@ -984,15 +1017,16 @@ export default {
},
mounted
()
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
;
if
(
this
.
isUser
)
{
this
.
searchUser
();
this
.
searchUser
(
"yes"
);
}
else
{
this
.
searchGroup
();
this
.
searchGroup
(
"yes"
);
}
});
this
.
isUser
=
true
;
if
(
this
.
isUser
)
{
this
.
searchUser
();
this
.
searchUser
(
"yes"
);
}
this
.
$nextTick
(()
=>
{
document
.
body
.
appendChild
(
this
.
$refs
.
isShowUserDialog
);
...
...
@@ -1009,6 +1043,9 @@ export default {
<
style
scoped
lang=
"scss"
>
@import
"scss/group"
;
@import
"scss/permission"
;
.groupTable
{
height
:
550px
!important
;
}
.el-table
/
deep
/
{
.el-tooltip
{
width
:
100%
!important
;
...
...
src/views/SystemManage/RoleManage.vue
View file @
9d6f4dab
...
...
@@ -491,7 +491,7 @@ export default {
if
(
item
)
{
let
id
=
this
.
diyRoleList
.
length
+
20
+
"copy"
;
var
roleitem
=
{
name
:
item
.
name
+
"_copy
"
,
name
:
"请输入名称
"
,
value
:
""
,
flag
:
false
,
code
:
this
.
diyRoleList
.
length
,
...
...
@@ -520,11 +520,14 @@ export default {
// 保存
save
()
{
let
self
=
this
;
//如果是添加角色
if
(
this
.
customAddUser
.
length
>
0
)
{
//如果选的用户不是添加的用户
if
(
this
.
diyRoleItemIndex
!==
this
.
customAddUser
[
0
].
id
)
{
let
userObj
=
this
.
diyRoleList
.
find
(
(
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
);
debugger
;
//修改
let
obj
=
{
id
:
this
.
diyRoleItemIndex
,
...
...
@@ -535,7 +538,7 @@ export default {
return
;
}
console
.
log
(
this
.
customAddUser
);
//如果位置在新增的用户就新增
let
name
=
this
.
customAddUser
[
0
].
value
;
let
checkArr
=
this
.
checkList
;
let
params
=
{
...
...
@@ -571,12 +574,12 @@ export default {
},
800
);
}
else
{
setTimeout
(()
=>
{
this
.
$message
.
success
(
"新增角色失败!"
);
this
.
$message
.
error
(
res
.
data
.
detail
);
},
800
);
}
});
}
else
{
//修改
//修改
角色
let
userObj
=
this
.
diyRoleList
.
find
(
(
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
);
...
...
@@ -589,6 +592,7 @@ export default {
this
.
editUserRole
(
obj
);
}
},
//选中主的全选子的,取消主的取消全部子的
handleCheckAllChange
(
boo
,
id
)
{
let
obj
=
this
.
permissionDataList
.
find
((
i
)
=>
i
.
id
==
id
);
let
sonArr
=
obj
.
children
.
map
((
i
)
=>
i
.
id
);
...
...
@@ -619,12 +623,15 @@ export default {
this
.
checkList
=
[];
}
}
//分开button,重构数据
this
.
defaultRoleBtns
=
result
.
filter
((
i
)
=>
i
.
defaultFlag
==
1
);
this
.
diyRoleList
=
result
.
filter
((
i
)
=>
{
i
.
value
=
i
.
name
;
return
i
.
defaultFlag
==
0
;
});
this
.
diyRoleList
=
JSON
.
parse
(
JSON
.
stringify
(
result
)).
filter
(
(
i
)
=>
{
i
.
value
=
i
.
name
;
i
.
name
=
"请输入名称"
;
return
i
.
defaultFlag
==
0
;
}
);
//console.log(1111111, this.diyRoleList);
let
arr
=
[...
this
.
diyRoleList
,
...
this
.
defaultRoleBtns
];
let
obj
=
arr
.
find
((
i
)
=>
i
.
id
==
this
.
diyRoleItemIndex
);
...
...
@@ -644,6 +651,13 @@ export default {
this
.
$message
.
error
(
"请选择角色后操作"
);
return
;
}
if
(
this
.
customAddUser
.
length
>
0
&&
this
.
btnCheckList
.
includes
(
this
.
customAddUser
[
0
].
id
)
)
{
this
.
$message
.
error
(
"请保存后进行删除操作"
);
return
;
}
let
ids
=
this
.
btnCheckList
.
join
(
","
);
let
boo
=
this
.
btnCheckList
.
find
((
i
)
=>
i
==
this
.
diyRoleItemIndex
);
let
loading
=
this
.
$loading
({
...
...
@@ -688,7 +702,7 @@ export default {
let
id
=
this
.
diyRoleList
.
length
+
20
+
"l"
;
var
roleitem
=
{
value
:
""
,
name
:
"
自定义"
+
(
this
.
diyRoleList
.
length
+
1
)
,
name
:
"
请输入名称"
,
flag
:
false
,
code
:
this
.
diyRoleList
.
length
,
edit
:
true
,
...
...
@@ -748,6 +762,10 @@ export default {
this
.
$message
.
success
(
"更新成功"
);
},
500
);
this
.
resetEdit
();
}
else
{
setTimeout
(()
=>
{
this
.
$message
.
error
(
res
.
data
.
detail
);
},
500
);
}
});
},
...
...
@@ -761,6 +779,7 @@ export default {
this
.
viewSelect
(
item
);
this
.
diyRoleItemIndex
=
item
.
id
;
},
// 选中的权限
viewSelect
(
item
)
{
this
.
checkList
=
(
item
.
permissions
&&
item
.
permissions
.
map
((
i
)
=>
i
.
id
))
||
[];
...
...
@@ -774,7 +793,7 @@ export default {
this
.
diyRoleItemIndex
=
item
.
id
;
this
.
viewSelect
(
item
);
},
// 编辑
// 编辑
以后出现输入框的一系列细节
editDiyRoleItem
(
item
)
{
let
edit
=
item
.
edit
;
let
index
=
this
.
diyRoleList
.
findIndex
((
i
)
=>
i
.
id
==
item
.
id
);
...
...
src/views/SystemManage/UserManage.vue
View file @
9d6f4dab
...
...
@@ -54,7 +54,7 @@
></SelectCode>
</div>
<div
class=
"clear-btn"
@
click=
"clear"
v-if=
"newStr"
>
清空
</div>
<div
class=
"btn"
@
click=
"search"
>
筛选用户
</div>
<div
class=
"btn"
@
click=
"search
('yes')
"
>
筛选用户
</div>
</div>
<div
class=
"operation"
>
<div
class=
"btn1"
@
click=
"batch"
>
批量操作
</div>
...
...
@@ -242,7 +242,9 @@
</div>
<div
class=
"footer"
>
<span
class=
"count"
>
共{{ tableData.length }} 条记录 第{{ page.page }}/{{ Tpage }}页
</span
>
共{{ total }} 条记录 第{{
searchParams.page > countPage ? countPage : searchParams.page
}}/{{ countPage }}页
</span
>
<div
class=
"page"
>
<el-pagination
...
...
@@ -250,11 +252,11 @@
background
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrPageChange"
:current-page=
"
page
.page"
:current-page=
"
searchParams
.page"
:page-sizes=
"[10, 20, 50, 100]"
:page-size=
"
page.total
"
:page-size=
"
searchParams.size
"
layout=
"prev, pager, next"
:total=
"
page.count
"
:total=
"
total
"
>
</el-pagination>
</div>
...
...
@@ -404,6 +406,7 @@
<el-input
placeholder=
"请输入用户名"
class=
"input-info"
disabled
maxlength=
"8"
show-word-limit
v-model=
"editFormParams.username"
...
...
@@ -725,12 +728,15 @@ export default {
unitCode
:
""
,
roleId
:
[],
permissionId
:
[],
page
:
1
,
size
:
10
,
},
page
:
{
total
:
10
,
count
:
0
,
page
:
1
,
},
total
:
0
,
// 选中数据
multipleSelection
:
[],
isShowTip
:
false
,
//批量操作提示
...
...
@@ -750,6 +756,9 @@ export default {
};
},
computed
:
{
countPage
()
{
return
Math
.
ceil
(
this
.
total
/
10
)
>
0
?
Math
.
ceil
(
this
.
total
/
10
)
:
1
;
},
newWidth
()
{
let
w1
=
1920
;
let
w2
=
window
.
innerWidth
;
...
...
@@ -787,7 +796,8 @@ export default {
key
!=
"page"
&&
key
!=
"roleId"
&&
key
!=
"userGroupId"
&&
key
!=
"permissionId"
key
!=
"permissionId"
&&
key
!=
"size"
)
{
str
+=
this
.
searchParams
[
key
].
trim
();
}
...
...
@@ -823,7 +833,7 @@ export default {
},
800
);
this
.
isShowAddUserDialog
=
false
;
this
.
isShowAddUserDialogBg
=
false
;
this
.
search
();
this
.
search
(
"yes"
);
}
else
if
(
res
.
data
.
code
==
400
||
res
.
data
.
code
==
500
)
{
setTimeout
(()
=>
{
this
.
$message
.
error
(
res
.
data
.
detail
);
...
...
@@ -902,10 +912,11 @@ export default {
clear
()
{
for
(
let
key
in
this
.
searchParams
)
{
if
(
key
!=
"page"
||
key
!=
"userGroupId"
||
key
!=
"roleId"
||
key
!=
"permissionId"
key
!=
"page"
&&
key
!=
"userGroupId"
&&
key
!=
"roleId"
&&
key
!=
"permissionId"
&&
key
!=
"size"
)
{
this
.
$set
(
this
.
searchParams
,
key
,
""
);
}
...
...
@@ -913,11 +924,14 @@ export default {
this
.
$set
(
this
.
searchParams
,
key
,
[]);
}
}
this
.
search
();
this
.
search
(
"yes"
);
},
search
()
{
search
(
boo
)
{
let
params
=
{};
if
(
boo
)
{
this
.
$set
(
this
.
searchParams
,
"page"
,
1
);
this
.
$set
(
this
.
searchParams
,
"size"
,
10
);
}
for
(
let
key
in
this
.
searchParams
)
{
if
(
key
==
"userGroupId"
||
key
==
"roleId"
||
key
==
"permissionId"
)
{
params
[
key
]
=
this
.
searchParams
[
key
].
join
();
...
...
@@ -925,9 +939,6 @@ export default {
params
[
key
]
=
this
.
searchParams
[
key
];
}
}
console
.
log
(
params
);
///////////////////
//console.info("搜索用户列表");
this
.
$axios
({
url
:
"/security/users/search"
,
method
:
"post"
,
...
...
@@ -937,8 +948,10 @@ export default {
},
}).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
)
{
this
.
tableData
=
res
.
data
.
detail
;
this
.
allTableData
=
res
.
data
.
detail
;
let
result
=
res
.
data
.
detail
;
this
.
tableData
=
result
.
users
;
this
.
allTableData
=
result
.
users
;
this
.
total
=
result
.
total
;
this
.
key
++
;
}
});
...
...
@@ -970,12 +983,12 @@ export default {
},
// 当期页发生变化
handleCurrPageChange
:
function
(
val
)
{
this
.
page
.
page
=
val
;
this
.
searchParams
.
page
=
val
;
this
.
search
();
},
// 每页展示数量发生变化
handleSizeChange
:
function
(
val
)
{
this
.
page
.
total
=
val
;
this
.
searchParams
.
size
=
val
;
this
.
search
();
},
// 打开新增弹窗
...
...
@@ -1104,7 +1117,7 @@ export default {
}),
}).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
200
&&
res
.
data
.
info
==
"success"
)
{
this
.
search
();
this
.
search
(
"yes"
);
setTimeout
(()
=>
{
this
.
$message
.
success
(
"删除成功"
);
this
.
offMultiple
();
...
...
@@ -1118,7 +1131,8 @@ export default {
},
activated
()
{
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
search
();
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
;
this
.
search
(
"yes"
);
});
},
deactivated
()
{
...
...
@@ -1128,9 +1142,10 @@ export default {
this
.
$bus
.
off
(
"enter"
);
},
mounted
()
{
this
.
search
();
this
.
search
(
"yes"
);
this
.
$bus
.
on
(
"enter"
,
()
=>
{
this
.
search
();
if
(
this
.
$store
.
state
.
loading
.
groundGlassBoo
)
return
;
this
.
search
(
"yes"
);
});
this
.
$nextTick
(()
=>
{
document
.
body
.
appendChild
(
this
.
$refs
.
addUserDialog
);
...
...
src/views/SystemManage/UserPermission.vue
View file @
9d6f4dab
...
...
@@ -412,7 +412,7 @@
<
script
>
export
default
{
name
:
"UserPermission"
,
//
name: "UserPermission",
data
()
{
return
{
id
:
""
,
...
...
src/views/SystemManage/scss/group.scss
View file @
9d6f4dab
...
...
@@ -223,9 +223,12 @@
}
}
.table-data
{
height
:
5
8
0px
;
.table-data
/
deep
/
{
height
:
5
3
0px
;
width
:
100%
;
.el-table
{
height
:
510px
!
important
;
}
.tagsBox
{
display
:
flex
;
.el-tooltip
{
...
...
@@ -329,6 +332,7 @@
}
}
.el-table
/
deep
/
{
.is-checked
{
.el-checkbox__inner
{
background
:
#055fe7
;
...
...
src/views/SystemManage/scss/user.scss
View file @
9d6f4dab
...
...
@@ -181,9 +181,12 @@
}
}
}
.table-data
{
height
:
5
8
0px
;
.table-data
/
deep
/
{
height
:
5
3
0px
;
width
:
100%
;
.el-table
{
height
:
510px
!
important
;
}
.tagsBox
{
display
:
flex
;
.el-tooltip
{
...
...
src/views/cxyrd/LL.vue
View file @
9d6f4dab
...
...
@@ -13,6 +13,11 @@
<div
class=
"lt_main_left"
>
<LLSrc
:src-data=
"qid"
@
sourceObj=
"
(val) =>
{
sourceObj = val;
}
"
@switchName="
(val) => {
fingerShowType = val;
...
...
@@ -27,7 +32,14 @@
<ImageEd></ImageEd>
</div>
<div
class=
"lt_main_right"
>
<LLCandidate
:fingerShowType=
"fingerShowType"
></LLCandidate>
<LLCandidate
:fingerShowType=
"fingerShowType"
@
targetObj=
"
(val) =>
{
targetObj = val;
}
"
>
</LLCandidate>
</div>
</div>
</div>
...
...
@@ -59,7 +71,7 @@
串查
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
style=
"visibility: hidden"
>
<div
class=
"bzname"
>
现场勘验编号:
</div>
<div
class=
"bzvalue"
>
{{
xckybh
}}
</div>
</div>
...
...
@@ -115,30 +127,31 @@
<div
class=
"bz-target"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中单位:
</div>
<div
class=
"bzvalue"
>
{{
bz
dw
}}
</div>
<div
class=
"bzvalue"
>
{{
bz
r
.
unitName
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人:
</div>
<div
class=
"bzvalue"
>
{{
bzr
}}
</div>
<div
class=
"bzvalue"
>
{{
bzr
.
name
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
单位代码:
</div>
<div
class=
"bzvalue"
>
{{
dwdm
}}
</div>
<div
class=
"bzvalue"
>
{{
bzr
.
unitCode
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人身份证号:
</div>
<div
class=
"bzvalue"
>
{{
bzr
sfzh
}}
</div>
<div
class=
"bzvalue"
>
{{
bzr
.
idCard
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中时间:
</div>
<div
class=
"bzvalue"
>
{{
bz
sj
}}
</div>
<div
class=
"bzvalue"
>
{{
bz
r
.
bzTime
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人联系电话:
</div>
<el-input
class=
"bzphone"
v-model=
"
phone
"
v-model=
"
bzr.phoneNumber
"
placeholder=
"请输入内容"
disabled
></el-input>
<div
class=
"input-error"
v-show=
"isPhoneError"
>
<!--
<img
src=
"@/assets/img/inputerror.png"
alt=
""
>
-->
...
...
@@ -233,10 +246,23 @@ export default {
xckybh
:
""
,
rybh
:
""
,
zw
:
""
,
//比中人信息
bzr
:
{
bzTime
:
""
,
idCard
:
""
,
phoneNumber
:
""
,
name
:
""
,
unitCode
:
""
,
unitName
:
""
,
},
// 是否展示认定完成确认框背景
isShowrdwcDialogBg
:
false
,
// 是否展示认定完成确认框
isShowrdwcDialog
:
false
,
//当前选中的源对象
sourceObj
:
{},
//当前选中的目标对象
targetObj
:
{},
};
},
created
()
{
...
...
@@ -336,27 +362,35 @@ export default {
return
;
}
// 3:串查
let
query
type
=
3
;
let
query
Type
=
"3"
;
this
.
$axios
({
method
:
"post"
,
url
:
"/api/matchcand/affirm/hit"
,
data
:
{
affirmstatus
,
srcseqno
,
destseqno
,
srcseqno
:
parseInt
(
srcseqno
),
destseqno
:
parseInt
(
destseqno
),
srcbarcode
,
destbarcode
,
qqid
,
qid
,
query
t
ype
,
qqid
:
parseInt
(
qqid
)
,
qid
:
parseInt
(
qid
)
,
query
T
ype
,
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
)
=>
{
// 跟新列表数据
self
.
$bus
.
emit
(
"updateFinderSource"
);
//console.log(response);
this
.
$message
.
success
(
"比中成功!"
);
if
(
response
.
data
.
code
==
0
){
// 跟新列表数据
self
.
$bus
.
emit
(
"updateFinderSource"
);
this
.
$message
.
success
(
"比中成功!"
);
}
else
{
this
.
$message
.
error
(
response
.
data
.
message
)
}
})
.
catch
((
err
)
=>
{
this
.
$message
.
error
(
"比中失败!"
);
...
...
@@ -398,6 +432,7 @@ export default {
"xh"
,
sessionStorage
.
getItem
(
"destseqno"
)
||
""
);
this
.
$set
(
this
.
bzr
,
"bzTime"
,
result
.
time
);
}
});
},
...
...
@@ -422,33 +457,9 @@ export default {
}
}
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: 比中
...
...
@@ -456,12 +467,26 @@ export default {
* @return {*}
*/
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
.
getUserInfo2
();
this
.
asjbh
=
sessionStorage
.
getItem
(
"srcbarcode"
);
this
.
xh
=
sessionStorage
.
getItem
(
"srcseqno"
);
this
.
rybh
=
sessionStorage
.
getItem
(
"destbarcode"
);
this
.
judgeZw
(
Number
(
sessionStorage
.
getItem
(
"destseqno"
)));
this
.
isShowbzDialogBg
=
true
;
this
.
isShowbzDialog
=
true
;
},
...
...
src/views/cxyrd/QueryConfirm.vue
View file @
9d6f4dab
...
...
@@ -25,8 +25,8 @@
@
change=
"selectUserInfo"
>
<el-option
v-for=
"
item
in userOption"
:key=
"i
tem.userid
"
v-for=
"
(item,index)
in userOption"
:key=
"i
ndex
"
:label=
"item.userdesc"
:value=
"item.userid"
>
...
...
@@ -34,10 +34,10 @@
</el-select>
</div>
<div
class=
"display_style"
>
<span>
任务号/
查询ID:
</span>
<span>
查询ID:
</span>
<el-input
class=
"el_input"
placeholder=
"请输入
任务号/
查询ID"
placeholder=
"请输入查询ID"
v-model=
"reqParam.contrastCustomSearchReq.qqid"
></el-input>
</div>
...
...
@@ -62,6 +62,9 @@
range-separator=
"-"
start-placeholder=
"开始时间"
end-placeholder=
"结束时间"
:picker-options=
"
{
disabledDate: disabledDate,
}"
>
</el-date-picker>
</div>
...
...
@@ -624,6 +627,13 @@ export default {
},
},
methods
:
{
disabledDate
(
a
)
{
if
(
a
.
getTime
()
>
new
Date
().
getTime
())
{
return
true
;
}
else
{
return
false
;
}
},
// 获取认定列表
search
()
{
this
.
getParam
();
...
...
@@ -637,7 +647,7 @@ export default {
this
.
list
=
response
.
data
.
ret
.
list
;
this
.
reqParam
.
page
.
total
=
response
.
data
.
ret
.
total
;
//console.info("查询结果===>", this.list);
this
.
userInfo
=
this
.
getUserInfo
(
this
.
list
);
//
this.userInfo = this.getUserInfo(this.list);
}
else
{
// 请求成功无返回值
this
.
list
=
[];
...
...
@@ -688,7 +698,7 @@ export default {
});
}
});
this
.
userOption
=
this
.
unique
(
userInfo
);
//
this.userOption = this.unique(userInfo);
// //console.info("用户信息==>", this.userOption);
},
// 用户信息去重
...
...
src/views/cxyrd/TT.vue
View file @
9d6f4dab
<
template
>
<div
style=
"width: 100%"
>
<div
:class=
"
{ bzActive: isShowbzDialogBg, tt: true }">
<div
:class=
"
{ bzActive: isShowbzDialogBg
|| loading_sd
, tt: true }">
<div
class=
"header"
>
<div
class=
"label"
>
查重
</div>
<div
class=
"btns"
>
...
...
@@ -113,7 +113,7 @@
<div
class=
"del"
slot-scope=
"scope"
v-if=
"
targetDel && destbarcode == scope.row.destbarcode
"
v-if=
"
scope.row.removeFlag == '1'
"
>
{{ scope.$index + 1 }}
</div>
...
...
@@ -125,7 +125,7 @@
<div
class=
"del"
slot-scope=
"scope"
v-if=
"
targetDel && destbarcode == scope.row.destbarcode
"
v-if=
"
scope.row.removeFlag == '1'
"
>
{{ scope.row.score }}
</div>
...
...
@@ -141,7 +141,7 @@
<div
class=
"del"
slot-scope=
"scope"
v-if=
"
targetDel && destbarcode == scope.row.destbarcode
"
v-if=
"
scope.row.removeFlag == '1'
"
>
{{ scope.row.destbarcode }}
</div>
...
...
@@ -154,7 +154,7 @@
<p>
<img
src=
"@/assets/img/TT/delTime.png"
alt=
""
/>
<span>
删除时间
</span>
<span>
2012.12.24 12:39:45
</span>
<span>
{{ targetDelText }}
</span>
</p>
</div>
</div>
...
...
@@ -666,6 +666,17 @@
/>
</div>
</div>
<!-- 加载动画 -->
<div
class=
"loading"
v-show=
"loading_sd"
>
<div
class=
"loading-finger"
>
<img
src=
"@/assets/img/loadingfinger.gif"
alt=
""
/>
</div>
<div
class=
"loading-name"
>
<img
src=
"@/assets/img/loadingtxt.gif"
alt=
""
/>
</div>
</div>
<!-- 认定判断弹框 -->
<div
class=
"rdwccontent"
v-show=
"isShowrdwcDialog"
>
<div
class=
"title"
>
当前候选未全部查看,是否确认认定完成?
</div>
...
...
@@ -735,11 +746,11 @@
</div>
<div
class=
"item"
>
<div
class=
"title"
>
人员编号:
</div>
<div
class=
"value"
>
{{ sourcebarcode }}
</div>
<div
class=
"value"
>
{{ source
Obj.
barcode }}
</div>
<div
class=
"title"
>
姓名:
</div>
<div
class=
"value"
>
{{
userName
}}
</div>
<div
class=
"value"
>
{{
bzsource.xm
}}
</div>
<div
class=
"title"
>
捺印日期:
</div>
<div
class=
"value"
>
{{
dateTime
}}
</div>
<div
class=
"value"
>
{{
bzsource.nysj
}}
</div>
</div>
</div>
<div
class=
"bz-src-item"
>
...
...
@@ -749,40 +760,41 @@
</div>
<div
class=
"item"
>
<div
class=
"title"
>
人员编号:
</div>
<div
class=
"value"
>
{{
source
barcode }}
</div>
<div
class=
"value"
>
{{
targetObj.dest
barcode }}
</div>
<div
class=
"title"
>
姓名:
</div>
<div
class=
"value"
>
{{
userName
}}
</div>
<div
class=
"value"
>
{{
bztarget.xm
}}
</div>
<div
class=
"title"
>
捺印日期:
</div>
<div
class=
"value"
>
{{
dateTime
}}
</div>
<div
class=
"value"
>
{{
bztarget.nysj
}}
</div>
</div>
</div>
</div>
<div
class=
"bz-target"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中单位:
</div>
<div
class=
"bzvalue"
>
{{ bz
dw
}}
</div>
<div
class=
"bzvalue"
>
{{ bz
r.unitName
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人:
</div>
<div
class=
"bzvalue"
>
{{ bzr }}
</div>
<div
class=
"bzvalue"
>
{{ bzr
.name
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
单位代码:
</div>
<div
class=
"bzvalue"
>
{{
dwdm
}}
</div>
<div
class=
"bzvalue"
>
{{
bzr.unitCode
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人身份证号:
</div>
<div
class=
"bzvalue"
>
{{ bzr
sfzh
}}
</div>
<div
class=
"bzvalue"
>
{{ bzr
.idCard
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中时间:
</div>
<div
class=
"bzvalue"
>
{{ bz
sj
}}
</div>
<div
class=
"bzvalue"
>
{{ bz
r.bzTime
}}
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人联系电话:
</div>
<el-input
class=
"bzphone"
v-model=
"phone"
v-model=
"bzr.phoneNumber"
disabled
placeholder=
"请输入内容"
></el-input>
<div
class=
"input-error"
v-show=
"isPhoneError"
>
...
...
@@ -815,6 +827,7 @@
</template>
<
script
>
import
{
mapState
}
from
"vuex"
;
import
"swiper/dist/css/swiper.css"
;
import
{
swiper
,
swiperSlide
}
from
"vue-awesome-swiper"
;
import
TTPlam
from
"./modules/TTPlam.vue"
;
...
...
@@ -832,6 +845,11 @@ export default {
swiperSlide
,
Swiper
,
},
computed
:
{
...
mapState
({
loading_sd
:
(
state
)
=>
state
.
loading
.
loading_sd
,
}),
},
data
()
{
return
{
width1
:
50
,
...
...
@@ -956,7 +974,14 @@ export default {
// 指纹图片加载
fingerLoading
:
true
,
bzdw
:
""
,
bzr
:
""
,
bzr
:
{
bzTime
:
""
,
idCard
:
""
,
phoneNumber
:
""
,
name
:
""
,
unitCode
:
""
,
unitName
:
""
,
},
dwdm
:
""
,
bzrsfzh
:
""
,
bzsj
:
""
,
...
...
@@ -987,6 +1012,20 @@ export default {
sonTargetDel
:
false
,
faceDetail
:
1
,
plamDetail
:
1
,
//当前展示的源对象
sourceObj
:
{},
//当前展示的目标对象
targetObj
:
{},
//比中弹框目标信息
bztarget
:
{
xm
:
""
,
nysj
:
""
,
},
//比重弹框目标信息
bzsource
:
{
xm
:
""
,
nysj
:
""
,
},
};
},
created
()
{
...
...
@@ -1052,21 +1091,21 @@ export default {
loadingIndex
(
val
,
oldval
)
{
if
(
oldval
==
0
)
{
this
.
screenLoading
=
true
;
this
.
sLoading
=
this
.
$loading
({
// 通过cdn引入的element-ui
customClass
:
"screen"
,
spinner
:
"screenIcon"
,
lock
:
true
,
text
:
" "
,
background
:
"rgba(255, 255, 255, 0.9)"
,
});
//
this.sLoading = this.$loading({
//
// 通过cdn引入的element-ui
//
customClass: "screen",
//
spinner: "screenIcon",
//
lock: true,
//
text: " ",
//
background: "rgba(255, 255, 255, 0.9)",
//
});
}
if
(
this
.
timer
)
clearTimeout
(
this
.
timer
);
if
(
val
==
0
)
{
this
.
timer
=
setTimeout
(()
=>
{
this
.
screenLoading
=
false
;
this
.
sLoading
.
close
();
this
.
sLoading
=
null
;
//
this.sLoading.close();
//
this.sLoading = null;
},
200
);
}
},
...
...
@@ -1101,6 +1140,7 @@ export default {
if
(
index
>
0
)
{
this
.
currentQqid
=
this
.
sourcedatas
[
i
-
1
].
qqid
;
this
.
sourcebarcode
=
this
.
sourcedatas
[
i
-
1
].
barcode
;
this
.
sourceObj
=
this
.
sourcedatas
[
i
-
1
];
this
.
fingerLoading
=
true
;
this
.
$set
(
this
.
sourcedatas
[
i
-
1
],
"clickLog"
,
"1"
);
if
(
this
.
sourcedatas
[
i
-
1
].
removeFlag
==
"1"
)
{
...
...
@@ -1131,6 +1171,7 @@ export default {
if
(
this
.
sourcedatas
.
length
-
1
>
index
)
{
this
.
currentQqid
=
this
.
sourcedatas
[
i
+
1
].
qqid
;
this
.
sourcebarcode
=
this
.
sourcedatas
[
i
+
1
].
barcode
;
this
.
sourceObj
=
this
.
sourcedatas
[
i
+
1
];
this
.
$set
(
this
.
sourcedatas
[
i
+
1
],
"clickLog"
,
"1"
);
if
(
this
.
sourcedatas
[
i
+
1
].
removeFlag
==
"1"
)
{
this
.
souceDel
=
true
;
...
...
@@ -1162,13 +1203,9 @@ export default {
this
.
loadingIndex
++
;
if
(
me
.
dataType
==
"father"
)
{
me
.
$axios
.
post
(
"/api/queryque/standardAll"
,
{
contrastCustomSearchReq
:
{
qid
:
me
.
qid
},
},
{
loading
:
false
}
)
.
post
(
"/api/queryque/standardAll"
,
{
contrastCustomSearchReq
:
{
qid
:
me
.
qid
},
})
.
then
((
res
)
=>
{
me
.
loadingIndex
--
;
if
(
res
.
data
.
code
==
0
)
{
...
...
@@ -1176,6 +1213,7 @@ export default {
me
.
sourcedatasLength
=
res
.
data
.
ret
.
length
;
me
.
sourcebarcode
=
res
.
data
.
ret
[
0
].
barcode
;
me
.
currentQqid
=
res
.
data
.
ret
[
0
].
qqid
;
me
.
sourceObj
=
res
.
data
.
ret
[
0
];
me
.
$set
(
me
.
sourcedatas
[
0
],
"clickLog"
,
1
);
if
(
res
.
data
.
ret
[
0
].
removeFlag
==
"1"
)
{
...
...
@@ -1208,13 +1246,9 @@ export default {
});
}
else
{
me
.
$axios
.
post
(
"/api/queryque/standardAll"
,
{
contrastCustomSearchReq
:
{
qqid
:
me
.
currentQqid
},
},
{
loading
:
false
}
)
.
post
(
"/api/queryque/standardAll"
,
{
contrastCustomSearchReq
:
{
qqid
:
me
.
currentQqid
},
})
.
then
((
res
)
=>
{
me
.
loadingIndex
--
;
if
(
res
.
data
.
code
==
0
)
{
...
...
@@ -1263,8 +1297,7 @@ export default {
if
(
me
.
currentQqid
!==
null
)
{
me
.
$axios
.
get
(
"/api/query/matchcand/"
+
me
.
currentQqid
+
"/"
+
me
.
sourcebarcode
,
{
loading
:
false
}
"/api/query/matchcand/"
+
me
.
currentQqid
+
"/"
+
me
.
sourcebarcode
)
.
then
((
res
)
=>
{
me
.
loadingIndex
--
;
...
...
@@ -1283,13 +1316,9 @@ export default {
this
.
loadingIndex
++
;
// 平面
this
.
$axios
.
post
(
"/api/png/plainByBarcode/barcode"
,
{
barcode
:
this
.
sourcebarcode
,
},
{
loading
:
false
}
)
.
post
(
"/api/png/plainByBarcode/barcode"
,
{
barcode
:
this
.
sourcebarcode
,
})
.
then
(
function
(
response
)
{
self
.
loadingIndex
--
;
if
(
response
.
data
.
code
==
0
)
{
...
...
@@ -1325,11 +1354,7 @@ export default {
let
self
=
this
;
// 滚动 源数据
this
.
$axios
.
post
(
"/api/png/rollByBarcode/barcode"
,
{
barcode
:
barcode
},
{
loading
:
false
}
)
.
post
(
"/api/png/rollByBarcode/barcode"
,
{
barcode
:
barcode
})
.
then
(
function
(
response
)
{
self
.
loadingIndex
--
;
if
(
response
.
data
.
code
==
0
)
{
...
...
@@ -1364,13 +1389,9 @@ export default {
this
.
loadingIndex
++
;
// 平面 目标
this
.
$axios
.
post
(
"/api/png/plainByBarcode/barcode"
,
{
barcode
:
this
.
destbarcode
,
},
{
loading
:
false
}
)
.
post
(
"/api/png/plainByBarcode/barcode"
,
{
barcode
:
this
.
destbarcode
,
})
.
then
(
function
(
response
)
{
self
.
loadingIndex
--
;
if
(
response
.
data
.
code
==
0
)
{
...
...
@@ -1406,11 +1427,7 @@ export default {
this
.
loadingIndex
++
;
// 滚动 目标数据
this
.
$axios
.
post
(
"/api/png/rollByBarcode/barcode"
,
{
barcode
:
this
.
destbarcode
},
{
loading
:
false
}
)
.
post
(
"/api/png/rollByBarcode/barcode"
,
{
barcode
:
this
.
destbarcode
})
.
then
(
function
(
response
)
{
self
.
loadingIndex
--
;
if
(
response
.
data
.
code
==
0
)
{
...
...
@@ -1441,6 +1458,7 @@ export default {
handleCurrentChange
(
val
)
{
console
.
log
(
val
);
if
(
val
)
{
this
.
targetObj
=
val
;
val
.
clickLog
=
"1"
;
if
(
val
.
removeFlag
==
"1"
)
{
this
.
targetDel
=
true
;
...
...
@@ -1472,60 +1490,56 @@ export default {
},
//比中
Bz
()
{
if
(
(
this
.
targetObj
.
affirmstatus
==
2
||
this
.
targetObj
.
affirmstatus
==
3
)
&&
(
this
.
sourceObj
.
affirmStatus
==
2
||
this
.
sourceObj
.
affirmStatus
==
3
)
)
{
this
.
$message
.
error
(
"已经比中过的数据无法再次比中!"
);
return
;
}
this
.
isShowbzDialogBg
=
true
;
this
.
isShowbzDialog
=
true
;
//console.info("比中弹窗");
// 获取用户信息
// this.getUserInfo();
let
params
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
));
for
(
let
key
in
this
.
bzr
)
{
this
.
bzr
[
key
]
=
params
[
key
];
}
this
.
getUser
();
},
getUser
()
{
let
self
=
this
;
this
.
loadingIndex
++
;
this
.
loadingIndex
+=
2
;
this
.
$axios
({
method
:
"post"
,
url
:
`/api/personstore/findname?ysxtAsjxgrybh=R430795G000002021100002`
,
loading
:
false
,
url
:
`/api/personstore/findname?ysxtAsjxgrybh=
${
this
.
sourceObj
.
barcode
}
`
,
}).
then
((
res
)
=>
{
this
.
loadingIndex
--
;
if
(
res
.
data
.
code
==
0
)
{
let
result
=
res
.
data
.
ret
;
self
.
userName
=
result
.
xm
;
self
.
dateTime
=
result
.
nysj
;
if
(
result
)
{
for
(
let
key
in
self
.
bzsource
)
{
self
.
bzsource
[
key
]
=
result
[
key
];
}
this
.
$set
(
this
.
bzr
,
"bzTime"
,
result
.
time
);
}
}
});
this
.
$axios
({
method
:
"post"
,
url
:
`/api/personstore/findname?ysxtAsjxgrybh=
${
this
.
targetObj
.
destbarcode
}
`
,
}).
then
((
res
)
=>
{
this
.
loadingIndex
--
;
if
(
res
.
data
.
code
==
0
)
{
let
result
=
res
.
data
.
ret
;
if
(
result
)
{
for
(
let
key
in
self
.
bztarget
)
{
self
.
bztarget
[
key
]
=
result
[
key
];
}
this
.
$set
(
this
.
bzr
,
"bzTime"
,
result
.
time
);
}
}
});
},
// 获取用户信息
// getUserInfo(id = 1) {
// let self = this;
// this.loadingIndex++;
// this.$axios({
// method: "post",
// url: "/api/user/searchByUserid",
// loading: false,
// data: {
// id: id,
// },
// }).then(async (res) => {
// self.loadingIndex--;
// if (res.data.code == 0) {
// let data = res.data.ret[0];
// //console.log("userInfo==>", 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: 取消认定完成
* @param {*}
...
...
@@ -1546,11 +1560,7 @@ export default {
this
.
loadingIndex
++
;
// 认定之前的操作
this
.
$axios
.
post
(
"/api/matchcand/affirm/confirm"
,
{
qqid
:
this
.
currentQqid
},
{
loading
:
false
}
)
.
post
(
"/api/matchcand/affirm/confirm"
,
{
qqid
:
this
.
currentQqid
})
.
then
((
res
)
=>
{
this
.
loadingIndex
--
;
//console.log(res);
...
...
@@ -1574,17 +1584,13 @@ export default {
// 1:倒查
let
querytype
=
0
;
this
.
$axios
.
post
(
"/api/matchcand/affirm/finish"
,
{
srcbarcode
:
self
.
sourcebarcode
,
destbarcode
:
self
.
destbarcode
,
qqid
:
self
.
currentQqid
,
qid
:
self
.
qid
,
querytype
:
querytype
,
},
{
loading
:
false
}
)
.
post
(
"/api/matchcand/affirm/finish"
,
{
srcbarcode
:
self
.
sourcebarcode
,
destbarcode
:
self
.
destbarcode
,
qqid
:
self
.
currentQqid
,
qid
:
self
.
qid
,
querytype
:
querytype
,
})
.
then
((
response
)
=>
{
this
.
loadingIndex
--
;
// 跟新列表数据
...
...
@@ -1656,51 +1662,55 @@ export default {
this
.
loadingIndex
++
;
let
querytype
=
0
;
this
.
$axios
.
post
(
"/api/matchcand/affirm/hit"
,
{
srcbarcode
:
self
.
sourcebarcode
,
destbarcode
:
self
.
destbarcode
,
// affirmstatus: "1"
querytype
:
"0"
,
qqid
:
self
.
currentQqid
,
},
{
loading
:
false
}
)
.
post
(
"/api/matchcand/affirm/hit"
,
{
srcbarcode
:
self
.
sourcebarcode
,
destbarcode
:
self
.
destbarcode
,
qid
:
parseInt
(
self
.
qid
),
queryType
:
"0"
,
qqid
:
parseInt
(
self
.
currentQqid
),
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
),
affirmDescribe
:
self
.
textarea
,
})
.
then
((
response
)
=>
{
this
.
loadingIndex
--
;
// 跟新列表数据
self
.
$bus
.
emit
(
"updateTTSourceData"
);
//源数据手动修改状态
let
index
=
this
.
sourcedatas
.
findIndex
(
(
i
)
=>
i
.
barcode
==
this
.
sourcebarcode
);
if
(
index
>=
0
)
{
let
obj
=
this
.
sourcedatas
[
index
];
if
(
obj
.
affirmStatus
==
"1"
||
obj
.
affirmStatus
==
"3"
)
{
obj
.
affirmStatus
=
"3"
;
if
(
response
.
data
.
code
==
0
)
{
// 跟新列表数据
self
.
$bus
.
emit
(
"updateTTSourceData"
);
//源数据手动修改状态
let
index
=
this
.
sourcedatas
.
findIndex
(
(
i
)
=>
i
.
barcode
==
this
.
sourcebarcode
);
if
(
index
>=
0
)
{
let
obj
=
this
.
sourcedatas
[
index
];
if
(
obj
.
affirmStatus
==
"1"
||
obj
.
affirmStatus
==
"3"
)
{
obj
.
affirmStatus
=
"3"
;
}
else
{
obj
.
affirmStatus
=
"2"
;
}
this
.
$set
(
this
.
sourcedatas
,
index
,
obj
);
}
//目标数据手动修改状态
let
tableDataIndex
=
this
.
tableData
.
findIndex
(
(
i
)
=>
i
.
destbarcode
==
this
.
destbarcode
);
let
newObj
=
this
.
tableData
[
tableDataIndex
];
if
(
newObj
.
affirmstatus
==
"1"
||
newObj
.
affirmstatus
==
"3"
)
{
newObj
.
affirmstatus
=
"3"
;
}
else
{
obj
.
affirmS
tatus
=
"2"
;
newObj
.
affirms
tatus
=
"2"
;
}
this
.
$set
(
this
.
sourcedatas
,
index
,
obj
);
}
//目标数据手动修改状态
let
tableDataIndex
=
this
.
tableData
.
findIndex
(
(
i
)
=>
i
.
destbarcode
==
this
.
destbarcode
);
let
newObj
=
this
.
tableData
[
tableDataIndex
];
if
(
newObj
.
affirmstatus
==
"1"
||
newObj
.
affirmstatus
==
"3"
)
{
newObj
.
affirmstatus
=
"3"
;
}
else
{
newObj
.
affirmstatus
=
"2"
;
}
this
.
$set
(
this
.
tableData
,
tableDataIndex
,
newObj
);
this
.
$set
(
this
.
tableData
,
tableDataIndex
,
newObj
);
self
.
isShowbzDialogBg
=
false
;
self
.
isShowbzDialog
=
false
;
this
.
$message
.
success
(
"比中成功!"
);
//console.log(response);
self
.
isShowbzDialogBg
=
false
;
self
.
isShowbzDialog
=
false
;
this
.
$message
.
success
(
"比中成功!"
);
//console.log(response);
}
})
.
catch
((
err
)
=>
{
this
.
$message
.
error
(
"比中失败!"
);
...
...
@@ -2252,6 +2262,36 @@ div {
.el-table
th
{
padding
:
0
;
}
.loading
{
z-index
:
999999
;
position
:
fixed
;
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
background
:
rgba
(
$
color
:
#fff
,
$
alpha
:
0.65
);
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
justify-content
:
center
;
.loading-finger
{
width
:
100px
;
height
:
100px
;
img
{
width
:
100%
;
height
:
100%
;
}
}
.loading-name
{
width
:
100px
;
height
:
auto
;
margin-top
:
20px
;
img
{
width
:
100%
;
height
:
100%
;
}
}
}
/* 修改表格里内容 */
/
deep
/
.dest-table
.el-table__body-wrapper
tr
td
{
height
:
24px
;
...
...
src/views/cxyrd/modules/LLCandidate.vue
View file @
9d6f4dab
...
...
@@ -43,7 +43,7 @@
</div>
<div
class=
"lt_candidate_number"
>
<el-table
highlight-current-row
:highlight-current-row=
"isDelete ? false : true"
@
current-change=
"handleCurrentChange"
class=
"lt_candidate_table"
:data=
"tableData"
...
...
@@ -1037,13 +1037,9 @@ export default {
* @return {*}
*/
handleCurrentChange
(
val
,
old
)
{
debugger
;
if
(
!
val
)
return
;
// document
// .getElementsByClassName("lcurrte")[0]
// .parentElement.parentElement.parentElement.classList.remove(
// "current-row"
// );
if
(
this
.
isDelete
)
return
;
this
.
$emit
(
"targetObj"
,
val
);
this
.
targetBh
=
val
.
destbarcode
;
let
self
=
this
;
if
(
val
.
removeFlag
==
"1"
)
{
...
...
src/views/cxyrd/modules/LLSrc.vue
View file @
9d6f4dab
...
...
@@ -82,7 +82,7 @@
<div
class=
"finger_print"
:class=
"{
finger_print_active: i
ndex
=== isActive,
finger_print_active: i
tem.seq
=== isActive,
fingerLook: item.clickLog == 1,
fingerRD: item.affirmstatus == 1,
fingerBZ: item.affirmstatus == 2,
...
...
@@ -95,7 +95,7 @@
<div
class=
"finger_print_number"
:class=
"{
finger_print_number_active: i
ndex
=== isActive,
finger_print_number_active: i
tem.seq
=== isActive,
fingerLookNum: item.clickLog == 1,
fingerRDNum: item.affirmstatus == 1,
fingerBZNum: item.affirmstatus == 2,
...
...
@@ -147,27 +147,27 @@
<div
class=
"finger_print_zw"
:class=
"{
finger_print_active_zw: i
ndex
=== isActive,
finger_print_active_zw: i
tem.seq
=== isActive,
fingerLook: item.clickLog == 1,
fingerRD: item.affirmstatus == 1,
fingerBZ: item.affirmstatus == 2,
fingerRB: item.affirmstatus == 3,
}"
v-for=
"(item, index) in
enumerate
"
v-for=
"(item, index) in
plamList
"
@
click=
"changeStyle(index, item)"
:key=
"index"
>
<div
class=
"finger_print_number"
:class=
"{
finger_print_number_active: i
ndex
=== isActive,
finger_print_number_active: i
tem.seq
=== isActive,
fingerLookNum: item.clickLog == 1,
fingerRDNum: item.affirmstatus == 1,
fingerBZNum: item.affirmstatus == 2,
fingerRBNum: item.affirmstatus == 3,
}"
>
{{
100 + Number(index + 1
) }}
{{
Number(item.seq + 1)
<
11 ? ("0" + Number(item.seq)) : Number(item.seq
) }}
</div>
<img
:src=
"'data:image/jpeg;base64,' + item.image"
/>
<div
class=
"finger-tips"
>
...
...
@@ -266,6 +266,7 @@ export default {
// 加载动画
loading
:
null
,
timer
:
null
,
plamList
:
[],
};
},
methods
:
{
...
...
@@ -274,6 +275,9 @@ export default {
*/
switchZhangWen
()
{
this
.
fingerShowType
=
"掌纹"
;
if
(
this
.
plamList
&&
this
.
plamList
?.
length
>
0
)
{
this
.
changeStyle
(
0
,
this
.
plamList
[
0
]);
}
this
.
$emit
(
"switchName"
,
this
.
fingerShowType
);
},
/**
...
...
@@ -281,6 +285,9 @@ export default {
*/
switchZhiWen
()
{
this
.
fingerShowType
=
"指纹"
;
if
(
this
.
enumerate
&&
this
.
enumerate
?.
length
>
0
)
{
this
.
changeStyle
(
0
,
this
.
enumerate
[
0
]);
}
this
.
$emit
(
"switchName"
,
this
.
fingerShowType
);
},
/**
...
...
@@ -306,6 +313,19 @@ export default {
return
"looked"
;
}
},
//获取掌纹
getPlam
()
{
this
.
$axios
.
post
(
"/api/org/case/palm/barcode"
,
{
barcode
:
sessionStorage
.
getItem
(
"srcbarcode"
),
})
.
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
0
&&
res
.
data
.
message
==
"success"
)
{
let
result
=
res
.
data
.
ret
;
this
.
plamList
=
result
;
}
});
},
/**
* @description: 选择切换
* @param {*} val
...
...
@@ -316,6 +336,7 @@ export default {
if
(
!
val
)
return
;
let
self
=
this
;
// 发送请求
this
.
fingerShowType
=
"指纹"
;
self
.
$store
.
commit
(
"loading/setLoading"
,
true
);
self
.
qqid
=
val
.
qqid
;
self
.
qid
=
val
.
qid
;
...
...
@@ -397,6 +418,8 @@ export default {
self
.
changeStyle
(
0
,
self
.
enumerate
[
0
]);
}
});
self
.
getPlam
();
self
.
isActive
=
""
;
}
...
...
@@ -470,12 +493,12 @@ export default {
},
// 指纹部分 增加边框
changeStyle
(
index
,
imageInfo
)
{
console
.
log
(
imageInfo
);
let
self
=
this
;
this
.
isActive
=
i
ndex
;
this
.
isActive
=
i
mageInfo
.
seq
;
//console.log(this.isActive);
// 存储源数据序号
if
(
imageInfo
)
{
this
.
$emit
(
"sourceObj"
,
imageInfo
);
// 改变数据为点击状态
self
.
$set
(
imageInfo
,
"clickLog"
,
"1"
);
sessionStorage
.
setItem
(
"srcseqno"
,
imageInfo
.
seq
);
...
...
src/views/cxyrd/modules/TTPlam.vue
View file @
9d6f4dab
<!--
* @Author: your name
* @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
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
...
...
@@ -15,6 +15,7 @@
</p>
<el-carousel
@
mousewheel
.
native=
"rollScroll($event)"
@
change=
"change"
direction=
"vertical"
ref=
"carousel"
:autoplay=
"false"
...
...
@@ -144,6 +145,7 @@ export default {
return
{
zwName
:
"222"
,
loadingIndex
:
0
,
changeIndex
:
0
,
sourceSrc
:
""
,
targetSrc
:
""
,
isShowDetail
:
false
,
...
...
@@ -179,6 +181,9 @@ export default {
});
},
methods
:
{
change
(
val
)
{
this
.
changeIndex
=
val
;
},
rollScroll
(
event
)
{
let
_that
=
this
;
// chrome、ie使用的wheelDelta,火狐使用detail
...
...
@@ -187,16 +192,17 @@ export default {
if
(
!
_that
.
timeOut
)
{
_that
.
timeOut
=
setTimeout
(()
=>
{
_that
.
timeOut
=
null
;
scrollVal
>
0
?
_that
.
$refs
.
carousel
.
prev
()
:
_that
.
$refs
.
carousel
.
next
();
if
(
scrollVal
>
0
&&
_that
.
changeIndex
>
0
)
{
_that
.
$refs
.
carousel
.
prev
();
}
else
if
(
scrollVal
<=
0
&&
_that
.
changeIndex
<
3
)
{
_that
.
$refs
.
carousel
.
next
();
}
},
300
);
}
else
{
}
},
showDetail
(
item
)
{
this
.
checkItem
=
item
;
console
.
log
(
this
.
checkItem
);
this
.
isShowDetail
=
true
;
this
.
$emit
(
"logbg"
,
true
);
},
...
...
@@ -205,6 +211,9 @@ export default {
$
(
".plamDetail"
).
remove
();
},
watch
:
{
isPlam
(
val
)
{
if
(
val
)
this
.
changeIndex
=
0
;
},
plamDetail
(
val
)
{
this
.
isShowDetail
=
false
;
},
...
...
src/views/drFPTX/Index.vue
View file @
9d6f4dab
...
...
@@ -59,7 +59,7 @@
<div
class=
"divider"
></div>
<div
class=
'bottom'
v-
if
=
"this.drlx==3||this.drlx==6"
v-
show
=
"this.drlx==3||this.drlx==6"
>
<div
class=
"left"
>
<el-col
:span=
"11"
>
...
...
@@ -69,27 +69,63 @@
<el-table
height=
"550"
:data=
"datas"
ref=
"selection"
@
selection-change=
"checkAll1"
style=
"width: 100%"
row-key=
"
nx
"
row-key=
"
pid
"
:tree-props=
"
{children: 'sonBarcode', hasChildren: 'hasChildren'}"
default-expand-all
>
<el-table-column
type=
"selection"
:width=
"fptxWidth1"
:selectable=
"checkSelectable"
>
</el-table-column>
<el-table-column
prop=
"wjxh"
:width=
"fptxWidth2"
label=
"文件序号"
>
<template
slot-scope=
"scope"
>
<svg-icon
style=
"
width: 0.875rem;
height: 0.6875rem;
margin-bottom: 0.125rem;
margin-left: 0.3125rem;
margin-right:0.625rem;
"
v-if=
"scope.row.sonBarcode || scope.row.sonBarcode === null"
icon-class=
"tree_f"
>
</svg-icon>
<svg-icon
style=
"
width: 0.8125rem;
height: 0.375rem;
margin: 0 0 0.1875rem 0;
"
v-else-if=
"!scope.row.sonBarcode || scope.row.sonBarcode !== null"
icon-class=
"tree_c"
></svg-icon>
{{
scope
.
row
.
sonBarcode
||
scope
.
row
.
sonBarcode
===
null
?
scope
.
row
.
wjxh
:
scope
.
row
.
wjxh
}}
<div
v-show=
"scope.row.sonBarcode && scope.row.sonBarcode !== null"
class=
"children-count"
>
{{
scope
.
row
.
sonBarcode
?
scope
.
row
.
sonBarcode
.
length
:
0
}}
</div>
</
template
>
</el-table-column>
<el-table-column
prop=
"nx"
label=
"内序"
:width=
"fptxWidth3"
>
</el-table-column>
<!-- <el-table-column label="条码号">
...
...
@@ -137,16 +173,15 @@
<el-table
height=
"550"
:data=
"selectArr"
ref=
"selection"
@
selection-change=
"checkRightAll"
style=
"width: 100%"
row-key=
"
nx
"
:tree-props=
"{children: 'sonBarcode'
, hasChildren: 'hasChildren'
}"
default-expand-all
row-key=
"
pid
"
:tree-props=
"{children: 'sonBarcode'}"
@
selection-change=
"checkRightAll"
>
<el-table-column
type=
"selection"
:width=
"fptxWidth1"
:selectable=
"checkSelectable"
>
</el-table-column>
<el-table-column
...
...
@@ -154,10 +189,45 @@
:width=
"fptxWidth2"
label=
"文件序号"
>
<
template
slot-scope=
"scope"
>
<svg-icon
style=
"
width: 0.875rem;
height: 0.6875rem;
margin-bottom: 0.125rem;
margin-left: 0.3125rem;
margin-right:0.625rem;
"
v-if=
"scope.row.sonBarcode || scope.row.sonBarcode === null"
icon-class=
"tree_f"
>
</svg-icon>
<svg-icon
style=
"
width: 0.8125rem;
height: 0.375rem;
margin: 0 0 0.1875rem 0;
"
v-else-if=
"!scope.row.sonBarcode || scope.row.sonBarcode !== null"
icon-class=
"tree_c"
></svg-icon>
{{
scope
.
row
.
sonBarcode
||
scope
.
row
.
sonBarcode
===
null
?
scope
.
row
.
wjxh
:
scope
.
row
.
wjxh
}}
<div
v-show=
"scope.row.sonBarcode && scope.row.sonBarcode !== null"
class=
"children-count"
>
{{
scope
.
row
.
sonBarcode
?
scope
.
row
.
sonBarcode
.
length
:
0
}}
</div>
</
template
>
</el-table-column>
<el-table-column
prop=
"nx"
label=
"内序"
:width=
"fptxWidth3"
>
</el-table-column>
<el-table-column
...
...
@@ -197,7 +267,7 @@
</div>
<div
class=
'bdbottom'
v-
if
=
"this.drlx==9"
v-
show
=
"this.drlx==9"
>
<div
class=
"left"
>
<el-col
:span=
"11"
>
...
...
@@ -207,7 +277,6 @@
<el-table
height=
'550'
:data=
"datas"
ref=
"selection"
@
selection-change=
"checkAll1"
style=
"width: 100%"
>
...
...
@@ -288,7 +357,6 @@
<el-table
height=
"550"
:data=
"selectArr"
ref=
"dataTable"
@
selection-change=
"checkRightAll"
style=
"width: 100%"
>
...
...
@@ -404,7 +472,7 @@
:percentage=
"UploadPercent"
></el-progress>
<div
style=
"margin-top:.9375rem; margin-bottom:.9375rem;font-size: .875rem;font-family: MicrosoftYaHei;color: #909090;"
>
正在解析指纹文件,点击“取消”可终止处理
</div>
<el-button
@
click=
"abort"
>
取 消
</el-button>
<el-button
@
click=
"abort"
>
<span
style=
"color:#fff;font-size: 14px;"
>
取消
</span>
</el-button>
</div>
<div
v-else
>
<div>
...
...
@@ -416,10 +484,10 @@
</div>
<div
style=
"margin-top:.9375rem; margin-bottom:.9375rem;font-size: .875rem;font-family: MicrosoftYaHei;color: #909090;"
>
导入成功{{successCount}}条,失败{{failCount}}条
</div>
<el-button
class=
'ckxq'
style=
"background: #055FE7;border-radius: .25rem; border-color:#055FE7;"
type=
"primary"
@
click=
"goList"
>
查看详情
</el-button>
>
<span
style=
"color:#fff;font-size: 14px;"
>
查看详情
</span>
</el-button>
</div>
</el-dialog>
...
...
@@ -428,6 +496,8 @@
</template>
<
script
>
import
"@/icons/tree_f.svg"
;
import
"@/icons/tree_c.svg"
;
const
targetOptions_ry
=
[
'基本人员库'
,
'高危人员库'
,
'非法人员库'
,
'在逃人员库'
,
'布控人员库'
,
'前科人员库'
,
'协查人员库'
];
const
targetOptions_aj
=
[
'本地案件库'
,
'比中案件库'
,
'已破案件库'
,
'重大案件库'
,
'B类案件库'
,
'C类案件库'
,
'勘查案件库'
,
'协查案件库'
];
export
default
{
...
...
@@ -441,9 +511,10 @@ export default {
successCount
:
0
,
// 成功条数
failCount
:
0
,
// 失败条数
barcode
:
null
,
fptxWidth1
:
6
0
,
fptxWidth2
:
1
2
0
,
fptxWidth1
:
5
0
,
fptxWidth2
:
1
5
0
,
fptxWidth3
:
100
,
action
:
''
,
fileList
:
[],
UploadPercent
:
0
,
...
...
@@ -472,7 +543,7 @@ export default {
// 比中关系
checkAllLeft
:
false
,
// 逻辑库全选
checkedTargetsLeft
:
[],
// 选定逻辑库
checkedTargetsLeft
:
[],
// 选定逻辑库
targetsLeft
:
targetOptions_ry
,
// 逻辑库列表
isIndeterminateLeft
:
false
,
// 逻辑库全选状态
checkAllRight
:
false
,
// 逻辑库全选
...
...
@@ -510,6 +581,11 @@ export default {
this
.
selectArr
=
[]
this
.
nowSelectRightData
=
[]
this
.
fileList
=
[]
this
.
checkedTargets
=
[]
this
.
logicList
=
[]
// 目标逻辑库数组
this
.
logicPsnList
=
[]
// 比中关系人员逻辑库数组
this
.
logicCaseList
=
[]
//比中关系案件逻辑库数组
this
.
$forceUpdate
()
}
else
if
(
newValue
==
6
)
{
this
.
targetHead
=
'案件逻辑分库'
this
.
targets
=
targetOptions_aj
...
...
@@ -521,26 +597,46 @@ export default {
this
.
selectArr
=
[]
this
.
nowSelectRightData
=
[]
this
.
fileList
=
[]
this
.
checkedTargets
=
[]
this
.
logicList
=
[]
// 目标逻辑库数组
this
.
logicPsnList
=
[]
// 比中关系人员逻辑库数组
this
.
logicCaseList
=
[]
//比中关系案件逻辑库数组
this
.
$forceUpdate
()
}
else
if
(
newValue
==
9
)
{
this
.
datas
=
[]
this
.
nowSelectData
=
[]
this
.
selectArr
=
[]
this
.
nowSelectRightData
=
[]
this
.
fileList
=
[]
this
.
checkedTargets
=
[]
this
.
checkedTargetsRight
=
[]
this
.
checkedTargetsLeft
=
[]
this
.
logicList
=
[]
// 目标逻辑库数组
this
.
logicPsnList
=
[]
// 比中关系人员逻辑库数组
this
.
logicCaseList
=
[]
//比中关系案件逻辑库数组
this
.
$forceUpdate
()
}
}
},
methods
:
{
// 判断能不能选择
checkSelectable
(
row
)
{
return
row
.
sonBarcode
},
// 导入成功,跳转详情
goList
()
{
if
(
this
.
drlx
==
3
||
this
.
drlx
==
6
)
{
if
(
this
.
drlx
==
3
)
{
this
.
dialogVisible
=
false
this
.
selectArr
=
[]
// 右边列表
this
.
datas
=
[]
// 左边表格数据项
this
.
nowSelectData
=
[]
// 左边选中列表数据
this
.
nowSelectRightData
=
[]
// 右边选中列表数据
this
.
dialogVisible
=
false
// 进度条弹窗
this
.
showProgress
=
true
// 进度条(正在导入)
this
.
UploadPercent
=
0
this
.
$store
.
commit
(
'layout/delcachePageName'
,
'RAList'
);
this
.
$router
.
push
({
path
:
'/RAList'
,
query
:
{
...
...
@@ -549,17 +645,37 @@ export default {
})
}
else
if
(
this
.
drlx
==
9
)
{
this
.
dialogVisible
=
false
this
.
selectArr
=
[]
// 右边列表
this
.
datas
=
[]
// 左边表格数据项
this
.
nowSelectData
=
[]
// 左边选中列表数据
this
.
nowSelectRightData
=
[]
// 右边选中列表数据
this
.
dialogVisible
=
false
// 进度条弹窗
this
.
showProgress
=
true
// 进度条(正在导入)
this
.
UploadPercent
=
0
this
.
$store
.
commit
(
'layout/delcachePageName'
,
'RAList'
);
this
.
$router
.
push
({
path
:
'/RAList'
,
query
:
{
id
:
2
}
})
}
else
if
(
this
.
drlx
==
6
)
{
this
.
dialogVisible
=
false
this
.
selectArr
=
[]
// 右边列表
this
.
datas
=
[]
// 左边表格数据项
this
.
nowSelectData
=
[]
// 左边选中列表数据
this
.
nowSelectRightData
=
[]
// 右边选中列表数据
this
.
dialogVisible
=
false
// 进度条弹窗
this
.
showProgress
=
true
// 进度条(正在导入)
this
.
UploadPercent
=
0
this
.
$store
.
commit
(
'layout/delcachePageName'
,
'RAList'
);
this
.
$router
.
push
({
path
:
'/RAList'
,
query
:
{
id
:
3
}
})
}
},
// 取消上传
...
...
@@ -588,8 +704,6 @@ export default {
onChange
(
file
,
fileList
)
{
// console.log(file.raw, 2222233333)
// if (this.timer2) clearTimeout(this.timer2);
// this.timer2 = setTimeout(() => {
// this.paramsArr = fileList;
...
...
@@ -605,33 +719,30 @@ export default {
// return i
// });
// this.newArr.push(obj);
// console.log(this.newArr, this.paramsArr)
// }, 200)
// 重复文件过滤
let
existFile
=
fileList
.
slice
(
0
,
fileList
.
length
-
1
).
find
(
f
=>
f
.
name
===
file
.
name
)
if
(
existFile
)
{
this
.
$message
.
error
(
'当前文件已经存在!'
);
fileList
.
pop
()
}
// 获取文件夹
var
folder
=
fileList
[
0
].
raw
.
webkitRelativePath
.
split
(
"/"
);
//
var folder = fileList[0].raw.webkitRelativePath.split("/");
// console.log('fffff', folder[0])
let
that
=
this
;
let
newlist
=
fileList
;
for
(
let
i
=
0
;
i
<
fileList
.
length
;
i
++
)
{
let
fatherId
=
(
i
+
1
);
let
file
=
fileList
[
i
].
raw
// console.log(file.webkitRelativePath, 999)
// 读取文件
var
reader
=
new
FileReader
();
reader
.
readAsText
(
file
);
// 判断文件类型
if
(
th
is
.
drlx
==
3
)
{
// 人员
if
(
th
at
.
drlx
==
3
)
{
// 人员
that
.
action
=
'/api/upload/person'
reader
.
onload
=
function
()
{
const
reg
=
/\<ysxt_asjxgrybh
\>(
.*
?)
\<
\/
ysxt_asjxgrybh
\>
/g
...
...
@@ -648,23 +759,28 @@ export default {
let
sonBarcodeOlny
=
{
nx
:
''
,
// 内序
barcode
:
''
,
// 条码号
pid
:
''
,
// 父子节点标志
}
const
reg1
=
/\<ysxt_asjxgrybh
\>(
.*
?)
\<
\/
ysxt_asjxgrybh
\>
/
newBarcode
=
barcode
[
i
].
match
(
reg1
)
console
.
log
(
newBarcode
,
'单条'
)
sonBarcodeOlny
.
nx
=
(
i
+
1
)
// console.log(newBarcode, '单条')
sonBarcodeOlny
.
nx
=
fatherId
+
''
+
(
i
+
1
)
sonBarcodeOlny
.
pid
=
fatherId
+
''
+
(
i
+
1
)
sonBarcodeOlny
.
barcode
=
newBarcode
[
1
]
sonBarcode
.
push
(
sonBarcodeOlny
)
// that.$set(newlist[i], 'nx', i + 1)
// that.$set(newlist[i], 'barcode', newBarcode[1])
}
// that.$set(newlist[i], 'barcode', barcode[1])
that
.
$set
(
newlist
[
i
],
'wjxh'
,
i
+
1
)
that
.
$set
(
newlist
[
i
],
'barcode'
,
sonBarcode
[
0
].
barcode
)
that
.
$set
(
newlist
[
i
],
'nx'
,
fatherId
+
''
+
1
)
that
.
$set
(
newlist
[
i
],
'pid'
,
fatherId
)
that
.
$set
(
newlist
[
i
],
'wjxh'
,
fatherId
)
that
.
$set
(
newlist
[
i
],
'sonBarcode'
,
sonBarcode
)
console
.
log
(
newlist
[
i
],
'ajdhsajgguifhh 内序'
)
//
console.log(newlist[i], 'ajdhsajgguifhh 内序')
}
}
}
else
if
(
th
is
.
drlx
==
6
)
{
// 案件
}
else
if
(
th
at
.
drlx
==
6
)
{
// 案件
that
.
action
=
'/api/upload/case'
reader
.
onload
=
function
()
{
const
reg
=
/\<ysxt_asjbh
\>(
.*
?)
\<
\/
ysxt_asjbh
\>
/g
...
...
@@ -680,19 +796,24 @@ export default {
let
sonBarcodeOlny
=
{
nx
:
''
,
//内序
barcode
:
''
,
// 条码号
pid
:
''
,
// 父子节点标志
}
const
reg1
=
/\<ysxt_asjbh
\>(
.*
?)
\<
\/
ysxt_asjbh
\>
/
newBarcode
=
barcode
[
i
].
match
(
reg1
)
sonBarcodeOlny
.
nx
=
(
i
+
1
)
sonBarcodeOlny
.
nx
=
fatherId
+
''
+
(
i
+
1
)
sonBarcodeOlny
.
pid
=
fatherId
+
''
+
(
i
+
1
)
sonBarcodeOlny
.
barcode
=
newBarcode
[
1
]
sonBarcode
.
push
(
sonBarcodeOlny
)
}
that
.
$set
(
newlist
[
i
],
'wjxh'
,
i
+
1
)
that
.
$set
(
newlist
[
i
],
'barcode'
,
sonBarcode
[
0
].
barcode
)
that
.
$set
(
newlist
[
i
],
'nx'
,
fatherId
+
''
+
1
)
that
.
$set
(
newlist
[
i
],
'pid'
,
fatherId
)
that
.
$set
(
newlist
[
i
],
'wjxh'
,
fatherId
)
that
.
$set
(
newlist
[
i
],
'sonBarcode'
,
sonBarcode
)
}
// that.$set(newlist[i], 'barcode', barcode[1])
}
}
else
if
(
th
is
.
drlx
==
9
)
{
// 比中关系
}
else
if
(
th
at
.
drlx
==
9
)
{
// 比中关系
// debugger
reader
.
onload
=
function
()
{
let
result
=
this
.
result
;
...
...
@@ -701,7 +822,6 @@ export default {
const
regTT
=
/\<TTHitResultPackage
\>
/
// 查重
// const regLL = /\
<
LLHitResultPackage
\
>
(.
*
?)
\
<
\
/
LLHitResultPackage
\
>
/ /
/
串查
const
regLL
=
/\<LLHitResultPackage
\>
/
// 串查
//正查,倒查
let
regTypes
=
result
.
match
(
reg
)
let
regType
=
null
;
...
...
@@ -715,7 +835,6 @@ export default {
console
.
log
(
'有查重文件'
)
regType
=
'0'
}
// 串查
let
regTypeLL
=
result
.
match
(
regLL
)
if
(
regTypeLL
!=
null
)
{
...
...
@@ -723,68 +842,74 @@ export default {
regType
=
'3'
}
// console.log('regType', regType)
//查重
// let TT = result.match(regTT)
// console.log('TT', TT)
if
(
regType
!=
''
&&
regType
!=
null
&&
regType
!=
undefined
&&
regType
==
"1"
)
{
// TL 倒查 1
// that.action = '/api/upload/lthitresult'
that
.
action
=
'/api/upload/hitresult'
// that.$set(data, 'action', '/api/upload/lthitresult')
// console.log('地址', this.action)
const
reg1
=
/\<nyzw_ysxt_asjxgrybh
\>(
.*
?)
\<
\/
nyzw_ysxt_asjxgrybh
\>
/
const
reg2
=
/\<xczw_ysxt_asjbh
\>(
.*
?)
\<
\/
xczw_ysxt_asjbh
\>
/
let
barcode1
=
result
.
match
(
reg1
)
let
barcode2
=
result
.
match
(
reg2
)
console
.
log
(
'倒查'
,
barcode1
,
barcode2
)
that
.
$set
(
newlist
[
i
],
'type'
,
regType
)
that
.
$set
(
newlist
[
i
],
'barcode1'
,
barcode1
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode2'
,
barcode2
[
1
])
}
else
if
(
regType
!=
''
&&
regType
!=
null
&&
regType
!=
undefined
&&
regType
==
"2"
)
{
// LT 正查 2
// that.action = '/api/upload/lthitresult'
that
.
action
=
'/api/upload/hitresult'
// console.log('地址', this.action)
// that.$set(data, 'action', '/api/upload/lthitresult')
const
reg1
=
/\<nyzw_ysxt_asjxgrybh
\>(
.*
?)
\<
\/
nyzw_ysxt_asjxgrybh
\>
/
const
reg2
=
/\<xczw_ysxt_asjbh
\>(
.*
?)
\<
\/
xczw_ysxt_asjbh
\>
/
let
barcode1
=
result
.
match
(
reg1
)
let
barcode2
=
result
.
match
(
reg2
)
console
.
log
(
'正查'
,
barcode1
,
barcode2
)
that
.
$set
(
newlist
[
i
],
'type'
,
regType
)
that
.
$set
(
newlist
[
i
],
'barcode1'
,
barcode2
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode2'
,
barcode1
[
1
])
}
else
if
(
regType
!=
''
&&
regType
!=
null
&&
regType
!=
undefined
&&
regType
==
"0"
)
{
// TT 查重 0
// that.action = '/api/upload/tthitresult'
that
.
action
=
'/api/upload/hitresult'
// that.$set(data, 'action', '/api/upload/tthitresult')
// console.log('地址', this.action)
const
reg1
=
/\<ysxt_asjxgrybh
\>(
.*
?)
\<
\/
ysxt_asjxgrybh
\>
/
const
reg2
=
/\<bzjg_ysxt_asjxgrybh
\>(
.*
?)
\<
\/
bzjg_ysxt_asjxgrybh
\>
/
let
barcode1
=
result
.
match
(
reg1
)
let
barcode2
=
result
.
match
(
reg2
)
console
.
log
(
'查重'
,
barcode1
,
barcode2
)
that
.
$set
(
newlist
[
i
],
'type'
,
'0'
)
that
.
$set
(
newlist
[
i
],
'barcode1'
,
barcode1
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode2'
,
barcode2
[
1
])
}
else
if
(
regType
!=
''
&&
regType
!=
null
&&
regType
!=
undefined
&&
regType
==
"3"
)
{
// LL 串查 3
that
.
action
=
'/api/upload/hitresult'
const
reg1
=
/\<ysxt_asjbh
\>(
.*
?)
\<
\/
ysxt_asjbh
\>
/
const
reg2
=
/\<bzjg_ysxt_asjbh
\>(
.*
?)
\<
\/
bzjg_ysxt_asjbh
\>
/
let
barcode1
=
result
.
match
(
reg1
)
let
barcode2
=
result
.
match
(
reg2
)
console
.
log
(
'串查'
,
barcode1
,
barcode2
)
that
.
$set
(
newlist
[
i
],
'type'
,
'3'
)
that
.
$set
(
newlist
[
i
],
'barcode1'
,
barcode1
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode2'
,
barcode2
[
1
])
if
(
regType
==
null
)
{
that
.
$message
.
error
(
'请检查所选类型和文件类型是否一致'
)
newlist
=
[]
fileList
.
pop
()
}
else
{
// console.log('regType', regType)
//查重
// let TT = result.match(regTT)
// console.log('TT', TT)
if
(
regType
!=
''
&&
regType
!=
null
&&
regType
!=
undefined
&&
regType
==
"1"
)
{
// TL 倒查 1
// that.action = '/api/upload/lthitresult'
that
.
action
=
'/api/upload/hitresult'
// that.$set(data, 'action', '/api/upload/lthitresult')
// console.log('地址', this.action)
const
reg1
=
/\<nyzw_ysxt_asjxgrybh
\>(
.*
?)
\<
\/
nyzw_ysxt_asjxgrybh
\>
/
const
reg2
=
/\<xczw_ysxt_asjbh
\>(
.*
?)
\<
\/
xczw_ysxt_asjbh
\>
/
let
barcode1
=
result
.
match
(
reg1
)
let
barcode2
=
result
.
match
(
reg2
)
console
.
log
(
'倒查'
,
barcode1
,
barcode2
)
that
.
$set
(
newlist
[
i
],
'type'
,
regType
)
that
.
$set
(
newlist
[
i
],
'barcode1'
,
barcode1
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode2'
,
barcode2
[
1
])
}
else
if
(
regType
!=
''
&&
regType
!=
null
&&
regType
!=
undefined
&&
regType
==
"2"
)
{
// LT 正查 2
// that.action = '/api/upload/lthitresult'
that
.
action
=
'/api/upload/hitresult'
// console.log('地址', this.action)
// that.$set(data, 'action', '/api/upload/lthitresult')
const
reg1
=
/\<nyzw_ysxt_asjxgrybh
\>(
.*
?)
\<
\/
nyzw_ysxt_asjxgrybh
\>
/
const
reg2
=
/\<xczw_ysxt_asjbh
\>(
.*
?)
\<
\/
xczw_ysxt_asjbh
\>
/
let
barcode1
=
result
.
match
(
reg1
)
let
barcode2
=
result
.
match
(
reg2
)
console
.
log
(
'正查'
,
barcode1
,
barcode2
)
that
.
$set
(
newlist
[
i
],
'type'
,
regType
)
that
.
$set
(
newlist
[
i
],
'barcode1'
,
barcode2
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode2'
,
barcode1
[
1
])
}
else
if
(
regType
!=
''
&&
regType
!=
null
&&
regType
!=
undefined
&&
regType
==
"0"
)
{
// TT 查重 0
// that.action = '/api/upload/tthitresult'
that
.
action
=
'/api/upload/hitresult'
// that.$set(data, 'action', '/api/upload/tthitresult')
// console.log('地址', this.action)
const
reg1
=
/\<ysxt_asjxgrybh
\>(
.*
?)
\<
\/
ysxt_asjxgrybh
\>
/
const
reg2
=
/\<bzjg_ysxt_asjxgrybh
\>(
.*
?)
\<
\/
bzjg_ysxt_asjxgrybh
\>
/
let
barcode1
=
result
.
match
(
reg1
)
let
barcode2
=
result
.
match
(
reg2
)
console
.
log
(
'查重'
,
barcode1
,
barcode2
)
that
.
$set
(
newlist
[
i
],
'type'
,
'0'
)
that
.
$set
(
newlist
[
i
],
'barcode1'
,
barcode1
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode2'
,
barcode2
[
1
])
}
else
if
(
regType
!=
''
&&
regType
!=
null
&&
regType
!=
undefined
&&
regType
==
"3"
)
{
// LL 串查 3
that
.
action
=
'/api/upload/hitresult'
const
reg1
=
/\<ysxt_asjbh
\>(
.*
?)
\<
\/
ysxt_asjbh
\>
/
const
reg2
=
/\<bzjg_ysxt_asjbh
\>(
.*
?)
\<
\/
bzjg_ysxt_asjbh
\>
/
let
barcode1
=
result
.
match
(
reg1
)
let
barcode2
=
result
.
match
(
reg2
)
console
.
log
(
'串查'
,
barcode1
,
barcode2
)
that
.
$set
(
newlist
[
i
],
'type'
,
'3'
)
that
.
$set
(
newlist
[
i
],
'barcode1'
,
barcode1
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode2'
,
barcode2
[
1
])
}
// const reg = /\
<
ysxt_asjbh
\
>
(.
*
?)
\
<
\
/
ysxt_asjbh
\
>
/
// let barcode = this.result.match(reg)
// that.$set(newlist[i], 'barcode', barcode[1])
}
// const reg = /\
<
ysxt_asjbh
\
>
(.
*
?)
\
<
\
/
ysxt_asjbh
\
>
/
// let barcode = this.result.match(reg)
// that.$set(newlist[i], 'barcode', barcode[1])
}
}
}
setTimeout
(()
=>
{
th
is
.
datas
=
newlist
;
th
at
.
datas
=
newlist
;
console
.
log
(
'newlist'
,
newlist
)
console
.
log
(
'datas'
,
this
.
datas
)
},
100
)
...
...
@@ -894,13 +1019,8 @@ export default {
}
}
}
},
// 上传文件函数
...
...
@@ -934,7 +1054,7 @@ export default {
onUploadProgress
:
function
(
progressEvent
)
{
// this.dialogVisible = true;
//console.log(progressEvent, 1);
that
.
UploadPercent
=
(((
progressEvent
.
loaded
/
10
*
9.9
)
/
progressEvent
.
total
)
*
100
).
toFixed
(
2
)
that
.
UploadPercent
=
Number
((((
progressEvent
.
loaded
/
10
*
9.9
)
/
progressEvent
.
total
)
*
100
).
toFixed
(
2
)
)
//console.log(that.UploadPercent, 123)
// Number(event.percent.toFixed())
},
...
...
@@ -971,6 +1091,7 @@ export default {
// this.userInfo = this.getUserInfo(this.tableDate);
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
showProgress
=
false
;
}
});
...
...
@@ -1130,11 +1251,100 @@ export default {
}
</
script
>
<!--table树-->
<
style
scoped
lang=
"scss"
>
/
deep
/
.children-count
{
width
:
34px
;
font-size
:
12px
;
text-align
:
center
;
background
:
#f6f8fa
;
border-radius
:
11px
;
position
:
absolute
;
right
:
10px
;
top
:
50%
;
transform
:
translate
(
0
,
-50%
);
}
.el-tree
/
deep
/
.el-tree-node__expand-icon.expanded
{
-webkit-transform
:
rotate
(
0deg
);
transform
:
rotate
(
0deg
);
}
/*有子节点 且未展开*/
.el-table
/
deep
/
.el-icon-arrow-right
:before
{
background
:
url("../../icons/tree_f.svg")
no-repeat
0
3px
;
content
:
""
;
display
:
block
;
width
:
16px
;
height
:
16px
;
font-size
:
16px
;
background-size
:
16px
;
}
/*有子节点 且已展开*/
.el-table
/
deep
/
.el-table__expand-icon--expanded
{
.
el-icon-arrow-right
:
before
{
background
:
url("../../icons/tree_c.svg")
no-repeat
0
3px
;
content
:
""
;
display
:
block
;
width
:
15px
;
height
:
20px
;
font-size
:
18px
;
background-size
:
21px
;
}
}
/*没有子节点*/
.el-tree
/
deep
/
.el-tree-node__expand-icon.is-leaf
::before
.el-table
/
deep
/
.el-table__placeholder
::before
{
//
background
:
url("../../icons/tree_f.svg")
no-repeat
0
3px
;
content
:
""
;
display
:
block
;
width
:
16px
;
height
:
18px
;
font-size
:
16px
;
background-size
:
16px
;
}
/
deep
/
.el-table--enable-row-hover
.el-table__body
tr
:hover
{
cursor
:
pointer
;
}
</
style
>
<
style
lang=
"scss"
>
.el-table__expand-icon
{
.el-icon-arrow-right
{
cursor
:
pointer
!important
;
}
cursor
:
pointer
!
important
;
position
:
absolute
;
right
:
45px
;
cursor
:
pointer
;
color
:
#b51f1f
;
transition
:
transform
0
.2s
ease-in-out
;
width
:
11px
;
height
:
11px
;
/* border: black 1px solid; */
margin
:
0
;
background-image
:
url
(
"../../assets/img/confirm/expend.png"
);
background-position
:
center
;
background-size
:
11px
;
background-repeat
:
no-repeat
;
}
.el-table__expand-icon.el-table__expand-icon--expanded
{
width
:
11px
;
height
:
11px
;
background-image
:
url("../../assets/img/confirm/shrink.png")
;
background-position
:
center
;
background-size
:
11px
;
background-repeat
:
no-repeat
;
transform
:
rotate
(
180deg
)
!important
;
}
</
style
>
<
style
lang=
"scss"
scoped
>
//
/
deep
/
.el-dialog__wrapper
{
//
background
:
rgba
(
$
color
:
#fff
,
$
alpha
:
0.65
);
//
//
filter
:
blur
(
2px
);
//
}
/
deep
/
.el-dialog
{
margin-top
:
30vh
;
.el-button
{
...
...
@@ -1528,4 +1738,4 @@ export default {
}
}
}
</
style
>
\ No newline at end of file
</
style
>
src/views/drFPTX/RAList.vue
View file @
9d6f4dab
...
...
@@ -35,7 +35,7 @@
</div>
<div
class=
"search ljfk"
>
<div
class=
"item"
>
逻辑分库:
</div>
<div
v-
if
=
"showType==1"
>
<div
v-
show
=
"showType==1"
>
<SelectCode
codeUrl=
"/api/code/personLogic"
width=
"10.5"
...
...
@@ -43,7 +43,7 @@
id=
"logicDatabase"
></SelectCode>
</div>
<div
v-
if
=
"showType==3"
>
<div
v-
show
=
"showType==3"
>
<SelectCode
codeUrl=
"/api/code/caseLogic"
width=
"10.5"
...
...
@@ -253,8 +253,8 @@
>
<span
v-html=
"' '"
></span>
<i
class=
"
el-icon-info
"
style=
"color: #055fe7; font-size: 1
5px
"
class=
"
iconfont icon-tanhao1
"
style=
"color: #055fe7; font-size: 1
6px; margin: 0 0.625rem;
"
></i>
已选择
<span
style=
"color: #055fe7"
>
{{
multipleSelection
.
length
}}
</span>
项
...
...
@@ -283,6 +283,7 @@
hasChildren: 'hasChildren',
}"
@selection-change="handleSelectionChange"
@expand-change="hadnlExpandChange"
>
<!-- @expand-change="hadnlExpandChange" -->
<el-table-column
...
...
@@ -340,6 +341,7 @@
prop=
"barcode"
:label=
"showType == 1?'人员编号':'案事件编号'"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<!-- <el-table-column
...
...
@@ -358,8 +360,36 @@
<el-table-column
prop=
"statusName"
label=
"状态"
:width=
"width
3
"
:width=
"width
6
"
>
<
template
slot-scope=
"scope"
>
<span
class=
"zt1"
v-if=
"scope.row.status==1"
></span>
<span
class=
"zt0"
v-if=
"scope.row.status==0"
></span>
<span>
{{
scope
.
row
.
statusName
}}
</span>
<!-- scope.row.status==1?'zt1':'zt0' -->
<span
v-if=
"scope.row.failReason"
class=
"history"
>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"left"
>
<div
slot=
"content"
>
{{
scope
.
row
.
failReason
}}
</div>
<img
src=
"../../assets/img/confirm/history2x.png"
@
click
.
stop=
"getDialog(scope.row)"
/>
</el-tooltip>
</span>
</
template
>
</el-table-column>
<el-table-column
fixed=
"right"
...
...
@@ -367,7 +397,10 @@
:width=
"width4"
>
<
template
slot-scope=
"scope"
>
<div
class=
"ops"
>
<div
class=
"ops"
v-if=
"scope.row.barcode"
>
<el-tooltip
class=
"item"
effect=
"dark"
...
...
@@ -427,6 +460,7 @@
</div>
<el-table
class=
"bzTable"
:class=
"{delSelection: !selectBoo}"
v-if=
"showType == 2"
:max-height=
"height"
...
...
@@ -441,6 +475,7 @@
hasChildren: 'hasChildren',
}"
@
selection-change=
"handleSelectionChange"
@
expand-change=
"hadnlExpandChangeBz"
>
<el-table-column
type=
"selection"
...
...
@@ -496,7 +531,7 @@
<el-table-column
prop=
"dataTypeName"
label=
"查询类型"
:width=
"width
4
"
:width=
"width
3
"
>
<
template
slot-scope=
"scope"
>
<div
...
...
@@ -521,6 +556,7 @@
prop=
"barcode"
label=
"人员编号/案事件编号"
:width=
"width1"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<div>
{{
scope
.
row
.
srcBarcode
}}
</div>
...
...
@@ -543,8 +579,36 @@
<el-table-column
prop=
"statusName"
label=
"状态"
:width=
"width
3
"
:width=
"width
6
"
>
<
template
slot-scope=
"scope"
>
<span
class=
"zt1"
v-if=
"scope.row.status==1"
></span>
<span
class=
"zt0"
v-if=
"scope.row.status==0"
></span>
<span>
{{
scope
.
row
.
statusName
}}
</span>
<!-- scope.row.status==1?'zt1':'zt0' -->
<span
v-if=
"scope.row.failReason"
class=
"history"
>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"left"
>
<div
slot=
"content"
>
{{
scope
.
row
.
failReason
}}
</div>
<img
src=
"../../assets/img/confirm/history2x.png"
@
click
.
stop=
"getDialog(scope.row)"
/>
</el-tooltip>
</span>
</
template
>
</el-table-column>
<el-table-column
fixed=
"right"
...
...
@@ -552,7 +616,10 @@
:width=
"width4"
>
<
template
slot-scope=
"scope"
>
<div
class=
"ops"
>
<div
class=
"ops"
v-if=
"scope.row.srcBarcode"
>
<el-tooltip
class=
"item"
effect=
"dark"
...
...
@@ -709,15 +776,17 @@ export default {
this
.
width3
=
(
this
.
width3
*
w2
)
/
w1
;
this
.
width4
=
(
this
.
width4
*
w2
)
/
w1
;
this
.
width5
=
(
this
.
width5
*
w2
)
/
w1
;
this
.
width6
=
(
this
.
width6
*
w2
)
/
w1
;
},
data
()
{
return
{
width5
:
50
,
width4
:
200
,
width3
:
100
,
width2
:
32
0
,
width1
:
30
0
,
width2
:
25
0
,
width1
:
25
0
,
height
:
460
,
width6
:
160
,
dataType
:
null
,
// 导入类型
barcode
:
""
,
// 条码号
logicDatabaseoptions
:
[
...
...
@@ -779,6 +848,7 @@ export default {
sendTimeEnd
:
""
,
// 结束时间
expanded
:
false
,
// 展开标志
expandedBz
:
false
,
//展开标志比中关系
...
...
@@ -906,47 +976,104 @@ export default {
}
});
},
// // 展开或关闭行
// hadnlExpandChange (row, expanded) {
// // 获取展开标志
// this.expanded = expanded;
// // 获取下标
// var i = this.tableDate1.findIndex((table) => table.sequenceNumber === row.sequenceNumber);
// // var i = this.tableData.findIndex(table => table.id === row.id);
// // //console.log(i);
// if (expanded) {
// this.list[i] = {
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
// expanded: true,
// };
// this.$forceUpdate();
// } else {
// //console.info("折叠时row数据", this.list[i]);
// this.list[i] = {
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
// querylog: row.children[0].querylog,
// expanded: false,
// barcode: row.children[0].barcode,
// maxcandidatecnt: row.children[0].maxcandidatecnt,
// querytype: row.children[0].querytype,
// queryStateName: row.children[0].queryStateName,
// hitpossibility: row.children[0].hitpossibility,
// queryclass: row.children[0].queryclass,
// affirmtime: row.children[0].affirmtime,
// requestdatetime: row.children[0].requestdatetime,
// userdesc: row.children[0].userdesc,
// queryTypeName: row.children[0].queryTypeName,
// removeFlag: row.children[0].removeFlag,
// };
// //console.log(this.list[i]);
// this.$forceUpdate();
// // //console.info("塞完数据的row", this.list[i]);
// }
// },
// 展开或关闭行
hadnlExpandChange
(
row
,
expanded
)
{
console
.
log
(
row
,
expanded
,
"zhankaiguanbi"
)
// let oldObj = row;
// 获取展开标志
this
.
expanded
=
expanded
;
// 获取下标
var
i
=
this
.
tableDate1
.
findIndex
((
table
)
=>
table
.
sequenceNumber
===
row
.
sequenceNumber
);
// var i = this.tableData.findIndex(table => table.id === row.id);
console
.
log
(
i
,
112233
);
if
(
expanded
)
{
this
.
tableDate1
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
pcImportRecordGrandchildren
:
row
.
pcImportRecordGrandchildren
,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded
:
true
,
};
this
.
$forceUpdate
();
}
else
{
//console.info("折叠时row数据", this.list[i]);
this
.
tableDate1
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
barcode
:
row
.
pcImportRecordGrandchildren
[
0
].
barcode
,
dataType
:
row
.
pcImportRecordGrandchildren
[
0
].
dataType
,
fileName
:
row
.
pcImportRecordGrandchildren
[
0
].
fileName
,
statusName
:
row
.
pcImportRecordGrandchildren
[
0
].
statusName
,
logicBatabaseName
:
row
.
pcImportRecordGrandchildren
[
0
].
logicBatabaseName
,
pcImportRecordGrandchildren
:
row
.
pcImportRecordGrandchildren
,
dataTypeName
:
row
.
pcImportRecordGrandchildren
[
0
].
dataTypeName
,
failReason
:
row
.
pcImportRecordGrandchildren
[
0
].
failReason
,
id
:
row
.
pcImportRecordGrandchildren
[
0
].
id
,
importTime
:
row
.
pcImportRecordGrandchildren
[
0
].
importTime
,
loginDatabaseCode
:
row
.
pcImportRecordGrandchildren
[
0
].
loginDatabaseCode
,
status
:
row
.
pcImportRecordGrandchildren
[
0
].
status
,
expanded
:
false
,
};
//console.log(this.list[i]);
this
.
$forceUpdate
();
// //console.info("塞完数据的row", this.list[i]);
}
},
// 展开或关闭行
hadnlExpandChangeBz
(
row
,
expanded
)
{
console
.
log
(
row
,
expanded
,
"bz"
)
// let oldObj = row;
// 获取展开标志
this
.
expanded
=
expanded
;
// 获取下标
var
i
=
this
.
tableDate2
.
findIndex
((
table
)
=>
table
.
sequenceNumber
===
row
.
sequenceNumber
);
// var i = this.tableData.findIndex(table => table.id === row.id);
console
.
log
(
i
,
112233
);
if
(
expanded
)
{
this
.
tableDate2
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
affirmImportRecordGrandchildren
:
row
.
affirmImportRecordGrandchildren
,
// qid: row.qid,
// children: row.children,
// queryId: row.queryId,
expanded
:
true
,
};
this
.
$forceUpdate
();
}
else
{
//console.info("折叠时row数据", this.list[i]);
this
.
tableDate2
[
i
]
=
{
taskNumber
:
row
.
taskNumber
,
sequenceNumber
:
row
.
sequenceNumber
,
affirmImportRecordGrandchildren
:
row
.
affirmImportRecordGrandchildren
,
dataTypeName
:
row
.
affirmImportRecordGrandchildren
[
0
].
dataTypeName
,
destbarcode
:
row
.
affirmImportRecordGrandchildren
[
0
].
destbarcode
,
destLogicName
:
row
.
affirmImportRecordGrandchildren
[
0
].
destLogicName
,
destLoginCode
:
row
.
affirmImportRecordGrandchildren
[
0
].
destLoginCode
,
failReason
:
row
.
affirmImportRecordGrandchildren
[
0
].
failReason
,
fileName
:
row
.
affirmImportRecordGrandchildren
[
0
].
fileName
,
id
:
row
.
affirmImportRecordGrandchildren
[
0
].
id
,
importTime
:
row
.
affirmImportRecordGrandchildren
[
0
].
importTime
,
queryType
:
row
.
affirmImportRecordGrandchildren
[
0
].
queryType
,
srcBarcode
:
row
.
affirmImportRecordGrandchildren
[
0
].
srcBarcode
,
srcLogicName
:
row
.
affirmImportRecordGrandchildren
[
0
].
srcLogicName
,
srcLogicCode
:
row
.
affirmImportRecordGrandchildren
[
0
].
srcLogicCode
,
status
:
row
.
affirmImportRecordGrandchildren
[
0
].
status
,
statusName
:
row
.
affirmImportRecordGrandchildren
[
0
].
statusName
,
expanded
:
false
,
};
//console.log(this.list[i]);
this
.
$forceUpdate
();
// //console.info("塞完数据的row", this.list[i]);
}
},
clear
()
{
this
.
taskNumber
=
""
;
// 任务号
this
.
dataType
=
null
;
// 人员or案件
...
...
@@ -977,6 +1104,8 @@ export default {
this
.
copyNum
=
[];
if
(
this
.
multipleSelection
.
length
===
0
)
{
this
.
$message
.
error
(
"请选择需要复制条码号的数据!"
);
this
.
selectBoo
=
true
;
this
.
isShowTip
=
true
;
}
else
{
self
.
multipleSelection
.
forEach
((
item
)
=>
{
self
.
copyNum
.
push
(
item
.
barcode
);
...
...
@@ -1037,26 +1166,30 @@ export default {
//console.log("添加到队列");
if
(
this
.
multipleSelection
.
length
===
0
)
{
this
.
$message
.
error
(
"请选择需要添加到队列的数据!"
);
this
.
isSelected
=
true
;
this
.
selectBoo
=
true
;
this
.
isShowTip
=
true
}
else
{
if
(
this
.
showType
==
1
)
{
this
.
type
=
"ry"
this
.
rowData
=
this
.
multipleSelection
;
this
.
isShowTjddl
=
true
;
//console.log('人员人员')
}
else
if
(
this
.
showType
==
3
)
{
this
.
type
=
'aj'
//console.log('案件案件')
}
this
.
rowData
=
this
.
multipleSelection
;
this
.
isShowTjddl
=
true
;
//
this.rowData = this.multipleSelection;
//
this.isShowTjddl = true;
}
},
closeTjddl
(
val
)
{
this
.
$bus
.
emit
(
'isBlur'
,
val
)
//console.log("添加到队列关闭", val);
this
.
isShowTjddl
=
val
;
},
//复制条码列表操作
isShowFztmBtn
(
val
)
{
console
.
log
(
val
,
'hahahahahah '
)
//
console.log(val, 'hahahahahah ')
//console.log("复制条码", val);
if
(
this
.
showType
==
1
)
{
this
.
type
=
"ry"
...
...
@@ -1084,7 +1217,8 @@ export default {
isShowFcxBtn
()
{
if
(
this
.
multipleSelection
.
length
===
0
)
{
this
.
$message
.
error
(
"请选择需要发查询的数据!"
);
this
.
isSelected
=
true
;
this
.
selectBoo
=
true
;
this
.
isShowTip
=
true
}
else
{
if
(
this
.
showType
==
1
)
{
this
.
type
=
"ry"
...
...
@@ -1252,6 +1386,36 @@ export default {
};
</
script
>
<
style
scoped
lang=
"scss"
>
.zt1
{
display
:
inline-block
;
width
:
8px
;
height
:
8px
;
background
:
#055fe7
;
border-radius
:
50%
;
margin-right
:
6px
;
}
.zt0
{
display
:
inline-block
;
width
:
8px
;
height
:
8px
;
border-radius
:
50%
;
background
:
#fe0000
;
margin-right
:
6px
;
}
.history
{
width
:
12px
;
height
:
12px
;
margin-left
:
4px
;
margin-bottom
:
3px
;
cursor
:
pointer
;
img
{
width
:
12px
;
height
:
12px
;
margin-left
:
4px
;
margin-bottom
:
3px
;
cursor
:
pointer
;
}
}
.delSelection
/
deep
/
.el-table-column--selection
.cell
{
display
:
none
;
}
...
...
@@ -1545,6 +1709,15 @@ export default {
font-family
:
MicrosoftYaHei
;
color
:
#333333
;
}
/
deep
/
.el-checkbox__input.is-checked
.el-checkbox__inner
,
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
background-color
:
#006aff
;
border-color
:
#006aff
;
}
/
deep
/
.el-checkbox__input.is-indeterminate
.el-checkbox__inner
{
background-color
:
#006aff
;
border-color
:
#006aff
;
}
</
style
>
<!--table树-->
<
style
scoped
lang=
"scss"
>
...
...
@@ -1604,8 +1777,12 @@ export default {
cursor
:
pointer
;
}
</
style
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
.el-table__expand-icon
{
.el-icon-arrow-right
{
cursor
:
pointer
!important
;
}
cursor
:
pointer
!
important
;
position
:
absolute
;
right
:
45px
;
cursor
:
pointer
;
...
...
@@ -1630,4 +1807,44 @@ export default {
transform
:
rotate
(
180deg
)
!important
;
}
</
style
>
<
style
scoped
lang=
"scss"
>
.el-table__expand-icon
{
position
:
absolute
;
right
:
45px
;
cursor
:
pointer
;
color
:
#b51f1f
;
transition
:
transform
0.2s
ease-in-out
;
width
:
11px
;
height
:
11px
;
/* border: black 1px solid; */
margin
:
0
;
background-image
:
url("../../assets/img/confirm/expend.png")
;
background-position
:
center
;
background-size
:
11px
;
background-repeat
:
no-repeat
;
}
.el-table__expand-icon.el-table__expand-icon--expanded
{
width
:
11px
;
height
:
11px
;
background-image
:
url("../../assets/img/confirm/shrink.png")
;
background-position
:
center
;
background-size
:
11px
;
background-repeat
:
no-repeat
;
transform
:
rotate
(
180deg
)
!important
;
}
/
deep
/
.el-table--enable-row-transition
.el-table__body
td
.el-table__cell
{
height
:
55px
;
}
/
deep
/
.el-table__row
{
height
:
55px
;
}
/
deep
/
.bzTable.el-table--enable-row-transition
.el-table__body
td
.el-table__cell
{
height
:
71px
;
}
/
deep
/
.bzTable.el-table__row
{
height
:
55px
;
}
</
style
>
src/views/login/modules/AccountsLogin.vue
View file @
9d6f4dab
...
...
@@ -83,7 +83,7 @@ export default {
let
me
=
this
;
me
.
btnLoading
=
true
;
this
.
$axios
({
url
:
"/
login
/login/myLoginForm"
,
url
:
"/
security
/login/myLoginForm"
,
method
:
"post"
,
data
:
qs
.
stringify
(
userinfo
),
headers
:
{
...
...
src/views/zljc/Index.vue
View file @
9d6f4dab
...
...
@@ -31,7 +31,7 @@
@
keyup
.
enter
.
native=
"search"
>
<el-option
label=
"
未
检查"
label=
"
待
检查"
value=
"0"
></el-option>
<el-option
...
...
@@ -109,7 +109,7 @@
<el-tag
v-show=
"isShowTip"
>
<span
v-html=
"' '"
></span>
<i
class=
"
el-icon-info
"
class=
"
iconfont icon-tanhao1
"
style=
"color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
></i>
已选择
...
...
@@ -142,12 +142,14 @@
prop=
"barcode"
label=
"人员编号"
:width=
"width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop=
"name"
label=
"姓名"
:width=
"width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
...
...
@@ -187,7 +189,7 @@
:width=
"width3"
>
<template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.inspectionFlag==0"
>
未
检查
</div>
<div
v-if=
"scope.row.inspectionFlag==0"
>
待
检查
</div>
<div
v-if=
"scope.row.inspectionFlag==1"
>
已检查
</div>
<div
v-if=
"scope.row.inspectionFlag==2"
>
合格
</div>
<div
v-if=
"scope.row.inspectionFlag==3"
>
不合格
</div>
...
...
@@ -556,4 +558,7 @@ $tableHeight: var(--tableHeight, 550px);
}
}
}
/
deep
/
.el-table
tr
{
height
:
55px
;
}
</
style
>
\ No newline at end of file
src/views/zljc/jcxq.vue
View file @
9d6f4dab
...
...
@@ -59,10 +59,10 @@ export default {
<
style
lang=
"scss"
scoped
>
.p1
{
padding-top
:
10
8
px
;
padding-top
:
10
9
px
;
}
.p2
{
padding-top
:
5
7
px
;
padding-top
:
5
8
px
;
}
.jcxq
{
position
:
relative
;
...
...
@@ -71,7 +71,7 @@ export default {
height
:
100%
;
.fixedBox
{
position
:
absolute
;
top
:
0
;
top
:
0
.5px
;
left
:
0
;
width
:
100%
;
background-color
:
#fff
;
...
...
vue.config.js
View file @
9d6f4dab
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-11 1
1:34:19
* @LastEditTime: 2021-12-11 1
4:19:43
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
...
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