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
3339c724
Commit
3339c724
authored
Dec 18, 2021
by
米嘉伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://47.92.108.28/changchao/founder_vue
into dev_zwpt
parents
7e48e7ce
00aaa73d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
21 deletions
+30
-21
src/views/Editor/modules/imageEd.vue
+20
-13
src/views/Editor/modules/imageEdAJ.vue
+0
-0
src/views/bzxxgl/fhxxLT.vue
+3
-1
src/views/cxyrd/TT.vue
+1
-1
src/views/cxyrd/modules/LLCandidate.vue
+1
-1
src/views/cxyrd/modules/LTCandidate.vue
+1
-1
src/views/cxyrd/modules/TLCandidate.vue
+1
-1
vue.config.js
+3
-3
No files found.
src/views/Editor/modules/imageEd.vue
View file @
3339c724
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-17
16:22:04
* @LastEditTime: 2021-12-17
21:04:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...
...
@@ -78,39 +78,39 @@
<div
class=
"rotate_line_top"
></div>
<div
class=
"content"
>
<div
class=
"rotate_content"
>
<div
class=
"rotate_left"
id=
"btn-rotate-clockwise"
>
<div
class=
"rotate_left"
id=
"btn-rotate-c
ounter-c
lockwise"
>
<div
class=
"rotate_icon"
>
<img
v-if=
"!is
Lef
tRotate"
src=
"@/assets/img/zcedit/left_rotate_d.png"
alt=
""
/>
<img
v-if=
"!is
Righ
tRotate"
src=
"@/assets/img/zcedit/left_rotate_d.png"
alt=
""
/>
<img
v-else
src=
"@/assets/img/zcedit/left_rotate_a.png"
alt=
""
/>
</div>
<div
class=
"num"
:class=
"
{ leftRotateActive: isLeftRotate }">
30
-
30
</div>
</div>
<div
class=
"rotate_right"
id=
"btn-rotate-c
ounter-c
lockwise"
>
<div
class=
"rotate_right"
id=
"btn-rotate-clockwise"
>
<div
class=
"rotate_icon"
>
<img
v-if=
"!is
Righ
tRotate"
src=
"@/assets/img/zcedit/left_rotate_d.png"
alt=
""
/>
<img
v-if=
"!is
Lef
tRotate"
src=
"@/assets/img/zcedit/left_rotate_d.png"
alt=
""
/>
<img
v-else
src=
"@/assets/img/zcedit/left_rotate_a.png"
alt=
""
/>
</div>
<div
class=
"num"
:class=
"
{ rightRotateActive: isRightRotate }">
-
30
30
</div>
</div>
</div>
<div
class=
"flap_content"
>
<div
class=
"flap_x"
id=
"btn-flip-
x
"
>
<div
class=
"flap_x"
id=
"btn-flip-
y
"
>
<div
class=
"flap_x_icon"
>
<img
v-if=
"!is
X
"
src=
"@/assets/img/zcedit/flap_x_d.png"
alt=
""
/>
<img
v-if=
"!is
Y
"
src=
"@/assets/img/zcedit/flap_x_d.png"
alt=
""
/>
<img
v-else
src=
"@/assets/img/zcedit/flap_x_a.png"
alt=
""
/>
</div>
<div
class=
"flap_txt"
:class=
"
{ xActive: is
X
}">X轴
</div>
<div
class=
"flap_txt"
:class=
"
{ xActive: is
Y
}">X轴
</div>
</div>
<div
class=
"flap_y"
id=
"btn-flip-
y
"
>
<div
class=
"flap_y"
id=
"btn-flip-
x
"
>
<div
class=
"flap_y_icon"
>
<img
v-if=
"!is
Y
"
src=
"@/assets/img/zcedit/flap_y_d.png"
alt=
""
/>
<img
v-if=
"!is
X
"
src=
"@/assets/img/zcedit/flap_y_d.png"
alt=
""
/>
<img
v-else
src=
"@/assets/img/zcedit/flap_y_a.png"
alt=
""
/>
</div>
<div
class=
"flap_txt"
:class=
"
{ yActive: is
Y
}">Y轴
</div>
<div
class=
"flap_txt"
:class=
"
{ yActive: is
X
}">Y轴
</div>
</div>
</div>
</div>
...
...
@@ -1015,6 +1015,7 @@ export default {
self
.
isReset
=
true
;
// 旋转角度同样恢复到0
self
.
inputRotationRange
=
0
;
self
.
startPlace
=
0
//console.log(self.startPlace, 222);
// 事件不能连续重复执行,需要缓存时间
setTimeout
(()
=>
{
...
...
@@ -1178,7 +1179,13 @@ export default {
// 缩放为1
self
.
zoomLevel
=
1
;
imageEditor
.
resetZoom
();
imageEditor
.
resetFlip
().
catch
(
err
=>
{})
self
.
resetTzdDrawing
();
self
.
tzdDrawingLeft
=
0
self
.
tzdDrawingTop
=
0
self
.
tzdDrawing_left
=
0
self
.
tzdDrawing_top
=
0
self
.
startPlace
=
0
self
.
sourceImage
=
sourceImage
;
imageEditor
.
loadImageFromURL
(
...
...
src/views/Editor/modules/imageEdAJ.vue
View file @
3339c724
This diff is collapsed.
Click to expand it.
src/views/bzxxgl/fhxxLT.vue
View file @
3339c724
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-17
15:57:54
* @LastEditTime: 2021-12-17
23:11:18
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...
...
@@ -350,6 +350,8 @@ export default {
}
})
}
}
else
{
self
.
$bus
.
emit
(
'changImageEditTarget'
,
'xxx'
)
}
},
/**
...
...
src/views/cxyrd/TT.vue
View file @
3339c724
...
...
@@ -121,7 +121,7 @@
{{ scope.$index + 1 }}
</div>
</el-table-column>
<el-table-column
prop=
"score"
label=
"得分"
:width=
"width1"
>
<el-table-column
prop=
"score"
label=
"得分"
:width=
"
!roleArr.includes('C-1-7')?'auto':
width1"
>
<div
class=
"del"
slot-scope=
"scope"
...
...
src/views/cxyrd/modules/LLCandidate.vue
View file @
3339c724
...
...
@@ -65,7 +65,7 @@
</div>
</
template
>
</el-table-column>
<el-table-column
prop=
"destseqno"
label=
"序号"
:width=
"width3"
>
<el-table-column
prop=
"destseqno"
label=
"序号"
:width=
"
!roleArr.includes('C-1-7')?'auto':
width3"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.removeFlag === 1"
>
<del>
{{
...
...
src/views/cxyrd/modules/LTCandidate.vue
View file @
3339c724
...
...
@@ -39,7 +39,7 @@
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"destseqno"
label=
"指位"
:width=
"width3"
:render-header=
"icons"
>
<el-table-column
prop=
"destseqno"
label=
"指位"
:width=
"
!roleArr.includes('C-1-7')?'auto':
width3"
:render-header=
"icons"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.removeFlag===1"
>
{{
...
...
src/views/cxyrd/modules/TLCandidate.vue
View file @
3339c724
...
...
@@ -22,7 +22,7 @@
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"序号"
prop=
"destseqno"
:width=
"width1"
>
<el-table-column
label=
"序号"
prop=
"destseqno"
:width=
"
!roleArr.includes('C-1-7')?'auto':
width1"
>
<
template
slot-scope=
"scope"
>
<!-- 被删除-->
<span
v-if=
"scope.row.removeFlag==1"
>
...
...
vue.config.js
View file @
3339c724
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-17
15:07:3
1
* @LastEditTime: 2021-12-17
23:04:5
1
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
...
...
@@ -91,14 +91,14 @@ module.exports = {
"/api"
:
{
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
target
:
"http://192.168.128.114:8099"
,
// 湖南-马
//
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/",
target
:
"http://zwpt.xzclub.top:9333/"
,
// target: "http://192.168.128.115:8099", // 江
ws
:
true
,
changeOrigin
:
true
,
...
...
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