Browse Source

Merge remote-tracking branch 'origin/dev' into preview

* origin/dev:
  数据看板房屋概览列表总数接口传参
  导入状态点击导入记录跳转至导入记录页面
  bug#108
  数据看板滚动条高度不为0
  面包屑导航默认首页
  菜单接口修改
  迁入记录详细地址必填项
feature
luyan 3 years ago
parent
commit
e5fbe302f1
  1. 2
      src/js/store/index.js
  2. 4
      src/router/index.js
  3. 4
      src/views/dataBoard/renfang/cpts/fwgl.vue
  4. 14
      src/views/dataBoard/renfang/house/list.vue
  5. 2
      src/views/dataBoardMain/main.vue
  6. 9
      src/views/modules/base/community/buildTable.vue
  7. 10
      src/views/modules/base/community/communityTable.vue
  8. 9
      src/views/modules/base/community/roomTable.vue
  9. 9
      src/views/modules/base/huji/chusheng/index.vue
  10. 6
      src/views/modules/base/huji/immigration/edit.vue
  11. 9
      src/views/modules/base/huji/immigration/index.vue
  12. 9
      src/views/modules/base/resi copy.vue
  13. 9
      src/views/modules/base/resi.vue
  14. 9
      src/views/modules/communityParty/elegant/index.vue
  15. 9
      src/views/modules/communityParty/members/index.vue
  16. 9
      src/views/modules/communityService/shzz/index.vue
  17. 9
      src/views/modules/communityService/sqzzz/index.vue
  18. 9
      src/views/modules/communityService/worklog/workLog.vue
  19. 9
      src/views/modules/cpts/base/index.vue
  20. 9
      src/views/modules/cpts/base2/index.vue
  21. 8
      src/views/modules/home/index.vue
  22. 9
      src/views/modules/plugins/change/resichange.vue
  23. 9
      src/views/modules/plugins/change/resideath.vue
  24. 9
      src/views/modules/plugins/change/resiwelfare.vue
  25. 9
      src/views/modules/plugins/point/icpointnucleicmonitoring.vue
  26. 9
      src/views/modules/plugins/point/icpointvaccinesinoculation.vue
  27. 9
      src/views/modules/plugins/rent/resi.vue
  28. 17
      src/views/modules/shequ/chaxun.vue
  29. 9
      src/views/modules/shequzhili/csgltc/csgl.vue
  30. 9
      src/views/modules/shequzhili/ggfwtc/ggfw.vue
  31. 9
      src/views/modules/shequzhili/xiangmu/index.vue
  32. 9
      src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
  33. 9
      src/views/modules/sys/icvaccineprarmeter.vue

2
src/js/store/index.js

