Skip to content

W
web
Commit 39085b91 authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

fix: 71098

parent 8ed40c7a
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 234 deletions
src/components/columnData/index.vue 0 → 100644
View file @ 39085b91
<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"
>
<span class="textContent">{{ text }}</span>
</el-tooltip>
<span v-else>{{ text }}</span>
</div>
</template>
<script>
export default {
props: {
text: ''
},
data() {
return {
isExceeded: false
}
},
mounted() {
this.checkTextOverflow()
window.addEventListener('resize', this.checkTextOverflow)
},
beforeDestroy() {
window.removeEventListener('resize', this.checkTextOverflow)
},
methods: {
checkTextOverflow() {
// 获取容器宽度
const containerWidth = this.$refs.textContainer.clientWidth
// 获取文本实际宽度
const textWidth = this.$refs.textContent.offsetWidth
// 检查是否超出，这里简单以文本宽度大于容器宽度判断为超出
this.isExceeded = textWidth - 10 > containerWidth
}
}
}
</script>
<style>
.textContent {
display: block;
width: 90%;
overflow: hidden;
text-overflow: ellipsis; /* 添加省略号 */
white-space: nowrap; /* 不允许文本换行 */
}
</style>
src/main.js
View file @ 39085b91
......@@ -65,6 +65,8 @@ import DictData from '@/components/DictData'
import TalkItem from '@/components/TalkItem'
import { IconPark } from '@icon-park/vue/es/all';
import columnData from '@/components/columnData/index'
// import { install } from '@icon-park/vue/es/all';
// import '@icon-park/vue/styles/index.css';
// Vue.use(install)
......@@ -100,6 +102,7 @@ Vue.component('TalkItem', TalkItem)
Vue.component('EmptyData', Empty)
Vue.component('HeaderButton', HeaderButton)
Vue.component('FooterButton', FooterButton)
Vue.component('columnData', columnData)
Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
......
src/mixins/page.js
View file @ 39085b91
......@@ -11,7 +11,7 @@ export default {
loading: false,
// 显示搜索条件
showSearch: true,
allows: ['StandardTerms', 'ViewStandardTerms'],
// 重新渲染表格状态
refreshTable: true,
tableData: [],
......@@ -19,7 +19,11 @@ export default {
}
},
mounted() {
this.loadData()
console.log(this.$route.name);
console.log(this.allows.indexOf(this.$route.name) );
if (this.allows.indexOf(this.$route.name) == -1) {
this.loadData()
}
},
methods: {
/** 展开/折叠操作 */
......
src/views/processing/carReview/review-form/index.vue
View file @ 39085b91
......@@ -165,34 +165,16 @@
</div>
<div v-else>__</div>
</td>
<el-tooltip
v-if="reviewDetail.result"
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
<td align="center" class="written-by">
<column-data
:text="
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
"
/>
</td>
</tr>
</template>
......
src/views/processing/carReview/source-record/index.vue
View file @ 39085b91
......@@ -225,34 +225,16 @@
</div>
<div v-else>__</div>
</td>
<el-tooltip
v-if="reviewDetail.result"
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
<td align="center" class="written-by">
<column-data
:text="
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
"
/>
</td>
</tr>
</template>
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ 39085b91
......@@ -207,34 +207,16 @@
</div>
<div v-else>__</div>
</td>
<el-tooltip
v-if="reviewDetail.result"
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
<td align="center" class="written-by">
<column-data
:text="
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
"
/>
</td>
</tr>
</template>
......
src/views/processing/carReview/write-check-form/components/previewView.vue
View file @ 39085b91
......@@ -112,32 +112,16 @@
</div>
<div v-else>__</div>
</td>
<el-tooltip
v-if="reviewDetail.result"
effect="dark"
:content="
reviewDetail.result ? reviewDetail.result.userName : '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
<td align="center" class="written-by">
<column-data
:text="
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
"
/>
</td>
</tr>
</template>
......
src/views/processing/carReview/write-check-form/index.vue
View file @ 39085b91
......@@ -74,8 +74,8 @@
> -->
</div>
<div class="checked-noUse">
<el-checkbox v-model="checked">仅显示未完成页面</el-checkbox>
<el-checkbox v-model="passed">仅显示未通过页面</el-checkbox>
<el-checkbox v-model="checked">仅显示未完成条目</el-checkbox>
<el-checkbox v-model="passed">仅显示未通过条目</el-checkbox>
</div>
<div v-if="detailsList.length">
<div class="btn-tool">
......@@ -477,12 +477,12 @@ export default {
this.detailsList = this.model.detailsList.filter(item => {
return !item.result || item.result.passed === null
})
this.handleCircle(0)
})
console.log(this.detailsList)
} else {
this.detailsList = this.model.detailsList
this.handleCircle(0)
}
this.handleCircle(0)
},
passed(newV) {
if (newV) {
......@@ -491,11 +491,12 @@ export default {
this.detailsList = this.model.detailsList.filter(item => {
return item.result && item.result.passed === 0
})
this.handleCircle(0)
})
} else {
this.detailsList = this.model.detailsList
this.handleCircle(0)
}
this.handleCircle(0)
}
},
async mounted() {
......@@ -605,10 +606,7 @@ export default {
this.detailsList = this.model.detailsList.filter(item => {
return !item.result || item.result.passed === null
})
} else {
this.detailsList = this.model.detailsList
}
if (this.passed) {
} else if (this.passed) {
this.detailsList = this.model.detailsList.filter(item => {
return item.result && item.result.passed === 0
})
......
src/views/processing/processed-review/index.vue
View file @ 39085b91
......@@ -128,22 +128,18 @@
<div class="card-cell">
<div class="cell-label">任务组长</div>
<div class="cell-value">
<el-tooltip
effect="dark"
:content="item.leader ? item.leader : '---'"
placement="bottom-start"
>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<p>{{ item.leader ? item.leader : '---' }}</p>
</div>
</el-tooltip>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<column-data
:text="item.leader ? item.leader : '---'"
></column-data>
</div>
</div>
</div>
<div class="card-buttons">
......
src/views/processing/systemReview/confirm-result/index.vue
View file @ 39085b91
......@@ -209,34 +209,16 @@
>不符合</el-tag
>
</td>
<el-tooltip
v-if="reviewDetail.result"
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
<td align="center" class="written-by">
<column-data
:text="
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
"
/>
</td>
</tr>
</template>
......
src/views/processing/systemReview/review-form/index.vue
View file @ 39085b91
......@@ -137,34 +137,16 @@
</div>
<div v-else>__</div>
</td>
<el-tooltip
v-if="reviewDetail.result"
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
<td align="center" class="written-by">
<column-data
:text="
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
"
/>
</td>
</tr>
</template>
......
src/views/processing/systemReview/source-record/index.vue
View file @ 39085b91
......@@ -230,34 +230,16 @@
</div>
<div v-else>__</div>
</td>
<el-tooltip
v-if="reviewDetail.result"
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
<td align="center" class="written-by">
<column-data
:text="
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
"
/>
</td>
</tr>
</template>
......
src/views/processing/systemReview/write-check-form/components/previewView.vue
View file @ 39085b91
......@@ -112,32 +112,16 @@
</div>
<div v-else>__</div>
</td>
<el-tooltip
v-if="reviewDetail.result"
effect="dark"
:content="
reviewDetail.result ? reviewDetail.result.userName : '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
<td align="center" class="written-by">
<column-data
:text="
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
</td>
</el-tooltip>
<td v-else align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
}}
"
/>
</td>
</tr>
</template>
......
src/views/processing/systemReview/write-check-form/index.vue
View file @ 39085b91
......@@ -79,8 +79,8 @@
> -->
</div>
<div class="checked-noUse">
<el-checkbox v-model="checked">仅显示未完成页面</el-checkbox>
<el-checkbox v-model="passed">仅显示未通过页面</el-checkbox>
<el-checkbox v-model="checked">仅显示未完成条目</el-checkbox>
<el-checkbox v-model="passed">仅显示未通过条目</el-checkbox>
</div>
<div v-if="detailsList.length">
<div class="btn-tool">
......@@ -492,13 +492,17 @@ export default {
watch: {
checked(newV) {
if (newV) {
this.detailsList = this.model.detailsList.filter(item => {
return !item.result || item.result.passed === null
this.passed = false
this.$nextTick(() => {
this.detailsList = this.model.detailsList.filter(item => {
return !item.result || item.result.passed === null
})
this.handleCircle(0)
})
} else {
this.detailsList = this.model.detailsList
this.handleCircle(0)
}
this.handleCircle(0)
},
passed(newV) {
if (newV) {
......@@ -507,11 +511,12 @@ export default {
this.detailsList = this.model.detailsList.filter(item => {
return item.result && item.result.passed === 0
})
this.handleCircle(0)
})
} else {
this.detailsList = this.model.detailsList
this.handleCircle(0)
}
this.handleCircle(0)
}
},
async mounted() {
......@@ -620,10 +625,7 @@ export default {
this.detailsList = this.model.detailsList.filter(item => {
return !item.result || item.result.passed === null
})
} else {
this.detailsList = this.model.detailsList
}
if (this.passed) {
} else if (this.passed) {
this.detailsList = this.model.detailsList.filter(item => {
return item.result && item.result.passed === 0
})
......@@ -744,6 +746,7 @@ export default {
this.activeModel = index
if (this.detailsList.length) {
this.taskModel = JSON.parse(JSON.stringify(this.detailsList[index]))
console.log(this.taskModel)
if (this.taskModel.result) {
this.form = {
passed: this.taskModel.result.passed,
......
src/views/processing/unprocessed-review/index.vue
View file @ 39085b91
......@@ -119,22 +119,18 @@
<div class="card-cell">
<div class="cell-label">任务组长</div>
<div class="cell-value">
<el-tooltip
effect="dark"
:content="item.leader ? item.leader : '---'"
placement="bottom-start"
>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<p>{{ item.leader ? item.leader : '---' }}</p>
</div>
</el-tooltip>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<column-data
:text="item.leader ? item.leader : '---'"
></column-data>
</div>
</div>
</div>
<div class="card-cell">
......
src/views/setting/standardTerms/index.vue
View file @ 39085b91
......@@ -360,6 +360,7 @@ export default {
created() {
this.getTaskType(this.$store.getters.standard)
},
mounted() {},
methods: {
getTaskType(id) {
getByStandardId({
......@@ -397,7 +398,6 @@ export default {
})
},
handleTab(v) {
console.log(v)
if (v.name === 'test') {
this.queryParamsTest.pageNum = 1
this.loadTestData()
......
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