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

jero-web/src/views/externalReports/index.vue

@@ -84,8 +84,9 @@
                         </div>
 <!--                        :placeholder="$t('PleaseSelect')+$t('uploadTime')"-->
                         <a-range-picker
-                                       style='width: 264px'
+                                       class="box-input"
                                        @change="onChange"
+                                       style='margin-left: -1px'
                                        format="YYYY-MM-DD"
                                        :getCalendarContainer="(trigger) => trigger.parentNode"
                                        v-model="queryParams.time"

jero-web/src/views/parameter/parameterexport/index.vue

@@ -37,7 +37,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"

jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue

@@ -5,7 +5,7 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="10">
             <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>
             </a-form-item>