fix: 修改 asset model 下滑页面 状态搜索不可用的问题
This commit is contained in:
@@ -31,7 +31,7 @@
|
|||||||
<terminal-log-record-tab v-if="from === fromRoute.terminalLog && targetTab === 'recordTab'" :from="from" :obj="obj" :tabs="tabs.terminalLog.record" @changeTab="changeTab"></terminal-log-record-tab>
|
<terminal-log-record-tab v-if="from === fromRoute.terminalLog && targetTab === 'recordTab'" :from="from" :obj="obj" :tabs="tabs.terminalLog.record" @changeTab="changeTab"></terminal-log-record-tab>
|
||||||
<terminal-log-monitor-tab v-if="from === fromRoute.terminalLog && targetTab === 'monitorTab'" :from="from" :obj="obj" :tabs="tabs.terminalLog.monitor" @changeTab="changeTab" @exit="closeSubList"></terminal-log-monitor-tab>
|
<terminal-log-monitor-tab v-if="from === fromRoute.terminalLog && targetTab === 'monitorTab'" :from="from" :obj="obj" :tabs="tabs.terminalLog.monitor" @changeTab="changeTab" @exit="closeSubList"></terminal-log-monitor-tab>
|
||||||
|
|
||||||
<asset-tab v-if="from === fromRoute.dc && targetTab === 'asset'" :tabs="tabs.dc.asset" ref="assetTab" :from="from" :obj="obj" @changeTab="changeTab" @exit="closeSubList"></asset-tab>
|
<asset-tab v-if="from === fromRoute.dc && targetTab === 'asset'" :tabs="tabs.dc.asset" ref="assetTab" :from="from" :obj="obj" @changeTab="changeTab" @exit="closeSubList" :targetTab.sync="targetTab"></asset-tab>
|
||||||
|
|
||||||
<!--user列表的两个日志-->
|
<!--user列表的两个日志-->
|
||||||
<operation-log-tab v-if="from === fromRoute.user && targetTab === 'operationLogTab'" :from="from" :obj="obj" :tabs="tabs.user.operationLog" @changeTab="changeTab"></operation-log-tab>
|
<operation-log-tab v-if="from === fromRoute.user && targetTab === 'operationLogTab'" :from="from" :obj="obj" :tabs="tabs.user.operationLog" @changeTab="changeTab"></operation-log-tab>
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
<alertMessageTabNew v-if="from === fromRoute.alertRule && targetTab === 'alertRuleAlertMessage'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertRule.alertRule" @changeTab="changeTab" :targetTab.sync="targetTab"></alertMessageTabNew>
|
<alertMessageTabNew v-if="from === fromRoute.alertRule && targetTab === 'alertRuleAlertMessage'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertRule.alertRule" @changeTab="changeTab" :targetTab.sync="targetTab"></alertMessageTabNew>
|
||||||
<alertRuleEvalLog v-if="from === fromRoute.alertRule && targetTab === 'evalLog'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertRule.alertRule" @changeTab="changeTab" :targetTab.sync="targetTab"></alertRuleEvalLog>
|
<alertRuleEvalLog v-if="from === fromRoute.alertRule && targetTab === 'evalLog'" v-show="subResizeShow" :from="from" :obj="obj" :tabs="tabs.alertRule.alertRule" @changeTab="changeTab" :targetTab.sync="targetTab"></alertRuleEvalLog>
|
||||||
<!--model 下滑-->
|
<!--model 下滑-->
|
||||||
<asset-tab v-if="(from === fromRoute.model) && targetTab === 'asset'" :tabs="tabs.model" ref="assetTab" :from="from" :obj="obj" @changeTab="changeTab" @exit="closeSubList"></asset-tab>
|
<asset-tab v-if="(from === fromRoute.model) && targetTab === 'asset'" :tabs="tabs.model" ref="assetTab" :from="from" :obj="obj" @changeTab="changeTab" @exit="closeSubList" :targetTab.sync="targetTab"></asset-tab>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="top-tool-right" v-if="!customTool">
|
<div class="top-tool-right" v-if="!customTool">
|
||||||
<div v-if="layout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20">
|
<div v-if="layout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20">
|
||||||
<search-input :searchMsg="searchMsg" position="endpoint-bottom" @search="search"></search-input>
|
<search-input :searchMsg="searchMsg" position="endpoint-bottom" @search="search" :targetTab="targetTab"></search-input>
|
||||||
</div>
|
</div>
|
||||||
<slot name="top-tool-right"></slot>
|
<slot name="top-tool-right"></slot>
|
||||||
<button v-if="layout.indexOf('elementSet') > -1" id="account-column-setting" class="top-tool-btn margin-r-20"
|
<button v-if="layout.indexOf('elementSet') > -1" id="account-column-setting" class="top-tool-btn margin-r-20"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<nz-bottom-data-list
|
<nz-bottom-data-list
|
||||||
:showTitle='showTitle'
|
:showTitle='showTitle'
|
||||||
|
:targetTab.sync="targetTab"
|
||||||
:api="url"
|
:api="url"
|
||||||
style="height: 100%"
|
style="height: 100%"
|
||||||
:custom-table-title.sync="tools.customTableTitle"
|
:custom-table-title.sync="tools.customTableTitle"
|
||||||
@@ -103,6 +104,7 @@ export default {
|
|||||||
name: this.$t('asset.state'),
|
name: this.$t('asset.state'),
|
||||||
type: 'assetState',
|
type: 'assetState',
|
||||||
label: 'stateIds',
|
label: 'stateIds',
|
||||||
|
id: 'stateIds',
|
||||||
readonly: true,
|
readonly: true,
|
||||||
disabled: false
|
disabled: false
|
||||||
}]
|
}]
|
||||||
|
|||||||
@@ -468,7 +468,8 @@ export default {
|
|||||||
placeholder: {
|
placeholder: {
|
||||||
type: String,
|
type: String,
|
||||||
default: ''
|
default: ''
|
||||||
}
|
},
|
||||||
|
targetTab: {}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// dc
|
// dc
|
||||||
@@ -1465,7 +1466,7 @@ export default {
|
|||||||
this.defaultValue != '' ? this.no_condition=this.defaultValue:''; */
|
this.defaultValue != '' ? this.no_condition=this.defaultValue:''; */
|
||||||
this.restructure_historyDate()
|
this.restructure_historyDate()
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (this.$route.path === '/asset') {
|
if (this.$route.path === '/asset' || this.targetTab === 'asset') {
|
||||||
this.getAssetStateData()
|
this.getAssetStateData()
|
||||||
}
|
}
|
||||||
if (this.$route.path === '/agent') {
|
if (this.$route.path === '/agent') {
|
||||||
|
|||||||
Reference in New Issue
Block a user