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
b5a24eb5
Commit
b5a24eb5
authored
May 15, 2024
by
mengzixuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(修改bug): 72015
parent
4b661d08
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
57 additions
and
42 deletions
+57
-42
standardTerms.js
src/api/setting/standardTerms.js
+2
-2
useCaseLibrary.js
src/api/setting/useCaseLibrary.js
+0
-1
home.js
src/api/system/home.js
+1
-1
new.js
src/api/task/new.js
+2
-5
index.vue
src/components/columnData/index.vue
+6
-8
main.js
src/main.js
+8
-9
page.js
src/mixins/page.js
+2
-2
index.vue
src/views/task/new/index.vue
+36
-14
No files found.
src/api/setting/standardTerms.js
View file @
b5a24eb5
...
...
@@ -19,8 +19,8 @@ export function listDocumentReview(data) {
}
/**
* 根据章节号获取测试用例
* @param {*} data
* @returns
* @param {*} data
* @returns
*/
export
function
getUseCaseByChapter
(
data
)
{
return
request
({
...
...
src/api/setting/useCaseLibrary.js
View file @
b5a24eb5
...
...
@@ -53,4 +53,3 @@ export function listTestCase(data) {
data
:
data
})
}
src/api/system/home.js
View file @
b5a24eb5
...
...
@@ -41,6 +41,6 @@ export function selectTest(data) {
return
request
({
url
:
'/system/testCase/getUseCaseMsg'
,
method
:
'post'
,
data
:
data
data
:
data
})
}
src/api/task/new.js
View file @
b5a24eb5
...
...
@@ -13,8 +13,8 @@ export function manufacturerData(data) {
/**
* 根据标准获取子任务类型
* @param {*} data
* @returns
* @param {*} data
* @returns
*/
export
function
getByStandardId
(
data
)
{
return
request
({
...
...
@@ -23,6 +23,3 @@ export function getByStandardId(data) {
data
})
}
src/components/columnData/index.vue
View file @
b5a24eb5
<
template
>
<div
ref=
"textContainer"
style=
"position: relative; overflow: hidden;"
>
<span
style=
"position:absolute;top: -200px;white-space: nowrap; "
ref=
"textContent"
>
{{
text
}}
</span>
<el-tooltip
v-if=
"isExceeded"
effect=
"dark"
:content=
"text"
placement=
"top"
<div
ref=
"textContainer"
style=
"position: relative; overflow: hidden"
>
<span
style=
"position: absolute; top: -200px; white-space: nowrap"
ref=
"textContent"
>
{{
text
}}
</span
>
<el-tooltip
v-if=
"isExceeded"
effect=
"dark"
:content=
"text"
placement=
"top"
>
<span
class=
"textContent"
>
{{
text
}}
</span>
</el-tooltip>
<span
v-else
>
{{
text
}}
</span>
...
...
@@ -30,7 +29,6 @@ export default {
window
.
removeEventListener
(
'resize'
,
this
.
checkTextOverflow
)
},
methods
:
{
checkTextOverflow
()
{
// 获取容器宽度
const
containerWidth
=
this
.
$refs
.
textContainer
.
clientWidth
...
...
src/main.js
View file @
b5a24eb5
...
...
@@ -3,7 +3,7 @@ import Vue from 'vue'
import
Cookies
from
'js-cookie'
import
Element
from
'element-ui'
import
"@/utils/el-components.js"
import
'@/utils/el-components.js'
import
'./assets/styles/element-variables.scss'
import
'@/assets/styles/index.scss'
// global css
import
'@/assets/styles/ruoyi.scss'
// ruoyi css
...
...
@@ -64,7 +64,7 @@ import DictData from '@/components/DictData'
import
TalkItem
from
'@/components/TalkItem'
import
{
IconPark
}
from
'@icon-park/vue/es/all'
;
import
{
IconPark
}
from
'@icon-park/vue/es/all'
import
columnData
from
'@/components/columnData/index'
// import { install } from '@icon-park/vue/es/all';
...
...
@@ -125,13 +125,12 @@ Vue.use(Element, {
Vue
.
config
.
productionTip
=
false
// 导入apollo-boost模块实例化ApolloClient
import
ApolloClient
from
'apollo-boost'
;
import
ApolloClient
from
'apollo-boost'
import
VueApollo
from
'vue-apollo'
// 全局使用
Vue
.
use
(
VueApollo
)
;
Vue
.
use
(
VueApollo
)
// 全局导入Echarts
import
*
as
echarts
from
'echarts'
...
...
@@ -140,15 +139,15 @@ import { Message } from 'element-ui'
// 请求graphql使用的apollo API
const
apolloClient
=
new
ApolloClient
({
// 服务端Url
uri
:
process
.
env
.
VUE_APP_CLIENT_API
+
"/query"
,
//
uri
:
process
.
env
.
VUE_APP_CLIENT_API
+
'/query'
,
//
onError
(
error
)
{
Message
({
message
:
'车联网接口异常'
,
type
:
'error'
})
// 处理错误
}
,
})
;
}
})
//创建apollo实例对象
const
apolloProvider
=
new
VueApollo
({
defaultClient
:
apolloClient
,
//默认查询
defaultClient
:
apolloClient
//默认查询
})
new
Vue
({
el
:
'#app'
,
...
...
src/mixins/page.js
View file @
b5a24eb5
...
...
@@ -19,8 +19,8 @@ export default {
}
},
mounted
()
{
console
.
log
(
this
.
$route
.
name
)
;
console
.
log
(
this
.
allows
.
indexOf
(
this
.
$route
.
name
)
);
console
.
log
(
this
.
$route
.
name
)
console
.
log
(
this
.
allows
.
indexOf
(
this
.
$route
.
name
)
)
if
(
this
.
allows
.
indexOf
(
this
.
$route
.
name
)
==
-
1
)
{
this
.
loadData
()
}
...
...
src/views/task/new/index.vue
View file @
b5a24eb5
...
...
@@ -174,7 +174,7 @@
:data=
"tableData"
>
<el-table-column
label=
"姓名"
align=
"left"
prop=
"nickName"
>
<template
slot-scope=
"
{ row }">
<template
slot-scope=
"
{ row
, $index
}">
<span
v-if=
"row.userId !== ''"
>
<span
v-show=
"row.status.toString() === '1'"
>
{{
row
.
name
}}
(已停用)
</span
...
...
@@ -187,7 +187,11 @@
v-else
v-model=
"userId"
placeholder=
"请选择"
@
change=
"handleNameChange"
@
change=
"
e =>
{
handleNameChange(e, $index)
}
"
>
<el-option
v-for=
"(item, index) in userList"
...
...
@@ -1027,19 +1031,24 @@ export default {
}
})
},
handleNameChange
(
value
)
{
console
.
log
(
'value'
,
value
)
handleNameChange
(
value
,
index
)
{
this
.
userId
=
value
const
selectData
=
this
.
userList
.
find
(
item
=>
item
.
userId
===
value
)
this
.
tableData
.
forEach
(
data
=>
{
if
(
data
.
userId
===
''
)
{
data
.
nickName
=
selectData
.
nickName
data
.
name
=
selectData
.
nickName
data
.
userId
=
selectData
.
userId
data
.
dept
=
selectData
.
dept
data
.
status
=
'0'
}
})
// this.tableData.forEach((data, index) => {
// console.log('index', index)
// if (data.userId === '') {
// data.nickName = selectData.nickName
// data.name = selectData.nickName
// data.userId = selectData.userId
// data.dept = selectData.dept
// data.status = '0'
// }
// })
this
.
tableData
[
index
].
nickName
=
selectData
.
nickName
this
.
tableData
[
index
].
name
=
selectData
.
nickName
this
.
tableData
[
index
].
userId
=
selectData
.
userId
this
.
tableData
[
index
].
dept
=
selectData
.
dept
this
.
tableData
[
index
].
status
=
'0'
// 已被选择的人做禁用
this
.
userList
.
find
(
item
=>
item
.
userId
===
this
.
userId
).
disabled
=
true
this
.
userId
=
''
...
...
@@ -1281,31 +1290,38 @@ export default {
width
:
100%
;
margin-bottom
:
18px
;
}
.global-left-margin
{
padding-left
:
18px
;
}
.tip-navigation
{
display
:
flex
;
align-items
:
center
;
margin
:
3px
0
18px
0
;
.tip
{
width
:
4px
;
height
:
26px
;
background
:
#1a6fd7
;
margin-right
:
14px
;
}
.tip-title
{
font-size
:
16px
;
font-weight
:
700
;
color
:
#1a6fd7
;
}
}
.sortable-handle
{
cursor
:
move
;
}
.test-scenario-container
{
display
:
flex
;
flex-wrap
:
wrap
;
.test-scenario
{
width
:
228px
;
height
:
32px
;
...
...
@@ -1313,11 +1329,13 @@ export default {
background-color
:
#ffffff
;
margin
:
0
10px
10px
0
;
border-radius
:
30px
;
div
{
text-align
:
center
;
position
:
relative
;
}
}
.check-test-scenario
{
width
:
228px
;
height
:
32px
;
...
...
@@ -1325,6 +1343,7 @@ export default {
background-color
:
#e3eefc
;
margin
:
0
10px
10px
0
;
border-radius
:
30px
;
div
{
color
:
#1a6fd7
;
text-align
:
center
;
...
...
@@ -1335,11 +1354,14 @@ export default {
}
}
}
.actions-container
{
display
:
flex
;
justify-content
:
center
;
}
.button-gap
{
margin
:
0
10px
;
/* 通过margin属性设置按钮之间的间隙 */
margin
:
0
10px
;
/* 通过margin属性设置按钮之间的间隙 */
}
</
style
>
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