Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
web
Project
Project
Details
Activity
Releases
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
中汽测评-信息安全测评系统
web
Commits
0a9da7db
Commit
0a9da7db
authored
May 13, 2024
by
jiaxu.yan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 检验内容库、我发起的任务、任务添加、任务编辑、任务详情、待办任务、已办任务、已归档任务
parent
c144859b
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
355 additions
and
188 deletions
+355
-188
new.js
src/api/task/new.js
+16
-0
standardOption.vue
src/components/Page/standardOption.vue
+4
-1
getters.js
src/store/getters.js
+1
-0
standard.js
src/store/modules/standard.js
+7
-2
index.vue
src/views/informationBase/viewStandardTerms/index.vue
+44
-17
index.vue
src/views/processing/archivedTask/index.vue
+25
-6
index.vue
src/views/processing/processed-review/index.vue
+25
-4
index.vue
src/views/processing/unprocessed-review/index.vue
+25
-5
index.vue
src/views/setting/standardTerms/index.vue
+44
-17
index.vue
src/views/system/user/index.vue
+11
-0
index.vue
src/views/task/edit/index.vue
+33
-24
index.vue
src/views/task/new/index.vue
+43
-39
index.vue
src/views/task/on/index.vue
+26
-4
index.vue
src/views/task/task-detail/index.vue
+51
-69
No files found.
src/api/task/new.js
View file @
0a9da7db
...
...
@@ -10,3 +10,19 @@ export function manufacturerData(data) {
data
})
}
/**
* 根据标准获取子任务类型
* @param {*} data
* @returns
*/
export
function
getByStandardId
(
data
)
{
return
request
({
url
:
'/standard/getByStandardId'
,
method
:
'post'
,
data
})
}
src/components/Page/standardOption.vue
View file @
0a9da7db
...
...
@@ -20,7 +20,7 @@ empty
<ul
class=
"select-list"
>
<template
v-for=
"item in standardList"
>
<li
@
click=
"selectStandard(item
.id
)"
@
click=
"selectStandard(item)"
:class=
"item.id === standard ? 'selected' : ''"
>
<el-tooltip
...
...
@@ -70,6 +70,9 @@ export default {
},
created
()
{
this
.
$store
.
dispatch
(
'standard/setStandardList'
)
if
(
this
.
standardList
.
length
>
0
)
{
this
.
selectStandard
(
this
.
standardList
[
0
])
}
},
computed
:
{
...
mapGetters
([
'standard'
,
'standardList'
])
...
...
src/store/getters.js
View file @
0a9da7db
...
...
@@ -18,6 +18,7 @@ const getters = {
sidebarRouters
:
state
=>
state
.
permission
.
sidebarRouters
,
companyFiles
:
state
=>
state
.
processing
.
companyFiles
,
standard
:
state
=>
state
.
standard
.
standard
,
standard_name
:
state
=>
state
.
standard
.
standard_name
,
standardList
:
state
=>
state
.
standard
.
standardList
,
testScenarioList
:
state
=>
state
.
testScenario
.
testScenarioList
,
dept
:
state
=>
state
.
user
.
dept
...
...
src/store/modules/standard.js
View file @
0a9da7db
...
...
@@ -3,6 +3,7 @@ const standard = {
namespaced
:
true
,
state
:
{
standard
:
''
,
standard_name
:
''
,
standardList
:
[]
},
...
...
@@ -12,12 +13,16 @@ const standard = {
},
SET_STANDARD_LIST
:
(
state
,
standardList
)
=>
{
state
.
standardList
=
standardList
}
},
SET_STANDARDNAME
:
(
state
,
standard
)
=>
{
state
.
standard_name
=
standard
},
},
actions
:
{
setStandard
({
commit
},
standard
)
{
commit
(
'SET_STANDARD'
,
standard
)
commit
(
'SET_STANDARD'
,
standard
.
id
)
commit
(
'SET_STANDARDNAME'
,
standard
.
name
)
},
setStandardList
({
commit
},
name
)
{
getStandardList
({
...
...
src/views/informationBase/viewStandardTerms/index.vue
View file @
0a9da7db
...
...
@@ -282,6 +282,7 @@ import page from '@/mixins/page'
import
vehicleModelDialog
from
'./components/vehicleModelDialog'
import
documentReviewDialog
from
'./components/documentReviewDialog'
import
request
from
'@/utils/request'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
components
:
{
'vehiclemodel-dialog'
:
vehicleModelDialog
,
...
...
@@ -294,20 +295,7 @@ export default {
listUrl
:
'/review/standard/list'
,
totalTest
:
0
,
tableTestData
:
[],
reviewTypeList
:
[
{
label
:
'体系审查'
,
value
:
'system'
},
{
label
:
'车型审查'
,
value
:
'car'
},
{
label
:
'车型试验'
,
value
:
'test'
}
],
reviewTypeList
:
[],
showSearch
:
true
,
tableData
:
[],
queryParams
:
{
...
...
@@ -353,7 +341,7 @@ export default {
'$store.getters.standard'
:
{
handler
(
newVal
,
oldVal
)
{
this
.
queryParams
.
standardId
=
newVal
this
.
loadData
(
)
this
.
getTaskType
(
newVal
)
}
},
refreshList
(
val
)
{
...
...
@@ -369,9 +357,48 @@ export default {
}
}
},
created
()
{
this
.
getTaskType
(
this
.
$store
.
getters
.
standard
)
},
methods
:
{
getTaskType
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
reviewTypeList
=
response
.
rows
.
map
(
i
=>
{
if
(
i
.
dictValue
===
'sraif'
)
{
return
{
label
:
'体系审查'
,
value
:
'system'
}
}
else
if
(
i
.
dictValue
===
'grfis'
)
{
return
{
label
:
'车型审查'
,
value
:
'car'
}
}
else
{
return
{
label
:
'车型试验'
,
value
:
'test'
}
}
})
if
(
this
.
reviewTypeList
.
length
)
{
this
.
queryParams
.
type
=
this
.
reviewTypeList
[
0
].
value
if
(
this
.
queryParams
.
type
===
'test'
)
{
this
.
queryParamsTest
.
pageNum
=
1
this
.
loadTestData
()
}
else
{
this
.
queryParams
.
pageNum
=
1
this
.
loadData
()
}
}
})
},
handleTab
(
v
)
{
if
(
v
.
index
===
'2'
)
{
console
.
log
(
v
)
if
(
v
.
name
===
'test'
)
{
this
.
queryParamsTest
.
pageNum
=
1
this
.
loadTestData
()
}
else
{
...
...
@@ -434,7 +461,7 @@ export default {
offset
:
this
.
queryParamsTest
.
offset
,
searchFields
:
this
.
queryParamsTest
.
searchFields
,
orderBy
:
this
.
queryParamsTest
.
orderBy
,
name
:
'汽车整车信息安全技术要求'
name
:
this
.
$store
.
getters
.
standard_name
}
this
.
loading
=
true
request
({
...
...
src/views/processing/archivedTask/index.vue
View file @
0a9da7db
...
...
@@ -48,10 +48,10 @@
clearable
>
<el-option
v-for=
"dict in
dict.type.inspection_item
"
:key=
"dict.
v
alue"
:label=
"dict.
l
abel"
:value=
"dict.
v
alue"
v-for=
"dict in
taskTypeList
"
:key=
"dict.
dictV
alue"
:label=
"dict.
dictL
abel"
:value=
"dict.
dictV
alue"
/>
</el-select>
</el-form-item>
...
...
@@ -259,12 +259,14 @@
import
page
from
'@/mixins/page'
import
{
pdfDownload
}
from
'@/api/task/task'
import
{
mapGetters
}
from
'vuex'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
dicts
:
[
'sys_scene_type'
,
'task_type'
,
'inspection_item'
],
mixins
:
[
page
],
data
()
{
return
{
listUrl
:
'/task/findFinish'
,
taskTypeList
:
[],
showSearch
:
true
,
tableData
:
[]
}
...
...
@@ -273,12 +275,29 @@ export default {
computed
:
{
...
mapGetters
([
'userId'
,
'standardList'
])
},
watch
:
{},
watch
:
{
// 监控标准修改
'queryParams.standardId'
:
{
handler
(
newValue
,
oldValue
)
{
this
.
taskTypeList
=
[]
if
(
newValue
)
{
this
.
getTaskType
(
newValue
)
}
}
}
},
created
()
{
this
.
$store
.
dispatch
(
'standard/setStandardList'
)
},
methods
:
{
getTaskType
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
taskTypeList
=
response
.
rows
})
},
/* 跳转到问卷详情*/
goNext
(
url
)
{
this
.
$router
.
push
({
path
:
url
})
...
...
src/views/processing/processed-review/index.vue
View file @
0a9da7db
...
...
@@ -48,10 +48,10 @@
clearable
>
<el-option
v-for=
"dict in
dict.type.inspection_item
"
:key=
"dict.
v
alue"
:label=
"dict.
l
abel"
:value=
"dict.
v
alue"
v-for=
"dict in
taskTypeList
"
:key=
"dict.
dictV
alue"
:label=
"dict.
dictL
abel"
:value=
"dict.
dictV
alue"
/>
</el-select>
</el-form-item>
...
...
@@ -234,11 +234,13 @@
import
page
from
'@/mixins/page'
import
{
mapGetters
}
from
'vuex'
import
{
pdfDownload
}
from
'@/api/task/task'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
mixins
:
[
page
],
dicts
:
[
'inspection_item'
],
data
()
{
return
{
taskTypeList
:
[],
listUrl
:
'/task/findUserFinish'
,
showSearch
:
true
,
tableData
:
[]
...
...
@@ -247,10 +249,29 @@ export default {
computed
:
{
...
mapGetters
([
'userId'
,
'standardList'
])
},
watch
:
{
// 监控标准修改
'queryParams.standardId'
:
{
handler
(
newValue
,
oldValue
)
{
this
.
taskTypeList
=
[]
if
(
newValue
)
{
this
.
getTaskType
(
newValue
)
}
}
}
},
created
()
{
this
.
$store
.
dispatch
(
'standard/setStandardList'
)
},
methods
:
{
getTaskType
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
taskTypeList
=
response
.
rows
})
},
/**
* 检验报告
*/
...
...
src/views/processing/unprocessed-review/index.vue
View file @
0a9da7db
...
...
@@ -48,10 +48,10 @@
clearable
>
<el-option
v-for=
"dict in
dict.type.inspection_item
"
:key=
"dict.
v
alue"
:label=
"dict.
l
abel"
:value=
"dict.
v
alue"
v-for=
"dict in
taskTypeList
"
:key=
"dict.
dictV
alue"
:label=
"dict.
dictL
abel"
:value=
"dict.
dictV
alue"
/>
</el-select>
</el-form-item>
...
...
@@ -408,7 +408,7 @@ import {
getScenarioList
,
reviewTaskStart
}
from
'@/api/task/task'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
dicts
:
[
'inspection_item'
,
...
...
@@ -423,6 +423,7 @@ export default {
mixins
:
[
page
],
data
()
{
return
{
taskTypeList
:
[],
// 子任务内容跳转文字map
dialogManager
:
{
dialogVisible
:
false
,
...
...
@@ -444,10 +445,29 @@ export default {
computed
:
{
...
mapGetters
([
'userId'
,
'standardList'
])
},
watch
:
{
// 监控标准修改
'queryParams.standardId'
:
{
handler
(
newValue
,
oldValue
)
{
this
.
taskTypeList
=
[]
if
(
newValue
)
{
this
.
getTaskType
(
newValue
)
}
}
}
},
created
()
{
this
.
$store
.
dispatch
(
'standard/setStandardList'
)
},
methods
:
{
getTaskType
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
taskTypeList
=
response
.
rows
})
},
/**
* 企业留档文件
* @param item 对象
...
...
src/views/setting/standardTerms/index.vue
View file @
0a9da7db
...
...
@@ -282,6 +282,7 @@ import page from '@/mixins/page'
import
vehicleModelDialog
from
'./components/vehicleModelDialog'
import
documentReviewDialog
from
'./components/documentReviewDialog'
import
request
from
'@/utils/request'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
components
:
{
'vehiclemodel-dialog'
:
vehicleModelDialog
,
...
...
@@ -294,20 +295,7 @@ export default {
listUrl
:
'/review/standard/list'
,
totalTest
:
0
,
tableTestData
:
[],
reviewTypeList
:
[
{
label
:
'体系审查'
,
value
:
'system'
},
{
label
:
'车型审查'
,
value
:
'car'
},
{
label
:
'车型试验'
,
value
:
'test'
}
],
reviewTypeList
:
[],
showSearch
:
true
,
tableData
:
[],
queryParams
:
{
...
...
@@ -353,7 +341,7 @@ export default {
'$store.getters.standard'
:
{
handler
(
newVal
,
oldVal
)
{
this
.
queryParams
.
standardId
=
newVal
this
.
loadData
(
)
this
.
getTaskType
(
newVal
)
}
},
refreshList
(
val
)
{
...
...
@@ -369,9 +357,48 @@ export default {
}
}
},
created
()
{
this
.
getTaskType
(
this
.
$store
.
getters
.
standard
)
},
methods
:
{
getTaskType
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
reviewTypeList
=
response
.
rows
.
map
(
i
=>
{
if
(
i
.
dictValue
===
'sraif'
)
{
return
{
label
:
'体系审查'
,
value
:
'system'
}
}
else
if
(
i
.
dictValue
===
'grfis'
)
{
return
{
label
:
'车型审查'
,
value
:
'car'
}
}
else
{
return
{
label
:
'车型试验'
,
value
:
'test'
}
}
})
if
(
this
.
reviewTypeList
.
length
)
{
this
.
queryParams
.
type
=
this
.
reviewTypeList
[
0
].
value
if
(
this
.
queryParams
.
type
===
'test'
)
{
this
.
queryParamsTest
.
pageNum
=
1
this
.
loadTestData
()
}
else
{
this
.
queryParams
.
pageNum
=
1
this
.
loadData
()
}
}
})
},
handleTab
(
v
)
{
if
(
v
.
index
===
'2'
)
{
console
.
log
(
v
)
if
(
v
.
name
===
'test'
)
{
this
.
queryParamsTest
.
pageNum
=
1
this
.
loadTestData
()
}
else
{
...
...
@@ -434,7 +461,7 @@ export default {
offset
:
this
.
queryParamsTest
.
offset
,
searchFields
:
this
.
queryParamsTest
.
searchFields
,
orderBy
:
this
.
queryParamsTest
.
orderBy
,
name
:
'汽车整车信息安全技术要求'
name
:
this
.
$store
.
getters
.
standard_name
}
this
.
loading
=
true
request
({
...
...
src/views/system/user/index.vue
View file @
0a9da7db
...
...
@@ -449,6 +449,14 @@
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
label=
"签字图片"
prop=
"signaturePicture"
>
<ImageUpload
v-model=
"form.signaturePicture"
:limit=
"1"
></ImageUpload>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
...
...
@@ -622,6 +630,9 @@ export default {
trigger
:
[
'blur'
,
'change'
]
}
],
signaturePicture
:
[
{
required
:
true
,
message
:
'请上传签字图片'
,
trigger
:
'blur'
}
],
phonenumber
:
[
{
pattern
:
/^1
[
3|4|5|6|7|8|9
][
0-9
]\d{8}
$/
,
...
...
src/views/task/edit/index.vue
View file @
0a9da7db
...
...
@@ -17,6 +17,7 @@
v-model=
"model.standardId"
style=
"width: 100%"
clearable
@
change=
"changeStandard"
>
<el-option
v-for=
"(item, key) in standardList"
...
...
@@ -28,7 +29,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row
v-show=
"model.standardId
=== '1'
"
:gutter=
"20"
>
<el-row
v-show=
"model.standardId"
:gutter=
"20"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"检验项目(可多选)"
prop=
"inspectionItemList"
>
<div
class=
"test-scenario-container"
>
...
...
@@ -346,7 +347,7 @@ import {
import
{
mapGetters
}
from
'vuex'
import
{
getDicts
}
from
'@/api/system/dict/data'
import
DocumentInfo
from
'@/views/task/new/components/DocumentInfo.vue'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
dicts
:
[
'sys_task_status'
,
...
...
@@ -446,14 +447,14 @@ export default {
tableData
:
[],
inspectionItemList
:
[],
rules
:
{
testScenarioList
:
[
{
type
:
'array'
,
required
:
true
,
message
:
'请至少选择一个测试场景'
,
trigger
:
'change'
}
],
//
testScenarioList: [
//
{
//
type: 'array',
//
required: true,
//
message: '请至少选择一个测试场景',
//
trigger: 'change'
//
}
//
],
inspectionItemList
:
[
{
type
:
'array'
,
...
...
@@ -629,6 +630,13 @@ export default {
...
mapGetters
([
'standard'
,
'standardList'
,
'testScenarioList'
])
},
methods
:
{
changeStandard
(
e
)
{
this
.
taskDetail
.
taskList
=
[]
this
.
getInspectionItemDict
(
e
)
this
.
$nextTick
(()
=>
{
this
.
$refs
.
form
.
clearValidate
()
})
},
handleDocumentInfoChange
(
value
)
{
this
.
documentInfoArr
=
value
},
...
...
@@ -640,12 +648,7 @@ export default {
this
.
model
.
standardId
=
this
.
taskDetail
.
standardId
this
.
taskDetail
.
taskList
=
this
.
taskDetail
.
taskList
.
split
(
','
)
this
.
model
.
inspectionItemList
=
this
.
taskDetail
.
taskList
this
.
inspectionItemList
.
forEach
(
item
=>
{
if
(
this
.
taskDetail
.
taskList
.
includes
(
item
.
value
))
{
item
.
check
=
true
}
})
console
.
log
(
'检验项目'
,
this
.
inspectionItemList
)
this
.
getInspectionItemDict
(
this
.
taskDetail
.
standardId
)
// 把detail转到model里(任务信息)
for
(
const
key
in
this
.
taskDetail
)
{
// eslint-disable-next-line no-prototype-builtins
...
...
@@ -712,9 +715,13 @@ export default {
return
obj
.
value
})
},
getInspectionItemDict
()
{
getDicts
(
'inspection_item'
).
then
(
response
=>
{
this
.
inspectionItemList
=
response
.
data
.
map
(
getInspectionItemDict
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
inspectionItemList
=
[]
this
.
inspectionItemList
=
response
.
rows
.
map
(
({
dictValue
,
dictLabel
,
...
rest
})
=>
({
label
:
dictLabel
,
value
:
dictValue
,
...
...
@@ -722,14 +729,15 @@ export default {
...
rest
})
)
console
.
log
(
'aaa'
,
this
.
inspectionItemList
)
this
.
inspectionItemList
.
forEach
(
item
=>
{
if
(
this
.
taskDetail
.
taskList
.
includes
(
item
.
value
))
{
item
.
check
=
true
}
})
// 当编辑时
this
.
taskId
=
this
.
$route
.
query
.
taskId
if
(
this
.
taskId
!==
undefined
)
{
// this.$route.meta.title = '编辑任务'
this
.
getTaskDetail
(
this
.
taskId
)
this
.
rules
.
inspectionItemList
[
0
].
required
=
false
this
.
rules
.
testScenarioList
[
0
].
required
=
false
}
else
{
this
.
getTemporaryStorage
()
}
...
...
@@ -802,7 +810,8 @@ export default {
return
{
...
obj
,
disabled
:
false
}
})
console
.
log
(
'this.userList-1'
,
this
.
userList
)
this
.
getInspectionItemDict
()
this
.
taskId
=
this
.
$route
.
query
.
taskId
this
.
getTaskDetail
(
this
.
taskId
)
})
},
handleCarsChange
(
cards
)
{
...
...
src/views/task/new/index.vue
View file @
0a9da7db
...
...
@@ -24,7 +24,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row
v-show=
"model.standardId
=== '1'
"
:gutter=
"20"
>
<el-row
v-show=
"model.standardId"
:gutter=
"20"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"检验项目(可多选)"
prop=
"inspectionItemList"
>
<div
class=
"test-scenario-container"
>
...
...
@@ -345,7 +345,7 @@ import {
import
{
mapGetters
}
from
'vuex'
import
{
getDicts
}
from
'@/api/system/dict/data'
import
DocumentInfo
from
'@/views/task/new/components/DocumentInfo.vue'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
dicts
:
[
'sys_task_status'
,
...
...
@@ -426,7 +426,6 @@ export default {
websock
:
null
,
testScenarioShow
:
false
,
userId
:
''
,
standardId
:
'1'
,
showTestScenario
:
false
,
// 新增/保存 - 对象
model
:
{
...
...
@@ -586,6 +585,18 @@ export default {
}
}
},
// 监控标准修改
'model.standardId'
:
{
handler
(
newValue
,
oldValue
)
{
if
(
newValue
)
{
this
.
model
.
inspectionItemList
=
[]
this
.
getTaskType
(
newValue
)
this
.
$nextTick
(()
=>
{
this
.
$refs
.
form
.
clearValidate
()
})
}
}
},
'model.inspectionItemList'
:
{
handler
(
newValue
,
oldValue
)
{
console
.
log
(
'bne'
,
newValue
)
...
...
@@ -611,7 +622,7 @@ export default {
// this.rules.testScenarioList[0].required = false
// }
}
}
,
}
// 'model.testScenarioList': {
// handler(newValue, oldValue) {
// if (newValue.length > 0) {
...
...
@@ -621,16 +632,6 @@ export default {
// }
// }
// },
standardId
:
{
handler
(
newValue
,
oldValue
)
{
console
.
log
(
'standardId'
,
newValue
)
if
(
newValue
===
'1'
)
{
this
.
standardId
=
'1'
}
else
if
(
newValue
===
'2'
)
{
this
.
standardId
=
'2'
}
}
}
},
created
()
{
// this.$store.dispatch('testScenario/setTestScenarioList')
...
...
@@ -652,6 +653,34 @@ export default {
// this.websock.close() // 离开路由之后断开websocket连接
// },
methods
:
{
getTaskType
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
inspectionItemList
=
[]
this
.
inspectionItemList
=
response
.
rows
.
map
(
({
dictValue
,
dictLabel
,
...
rest
})
=>
({
label
:
dictLabel
,
value
:
dictValue
,
check
:
false
,
...
rest
})
)
console
.
log
(
'aaa'
,
this
.
inspectionItemList
)
// 当编辑时
this
.
taskId
=
this
.
$route
.
query
.
taskId
if
(
this
.
taskId
!==
undefined
)
{
// this.$route.meta.title = '编辑任务'
this
.
getTaskDetail
(
this
.
taskId
)
this
.
rules
.
inspectionItemList
[
0
].
required
=
false
this
.
rules
.
testScenarioList
[
0
].
required
=
false
}
else
{
// this.$route.meta.title = '发起新任务'
this
.
getTemporaryStorage
()
}
})
},
getTaskDetail
(
taskId
)
{
getTaskById
({
id
:
taskId
}).
then
(
response
=>
{
console
.
log
(
'response'
,
response
)
...
...
@@ -718,30 +747,6 @@ export default {
return
obj
.
value
})
},
getInspectionItemDict
()
{
getDicts
(
'inspection_item'
).
then
(
response
=>
{
this
.
inspectionItemList
=
response
.
data
.
map
(
({
dictValue
,
dictLabel
,
...
rest
})
=>
({
label
:
dictLabel
,
value
:
dictValue
,
check
:
false
,
...
rest
})
)
console
.
log
(
'aaa'
,
this
.
inspectionItemList
)
// 当编辑时
this
.
taskId
=
this
.
$route
.
query
.
taskId
if
(
this
.
taskId
!==
undefined
)
{
// this.$route.meta.title = '编辑任务'
this
.
getTaskDetail
(
this
.
taskId
)
this
.
rules
.
inspectionItemList
[
0
].
required
=
false
this
.
rules
.
testScenarioList
[
0
].
required
=
false
}
else
{
// this.$route.meta.title = '发起新任务'
this
.
getTemporaryStorage
()
}
})
},
// 查看是否有暂存数据
getTemporaryStorage
()
{
getTemporaryStorage
().
then
(
response
=>
{
...
...
@@ -822,7 +827,6 @@ export default {
return
{
...
obj
,
disabled
:
false
}
})
console
.
log
(
'this.userList-1'
,
this
.
userList
)
this
.
getInspectionItemDict
()
})
},
handleCarsChange
(
cards
)
{
...
...
src/views/task/on/index.vue
View file @
0a9da7db
...
...
@@ -59,10 +59,10 @@
clearable
>
<el-option
v-for=
"dict in
dict.type.inspection_item
"
:key=
"dict.
v
alue"
:label=
"dict.
l
abel"
:value=
"dict.
v
alue"
v-for=
"dict in
taskTypeList
"
:key=
"dict.
dictV
alue"
:label=
"dict.
dictL
abel"
:value=
"dict.
dictV
alue"
/>
</el-select>
</el-form-item>
...
...
@@ -512,6 +512,7 @@ import { getHourDiff } from '@/utils/diff'
import
{
mapGetters
}
from
'vuex'
import
{
reviewTaskStart
,
pdfDownload
,
removeTask
}
from
'@/api/task/task'
import
request
from
'@/utils/request'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
dicts
:
[
'inspection_item'
,
...
...
@@ -543,6 +544,7 @@ export default {
value
:
'FINISH'
}
],
taskTypeList
:
[],
// 子任务内容跳转文字map
dialogVisible
:
false
,
listUrl
:
'/task/findCreate'
,
...
...
@@ -561,10 +563,30 @@ export default {
computed
:
{
...
mapGetters
([
'userId'
,
'standardList'
])
},
watch
:
{
// 监控标准修改
'queryParams.standardId'
:
{
handler
(
newValue
,
oldValue
)
{
this
.
taskTypeList
=
[]
if
(
newValue
)
{
this
.
getTaskType
(
newValue
)
}
}
}
},
created
()
{
this
.
$store
.
dispatch
(
'standard/setStandardList'
)
},
methods
:
{
getTaskType
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
taskTypeList
=
response
.
rows
})
},
/**
* 下载pdf
*/
...
...
src/views/task/task-detail/index.vue
View file @
0a9da7db
...
...
@@ -50,7 +50,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row
v-show=
"model.formType === '1'"
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"检验项目(可多选)"
prop=
"inspectionItemList"
>
<div
class=
"test-scenario-container"
>
...
...
@@ -68,7 +68,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row
v-show=
"testScenarioShow"
:gutter=
"20"
>
<
!--
<
el-row
v-show=
"testScenarioShow"
:gutter=
"20"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"请选择测试场景(可多选)"
...
...
@@ -88,7 +88,7 @@
</div>
</el-form-item>
</el-col>
</el-row>
</el-row>
-->
<el-row
:gutter=
"20"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"任务编号"
prop=
"taskNo"
>
...
...
@@ -275,6 +275,7 @@ import { createTask, getTaskById } from '@/api/task/task'
import
{
mapGetters
}
from
'vuex'
import
{
getDicts
}
from
'@/api/system/dict/data'
import
DocumentInfo
from
'@/views/task/new/components/DocumentInfo.vue'
import
{
getByStandardId
}
from
'@/api/task/new'
export
default
{
dicts
:
[
'sys_task_status'
,
...
...
@@ -371,16 +372,7 @@ export default {
// 小组成员回显数据
tableData
:
[],
inspectionItemList
:
[],
// testScenarioList: [],
rules
:
{
// testScenarioList: [
// {
// type: 'array',
// required: true,
// message: '请至少选择一个测试场景',
// trigger: 'change'
// }
// ],
inspectionItemList
:
[
{
type
:
'array'
,
...
...
@@ -504,44 +496,34 @@ export default {
this
.
$refs
.
form
.
validateField
(
'inspectionItemList'
)
}
console
.
log
(
'aaaa'
,
newValue
)
// if (
// (newValue.length === 1 && newValue.includes('trfis')) ||
// (newValue.length === 2 &&
// newValue.includes('trfis') &&
// newValue.includes('sraif'))
// ) {
// this.rules.testScenarioList[0].required = true
// this.testScenarioShow = true
// } else {
// this.testScenarioShow = false
// this.rules.testScenarioList[0].required = false
// }
}
},
'model.testScenarioList'
:
{
handler
(
newValue
,
oldValue
)
{
if
(
newValue
.
length
>
0
)
{
this
.
$refs
.
form
.
clearValidate
(
'testScenarioList'
)
}
else
{
this
.
$refs
.
form
.
validateField
(
'testScenarioList'
)
}
}
},
formType
:
{
handler
(
newValue
,
oldValue
)
{
console
.
log
(
'formType'
,
newValue
)
if
(
newValue
===
'1'
)
{
this
.
formType
=
'1'
}
else
if
(
newValue
===
'2'
)
{
this
.
formType
=
'2'
}
}
}
// 'model.testScenarioList': {
// handler(newValue, oldValue) {
// if (newValue.length > 0) {
// this.$refs.form.clearValidate('testScenarioList')
// } else {
// this.$refs.form.validateField('testScenarioList')
// }
// }
// },
// formType: {
// handler(newValue, oldValue) {
// console.log('formType', newValue)
// if (newValue === '1') {
// this.formType = '1'
// } else if (newValue === '2') {
// this.formType = '2'
// }
// }
// }
},
created
()
{
// 接收路由传参
// this.$store.dispatch('testScenario/setTestScenarioList')
this
.
getInspectionItemDict
()
// 查询详情
const
taskId
=
this
.
$route
.
query
.
taskId
this
.
getTaskDetail
(
taskId
)
this
.
$store
.
dispatch
(
'standard/setStandardList'
)
},
computed
:
{
...
...
@@ -552,13 +534,7 @@ export default {
getTaskById
({
id
:
taskId
}).
then
(
response
=>
{
console
.
log
(
'response'
,
response
)
this
.
taskDetail
=
response
.
data
// 任务信息-(检验依据、检验项目)
this
.
model
.
formType
=
this
.
taskDetail
.
standardId
this
.
inspectionItemList
.
forEach
(
item
=>
{
if
(
this
.
taskDetail
.
taskList
.
split
(
','
).
includes
(
item
.
value
))
{
item
.
check
=
true
}
})
this
.
getInspectionItemDict
(
this
.
taskDetail
.
standardId
)
// 测试场景
if
(
this
.
taskDetail
.
testScenarioList
!==
null
)
{
this
.
testScenarioList
.
forEach
(
item
=>
{
...
...
@@ -614,9 +590,12 @@ export default {
// }
})
},
getInspectionItemDict
()
{
getDicts
(
'inspection_item'
).
then
(
response
=>
{
this
.
inspectionItemList
=
response
.
data
.
map
(
getInspectionItemDict
(
id
)
{
getByStandardId
({
id
}).
then
(
response
=>
{
console
.
log
(
response
)
this
.
inspectionItemList
=
response
.
rows
.
map
(
({
dictValue
,
dictLabel
,
...
rest
})
=>
({
label
:
dictLabel
,
value
:
dictValue
,
...
...
@@ -624,9 +603,12 @@ export default {
...
rest
})
)
// 查询详情
const
taskId
=
this
.
$route
.
query
.
taskId
this
.
getTaskDetail
(
taskId
)
// 任务信息-(检验依据、检验项目)
this
.
inspectionItemList
.
forEach
(
item
=>
{
if
(
this
.
taskDetail
.
taskList
.
split
(
','
).
includes
(
item
.
value
))
{
item
.
check
=
true
}
})
})
},
backPage
()
{
...
...
@@ -751,19 +733,19 @@ export default {
this
.
model
.
inspectionItemList
.
push
(
item
.
value
)
}
console
.
log
(
'李斯特'
,
this
.
model
.
inspectionItemList
)
},
handleTestScenario
(
item
)
{
if
(
this
.
model
.
testScenarioList
.
includes
(
item
.
value
))
{
this
.
model
.
testScenarioList
.
splice
(
this
.
model
.
testScenarioList
.
indexOf
(
item
.
label
),
1
)
item
.
check
=
false
}
else
{
item
.
check
=
true
this
.
model
.
testScenarioList
.
push
(
item
.
value
)
}
}
// handleTestScenario(item) {
// if (this.model.testScenarioList.includes(item.value)) {
// this.model.testScenarioList.splice(
// this.model.testScenarioList.indexOf(item.label),
// 1
// )
// item.check = false
// } else {
// item.check = true
// this.model.testScenarioList.push(item.value)
// }
// }
}
}
</
script
>
...
...
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