Browse Source

【PC端优化】前端优化-王公峰-2020-07-29

master
wanggongfeng 6 years ago
parent
commit
4dd1237c59
  1. 21
      src/views/modules/analysis/issue/latest-issue-list.vue
  2. 19
      src/views/modules/analysis/item/report-unsolved-item-list.vue
  3. 8
      src/views/modules/sys/totalconfig-list.vue

21
src/views/modules/analysis/issue/latest-issue-list.vue

@ -10,25 +10,24 @@
<el-input v-model="dataForm.issueContent" placeholder="议题摘要" clearable @keyup.native="btKeyUpissueContent" ></el-input>
</el-form-item>
<br>
<el-form-item label="时间"
prop="startTime" label-width="68px">
<el-form-item label="发布时间" prop="startTime" label-width="68px">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
placeholder="选择日期时间"
style="width:200px">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
placeholder="选择日期时间"
style="width:200px">
</el-date-picker>
</el-form-item>
<el-form-item>
@ -88,17 +87,17 @@ export default {
},
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},

19
src/views/modules/analysis/item/report-unsolved-item-list.vue

@ -2,7 +2,7 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-news__topic}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
<el-form-item label="上报到网格化平台的街道">
<el-form-item label="上报到网格化平台的街道" label-width="170px">
<el-cascader v-model="streetIds" :options="streetOptions" :props="{ checkStrictly: true }" clearable filterable style="width:200px"></el-cascader>
</el-form-item>
<el-form-item label="项目来源区域">
@ -12,25 +12,24 @@
<el-input v-model="dataForm.searchContent" placeholder="项目摘要" clearable @keyup.native="btKeyUpsearchContent" style="width:200px"></el-input>
</el-form-item>
<div class="block">
<el-form-item label="上报网格化平台时间"
prop="reportStartTime" label-width="166px">
<el-form-item label="上报网格化平台时间" prop="reportStartTime" label-width="170px">
<el-date-picker v-model="dataForm.reportStartTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间" style="width:200px">
placeholder="选择日期时间"
style="width:200px">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="reportEndTime">
<el-form-item label="至" prop="reportEndTime">
<el-date-picker v-model="dataForm.reportEndTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间" style="width:200px">
placeholder="选择日期时间"
style="width:200px">
</el-date-picker>
</el-form-item>
<el-form-item>
@ -90,7 +89,7 @@ export default {
},
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
let beginDateVal = this.dataForm.reportEndTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
@ -98,7 +97,7 @@ export default {
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
let EndDateVal = this.dataForm.reportStartTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}

8
src/views/modules/sys/totalconfig-list.vue

@ -39,11 +39,11 @@
</template>
</el-table-column>
<el-table-column prop="totalName" label="统计名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="totalType" label="统计类型" header-align="center" align="center" width="150"></el-table-column>
<el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center"></el-table-column>
<el-table-column prop="spec" label="规格" header-align="center" align="center"></el-table-column>
<el-table-column prop="totalType" label="统计类型" header-align="center" align="center" width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="totalStyle" label="统计方式" :formatter="totalStyleFormatter" header-align="center" align="center" width="150"></el-table-column>
<el-table-column prop="spec" label="规格" header-align="center" align="center" width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center" width="90"></el-table-column>
<el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center" width="150"></el-table-column>
<el-table-column prop="mustFlag" label="是否必须输入" :formatter="mustFlagFormatter" header-align="center" align="center" width="150"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">

Loading…
Cancel
Save