Browse Source

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

master
wanggongfeng 5 years ago
parent
commit
0a6ac74b96
  1. 16
      src/views/modules/analysis/issue/issue-classified-statistic-second.vue
  2. 9
      src/views/modules/analysis/issue/issue-classified-statistic.vue
  3. 22
      src/views/modules/analysis/user/gridopening.vue

16
src/views/modules/analysis/issue/issue-classified-statistic-second.vue

@ -27,7 +27,8 @@
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间"
style="width:200px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" <el-form-item label="至"
@ -38,11 +39,12 @@
:picker-options="pickerBeginDateAfter" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间"
style="width:200px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
@ -100,17 +102,17 @@ export default {
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: (time) => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: (time) => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
}, },

9
src/views/modules/analysis/issue/issue-classified-statistic.vue

@ -26,6 +26,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<br>
<el-form-item label="时间" <el-form-item label="时间"
prop="startTime" label-width="70px"> prop="startTime" label-width="70px">
<el-date-picker v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
@ -33,7 +34,8 @@
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间"
style="width:200px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" <el-form-item label="至"
@ -44,11 +46,12 @@
:picker-options="pickerBeginDateAfter" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间"
style="width:200px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">

22
src/views/modules/analysis/user/gridopening.vue

@ -10,13 +10,13 @@
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable clearable
style="width:250px"></el-cascader> style="width:200px"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="排序规则"> <el-form-item label="排序规则">
<el-select v-model="dataForm.category" <el-select v-model="dataForm.category"
clearable clearable
placeholder="排序规则" placeholder="排序规则"
style="width:250px"> style="width:200px">
<el-option v-for="item in categorys" <el-option v-for="item in categorys"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
@ -25,27 +25,24 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="提交时间" <el-form-item label="发布时间" prop="startTime">
prop="startTime">
<el-date-picker v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间" placeholder="选择日期时间"
style="width:250px;"> style="width:200px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" <el-form-item label="至" prop="endTime">
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime" <el-date-picker v-model="dataForm.endTime"
type="date" type="date"
:picker-options="pickerBeginDateAfter" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间" placeholder="选择日期时间"
style="width:250px;"> style="width:200px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -328,7 +325,7 @@ export default {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
}, }
} }
}, },
created () { created () {
@ -451,11 +448,6 @@ export default {
this.dataForm.dept = choosenItem.name this.dataForm.dept = choosenItem.name
this.dataForm.deptId = choosenItem.id this.dataForm.deptId = choosenItem.id
}, },
setRegistTime () {
console.log(this.time[0])
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},
// //
getAllCount () { getAllCount () {
this.isAble = true this.isAble = true

Loading…
Cancel
Save