Commit 26fb3919 authored by zhang's avatar zhang

feat: 更新实施细则显示,修复车型检验记录点击重复问题

parent d6c78e32
...@@ -170,12 +170,12 @@ export default { ...@@ -170,12 +170,12 @@ export default {
loadingFile: false loadingFile: false
} }
}, },
mounted() { // mounted() {
this.getTestDetail() // this.getTestDetail()
}, // },
async activated() { // async activated() {
this.getTestDetail() // this.getTestDetail()
}, // },
methods: { methods: {
getTestDetail() { getTestDetail() {
console.log('调用详情的接口') console.log('调用详情的接口')
......
...@@ -291,7 +291,7 @@ export default { ...@@ -291,7 +291,7 @@ export default {
}, },
downPdf(row, name) { downPdf(row, name) {
if (name == 'name') { if (name == 'name') {
window.open("https:\\"+row.file); window.open(row.file);
} else if (name == 'keypointname') { } else if (name == 'keypointname') {
window.open('/pdfjs/web/viewer.html?file=' + process.env.VUE_APP_IMAGE_API + row.keypointFile) window.open('/pdfjs/web/viewer.html?file=' + process.env.VUE_APP_IMAGE_API + row.keypointFile)
//window.open(process.env.VUE_APP_IMAGE_API + row.keypointFile) //window.open(process.env.VUE_APP_IMAGE_API + row.keypointFile)
......
...@@ -151,38 +151,43 @@ ...@@ -151,38 +151,43 @@
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
:props="defaultProps" :props="defaultProps"
bordered
@node-click="handleNodeClick" @node-click="handleNodeClick"
:default-checked-keys="checkedkeys" :default-checked-keys="checkedkeys"
> >
<!-- node:节点信息(由defaultProps定义) data: 当前节点包含的数据对象 --> <!-- node:节点信息(由defaultProps定义) data: 当前节点包含的数据对象 -->
<span <span
slot-scope="{ node, data }" slot-scope="{ node, data }"
style="display: flex; width: 100%; justify-content: space-between" style="display: flex;height: 100%; width: 100%; justify-content: space-between"
> >
<div style="display: flex;justify-content: space-between;width: 100%;margin:6px 0;padding-right: 30px;">
<div style="display: flex;">
<div> <div>
<span v-if="node.level == 1" class="el-tree-label">标准要求</span> <span v-if="node.level == 1" class="el-tree-label">标准要求</span>
<span v-else-if="node.parent.data.type == 'test'" class="el-tree-label" <span v-else-if="node.parent.data.type == 'test'" class="el-tree-label"
>测试场景</span >测试场景</span
> >
<span v-else class="el-tree-label">检查要点</span> <span v-else class="el-tree-label">检查要点</span>
</div>
<!-- 多个空格 --> <!-- 多个空格 -->
<span <!-- <span
v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'" v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"
></span> ></span> -->
<div>
<span v-if="data.chapter" class="el-tree-content"> <span v-if="data.chapter" class="el-tree-content">
{{ (data.chapter + '\u00a0' + data.text) | ellipsis }}</span {{ (data.chapter + '\u00a0' + data.text) }}</span
> >
<span v-else-if="data.serialNumber" class="el-tree-content"> <span v-else-if="data.serialNumber" class="el-tree-content">
{{ (data.serialNumber + '\u00a0' + data.requirements) | ellipsis }}</span {{ (data.serialNumber + '\u00a0' + data.requirements)}}</span
> >
<span v-else class="el-tree-content"> <span v-else class="el-tree-content">
{{ data.text || data.testScenario | ellipsis }}</span {{ data.text || data.testScenario }}</span
> >
</div> </div>
<!-- 当二级树为审查要点时将详情图标向左移动20px --> </div>
<span v-if="node.level == 2 && isEnterprise" style="margin-right: 30px"> <span class="button-bar" v-if="node.level == 2 && isEnterprise">
<page-button <page-button
v-hasPermi="['setting:standardTerms:content']" v-hasPermi="['setting:standardTerms:content']"
icon="doc-search" icon="doc-search"
...@@ -190,6 +195,9 @@ ...@@ -190,6 +195,9 @@
@click.native="handleUpdate(data, node)" @click.native="handleUpdate(data, node)"
></page-button> ></page-button>
</span> </span>
</div>
<!-- 当二级树为审查要点时将详情图标向左移动20px -->
</span> </span>
</el-tree> </el-tree>
<pagination <pagination
...@@ -767,8 +775,9 @@ export default { ...@@ -767,8 +775,9 @@ export default {
padding: 10px 20px; padding: 10px 20px;
::v-deep .el-tree-node { ::v-deep .el-tree-node {
// 节点样式 // 节点样式
position: relative; position: relative;
display: flex; display: block;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
} }
...@@ -779,8 +788,9 @@ export default { ...@@ -779,8 +788,9 @@ export default {
::v-deep .el-tree-node__content { ::v-deep .el-tree-node__content {
// 节点内容样式设置 // 节点内容样式设置
width: 100%; width: 100%;
height: 40px; height: auto;
//display: flex; min-height: 40px;
display: flex;
//justify-content: space-between; //justify-content: space-between;
margin-top: 10px; margin-top: 10px;
color: black; color: black;
...@@ -799,8 +809,9 @@ export default { ...@@ -799,8 +809,9 @@ export default {
} }
::v-deep .el-tree-node__children .el-tree-node__content { ::v-deep .el-tree-node__children .el-tree-node__content {
// 子节点内容样式设置 // 子节点内容样式设置
height: 30px; height: auto;
margin: 5px 0; margin: 5px 0;
border: gray 2px solid;
background-color: white; background-color: white;
} }
::v-deep ::v-deep
...@@ -812,13 +823,22 @@ export default { ...@@ -812,13 +823,22 @@ export default {
} }
::v-deep .el-tree-label { ::v-deep .el-tree-label {
// 树中显示标题(label)设置 // 树中显示标题(label)设置
text-align: center; display: block flex;
margin-right: 20px;
height: 100%;
align-items: center;
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: bold;
} }
::v-deep .el-tree-content { ::v-deep .el-tree-content {
// 树中显示内容(content)设置 // 树中显示内容(content)设置
font-size: 14px; font-size: 14px;
white-space: pre-wrap;
}
::v-deep .button-bar{
display: block flex;
height: 100%;
align-items: center;
} }
} }
</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