diff --git a/src/views/modules/analysis/item/item-detail-view.vue b/src/views/modules/analysis/item/item-detail-view.vue index 7c670286..a75886af 100644 --- a/src/views/modules/analysis/item/item-detail-view.vue +++ b/src/views/modules/analysis/item/item-detail-view.vue @@ -109,8 +109,8 @@ - - + + @@ -433,4 +433,8 @@ export default { float:left; } } + .el-pagination{ + margin-top: 10px; + text-align: right; + } diff --git a/src/views/modules/custom/gridoperatorinfo-add-or-update.vue b/src/views/modules/custom/gridoperatorinfo-add-or-update.vue index f88bda54..39b85c56 100755 --- a/src/views/modules/custom/gridoperatorinfo-add-or-update.vue +++ b/src/views/modules/custom/gridoperatorinfo-add-or-update.vue @@ -8,14 +8,14 @@ ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"> + prop="realName" style="width:300px"> + placeholder="性别" style="width:220px"> + prop="identityNo" style="width:300px"> + prop="mobile" style="width:300px"> @@ -40,7 +40,7 @@ :options="options" :props="{ multiple: true }" filterable - collapse-tags> + collapse-tags style="width:220px"> @@ -50,7 +50,7 @@ prop="dutyCategoryId"> + placeholder="请选择网络职责" style="width:220px"> + :label="$t('dict.sort')" style="width:220px"> diff --git a/src/views/modules/events/category-add-or-update.vue b/src/views/modules/events/category-add-or-update.vue index 06ed928a..f40c144b 100644 --- a/src/views/modules/events/category-add-or-update.vue +++ b/src/views/modules/events/category-add-or-update.vue @@ -4,9 +4,6 @@ - - - + + + - + - + - + diff --git a/src/views/modules/kpi/kpigridentity.vue b/src/views/modules/kpi/kpigridentity.vue index d5863f7d..5b42de33 100644 --- a/src/views/modules/kpi/kpigridentity.vue +++ b/src/views/modules/kpi/kpigridentity.vue @@ -13,7 +13,7 @@ > - + diff --git a/src/views/modules/kpi/kpimassevaluation.vue b/src/views/modules/kpi/kpimassevaluation.vue index ed9e03ba..cecb1fab 100644 --- a/src/views/modules/kpi/kpimassevaluation.vue +++ b/src/views/modules/kpi/kpimassevaluation.vue @@ -13,7 +13,7 @@ > - + @@ -57,8 +57,8 @@ - + diff --git a/src/views/modules/kpi/kpimattersresponse.vue b/src/views/modules/kpi/kpimattersresponse.vue index fb02d428..fffb5844 100644 --- a/src/views/modules/kpi/kpimattersresponse.vue +++ b/src/views/modules/kpi/kpimattersresponse.vue @@ -13,7 +13,7 @@ > - + diff --git a/src/views/modules/kpi/kpipublicopinion.vue b/src/views/modules/kpi/kpipublicopinion.vue index c8cbae14..de1dac04 100644 --- a/src/views/modules/kpi/kpipublicopinion.vue +++ b/src/views/modules/kpi/kpipublicopinion.vue @@ -13,7 +13,7 @@ > - + diff --git a/src/views/modules/kpi/kpitypicalculture.vue b/src/views/modules/kpi/kpitypicalculture.vue index 56eed65d..0943f3cb 100644 --- a/src/views/modules/kpi/kpitypicalculture.vue +++ b/src/views/modules/kpi/kpitypicalculture.vue @@ -13,7 +13,7 @@ style="width:250px;" > - + - + diff --git a/src/views/modules/master/masteruserrelation-add.vue b/src/views/modules/master/masteruserrelation-add.vue index 593d9049..1a92f4ff 100644 --- a/src/views/modules/master/masteruserrelation-add.vue +++ b/src/views/modules/master/masteruserrelation-add.vue @@ -11,7 +11,7 @@
{{"书记"+(index+1)+":"}}
- + {{"选择书记"}}   - + - + diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue index 4cae3afc..58c296f1 100644 --- a/src/views/modules/news/banner-add-or-update.vue +++ b/src/views/modules/news/banner-add-or-update.vue @@ -6,24 +6,21 @@ + prop="url" label-width="100px"> + prop="title" label-width="100px"> - + --> + prop="bannerType" label-width="100px"> + prop="position" label-width="100px"> + prop="imgUrl" label-width="100px"> + placeholder="类别名称" maxlength="128"> + placeholder="类别编码" maxlength="32"> + placeholder="描述" maxlength="128"> diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue index 23ae46ad..572fb63c 100644 --- a/src/views/modules/news/newsdraft.vue +++ b/src/views/modules/news/newsdraft.vue @@ -343,6 +343,14 @@ export default { return this.$message.error(res.msg) } this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data + if (this.dataList.length>0){ + this.dataList.forEach(item=>{ + let a = item.newsReleaseStartTime.substring(0,item.newsReleaseStartTime.indexOf(" ")); + let b = item.newsReleaseEndTime.substring(0,item.newsReleaseEndTime.indexOf(" ")); + item.newsReleaseStartTime = a + item.newsReleaseEndTime = b + }) + } this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0 }).catch(() => { this.dataListLoading = false @@ -352,7 +360,8 @@ export default { btKeyUpkeyword(e){ e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~!#¥%……&*()={}|《》?:“”【】\\[\]、;‘’,。、\s+]/g, '') this.dataForm.keyword = e.target.value - } + }, + }, components: { AddOrUpdate diff --git a/src/views/modules/organize/sysdeptmanagement.vue b/src/views/modules/organize/sysdeptmanagement.vue index 48b743c1..485a7313 100644 --- a/src/views/modules/organize/sysdeptmanagement.vue +++ b/src/views/modules/organize/sysdeptmanagement.vue @@ -18,7 +18,7 @@ {{scope.$index+1}} - + @@ -91,7 +91,7 @@ export default { }).catch(() => { }) }, btKeyUpName(e){ - e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~!#¥%……&*()={}|《》?:“”【】\\[\]、;‘’,。、\s+]/g, '') + e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~!#¥%……&*()={}|《》?:“”【】\\[\]、;‘’,。、\s+]/g, '') this.dataForm.name= e.target.value } } diff --git a/src/views/modules/sys/analysis-menu-add-or-update.vue b/src/views/modules/sys/analysis-menu-add-or-update.vue index f288a2b0..2fa0d1a5 100644 --- a/src/views/modules/sys/analysis-menu-add-or-update.vue +++ b/src/views/modules/sys/analysis-menu-add-or-update.vue @@ -94,6 +94,7 @@ controls-position="right" :min="0" :label="$t('menu.sort')" + style="width:200px" > + :label="$t('dept.sort')" + style="width:200px">