合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!42

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

@@ -72,7 +72,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -154,7 +154,7 @@ export default {
         {
           title: this.$t('NiONumber'),
           align: 'center',
-          width: '10%',
+          width: 100,
           dataIndex: 'nioNumber',
           sorter: true
         },
@@ -162,29 +162,31 @@ export default {
           title: this.$t('ParameterName'),
           align: 'center',
           dataIndex: 'paramsName',
+          width: 160,
         },
         {
           title: this.$t('ParameterDescription'),
           align: 'center',
           dataIndex: 'description',
-          scopedSlots: { customRender: 'titleName' }
+          // scopedSlots: { customRender: 'titleName' }
         },
         {
           title: this.$t('areaOfResponsibility'),
           align: 'center',
-          dataIndex: 'dutyTerritory_dictText'
+          dataIndex: 'dutyTerritory_dictText',
+          width: 150,
         },
         {
           title: this.$t('createTime'),
           align: 'center',
-          width: '10%',
-          dataIndex: 'createTime'
+          dataIndex: 'createTime',
+          width: 110,
         },
         {
           title: this.$t('operation'),
           align: 'center',
           fixed: 'right',
-          width: 200,
+          width: 100,
           scopedSlots: { customRender: 'operation' }
         }
       ],