WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
gaosong
2022-08-10 17:41:23 +08:00
parent 3a3d846e93 b5e8f752e6
commit d27ce381f0
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/externalReports/index.vue
+2 -1
View File
@@ -84,8 +84,9 @@
</div> </div>
<!-- :placeholder="$t('PleaseSelect')+$t('uploadTime')"--> <!-- :placeholder="$t('PleaseSelect')+$t('uploadTime')"-->
<a-range-picker <a-range-picker
style='width: 264px' class="box-input"
@change="onChange" @change="onChange"
style='margin-left: -1px'
format="YYYY-MM-DD" format="YYYY-MM-DD"
:getCalendarContainer="(trigger) => trigger.parentNode" :getCalendarContainer="(trigger) => trigger.parentNode"
v-model="queryParams.time" v-model="queryParams.time"
jero-web/src/views/parameter/parameterexport/index.vue
+1 -1
View File
@@ -37,7 +37,7 @@
size="middle" size="middle"
:loading="loading" :loading="loading"
:pagination="false" :pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 130px)'}" :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
rowKey="id" rowKey="id"
:data-source="dataSource" :data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue
+1 -1
View File
@@ -5,7 +5,7 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="10"> <a-col :md="6" :sm="10">
<a-form-item :label="$t('Collectlist')"> <a-form-item :label="$t('Collectlist')">
<a-select v-model="queryParam.ctype" @change="getonChange"> <a-select v-model="queryParam.ctype" @change="getonChange" :getPopupContainer="triggerNode => triggerNode.parentNode">
<a-select-option v-for="d in options" :key="d.value" :value="d.value" >{{ d.label }}</a-select-option> <a-select-option v-for="d in options" :key="d.value" :value="d.value" >{{ d.label }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>