elink-star
/
epmet-oper-gov
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-statics' into dev

test
13176889840 3 years ago
parent
3c5f1f443f 9d9c44058f
commit
46eca8467d
2 changed files with 38 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src/views/modules/shequzhili/statics/cEvent.vue
  2. 25
      src/views/modules/shequzhili/statics/gridEvent.vue

39
src/views/modules/shequzhili/statics/cEvent.vue
View File

@ -13,16 +13,16 @@
</template> --> </template> -->
</el-form-item> </el-form-item>
<el-form-item label="时间范围" <el-form-item label="时间范围"
prop="startTime"> prop="startDate">
<el-date-picker v-model="timeRange" <el-date-picker v-model="timeRange"
type="daterange" type="datetimerange"
clearable clearable
size="small" size="small"
:picker-options="pickerOptions" :picker-options="pickerOptions"
range-separator="至" range-separator="至"
start-placeholder="选择日期" start-placeholder="选择日期"
end-placeholder="选择日期" end-placeholder="选择日期"
value-format="yyyyMMdd"> value-format="yyyyMMddHHmmss">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -48,8 +48,14 @@
:height="tableHeight"> :height="tableHeight">
<!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> --> <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
<el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
<el-table-column min-width="100" prop="orgName" label="所属社区" header-align="center" align="center" >
<template slot-scope="scope">
<span v-if="scope.row.orgType==='agency'"><a class="name-a" style="color: #2195fe;" @click="handleClick(scope.row)">{{scope.row.orgName}}</a></span>
<span v-else>{{scope.row.orgName}}</span>
</template>
</el-table-column>
<el-table-column min-width="100" prop="memberCount" label="网格员数" header-align="center" align="center" /> <el-table-column min-width="100" prop="memberCount" label="网格员数" header-align="center" align="center" />
<el-table-column min-width="100" prop="orgName" label="所属社区" header-align="center" align="center" />
<el-table-column min-width="100" prop="projectCount" label="上报数量" header-align="center" align="center" /> <el-table-column min-width="100" prop="projectCount" label="上报数量" header-align="center" align="center" />
<el-table-column min-width="110" prop="closedCount" label="办结数" header-align="center" align="center" /> <el-table-column min-width="110" prop="closedCount" label="办结数" header-align="center" align="center" />
<el-table-column min-width="110" prop="projectAve" label="人均上报" header-align="center" align="center" /> <el-table-column min-width="110" prop="projectAve" label="人均上报" header-align="center" align="center" />
@ -78,8 +84,9 @@
style="width: 100%" style="width: 100%"
height="200"> height="200">
<!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> --> <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
<el-table-column min-width="100" prop="memberCount" label="网格员数" header-align="center" align="center" />
<el-table-column min-width="100" prop="orgName" label="所属社区" header-align="center" align="center" /> <el-table-column min-width="100" prop="orgName" label="所属社区" header-align="center" align="center" />
<el-table-column min-width="100" prop="memberCount" label="网格员数" header-align="center" align="center" />
<el-table-column min-width="100" prop="projectCount" label="上报数量" header-align="center" align="center" /> <el-table-column min-width="100" prop="projectCount" label="上报数量" header-align="center" align="center" />
<el-table-column min-width="110" prop="closedCount" label="办结数" header-align="center" align="center" /> <el-table-column min-width="110" prop="closedCount" label="办结数" header-align="center" align="center" />
<el-table-column min-width="110" prop="projectAve" label="人均上报" header-align="center" align="center" /> <el-table-column min-width="110" prop="projectAve" label="人均上报" header-align="center" align="center" />
@ -109,15 +116,15 @@ export default {
totalVisible: false, totalVisible: false,
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() > (Date.now() - 3600 * 1000 * 24); return time.getTime() > Date.now();
}, },
}, },
dataList: [], dataList: [],
timeRange: '', timeRange: '',
dataForm: { dataForm: {
agencyId: '', agencyId: '',
startTime: '', startDate: '',
endTime: '', endDate: '',
type: '' type: ''
}, },
total: 0, total: 0,
@ -137,11 +144,11 @@ export default {
watch: { watch: {
timeRange (val) { timeRange (val) {
if (Array.isArray(val) && val.length == 2) { if (Array.isArray(val) && val.length == 2) {
this.dataForm.startTime = val[0]; this.dataForm.startDate = val[0];
this.dataForm.endTime = val[1]; this.dataForm.endDate = val[1];
} else { } else {
this.dataForm.startTime = ""; this.dataForm.startDate = "";
this.dataForm.endTime = ""; this.dataForm.endDate = "";
} }
} }
}, },
@ -154,11 +161,15 @@ export default {
}, },
}, },
methods: { methods: {
handleClick(row) {
this.dataForm.agencyId = row.orgId
this.handleSearch()
},
resetForm(formName) { resetForm(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.timeRange = ""; this.timeRange = "";
this.dataForm.startTime = ""; this.dataForm.startDate = "";
this.dataForm.endTime = ""; this.dataForm.endDate = "";
this.dataForm.type = ""; this.dataForm.type = "";
this.pageNo = 1 this.pageNo = 1
this.getTableList() this.getTableList()

25
src/views/modules/shequzhili/statics/gridEvent.vue
View File

@ -17,16 +17,16 @@
</template> --> </template> -->
</el-form-item> </el-form-item>
<el-form-item label="时间范围" <el-form-item label="时间范围"
prop="startTime"> prop="startDate">
<el-date-picker v-model="timeRange" <el-date-picker v-model="timeRange"
type="daterange" type="datetimerange"
clearable clearable
size="small" size="small"
:picker-options="pickerOptions" :picker-options="pickerOptions"
range-separator="至" range-separator="至"
start-placeholder="选择日期" start-placeholder="选择日期"
end-placeholder="选择日期" end-placeholder="选择日期"
value-format="yyyyMMdd"> value-format="yyyyMMddHHmmss">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -52,6 +52,7 @@
:height="tableHeight"> :height="tableHeight">
<!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> --> <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
<el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
<el-table-column min-width="100" prop="staffName" label="网格员" header-align="center" align="center" /> <el-table-column min-width="100" prop="staffName" label="网格员" header-align="center" align="center" />
<el-table-column min-width="100" prop="orgName" label="所属社区" header-align="center" align="center" /> <el-table-column min-width="100" prop="orgName" label="所属社区" header-align="center" align="center" />
<el-table-column min-width="100" prop="projectCount" label="上报数量" header-align="center" align="center" /> <el-table-column min-width="100" prop="projectCount" label="上报数量" header-align="center" align="center" />
@ -110,14 +111,14 @@ export default {
totalVisible: false, totalVisible: false,
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() > (Date.now() - 3600 * 1000 * 24); return time.getTime() > Date.now();
}, },
}, },
timeRange: '', timeRange: '',
dataForm: { dataForm: {
orgId: '', orgId: '',
startTime: '', startDate: '',
endTime: '', endDate: '',
orgType: '' orgType: ''
}, },
total: 0, total: 0,
@ -138,11 +139,11 @@ export default {
watch: { watch: {
timeRange (val) { timeRange (val) {
if (Array.isArray(val) && val.length == 2) { if (Array.isArray(val) && val.length == 2) {
this.dataForm.startTime = val[0]; this.dataForm.startDate = val[0];
this.dataForm.endTime = val[1]; this.dataForm.endDate = val[1];
} else { } else {
this.dataForm.startTime = ""; this.dataForm.startDate = "";
this.dataForm.endTime = ""; this.dataForm.endDate = "";
} }
} }
}, },
@ -165,8 +166,8 @@ export default {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.timeRange = ""; this.timeRange = "";
this.orgId = '' this.orgId = ''
this.dataForm.startTime = ""; this.dataForm.startDate = "";
this.dataForm.endTime = ""; this.dataForm.endDate = "";
this.dataForm.orgType = ""; this.dataForm.orgType = "";
this.handleSearch(); this.handleSearch();
}, },

Write Preview
Loading…
Cancel
Save