Browse Source

Merge branch 'bug_mk' into feature

feature
mk 1 year ago
parent
commit
c4a43ab8e1
  1. BIN
      src/assets/images/home/azb.png
  2. BIN
      src/assets/images/home/azbj.png
  3. BIN
      src/assets/images/home/blqsn.png
  4. BIN
      src/assets/images/home/dbry1.png
  5. BIN
      src/assets/images/home/dy.png
  6. BIN
      src/assets/images/home/dyz.png
  7. BIN
      src/assets/images/home/gqty.png
  8. BIN
      src/assets/images/home/gyg.png
  9. BIN
      src/assets/images/home/ldry.png
  10. BIN
      src/assets/images/home/lset.png
  11. BIN
      src/assets/images/home/qz.png
  12. BIN
      src/assets/images/home/sqjz.png
  13. BIN
      src/assets/images/home/wgy.png
  14. BIN
      src/assets/images/home/xdry.png
  15. BIN
      src/assets/images/home/xjcrs.png
  16. BIN
      src/assets/images/home/xjry.png
  17. BIN
      src/assets/images/home/xjyqt.png
  18. 65
      src/components/PopHomeTip/index.vue
  19. 100
      src/views/modules/base/community/communityTable.vue
  20. 5
      src/views/modules/base/community/roomForm.vue
  21. 3
      src/views/modules/base/diyInfo.vue
  22. 4
      src/views/modules/base/resi.vue
  23. 2
      src/views/modules/base/smartImport/cpts/executeTask.vue

BIN
src/assets/images/home/azb.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/images/home/azbj.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/images/home/blqsn.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
src/assets/images/home/dbry1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/assets/images/home/dy.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 887 B

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
src/assets/images/home/dyz.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/assets/images/home/gqty.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
src/assets/images/home/gyg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/assets/images/home/ldry.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 867 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/assets/images/home/lset.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/assets/images/home/qz.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/assets/images/home/sqjz.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/assets/images/home/wgy.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/assets/images/home/xdry.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/assets/images/home/xjcrs.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/assets/images/home/xjry.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/assets/images/home/xjyqt.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

65
src/components/PopHomeTip/index.vue