@ -27,7 +27,7 @@ export default new Vuex.Store({
// 内容, 是否需要刷新
contentIsNeedRefresh: false,
// 内容, 标签页(默认添加首页)
contentTabs: [],
contentTabs: [{name:"home",title:"首页"}],
contentTabsActiveName: "",
mainShuju: {

4
src/router/index.js

@ -427,7 +427,7 @@ router.beforeEach((to, from, next) => {
}
const customerId = localStorage.getItem("customerId");
console.log("customerId:", customerId);
http.get("gov/access/menu/navDigitalCommunity?tableName=data_menu").then(({
http.get("gov/access/menu/navDigitalCommunityNew?tableName=data_menu").then(({
data: res
}) => {
if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
@ -449,7 +449,7 @@ router.beforeEach((to, from, next) => {
name: "login",
});
});
http.get("gov/access/menu/navDigitalCommunity").then(({
http.get("gov/access/menu/navDigitalCommunityNew").then(({
data: res
}) => {
if (res.code == 10005 || res.code == 10006 || res.code == 10007) {

4
src/views/dataBoard/renfang/cpts/fwgl.vue

@ -25,7 +25,7 @@
</div>
<div class="pie-right">
<div class="right-row">
<div class="row-item" @click="toListPage">
<div class="row-item" @click="toListPage('all')">
<div class="item-one">
<img
class="img"
@ -42,7 +42,7 @@
<div
class="row-item marginleft10"
@click="toListPage('self_dwelling', '自住')"
@click="toListPage('self', '自住')"
>
<div class="item-one">
<img

14
src/views/dataBoard/renfang/house/list.vue

@ -1,5 +1,5 @@
<template>
<div class="g-pgi">
<div class="g-pgi" >
<!-- 组织路由 -->
<cpt-bread
:separator="'/'"
@ -162,8 +162,10 @@ export default {
this.getList();
this.getCount();
},
methods: {
handleRouter(){
document.getElementById('scT').getElementsByClassName('g-bd')[0].scrollTop = 0
},
handleClickBreadItem({ item }) {
if (item.type == "back") {
this.$router.back();
@ -236,10 +238,8 @@ export default {
this.$message.error(msg);
}
},
async getCount() {
const { org_id, houseType, pageNo, pageSize } = this;
const url = "house_list_total";
const { data, code, msg } = await requestPostBi(
@ -264,9 +264,13 @@ export default {
}
},
},
watch: {
$route(to, from){
this.handleRouter()
},
},
destroyed() {
console.log("我已经离开了!");
},
};
</script>

2
src/views/dataBoardMain/main.vue

@ -1,5 +1,5 @@
<template>
<fixed1920 class="g-fx">
<fixed1920 class="g-fx" id="g-scT">
<div v-loading.fullscreen.lock="loading" :element-loading-text="$t('loading')" :class="[
'g-pg',
{ 'z-sidebar--fold': $store.state.sidebarFold },

9
src/views/modules/base/community/buildTable.vue

@ -813,8 +813,13 @@ export default {
}
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})

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

@ -1252,10 +1252,14 @@ export default {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000,
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
//
let url = "";

9
src/views/modules/base/community/roomTable.vue

@ -897,9 +897,14 @@ export default {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
//
this.$refs["upload"].clearFiles();

9
src/views/modules/base/huji/chusheng/index.vue

@ -712,9 +712,14 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //
await this.$http

6
src/views/modules/base/huji/immigration/edit.vue

@ -368,9 +368,9 @@ export default {
sourceAddress: [
{ required: true, message: '来源地不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '详细地址不能为空', trigger: 'blur' }
]
// address: [
// { required: true, message: '', trigger: 'blur' }
// ]
}
},

9
src/views/modules/base/huji/immigration/index.vue

@ -795,9 +795,14 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //
await this.$http

9
src/views/modules/base/resi copy.vue

@ -822,9 +822,14 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //
await this.$http

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

@ -1183,9 +1183,14 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //
await this.$http

9
src/views/modules/communityParty/elegant/index.vue

@ -550,8 +550,13 @@ export default {
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData() //FormDataappend('key', value)
formData.append('file', file.file) //

9
src/views/modules/communityParty/members/index.vue

@ -641,8 +641,13 @@ export default {
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData() //FormDataappend('key', value)
formData.append('file', file.file) //

9
src/views/modules/communityService/shzz/index.vue

@ -319,8 +319,13 @@ export default {
this.getTableData();
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
})
.catch((err) => {

9
src/views/modules/communityService/sqzzz/index.vue

@ -347,9 +347,14 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //
await this.$http

9
src/views/modules/communityService/worklog/workLog.vue

@ -651,9 +651,14 @@ export default {
if (code === 0) {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
this.loadTable()
} else {

9
src/views/modules/cpts/base/index.vue

@ -510,9 +510,14 @@ export default {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //

9
src/views/modules/cpts/base2/index.vue

@ -636,9 +636,14 @@ export default {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //

8
src/views/modules/home/index.vue

@ -378,12 +378,10 @@ export default {
toSearchPage(type, searchKey) {
this.$router.push({
path: "/main/shequ-chaxun",
query: {
type,
searchKey,
},
path: "/main/shequ-chaxun"
});
localStorage.setItem('homeSearchType',type)
localStorage.setItem('homeSearchKey',searchKey)
},
handleClickSearchBtn() {

9
src/views/modules/plugins/change/resichange.vue

@ -712,8 +712,13 @@ export default {
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData() //FormDataappend('key', value)
formData.append('file', file.file) //

9
src/views/modules/plugins/change/resideath.vue

@ -768,8 +768,13 @@ export default {
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData() //FormDataappend('key', value)
formData.append('file', file.file) //

9
src/views/modules/plugins/change/resiwelfare.vue

@ -705,8 +705,13 @@ export default {
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData() //FormDataappend('key', value)
formData.append('file', file.file) //

9
src/views/modules/plugins/point/icpointnucleicmonitoring.vue

@ -492,9 +492,14 @@ export default {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
//
this.$refs["upload"].clearFiles();

9
src/views/modules/plugins/point/icpointvaccinesinoculation.vue

@ -430,9 +430,14 @@ export default {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
//
this.$refs["upload"].clearFiles();

9
src/views/modules/plugins/rent/resi.vue

@ -705,8 +705,13 @@ export default {
this.importBtnTitle = '正在上传中...'
this.$message({
showClose: true,
message: '导入中,请到系统管理-导入记录中查看进度',
duration: 0
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData() //FormDataappend('key', value)
formData.append('file', file.file) //

17
src/views/modules/shequ/chaxun.vue

@ -726,8 +726,12 @@ export default {
methods: {
firstSearch() {
console.log(getQueryPara("type"));
this.searchData.searchKey = getQueryPara("searchKey");
this.searchData.type = getQueryPara("type");
console.log(this.$route.query.type,'type');
console.log(this.$route.query.searchKey,'search');
// this.searchData.searchKey = getQueryPara("searchKey");
// this.searchData.type = getQueryPara("type");
this.searchData.searchKey = localStorage.getItem('homeSearchKey') || ''
this.searchData.type = localStorage.getItem('homeSearchType') || ''
this.handleClickSearchBtn();
},
@ -742,7 +746,6 @@ export default {
if (n.value == row[item.columnName] ) _val = n.label;
});
}
console.log(row.mobile);
if(row.mobile == '' || row.mobile == '--'){
row.mobile = ""
@ -754,11 +757,11 @@ export default {
},
handleClickSearchBtn() {
const {
searchData: { type, searchKey },
} = this;
console.log("ddddddddd",type)
localStorage.setItem('homeSearchType',type)
localStorage.setItem('homeSearchKey',searchKey)
if (!searchKey) return this.$message.error("请输入搜索条件");
if (type == "jumin") {
this.searchJumin.pageNo = 1;
@ -894,6 +897,10 @@ export default {
// this.searchData.searchKey = ''
}
},
destroyed(){
localStorage.removeItem('homeSearchKey')
localStorage.removeItem('homeSearchType')
},
};
</script>

9
src/views/modules/shequzhili/csgltc/csgl.vue

@ -546,9 +546,14 @@ export default {
if (code === 0) {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
this.loadTable()
} else {

9
src/views/modules/shequzhili/ggfwtc/ggfw.vue

@ -584,9 +584,14 @@ export default {
if (code === 0) {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
this.loadTable()
} else {

9
src/views/modules/shequzhili/xiangmu/index.vue

@ -440,9 +440,14 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const formData = new FormData(); //FormDataappend('key', value)
formData.append("file", file.file); //
await this.$http

9
src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue

@ -555,9 +555,14 @@ export default {
this.importBtnTitle = "正在上传中...";
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
const fmData = new FormData(); //FormDataappend('key', value)
fmData.append("file", file.file); //
await this.$http

9
src/views/modules/sys/icvaccineprarmeter.vue

@ -755,9 +755,14 @@ export default {
this.$message({
showClose: true,
message: "导入中,请到系统管理-导入记录中查看进度",
duration: 0,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
})
//
this.$refs["upload"].clearFiles();

Loading…
Cancel
Save