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
53ca1a28
Commit
53ca1a28
authored
Jan 08, 2022
by
米嘉伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://47.92.108.28/changchao/founder_vue
into dev_zwpt
parents
d298b87d
3a667cd2
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
98 additions
and
160 deletions
+98
-160
src/views/Editor/modules/rydaxx.vue
+42
-5
src/views/Editor/modules/ryzwbjLeft.vue
+6
-2
src/views/cxyrd/LT.scss
+11
-0
src/views/cxyrd/LT.vue
+5
-2
src/views/drFPTX/RAList.vue
+25
-0
src/views/xtfkgl/GzlDlView.vue
+0
-145
src/views/xtfkgl/SjkyhSelect.vue
+4
-0
src/views/xtfkgl/XtfkAndGzlView.vue
+4
-5
src/views/xtfkgl/XtfkglMain.vue
+1
-1
No files found.
src/views/Editor/modules/rydaxx.vue
View file @
53ca1a28
...
...
@@ -189,6 +189,7 @@ export default {
name
:
"rydaxx"
,
data
()
{
return
{
barcode
:
''
,
isShowDcftpx
:
false
,
// 导出FPTX
arrow
:
'bottom'
,
width1
:
80
,
...
...
@@ -302,7 +303,21 @@ export default {
czrq
:
'2021.12.10. 23:59:59'
,
czsj
:
'编辑档案信息'
}],
rowData
:
[]
rowData
:
[],
// 请求档案信息
reqParam
:
{
// 请求参数
page
:
{
total
:
0
,
//表格条数
pageSize
:
10
,
//当前选择要显示的条数
currPage
:
1
// 当前在第几页
},
personStoreCustomSearch
:
{
ysxtAsjxgrybh
:
""
,
// 搜索框内容
searchOptions
:
3
,
// 默认搜索方式
checkboxQuery
:
[]
//滚动平面等筛选条件
}
},
};
},
computed
:
{
...
...
@@ -319,6 +334,11 @@ export default {
// 打开侧边抽屉
this
.
$bus
.
on
(
"openRyDaxx"
,
(
flag
)
=>
{
// let flag = obj.flag
// self.barcode = obj.barcode
// self.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = self.barcode
// self.getRyinfo()
self
.
drawer
=
flag
;
// 开启毛玻璃
self
.
$bus
.
emit
(
'isBlur'
,
true
)
...
...
@@ -327,12 +347,29 @@ export default {
// 人员档案信息
//console.log(this.ryInfo);
this
.
initData
()
},
mounted
()
{
},
methods
:
{
/**
* @description:
* @param {*}
* @return {*}
*/
getRyinfo
()
{
this
.
$axios
.
post
(
"/api/personstore/person/list"
,
this
.
reqParam
)
.
then
(
response
=>
{
if
(
response
.
data
.
code
===
0
)
{
console
.
log
(
response
);
}
else
{
this
.
$message
.
error
(
response
.
data
.
message
);
}
});
},
/**
* @description: 页面滚动,导航切换显示
* @param {*}
* @return {*}
...
...
@@ -500,13 +537,13 @@ export default {
dcftpx
},
watch
:
{
drawer
(
newValue
,
oldValue
)
{
drawer
(
newValue
,
oldValue
)
{
let
self
=
this
if
(
newValue
)
{
if
(
newValue
)
{
//监听页面滚动
this
.
$nextTick
(()
=>
{
document
.
querySelector
(
'.el-drawer__body'
).
addEventListener
(
"scroll"
,
(
e
)
=>
{
if
(
e
.
target
.
scrollTop
>
400
)
{
if
(
e
.
target
.
scrollTop
>
400
)
{
$
(
'.arrow-down-img'
).
css
(
'transform'
,
'rotate(180deg)'
);
}
else
{
$
(
'.arrow-down-img'
).
css
(
'transform'
,
'rotate(0deg)'
);
...
...
src/views/Editor/modules/ryzwbjLeft.vue
View file @
53ca1a28
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2022-01-0
7 16:53:10
* @LastEditTime: 2022-01-0
8 13:45:51
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...
...
@@ -581,7 +581,11 @@ export default {
* 打开档案信息
*/
daxxChange
()
{
this
.
$bus
.
emit
(
'openRyDaxx'
,
true
)
let
obj
=
{
flag
:
true
,
barcode
:
this
.
barcode
}
this
.
$bus
.
emit
(
'openRyDaxx'
,
obj
)
// 降低指纹编辑按钮的优先级
$
(
".center"
).
css
(
'z-index'
,
9
)
$
(
".tzdDrawing"
).
css
(
'z-index'
,
9
)
...
...
src/views/cxyrd/LT.scss
View file @
53ca1a28
...
...
@@ -301,3 +301,14 @@ $phone: var(--phone, #606266); //#ff4242;
}
}
}
.top-head
{
position
:
fixed
;
top
:
0
;
left
:
0
;
width
:
1920px
;
height
:
123px
;
img
{
width
:
1920px
;
height
:
123px
;
}
}
src/views/cxyrd/LT.vue
View file @
53ca1a28
<
template
>
<div
class=
"ltDiv"
>
<div
class=
"lt-dom"
:class=
"
{ bzActive: isShowbzDialogBg || loading_sd }">
<!--
<div
class=
"top-head"
>
<img
src=
"@/assets/img/rgrd/gongjvlan.svg"
alt=
""
>
</div>
-->
<div
class=
"header"
>
<div
class=
"label"
>
正查
</div>
<div
class=
"btns"
>
...
...
@@ -601,7 +604,8 @@ div {
}
.lt-dom
{
width
:
100%
;
background-color
:
#ffffff
;
//
background-color
:
rgba
(
5
,
95
,
231
,
0.08
);
background-color
:
#fff
;
/*padding: 24px;*/
margin
:
0
;
display
:
flex
;
...
...
@@ -686,7 +690,6 @@ div {
display
:
flex
;
//
flex-direction
:
row
;
justify-content
:
space-between
;
background
:
#fff
;
}
.lt_main_left
{
width
:
352px
;
...
...
src/views/drFPTX/RAList.vue
View file @
53ca1a28
...
...
@@ -1501,8 +1501,33 @@ export default {
handleClick
(
row
)
{
console
.
log
(
row
);
if
(
this
.
showType
==
1
)
{
// 清除bus
this
.
$bus
.
off
(
'ryzwbjImage'
);
this
.
$bus
.
off
(
'ryzwbjType'
);
this
.
$bus
.
off
(
'ryzwbjTDZ'
);
this
.
$bus
.
off
(
'zwType'
);
this
.
$bus
.
off
(
'setRxInfo'
)
this
.
$bus
.
off
(
'openRyDaxx'
)
// 先清除路由懒加载
this
.
$store
.
commit
(
'layout/delcachePageName'
,
'ryzwbj'
)
// 清除sessionStorage值
sessionStorage
.
clear
()
this
.
$store
.
commit
(
"rydaxx/setRyInfo"
,
row
);
this
.
$router
.
push
(
"/ryzwbj/"
+
row
.
id
+
"/"
+
row
.
barcode
);
}
else
if
(
this
.
showType
==
3
)
{
// 清除bus
this
.
$bus
.
off
(
'ajzwbjImage'
);
this
.
$bus
.
off
(
'ajzwbjType'
);
this
.
$bus
.
off
(
'ajzwbjTDZ'
);
this
.
$bus
.
off
(
'zwType'
);
this
.
$bus
.
off
(
'openAjDaxx'
);
this
.
$bus
.
off
(
'updateList'
);
this
.
$bus
.
off
(
'updateList_hand'
)
// 先清除路由懒加载
this
.
$store
.
commit
(
'layout/delcachePageName'
,
'ajzwbj'
)
// 清除sessionStorage值
sessionStorage
.
clear
()
this
.
$store
.
commit
(
'ajdaxx/setAjInfo'
,
row
)
this
.
$router
.
push
(
'/ajzwbj/'
+
row
.
id
+
'/'
+
row
.
barcode
)
}
else
if
(
this
.
showType
==
2
)
{
console
.
log
(
row
)
...
...
src/views/xtfkgl/GzlDlView.vue
deleted
100644 → 0
View file @
d298b87d
/**
* Description: 工作流队列相关代码
* @author: li_hongchao
* @date: 2021/12/28 21:07
*/
<
template
>
<div
style=
"background: #F7F9FB; padding: 30px 0px;"
>
<el-row
style=
"margin-bottom: 20px;"
>
<el-col
:span=
"24"
>
<el-form-item
class=
"dui-lie-ming-cheng-layout"
label=
"队列名称:"
prop=
"dlmc"
>
<div
style=
"margin-left: 40px;"
>
<div
class=
"dui-lie-ming-cheng"
v-for=
"(item,index) in dlmcArr"
v-show=
"dlmcArr && dlmcArr.length > 0"
>
<i
class=
"el-icon-circle-plus icon"
style=
"color: #055fe7"
@
click=
"addDl(item,index)"
/>
<div>
{{
item
.
name
||
'-'
}}
<div
v-if=
"item.type === 3"
>
<span
class=
"line"
/>
<span
v-if=
"isRy"
>
<span
v-show=
"item.search === 3 || item.search === 1"
class=
"tag"
>
倒查
</span>
<span
v-show=
"item.search === 3 || item.search === 2"
class=
"tag"
>
查重
</span>
</span>
<span
v-else
>
<span
v-show=
"item.search === 3 || item.search === 1"
class=
"tag"
>
正查
</span>
<span
v-show=
"item.search === 3 || item.search === 2"
class=
"tag"
>
串查
</span>
</span>
</div>
</div>
</div>
</div>
<div
v-show=
"!dlmcArr || dlmcArr.length
<
=
0
"
v-for=
"(item, index) in getDlCount()"
:key=
"index + 'l'"
class=
"kong"
></div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item
class=
"gong-zuo-dui-lie-layout"
label=
"工作队列:"
prop=
"gzdl"
>
<div
v-if=
"gzdlArr && gzdlArr.length > 1"
>
<!-- 串行模式;-->
<div
v-if=
"ruleForm.gzms === 0"
class=
"gong-zuo-dui-lie-chuanxing"
v-for=
"(item,index) in gzdlArr"
>
<div
v-if=
"index === 0"
class=
"chu-li-dui-lie"
style=
"margin-left: 0px;"
>
处理队列
</div>
<i
v-if=
"index !== 0"
class=
"el-icon-remove icon"
style=
"color: #055fe7"
@
click=
"deledeDl(item,index)"
/>
<div
v-if=
"index !== 0"
>
{{
item
.
name
||
'-'
}}
<div
v-if=
"item.type === 3"
>
<span
class=
"gzdl-line"
/>
<span
v-if=
"isRy"
>
<span
v-show=
"item.search === 3 || item.search === 2"
class=
"gztl-tag chachong"
>
查重
</span>
<span
v-show=
"item.search === 3 || item.search === 1"
class=
"gztl-tag daocha"
>
倒查
</span>
</span>
<span
v-else
>
<span
v-show=
"item.search === 3 || item.search === 1"
class=
"gztl-tag zhengcha"
>
正查
</span>
<span
v-show=
"item.search === 3 || item.search === 2"
class=
"gztl-tag chuancha"
>
串查
</span>
</span>
</div>
</div>
</div>
<!-- 并行模式;-->
<div
v-if=
"ruleForm.gzms === 1"
v-for=
"(item,index) in gzdlArr"
:class=
"
{'gong-zuo-dui-lie-bingxing-item':true, kk:index !== 0}">
<div
class=
"gong-zuo-dui-lie-bingxing-item-left"
>
<div
:class=
"
{verLine:true,verLineTrans: index === 0}" />
<div
:class=
"
{verLine:true,verLineTrans: index === gzdlArr.length -1}" />
</div>
<div
class=
"gong-zuo-dui-lie-bingxing-item-right"
>
<span
class=
"mid-line"
/>
<span
class=
"mid-circle"
/>
<div
v-if=
"index === 0"
class=
"chu-li-dui-lie"
style=
"margin-left: 8px;"
>
处理队列
</div>
<div
v-else
class=
"gong-zuo-dui-lie-bingxing"
>
<i
class=
"el-icon-remove icon"
@
click=
"deledeDl(item,index)"
style=
"color: #055fe7"
/>
<div>
{{
item
.
name
||
'-'
}}
<div
v-if=
"item.type === 3"
>
<span
class=
"gzdl-line"
/>
<span
v-if=
"isRy"
>
<span
v-show=
"item.search === 3 || item.search === 2"
class=
"gztl-tag chachong"
>
查重
</span>
<span
v-show=
"item.search === 3 || item.search === 1"
class=
"gztl-tag daocha"
>
倒查
</span>
</span>
<span
v-else
>
<span
v-show=
"item.search === 3 || item.search === 1"
class=
"gztl-tag zhengcha"
>
正查
</span>
<span
v-show=
"item.search === 3 || item.search === 2"
class=
"gztl-tag chuancha"
>
串查
</span>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div
v-else
>
<div
class=
"chu-li-dui-lie"
>
处理队列
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</
template
>
<
script
>
export
default
{
name
:
'GzlDlView'
}
</
script
>
<
style
scoped
>
</
style
>
src/views/xtfkgl/SjkyhSelect.vue
View file @
53ca1a28
...
...
@@ -88,6 +88,9 @@ export default {
this
.
userSelectSet
=
new
Set
()
this
.
doQuery
()
},
mounted
()
{
this
.
updateSelectSet
()
},
methods
:
{
isSelect
(
item
)
{
if
(
this
.
isYh
)
{
...
...
@@ -128,6 +131,7 @@ export default {
this
.
userGroupSelectSet
.
add
(
item
.
id
)
}
})
this
.
$forceUpdate
()
},
toggleYh
(
isyh
)
{
this
.
isYh
=
isyh
...
...
src/views/xtfkgl/XtfkAndGzlView.vue
View file @
53ca1a28
...
...
@@ -155,11 +155,10 @@
:style=
"
{marginLeft: gindex===0?'24px':'0px'}">
<div
v-if=
"gindex === 0"
class=
"chu-li-dui-lie"
style=
"margin-left: 0px;"
>
<!--
<span
style=
"position: absolute;float:left;top:-4px;left: 10px;color: white"
>
-->
<!--
<img-->
<!-- src="../../assets/img/ljfkgl/ljfk_gzl_num_bg.svg" />-->
<!--
<span
style=
"position: absolute;"
>
{{
index
+
1
}}
</span>
-->
<!--
</span>
-->
<!--
<span
style=
"position: absolute;float:left;top:-4px;left: 10px;color: white"
>
-->
<!--
<img
src=
"../../assets/img/ljfkgl/ljfk_gzl_num_bg.svg"
/>
-->
<!--
<span
style=
"position: absolute;"
>
{{
index
+
1
}}
</span>
-->
<!--
</span>
-->
处理队列
</div>
<i
v-if=
"gindex !== 0"
class=
"el-icon-remove icon"
...
...
src/views/xtfkgl/XtfkglMain.vue
View file @
53ca1a28
...
...
@@ -93,7 +93,7 @@ export default {
},
closeXtfkView
(
isSuccess
)
{
closeXtfkView
(
isSuccess
,
isRefresh
)
{
this
.
isAddFk
=
false
if
(
isSuccess
&&
isRefresh
)
{
if
(
this
.
isPerson
)
{
...
...
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