修改UAT提出的问题

This commit is contained in:
范强强
2023-05-10 11:04:46 +08:00
parent 50482a7ec6
commit bb19525560
2 changed files with 59 additions and 58 deletions
@@ -43,40 +43,39 @@
</a-select> </a-select>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <template v-if="toggleSearchStatus">
<div class="box-title-text"> <a-col :md="6" :sm="8">
<div class="title-text" :title="$t('standardNo')"> <div class="box-title-text">
<span>{{ $t('standardNo') }}</span> <div class="title-text" :title="$t('standardNo')">
<span>{{ $t('standardNo') }}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardNo')"
v-model="queryParam.serialNumber"></j-input>
</div> </div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardNo')" </a-col>
v-model="queryParam.serialNumber"></j-input> <a-col :md="6" :sm="8">
</div> <div class="box-title-text">
</a-col> <div class="title-text" :title="$t('statisticalNodes')">
<a-col :md="6" :sm="8"> <span>{{ $t('statisticalNodes') }}</span>
<div class="box-title-text"> </div>
<div class="title-text" :title="$t('statisticalNodes')"> <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
<span>{{ $t('statisticalNodes') }}</span> allowClear
</div> class="box-input"
<a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')" show-search
allowClear optionFilterProp="label"
class="box-input" :getPopupContainer="triggerNode=> triggerNode.parentNode"
show-search v-model="queryParam.firstLevelDutyTerritory">
optionFilterProp="label" <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :key="key"
v-model="queryParam.firstLevelDutyTerritory"> :label="item.key"
<a-select-option v-for="(item, key) in firstLevelDutyTerritoryList" :value="item.key">
:key="key"
:label="item.key"
:value="item.key">
<span style="display: inline-block;width: 100%" :title=" item.key "> <span style="display: inline-block;width: 100%" :title=" item.key ">
{{ item.key }} {{ item.key }}
</span> </span>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
</a-col> </a-col>
<template v-if="toggleSearchStatus">
</template> </template>
<span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons"> <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
@@ -85,10 +84,10 @@
<globalAdvancedQuery ref="globalAdvancedQueryRef" <globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery" @handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/> :fieldList="fieldList"/>
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">--> <a @click="handleToggleSearch" style="margin-left: 8px">
<!-- {{ !toggleSearchStatus ? $t('open') : $t('away') }}--> {{ !toggleSearchStatus ? $t('open') : $t('away') }}
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>--> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
<!-- </a>--> </a>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
@@ -68,29 +68,31 @@
</a-input-group> </a-input-group>
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <template v-if="toggleSearchStatus">
<div class="box-title-text"> <a-col :md="6" :sm="8">
<div class="title-text" :title="$t('statisticalNodes')"> <div class="box-title-text">
<span>{{ $t('statisticalNodes') }}</span> <div class="title-text" :title="$t('statisticalNodes')">
</div> <span>{{ $t('statisticalNodes') }}</span>
<a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')" </div>
allowClear <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
show-search allowClear
class="box-input" show-search
optionFilterProp="label" class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" optionFilterProp="label"
v-model="queryParam.firstLevelDutyTerritory"> :getPopupContainer="triggerNode=> triggerNode.parentNode"
<a-select-option v-for="(item, key) in firstLevelDutyTerritoryList" v-model="queryParam.firstLevelDutyTerritory">
:key="key" <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
:label="item.key" :key="key"
:value="item.key"> :label="item.key"
:value="item.key">
<span style="display: inline-block;width: 100%" :title=" item.key "> <span style="display: inline-block;width: 100%" :title=" item.key ">
{{ item.key }} {{ item.key }}
</span> </span>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
</a-col> </a-col>
</template>
<!-- <template v-if="toggleSearchStatus">--> <!-- <template v-if="toggleSearchStatus">-->
<!-- <a-col :md="6" :sm="8">--> <!-- <a-col :md="6" :sm="8">-->
<!-- <div class="box-title-text">--> <!-- <div class="box-title-text">-->
@@ -120,10 +122,10 @@
<globalAdvancedQuery ref="globalAdvancedQueryRef" <globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery" @handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/> :fieldList="fieldList"/>
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">--> <a @click="handleToggleSearch" style="margin-left: 8px">
<!-- {{ !toggleSearchStatus ? $t('open') : $t('away') }}--> {{ !toggleSearchStatus ? $t('open') : $t('away') }}
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>--> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
<!-- </a>--> </a>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>