修改UAT提出的问题
This commit is contained in:
@@ -846,11 +846,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.text-field-right {
|
.text-field-right {
|
||||||
width: calc(66.6% - 130px);
|
width: calc(100% - 130px);
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: pre-wrap;
|
||||||
word-break: break-word;
|
word-break: break-word;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
float: left;
|
float: left;
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="dic-list-table">
|
<div class="dic-list-table">
|
||||||
<list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict"
|
<list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict"
|
||||||
|
:record="record"
|
||||||
@deleteDict="deleteDict" :total="total" :queryParams="queryParams" @selected="selectedKeys"
|
@deleteDict="deleteDict" :total="total" :queryParams="queryParams" @selected="selectedKeys"
|
||||||
@ok="ok"></list-table>
|
@ok="ok"></list-table>
|
||||||
<tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record"
|
<tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record"
|
||||||
|
|||||||
@@ -35,7 +35,8 @@
|
|||||||
props: {
|
props: {
|
||||||
tableData: Array,
|
tableData: Array,
|
||||||
total: Number,
|
total: Number,
|
||||||
queryParams: Object
|
queryParams: Object,
|
||||||
|
record: Object
|
||||||
},
|
},
|
||||||
mixins: [ResizeHeader, ResizeColumnProvide],
|
mixins: [ResizeHeader, ResizeColumnProvide],
|
||||||
data() {
|
data() {
|
||||||
@@ -47,34 +48,41 @@
|
|||||||
// pageNo:1,
|
// pageNo:1,
|
||||||
// pageSize:10
|
// pageSize:10
|
||||||
// }, //搜索条件
|
// }, //搜索条件
|
||||||
columns: [
|
columnsAll: [
|
||||||
{
|
{
|
||||||
title: this.$t('name'),
|
title: this.$t('name'),
|
||||||
dataIndex: 'itemText',
|
dataIndex: 'itemText',
|
||||||
key: 'itemText',
|
key: 'itemText',
|
||||||
align: "left",
|
align: 'left',
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
width: 100,
|
width: 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('enName'),
|
title: this.$t('enName'),
|
||||||
align: "left",
|
align: 'left',
|
||||||
width: 100,
|
width: 100,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'enName',
|
dataIndex: 'enName'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: this.$t('statisticalNodes'),
|
||||||
|
align: 'left',
|
||||||
|
dataIndex: 'statNode',
|
||||||
|
ellipsis: true,
|
||||||
|
width: 100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('describe'),
|
title: this.$t('describe'),
|
||||||
align: "left",
|
align: 'left',
|
||||||
width: 100,
|
width: 100,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
dataIndex: 'description',
|
dataIndex: 'description'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('operation'),
|
title: this.$t('operation'),
|
||||||
dataIndex: 'action',
|
dataIndex: 'action',
|
||||||
scopedSlots: { customRender: 'action' },
|
scopedSlots: { customRender: 'action' },
|
||||||
align: "left",
|
align: 'left',
|
||||||
width: 170
|
width: 170
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -83,6 +91,21 @@
|
|||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
// this.loadData()
|
// this.loadData()
|
||||||
|
console.log(this.record)
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
columns() {
|
||||||
|
let columnsAll = JSON.parse(JSON.stringify(this.columnsAll))
|
||||||
|
if (this.record.id != '1513417672023441409') {
|
||||||
|
for (let i = 0; i < columnsAll.length; i++) {
|
||||||
|
if (columnsAll[i].dataIndex == 'statNode') {
|
||||||
|
columnsAll.splice(i, 1)
|
||||||
|
i--
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return columnsAll
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
//获取列表数据
|
//获取列表数据
|
||||||
@@ -108,7 +131,7 @@
|
|||||||
this.$emit('deleteDict', val.id, true)
|
this.$emit('deleteDict', val.id, true)
|
||||||
},
|
},
|
||||||
onSelectChange(selectedRowKeys) {
|
onSelectChange(selectedRowKeys) {
|
||||||
this.selectedRowKeys = selectedRowKeys;
|
this.selectedRowKeys = selectedRowKeys
|
||||||
this.$emit('selected', this.selectedRowKeys)
|
this.$emit('selected', this.selectedRowKeys)
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -125,7 +148,7 @@
|
|||||||
this.$emit('ok', this.queryParams)
|
this.$emit('ok', this.queryParams)
|
||||||
|
|
||||||
// this.loadData()
|
// this.loadData()
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -136,10 +159,12 @@
|
|||||||
.action-edit {
|
.action-edit {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.action-delete {
|
.action-delete {
|
||||||
color: red;
|
color: red;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.page {
|
.page {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
|||||||
@@ -310,7 +310,7 @@
|
|||||||
myChart.on('click', (params) => {
|
myChart.on('click', (params) => {
|
||||||
console.log(params)
|
console.log(params)
|
||||||
let query = {
|
let query = {
|
||||||
title: params.seriesName,
|
title: params.seriesName+'-'+params.name,
|
||||||
projectLibraryId: this.$route.query.id
|
projectLibraryId: this.$route.query.id
|
||||||
}
|
}
|
||||||
if (params.seriesName === this.$t('certificationTaskConfirmation')) {
|
if (params.seriesName === this.$t('certificationTaskConfirmation')) {
|
||||||
|
|||||||
@@ -295,6 +295,13 @@
|
|||||||
visible: false,
|
visible: false,
|
||||||
queryParam: {},
|
queryParam: {},
|
||||||
columnsAll: [
|
columnsAll: [
|
||||||
|
{
|
||||||
|
title: this.$t('statisticalNodes'),
|
||||||
|
align: 'left',
|
||||||
|
dataIndex: 'statNode',
|
||||||
|
ellipsis: true,
|
||||||
|
width: 100
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: this.$t('areaOfResponsibility'),
|
title: this.$t('areaOfResponsibility'),
|
||||||
align: 'left',
|
align: 'left',
|
||||||
|
|||||||
@@ -150,21 +150,21 @@
|
|||||||
let query = {}
|
let query = {}
|
||||||
if (params.seriesName == this.$t('regulatoryTaskConfirmation')) {
|
if (params.seriesName == this.$t('regulatoryTaskConfirmation')) {
|
||||||
query = {
|
query = {
|
||||||
title: params.seriesName,
|
title: params.seriesName+'-'+params.name,
|
||||||
projectLibraryId: this.$route.query.id,
|
projectLibraryId: this.$route.query.id,
|
||||||
operatorType: 'queryFGTaskToConfirmStatistics',
|
operatorType: 'queryFGTaskToConfirmStatistics',
|
||||||
status: params.data.status
|
status: params.data.status
|
||||||
}
|
}
|
||||||
} else if (params.seriesName == this.$t('designCompliance')) {
|
} else if (params.seriesName == this.$t('designCompliance')) {
|
||||||
query = {
|
query = {
|
||||||
title: params.seriesName,
|
title: params.seriesName+'-'+params.name,
|
||||||
projectLibraryId: this.$route.query.id,
|
projectLibraryId: this.$route.query.id,
|
||||||
operatorType: 'queryDesignStatistics',
|
operatorType: 'queryDesignStatistics',
|
||||||
status: params.data.status
|
status: params.data.status
|
||||||
}
|
}
|
||||||
} else if (params.seriesName == this.$t('verifyCompliance')) {
|
} else if (params.seriesName == this.$t('verifyCompliance')) {
|
||||||
query = {
|
query = {
|
||||||
title: params.seriesName,
|
title: params.seriesName+'-'+params.name,
|
||||||
projectLibraryId: this.$route.query.id,
|
projectLibraryId: this.$route.query.id,
|
||||||
operatorType: 'queryVerifyStatistics',
|
operatorType: 'queryVerifyStatistics',
|
||||||
status: params.data.status
|
status: params.data.status
|
||||||
|
|||||||
Reference in New Issue
Block a user