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
3b828447
Commit
3b828447
authored
Nov 10, 2021
by
liyuhang19990520
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
8c53df63
eb439605
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
447 additions
and
162 deletions
+447
-162
src/views/AllPersonnelBase/modules/fcx.vue
+4
-4
src/views/SystemManage/GroupManage.vue
+13
-0
src/views/SystemManage/RoleManage.vue
+10
-0
src/views/SystemManage/UserManage.vue
+26
-0
src/views/cxyrd/LT.vue
+30
-17
src/views/cxyrd/QueryConfirm.vue
+65
-66
src/views/drFPTX/Index.vue
+12
-12
src/views/drFPTX/RAList.vue
+273
-57
vue.config.js
+14
-6
No files found.
src/views/AllPersonnelBase/modules/fcx.vue
View file @
3b828447
...
@@ -306,8 +306,8 @@
...
@@ -306,8 +306,8 @@
<el-radio-group
v-model=
"ruleForm.cxlx.querytype"
>
<el-radio-group
v-model=
"ruleForm.cxlx.querytype"
>
<el-radio
<el-radio
label=
"2"
label=
"2"
style=
"color: #00
ccb5
"
style=
"color: #00
b47a
"
class=
'color_00
ccb5
'
class=
'color_00
b47a
'
>
正查
</el-radio>
>
正查
</el-radio>
<el-radio
<el-radio
label=
"3"
label=
"3"
...
@@ -1085,8 +1085,8 @@ export default {
...
@@ -1085,8 +1085,8 @@ export default {
/
deep
/
.color_fa9500
.el-radio__input.is-checked
+
.el-radio__label
{
/
deep
/
.color_fa9500
.el-radio__input.is-checked
+
.el-radio__label
{
color
:
#fa9500
;
color
:
#fa9500
;
}
}
/
deep
/
.color_00
ccb5
.el-radio__input.is-checked
+
.el-radio__label
{
/
deep
/
.color_00
b47a
.el-radio__input.is-checked
+
.el-radio__label
{
color
:
#00
ccb5
;
color
:
#00
b47a
;
}
}
/
deep
/
.color_055fe7
.el-radio__input.is-checked
+
.el-radio__label
{
/
deep
/
.color_055fe7
.el-radio__input.is-checked
+
.el-radio__label
{
color
:
#055fe7
;
color
:
#055fe7
;
...
...
src/views/SystemManage/GroupManage.vue
View file @
3b828447
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
</div>
</div>
<div
class=
"operation"
>
<div
class=
"operation"
>
<div
class=
"btn1"
@
click=
"batch"
>
批量操作
</div>
<div
class=
"btn1"
@
click=
"batch"
>
批量操作
</div>
<div
@
click=
"addgroup"
class=
"clear-btn"
>
addgroup
</div>
<div
class=
"btns"
>
<div
class=
"btns"
>
<div
class=
"btn1"
@
click=
"delMore()"
>
删除
</div>
<div
class=
"btn1"
@
click=
"delMore()"
>
删除
</div>
<div
class=
"add"
@
click=
"open"
>
<div
class=
"add"
@
click=
"open"
>
...
@@ -593,6 +594,18 @@ export default {
...
@@ -593,6 +594,18 @@ export default {
}
}
},
},
methods
:
{
methods
:
{
addgroup
()
{
var
group
=
{
userId
:
39898889
,
status
:
-
17476821
,
describe
:
"sit laborum Excepteur officia"
,
name
:
"ullamco esse"
,
roleId
:
-
70041648
};
this
.
$axios
.
post
(
"/system/user-groups"
,
group
).
then
(
res
=>
{
console
.
info
(
res
);
});
},
clear
()
{
clear
()
{
this
.
searchParams
.
page
.
page
=
1
;
//必填
this
.
searchParams
.
page
.
page
=
1
;
//必填
this
.
searchParams
.
page
.
total
=
20
;
//必填
this
.
searchParams
.
page
.
total
=
20
;
//必填
...
...
src/views/SystemManage/RoleManage.vue
View file @
3b828447
...
@@ -60,6 +60,7 @@
...
@@ -60,6 +60,7 @@
数据权限
数据权限
</div>
</div>
</div>
</div>
<div
@
click=
"addrole"
>
addrole
</div>
<div
class=
"save"
>
<div
class=
"save"
>
<div
class=
"btn"
@
click=
"save"
>
保存
</div>
<div
class=
"btn"
@
click=
"save"
>
保存
</div>
<!--
<el-button
@
click=
"add"
>
add
</el-button>
-->
<!--
<el-button
@
click=
"add"
>
add
</el-button>
-->
...
@@ -333,6 +334,15 @@ export default {
...
@@ -333,6 +334,15 @@ export default {
};
};
},
},
methods
:
{
methods
:
{
addrole
()
{
var
role
=
{
name
:
"do aute officia irure voluptate"
,
permissionIds
:
[]
};
this
.
$axios
.
post
(
"/system/roles"
,
role
).
then
(
res
=>
{
console
.
info
(
res
);
});
},
// 复制
// 复制
copy
()
{
copy
()
{
console
.
info
(
"复制数据"
);
console
.
info
(
"复制数据"
);
...
...
src/views/SystemManage/UserManage.vue
View file @
3b828447
...
@@ -56,6 +56,8 @@
...
@@ -56,6 +56,8 @@
</div>
</div>
<div
class=
"operation"
>
<div
class=
"operation"
>
<div
class=
"btn1"
@
click=
"batch"
>
批量操作
</div>
<div
class=
"btn1"
@
click=
"batch"
>
批量操作
</div>
<div
class=
"clear-btn"
@
click=
"adduser"
>
adduser
</div>
<div
class=
"clear-btn"
@
click=
"searchuser"
>
searchuser
</div>
<div
class=
"btns"
>
<div
class=
"btns"
>
<div
class=
"btn1"
@
click=
"delMore()"
>
删除
</div>
<div
class=
"btn1"
@
click=
"delMore()"
>
删除
</div>
<div
class=
"add"
@
click=
"open"
>
<div
class=
"add"
@
click=
"open"
>
...
@@ -384,6 +386,8 @@
...
@@ -384,6 +386,8 @@
<
script
>
<
script
>
import
"@/icons/ic_add.svg"
;
import
"@/icons/ic_add.svg"
;
import
qs
from
"qs"
;
export
default
{
export
default
{
name
:
"UserManage"
,
name
:
"UserManage"
,
created
()
{
created
()
{
...
@@ -632,6 +636,28 @@ export default {
...
@@ -632,6 +636,28 @@ export default {
}
}
},
},
methods
:
{
methods
:
{
adduser
()
{
var
user
=
{
username
:
"2021"
,
phoneNumber
:
"15806613121"
,
password
:
"2021"
,
policeNumber
:
"223"
,
unitName
:
"长沙"
,
unitCode
:
"123"
,
name
:
"王明光"
,
status
:
1
,
userGroupId
:
1
,
roleId
:
1
};
this
.
$axios
.
post
(
"/system/users"
,
user
).
then
(
res
=>
{
console
.
info
(
res
);
});
},
searchuser
()
{
this
.
$axios
.
get
(
"/system/users"
).
then
(
res
=>
{
console
.
info
(
res
);
});
},
// 新增
// 新增
submitForm
(
formName
)
{
submitForm
(
formName
)
{
this
.
$refs
.
addFormParams
.
validate
(
valid
=>
{
this
.
$refs
.
addFormParams
.
validate
(
valid
=>
{
...
...
src/views/cxyrd/LT.vue
View file @
3b828447
...
@@ -87,7 +87,11 @@
...
@@ -87,7 +87,11 @@
</div>
</div>
<div
class=
"bzitem"
>
<div
class=
"bzitem"
>
<div
class=
"bzname"
>
比中人联系电话:
</div>
<div
class=
"bzname"
>
比中人联系电话:
</div>
<el-input
class=
"bzphone"
v-model=
"phone"
placeholder=
"请输入内容"
></el-input>
<el-input
class=
"bzphone"
v-model=
"phone"
placeholder=
"请输入内容"
></el-input>
<div
class=
"input-error"
v-show=
"isPhoneError"
>
<div
class=
"input-error"
v-show=
"isPhoneError"
>
<!--
<img
src=
"@/assets/img/inputerror.png"
alt=
""
>
-->
<!--
<img
src=
"@/assets/img/inputerror.png"
alt=
""
>
-->
<svg-icon
icon-class=
"error"
class=
"icon"
/>
<svg-icon
icon-class=
"error"
class=
"icon"
/>
...
@@ -100,7 +104,12 @@
...
@@ -100,7 +104,12 @@
<div
class=
"line"
></div>
<div
class=
"line"
></div>
<div
class=
"bzfooter"
>
<div
class=
"bzfooter"
>
<div
class=
"footer-title"
>
备注
</div>
<div
class=
"footer-title"
>
备注
</div>
<el-input
type=
"textarea"
:rows=
"5"
placeholder=
"在此输入备注信息"
v-model=
"textarea"
>
<el-input
type=
"textarea"
:rows=
"5"
placeholder=
"在此输入备注信息"
v-model=
"textarea"
>
</el-input>
</el-input>
</div>
</div>
<div
class=
"bzbtns"
>
<div
class=
"bzbtns"
>
...
@@ -111,7 +120,11 @@
...
@@ -111,7 +120,11 @@
</div>
</div>
<!-- 认定完成确认框 -->
<!-- 认定完成确认框 -->
<div
class=
"rdwcDialog"
v-show=
"isShowrdwcDialogBg"
@
click=
"cancelrdwc"
></div>
<div
class=
"rdwcDialog"
v-show=
"isShowrdwcDialogBg"
@
click=
"cancelrdwc"
></div>
<div
class=
"rdwccontent"
v-show=
"isShowrdwcDialog"
>
<div
class=
"rdwccontent"
v-show=
"isShowrdwcDialog"
>
<div
class=
"title"
>
当前候选未全部查看,是否确认认定完成?
</div>
<div
class=
"title"
>
当前候选未全部查看,是否确认认定完成?
</div>
<div
class=
"rdwcbtns"
>
<div
class=
"rdwcbtns"
>
...
@@ -136,7 +149,7 @@ export default {
...
@@ -136,7 +149,7 @@ export default {
LTCandidate
,
LTCandidate
,
ImageEd
ImageEd
},
},
data
()
{
data
()
{
return
{
return
{
qid
:
null
,
qid
:
null
,
radio
:
6
,
radio
:
6
,
...
@@ -161,12 +174,12 @@ export default {
...
@@ -161,12 +174,12 @@ export default {
isShowrdwcDialog
:
false
isShowrdwcDialog
:
false
};
};
},
},
created
()
{
created
()
{
this
.
qid
=
this
.
$route
.
query
.
rowData
;
this
.
qid
=
this
.
$route
.
query
.
rowData
;
console
.
log
(
"源qid====>"
,
this
.
qid
);
console
.
log
(
"源qid====>"
,
this
.
qid
);
},
},
watch
:
{
watch
:
{
phone
(
newValue
,
oldValue
)
{
phone
(
newValue
,
oldValue
)
{
if
(
newValue
.
length
<
7
)
{
if
(
newValue
.
length
<
7
)
{
this
.
isPhoneError
=
true
;
this
.
isPhoneError
=
true
;
document
document
...
@@ -186,7 +199,7 @@ export default {
...
@@ -186,7 +199,7 @@ export default {
* @param {*}
* @param {*}
* @return {*}
* @return {*}
*/
*/
confirmrdwc
()
{
confirmrdwc
()
{
let
self
=
this
;
let
self
=
this
;
this
.
isShowrdwcDialogBg
=
false
;
this
.
isShowrdwcDialogBg
=
false
;
this
.
isShowrdwcDialog
=
false
;
this
.
isShowrdwcDialog
=
false
;
...
@@ -228,7 +241,7 @@ export default {
...
@@ -228,7 +241,7 @@ export default {
* @param {*}
* @param {*}
* @return {*}
* @return {*}
*/
*/
cancelrdwc
()
{
cancelrdwc
()
{
this
.
isShowrdwcDialogBg
=
false
;
this
.
isShowrdwcDialogBg
=
false
;
this
.
isShowrdwcDialog
=
false
;
this
.
isShowrdwcDialog
=
false
;
},
},
...
@@ -237,7 +250,7 @@ export default {
...
@@ -237,7 +250,7 @@ export default {
* @param {*}
* @param {*}
* @return {*}
* @return {*}
*/
*/
cancelbz
()
{
cancelbz
()
{
this
.
isShowbzDialogBg
=
false
;
this
.
isShowbzDialogBg
=
false
;
this
.
isShowbzDialog
=
false
;
this
.
isShowbzDialog
=
false
;
},
},
...
@@ -246,7 +259,7 @@ export default {
...
@@ -246,7 +259,7 @@ export default {
* @param {*}
* @param {*}
* @return {*}
* @return {*}
*/
*/
confirmbz
()
{
confirmbz
()
{
let
self
=
this
;
let
self
=
this
;
console
.
log
(
"比中"
);
console
.
log
(
"比中"
);
let
affirmstatus
=
"1"
;
let
affirmstatus
=
"1"
;
...
@@ -302,7 +315,7 @@ export default {
...
@@ -302,7 +315,7 @@ export default {
* @param {*}
* @param {*}
* @return {*}
* @return {*}
*/
*/
getUserInfo2
()
{
getUserInfo2
()
{
let
self
=
this
;
let
self
=
this
;
let
destbarcode
=
sessionStorage
.
getItem
(
"destbarcode"
)
||
""
;
let
destbarcode
=
sessionStorage
.
getItem
(
"destbarcode"
)
||
""
;
console
.
log
(
destbarcode
);
console
.
log
(
destbarcode
);
...
@@ -323,7 +336,7 @@ export default {
...
@@ -323,7 +336,7 @@ export default {
* @param {*} id
* @param {*} id
* @return {*}
* @return {*}
*/
*/
getUserInfo
(
id
=
1234
)
{
getUserInfo
(
id
=
1234
)
{
let
self
=
this
;
let
self
=
this
;
this
.
$axios
({
this
.
$axios
({
method
:
"post"
,
method
:
"post"
,
...
@@ -354,7 +367,7 @@ export default {
...
@@ -354,7 +367,7 @@ export default {
* @param {*}
* @param {*}
* @return {*}
* @return {*}
*/
*/
Bz
()
{
Bz
()
{
this
.
getUserInfo
();
this
.
getUserInfo
();
this
.
getUserInfo2
();
this
.
getUserInfo2
();
this
.
asjbh
=
sessionStorage
.
getItem
(
"srcbarcode"
);
this
.
asjbh
=
sessionStorage
.
getItem
(
"srcbarcode"
);
...
@@ -369,7 +382,7 @@ export default {
...
@@ -369,7 +382,7 @@ export default {
* @param {*}
* @param {*}
* @return {*}
* @return {*}
*/
*/
Rdwc
()
{
Rdwc
()
{
console
.
log
(
"认定完成"
);
console
.
log
(
"认定完成"
);
let
qqid
=
sessionStorage
.
getItem
(
"qqid"
)
||
""
;
let
qqid
=
sessionStorage
.
getItem
(
"qqid"
)
||
""
;
...
@@ -396,7 +409,7 @@ export default {
...
@@ -396,7 +409,7 @@ export default {
* @param {*} code
* @param {*} code
* @return {*}
* @return {*}
*/
*/
judgeZw
(
code
)
{
judgeZw
(
code
)
{
console
.
log
(
code
);
console
.
log
(
code
);
switch
(
code
)
{
switch
(
code
)
{
case
1
:
case
1
:
...
@@ -462,7 +475,7 @@ export default {
...
@@ -462,7 +475,7 @@ export default {
}
}
}
}
},
},
beforeDestroy
()
{
beforeDestroy
()
{
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this
.
$bus
.
$off
(
"updateFinderSource"
);
this
.
$bus
.
$off
(
"updateFinderSource"
);
}
}
...
@@ -508,7 +521,7 @@ div {
...
@@ -508,7 +521,7 @@ div {
height
:
22px
;
height
:
22px
;
font-size
:
16px
;
font-size
:
16px
;
font-weight
:
bold
;
font-weight
:
bold
;
color
:
#00
ccb5
;
color
:
#00
b47a
;
line-height
:
22px
;
line-height
:
22px
;
margin-top
:
14px
;
margin-top
:
14px
;
}
}
...
...
src/views/cxyrd/QueryConfirm.vue
View file @
3b828447
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
:class=
"[
:class=
"[
reqParam.contrastCustomSearchReq.querytypes.includes(btn.value)
reqParam.contrastCustomSearchReq.querytypes.includes(btn.value)
? 'btn-active'
? 'btn-active'
: ''
,
: ''
]"
]"
>
>
{{
btn
.
name
}}
{{
btn
.
name
}}
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
:class=
"[
:class=
"[
reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value)
reqParam.contrastCustomSearchReq.queryclasss.includes(btn.value)
? 'btn-active'
? 'btn-active'
: ''
,
: ''
]"
]"
>
>
{{
btn
.
name
}}
{{
btn
.
name
}}
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
:class=
"[
:class=
"[
reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value)
reqParam.contrastCustomSearchReq.remoteflags.includes(btn.value)
? 'btn-active'
? 'btn-active'
: ''
,
: ''
]"
]"
>
>
{{
btn
.
name
}}
{{
btn
.
name
}}
...
@@ -141,7 +141,7 @@
...
@@ -141,7 +141,7 @@
:class=
"[
:class=
"[
reqParam.contrastCustomSearchReq.querystates.includes(btn.value)
reqParam.contrastCustomSearchReq.querystates.includes(btn.value)
? 'btn-active'
? 'btn-active'
: ''
,
: ''
]"
]"
>
>
{{
btn
.
name
}}
{{
btn
.
name
}}
...
@@ -316,7 +316,7 @@
...
@@ -316,7 +316,7 @@
</div>
</div>
<div
<div
v-else-if=
"scope.row.querytype === '2'"
v-else-if=
"scope.row.querytype === '2'"
style=
"color: #0
8bd9e
"
style=
"color: #0
0b47a
"
>
>
{{
scope
.
row
.
queryTypeName
}}
{{
scope
.
row
.
queryTypeName
}}
</div>
</div>
...
@@ -442,7 +442,7 @@ export default {
...
@@ -442,7 +442,7 @@ export default {
page
:
{
page
:
{
total
:
0
,
total
:
0
,
pageSize
:
10
,
pageSize
:
10
,
currPage
:
1
,
currPage
:
1
},
},
contrastCustomSearchReq
:
{
contrastCustomSearchReq
:
{
barcode
:
""
,
barcode
:
""
,
...
@@ -454,8 +454,8 @@ export default {
...
@@ -454,8 +454,8 @@ export default {
querytypes
:
[],
querytypes
:
[],
querystates
:
[],
querystates
:
[],
remoteflags
:
[],
remoteflags
:
[],
queryclasss
:
[]
,
queryclasss
:
[]
}
,
}
},
},
list
:
[],
list
:
[],
currentPage
:
5
,
currentPage
:
5
,
...
@@ -486,7 +486,7 @@ export default {
...
@@ -486,7 +486,7 @@ export default {
"queryclass"
,
"queryclass"
,
"affirmtime"
,
"affirmtime"
,
"requestdatetime"
,
"requestdatetime"
,
"userdesc"
,
"userdesc"
],
],
defaultTableProps
:
content
,
defaultTableProps
:
content
,
//标签数组
//标签数组
...
@@ -495,20 +495,20 @@ export default {
...
@@ -495,20 +495,20 @@ export default {
{
value
:
"2"
,
name
:
"正查"
,
type
:
"querytypes"
},
{
value
:
"2"
,
name
:
"正查"
,
type
:
"querytypes"
},
{
value
:
"1"
,
name
:
"倒查"
,
type
:
"querytypes"
},
{
value
:
"1"
,
name
:
"倒查"
,
type
:
"querytypes"
},
{
value
:
"0"
,
name
:
"查重"
,
type
:
"querytypes"
},
{
value
:
"0"
,
name
:
"查重"
,
type
:
"querytypes"
},
{
value
:
"3"
,
name
:
"串查"
,
type
:
"querytypes"
}
,
{
value
:
"3"
,
name
:
"串查"
,
type
:
"querytypes"
}
],
],
queryClassBtns
:
[
queryClassBtns
:
[
{
value
:
"1"
,
name
:
"最高"
,
type
:
"queryclasss"
},
{
value
:
"1"
,
name
:
"最高"
,
type
:
"queryclasss"
},
{
value
:
"2"
,
name
:
"高"
,
type
:
"queryclasss"
},
{
value
:
"2"
,
name
:
"高"
,
type
:
"queryclasss"
},
{
value
:
"3"
,
name
:
"中"
,
type
:
"queryclasss"
},
{
value
:
"3"
,
name
:
"中"
,
type
:
"queryclasss"
},
{
value
:
"4"
,
name
:
"低"
,
type
:
"queryclasss"
},
{
value
:
"4"
,
name
:
"低"
,
type
:
"queryclasss"
},
{
value
:
"5"
,
name
:
"最低"
,
type
:
"queryclasss"
}
,
{
value
:
"5"
,
name
:
"最低"
,
type
:
"queryclasss"
}
],
],
remoteFlagBtns
:
[
remoteFlagBtns
:
[
{
value
:
"0"
,
name
:
"本地查询"
,
type
:
"remoteflags"
},
{
value
:
"0"
,
name
:
"本地查询"
,
type
:
"remoteflags"
},
{
value
:
"0"
,
name
:
"远程查询"
,
type
:
"remoteflags"
},
{
value
:
"0"
,
name
:
"远程查询"
,
type
:
"remoteflags"
},
{
value
:
"0"
,
name
:
"城市"
,
type
:
"remoteflags"
},
{
value
:
"0"
,
name
:
"城市"
,
type
:
"remoteflags"
},
{
value
:
"0"
,
name
:
"国家库"
,
type
:
"remoteflags"
}
,
{
value
:
"0"
,
name
:
"国家库"
,
type
:
"remoteflags"
}
],
],
queryStateBtns
:
[
queryStateBtns
:
[
{
value
:
"0"
,
name
:
"等待比对"
,
type
:
"querystates"
},
{
value
:
"0"
,
name
:
"等待比对"
,
type
:
"querystates"
},
...
@@ -522,12 +522,12 @@ export default {
...
@@ -522,12 +522,12 @@ export default {
{
value
:
"29"
,
name
:
"复核出错"
,
type
:
"querystates"
},
{
value
:
"29"
,
name
:
"复核出错"
,
type
:
"querystates"
},
{
value
:
"99"
,
name
:
"标记删除"
,
type
:
"querystates"
},
{
value
:
"99"
,
name
:
"标记删除"
,
type
:
"querystates"
},
{
value
:
"-1"
,
name
:
"无效"
,
type
:
"querystates"
},
{
value
:
"-1"
,
name
:
"无效"
,
type
:
"querystates"
},
{
value
:
"-2"
,
name
:
"同步特征"
,
type
:
"querystates"
}
,
{
value
:
"-2"
,
name
:
"同步特征"
,
type
:
"querystates"
}
],
],
expanded
:
false
,
// 展开标志
expanded
:
false
,
// 展开标志
historyDialogVisible
:
false
,
historyDialogVisible
:
false
,
cxyrdWidth1
:
200
,
cxyrdWidth1
:
200
,
height
:
450
,
height
:
450
// cxyrdWidth1: sessionStorage.getItem('cxyrdWidth1'),
// cxyrdWidth1: sessionStorage.getItem('cxyrdWidth1'),
// height: sessionStorage.getItem('tableHeight')
// height: sessionStorage.getItem('tableHeight')
};
};
...
@@ -540,7 +540,7 @@ export default {
...
@@ -540,7 +540,7 @@ export default {
this
.
height
=
(
h1
*
w2
)
/
w1
;
this
.
height
=
(
h1
*
w2
)
/
w1
;
this
.
cxyrdWidth1
=
(
this
.
cxyrdWidth1
*
w2
)
/
w1
;
this
.
cxyrdWidth1
=
(
this
.
cxyrdWidth1
*
w2
)
/
w1
;
content
.
forEach
(
(
item
)
=>
{
content
.
forEach
(
item
=>
{
// console.log(item);
// console.log(item);
self
.
$set
(
item
,
"width"
,
(
item
.
width
*
w2
)
/
w1
);
self
.
$set
(
item
,
"width"
,
(
item
.
width
*
w2
)
/
w1
);
});
});
...
@@ -550,11 +550,11 @@ export default {
...
@@ -550,11 +550,11 @@ export default {
// 批量处理
// 批量处理
checkedProps
(
val
)
{
checkedProps
(
val
)
{
this
.
tableProps
=
this
.
defaultTableProps
.
filter
(
this
.
tableProps
=
this
.
defaultTableProps
.
filter
(
(
i
)
=>
val
.
indexOf
(
i
.
prop
)
>=
0
i
=>
val
.
indexOf
(
i
.
prop
)
>=
0
);
);
//挑选被选中的对象
//挑选被选中的对象
this
.
key
=
this
.
key
+
1
;
//为了保证table 每次都会重渲,这样做体验感更好,如果不为table设置key值的话,用户一旦选中了复选框选项,就是在原来table基础上添加删除每一列,页面就有跳动的感觉,体验感不好
this
.
key
=
this
.
key
+
1
;
//为了保证table 每次都会重渲,这样做体验感更好,如果不为table设置key值的话,用户一旦选中了复选框选项,就是在原来table基础上添加删除每一列,页面就有跳动的感觉,体验感不好
}
,
}
},
},
computed
:
{
computed
:
{
// 计算总页数
// 计算总页数
...
@@ -562,7 +562,7 @@ export default {
...
@@ -562,7 +562,7 @@ export default {
return
(
return
(
Math
.
floor
(
this
.
reqParam
.
page
.
total
/
this
.
reqParam
.
page
.
pageSize
)
+
1
Math
.
floor
(
this
.
reqParam
.
page
.
total
/
this
.
reqParam
.
page
.
pageSize
)
+
1
);
);
}
,
}
},
},
methods
:
{
methods
:
{
// 获取认定列表
// 获取认定列表
...
@@ -571,7 +571,7 @@ export default {
...
@@ -571,7 +571,7 @@ export default {
// console.info("请求===>", this.reqParam.contrastCustomSearchReq);
// console.info("请求===>", this.reqParam.contrastCustomSearchReq);
this
.
$axios
this
.
$axios
.
post
(
"/api/queryque/standardQid"
,
this
.
reqParam
)
.
post
(
"/api/queryque/standardQid"
,
this
.
reqParam
)
.
then
(
(
response
)
=>
{
.
then
(
response
=>
{
if
(
response
.
data
.
code
===
0
)
{
if
(
response
.
data
.
code
===
0
)
{
this
.
list
=
response
.
data
.
ret
.
list
;
this
.
list
=
response
.
data
.
ret
.
list
;
this
.
reqParam
.
page
.
total
=
response
.
data
.
ret
.
total
;
this
.
reqParam
.
page
.
total
=
response
.
data
.
ret
.
total
;
...
@@ -610,13 +610,13 @@ export default {
...
@@ -610,13 +610,13 @@ export default {
// 获取用户信息
// 获取用户信息
getUserInfo
(
val
)
{
getUserInfo
(
val
)
{
var
userInfo
=
[];
var
userInfo
=
[];
val
.
forEach
(
(
item
)
=>
{
val
.
forEach
(
item
=>
{
var
user
=
{};
var
user
=
{};
user
.
userid
=
item
.
userid
;
user
.
userid
=
item
.
userid
;
user
.
userdesc
=
item
.
userdesc
;
user
.
userdesc
=
item
.
userdesc
;
userInfo
.
push
(
user
);
userInfo
.
push
(
user
);
if
(
item
.
children
)
{
if
(
item
.
children
)
{
item
.
children
.
forEach
(
(
ite
)
=>
{
item
.
children
.
forEach
(
ite
=>
{
var
use
=
{};
var
use
=
{};
use
.
userid
=
ite
.
userid
;
use
.
userid
=
ite
.
userid
;
use
.
userdesc
=
ite
.
userdesc
;
use
.
userdesc
=
ite
.
userdesc
;
...
@@ -635,7 +635,7 @@ export default {
...
@@ -635,7 +635,7 @@ export default {
// 返回arr数组过滤后对结果,结果为一个数组 过滤条件是对象中的value值
// 返回arr数组过滤后对结果,结果为一个数组 过滤条件是对象中的value值
// 如果res中没有某个键,就设置这个键为1
// 如果res中没有某个键,就设置这个键为1
return
arr
.
filter
(
return
arr
.
filter
(
(
arr
)
=>
!
res
.
has
(
arr
.
username
)
&&
res
.
set
(
arr
.
username
,
arr
.
username
)
arr
=>
!
res
.
has
(
arr
.
username
)
&&
res
.
set
(
arr
.
username
,
arr
.
username
)
);
);
},
},
// 多条件查询 获取查询条件
// 多条件查询 获取查询条件
...
@@ -643,17 +643,17 @@ export default {
...
@@ -643,17 +643,17 @@ export default {
let
{
name
,
value
}
=
data
;
let
{
name
,
value
}
=
data
;
let
list
=
this
.
reqParam
.
contrastCustomSearchReq
[
type
];
let
list
=
this
.
reqParam
.
contrastCustomSearchReq
[
type
];
if
(
list
.
includes
(
value
))
{
if
(
list
.
includes
(
value
))
{
list
=
list
.
filter
(
(
item
)
=>
item
!==
value
);
list
=
list
.
filter
(
item
=>
item
!==
value
);
this
.
dynamicTags
=
this
.
dynamicTags
.
filter
(
this
.
dynamicTags
=
this
.
dynamicTags
.
filter
(
(
item
)
=>
item
.
value
!==
value
item
=>
item
.
value
!==
value
);
);
}
else
{
}
else
{
//点击优先级先清除优先级的按钮在添加
//点击优先级先清除优先级的按钮在添加
if
(
type
==
"queryclasss"
)
{
if
(
type
==
"queryclasss"
)
{
this
.
queryClassBtns
.
forEach
(
(
i
)
=>
{
this
.
queryClassBtns
.
forEach
(
i
=>
{
let
listIndex
=
list
.
findIndex
(
(
j
)
=>
j
==
i
.
value
);
let
listIndex
=
list
.
findIndex
(
j
=>
j
==
i
.
value
);
let
dynamicTagsIndex
=
this
.
dynamicTags
.
findIndex
(
let
dynamicTagsIndex
=
this
.
dynamicTags
.
findIndex
(
(
j
)
=>
j
.
name
==
i
.
name
j
=>
j
.
name
==
i
.
name
);
);
if
(
listIndex
>=
0
)
list
.
splice
(
listIndex
,
1
);
if
(
listIndex
>=
0
)
list
.
splice
(
listIndex
,
1
);
if
(
dynamicTagsIndex
>=
0
)
if
(
dynamicTagsIndex
>=
0
)
...
@@ -718,12 +718,12 @@ export default {
...
@@ -718,12 +718,12 @@ export default {
this
.
$confirm
(
"是否确定删除已选择的数据?"
,
"提示"
,
{
this
.
$confirm
(
"是否确定删除已选择的数据?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
,
type
:
"warning"
})
})
.
then
(()
=>
{
.
then
(()
=>
{
this
.
$axios
this
.
$axios
.
post
(
"/api/queryque/delete"
,
{
qqid
:
qqid
})
.
post
(
"/api/queryque/delete"
,
{
qqid
:
qqid
})
.
then
(
(
response
)
=>
{
.
then
(
response
=>
{
if
(
response
.
data
.
code
===
0
)
{
if
(
response
.
data
.
code
===
0
)
{
this
.
$message
.
success
(
"删除成功"
);
this
.
$message
.
success
(
"删除成功"
);
this
.
search
();
this
.
search
();
...
@@ -735,7 +735,7 @@ export default {
...
@@ -735,7 +735,7 @@ export default {
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
$message
({
this
.
$message
({
type
:
"info"
,
type
:
"info"
,
message
:
"已取消删除"
,
message
:
"已取消删除"
});
});
});
});
},
},
...
@@ -752,8 +752,8 @@ export default {
...
@@ -752,8 +752,8 @@ export default {
qqid
:
row
.
qqid
,
qqid
:
row
.
qqid
,
qid
:
row
.
qid
,
qid
:
row
.
qid
,
barcode
:
row
.
barcode
,
barcode
:
row
.
barcode
,
type
:
"father"
,
type
:
"father"
}
,
}
});
});
window
.
open
(
routeUrl
.
href
,
"_blank"
);
window
.
open
(
routeUrl
.
href
,
"_blank"
);
}
else
{
}
else
{
...
@@ -763,8 +763,8 @@ export default {
...
@@ -763,8 +763,8 @@ export default {
qqid
:
row
.
qqid
,
qqid
:
row
.
qqid
,
qid
:
row
.
qid
,
qid
:
row
.
qid
,
barcode
:
row
.
barcode
,
barcode
:
row
.
barcode
,
type
:
"son"
,
type
:
"son"
}
,
}
});
});
window
.
open
(
routeUrl
.
href
,
"_blank"
);
window
.
open
(
routeUrl
.
href
,
"_blank"
);
}
}
...
@@ -777,14 +777,14 @@ export default {
...
@@ -777,14 +777,14 @@ export default {
// 父级
// 父级
let
routeUrl
=
this
.
$router
.
resolve
({
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
"/confirm/TL"
,
path
:
"/confirm/TL"
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
"father"
}
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
"father"
}
});
});
window
.
open
(
routeUrl
.
href
,
"_blank"
);
window
.
open
(
routeUrl
.
href
,
"_blank"
);
}
else
{
}
else
{
// 子级
// 子级
let
routeUrl
=
this
.
$router
.
resolve
({
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
"/confirm/TL"
,
path
:
"/confirm/TL"
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
"son"
}
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
"son"
}
});
});
window
.
open
(
routeUrl
.
href
,
"_blank"
);
window
.
open
(
routeUrl
.
href
,
"_blank"
);
}
}
...
@@ -796,13 +796,13 @@ export default {
...
@@ -796,13 +796,13 @@ export default {
if
(
row
.
children
)
{
if
(
row
.
children
)
{
let
routeUrl
=
this
.
$router
.
resolve
({
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
"/confirm/LT"
,
path
:
"/confirm/LT"
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
"father"
}
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
"father"
}
});
});
window
.
open
(
routeUrl
.
href
,
"_blank"
);
window
.
open
(
routeUrl
.
href
,
"_blank"
);
}
else
{
}
else
{
let
routeUrl
=
this
.
$router
.
resolve
({
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
"/confirm/LT"
,
path
:
"/confirm/LT"
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
"son"
}
,
query
:
{
qid
:
row
.
qid
,
qqid
:
row
.
qqid
,
type
:
"son"
}
});
});
window
.
open
(
routeUrl
.
href
,
"_blank"
);
window
.
open
(
routeUrl
.
href
,
"_blank"
);
}
}
...
@@ -815,14 +815,14 @@ export default {
...
@@ -815,14 +815,14 @@ export default {
// 获取展开标志
// 获取展开标志
this
.
expanded
=
expanded
;
this
.
expanded
=
expanded
;
// 获取下标
// 获取下标
var
i
=
this
.
list
.
findIndex
(
(
table
)
=>
table
.
queryId
===
row
.
queryId
);
var
i
=
this
.
list
.
findIndex
(
table
=>
table
.
queryId
===
row
.
queryId
);
// var i = this.tableData.findIndex(table => table.id === row.id);
// var i = this.tableData.findIndex(table => table.id === row.id);
// console.log(i);
// console.log(i);
if
(
expanded
)
{
if
(
expanded
)
{
this
.
list
[
i
]
=
{
this
.
list
[
i
]
=
{
qid
:
row
.
qid
,
qid
:
row
.
qid
,
children
:
row
.
children
,
children
:
row
.
children
,
queryId
:
row
.
queryId
,
queryId
:
row
.
queryId
};
};
this
.
$forceUpdate
();
this
.
$forceUpdate
();
// console.info("展开时row数据", this.list[i]);
// console.info("展开时row数据", this.list[i]);
...
@@ -854,7 +854,7 @@ export default {
...
@@ -854,7 +854,7 @@ export default {
affirmtime
:
row
.
children
[
0
].
affirmtime
,
affirmtime
:
row
.
children
[
0
].
affirmtime
,
requestdatetime
:
row
.
children
[
0
].
requestdatetime
,
requestdatetime
:
row
.
children
[
0
].
requestdatetime
,
userdesc
:
row
.
children
[
0
].
userdesc
,
userdesc
:
row
.
children
[
0
].
userdesc
,
queryTypeName
:
row
.
children
[
0
].
queryTypeName
,
queryTypeName
:
row
.
children
[
0
].
queryTypeName
};
};
console
.
log
(
this
.
list
[
i
]);
console
.
log
(
this
.
list
[
i
]);
this
.
$forceUpdate
();
this
.
$forceUpdate
();
...
@@ -886,7 +886,7 @@ export default {
...
@@ -886,7 +886,7 @@ export default {
this
.
$message
.
error
(
"请选择需要复制条码号的数据!"
);
this
.
$message
.
error
(
"请选择需要复制条码号的数据!"
);
}
else
{
}
else
{
console
.
log
(
this
.
selectionData
);
console
.
log
(
this
.
selectionData
);
self
.
selectionData
.
forEach
(
(
item
)
=>
{
self
.
selectionData
.
forEach
(
item
=>
{
self
.
barcode
.
push
(
item
.
barcode
);
self
.
barcode
.
push
(
item
.
barcode
);
});
});
this
.
barcode
=
this
.
barcode
.
join
(
","
);
this
.
barcode
=
this
.
barcode
.
join
(
","
);
...
@@ -898,7 +898,7 @@ export default {
...
@@ -898,7 +898,7 @@ export default {
this
.
$message
({
this
.
$message
({
type
:
"success"
,
type
:
"success"
,
// message: "复制条码号:" + this.barcode + "成功!"
// message: "复制条码号:" + this.barcode + "成功!"
message
:
"已复制到剪切板"
,
message
:
"已复制到剪切板"
});
});
},
},
// 复制失败时的回调函数
// 复制失败时的回调函数
...
@@ -912,25 +912,24 @@ export default {
...
@@ -912,25 +912,24 @@ export default {
// console.info("选中", this.checkedProps);
// console.info("选中", this.checkedProps);
},
},
// 当期页发生变化
// 当期页发生变化
handleCurrPageChange
:
function
(
val
)
{
handleCurrPageChange
:
function
(
val
)
{
this
.
reqParam
.
page
.
currPage
=
val
;
this
.
reqParam
.
page
.
currPage
=
val
;
this
.
search
();
this
.
search
();
},
},
// 每页展示数量发生变化
// 每页展示数量发生变化
handleSizeChange
:
function
(
val
)
{
handleSizeChange
:
function
(
val
)
{
this
.
reqParam
.
page
.
pageSize
=
val
;
this
.
reqParam
.
page
.
pageSize
=
val
;
this
.
search
();
this
.
search
();
},
},
// 标签关闭 isTag:是否为标签点击
// 标签关闭 isTag:是否为标签点击
handleClose
(
tag
)
{
handleClose
(
tag
)
{
let
{
type
,
value
}
=
tag
;
let
{
type
,
value
}
=
tag
;
this
.
dynamicTags
=
this
.
dynamicTags
.
filter
(
this
.
dynamicTags
=
this
.
dynamicTags
.
filter
(
item
=>
item
.
value
!==
value
);
(
item
)
=>
item
.
value
!==
value
this
.
reqParam
.
contrastCustomSearchReq
[
type
]
=
this
.
reqParam
.
contrastCustomSearchReq
[
type
].
filter
(
item
=>
item
!==
value
);
);
this
.
reqParam
.
contrastCustomSearchReq
[
type
]
=
this
.
reqParam
.
contrastCustomSearchReq
[
type
].
filter
(
(
item
)
=>
item
!==
value
);
this
.
search
();
this
.
search
();
},
},
// 标签生成
// 标签生成
...
@@ -998,14 +997,14 @@ export default {
...
@@ -998,14 +997,14 @@ export default {
*/
*/
toggleSelection
(
rows
)
{
toggleSelection
(
rows
)
{
if
(
rows
)
{
if
(
rows
)
{
rows
.
forEach
(
(
row
)
=>
{
rows
.
forEach
(
row
=>
{
this
.
$refs
.
confirmTable
.
toggleRowSelection
(
row
);
this
.
$refs
.
confirmTable
.
toggleRowSelection
(
row
);
});
});
}
else
{
}
else
{
this
.
$refs
.
confirmTable
.
clearSelection
();
this
.
$refs
.
confirmTable
.
clearSelection
();
}
}
console
.
log
(
this
.
selectionData
);
console
.
log
(
this
.
selectionData
);
}
,
}
},
},
mounted
()
{
mounted
()
{
console
.
log
(
this
.
height
);
console
.
log
(
this
.
height
);
...
@@ -1019,7 +1018,7 @@ export default {
...
@@ -1019,7 +1018,7 @@ export default {
// this.height = h1 -h2 -h3
// this.height = h1 -h2 -h3
// console.log(this.height);
// console.log(this.height);
this
.
search
();
this
.
search
();
}
,
}
};
};
// 用户ID 下拉的数据
// 用户ID 下拉的数据
const
users
=
[{
username
:
"张三"
},
{
username
:
"李四"
},
{
username
:
"赵6"
}];
const
users
=
[{
username
:
"张三"
},
{
username
:
"李四"
},
{
username
:
"赵6"
}];
...
@@ -1034,7 +1033,7 @@ const content = [
...
@@ -1034,7 +1033,7 @@ const content = [
{
colume
:
"优先级"
,
prop
:
"queryclass"
,
width
:
100
},
{
colume
:
"优先级"
,
prop
:
"queryclass"
,
width
:
100
},
{
colume
:
"认定时间"
,
prop
:
"affirmtime"
,
width
:
200
},
{
colume
:
"认定时间"
,
prop
:
"affirmtime"
,
width
:
200
},
{
colume
:
"发送时间"
,
prop
:
"requestdatetime"
,
width
:
200
},
{
colume
:
"发送时间"
,
prop
:
"requestdatetime"
,
width
:
200
},
{
colume
:
"用户名"
,
prop
:
"username"
,
width
:
100
}
,
{
colume
:
"用户名"
,
prop
:
"username"
,
width
:
100
}
];
];
// 数据
// 数据
const
datas1
=
[
const
datas1
=
[
...
@@ -1109,7 +1108,7 @@ const datas1 = [
...
@@ -1109,7 +1108,7 @@ const datas1 = [
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>'
,
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>'
,
queryStateName
:
"正在复核"
,
queryStateName
:
"正在复核"
,
queryTypeName
:
"串案"
,
queryTypeName
:
"串案"
,
private
:
"0"
,
private
:
"0"
},
},
{
{
qid
:
21
,
qid
:
21
,
...
@@ -1146,7 +1145,7 @@ const datas1 = [
...
@@ -1146,7 +1145,7 @@ const datas1 = [
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>'
,
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>'
,
queryStateName
:
"认定出错"
,
queryStateName
:
"认定出错"
,
queryTypeName
:
"倒查"
,
queryTypeName
:
"倒查"
,
private
:
"0"
,
private
:
"0"
},
},
{
{
qid
:
21
,
qid
:
21
,
...
@@ -1183,9 +1182,9 @@ const datas1 = [
...
@@ -1183,9 +1182,9 @@ const datas1 = [
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>'
,
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>'
,
queryStateName
:
"复核出错"
,
queryStateName
:
"复核出错"
,
queryTypeName
:
"倒查"
,
queryTypeName
:
"倒查"
,
private
:
"0"
,
private
:
"0"
}
,
}
]
,
]
},
},
{
{
qid
:
23
,
qid
:
23
,
...
@@ -1223,7 +1222,7 @@ const datas1 = [
...
@@ -1223,7 +1222,7 @@ const datas1 = [
queryStateName
:
"正在复核"
,
queryStateName
:
"正在复核"
,
queryTypeName
:
"查重"
,
queryTypeName
:
"查重"
,
children
:
null
,
children
:
null
,
private
:
"0"
,
private
:
"0"
},
},
{
{
qid
:
8
,
qid
:
8
,
...
@@ -1297,18 +1296,18 @@ const datas1 = [
...
@@ -1297,18 +1296,18 @@ const datas1 = [
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>'
,
'<?xml version="1.0"?><TEXT>=#54*$!#11?$</TEXT><LOGICPSN>0000000000000111</LOGICPSN>'
,
queryStateName
:
"复核出错"
,
queryStateName
:
"复核出错"
,
queryTypeName
:
"倒查"
,
queryTypeName
:
"倒查"
,
private
:
"0"
,
private
:
"0"
}
,
}
],
],
private
:
"0"
,
private
:
"0"
}
,
}
];
];
const
setQueryClass
=
[
const
setQueryClass
=
[
{
queryclass
:
"1"
,
name
:
"最高"
},
{
queryclass
:
"1"
,
name
:
"最高"
},
{
queryclass
:
"2"
,
name
:
"高"
},
{
queryclass
:
"2"
,
name
:
"高"
},
{
queryclass
:
"3"
,
name
:
"中"
},
{
queryclass
:
"3"
,
name
:
"中"
},
{
queryclass
:
"4"
,
name
:
"低"
},
{
queryclass
:
"4"
,
name
:
"低"
},
{
queryclass
:
"5"
,
name
:
"最低"
}
,
{
queryclass
:
"5"
,
name
:
"最低"
}
];
];
</
script
>
</
script
>
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
...
...
src/views/drFPTX/Index.vue
View file @
3b828447
...
@@ -85,8 +85,8 @@
...
@@ -85,8 +85,8 @@
>
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
name
"
prop=
"
index
"
label=
"
文件名称
"
label=
"
内序
"
>
>
</el-table-column>
</el-table-column>
<!--
<el-table-column
label=
"条码号"
>
<!--
<el-table-column
label=
"条码号"
>
...
@@ -150,8 +150,8 @@
...
@@ -150,8 +150,8 @@
>
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
name
"
prop=
"
index
"
label=
"
文件名称
"
label=
"
内序
"
>
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
...
@@ -225,7 +225,7 @@
...
@@ -225,7 +225,7 @@
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
<div
v-if=
'scope.row.type==0'
v-if=
'scope.row.type==0'
style=
"color: #f
fa219
;"
style=
"color: #f
a9500
;"
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
<div
<div
v-if=
'scope.row.type==1'
v-if=
'scope.row.type==1'
...
@@ -233,7 +233,7 @@
...
@@ -233,7 +233,7 @@
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
<div
<div
v-if=
'scope.row.type==2'
v-if=
'scope.row.type==2'
style=
"color: #0
8BD9E
;"
style=
"color: #0
0b47a
;"
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
<div
<div
v-if=
'scope.row.type==3'
v-if=
'scope.row.type==3'
...
@@ -282,7 +282,7 @@
...
@@ -282,7 +282,7 @@
<el-table
<el-table
height=
"550"
height=
"550"
:data=
"selectArr"
:data=
"selectArr"
ref=
"
selection
"
ref=
"
dataTable
"
@
selection-change=
"checkRightAll"
@
selection-change=
"checkRightAll"
style=
"width: 100%"
style=
"width: 100%"
>
>
...
@@ -306,7 +306,7 @@
...
@@ -306,7 +306,7 @@
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
<div
v-if=
'scope.row.type==0'
v-if=
'scope.row.type==0'
style=
"color: #f
fa219
;"
style=
"color: #f
a9500
;"
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
<div
<div
v-if=
'scope.row.type==1'
v-if=
'scope.row.type==1'
...
@@ -314,7 +314,7 @@
...
@@ -314,7 +314,7 @@
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
<div
<div
v-if=
'scope.row.type==2'
v-if=
'scope.row.type==2'
style=
"color: #0
8BD9E
;"
style=
"color: #0
0b47a
;"
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
>
{{
scope
.
row
.
type
|
typeNum
}}
</div>
<div
<div
v-if=
'scope.row.type==3'
v-if=
'scope.row.type==3'
...
@@ -584,7 +584,6 @@ export default {
...
@@ -584,7 +584,6 @@ export default {
var
reader
=
new
FileReader
();
var
reader
=
new
FileReader
();
reader
.
readAsText
(
file
);
reader
.
readAsText
(
file
);
if
(
this
.
drlx
==
3
)
{
if
(
this
.
drlx
==
3
)
{
console
.
log
(
'333333'
)
that
.
action
=
'/api/upload/person'
that
.
action
=
'/api/upload/person'
reader
.
onload
=
function
()
{
reader
.
onload
=
function
()
{
const
reg
=
/\<ysxt_asjxgrybh
\>(
.*
?)
\<
\/
ysxt_asjxgrybh
\>
/
const
reg
=
/\<ysxt_asjxgrybh
\>(
.*
?)
\<
\/
ysxt_asjxgrybh
\>
/
...
@@ -592,7 +591,7 @@ export default {
...
@@ -592,7 +591,7 @@ export default {
that
.
$set
(
newlist
[
i
],
'barcode'
,
barcode
[
1
])
that
.
$set
(
newlist
[
i
],
'barcode'
,
barcode
[
1
])
}
}
}
else
if
(
this
.
drlx
==
6
)
{
}
else
if
(
this
.
drlx
==
6
)
{
that
.
action
=
'/api/upload/
person
'
that
.
action
=
'/api/upload/
case
'
reader
.
onload
=
function
()
{
reader
.
onload
=
function
()
{
const
reg
=
/\<ysxt_asjbh
\>(
.*
?)
\<
\/
ysxt_asjbh
\>
/
const
reg
=
/\<ysxt_asjbh
\>(
.*
?)
\<
\/
ysxt_asjbh
\>
/
let
barcode
=
this
.
result
.
match
(
reg
)
let
barcode
=
this
.
result
.
match
(
reg
)
...
@@ -813,12 +812,13 @@ export default {
...
@@ -813,12 +812,13 @@ export default {
this
.
nowSelectData
=
val
;
this
.
nowSelectData
=
val
;
},
},
checkRightAll
(
val
)
{
checkRightAll
(
val
)
{
console
.
log
(
'val'
,
val
)
console
.
log
(
'val
111
'
,
val
)
this
.
nowSelectRightData
=
val
;
this
.
nowSelectRightData
=
val
;
},
},
// 选中
// 选中
handelSelect
()
{
handelSelect
()
{
this
.
selectArr
=
this
.
handleConcatArr
(
this
.
selectArr
,
this
.
nowSelectData
)
this
.
selectArr
=
this
.
handleConcatArr
(
this
.
selectArr
,
this
.
nowSelectData
)
this
.
nowSelectRightData
=
this
.
selectArr
this
.
handleRemoveTabList
(
this
.
nowSelectData
,
this
.
datas
);
this
.
handleRemoveTabList
(
this
.
nowSelectData
,
this
.
datas
);
this
.
nowSelectData
=
[];
this
.
nowSelectData
=
[];
},
},
...
...
src/views/drFPTX/RAList.vue
View file @
3b828447
...
@@ -8,15 +8,18 @@
...
@@ -8,15 +8,18 @@
class=
'head'
class=
'head'
v-if=
"showType==1"
v-if=
"showType==1"
>
>
<el-radio-group
v-model=
"drlx"
>
<el-radio-group
<el-radio
:label=
"3"
>
人员
</el-radio>
v-model=
"dataType"
<el-radio
:label=
"6"
>
案件
</el-radio>
class=
"chooseType"
>
<el-radio
:label=
"1"
>
人员
</el-radio>
<el-radio
:label=
"2"
>
案件
</el-radio>
</el-radio-group>
</el-radio-group>
<div
class=
'search
tmh
'
>
<div
class=
'search
barcode
'
>
<div
class=
'item'
>
条码号:
</div>
<div
class=
'item'
>
条码号:
</div>
<el-input
<el-input
placeholder=
"请输入条码号"
placeholder=
"请输入条码号"
v-model=
"
tmh
"
v-model=
"
barcode
"
clearable
clearable
>
>
</el-input>
</el-input>
...
@@ -24,12 +27,11 @@
...
@@ -24,12 +27,11 @@
<div
class=
'search ljfk'
>
<div
class=
'search ljfk'
>
<div
class=
'item'
>
逻辑分库:
</div>
<div
class=
'item'
>
逻辑分库:
</div>
<el-select
<el-select
v-model=
"value"
v-model=
"logicDatabase"
clearable
placeholder=
"请选择逻辑分库"
placeholder=
"请选择逻辑分库"
>
>
<el-option
<el-option
v-for=
"item in options"
v-for=
"item in
logicDatabase
options"
:key=
"item.value"
:key=
"item.value"
:label=
"item.label"
:label=
"item.label"
:value=
"item.value"
:value=
"item.value"
...
@@ -37,11 +39,11 @@
...
@@ -37,11 +39,11 @@
</el-option>
</el-option>
</el-select>
</el-select>
</div>
</div>
<div
class=
'search
rwh
'
>
<div
class=
'search
taskNumber
'
>
<div
class=
'item'
>
任务号:
</div>
<div
class=
'item'
>
任务号:
</div>
<el-input
<el-input
placeholder=
"请输入任务号"
placeholder=
"请输入任务号"
v-model=
"
rwh
"
v-model=
"
taskNumber
"
clearable
clearable
>
>
</el-input>
</el-input>
...
@@ -49,12 +51,11 @@
...
@@ -49,12 +51,11 @@
<div
class=
'search rkzt'
>
<div
class=
'search rkzt'
>
<div
class=
'item'
>
入库状态:
</div>
<div
class=
'item'
>
入库状态:
</div>
<el-select
<el-select
v-model=
"value"
v-model=
"status"
clearable
placeholder=
"请选择入库状态"
placeholder=
"请选择入库状态"
>
>
<el-option
<el-option
v-for=
"item in options"
v-for=
"item in
status
options"
:key=
"item.value"
:key=
"item.value"
:label=
"item.label"
:label=
"item.label"
:value=
"item.value"
:value=
"item.value"
...
@@ -77,24 +78,38 @@
...
@@ -77,24 +78,38 @@
class=
'head'
class=
'head'
v-if=
"showType==2"
v-if=
"showType==2"
>
>
<div
class=
'search
tmh
'
>
<div
class=
'search
barcode
'
>
<div
class=
'item'
>
条码号:
</div>
<div
class=
'item'
>
条码号:
</div>
<el-input
<el-input
placeholder=
"请输入条码号"
placeholder=
"请输入条码号"
v-model=
"
tmh
"
v-model=
"
barcode
"
clearable
clearable
>
>
</el-input>
</el-input>
</div>
</div>
<div
class=
'search ljfk'
>
<div
class=
'search ljfk'
>
<div
class=
'item'
>
查询类型:
</div>
<el-select
v-model=
"queryType"
placeholder=
"请选择查询类型"
>
<el-option
v-for=
"item in queryTypeOptions"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<div
class=
'search ljfk'
>
<div
class=
'item'
>
逻辑分库:
</div>
<div
class=
'item'
>
逻辑分库:
</div>
<el-select
<el-select
v-model=
"value"
v-model=
"logicDatabase"
clearable
placeholder=
"请选择逻辑分库"
placeholder=
"请选择逻辑分库"
>
>
<el-option
<el-option
v-for=
"item in options"
v-for=
"item in
logicDatabase
options"
:key=
"item.value"
:key=
"item.value"
:label=
"item.label"
:label=
"item.label"
:value=
"item.value"
:value=
"item.value"
...
@@ -102,24 +117,23 @@
...
@@ -102,24 +117,23 @@
</el-option>
</el-option>
</el-select>
</el-select>
</div>
</div>
<
div
class=
'search rwh
'
>
<
!--
<div
class=
'search taskNumber
'
>
<div
class=
'item'
>
任务号:
</div>
<div
class=
'item'
>
任务号:
</div>
<el-input
<el-input
placeholder=
"请输入任务号"
placeholder=
"请输入任务号"
v-model=
"
rwh
"
v-model=
"
taskNumber
"
clearable
clearable
>
>
</el-input>
</el-input>
</div>
</div>
-->
<div
class=
'search rkzt'
>
<div
class=
'search rkzt'
>
<div
class=
'item'
>
入库状态:
</div>
<div
class=
'item'
>
入库状态:
</div>
<el-select
<el-select
v-model=
"value"
v-model=
"status"
clearable
placeholder=
"请选择入库状态"
placeholder=
"请选择入库状态"
>
>
<el-option
<el-option
v-for=
"item in options"
v-for=
"item in
status
options"
:key=
"item.value"
:key=
"item.value"
:label=
"item.label"
:label=
"item.label"
:value=
"item.value"
:value=
"item.value"
...
@@ -127,7 +141,7 @@
...
@@ -127,7 +141,7 @@
</el-option>
</el-option>
</el-select>
</el-select>
</div>
</div>
<div
class=
'search sjxz'
>
<
!--
<
div
class=
'search sjxz'
>
<div
class=
'item'
>
时间选择:
</div>
<div
class=
'item'
>
时间选择:
</div>
<el-date-picker
<el-date-picker
v-model=
"value1"
v-model=
"value1"
...
@@ -136,7 +150,7 @@
...
@@ -136,7 +150,7 @@
end-placeholder=
"结束日期"
end-placeholder=
"结束日期"
>
>
</el-date-picker>
</el-date-picker>
</div>
</div>
-->
</div>
</div>
<!-- 二 -->
<!-- 二 -->
<div
class=
"buttons"
>
<div
class=
"buttons"
>
...
@@ -150,7 +164,7 @@
...
@@ -150,7 +164,7 @@
</el-radio-group>
</el-radio-group>
</div>
</div>
<div
class=
'right'
>
<div
class=
'right'
>
<el-button>
筛选
</el-button>
<el-button
@
click=
'search'
>
筛选
</el-button>
</div>
</div>
</div>
</div>
...
@@ -204,14 +218,135 @@
...
@@ -204,14 +218,135 @@
>
清除
</el-link>
>
清除
</el-link>
</el-tag>
</el-tag>
<!-- 五 -->
<!-- 五 -->
<div
v-if=
"showType==1"
>
<el-table
max-height=
"500"
ref=
"multipleTable"
:data=
"tableDate1"
tooltip-effect=
"dark"
style=
"width: 100%"
row-key=
"sequenceNumber"
:tree-props=
"
{children: 'pcImportRecordGrandchildren', hasChildren: 'hasChildren'}"
@selection-change="handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"auto"
v-if=
"isSelected"
>
</el-table-column>
<el-table-column
prop=
"taskNumber"
label=
"任务号"
width=
"200"
>
</el-table-column>
<el-table-column
prop=
"fileName"
label=
"文件名"
width=
"300"
>
</el-table-column>
<el-table-column
prop=
"barcode"
label=
"人员编号/案事件编号"
width=
"300"
>
</el-table-column>
<el-table-column
prop=
"dataType"
label=
"类型"
width=
"auto"
>
</el-table-column>
<el-table-column
prop=
"logicDatabase"
label=
"逻辑分库"
width=
"auto"
>
</el-table-column>
<el-table-column
prop=
"status"
label=
"状态"
width=
"auto"
>
</el-table-column>
<el-table-column
fixed=
"right"
label=
"操作"
width=
"100"
>
<template
slot-scope=
"scope"
>
<div
class=
"ops"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"编辑"
placement=
"top"
:open-delay=
'500'
@
click=
"handleClick(scope.row)"
>
<div
class=
"icon bj"
@
click=
"handleClick(scope.row)"
>
<img
src=
"../../assets/img/qbryk/bj.svg"
alt=
""
>
</div>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"复制数据"
placement=
"top"
:open-delay=
'500'
>
<div
class=
"icon bz"
@
click=
'isShowFztmBtn(scope.row)'
>
<img
src=
"../../assets/img/qbryk/bz.svg"
alt=
""
>
</div>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"发查询"
placement=
"top"
:open-delay=
'500'
>
<div
class=
"icon look"
@
click=
"isShowFcxBtn1(scope.row)"
>
<img
src=
"../../assets/img/qbryk/search.svg"
alt=
""
>
</div>
</el-tooltip>
</div>
</
template
>
</el-table-column>
</el-table>
</div>
<el-table
<el-table
max-height=
"550"
v-if=
"showType==2"
max-height=
"500"
ref=
"multipleTable"
ref=
"multipleTable"
:data=
"tableDate"
:data=
"tableDate
2
"
tooltip-effect=
"dark"
tooltip-effect=
"dark"
style=
"width: 100%"
style=
"width: 100%"
row-key=
"sequenceNumber"
row-key=
"sequenceNumber"
:tree-props=
"
{children: '
pc
ImportRecordGrandchildren', hasChildren: 'hasChildren'}"
:tree-props=
"{children: '
affirm
ImportRecordGrandchildren', hasChildren: 'hasChildren'}"
@
selection-change=
"handleSelectionChange"
@
selection-change=
"handleSelectionChange"
>
>
<el-table-column
<el-table-column
...
@@ -233,19 +368,23 @@
...
@@ -233,19 +368,23 @@
>
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
barcod
e"
prop=
"
queryTyp
e"
label=
"
人员编号/案事件编号
"
label=
"
查询类型
"
width=
"
300
"
width=
"
auto
"
>
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
dataTyp
e"
prop=
"
barcod
e"
label=
"
类型
"
label=
"
人员编号/案事件编号
"
width=
"
auto
"
width=
"
300
"
>
>
<
template
slot-scope=
"scope"
>
<div>
{{
scope
.
row
.
srcBarcode
}}
</div>
<div>
{{
scope
.
row
.
destBarcode
}}
</div>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
dataTyp
e"
prop=
"
logicDatabas
e"
label=
"逻辑分库"
label=
"逻辑分库"
width=
"auto"
width=
"auto"
>
>
...
@@ -319,7 +458,6 @@
...
@@ -319,7 +458,6 @@
</div>
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<!-- 六 -->
<!-- 六 -->
<div
class=
"block"
>
<div
class=
"block"
>
...
@@ -375,16 +513,51 @@ export default {
...
@@ -375,16 +513,51 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
d
rlx
:
3
,
// 导入类型
d
ataType
:
1
,
// 导入类型
tmh
:
''
,
// 条码号
barcode
:
''
,
// 条码号
options
:
[{
logicDatabaseoptions
:
[{
// 逻辑库
value
:
'
选项
1'
,
value
:
'1'
,
label
:
'
黄金糕
'
label
:
'
人员逻辑库
'
}],
}],
value
:
''
,
// 逻辑库
statusoptions
:
[
value1
:
''
,
{
// 入库状态
rwh
:
''
,
// 任务号
value
:
'1'
,
showType
:
'1'
,
label
:
'成功'
},
{
value
:
'0'
,
label
:
'失败'
}
],
status
:
null
,
// 入库状态
logicDatabase
:
''
,
// 逻辑库
value1
:
''
,
// 时间
taskNumber
:
''
,
// 任务号
showType
:
'1'
,
// 1:人案 2:比中
queryType
:
''
,
// 比中类型
queryTypeOptions
:
[
{
// 比中类型
value
:
'0'
,
label
:
'查重'
},
{
value
:
'1'
,
label
:
'倒查'
},
{
value
:
'2'
,
label
:
'正查'
},
{
value
:
'3'
,
label
:
'串查'
},
],
tableDate1
:
[
],
// 人员列表数据
tableDate2
:
[
],
// 人员列表数据
...
@@ -407,27 +580,66 @@ export default {
...
@@ -407,27 +580,66 @@ export default {
checkboxQuery
:
[],
//滚动平面等筛选条件
checkboxQuery
:
[],
//滚动平面等筛选条件
}
}
},
},
tableDate
:
[
],
// 人员列表数据
multipleSelection
:
[],
// 表单选择项目
multipleSelection
:
[],
// 表单选择项目
isShowTip
:
false
,
//批量操作提示
isShowTip
:
false
,
//批量操作提示
selectionData
:
[],
selectionData
:
[],
};
};
},
},
watch
:
{
showType
(
newNum
,
oldNum
)
{
// ...
console
.
log
(
newNum
,
123
)
this
.
search
()
}
},
methods
:
{
methods
:
{
// 获取全部人员列表请求
// 获取全部人员列表请求
search
()
{
search
()
{
let
reqUrl
=
null
;
let
reqParam
=
null
;
if
(
this
.
showType
==
1
)
{
reqUrl
=
"/api/record/import/pc/search"
reqParam
=
{
taskNumber
:
""
,
// 任务号
dataType
:
null
,
// 人员or案件
status
:
null
,
// 状态
barcode
:
''
,
// 条码号
logicDatabase
:
''
,
// 逻辑分库
}
reqParam
.
taskNumber
=
this
.
taskNumber
reqParam
.
dataType
=
Number
(
this
.
dataType
)
// reqParam.status = Number(this.status)
reqParam
.
status
=
this
.
status
!=
null
?
Number
(
this
.
status
)
:
null
reqParam
.
barcode
=
this
.
barcode
reqParam
.
logicDatabase
=
this
.
logicDatabase
}
else
if
(
this
.
showType
==
2
)
{
// console.log('bizhong bizhong ')
reqUrl
=
"/api/record/import/affirm/search"
reqParam
=
{
status
:
null
,
// 状态
barcode
:
''
,
// 条码号
logicDatabase
:
''
,
// 逻辑分库
queryType
:
''
,
// 类型
}
reqParam
.
status
=
this
.
status
!=
null
?
Number
(
this
.
status
)
:
null
reqParam
.
barcode
=
this
.
barcode
reqParam
.
logicDatabase
=
this
.
logicDatabase
reqParam
.
queryType
=
this
.
queryType
}
// console.info("请求===>", this.reqParam);
// console.info("请求===>", this.reqParam);
this
.
$axios
this
.
$axios
.
get
(
"/api/record/import/pc/search"
)
.
post
(
reqUrl
,
reqParam
)
.
then
(
response
=>
{
.
then
(
response
=>
{
// console.info("查询结果===>", response);
// console.info("查询结果===>", response);
if
(
response
.
data
.
code
===
0
)
{
if
(
response
.
data
.
code
===
0
)
{
this
.
tableDate
=
response
.
data
.
ret
.
pcImportRecordChildren
;
if
(
this
.
showType
==
1
)
{
this
.
tableDate1
=
response
.
data
.
ret
.
pcImportRecordChildren
;
}
else
if
(
this
.
showType
==
2
)
{
this
.
tableDate2
=
response
.
data
.
ret
.
affirmImportRecordChildren
;
}
// this.reqParam.page.total = response.data.ret.total;
// this.reqParam.page.total = response.data.ret.total;
console
.
info
(
"查询结果===>"
,
this
.
tableDate
);
console
.
info
(
"查询结果===>"
,
this
.
tableDate
);
// this.userInfo = this.getUserInfo(this.tableDate);
}
else
{
}
else
{
this
.
$message
.
error
(
response
.
data
.
message
);
this
.
$message
.
error
(
response
.
data
.
message
);
}
}
...
@@ -628,9 +840,13 @@ export default {
...
@@ -628,9 +840,13 @@ export default {
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
}
}
.tmh
{
.chooseType
{
margin-top
:
3px
;
margin-right
:
24px
;
}
.barcode
{
//
margin-left
:
65px
;
//
margin-left
:
65px
;
margin-left
:
24px
;
//
margin-left
:
24px
;
.item
{
.item
{
width
:
60px
;
width
:
60px
;
font-size
:
14px
;
font-size
:
14px
;
...
@@ -661,7 +877,7 @@ export default {
...
@@ -661,7 +877,7 @@ export default {
height
:
32px
;
height
:
32px
;
}
}
}
}
.
rwh
{
.
taskNumber
{
margin-left
:
24px
;
margin-left
:
24px
;
.item
{
.item
{
width
:
80px
;
width
:
80px
;
...
@@ -722,11 +938,11 @@ export default {
...
@@ -722,11 +938,11 @@ export default {
/deep/.el-button
{
/deep/.el-button
{
width
:
72px
;
width
:
72px
;
height
:
32px
;
height
:
32px
;
background
:
#
ecedf1
;
background
:
#
055fe7
;
border-radius
:
4px
;
border-radius
:
4px
;
font-size
:
14px
;
font-size
:
14px
;
font-family
:
MicrosoftYaHei
;
font-family
:
MicrosoftYaHei
;
color
:
#
aeafb4
;
color
:
#
ffffff
;
line-height
:
22px
;
line-height
:
22px
;
}
}
}
}
...
...
vue.config.js
View file @
3b828447
...
@@ -8,13 +8,13 @@
...
@@ -8,13 +8,13 @@
*/
*/
const
path
=
require
(
"path"
);
const
path
=
require
(
"path"
);
// 引入等比适配插件
// 引入等比适配插件
const
px2rem
=
require
(
'postcss-px2rem'
)
const
px2rem
=
require
(
"postcss-px2rem"
);
// 配置基本大小
// 配置基本大小
const
postcss
=
px2rem
({
const
postcss
=
px2rem
({
// 基准大小 baseSize,需要和rem.js中相同
// 基准大小 baseSize,需要和rem.js中相同
remUnit
:
16
remUnit
:
16
})
})
;
// const CompressionPlugin = require('compression-webpack-plugin');
// const CompressionPlugin = require('compression-webpack-plugin');
// const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
// const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
...
@@ -97,7 +97,8 @@ module.exports = {
...
@@ -97,7 +97,8 @@ module.exports = {
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://47.92.225.109:5602",
target
:
"http://www.meetfood.cn:2390/"
,
// 湖南-线上
// target: "http://192.168.128.109:8765", // 湖南-王
target
:
"http://www.meetfood.cn:2390/"
,
// 湖南-线上
ws
:
true
,
ws
:
true
,
changeOrigin
:
true
,
changeOrigin
:
true
,
...
@@ -107,11 +108,20 @@ module.exports = {
...
@@ -107,11 +108,20 @@ module.exports = {
},
},
"/login"
:
{
"/login"
:
{
target
:
"http://47.92.226.24:3004/"
,
// 登录
target
:
"http://47.92.226.24:3004/"
,
// 登录
// target: "http://192.168.128.109:8765/", // 王
ws
:
true
,
ws
:
true
,
changeOrigin
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
pathRewrite
:
{
"^/login"
:
""
"^/login"
:
""
}
}
},
"/system"
:
{
target
:
"http://192.168.128.109:8765"
,
// 湖南-王
ws
:
true
,
changeOrigin
:
true
,
pathRewrite
:
{
"^/system"
:
""
}
}
}
// 阿里
// 阿里
// "/api": {
// "/api": {
...
@@ -127,9 +137,7 @@ module.exports = {
...
@@ -127,9 +137,7 @@ module.exports = {
css
:
{
css
:
{
loaderOptions
:
{
loaderOptions
:
{
postcss
:
{
postcss
:
{
plugins
:
[
plugins
:
[
postcss
]
postcss
]
}
}
},
},
sourceMap
:
process
.
env
.
NODE_ENV
===
"development"
?
true
:
false
// 在开发环境下开启 CSS sourcemaps
sourceMap
:
process
.
env
.
NODE_ENV
===
"development"
?
true
:
false
// 在开发环境下开启 CSS sourcemaps
...
...
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