diff --git a/src/views/media/Home/index.vue b/src/views/media/Home/index.vue index 3d0fe685..b134d3f3 100644 --- a/src/views/media/Home/index.vue +++ b/src/views/media/Home/index.vue @@ -157,6 +157,7 @@ const columns = [ title: 'ID', dataIndex: 'id', key: 'id', + ellipsis:true, search: { type: 'string', defaultTermType: 'eq', @@ -166,6 +167,7 @@ const columns = [ title: '名称', dataIndex: 'name', key: 'name', + ellipsis:true, search: { type: 'string', first: true, @@ -175,6 +177,7 @@ const columns = [ title: '通道数量', dataIndex: 'channelNumber', key: 'channelNumber', + width:100, scopedSlots: true, }, { @@ -192,6 +195,7 @@ const columns = [ return v; }, }, + width:80 }, ]; const params = ref>({}); diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue index 2a070f4c..c73a78f4 100644 --- a/src/views/notice/Template/Detail/index.vue +++ b/src/views/notice/Template/Detail/index.vue @@ -974,7 +974,7 @@ const formRules = { } ], code: [{ required: true, message: '请选择模板'}], - signName: [{ required: true, message: '请输入签名' }], + signName: [{ required: true, message: '请选择签名' }], phoneNumber: [ { max: 64, message: '最多可输入64个字符' }, { diff --git a/src/views/rule-engine/DashBoard/index.vue b/src/views/rule-engine/DashBoard/index.vue index d5ed9025..5b0d61c8 100644 --- a/src/views/rule-engine/DashBoard/index.vue +++ b/src/views/rule-engine/DashBoard/index.vue @@ -430,6 +430,9 @@ const selectChange = () => { xData.push(item.data.timeString); sData.push(item.data.value); }); + const maxY = sData.sort((a,b)=>{ + return b-a + })[0] alarmStatisticsOption.value = { xAxis: { type: 'category', @@ -448,7 +451,7 @@ const selectChange = () => { grid: { top: '2%', bottom: '5%', - left: '24px', + left: maxY > 10000 ? '50px' : '40px', right: '48px', }, series: [ diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue index 988353f5..4dc23c83 100644 --- a/src/views/system/Department/product/index.vue +++ b/src/views/system/Department/product/index.vue @@ -11,6 +11,10 @@ ref="tableRef" :request="table.requestFun" :gridColumn="2" + :scroll="{ + x:true, + y:610, + }" :params="queryParams" :rowSelection="{ selectedRowKeys: tableData._selectedRowKeys, @@ -613,6 +617,7 @@ watch(