elink-star
/
epmet-work-pc
17
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' into preview

V1.0
duanliangtao 2 years ago
parent
4061ddda93 e46da0377f
commit
c7dcda52dc
2 changed files with 201 additions and 33 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. 124
      src/views/modules/shequzhili/event/eventList.vue
  2. 110
      src/views/modules/shequzhili/eventOld/eventList.vue

124
src/views/modules/shequzhili/event/eventList.vue
View File

@ -5,12 +5,16 @@
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'"> <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<div> <div>
<el-form-item label="所属组织" prop="gridId"> <el-form-item label="所属组织" prop="gridId">
<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small"
clearable> <el-cascader class="u-item-width-normal"
<el-option v-for="item in gridList" :key="item.value" :label="item.label" size="small"
:value="item.value"> ref="myCascader"
</el-option> v-model="formData.agencyId"
</el-select> :options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"
clearable></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="上报渠道" prop="sourceType"> <el-form-item label="上报渠道" prop="sourceType">
<el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
@ -271,11 +275,25 @@ export default {
// return time.getTime() > nowData; // return time.getTime() > nowData;
// }; // };
let orgOptionProps = {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
}
return { return {
pageType: "list", // 列表list 新增add 处理dispose 详情info pageType: "list", // 列表list 新增add 处理dispose 详情info
user: {}, user: {},
agencyId: "", agencyId: "",
gridList: [], //所属网格list--场所区域 orgOptions: [],
orgOptionProps,
level: '',
optionsG: [],
sarr: [],
tableData: [], tableData: [],
statusArray: [ statusArray: [
{ {
@ -313,7 +331,7 @@ export default {
], ],
formData: { formData: {
gridId: "", agencyId: "",
sourceType: "", sourceType: "",
eventContent: "", eventContent: "",
name: "", name: "",
@ -372,7 +390,9 @@ export default {
mounted() { mounted() {
this.user = this.$store.state.user; this.user = this.$store.state.user;
this.agencyId = this.user.agencyId; this.agencyId = this.user.agencyId;
this.loadGrid();
this.getOrgTreeList()
this.getGridList()
this.getTableData(); this.getTableData();
this.getCateOptions(); this.getCateOptions();
}, },
@ -441,19 +461,6 @@ export default {
this.getTableData(); this.getTableData();
}, },
async loadGrid() {
const url = "/gov/org/customergrid/gridoption";
let params = {
agencyId: this.agencyId,
purpose: "query",
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.gridList = data;
} else {
this.$message.error(msg);
}
},
async handleExport() { async handleExport() {
const url = "/governance/icEvent/export"; const url = "/governance/icEvent/export";
@ -677,6 +684,18 @@ export default {
if (this.eventTypeCheck) { if (this.eventTypeCheck) {
this.formData.secondIdList = this.eventTypeCheck this.formData.secondIdList = this.eventTypeCheck
} }
// 处理 agencyId
if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
if(this.level=="grid"){
this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
this.formData.agencyId = "";
}else{
this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
}
} else {
this.formData.agencyId = "";
}
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
pageSize, pageSize,
@ -710,9 +729,68 @@ export default {
this.getTableData(); this.getTableData();
}, },
getOrgTreeList () {
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取组织树成功', res.data)
this.orgOptions = []
this.orgOptions.push(res.data)
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getGridList () {
this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose: 'addorupdate' })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
handleChangeAgency (val) {
this.sarr = []
const map = new Map();
this.getLastItem(
this.orgOptions,
val,
"agencyId"
);
this.level = this.sarr[this.sarr.length - 1].level
},
getLastItem (list, vals, key) {
let LIST = list || [];
for (let item of LIST) {
// console.log(item[key]);
for (let i of vals) {
if (item[key] === i) {
this.sarr.push(item);
} else {
this.getLastItem(item.subAgencyList, vals, key);
}
}
}
},
resetSearch() { resetSearch() {
this.formData = { this.formData = {
gridId: "", agencyId: "",
sourceType: "", sourceType: "",
eventContent: "", eventContent: "",
name: "", name: "",

110
src/views/modules/shequzhili/eventOld/eventList.vue
View File

@ -4,13 +4,16 @@
<div class="m-search"> <div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'"> <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<div> <div>
<el-form-item label="所属网格" prop="gridId"> <el-form-item label="所属网格" prop="agencyId">
<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" <el-cascader class="u-item-width-normal"
clearable> size="small"
<el-option v-for="item in gridList" :key="item.value" :label="item.label" ref="myCascader"
:value="item.value"> v-model="formData.agencyId"
</el-option> :options="orgOptions"
</el-select> :props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"
clearable></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="上报渠道" prop="sourceType"> <el-form-item label="上报渠道" prop="sourceType">
<el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable <el-select v-model="formData.sourceType" placeholder="请选择" size="small" clearable
@ -257,6 +260,14 @@ export default {
return time.getTime() > nowData; return time.getTime() > nowData;
}; };
let orgOptionProps = {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
}
return { return {
pageType: "list", // 列表list 新增add 处理dispose 详情info pageType: "list", // 列表list 新增add 处理dispose 详情info
user: {}, user: {},
@ -264,6 +275,12 @@ export default {
gridList: [], //所属网格list--场所区域 gridList: [], //所属网格list--场所区域
tableData: [], tableData: [],
orgOptions: [],
orgOptionProps,
level: '',
optionsG: [],
sarr: [],
statusArray: [ statusArray: [
{ {
value: "processing", value: "processing",
@ -322,7 +339,8 @@ export default {
], ],
formData: { formData: {
gridId: "", agencyId: "",
gridId:"",
sourceType: "", sourceType: "",
eventContent: "", eventContent: "",
name: "", name: "",
@ -383,7 +401,8 @@ export default {
mounted() { mounted() {
this.user = this.$store.state.user; this.user = this.$store.state.user;
this.agencyId = this.user.agencyId; this.agencyId = this.user.agencyId;
this.loadGrid(); this.getOrgTreeList()
this.getGridList()
this.getTableData(); this.getTableData();
this.getCateOptions(); this.getCateOptions();
}, },
@ -588,6 +607,18 @@ export default {
if (this.eventTypeCheck) { if (this.eventTypeCheck) {
this.formData.secondIdList = this.eventTypeCheck this.formData.secondIdList = this.eventTypeCheck
} }
// 处理 agencyId
if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
if(this.level=="grid"){
this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
this.formData.agencyId = "";
}else{
this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
}
} else {
this.formData.agencyId = "";
}
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
pageSize, pageSize,
@ -665,7 +696,7 @@ export default {
}, },
resetSearch() { resetSearch() {
this.formData = { this.formData = {
gridId: "", agencyId: "",
sourceType: "", sourceType: "",
eventContent: "", eventContent: "",
name: "", name: "",
@ -682,6 +713,65 @@ export default {
this.getTableData(); this.getTableData();
// this.loadTable() // this.loadTable()
}, },
getOrgTreeList () {
this.$http
.post('/gov/org/customeragency/agencygridtree', {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取组织树成功', res.data)
this.orgOptions = []
this.orgOptions.push(res.data)
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getGridList () {
this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose: 'addorupdate' })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
handleChangeAgency (val) {
this.sarr = []
const map = new Map();
this.getLastItem(
this.orgOptions,
val,
"agencyId"
);
this.level = this.sarr[this.sarr.length - 1].level
},
getLastItem (list, vals, key) {
let LIST = list || [];
for (let item of LIST) {
// console.log(item[key]);
for (let i of vals) {
if (item[key] === i) {
this.sarr.push(item);
} else {
this.getLastItem(item.subAgencyList, vals, key);
}
}
}
},
//重构树，去除网格 //重构树，去除网格
deepTree(arr, children) { deepTree(arr, children) {
if (Array.isArray(arr) && arr.length > 0) { if (Array.isArray(arr) && arr.length > 0) {

Write Preview
Loading…
Cancel
Save