Commit b5a24eb5 authored by mengzixuan's avatar mengzixuan

feat(修改bug): 72015

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