@ -4,8 +4,8 @@
<div style="margin-bottom: 13px">家庭类别</div>
<div v-if="homeTypeArr.length > 0">
<div class="listMsg" v-for="itm in homeTypeArr" :key="itm">
<img :src="require(`@/assets/images/home/${getHomeTypesMap(itm)[1]}.png`)" alt="" />
<span style="margin-left: 3px">{{ getHomeTypesMap(itm)[0] }}</span>
<img :src="require(`@/assets/images/home/${getHomeTypesMap(itm)}.png`)" alt="" style="width: 20px;height: 20px;"/>
<span style="margin-left: 3px">{{itm}}</span>
</div>
</div>
<div v-else>暂无</div>
@ -39,39 +39,46 @@ export default {
// Map
getHomeTypesMap(item) {
const homeTypeMap = new Map([
["partyFlag", { name: "党员", icon: "dy" }],
["subsistenceAllowanceFlag", { name: "低保人员", icon: "dbry" }],
["ensureHouseFlag", { name: "保障房人员", icon: "bzfry" }],
["unemployedFlag", { name: "失业人员", icon: "syry" }],
["fertileWomanFlag", { name: "育龄妇女", icon: "ylfn" }],
["veteranFlag", { name: "退役军人", icon: "tyjr" }],
["unitedFrontFlag", { name: "统战人员", icon: "tzry" }],
["petitionOfficerFlag", { name: "信访人员", icon: "xfry" }],
["volunteerFlag", { name: "志愿者", icon: "zyz" }],
["oldPeopleFlag", { name: "老年人", icon: "lnr" }],
["emptyNesterFlag", { name: "空巢老人", icon: "kclr" }],
["specialSupportFlag", { name: "特扶人员", icon: "tfry" }],
["disabledFlag", { name: "失能人员", icon: "snry" }],
["dementedFlag", { name: "失智人员", icon: "szry" }],
["disabilityFlag", { name: "残疾人", icon: "cjr" }],
["seriousIllnessFlag", { name: "大病人员", icon: "dbry" }],
["chronicDiseaseFlag", { name: "慢性病人员", icon: "mxbry" }],
["specialCrowdFlag", { name: "特殊人群", icon: "tsry" }],
["tenantFlag", { name: "租户", icon: "zh" }],
["floatingFlag", { name: "流动人员", icon: "ldry" }],
["liveAloneFlag", { name: "独居老人", icon: "kclr" }],
["publicWelfareFlag", { name: "公益岗人员", icon: "gyg" }],
]);
return [homeTypeMap.get(item).name, homeTypeMap.get(item).icon];
["群众", "qz"],
["流动人员", "dbry"],
["党员", "dy"],
["共青团员", "gqty"],
["残疾人", "cjr"],
["大病人员", "dbry"],
["慢病人员", "mxbry"],
["老年人", "lnr"],
["低保人员", "dbry1"],
["退役军人", "tyjr"],
["保障房人员", "bzfry"],
["育龄妇女", "ylfn"],
["特扶人员", "tfry"],
["留守儿童", "lset"],
["艾滋病人员", "azb"],
["失业人员", "syry"],
["新阶层人士", "xjcrs"],
["新就业群体", "xjyqt"],
["安置帮教", "azbj"],
["吸毒人员", "xdry"],
["社区矫正", "sqjz"],
["不良青少年", "blqsn"],
["肇事肇祸精神病", "szry"],
["邪教人员", "xjry"],
["信访人员", "xfry"],
["统战人员", "tzry"],
["志愿者", "zyz"],
["网格员", "wgy"],
["楼长", "lzdyz"],
["单元长", "dyz"],
["公益岗", "gyg"],
]);
return homeTypeMap.get(item);
},
getHomeTypes(id) {
this.$http.get(`/actual/base/organizational/structure/getResidentCategoryByHouseId?houseId=${id}`).then((res) => {
const { code, msg, data } = res.data;
if (code === 0) {
const newItem = data[0];
const itemNumOne = Object.keys(newItem).filter((key) => newItem[key] === 1);
this.homeTypeArr = itemNumOne;
this.homeTypeArr = data.categoryNameList
} else {
this.$message.error(msg);
}

100
src/views/modules/base/community/communityTable.vue

@ -16,23 +16,9 @@
uploadFile('community');
}
">
<el-button size="small" type="text" class="diy-button--other">导入小区数据</el-button>
<el-button size="small" type="text" class="diy-button--other">导入小区楼栋数据</el-button>
</el-upload>
</div>
<div class="table-more-btn">
<el-upload :headers="$getElUploadHeaders()" style="text-align: center" ref="upload_building"
:multiple="false" :show-file-list="false" :before-upload="(file) => {
beforeUpload(file, 'building');
}
" action="" accept=".xls,.xlsx" :http-request="() => {
uploadFile('building');
}
">
<el-button size="small" type="text" class="diy-button--other">导入楼栋数据</el-button>
</el-upload>
</div>
<div class="table-more-btn">
<el-upload :headers="$getElUploadHeaders()" style="text-align: center" ref="upload_room"
:multiple="false" :show-file-list="false" :before-upload="(file) => {
@ -64,14 +50,14 @@
<div>
<el-popover popper-class="btn-popper" placement="bottom" style="margin-left: 10px" width="20"
trigger="click">
<div v-if="showImportBtn" class="table-more-btn">
<!-- <div v-if="showImportBtn" class="table-more-btn">
<el-button class="diy-button--other" size="small" type="text"
@click="handleExportModule('community')">下载小区模板</el-button>
</div>
</div> -->
<div v-if="showImportBtn" class="table-more-btn">
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@click="handleExportModule('building')">下载楼栋模板</el-button>
@click="handleExportModule('building')">下载小区楼栋模板</el-button>
</div>
<div v-if="showImportBtn" class="table-more-btn">
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@ -79,7 +65,7 @@
</div>
<div class="table-more-btn">
<el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
@click="handleExportIDCard()">下载电子门牌二维码</el-button>
@click="handleExportIDCard()">下载电子门牌</el-button>
</div>
<!-- <div
v-if="
@ -336,6 +322,8 @@ export default {
queryConditions: [],
uploadType:null
};
},
@ -845,20 +833,17 @@ export default {
handleExportModule(type) {
let title = "";
let url = "";
if (type === "community") {
title = "小区导入模板";
url = "/gov/org/neighborhood/exporttemplate";
} else if (type === "building") {
let url = "/actual/base/intelligentImportData/autoGenerateExcelModule";
let params = {
importCategory:''
};
if (type === "building") {
title = "楼栋导入模板";
url = "/gov/org/building/exporttemplate";
params.importCategory = 'BUILDING_INFO'
} else if (type === "room") {
title = "房屋导入模板";
url = "/gov/org/house/exporttemplate";
params.importCategory = 'HOUSE_INFO'
}
let params = {};
app.ajax.exportFilePost(
url,
params,
@ -878,7 +863,7 @@ export default {
title = title + "电子门牌信息";
let url = "/actual/base/communityHouse/downloadZip";
console.log(this.agencyObj)
this.startLoading('正在生成,请稍候...')
this.startLoading('正在生成,需要几分钟时间,请耐心等待...')
let params = {
pageSize:this.pageSize,
pageNo:this.pageNo,
@ -1013,6 +998,7 @@ export default {
},
async uploadFile(type) {
this.uploadType = type;
if (this.fileName == "") {
this.$message.warning("请选择要上传的文件!");
return false;
@ -1029,7 +1015,7 @@ export default {
than.$router.replace('/main/importRecord-index');
})
//
let url = "";
let url = "/actual/base/intelligentImportData/uploadFile";
let fileFormData = new FormData();
fileFormData.append("file", this.files); //filenamefiletest.zip
@ -1042,14 +1028,8 @@ export default {
if (type === "community") {
this.importCommunityLoading = true;
this.$refs["upload_community"].clearFiles();
url = "/actual/base/communityQuarters/neighborhoodimport";
} else if (type === "building") {
this.$refs["upload_building"].clearFiles();
url = "/actual/base/communityBuilding/buildingimport";
this.importBuildingLoading = true;
} else if (type === "room") {
} else if (type === "room") {
this.$refs["upload_room"].clearFiles();
url = "/actual/base/communityHouse/houseimport";
this.importRoomLoading = true;
}
@ -1058,7 +1038,7 @@ export default {
fileFormData,
(data, rspMsg) => {
if (data.code === 0 && data.msg == "success") {
// this.$message.success('')
this.checkExtractExcelHead(data.data.fileName,data.data.url,type === 'community'?'BUILDING_INFO':'HOUSE_INFO')
} else {
// this.$message({
// showClose: true,
@ -1073,8 +1053,6 @@ export default {
// this.showMessage(rspMsg)
if (type === "community") {
this.importCommunityLoading = false;
} else if (type === "building") {
this.importBuildingLoading = false;
} else if (type === "room") {
this.importRoomLoading = false;
}
@ -1082,9 +1060,7 @@ export default {
(rspMsg, data) => {
if (type === "community") {
this.importCommunityLoading = false;
} else if (type === "building") {
this.importBuildingLoading = false;
} else if (type === "room") {
} else if (type === "room") {
this.importRoomLoading = false;
}
// this.$message.error(rspMsg)
@ -1092,7 +1068,41 @@ export default {
{ headers: { "Content-Type": "multipart/form-data" } }
);
},
async checkExtractExcelHead(originFileName,originalFilePath,importCategory) {
const url = "/actual/base/intelligentImportData/extractExcelHead";
let params = {
originFileName,
originalFilePath,
importCategory,
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.fileCode = data.fileCode;
this.saveImportResiHouseExcel(originFileName)
} else if (code >= 8000) {
this.$message.err(msg);
this.dataListLoading = false;
}
},
async saveImportResiHouseExcel(originFileName) {
const { fileCode ,uploadType} = this;
const formData = new FormData();
let json = uploadType === 'community'?'{"所属社区":"所属社区","所属网格":"所属网格","所属小区":"所属小区","所属楼栋":"所属楼栋","所属单元":"所属单元","门牌号":"门牌号","姓名":"居民姓名","联系电话":"联系电话","证件号":"证件号","低保类别":"低保类型","因病":"因病","因残":"因残","低收入":"低收入"}':'{"所属网格":"所属网格","所属小区":"所属小区","所属楼栋":"所属楼栋","所属单元":"所属单元","门牌号":"门牌号","房屋类型":"房屋类型","居住用途":"居住用途","房屋状态":"房屋状态","房主姓名":"房主姓名","房主电话":"房主电话","房主身份证":"房主身份证","党员中心户":"党员中心户","五好家庭":"五好家庭","模范之家":"模范之家","功臣之家":"功臣之家","光荣之家":"光荣之家"}'
formData.append("columnMateJson", json);
formData.append("fileCode", fileCode);
formData.append("taskName", originFileName);
await this.$http
.post(
"/actual/base/intelligentImportData/importResiHouseExcel",
formData
)
.then((res) => {
this.$message.success('导入成功')
})
.catch((err) => {
this.$message.error(err)
});
},
showMessage(msg) {
this.$alert(msg, "操作结果", {
confirmButtonText: "关闭",

5
src/views/modules/base/community/roomForm.vue

@ -77,7 +77,7 @@
<a style="margin-left: 10px;"
class="div-table-button--blue"
:href="dataForm.houseQrcodeUrl"
target="_blank" @click="downloadQR"><i class="el-icon-download"></i>下载电子门牌二维码</a>
target="_blank" @click="downloadQR"><i class="el-icon-download"></i>下载电子门牌</a>
</div>
</el-form-item>
@ -289,6 +289,7 @@ export default {
console.log(this.houseId)
let url = "/actual/base/communityHouse/createHouseQrcode/";
console.log(url)
this.startLoading('正在生成,需要几分钟时间,请耐心等待...')
let params={
id:this.houseId
}
@ -316,6 +317,7 @@ export default {
if (window.navigator && window.navigator.msSaveOrOpenBlob) {
window.navigator.msSaveOrOpenBlob(csvData, downFileName);
this.endLoading()
}
// for Non-IE (chrome, firefox etc.)
else {
@ -328,6 +330,7 @@ export default {
a.click();
a.remove();
window.URL.revokeObjectURL(url);
this.endLoading()
}
},

3
src/views/modules/base/diyInfo.vue

@ -304,10 +304,11 @@ export default {
if (this.form.isSaveTemp && !this.form.name) return this.$message.error('请输入模板名称')
this.exportLoading = true
this.exportTemplate()
this.$emit('close')
},
handleExportTemplate(id) {
this.exportTemplate(id)
this.$emit('close')
},
async exportTemplate(id) {
let url = "/actual/base/residentBaseInfo/exportExcelCustom"

4
src/views/modules/base/resi.vue

@ -351,10 +351,6 @@ export default {
exportList: [],
diyDialog: false,
exportList: [],
diyDialog: false,
treeData: [],
autoOpenArr: [],
selTreeObj: {},

2
src/views/modules/base/smartImport/cpts/executeTask.vue

@ -230,7 +230,7 @@ export default {
async cancelTask() {
let url = "/actual/base/intelligentImportData/cancelTask";
let parm = {
fileCode: this.fileCode,
fileCode: this.fileCode||this.fileCodeRow ,
taskId: this.taskId,
};
let { data, code, msg } = await requestPost(url, parm);

Loading…
Cancel
Save