diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue
index e297537a..444d5db5 100644
--- a/src/components/tools/Logo.vue
+++ b/src/components/tools/Logo.vue
@@ -7,13 +7,16 @@
-
{{ title }}
+
+
+
@@ -52,7 +60,7 @@ export default {
background-color: transparent !important;
h1 {
- color: #222222 !important;
+ color: @primary-color !important;
}
a {
diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue
index c85ff1d2..6f7dcd56 100644
--- a/src/views/dashboard/search/AdvancedSearch.vue
+++ b/src/views/dashboard/search/AdvancedSearch.vue
@@ -134,6 +134,14 @@
:pagination="ipagination"
@change="handleTableChange">
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
@@ -189,14 +197,14 @@ export default {
align: 'center',
width: 180,
dataIndex: 'standard_number',
- scopedSlots: { customRender: 'text' }
+ scopedSlots: { customRender: 'toDetail' }
},
{ // 标准名称
title: this.$t('dashboard.advancedSearch.standardName'),
align: 'center',
width: 180,
dataIndex: 'standard_name',
- scopedSlots: { customRender: 'text' }
+ scopedSlots: { customRender: 'toDetail' }
},
{ // 发布日期
title: this.$t('dashboard.advancedSearch.releaseDate'),
@@ -266,10 +274,29 @@ export default {
path: '/generalSearch'
})
},
+ // 跳转详情
+ handleGoDetail (record) {
+ let path = ''
+ // 需要先判断是哪种标准
+ if (this.currStandardType === '1') {
+ path = '/standardRegulationLibrary/DomesticStandardDetail'
+ } else if (this.currStandardType === '2') {
+ path = '/standardRegulationLibrary/OverseasStandardDetail'
+ } else if (this.currStandardType === '3') {
+ path = '/enterpriseStandardLibrary/enterpriseStandardDetail'
+ }
+ this.$openPageNewSheet({
+ path: path,
+ query: {
+ id: record.id
+ }
+ })
+ },
// 标准类型改变
standardTypeChange (value) {
this.currStandardType = value
this.queryParam = {}
+ this.dataSource = []
},
onChange (item) {
if (this.queryParam[item] && this.queryParam[item].length > 0) {
@@ -405,6 +432,7 @@ export default {