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
2b0a0cc8
Commit
2b0a0cc8
authored
May 24, 2022
by
米嘉伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://39.99.224.27:9022/changchao/founder_vue
into dev_zwpt
parents
56881f9b
e5ca33f7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
97 additions
and
42 deletions
+97
-42
public/image-edit/js/tui-image-editor.js
+10
-4
src/components/ImageEd.vue
+0
-0
src/i18n/zh-cn.js
+4
-3
src/views/AllPersonnelBase/AllPersonnelBase.vue
+65
-16
src/views/AllPersonnelBase/qbalk.vue
+18
-19
No files found.
public/image-edit/js/tui-image-editor.js
View file @
2b0a0cc8
...
@@ -4259,7 +4259,6 @@
...
@@ -4259,7 +4259,6 @@
},
},
/* eslint-disable complexity */
/* eslint-disable complexity */
objectActivated
:
function
objectActivated
(
obj
)
{
objectActivated
:
function
objectActivated
(
obj
)
{
_this12
.
activeObjectId
=
obj
.
id
;
_this12
.
activeObjectId
=
obj
.
id
;
_this12
.
ui
.
changeHelpButtonEnabled
(
'delete'
,
true
);
_this12
.
ui
.
changeHelpButtonEnabled
(
'delete'
,
true
);
...
@@ -8673,6 +8672,7 @@
...
@@ -8673,6 +8672,7 @@
},
{
},
{
key
:
'add'
,
key
:
'add'
,
value
:
function
add
(
type
,
options
)
{
value
:
function
add
(
type
,
options
)
{
// debugger
var
_this2
=
this
;
var
_this2
=
this
;
return
new
_util
.
Promise
(
function
(
resolve
)
{
return
new
_util
.
Promise
(
function
(
resolve
)
{
...
@@ -8926,6 +8926,7 @@
...
@@ -8926,6 +8926,7 @@
},
{
},
{
key
:
'_onFabricMouseMove'
,
key
:
'_onFabricMouseMove'
,
value
:
function
_onFabricMouseMove
(
fEvent
)
{
value
:
function
_onFabricMouseMove
(
fEvent
)
{
// debugger
var
_this4
=
this
;
var
_this4
=
this
;
var
canvas
=
this
.
getCanvas
();
var
canvas
=
this
.
getCanvas
();
...
@@ -8935,6 +8936,12 @@
...
@@ -8935,6 +8936,12 @@
var
width
=
startPointX
-
pointer
.
x
;
var
width
=
startPointX
-
pointer
.
x
;
var
height
=
startPointY
-
pointer
.
y
;
var
height
=
startPointY
-
pointer
.
y
;
var
shape
=
this
.
_shapeObj
;
var
shape
=
this
.
_shapeObj
;
// 张改 -- 阻止标记点随鼠标拖拽放大
if
(
this
.
_type
==
'circle'
)
{
return
}
if
(
!
shape
)
{
if
(
!
shape
)
{
this
.
add
(
this
.
_type
,
{
this
.
add
(
this
.
_type
,
{
...
@@ -12991,9 +12998,7 @@
...
@@ -12991,9 +12998,7 @@
* @override
* @override
*/
*/
initialize
:
function
initialize
()
{
initialize
:
function
initialize
()
{
this
.
matrix
=
[
4
,
4
,
4
,
this
.
matrix
=
[
4
,
4
,
4
,
4
,
0.7
,
-
4
,
-
4
,
-
4
,
-
4
];
4
,
0.7
,
-
4
,
-
4
,
-
4
,
-
4
];
// this.matrix = [1, 1, 1, 1, 0.7, -1, -1, -1, -1];
// this.matrix = [1, 1, 1, 1, 0.7, -1, -1, -1, -1];
// this.matrix = [0, -1, 0, -1, 5, -1, 0, -1, 0];
// this.matrix = [0, -1, 0, -1, 5, -1, 0, -1, 0];
// this.matrix = [1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9];
// this.matrix = [1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9, 1/9];
...
@@ -18371,6 +18376,7 @@
...
@@ -18371,6 +18376,7 @@
},
{
},
{
key
:
'redo'
,
key
:
'redo'
,
value
:
function
redo
()
{
value
:
function
redo
()
{
// debugger
var
_this5
=
this
;
var
_this5
=
this
;
var
iterationCount
=
arguments
.
length
>
0
&&
arguments
[
0
]
!==
undefined
?
arguments
[
0
]
:
1
;
var
iterationCount
=
arguments
.
length
>
0
&&
arguments
[
0
]
!==
undefined
?
arguments
[
0
]
:
1
;
src/components/ImageEd.vue
View file @
2b0a0cc8
This diff is collapsed.
Click to expand it.
src/i18n/zh-cn.js
View file @
2b0a0cc8
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2022-03-25 16:36:01
* @Date: 2022-03-25 16:36:01
* @LastEditTime: 2022-0
4-16 17:21:29
* @LastEditTime: 2022-0
5-23 10:47:42
* @LastEditors:
Please set LastEditors
* @LastEditors:
error: git config user.name && git config user.email & please set dead value or install git
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \uuuz\founder_vue\src\i18n\zh-cn.js
* @FilePath: \uuuz\founder_vue\src\i18n\zh-cn.js
*/
*/
...
@@ -913,7 +913,8 @@ export default {
...
@@ -913,7 +913,8 @@ export default {
hide_curve
:
'隐藏曲线'
,
hide_curve
:
'隐藏曲线'
,
show_line
:
'显示直线'
,
show_line
:
'显示直线'
,
show_curve
:
'显示曲线'
,
show_curve
:
'显示曲线'
,
show_marked_points
:
'显示标记点'
show_marked_points
:
'显示标记点'
,
delete_marked_points
:
'删除标记点'
},
},
// 人员指纹编辑
// 人员指纹编辑
Ryzwbj
:
{
Ryzwbj
:
{
...
...
src/views/AllPersonnelBase/AllPersonnelBase.vue
View file @
2b0a0cc8
...
@@ -8,19 +8,6 @@
...
@@ -8,19 +8,6 @@
<!--
<div
class=
'title'
>
全部人员库
</div>
-->
<!--
<div
class=
'title'
>
全部人员库
</div>
-->
<!--二-->
<!--二-->
<div
class=
"search"
>
<div
class=
"search"
>
<div
class=
"search-right"
>
<span
class=
"create-time-text"
>
{{
$t
(
'Common.sarehousing_time'
)
}}
:
</span>
<el-date-picker
v-model=
"reqParam.personStoreCustomSearch.createTime"
type=
"daterange"
range-separator=
"~"
:start-placeholder=
"$t('Common.start_time2')"
:end-placeholder=
"$t('Common.end_time2')"
:picker-options=
"
{ disabledDate: disabledDate }"
@change="selectTime"
>
</el-date-picker>
</div>
<div
class=
"search-left"
>
<div
class=
"search-left"
>
<el-input
<el-input
clear=
"search-input"
clear=
"search-input"
...
@@ -36,7 +23,50 @@
...
@@ -36,7 +23,50 @@
v-if=
"reqParam.personStoreCustomSearch.ysxtAsjxgrybh.length > 0"
v-if=
"reqParam.personStoreCustomSearch.ysxtAsjxgrybh.length > 0"
@
click=
"empty"
@
click=
"empty"
></i>
></i>
<div
class=
"search-icon el-icon-search"
@
click=
"search()"
></div>
<div
class=
"search-icon el-icon-search"
@
click=
"search()"
></div>
</div>
<div
class=
"search-right"
>
<div
class=
"rksj"
>
<span
class=
"create-time-text"
>
{{
$t
(
'Common.sarehousing_time'
)
}}
:
</span>
<el-date-picker
v-model=
"reqParam.personStoreCustomSearch.createTime"
type=
"daterange"
range-separator=
"~"
:start-placeholder=
"$t('Common.start_time2')"
:end-placeholder=
"$t('Common.end_time2')"
:picker-options=
"
{ disabledDate: disabledDate }"
@change="selectTime"
>
</el-date-picker>
</div>
<div
class=
"xm"
>
<span
class=
"create-time-text"
>
{{
$t
(
'Common.xm'
)
}}
:
</span>
<el-input
clear=
"search-input"
:placeholder=
"$t('Common.xm_placeholder')"
v-model
.
trim=
"reqParam.personStoreCustomSearch.xm"
@
keyup
.
enter
.
native=
"search()"
show-word-limit
clearable
>
</el-input>
</div>
<div
class=
"sfzh"
>
<span
class=
"create-time-text"
>
{{
$t
(
'Common.sfzh'
)
}}
:
</span>
<el-input
clear=
"search-input"
:placeholder=
"$t('Common.sfzh_placeholder')"
v-model
.
trim=
"reqParam.personStoreCustomSearch.zjhm"
@
keyup
.
enter
.
native=
"search()"
maxlength=
"18"
show-word-limit
clearable
>
</el-input>
</div>
</div>
</div>
<!--
<el-radio-group
<!--
<el-radio-group
v-model=
"reqParam.personStoreCustomSearch.searchOptions"
v-model=
"reqParam.personStoreCustomSearch.searchOptions"
...
@@ -539,6 +569,8 @@ export default {
...
@@ -539,6 +569,8 @@ export default {
createTime
:
[],
createTime
:
[],
createBeginTime
:
''
,
createBeginTime
:
''
,
createEndTime
:
''
,
createEndTime
:
''
,
zjhm
:
''
,
xm
:
''
},
},
},
},
tableDate
:
[
tableDate
:
[
...
@@ -626,6 +658,7 @@ export default {
...
@@ -626,6 +658,7 @@ export default {
},
},
// 获取全部人员列表请求
// 获取全部人员列表请求
search
(
page
=
1
)
{
search
(
page
=
1
)
{
let
self
=
this
this
.
selectBoo
=
false
this
.
selectBoo
=
false
// //console.info("请求===>", this.reqParam);
// //console.info("请求===>", this.reqParam);
this
.
reqParam
.
page
.
currPage
=
page
this
.
reqParam
.
page
.
currPage
=
page
...
@@ -652,8 +685,9 @@ export default {
...
@@ -652,8 +685,9 @@ export default {
this
.
reqParam
.
personStoreCustomSearch
.
createBeginTime
=
''
this
.
reqParam
.
personStoreCustomSearch
.
createBeginTime
=
''
this
.
reqParam
.
personStoreCustomSearch
.
createEndTime
=
''
this
.
reqParam
.
personStoreCustomSearch
.
createEndTime
=
''
}
}
console
.
log
(
this
.
reqParam
);
this
.
$axios
this
.
$axios
.
post
(
'/api/personstore/person/list'
,
this
.
reqParam
)
.
post
(
'/api/personstore/person/list'
,
self
.
reqParam
)
.
then
((
response
)
=>
{
.
then
((
response
)
=>
{
if
(
response
.
data
.
code
===
0
)
{
if
(
response
.
data
.
code
===
0
)
{
this
.
tableDate
=
response
.
data
.
ret
.
list
this
.
tableDate
=
response
.
data
.
ret
.
list
...
@@ -1113,6 +1147,8 @@ export default {
...
@@ -1113,6 +1147,8 @@ export default {
createTime
:
[],
createTime
:
[],
createBeginTime
:
''
,
createBeginTime
:
''
,
createEndTime
:
''
,
createEndTime
:
''
,
zjhm
:
''
,
xm
:
''
},
},
}
}
},
},
...
@@ -1276,11 +1312,24 @@ export default {
...
@@ -1276,11 +1312,24 @@ export default {
align-items
:
center
;
align-items
:
center
;
}
}
.search-right
{
.search-right
{
margin-right
:
30px
;
display
:
flex
;
align-items
:
center
;
.create-time-text
{
.create-time-text
{
font-size
:
14px
;
font-size
:
14px
;
color
:
#606266
;
color
:
#606266
;
}
}
.rksj
{
margin-right
:
30px
;
}
.xm
{
margin-right
:
30px
;
.el-input
{
width
:
180px
;
}
/
deep
/
.el-input__inner
{
width
:
180px
;
}
}
}
}
.el-input
{
.el-input
{
...
...
src/views/AllPersonnelBase/qbalk.vue
View file @
2b0a0cc8
...
@@ -5,19 +5,6 @@
...
@@ -5,19 +5,6 @@
<!--二-->
<!--二-->
<div
class=
"search"
>
<div
class=
"search"
>
<div
class=
"search-left"
>
<div
class=
"search-left"
>
<span
class=
"create-time-text"
>
{{
$t
(
'Common.sarehousing_time'
)
}}
:
</span>
<el-date-picker
v-model=
"reqParam.caseStoreCustomSearchReq.createTime"
type=
"daterange"
range-separator=
"~"
:start-placeholder=
"$t('Common.start_time2')"
:end-placeholder=
"$t('Common.end_time2')"
:picker-options=
"
{ disabledDate: disabledDate }"
@change="selectTime"
>
</el-date-picker>
</div>
<div
class=
"search-right"
>
<el-input
<el-input
clear=
"search-input"
clear=
"search-input"
:placeholder=
"$t('Allperson.input_barcode_vague_search')"
:placeholder=
"$t('Allperson.input_barcode_vague_search')"
...
@@ -33,6 +20,19 @@
...
@@ -33,6 +20,19 @@
></i>
></i>
<div
class=
"search-icon el-icon-search"
@
click=
"search()"
></div>
<div
class=
"search-icon el-icon-search"
@
click=
"search()"
></div>
</div>
</div>
<div
class=
"search-right"
>
<span
class=
"create-time-text"
>
{{
$t
(
'Common.sarehousing_time'
)
}}
:
</span>
<el-date-picker
v-model=
"reqParam.caseStoreCustomSearchReq.createTime"
type=
"daterange"
range-separator=
"~"
:start-placeholder=
"$t('Common.start_time2')"
:end-placeholder=
"$t('Common.end_time2')"
:picker-options=
"
{ disabledDate: disabledDate }"
@change="selectTime"
>
</el-date-picker>
</div>
<!--
<el-radio-group
v-model=
"reqParam.caseStoreCustomSearchReq.searchOptions"
>
<!--
<el-radio-group
v-model=
"reqParam.caseStoreCustomSearchReq.searchOptions"
>
<el-radio
:label=
"3"
>
通用搜索
</el-radio>
<el-radio
:label=
"3"
>
通用搜索
</el-radio>
<el-radio
:label=
"6"
>
指定条码搜索
</el-radio>
<el-radio
:label=
"6"
>
指定条码搜索
</el-radio>
...
@@ -1161,18 +1161,17 @@ const datas1 = [
...
@@ -1161,18 +1161,17 @@ const datas1 = [
align-items
:
center
;
align-items
:
center
;
.search-left
{
.search-left
{
margin-right
:
30px
;
display
:
flex
;
align-items
:
center
;
}
.search-right
{
.create-time-text
{
.create-time-text
{
font-size
:
14px
;
font-size
:
14px
;
color
:
#606266
;
color
:
#606266
;
}
}
}
}
.search-right
{
display
:
flex
;
align-items
:
center
;
}
/
deep
/
.el-input
{
/
deep
/
.el-input
{
/deep/
.el-input__inner
{
/deep/
.el-input__inner
{
border
:
none
;
border
:
none
;
...
...
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