Browse Source

Merge branch 'xiaowang-social' into feature

dlt_lingshan_12345
是小王呀\24601 1 year ago
parent
commit
deb02754cb
  1. 4
      package.json
  2. 2
      src/assets/scss/modules/management/list-main.scss
  3. 124
      src/assets/scss/modules/management/volunteet.scss
  4. 15
      src/components/Dialog/index.vue
  5. 7
      src/components/GridTree/nodeWrap.vue
  6. 4
      src/components/ImageList/ImageList.vue
  7. 8
      src/components/JwTree/nodeWrap.vue
  8. 4
      src/components/NameSplit/index.vue
  9. 5
      src/components/PopHomeTip/index.vue
  10. 2
      src/components/PopTips/index.vue
  11. 1
      src/components/Tree/nodeWrap.vue
  12. 21
      src/components/UploadImages/UploadImages.vue
  13. 1
      src/components/ren-process-detail/src/ren-process-detail.vue
  14. 1
      src/components/ren-process-multiple/src/ren-process-multiple.vue
  15. 1
      src/components/ren-process-running/src/ren-process-running.vue
  16. 1
      src/components/ren-process-running/src/ren-task-back.vue
  17. 1
      src/components/ren-process-running/src/ren-task-entrust.vue
  18. 1
      src/components/ren-process-running/src/ren-task-handle.vue
  19. 1
      src/components/ren-process-running/src/select-user.vue
  20. 1
      src/components/ren-process-start/src/ren-process-start.vue
  21. 1
      src/components/table-tree-column/index.vue
  22. 14
      src/components/wx-index/cpt-item.vue
  23. 24
      src/components/wx-index/extended.vue
  24. 20
      src/components/wx-index/group.vue
  25. 33
      src/components/wx-index/heart.vue
  26. 5
      src/components/wx-index/issue.vue
  27. 6
      src/components/wx-index/pageHeader.vue
  28. 47
      src/components/wx-index/score.vue
  29. 2
      src/views/components/CDialog.vue
  30. 34
      src/views/components/CTable.vue
  31. 65
      src/views/components/CTableNoPage.vue
  32. 6
      src/views/components/CTree.vue
  33. 63
      src/views/components/CTreeDialogCheckBox.vue
  34. 22
      src/views/components/CTreeDialogSingle.vue
  35. 3
      src/views/components/CUpload.vue
  36. 70
      src/views/components/addResi.vue
  37. 26
      src/views/components/blackSearch.vue
  38. 14
      src/views/components/checkBox.vue
  39. 4
      src/views/components/dateShow.vue
  40. 37
      src/views/components/deathSearch.vue
  41. 5
      src/views/components/dragItem.vue
  42. 12
      src/views/components/editResi.vue
  43. 54
      src/views/components/editResiCopy.vue
  44. 5
      src/views/components/fixed1920.vue
  45. 15
      src/views/components/foldText.vue
  46. 11
      src/views/components/rangeInput.vue
  47. 20
      src/views/components/resiChangeTransfer.vue
  48. 26
      src/views/components/resiExpand/editExpand.vue
  49. 8
      src/views/components/resiExpand/index.vue
  50. 13
      src/views/components/resiForm.vue
  51. 4
      src/views/components/resiInfo.vue
  52. 3
      src/views/components/resiInfo/ensureHouseDto/index.vue
  53. 3
      src/views/components/resiInfo/oldPeopleDto/index.vue
  54. 3
      src/views/components/resiInfo/parymemberInfoDto/index.vue
  55. 3
      src/views/components/resiInfo/postDto/index.vue
  56. 3
      src/views/components/resiInfo/specialSupportDto/index.vue
  57. 3
      src/views/components/resiInfo/unitedFrontDto/index.vue
  58. 3
      src/views/components/resiInfo/veteranDto/index.vue
  59. 3
      src/views/components/resiInfo/volunteerDto/index.vue
  60. 24
      src/views/components/resiSearch.vue
  61. 1
      src/views/components/resiTransfer.vue
  62. 1
      src/views/components/selectStaff.vue
  63. 60
      src/views/components/smartSearchRule.vue
  64. 8
      src/views/components/tinymce/example/Index.vue
  65. 11
      src/views/components/tinymce/index.vue
  66. 16
      src/views/components/tinymce2/index.vue
  67. 2
      src/views/dataBoard/404.vue
  68. 3
      src/views/dataBoard/cpts/CallPhone.vue
  69. 2
      src/views/dataBoard/cpts/NoData/index.vue
  70. 5
      src/views/dataBoard/cpts/Tabs.vue
  71. 5
      src/views/dataBoard/cpts/Title/index.vue
  72. 15
      src/views/dataBoard/cpts/bread.vue
  73. 31
      src/views/dataBoard/cpts/details/jmxq.vue
  74. 29
      src/views/dataBoard/cpts/details/smyd.vue
  75. 54
      src/views/dataBoard/cpts/details/xqwmz.vue
  76. 10
      src/views/dataBoard/cpts/details/yxwxfw.vue
  77. 1
      src/views/dataBoard/cpts/enterpriseInfo-detail.vue
  78. 27
      src/views/dataBoard/cpts/event-details.vue
  79. 5
      src/views/dataBoard/cpts/family/components/Breadcrumb/index.vue
  80. 4
      src/views/dataBoard/cpts/family/components/Pagination/index.vue
  81. 2
      src/views/dataBoard/cpts/family/components/Tabs/index.vue
  82. 5
      src/views/dataBoard/cpts/family/components/Title/index.vue
  83. 3
      src/views/dataBoard/cpts/family/index.vue
  84. 6
      src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
  85. 6
      src/views/dataBoard/cpts/family/modules/EnjoyService.vue
  86. 2
      src/views/dataBoard/cpts/family/modules/Family.vue
  87. 8
      src/views/dataBoard/cpts/family/modules/MatterDetails.vue
  88. 2
      src/views/dataBoard/cpts/family/modules/PointsRecord.vue
  89. 5
      src/views/dataBoard/cpts/family/modules/businessTables/community.vue
  90. 5
      src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue
  91. 5
      src/views/dataBoard/cpts/family/modules/businessTables/economize.vue
  92. 5
      src/views/dataBoard/cpts/family/modules/businessTables/give-service.vue
  93. 5
      src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue
  94. 5
      src/views/dataBoard/cpts/family/modules/businessTables/resident.vue
  95. 2
      src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue
  96. 5
      src/views/dataBoard/cpts/homeDetails/Title/index.vue
  97. 3
      src/views/dataBoard/cpts/homeDetails/index.vue
  98. 13
      src/views/dataBoard/cpts/house-details.vue
  99. 3
      src/views/dataBoard/cpts/loading.vue
  100. 18
      src/views/dataBoard/cpts/map/index.vue

4
package.json

@ -16,7 +16,7 @@
"et": "node_modules/.bin/et",
"et:init": "node_modules/.bin/et -i",
"et:list": "gulp themes"
},
},
"dependencies": {
"@antv/l7": "2.9.14",
"@antv/l7-draw": "3.0.5",
@ -27,7 +27,7 @@
"axios": "^0.19.0",
"babel-eslint": "^8.0.1",
"babel-plugin-component": "^1.1.1",
"css-loader": "^5.0.0",
"css-loader": "^5.0.0",
"echarts": "^5.2.2",
"echarts-gl": "^2.0.9",
"element-theme": "2.0.1",

2
src/assets/scss/modules/management/list-main.scss

@ -5,7 +5,7 @@
.m-search {
padding: 24px 10px 10px;
// box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
background: #FFFFFF;
box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12);
margin:20px 7px 7px;

124
src/assets/scss/modules/management/volunteet.scss

@ -0,0 +1,124 @@
.g-main{
padding: 30px 0 0 30px;
width: 100%;
}
.flex{
display: flex;
.flex1{
flex: 1;
}
&-1{
flex: 1;
}
&-y{
flex-direction: column;
}
&-x{
flex-direction: row;
}
&-center1{
justify-content: center;
}
&-center2{
align-items: center;
}
&-center3{
align-items: flex-start;
}
//
&-mean{
justify-content: space-around;
}
//两端对齐
&-end{
justify-content: space-between;
}
//水平轴右对齐
&-fend{
justify-content: flex-end;
}
// 允许子元素换行
&-wrap{
flex-wrap: wrap;
}
}
.m{
&-left12{
margin-left: 12px;
}
&-left5{
margin-left: 12px;
}
&-left012{
margin-left: -5px;
}
&-left18{
margin-left: 18px;
}
&-right12{
margin-right: 12px;
}
&-right7{
margin-right: 7px;
}
&-top12{
margin-top: 12px;
}
&-top5{
margin-top: 5px;
}
&-bottom5{
margin-bottom: 5px;
}
&-bottom10{
margin-bottom: 10px;
}
&-right10{
margin-right: 10px;
}
&-right26{
margin-right: 26px;
}
&-top15{
margin-top: 15px;
}
&-top10{
margin-top: 10px;
}
&-top18{
margin-top: 18px;
}
&-bot50{
margin-bottom: 50px;
}
&-bot10{
margin-bottom:10px;
}
&-top16{
margin-top:16px;
}
}
.p{
&-18{
padding: 0 18px;
}
&-12{
padding: 12px;
}
}
.el-form-item{
margin-bottom: 10px;
}
.bto_btn{
display: block;
position: fixed;
bottom: 5px;
left: 0;
background: #ffffff;
width: 100%;
padding: 6px 26px;
box-sizing: border-box;
text-align: right;
}

15
src/components/Dialog/index.vue

@ -18,11 +18,9 @@
</div>
</div>
</template>
<script>
export default {
name: "popup",
props: {
title: {
type: String,
@ -33,15 +31,11 @@ export default {
default: 820,
},
},
components: {},
data() {
return {};
},
mounted() {},
methods: {
handleClose() {
this.$emit("close");
@ -49,18 +43,15 @@ export default {
},
};
</script>
<style lang="scss" scoped>
@import "~@/assets/scss/c/config.scss";
@import "~@/assets/scss/c/function.scss";
@import "~@/assets/scss/dataBoard/c/common.scss";
.m-pop {
@include shield;
position: absolute;
height: auto;
background-color: rgba(#000, 0.65);
.wrap {
position: relative;
box-sizing: border-box;
@ -72,12 +63,10 @@ export default {
border-radius: 4px;
border: 1px solid #1a95ff;
height: auto !important;
.cnt {
overflow-y: auto;
@include scrollBar;
}
.title {
margin-bottom: 10px;
padding: 4px 2px;
@ -88,13 +77,11 @@ export default {
line-height: 22px;
display: flex;
align-items: center;
img {
display: block;
margin-right: 5px;
width: 17px;
}
span {
display: block;
}
@ -106,7 +93,6 @@ export default {
background: linear-gradient(270deg, rgba(55, 198, 255, 0.1) 0%, #1995ff 100%);
}
}
.btn-close {
position: absolute;
top: 24px;
@ -116,7 +102,6 @@ export default {
width: 16px;
}
}
.operate {
display: flex;
.btn {

7
src/components/GridTree/nodeWrap.vue

@ -78,22 +78,18 @@ export default {
getAllName(item) {
return item;
},
getItemNameArr(str) {
return str.split(",").slice(0, 2);
},
spliceNameFun(row, num) {
if (row && row.length > num) {
return row.substring(0, num) + "...";
}
return row;
},
getOnerSixLevelFlag(item) {
return this.sixLevelArr.includes(item.level);
},
findParentParentId(nodeConfig, pid) {
let parentParentId = "";
if (nodeConfig.id === pid) {
@ -164,7 +160,6 @@ export default {
align-items: center;
justify-content: space-around;
}
@mixin lastLevel {
@include spanLevel;
@include normalLevel;
@ -176,7 +171,6 @@ export default {
writing-mode: tb-rl;
text-orientation: upright;
}
.name_more {
span {
&:hover {
@ -258,7 +252,6 @@ export default {
background-image: url(~@/assets/images/home/dyzxhClick.png);
background-repeat: no-repeat;
}
.dyzxhGreen {
@include lastLevel;
background-image: url(~@/assets/images/home/gridGreen.png);

4
src/components/ImageList/ImageList.vue

@ -7,7 +7,6 @@
</div>
</div>
</template>
<script>
export default {
name: "ImageList",
@ -19,7 +18,6 @@ export default {
}
}
</script>
<style scoped lang="scss">
.img-list {
display: flex;
@ -34,7 +32,6 @@ export default {
overflow: hidden;
background: #f2f2f2;
border-radius: 5px;
.img-block {
display: flex;
width: 100%;
@ -48,5 +45,4 @@ export default {
}
}
}
</style>

8
src/components/JwTree/nodeWrap.vue

@ -72,7 +72,6 @@ export default {
};
},
mounted() {
},
computed: {},
watch: {},
@ -83,11 +82,9 @@ export default {
}
return row;
},
getOnerSixLevelFlag(item) {
return this.sixLevelArr.includes(item.level);
},
async getChildrenData(item, idx, arr) {
if(item.level != "street"){
let url = '/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeListByLevel'
@ -105,7 +102,6 @@ export default {
arr.forEach((element, index) => {
if (index === idx) {
if (element.children) {
console.log(item);
element.zkFlag = false;
element.children = null;
} else {
@ -135,9 +131,7 @@ export default {
}
});
}
},
gotoPersonnel(id, name) {
if (id) {
this.$router.push({ path: `/organizational/orgPersonnel/${name}`, query: { user_id: id } });
@ -162,7 +156,6 @@ export default {
align-items: center;
justify-content: space-around;
}
.name_more {
span {
&:hover {
@ -249,7 +242,6 @@ export default {
background-image: url(~@/assets/images/home/dyzxhClick.png);
background-repeat: no-repeat;
}
.lxjt {
@include spanLevel;
display: flex;

4
src/components/NameSplit/index.vue

@ -10,7 +10,6 @@
<div v-if="item.partyOrgLevel < 9" class="peoPosition peoName">({{ getPeopositionMap(item.partyOrgLevel) }})</div>
</div>
</template>
<script>
export default {
name: "NameSplit",
@ -43,11 +42,9 @@ export default {
getAllName(item) {
return item;
},
getItemNameArr(str) {
return str.split(",").slice(0, 1);
},
spliceNameFun(row, num) {
return row.substring(0, num);
},
@ -74,7 +71,6 @@ export default {
},
};
</script>
<style scope lang="scss">
.node-com {
// padding: 0 12px;

5
src/components/PopHomeTip/index.vue

@ -16,7 +16,6 @@
</div>
</el-popover>
</template>
<script>
export default {
name: "principalName",
@ -73,7 +72,6 @@ export default {
]);
return homeTypeMap.get(item);
},
getHomeTypes(id) {
this.$http.get(`/actual/base/organizational/structure/getResidentCategoryByHouseId?houseId=${id}`).then((res) => {
const { code, msg, data } = res.data;
@ -84,14 +82,12 @@ export default {
}
});
},
spliceNameFun(row, num) {
if (row && row.length > num) {
return row.substring(0, num) + "...";
}
return row;
},
gotoPersonnel(id) {
if (id && id !== "") {
this.$router.push({ path: `/organizational/orgPersonnel/${this.pageName}`, query: { user_id: id } });
@ -102,7 +98,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
@mixin spanLevel {
font-size: 14px;

2
src/components/PopTips/index.vue

@ -9,7 +9,6 @@
<i slot="reference" style="margin-left: 2px" class="el-icon-more"></i>
</el-popover>
</template>
<script>
export default {
name: "PopTips",
@ -28,7 +27,6 @@ export default {
},
methods: {
gotoPersonnel(id) {
console.log(id);
if (id && id !== "") {
this.$router.push({ path: `/organizational/orgPersonnel/${this.pageName}`, query: { user_id: id } });
} else {

1
src/components/Tree/nodeWrap.vue

@ -103,7 +103,6 @@ export default {
align-items: center;
justify-content: space-around;
}
.node-box-after {
.nodeBoxTop {
font-size: 14px;

21
src/components/UploadImages/UploadImages.vue

@ -18,7 +18,6 @@
</el-upload>
<!-- <span style="color: #999"> 点击上传仅支持图片格式</span>-->
</template>
<script>
export default {
name: "UploadImages",
@ -34,7 +33,6 @@ export default {
},
watch: {
fileList(val) {
console.log(val, 'valvalvalval')
if (JSON.stringify(val) !== JSON.stringify(this.attachmentList)) {
this.attachmentList = val || []
}
@ -54,14 +52,10 @@ export default {
},
methods: {
//
beforeImgUpload(file) {
console.log(file);
const isLt1M = file.size / 1024 / 1024 < 10;
const srcType = file.type;
const format = file.name.split(".").pop();
if (!isLt1M) {
this.$message.error("上传文件大小不能超过 10MB!");
return false;
@ -74,18 +68,14 @@ export default {
}
return true;
},
handleImgSuccess(res, file, fileList) {
console.log("handleImgSuccess", file);
if (res.code === 0 && res.msg === "success") {
let format = file.name.split(".").pop();
let srcType = file.raw.type;
let type = "file";
console.log("==============================srcType: ", srcType);
if (srcType.indexOf("image") != -1) {
type = "image";
}
console.log(this.attachmentList)
if (!this.attachmentList) {
this.attachmentList = [{
format,
@ -94,7 +84,6 @@ export default {
url: res.data.url,
}]
} else {
this.attachmentList.push({
format,
originFileName: file.name,
@ -102,7 +91,6 @@ export default {
url: res.data.url,
});
}
console.log(this.attachmentList)
this.$emit('change', this.attachmentList.map(item => {
return {
originFileName: item.originFileName,
@ -116,14 +104,10 @@ export default {
this.$message.error(res.msg);
}
},
handleImgPreview(file) {
console.log(file);
window.open(file.url || file.response.data.url);
},
handleImgRemove(file) {
console.log("handleImgRemove", file);
if (file.response) {
let index = this.attachmentList.findIndex(
(item) => item.url == file.response.data.url
@ -145,7 +129,6 @@ export default {
}
}))
},
handleImgExceed() {
this.$message({
type: "warning",
@ -155,27 +138,23 @@ export default {
}
}
</script>
<style lang="scss" scoped>
/deep/ .el-upload--picture-card {
line-height: 90px;
width: 90px;
height: 90px;
}
/deep/ .el-upload-list--picture-card .el-upload-list__item {
line-height: 90px;
width: 90px;
height: 90px;
}
/deep/ .el-upload-list--picture-card .el-upload-list__item-status-label i {
position: absolute;
top: 11px;
left: 15px;
margin-top: 0;
}
/deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail {
height: auto;
}

1
src/components/ren-process-detail/src/ren-process-detail.vue

@ -38,7 +38,6 @@
margin: 0 auto 30px auto;
}
</style>
<script>
import Cookies from 'js-cookie'
import qs from 'qs'

1
src/components/ren-process-multiple/src/ren-process-multiple.vue

@ -5,7 +5,6 @@
<ren-process-detail v-if="processDetailVisible" ref="renProcessDetail"></ren-process-detail>
</div>
</template>
<script>
export default {
name: 'RenProcessMultiple',

1
src/components/ren-process-running/src/ren-process-running.vue

@ -10,7 +10,6 @@
<ren-task-handle v-if="renTaskHandleVisible" ref="renTaskHandle"></ren-task-handle>
</div>
</template>
<script>
import RenTaskBack from './ren-task-back'
import RenTaskEntrust from './ren-task-entrust'

1
src/components/ren-process-running/src/ren-task-back.vue

@ -11,7 +11,6 @@
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
import qs from 'qs'

1
src/components/ren-process-running/src/ren-task-entrust.vue

@ -14,7 +14,6 @@
<select-user v-if="selectUserVisible" ref="selectUser" ></select-user>
</el-dialog>
</template>
<script>
import SelectUser from './select-user'
import qs from 'qs'

1
src/components/ren-process-running/src/ren-task-handle.vue

@ -11,7 +11,6 @@
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
import qs from 'qs'

1
src/components/ren-process-running/src/select-user.vue

@ -38,7 +38,6 @@
</template>
</el-dialog>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
export default {

1
src/components/ren-process-start/src/ren-process-start.vue

@ -1,7 +1,6 @@
<template>
<el-button type="primary" @click="processStartHandle()">{{ $t('process.createInstance') }}</el-button>
</template>
<script>
import qs from 'qs'
export default {

1
src/components/table-tree-column/index.vue

@ -8,7 +8,6 @@
</template>
</el-table-column>
</template>
<script>
import isArray from 'lodash/isArray'
export default {

14
src/components/wx-index/cpt-item.vue

@ -2,12 +2,10 @@
<div class="mw-cpt a-fade-in"
:ref="item.tempOnlyId"
@click="focusCpt">
<!-- 最顶部标题组件 -->
<page-header v-if="item.componentFrontId==='resi-titleList-home-gridNameTitle'"
:item=item
:isFocused=isFocused></page-header>
<!-- 新消息组件 -->
<div class="mw-cpt-new_msg"
v-else-if="item.componentFrontId==='resi-floatingList-mine-newMessageButton'">
@ -21,7 +19,6 @@
<span>{{ item.demoData.text }}</span>
</div>
</div>
<!-- 防疫组件 -->
<div class="mw-cpt-fangyi"
v-else-if="item.componentFrontId==='resi-functionList-extend-fangyiFloat'">
@ -34,14 +31,12 @@
mode="aspectFill">
</div>
</div>
<!-- 爱心互助 -->
<heart v-else-if="item.componentFrontId==='resi-functionList-heart-banner'
||item.componentFrontId==='resi-functionList-heart-new'
||item.componentFrontId==='resi-functionList-heart-history'"
:item=item
:isFocused=isFocused></heart>
<!-- 党建声音最新发布特色文章轮播图新闻最新发布带标签专题文章 -->
<div v-else-if="item.componentFrontId==='resi-functionList-voice-newsList'
||item.componentFrontId==='resi-functionList-voice-newsList2'
@ -51,21 +46,18 @@
<voice :item=item
:isFocused=isFocused></voice>
</div>
<!-- 党群议事结案项目最新议题 -->
<div v-else-if="item.componentFrontId==='resi-functionList-hall-latestIssueList'
||item.componentFrontId==='resi-functionList-hall-closedProjectList'">
<issue :item=item
:isFocused=isFocused></issue>
</div>
<!-- 积分银行积分排名党员积分排行 -->
<div v-else-if="item.componentFrontId==='resi-functionList-score-rank'||item.componentFrontId==='resi-functionList-top-party'
||item.componentFrontId==='resi-functionList-score-rank-2'">
<score :item=item
:isFocused=isFocused></score>
</div>
<!-- 扩展功能更多功能1更多功能2快捷入口问卷调查 -->
<div v-else-if="item.componentFrontId==='resi-functionList-extend-moreFunctionIcons'
||item.componentFrontId==='resi-functionList-extend-moreFunctionIcons2'
@ -74,13 +66,11 @@
<extended :item=item
:isFocused=isFocused></extended>
</div>
<!-- 楼院小组推荐小组 -->
<div v-else-if="item.componentFrontId==='resi-functionList-group-recommendGroupSlider'">
<group :item=item
:isFocused=isFocused></group>
</div>
<!-- 占位组件 -->
<div class="mw-cpt-placeholder"
v-else>
@ -88,7 +78,6 @@
{{ item.componentName }}
</div>
</div>
<!-- 操作区 -->
<div class="d-cpt-operate a-scale-in"
z
@ -115,7 +104,6 @@
</div>
</div>
</template>
<script>
import nextTick from 'dai-js/tools/nextTick'
import pageHeader from './pageHeader.vue'
@ -125,7 +113,6 @@ import issue from './issue'
import extended from './extended'
import score from './score'
import group from './group'
export default {
name: 'cptItem',
data () {
@ -155,7 +142,6 @@ export default {
this.$refs[tempOnlyId].scrollIntoViewIfNeeded(false)
},
focusCpt () {
console.log(this.item)
this.$emit('focus', this.item)
}
}

24
src/components/wx-index/extended.vue

@ -3,16 +3,13 @@
:ref="item.tempOnlyId"
:class="{'z-focused': isFocused}"
@click="focusCpt">
<!-- 扩展功能更多功能1 -->
<div class="extended_more1"
v-if="item.componentFrontId==='resi-functionList-extend-moreFunctionIcons'">
<div class="more_list">
<div class="more_item"
:key="subindex"
v-for="(subitem, subindex) in item.demoData.list">
<div>
<img v-if="subindex==0"
src="@/assets/img/modules/wx-mini/index-set/page/icon1.png">
@ -26,13 +23,10 @@
<p>{{ subitem.text }}</p>
</div>
</div>
</div>
<!-- 扩展功能更多功能2 -->
<div class="extended_more2"
v-else-if="item.componentFrontId==='resi-functionList-extend-moreFunctionIcons2'">
<div class="link">
<div class="link-item">
<img src="@/assets/img/modules/wx-mini/index-set/wailian-bg.jpg"
@ -44,50 +38,38 @@
mode="aspectFill" />
<span>{{'建议直通车'}}</span>
</div>
</div>
<div class="dots">
<div class="dot z-on"></div>
<div class="dot"></div>
</div>
<!-- <div class="dots">
<i></i>
<i></i>
<i></i>
<i class="z-on"></i>
</div> -->
</div>
<!-- 扩展功能快捷入口 -->
<div class="extended_quick"
v-if="item.componentFrontId==='resi-functionList-extend-quickentry'">
<div class="more_list">
<div class="more_item"
:key="subindex"
v-for="(subitem, subindex) in item.demoData.list">
<div>
<img v-if="subitem.icon"
:src="subitem.icon">
<img v-else
src="@/assets/img/modules/wx-mini/index-set/page/icon2.png">
</div>
<p>{{ subitem.name }}</p>
</div>
</div>
</div>
<!-- 扩展功能问卷调查 -->
<div class="extended_question"
v-if="item.componentFrontId==='resi-functionList-extend-question'">
<div class="left_title">问卷 调查</div>
<!-- <div class="center_content">标题</div> -->
<div v-if="item.configuration.info &&item.configuration.info.title"
@ -95,14 +77,10 @@
<div v-else
class="center_content">{{'新闻标题'}}</div>
<div class="right_more">查看更多</div>
</div>
</div>
</template>
<script>
export default {
name: 'cptItem',
data () {
@ -115,10 +93,8 @@ export default {
item: Object
},
mounted () {
},
methods: {
focusCpt () {
this.$emit('focusCpt', this.item)
}

20
src/components/wx-index/group.vue

@ -3,24 +3,17 @@
:ref="item.tempOnlyId"
:class="{'z-focused': isFocused}"
@click="focusCpt">
<!-- 群组件 -->
<div v-if="item.componentFrontId==='resi-functionList-group-recommendGroupSlider'">
<div class="m-group">
<div class="cpt-title">
<div class="cpt-title-t">热门小组</div>
</div>
<div class="wrap">
<div class="list">
<div class="item"
:key="subindex"
v-for="(subitem, subindex) in item.demoData.list">
<div class="item-no">
<img v-if=" subindex===0 "
src="@/assets/img/modules/wx-mini/index-set/1.png"
@ -32,9 +25,7 @@
src="@/assets/img/modules/wx-mini/index-set/3.png"
mode="aspectFill" />
</div>
<div class="item-avatar">
<img src="@/assets/img/modules/wx-mini/index-set/page/avatar.jpg">
</div>
<div class="item-name">{{ subitem.title }}</div>
@ -42,23 +33,19 @@
<span>{{ subitem.info2 }}</span>
<span> 党员{{ subitem.info3 }}</span>
</div>
<div class="item-btn-div">
<div class="item-btn">
<span>加入</span>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="list">
<div :class="['item',{'item_margin':subindex>0}]"
:key="subindex"
v-for="(subitem, subindex) in item.demoData.list">
<div class="row1">
<div class="left">
<div class="avatar">
@ -66,7 +53,6 @@
</div>
<div class="no">NO.{{subitem.no}}</div>
</div>
<div class="right">
<div class="groupName">{{subitem.title}}</div>
<div class="info">
@ -77,7 +63,6 @@
class="type">{{subitem.type}}</div>
</div>
</div>
<div class="row2">
<div class="operation">
<img src="@/assets/img/modules/wx-mini/index-set/add-red.png">
@ -88,16 +73,12 @@
<span> 参观</span>
</div>
</div>
</div>
</div> -->
</div>
</div>
</template>
<script>
export default {
name: 'cptItem',
data () {
@ -143,7 +124,6 @@ export default {
item: Object
},
methods: {
focusCpt () {
this.$emit('focusCpt', this.item)
}

33
src/components/wx-index/heart.vue

@ -4,123 +4,93 @@
:title="item.componentName"
:class="{'z-focused': isFocused}"
@click="focusCpt">
<!-- 爱心互助banner组件 -->
<div v-if="item.componentFrontId==='resi-functionList-heart-banner'">
<div class="mw-cpt-banner">
<div catchtap="toHeartHome"
class="d-cpt-subwrap">
<img v-if="item.configuration.url"
:src="item.configuration.url"
mode="aspectFill">
<img v-else
src="@/assets/img/modules/wx-mini/index-set/page/heart-banner.png"
mode="aspectFill">
<div v-if="true"
class="s-title">您报名的活动即将开始</div>
<div class="d-group-no">
<span>点击进入</span>
</div>
</div>
</div>
</div>
<!-- 爱心互助最新活动组件 -->
<div v-if="item.componentFrontId==='resi-functionList-heart-new'">
<div class="m-news">
<div class="cpt-title">
<div class="cpt-title-t">{{item.configuration.title}}</div>
</div>
<div class="list">
<div data-id=" subitem.actId "
class="item"
:key="subindex"
v-for="(subitem, subindex) in item.demoData.list">
<div class="img">
<img v-if="subitem.pic"
:src="subitem.pic">
<img v-else
src="@/assets/img/modules/wx-mini/index-set/page/news-pic.png">
</div>
<div class="info">
<div class="d-news-title">{{ subitem.title }}</div>
<div class="d-news-time">时间{{ subitem.time2 }}</div>
<div class="d-news-else">
<span>地点{{ subitem.adress }}</span>
</div>
<div class="d-news-state">
<span class="d-news-state-limit">活动名额 12</span>
<span class="d-news-state-act">已报名 9</span>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 爱心互助历史回顾组件 -->
<div v-if="item.componentFrontId==='resi-functionList-heart-history'">
<div class="m-news">
<div class="cpt-title">
<div class="cpt-title-t">{{item.configuration.title}}</div>
</div>
<div class="list">
<div data-id=" subitem.actId "
class="item"
:key="subindex"
v-for="(subitem, subindex) in item.demoData.list">
<div class="img">
<img v-if="subitem.pic"
:src="subitem.pic">
<img v-else
src="@/assets/img/modules/wx-mini/index-set/page/news-pic.png">
</div>
<div class="info">
<div class="d-news-title">{{ subitem.title }}</div>
<div class="d-news-time">时间{{ subitem.time2 }}</div>
<div class="d-news-else">
<span>地点{{ subitem.adress }}</span>
</div>
<div class="d-news-state">
<span class="d-news-state-limit">活动名额 12</span>
<span class="d-news-state-act">已报名 9</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import nextTick from 'dai-js/tools/nextTick'
export default {
name: 'cptItem',
data () {
@ -131,11 +101,8 @@ export default {
item: Object
},
mounted () {
console.log(this.item)
},
methods: {
focusCpt () {
this.$emit('focusCpt', this.item)
}

5
src/components/wx-index/issue.vue

@ -3,7 +3,6 @@
:ref="item.tempOnlyId"
:class="{'z-focused': isFocused}"
@click="focusCpt">
<!-- 最新议题组件 -->
<div class="issue_news"
v-if="item.componentFrontId==='resi-functionList-hall-latestIssueList'">
@ -53,12 +52,9 @@
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'cptItem',
data () {
@ -71,7 +67,6 @@ export default {
item: Object
},
methods: {
focusCpt () {
this.$emit('focusCpt', this.item)
}

6
src/components/wx-index/pageHeader.vue

@ -4,7 +4,6 @@
:title="item.componentName"
:class="{'z-focused': isFocused}"
@click="focusCpt">
<!-- 最顶部标题组件 -->
<div v-if="item.componentFrontId==='resi-titleList-home-gridNameTitle'"
class="page_header">
@ -23,14 +22,10 @@
<span class="span_slicer">|</span>
<span class="span_mine">我的</span>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'cptItem',
data () {
@ -43,7 +38,6 @@ export default {
item: Object
},
methods: {
focusCpt () {
this.$emit('focusCpt', this.item)
}

47
src/components/wx-index/score.vue

@ -3,20 +3,15 @@
:ref="item.tempOnlyId"
:class="{'z-focused': isFocused}"
@click="focusCpt">
<!-- 积分银行-积分排行组件 -->
<div v-if="item.componentFrontId==='resi-functionList-score-rank'">
<div class="score_news">
<div class="cpt-title">
<div v-if="item.configuration.title"
class="cpt-title-t">{{item.configuration.title}}</div>
<div v-else
class="cpt-title-t">积分排行</div>
</div>
<div class="info">
<div class="card">
<div class="title">
@ -27,20 +22,16 @@
</div>
<div class="ranks">
<div class="rank">
<div class="rank-field">网格排名</div>
<div class="rank-value value_color_1"><span>{{item.demoData.info1.no1}}</span></div>
</div>
<div class="rank">
<div class="rank-field">总排名</div>
<div class="rank-value value_color_2"><span>{{item.demoData.info1.no2}}</span></div>
</div>
</div>
</div>
<div class="line"></div>
<div class="card">
<div class="title">
<img class="avatar2"
@ -52,19 +43,15 @@
<div class="rank">
<div class="rank-field">社区排名</div>
<div class="rank-value value_color_1"><span>{{item.demoData.info2.no1}}</span></div>
</div>
<div class="rank">
<div class="rank-field">总排名</div>
<div class="rank-value value_color_2"><span>{{item.demoData.info2.no2}}</span></div>
</div>
</div>
</div>
</div>
<div class="score_list">
<div class="item"
:key="subindex"
v-for="(subitem,subindex) in item.demoData.list">
@ -80,7 +67,6 @@
mode="aspectFill">
<span v-else>{{ subindex+1 }}</span>
</div>
<div class="avatar">
<img src="../../assets/img/modules/wx-mini/index-set/page/good.jpg"
mode="aspectFill">
@ -90,13 +76,11 @@
</div>
</div>
</div>
<!-- <div class="score_rank_content">
<div v-if="item.configuration.title"
class="title">{{item.configuration.title}}</div>
<div v-else
class="title">积分排行</div>
<div class="rank_tabs">
<span class="tabs_1">总排名</span>
<span class="tabs_2">本周排名</span>
@ -109,8 +93,6 @@
<div>姓名</div>
<div>当月积分</div>
</div>
<div class="score_list score_no_border">
<div class="item"
:key="subindex"
@ -149,11 +131,9 @@
</div>
</div>
</div>
</div>
</div> -->
</div>
<!-- 积分银行-积分排行2 -->
<div class="score_rank"
v-if="item.componentFrontId==='resi-functionList-score-rank-2'">
@ -162,15 +142,12 @@
class="title">{{item.configuration.title}}</div>
<div v-else
class="title">积分排行</div>
<div class="single">
<div class="single_bc">
<div class="single_name">
<img src="../../assets/img/modules/wx-mini/index-set/page/duck.jpg">
<span>{{item.demoData.info1.title1}}</span>
</div>
<div class="single_rank">
<div class="single_rank_bc bc_left">
<div class="score">
@ -190,10 +167,8 @@
</div>
<div class="single_bc">
<div class="single_name">
<span>{{item.demoData.info2.title1}}</span>
</div>
<div class="single_rank">
<div class="single_rank_bc bc_left">
<div class="score">
@ -212,7 +187,6 @@
</div>
</div>
</div>
<div class="rank_tabs">
<span class="tabs_1">身边党员</span>
<span class="tabs_2">社区党员</span>
@ -225,7 +199,6 @@
<div>姓名</div>
<div>当月积分</div>
</div>
<!--更多排名-->
<div class="score_list score_no_border">
<div class="item"
@ -265,11 +238,9 @@
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 党员积分排行组件 -->
<div class="score_party"
v-else-if="item.componentFrontId==='resi-functionList-top-party'">
@ -284,7 +255,6 @@
<div class="red_line"></div>
<p class="rank_title_right">社区党员</p>
</div>
<div class="rank_img_score">
<!--:key,列表循环的唯一标识符 -->
<div class="item"
@ -298,7 +268,6 @@
<div v-if="subindex === 2"
class="logo3"></div>
</div>
<div class="d-group-rank">
<span v-if="subindex===0"
class="rank_1">2</span>
@ -306,9 +275,7 @@
class="rank_2">1</span>
<span v-if="subindex===2"
class="rank_3">3</span>
</div>
<div class="d-group-imgback">
<div v-if="subindex === 0"
class="back_1"></div>
@ -328,7 +295,6 @@
class="img3"
src="../../assets/img/modules/wx-mini/index-set/page/girl.jpg">
</div>
<div class="d-group-score">
<span v-if="subindex===0"
class="score_1">{{subitem.title1}}</span>
@ -337,20 +303,16 @@
<span v-if="subindex===2"
class="score_3">{{subitem.title3}}</span>
</div>
<div class="d-group-name">
<span v-if="subindex===0"
class="name_1">{{subitem.info1}}</span>
<span v-if="subindex===1"
class="name_2">{{subitem.info2}}</span>
<span v-if="subindex===2"
class="name_3">{{subitem.info3}}</span>
</div>
</div>
</div>
<!--更多排名-->
<div class="rank_box">
<div class="list_title">
@ -359,7 +321,6 @@
<div>姓名</div>
<div>当月积分</div>
</div>
<div class="score_list">
<div class="item"
:key="subindex"
@ -392,21 +353,15 @@
</div>
</div>
</div>
</div>
<div class="line"></div>
<span class="list6">查看更多</span>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'cptItem',
data () {
@ -419,10 +374,8 @@ export default {
item: Object
},
mounted () {
},
methods: {
focusCpt () {
this.$emit('focusCpt', this.item)
}

2
src/views/components/CDialog.vue

@ -26,7 +26,6 @@
</el-dialog>
</div>
</template>
<script>
/* eslint-disable */
import { mapGetters } from 'vuex'
@ -106,6 +105,5 @@ export default {
}
}
</script>
<style>
</style>

34
src/views/components/CTable.vue

@ -33,7 +33,6 @@
@change.native="getRadioRow(scope.$index,scope.row)">&nbsp;</el-radio>
</template>
</el-table-column>
</div>
<template v-for="col in tableColumn">
<!--渲染列-->
@ -66,10 +65,8 @@
class="function-icon"
:fit=" col.fill?col.fill:'fill'">
<span v-else>--</span>
</template>
</el-table-column>
<!--普通列-->
<el-table-column v-if="!col.tableType||col.tableType===''"
:key="col.key"
@ -139,9 +136,7 @@
</div>
</div>
</template>
<script>
import CDialog from './CDialog'
import { mapGetters } from 'vuex'
export default {
@ -205,7 +200,6 @@ export default {
type: Number,
default: 1
},
tableHeight: {
type: Number
},
@ -228,17 +222,13 @@ export default {
type: String,
default: "center"
}
},
computed: {
pageSize: {
//getter
get () {
if (this.resolution === 'small') {
this.table.params.pageSize = 10
return 10
} else {
this.table.params.pageSize = 20
@ -247,14 +237,8 @@ export default {
},
//setter
set (newValue) {
console.log('computed setter...')
this.table.params.pageSize = newValue
// return newValue
}
},
tablePageSizes () {
if (this.resolution === 'small') {
@ -264,7 +248,6 @@ export default {
}
},
...mapGetters(['resolution'])
},
methods: {
render () {
@ -279,19 +262,15 @@ export default {
}
})
Object.assign(this.table.params, this.params)
//
window.app.ajax.post(
this.url,
this.table.params,
(data, rspMsg) => {
if (data) {
this.total = data.total
this.tableData = data.list
if (this.filterParams.length > 0) {
this.filterParams.forEach(paramItem => {
const key = paramItem.key
const value = paramItem.value
@ -299,13 +278,9 @@ export default {
item[key].indexOf(value) > 0
})
})
}
}
this.loading = false
},
(rspMsg, data) => {
this.$message.error(rspMsg)
@ -320,7 +295,6 @@ export default {
//
handleSelect (selection, row) {
this.$emit('select', selection)
// console.log(selection, row)
},
//
handleSelectAll (selection) {
@ -332,7 +306,6 @@ export default {
this.selected = !this.selected
this.$refs['table'].toggleRowSelection(row, this.selected)
},
handleEdit (index, row) {
// tablerow-clickstop
this.handleClearSelection()
@ -354,9 +327,7 @@ export default {
scope._self.$refs[`popover-${scope.$index}`].doClose()
},
handleSizeChange (pageSize) {
this.table.params.pageSize = pageSize
this.table.params.pageNo = 1
this.$nextTick(() => {
this.loadData()
@ -375,7 +346,6 @@ export default {
//
handleNextClick (pageNo) {
},
//
getRadioRow (index, row) { //
this.$emit('selectRadioRow', row)
@ -387,7 +357,6 @@ export default {
// exportExcel (tHeader, filterVal) {
// require.ensure([], () => {
// const { export_json_to_excel } = require('@js/excel/Export2Excel')
// const list = this.tableData
// const data = this.formatJson(filterVal, list)
// export_json_to_excel(tHeader, data, 'excel')
@ -416,16 +385,13 @@ export default {
.el-table td {
padding: 6px 0 !important;
}
.page {
padding: 0 6px;
text-align: right;
}
.operate {
text-align: center;
}
.tableLimit tr td .cell {
overflow: hidden;
text-overflow: ellipsis;

65
src/views/components/CTableNoPage.vue

@ -33,7 +33,6 @@
@change.native="getRadioRow(scope.$index,scope.row)">&nbsp;</el-radio>
</template>
</el-table-column>
</div>
<template v-for="col in tableColumn">
<!--渲染列-->
@ -65,7 +64,6 @@
:style="{width: col.imgWidth?col.imgWidth:'50px',height:col.imgHeight?col.imgHeight:'50px'}"
class="function-icon"
:fit=" col.fill?col.fill:'fill'">
</template>
</el-table-column>
<!--有背景的图片列-->
@ -82,16 +80,13 @@
<div v-if="scope.row[col.key]"
class="img_bc"
:style="{background: col.bcColor?col.bcColor:'#e3271c'}">
<img :src="scope.row[col.key]"
:style="{width: col.imgWidth?col.imgWidth:'50px',height:col.imgHeight?col.imgHeight:'50px'}"
class="function-icon"
:fit=" col.fill?col.fill:'fill'">
</div>
</template>
</el-table-column>
<!--普通列-->
<el-table-column v-if="!col.tableType||col.tableType===''"
:key="col.key"
@ -112,7 +107,6 @@
header-align="center"
class="operate">
<template slot-scope="scope">
<el-button v-for="(item,index) in orderOperations"
:key="index"
:style=item.style
@ -145,9 +139,7 @@
</el-table>
</div>
</template>
<script>
import CDialog from './CDialog'
import { mapGetters } from 'vuex'
import { requestPost } from "@/js/dai/request";
@ -162,7 +154,6 @@ export default {
height: this.tableHeight,
params: {}
},
selected: false,
visiblePopover: false, //
templateRadio: ''
@ -215,7 +206,6 @@ export default {
type: Number
},
pageVisible: Boolean, // page lyx 20190411
filterParams: {
type: Array,
default () {
@ -230,10 +220,8 @@ export default {
// })
},
computed: {
//
operationWidth: function() {
if (this.operations.includes('add')) {
return (this.operations.length - 1) * 80 // add
} else if (this.operations.includes('analyze')) {
@ -244,10 +232,7 @@ export default {
},
//
orderOperationWidth: function() {
return this.orderOperations.length * 50
},
...mapGetters(['resolution'])
},
@ -269,66 +254,25 @@ export default {
})
Object.assign(this.table.params, this.params)
//
const { data, code, rspMsg } = await requestPost(this.url, this.table.params)
if (code === 0) {
if (data) {
this.tableData = data
// console.log("this.filterParams", this.filterParams)
if (this.filterParams.length > 0) {
this.filterParams.forEach(paramItem => {
const key = this.filterParams[0].key
const value = this.filterParams[0].value
this.tableData = this.tableData.filter(item => {
// console.log(item[key])
// console.log(item[key].indexOf(value))
return item[key].indexOf(value) != -1
})
})
}
}
this.loading = false
} else {
this.$message.error(rspMsg)
this.loading = false
}
// await window.app.ajax.post(
// this.url,
// this.table.params,
// (data, rspMsg) => {
// if (data) {
// this.tableData = data
// console.log("this.filterParams", this.filterParams)
// if (this.filterParams.length > 0) {
// this.filterParams.forEach(paramItem => {
// const key = this.filterParams[0].key
// const value = this.filterParams[0].value
// this.tableData = this.tableData.filter(item => {
// // console.log(item[key])
// // console.log(item[key].indexOf(value))
// return item[key].indexOf(value) != -1
// })
// })
// }
// }
// // console.log(this.tableData)
// this.loading = false
// },
// (rspMsg, data) => {
// }
// )
},
handleClearSelection () {
//
@ -337,7 +281,6 @@ export default {
//
handleSelect (selection, row) {
this.$emit('select', selection)
// console.log(selection, row)
},
//
handleSelectAll (selection) {
@ -349,7 +292,6 @@ export default {
this.selected = !this.selected
this.$refs['table'].toggleRowSelection(row, this.selected)
},
handleEdit (index, row) {
// tablerow-clickstop
this.handleClearSelection()
@ -370,7 +312,6 @@ export default {
// popover
scope._self.$refs[`popover-${scope.$index}`].doClose()
},
//
getRadioRow (index, row) { //
this.$emit('selectRadioRow', row)
@ -382,7 +323,6 @@ export default {
exportExcel (tHeader, filterVal) {
// require.ensure([], () => {
// const { export_json_to_excel } = require('@js/excel/Export2Excel')
// const list = this.tableData
// const data = this.formatJson(filterVal, list)
// export_json_to_excel(tHeader, data, 'excel')
@ -400,8 +340,6 @@ export default {
getTableData () {
return this.tableData
}
}
}
</script>
@ -409,16 +347,13 @@ export default {
.el-table td {
padding: 6px 0 !important;
}
.page {
padding: 20px 6px 0;
text-align: right;
}
.operate {
text-align: center;
}
.img_bc {
width: 50px;
height: 50px;

6
src/views/components/CTree.vue

@ -177,9 +177,7 @@ export default {
arrayData = []
arrayData.push(data)
}
// alert(JSON.stringify(data))
this.nodeData = data
// console.log(this.nodeData)
this.processData(this.nodeData, null)
this.initCheckNodes()
this.loading = false
@ -202,7 +200,6 @@ export default {
this.params,
(data, rspMsg) => {
this.nodeData = data
console.log(this.nodeData)
this.firstData = null
this.processData(this.nodeData, null)
this.initCheckNodes()
@ -344,10 +341,8 @@ export default {
this.$emit('chechBoxClick', data, checkedArr)
},
handleCurrentChange (data, node, store) {
// console.logconsole.log(data, node)
},
handleNodeExpand (data, node, store) {
// console.log(data, node, store)
},
loadNode (node, resolve) {
if (node.level === 0) {
@ -410,7 +405,6 @@ export default {
checkedNodes.push(oneNodes)
}
})
// console.log(checkedNodes)
return checkedNodes
},
//

63
src/views/components/CTreeDialogCheckBox.vue

@ -237,17 +237,6 @@ export default {
},
//
handleCheckBox (data, checkedArr) {
// to do
// let filterText = this.$refs['dialog_tree'].filterText
// if (filterText) {
// if (data.children.length !== 0) {
// console.log('father', filterText)
// } else {
// console.log('children', filterText)
// }
// } else {
// console.log('blank')
// }
let checkedNoRepeat = [] //
let keysNoRepeat = [] // keys
for (let i = 0; i < checkedArr.length; i++) {
@ -259,58 +248,8 @@ export default {
}
this.temArr = checkedNoRepeat
this.temKeys = keysNoRepeat
// let checkedObj = { 'id': data.id, 'name': data.label }
// let id = data.id
// let index = ''
// let haven = false
// let length = this.temArr.length
// if (this.temArr.length === 0) {
// this.temArr.push(checkedObj)
// this.temKeys.push(Number(id))
// } else {
// for (let i = 0 i < length i++) {
// if (this.temArr[i].id === id) {
// haven = true
// index = i
// break
// }
// }
// if (haven) {
// this.temArr.splice(index, 1)
// this.temKeys.splice(index, 1)
// } else {
// this.temArr.push(checkedObj)
// this.temKeys.push(Number(id))
// }
// }
},
handleNodeClick (data, node) { //
// console.log(checkedArr)
// let checkedObj = { 'id': data.id, 'name': data.label }
// let id = data.id
// let index = ''
// let haven = false
// let length = this.temArr.length
// if (this.temArr.length === 0) {
// this.temArr.push(checkedObj)
// this.temKeys.push(Number(id))
// } else {
// for (let i = 0 i < length i++) {
// if (this.temArr[i].id === id) {
// haven = true
// index = i
// break
// }
// }
// if (haven) {
// this.temArr.splice(index, 1)
// this.temKeys.splice(index, 1)
// } else {
// this.temArr.push(checkedObj)
// this.temKeys.push(Number(id))
// }
// }
}
handleNodeClick (data, node) {}
},
mounted () {
},

22
src/views/components/CTreeDialogSingle.vue

@ -3,12 +3,10 @@
<div>
<!-- <el-tooltip :content="inputValue"
placement="top"> -->
<el-input readonly
style="width:100%"
v-model.trim="inputValue"
:placeholder="placeholder">
<el-button slot="append"
:type="type"
class="undisabled"
@ -16,7 +14,6 @@
@click="handleSelect">选择</el-button>
</el-input>
<!-- </el-tooltip> -->
<el-dialog :title="title"
lock-scroll
:visible="dialogVisible"
@ -39,7 +36,6 @@
:nodeType="nodeType"
:autoLoad="autoLoad"
@nodeClick="handleNodeClick"></c-tree>
</div>
<span slot="footer"
class="dialog-footer">
@ -48,10 +44,8 @@
<!-- <el-button @click="handleCancel">取消</el-button> -->
</span>
</el-dialog>
</div>
</template>
<script>
import CDialog from './CDialog'
import CTree from './CTree'
@ -85,12 +79,10 @@ export default {
type: String,
default: ''
},
type: { // button
type: String,
default: 'primary'
},
title: { // dialog
type: String,
default: '选择'
@ -133,7 +125,6 @@ export default {
type: Boolean,
default: true
},
// 0
defaultNodeKey: { // tree
// (id)
@ -164,32 +155,24 @@ export default {
type: Boolean,
default: false
},
},
methods: {
handleSelect () {
this.dialogVisible = true
this.loadData()
},
setInputValue (inputValue) {
this.inputValue = inputValue
},
loadData (callback, currentKey, expandKeys) {
this.$nextTick(() => {
if (expandKeys) {
this.expandKeys = expandKeys
}
this.$refs['dialog_tree'].loadData(callback, currentKey, [], this.expandKeys)
})
},
setExpandKeys (expandKeys) {
this.expandKeys = expandKeys
},
handleClear () { //
@ -198,19 +181,16 @@ export default {
this.$emit('handleClear', '', this.formKey, this.formIndex)
this.dialogVisible = false
},
handleCancel () {
this.dialogVisible = false
},
handleOk () {
},
//
clearInput () {
this.selData = ''
this.inputValue = ''
},
handleNodeClick (data, node) {
if (data.id !== 0) {
if (this.nodeType !== '') {
@ -230,7 +210,6 @@ export default {
}
},
mounted () {
},
computed: {
formHeight () {
@ -240,7 +219,6 @@ export default {
}
}
</script>
<style>
.mLeft {
margin-left: 6px;

3
src/views/components/CUpload.vue

@ -18,7 +18,6 @@
<template v-if="uploadType === 'default'">
<el-button size="small"
type="primary">点击上传</el-button>
</template>
<template v-else>
<slot name="custom"></slot>
@ -26,7 +25,6 @@
</el-upload>
</div>
</template>
<script>
export default {
data () {
@ -82,6 +80,5 @@ export default {
}
}
</script>
<style scoped>
</style>

70
src/views/components/addResi.vue

@ -8,7 +8,6 @@
<el-input class="list_item_width_1" v-model.trim="form.baseInfoDto.name" placeholder="请输入内容"
size="small" clearable></el-input>
</el-form-item>
<el-form-item label="证件类型" prop="baseInfoDto.idType" class="font-color-orange flex_item_width1">
<el-select v-model.trim="form.baseInfoDto.idType" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
@ -16,12 +15,10 @@
:value="item.value" @click.native="handelCLickIdType(item.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="证件号" prop="baseInfoDto.idNum" class="font-color-orange flex_item_width1">
<el-input v-model.trim="form.baseInfoDto.idNum" placeholder="请输入内容" clearable size="small"
class="list_item_width_1" @blur="handleValidBlur"></el-input>
</el-form-item>
<el-form-item label="国籍" prop="baseInfoDto.nationality" class="font-color-orange flex_item_width1">
<el-select v-model.trim="form.baseInfoDto.nationality" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
@ -29,12 +26,10 @@
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="联系电话" prop="baseInfoDto.mobile" class="font-color-orange flex_item_width1">
<el-input class="list_item_width_1" v-model.trim="form.baseInfoDto.mobile"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
<el-form-item label="性别" class="flex_item_width1">
<el-select v-model.trim="form.baseInfoDto.gender" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
@ -42,14 +37,12 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出生日期" class="flex_item_width1">
<el-date-picker v-model.trim="form.baseInfoDto.birthday" class="list_item_width_1"
type="date" size="small" clearable placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="民族" class="flex_item_width1">
<el-select v-model.trim="form.baseInfoDto.nation" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
@ -57,7 +50,6 @@
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="文化程度" class="flex_item_width1">
<el-select v-model.trim="form.eduInfoDto.cultureLevel" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
@ -65,7 +57,6 @@
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="婚姻状况" class="flex_item_width1">
<el-select v-model.trim="form.familyInfoDto.marriage" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
@ -104,7 +95,6 @@
v-model.trim="form.resideInfoDtos[index].gridId" :options="orgOptions"
:props="orgOptionProps" @change="handleChangeAgency(index)"></el-cascader>
</el-form-item>
<el-form-item :prop="`resideInfoDtos[${index}].villageId`" label="所属房屋"
label-width="100px" class="font-color-orange flex_item_width4" :rules="[
{ required: true, message: '请选择小区', trigger: 'blur' },
@ -116,8 +106,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :prop="`resideInfoDtos[${index}].buildId`" label-width="0"
style="margin:0px" :rules="[
{ required: true, message: '请选择楼栋', trigger: 'blur' },
@ -187,7 +175,6 @@
v-model.trim="form.resideInfoDtos[index].currentResidence" placeholder="请输入内容"
size="small" clearable></el-input>
</el-form-item>
<el-form-item class="flex_item_width1" label="迁出时间" v-else-if="form.resideInfoDtos[index].householdSituation == 'rhdbz'">
<el-date-picker v-model.trim="form.resideInfoDtos[index].outOfTime"
class="list_item_width_1" type="date" size="small" clearable placeholder="选择日期"
@ -202,17 +189,13 @@
</el-select>
</el-form-item>
</div>
</section>
<h5>拓展信息登记</h5>
<div class="flex_box">
<el-form-item label="宗教信仰" class="flex_item_width1">
<el-input class="list_item_width_1" v-model.trim="form.religionDto.religion"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
<el-form-item label="就业状态" class="font-color-blue flex_item_width1">
<el-select v-model.trim="form.workInfoDto.careerStatus" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
@ -221,22 +204,18 @@
@click.native="handelClickCareerStatus(item.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工作单位" class="flex_item_width1" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
<el-input class="list_item_width_1" v-model.trim="form.workInfoDto.workUnit"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
<el-form-item label="职业" class="flex_item_width1" v-if="form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5">
<el-input class="list_item_width_1" v-model.trim="form.workInfoDto.occupation"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
<!-- <el-form-item label="原工作单位" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-input class="list_item_width_1" v-model.trim="form.unemployedDto.originWorkUnit"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> -->
<!-- <el-form-item label="失业时间" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-date-picker v-model.trim="form.unemployedDto.unemploymentTime"
class="list_item_width_1" type="date" size="small" clearable placeholder="选择日期"
@ -247,14 +226,12 @@
<el-input class="list_item_width_1" v-model.trim="form.economyDto.monthIncome"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item>
<!-- <el-form-item label="失业证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus" :rules="[
{ required: true, message: '请填写失业证号', trigger: 'blur' },
]" prop="unemployedDto.unemploymentNum">
<el-input class="list_item_width_1" v-model.trim="form.unemployedDto.unemploymentNum"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> -->
<!-- <el-form-item label="失业原因" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-select v-model.trim="form.unemployedDto.unemploymentReason" placeholder="请选择"
size="small" class="list_item_width_1" clearable>
@ -262,18 +239,14 @@
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="再就业优惠证号" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-input class="list_item_width_1" v-model.trim="form.unemployedDto.employmentNum"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> -->
<!-- <el-form-item label="技术特长"class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-input class="list_item_width_1" v-model.trim="form.unemployedDto.specialSkill"
placeholder="请输入内容" size="small" clearable></el-input>
</el-form-item> -->
<!-- <el-form-item label="是否领取失业金" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-radio-group v-model.trim="form.unemployedDto.unempCompensationFlag">
<el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
@ -281,7 +254,6 @@
}}</el-radio>
</el-radio-group>
</el-form-item> -->
<!-- <el-form-item label="是否就业困难对象" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus">
<el-radio-group v-model.trim="form.unemployedDto.employmentHardFlag">
<el-radio :label="item.value" v-for="item in disabilityFlagList" :key="item.value">{{
@ -289,7 +261,6 @@
}}</el-radio>
</el-radio-group>
</el-form-item> -->
<!-- <el-form-item label="劳动就业愿望" class="flex_item_width1" v-if="(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus" :rules="[
{ required: true, message: '请选择劳动就业愿望', trigger: 'blur' },
]" prop="workInfoDto.employmentWish">
@ -299,7 +270,6 @@
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="有无赡养人" class="flex_item_width1">
<el-radio-group v-model.trim="form.familyInfoDto.elderlyFlag">
<el-radio :label="item.value" v-for="item in hasOptions" :key="item.value"
@ -307,7 +277,6 @@
}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="与赡养人关系" class="flex_item_width1" v-if="form.familyInfoDto.elderlyFlag == 1">
<el-select v-model.trim="form.familyInfoDto.elderlyRelation" placeholder="请选择" size="small"
class="list_item_width_1" clearable>
@ -315,7 +284,6 @@
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="赡养人联系电话" class="flex_item_width1"v-if="form.familyInfoDto.elderlyFlag == 1">
<el-input class="list_item_width_1" v-model.trim="form.familyInfoDto.dependantMobile"
placeholder="请输入内容" size="small" clearable></el-input>
@ -354,7 +322,6 @@
</el-dialog>
</div>
</template>
<script>
import { requestGet, requestPost } from "@/js/dai/request";
import {
@ -675,7 +642,6 @@ export default {
opctionParams: { dictType: 'subsistence_allowance_reasons' },
opction: []
},
]
},
{
@ -826,7 +792,6 @@ export default {
itemType: "inputNum",
formName: "settlementAmount",
opction: [
]
},
{
@ -877,7 +842,6 @@ export default {
{
id: 'specialSupportDto',
children: [
{//0
label: "特扶类别",
check:'fourFont',
@ -942,7 +906,6 @@ export default {
opctionParams: { dictType: 'disability_level' },
opction: []
}
]
},
{
@ -1012,7 +975,6 @@ export default {
opctionParams: { dictType: 'career_goals' },
opction: []
}
]
}
],
@ -1065,7 +1027,6 @@ export default {
created() {
this.getDicts();
this.getOrgTreeList();
this.initHouseBind();
},
methods: {
@ -1137,7 +1098,6 @@ export default {
this.$http.post("sys/dict/data/dictlist", {
dictType: "unemployment_reason",
}),
];
const dictKeys = [
"nationalityList",
@ -1150,7 +1110,6 @@ export default {
"spouseSituationList",
"unemploymentReasonList",
]; //
const results = await Promise.all(requests);
results.forEach((result, index) => {
if (result.data.code === 0) {
@ -1170,7 +1129,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
console.log("获取组织树成功", res.data);
this.orgOptions = [];
this.orgOptions.push(res.data);
}
@ -1184,7 +1142,6 @@ export default {
val == 0 ? "rhyz" : "rzhbz";
},
handleChangeV(index) {
console.log(this.form.resideInfoDtos[index].villageId);
this.form.resideInfoDtos[index].buildId = "";
this.form.resideInfoDtos[index].unitId = "";
this.form.resideInfoDtos[index].homeId = "";
@ -1202,15 +1159,7 @@ export default {
this.form.resideInfoDtos[index].homeId = "";
this.getHouseList(index);
},
handleChangeH(i) {
// let item = this.optionsH.find((item, index) => index === i);
// if (item && item.type == '1') {
// // this.form.IS_TENANT = '1'
// console.log('item-----', item)
// }
// else
// this.form.IS_TENANT = '0'
},
handleChangeH(i) {},
handleChangeAgency(index) {
let obj = this.$refs[`myCascader`][index].getCheckedNodes()[0]
? this.$refs["myCascader"][index].getCheckedNodes()[0].data
@ -1219,12 +1168,10 @@ export default {
if (obj.level === "grid") {
this.form.resideInfoDtos[index].gridId = obj.agencyId;
this.form.resideInfoDtos[index].agencyId = obj.pid;
this.form.resideInfoDtos[index].villageId = "";
this.form.resideInfoDtos[index].buildId = "";
this.form.resideInfoDtos[index].unitId = "";
this.form.resideInfoDtos[index].homeId = "";
this.getValiheList(index);
} else {
// this.selGridId = []
@ -1233,13 +1180,9 @@ export default {
this.$message.info('请选择网格')
return false
}
}
},
getValiheList(index) {
console.log(this.form.resideInfoDtos[index].gridId, '小区接口');
console.log(this.form.resideInfoDtos);
const { user } = this.$store.state
this.$http.post('/actual/base/communityQuarters/listQuartersOptions', { gridId: this.form.resideInfoDtos[index].gridId, agencyId: user.agencyId }).then(({ data: res }) => {
if (res.code !== 0) {
@ -1329,7 +1272,6 @@ export default {
i = user.areaCodePath.length - 1
huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
}
if (this.form.baseInfoDto.idNum.length === 18 || this.form.baseInfoDto.idNum.length === 15) {
const _id = this.form.baseInfoDto.idNum.substr(0, 6)
const { sex, birth, age } = computedCard(this.form.baseInfoDto.idNum);
@ -1343,9 +1285,7 @@ export default {
// this.form.IS_BDHJ = huji == _id ? '1' : ''
//
// this.validateIdcard(this.form.idNum)
}
},
async getResidentInfoByIdNum(){
try {
@ -1363,11 +1303,8 @@ export default {
}).then(() => {
this.resiId = data.id
this.showCheckPassword = true;
}).catch(() => {
});
} else if (code >= 8000) {
this.$message.error(msg);
this.btnLoading = false;
@ -1381,7 +1318,6 @@ export default {
handleLocalRadio(e) {
if (e.target.type === 'radio') return
this.form.baseInfoDto.localResidenceFlag = this.form.baseInfoDto.localResidenceFlag === 0 ? 1 : 0;
console.log(this.form.baseInfoDto.localResidenceFlag);
},
handelClickMarriage() {
this.form.familyInfoDto.spouseSituation = null
@ -1401,7 +1337,6 @@ export default {
unemploymentReason: null,//code
employmentHardFlag: null,//10
employmentWish: null,//
}
this.form.workInfoDto = {
careerStatus: val,//
@ -1456,7 +1391,6 @@ export default {
this.form.resideInfoDtos = homeArr
}
this.btnLoading = false;
} else if (code >= 8000) {
this.$message.error(msg);
this.btnLoading = false;
@ -1516,7 +1450,6 @@ export default {
'volunteerFlag': { formId: 'volunteerDto', formType: 'volunteerDto', title: '志愿者' },
'unemployedFlag': { formId: 'unemployedDto', formType: 'unemployedDto', title: '失业人员' }
};
if (map[value]) {
this.dialogTitle = map[value].title;
this.dialogVisible =
@ -1550,7 +1483,6 @@ export default {
watch: {},
};
</script>
<style lang='scss' scoped>
@import "@/assets/scss/modules/management/form-main.scss";
@import "@/assets/scss/pages/resiAdd.scss";

26
src/views/components/blackSearch.vue

@ -203,7 +203,6 @@
</el-card>
</div>
</template>
<script>
export default {
name: 'ResiSearch',
@ -220,11 +219,6 @@ export default {
data() {
let initForm = (arr, columnName) => {
let _form = {}
// console.log('formInfo', obj)
// if (Object.keys(obj).length > 0) {
// _form = { ...obj }
// return _form
// }
arr.forEach((item) => {
if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
else _form[item.columnName] = ''
@ -233,7 +227,6 @@ export default {
}
let form = initForm(this.formList, this.columnName)
let tempFormList = this.formList.map(item => {
return {
...item,
isChange: this.columnName && this.columnName === item.columnName ? true : false
@ -337,11 +330,9 @@ export default {
watch: {
form: {
handler(val, val2) {
// console.log('valpppp----', val, val2)
for (let n in val) {
if (this.constForm[n] !== val[n]) {
this.handleChangeForm(n)
console.log('nnnnnn', n)
}
}
this.constForm = { ...val }
@ -351,7 +342,6 @@ export default {
},
created() {
// this.initForm()
// console.log('formcccc---', this.form)
this.getGridList()
this.getValiheList()
if (this.columnName) this.handleChangeForm(this.columnName)
@ -361,7 +351,6 @@ export default {
this.formList.forEach((item) => {
this.$set(this.form, item.columnName, '')
})
console.log('formcccc---', this.form)
},
handleClearVillage() {
this.form.BUILD_ID = ''
@ -383,7 +372,6 @@ export default {
this.handleSearch()
},
handleSearch() {
// console.log('formmmmm---', this.form)
const itemTypes = ['daterange', 'timerange']
let arr = this.tempFormList
.filter((n) => n.isChange)
@ -414,7 +402,6 @@ export default {
this.openSearch = !this.openSearch
},
handleChangeGrid(val) {
console.log('val', val)
this.form.VILLAGE_ID = ''
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
@ -422,20 +409,17 @@ export default {
this.getValiheList()
},
handleChangeV(val) {
console.log('val', val)
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getBuildList()
},
handleChangeB(val) {
console.log('val', val)
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getUniList()
},
handleChangeD(val) {
console.log('val', val)
this.form.HOME_ID = ''
this.getHouseList()
},
@ -451,7 +435,6 @@ export default {
hasVal = true
item.columnValue[0] = this.form[val]
if (!this.form[val]) this.fixedList.splice(index, 1)
console.log('fixedList----val', this.fixedList)
} else {
_item = {
queryType: 'equal',
@ -459,8 +442,6 @@ export default {
columnName: val,
columnValue: [this.form[val]]
}
console.log('fixedList----else', _item)
// this.$set(this.fixedList, index, _item)
}
})
if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item)
@ -474,7 +455,6 @@ export default {
}
}
}
console.log('fixedList----999', this.fixedList)
this.tempFormList.forEach((item) => {
if (item.columnName === val) item.isChange = true
})
@ -487,7 +467,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
}
})
@ -507,7 +486,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsV = res.data
}
})
@ -524,7 +502,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsB = res.data
}
})
@ -541,7 +518,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsD = res.data
}
})
@ -556,7 +532,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsH = res.data
}
})
@ -567,7 +542,6 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.resi-container .resi-card {
position: relative;

14
src/views/components/checkBox.vue

@ -13,7 +13,6 @@
<div v-else class="no-data">暂无数据</div>
</div>
</template>
<script>
export default {
name: 'checkBox',
@ -29,33 +28,35 @@ export default {
list: {
type: Array,
default: () => []
},
leftList:{
type: Array,
default: () => []
}
},
data() {
return {
boxList: [],
checkAll: false,
checkedList: [],
checkedList: ["20230902094509_3048"],
isIndeterminate: false,
pid: '',
loading: false
}
},
created() {
console.log(this.leftList,"sfsdfd");
this.boxList = this.list.filter(item => item.itemType != 'inputRange')
console.log('cehck-bo----', this.list)
console.log(this.boxList,"kdsflkljf");
this.pid = this.list[0].itemGroupId
},
methods: {
handleCheckAllChange(val) {
this.checkedList = val ? this.boxList.map(item => item.itemId) : [];
this.isIndeterminate = false;
this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid })
},
handleChange(value) {
console.log('value----', value)
let checkedCount = value.length;
this.checkAll = checkedCount === this.boxList.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.boxList.length;
@ -73,7 +74,6 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.mb10 {
margin-bottom: 10px;

4
src/views/components/dateShow.vue

@ -1,10 +1,8 @@
<template>
<span>{{ showText }}</span>
</template>
<script>
import dateFormat from "dai-js/tools/dateFormat";
export default {
name: "dateShow",
props: {
@ -35,12 +33,10 @@ export default {
init() {
this.computeShowText();
},
computeShowText() {
const { timestamp, format } = this;
if (!timestamp) return;
const showText = dateFormat(new Date(timestamp * 1000), format);
this.showText = showText;
},
},

37
src/views/components/deathSearch.vue

@ -4,10 +4,8 @@
<el-form :inline="true"
:model="form"
:label-width="'100px'">
<el-form-item prop="gridId"
label="所属网格">
<el-select v-model.trim="form.GRID_ID"
placeholder="请选择"
size="small"
@ -22,7 +20,6 @@
</el-select>
</el-form-item>
<el-form-item label="所属房屋">
<el-select v-model.trim="form.VILLAGE_ID"
placeholder="请选择小区"
size="small"
@ -79,14 +76,11 @@
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-for="(n, index) in formList"
:key="index"
:prop="n.id"
:label="n.label">
<el-input v-if="n.itemType === 'input' || n.itemType === 'textarea'"
v-model.trim="form[n.columnName]"
class="u-item-width-normal"
@ -140,7 +134,6 @@
class="u-item-width-normal">
</el-cascader>
</el-form-item>
<div class="u-search-btn">
<el-button class="diy-button--white"
size="small"
@ -149,15 +142,11 @@
size="small"
class="diy-button--blue"
@click="handleSearch">查询</el-button>
</div>
</el-form>
</div>
</div>
</template>
<script>
export default {
name: 'DeathSearch',
@ -174,11 +163,6 @@ export default {
data () {
let initForm = (arr, columnName) => {
let _form = {}
// console.log('formInfo', obj)
// if (Object.keys(obj).length > 0) {
// _form = { ...obj }
// return _form
// }
arr.forEach((item) => {
if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
else _form[item.columnName] = ''
@ -187,7 +171,6 @@ export default {
}
let form = initForm(this.formList, this.columnName)
let tempFormList = this.formList.map(item => {
return {
...item,
isChange: this.columnName && this.columnName === item.columnName ? true : false
@ -291,11 +274,9 @@ export default {
watch: {
form: {
handler (val, val2) {
// console.log('valpppp----', val, val2)
for (let n in val) {
if (this.constForm[n] !== val[n]) {
this.handleChangeForm(n)
console.log('nnnnnn', n)
}
}
this.constForm = { ...val }
@ -304,8 +285,6 @@ export default {
}
},
created () {
// this.initForm()
// console.log('formcccc---', this.form)
this.getGridList()
this.getValiheList()
if (this.columnName) this.handleChangeForm(this.columnName)
@ -315,7 +294,6 @@ export default {
this.formList.forEach((item) => {
this.$set(this.form, item.columnName, '')
})
console.log('formcccc---', this.form)
},
handleClearVillage () {
this.form.BUILD_ID = ''
@ -337,7 +315,6 @@ export default {
this.handleSearch()
},
handleSearch () {
// console.log('formmmmm---', this.form)
const itemTypes = ['daterange', 'timerange']
let arr = this.tempFormList
.filter((n) => n.isChange)
@ -368,7 +345,6 @@ export default {
this.openSearch = !this.openSearch
},
handleChangeGrid (val) {
console.log('val', val)
this.form.VILLAGE_ID = ''
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
@ -376,20 +352,17 @@ export default {
this.getValiheList()
},
handleChangeV (val) {
console.log('val', val)
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getBuildList()
},
handleChangeB (val) {
console.log('val', val)
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getUniList()
},
handleChangeD (val) {
console.log('val', val)
this.form.HOME_ID = ''
this.getHouseList()
},
@ -405,7 +378,6 @@ export default {
hasVal = true
item.columnValue[0] = this.form[val]
if (!this.form[val]) this.fixedList.splice(index, 1)
console.log('fixedList----val', this.fixedList)
} else {
_item = {
queryType: 'equal',
@ -413,7 +385,6 @@ export default {
columnName: val,
columnValue: [this.form[val]]
}
console.log('fixedList----else', _item)
// this.$set(this.fixedList, index, _item)
}
})
@ -428,7 +399,6 @@ export default {
}
}
}
console.log('fixedList----999', this.fixedList)
this.tempFormList.forEach((item) => {
if (item.columnName === val) item.isChange = true
})
@ -441,7 +411,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
}
})
@ -461,7 +430,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsV = res.data
}
})
@ -478,7 +446,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsB = res.data
}
})
@ -495,7 +462,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsD = res.data
}
})
@ -510,7 +476,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsH = res.data
}
})
@ -521,10 +486,8 @@ export default {
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss";
.m-search {
background-color: #fff;
/deep/ .el-form-item {

5
src/views/components/dragItem.vue

@ -13,7 +13,6 @@
</div>
</div>
</template>
<script>
import Sortable from 'sortablejs'
export default {
@ -34,7 +33,6 @@ export default {
}
},
mounted() {
// this.dragSort()
},
watch: {
@ -58,7 +56,6 @@ export default {
animation: 500,
delay: 0,
onEnd: evt => {
console.log('evt----', evt)
const targetRow = this.list.splice(evt.oldIndex, 1)[0]
this.list.splice(evt.newIndex, 0, targetRow)
this.$emit('drag', this.list)
@ -68,7 +65,6 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.right-wr {
max-height: calc(80vh - 270px);
@ -79,7 +75,6 @@ export default {
justify-content: space-between;
cursor: pointer;
padding: 10px 30px;
}
}
.sortable-choose {

12
src/views/components/editResi.vue

@ -1743,16 +1743,7 @@ export default {
this.form.resideInfoDtos[index].optionsH = [];
this.getHouseList(index);
},
handleChangeH(i) {
// let item = this.form.resideInfoDtos[i].optionsH.find((item, index) => index === i);
// if (item && item.type == '1') {
// // this.form.IS_TENANT = '1'
// console.log('item-----', item)
// }
// else
// this.form.IS_TENANT = '0'
},
handleChangeH(i) {},
getValiheList(index) {
const { user } = this.$store.state;
this.$http
@ -1892,7 +1883,6 @@ export default {
},
handelClickMarriage() {
this.form.familyInfoDto.spouseSituation = null;
// console.log(this.form.familyInfoDto,'');
},
handelClickelderly() {
this.form.familyInfoDto.elderlyRelation = null;

54
src/views/components/editResiCopy.vue

@ -115,16 +115,12 @@
</el-form-item>
</div>
<!-- <el-col :span="6">
</el-col>
<el-col :span="6">
</el-col>
<el-col :span="6">
</el-col>
<el-col :span="6">
</el-col> -->
</div>
</el-form-item>
@ -175,7 +171,6 @@
<!-- <div class="resi-cell"> -->
<!-- <div class="resi-cell-label">{{n.label}}</div> -->
<div class="resi-cell-value">
<template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
<!-- <span v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'">{{ form[n.columnName]||'--'}}</span> -->
<el-input v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'"
@ -186,7 +181,6 @@
clearable
placeholder="请输入内容">
</el-input>
<el-input v-else-if="n.validType"
v-model.trim="form[n.columnName]"
:disabled="disabled"
@ -313,12 +307,9 @@
</el-form>
</div>
</template>
<script>
import { isCard, isMobile, isPhone } from '@/utils/validate'
import { requestPost } from "@/js/dai/request";
export default {
name: 'editForm',
props: {
@ -399,7 +390,6 @@ export default {
}
let initForm = (obj, arr) => {
let _form = {}
// console.log('formInfo', obj)
if (Object.keys(obj).length > 0) {
_form = { ...obj }
// return _form
@ -411,7 +401,6 @@ export default {
else _form[item.columnName] = (item.columnValue && [item.columnValue]) || []
} else _form[item.columnName] = item.columnValue || ''
})
// console.log('_from0000---', arr)
return _form
}
let initRules = (arr) => {
@ -441,7 +430,6 @@ export default {
let constForm = {
...form
}
console.log('-----------------哈哈哈哈哈哈rules', rules)
return {
openSearch: false,
fixedForm: {
@ -544,11 +532,9 @@ export default {
watch: {
form: {
handler (val, val2) {
console.log('valpppp----', val, val2)
for (let n in val) {
if (this.constForm[n] !== val[n]) {
this.handleChangeForm(n)
console.log('nnnnnn', n)
this.handleChangeGroup(n, val[n])
}
}
@ -559,11 +545,8 @@ export default {
},
created () {
this.initForm()
console.log('formInfo---gggreg', this.rulesForm)
console.log('formList', this.formList)
if (this.supportAdd) {
this.addList = [...this.mutiList]
// console.log('addList----111', this.addList)
}
if (this.fixed) {
this.getGridList()
@ -572,33 +555,25 @@ export default {
this.getUniList()
this.getHouseList()
}
},
mounted () {
console.log('this.editUserId', this.editUserId)
if (this.editUserId) {
this.handleTuomin()
}
},
methods: {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.editUserId,
type: "checkIcResiUser",
});
if (code === 0) {
this.$set(this.form, 'MOBILE', data.mobile)
this.$set(this.form, 'ID_CARD', data.idCard)
} else {
this.$message.error(msg);
}
},
initForm () {
this.formList.forEach(async item => {
@ -644,7 +619,6 @@ export default {
handleChangeGroup (columnName, value) {
this.tempFormList.forEach(item => {
if (item.columnName === columnName && item.itemType === 'radio' && item.childGroup) {
console.log('columnName', item.columnName, columnName)
this.$emit('changegroup', { value, childGroup: item.childGroup })
}
})
@ -666,7 +640,6 @@ export default {
// this.handleForm()
},
handleChangeGrid (val) {
console.log('val', val)
this.form.VILLAGE_ID = ''
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
@ -677,7 +650,6 @@ export default {
this.getHouseList()
},
handleChangeV (val) {
console.log('val', val)
this.form.BUILD_ID = ''
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
@ -686,7 +658,6 @@ export default {
this.getHouseList()
},
handleChangeB (val) {
console.log('val', val)
this.form.UNIT_ID = ''
this.form.HOME_ID = ''
this.getUniList()
@ -701,13 +672,11 @@ export default {
let item = this.optionsH.find(item => item.value === val);
if (item && item.type == '1') {
this.form.IS_TENANT = '1'
console.log('item-----', item)
} else this.form.IS_TENANT = '0'
},
handlerMuscForm () {
let arr = []
this.addList.forEach(item => {
// console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm())
arr.push([...this.$refs['baseForms' + item.row][0].handleForm()])
})
if (arr.length === 0) return arr
@ -750,7 +719,6 @@ export default {
tableName: name
})
})
// console.log('resssssss', res)
const itemTypes = ['cascader', 'daterange', 'timerange']
res.forEach(item => {
let _form = {}
@ -770,7 +738,6 @@ export default {
}
if (!_form.ID) _form.ID = ID
}
console.log('objeckeyssss', Object.keys(_form), _form)
newForm.push({
tableName: item.tableName,
supportAdd: this.supportAdd,
@ -778,10 +745,8 @@ export default {
list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
})
})
console.log('newFormhhhhh', newForm)
return newForm
} else {
console.log('error submit!!')
return false
}
})
@ -790,7 +755,6 @@ export default {
},
async getOptionsLists (url) {
let options = []
// console.log('getOptionsList----', url)
await this.$http
.post(url, { formCode: 'resi_base_info' })
.then(({ data: res }) => {
@ -816,7 +780,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
}
})
@ -832,7 +795,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsV = res.data
}
})
@ -847,7 +809,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsB = res.data
}
})
@ -862,7 +823,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsD = res.data
}
})
@ -877,7 +837,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsH = res.data
}
})
@ -888,7 +847,6 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.resi-form {
:deep .el-date-editor.el-input,
@ -904,25 +862,13 @@ export default {
.resi-form .resi-row {
margin-bottom: 0;
}
// .resi-form .resi-cell {
// display: flex;
// align-items: center;
// .resi-cell-label {
// width: 70px;
// box-sizing: border-box;
// margin-right: 15px;
// text-align: right;
// }
// .resi-cell-value-radio {
// display: flex;
// align-items: center;
// min-height: 36px;
// }
// .resi-cell-value .resi-cell-input {
// width: 180px;
// }
.resi-cell-value .resi-cell-textarea {
width: 300px;
}

5
src/views/components/fixed1920.vue

@ -13,12 +13,10 @@ export default {
clientWidth: document.documentElement.clientWidth,
};
},
components: {},
computed: {
bdStyle() {
const { clientHeight, clientWidth } = this;
// console.log("clientHeight", clientHeight);
const scale = clientWidth / 1920;
const height = clientHeight / scale;
const top = (clientHeight - height) / 2;
@ -40,11 +38,9 @@ export default {
this.clientWidth = document.documentElement.clientWidth;
});
},
methods: {},
};
</script>
<style lang="scss" scoped>
.g-app {
position: absolute;
@ -53,7 +49,6 @@ export default {
height: 100vh;
overflow: hidden;
}
.g-bd {
position: absolute;
width: 1920px;

15
src/views/components/foldText.vue

@ -13,10 +13,8 @@
</div>
</div>
</template>
<script>
import nextTick from "dai-js/tools/nextTick";
export default {
name: "ResiSearch",
props: {
@ -32,9 +30,7 @@ export default {
data() {
return {
initOk: false,
isFolded: false,
noNeedFold: false,
};
},
@ -46,17 +42,13 @@ export default {
methods: {
async init() {
await nextTick();
const height = await this.$refs.foldSlot.offsetHeight;
const { row, lineHeight } = this;
let noNeedFold = height / row < lineHeight;
this.noNeedFold = noNeedFold;
this.isFolded = !noNeedFold;
this.initOk = true;
},
shiftFold() {
let { isFolded } = this;
this.isFolded = !isFolded;
@ -64,7 +56,6 @@ export default {
},
};
</script>
<style lang="scss" scoped>
//
@mixin cs {
@ -77,7 +68,6 @@ export default {
content: "";
}
}
//
@mixin toe {
overflow: hidden;
@ -85,7 +75,6 @@ export default {
text-overflow: ellipsis;
word-wrap: normal;
}
//
@mixin toeM($num) {
display: -webkit-box;
@ -94,17 +83,14 @@ export default {
-webkit-line-clamp: $num;
-webkit-box-orient: vertical;
}
.m-fold_text {
@include cs;
&.z-init {
background-color: rgba(#000, 0.05);
> view {
visibility: hidden;
}
}
.fold_text-cnt {
&.z-fold-1 {
@include toe;
@ -122,7 +108,6 @@ export default {
@include toeM(5);
}
}
.fold_text-btn {
float: right;
margin-right: -4px;

11
src/views/components/rangeInput.vue

@ -22,10 +22,8 @@
@blur="handleBlur" />
</el-form-item> -->
</div>
</el-form>
</template>
<script>
export default {
name: 'inputRange',
@ -59,12 +57,10 @@ export default {
} else {
callback()
}
}
}
return {
inputForm: { ...this.value },
}
},
computed: {
@ -74,7 +70,6 @@ export default {
},
watch: {
'value.start' (val) {
console.log(val);
this.inputForm.start = val
},
'value.end' (val) {
@ -83,17 +78,13 @@ export default {
},
methods: {
handleChange (val) {
console.log(this.inputForm);
// if ()
this.$emit('change', { ...this.inputForm })
},
handleBlur () {
}
}
}
</script>
<style lang="scss" scoped>
.flex-div {
display: flex;
@ -101,7 +92,6 @@ export default {
max-width: 200px;
}
// .wd50 {
// // width: 45%;
// }
.demo-form-inline {
::v-deep {
@ -119,7 +109,6 @@ export default {
}
}
}
.div_middle {
padding: 0 10px;
}

20
src/views/components/resiChangeTransfer.vue

@ -372,7 +372,6 @@ export default {
},
handleChangeAgency() {
console.log(this.$refs["myCascader"].getCheckedNodes()[0].data);
this.selGrid = this.$refs["myCascader"].getCheckedNodes()[0].data;
this.dataForm.agencyId = this.selGrid.pid;
this.dataForm.gridId = this.selGrid.agencyId;
@ -500,8 +499,6 @@ export default {
}, 2000);
this.$refs["ref_form"].validate((valid, messageObj) => {
if (!valid) {
// app.util.validateRule(messageObj)
console.log("error submit!");
} else {
if (this.dataForm.type === "in") {
if (!this.dataForm.buildId) {
@ -542,23 +539,6 @@ export default {
this.$message.error(msg);
}
},
// async saveForm () {
// const url = '/epmetuser/icusertransferrecord/add'
// let noData = new Date()
// noData = util.dateFormatter(noData, 'time')
// this.dataForm.transferTime = noData
//
// console.log('-----------3--------------')
// console.log(this.dataForm)
// const { data, code, msg } = await requestPost(url, this.dataForm)
//
// if (code === 0) {
// this.$message.success('')
// this.handleCancle()
// } else {
// this.$message.error(msg)
// }
// },
handleCancle() {
this.resetData();

26
src/views/components/resiExpand/editExpand.vue

@ -16,7 +16,6 @@
</el-radio>
</section>
</template>
<template v-else-if="itemk.itemType == 'select1' && itemk.showFlag !== '0'">
<el-select v-model.trim="form[itemj.id][itemk.formName]" :placeholder="`请选择${itemk.label}`"
size="small" :multiple="itemk.multiple" :disabled="itemk.disabled" :collapse-tags="itemk.collapseTags"
@ -28,21 +27,18 @@
</el-option>
</el-select>
</template>
<template v-else-if="itemk.itemType == 'textarea1'">
<el-input type="textarea" :placeholder="`请输入${itemk.label}`" class="item-width-textarea"
maxlength="120" size="small" show-word-limit resize="none" rows="3"
v-model.trim="form[itemj.id][itemk.formName]" @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
</el-input>
</template>
<template v-else-if="itemk.itemType == 'input1'">
<el-input :placeholder="`请输入${itemk.label}`" class="list_item_width_1" size="small"
:style="{ 'margin-right': itemk.label == '备注' ? '50px' : '' }"
v-model.trim="form[itemj.id][itemk.formName]" clearable @change.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
</el-input>
</template>
<template v-else-if="itemk.itemType == 'inputNum'" style="display:flex">
<div style="display: flex;">
<el-input :placeholder="`请输入${itemk.label}`" size="small" class="list_item_width_1-text"
@ -52,7 +48,6 @@
</el-input><span class="u-data-tag" style="margin-left: 10px;"></span>
</div>
</template>
<template v-else-if="itemk.itemType == 'checkbox'">
<el-checkbox-group size="small" v-model.trim="form[itemj.id][itemk.formName]">
<el-checkbox v-for="items in itemk.opction" :label="items.value"
@ -60,38 +55,31 @@
:key="items.value" :value="items.value" @click.native="handleFormChange(itemj.id,itemk.formName,itemk.itemType)" :disabled="items.disabled">{{ items.label }}</el-checkbox>
</el-checkbox-group>
</template>
<template v-else-if="itemk.itemType == 'datepicker1' && itemk.showFlag !== '0'">
<el-date-picker v-model.trim="form[itemj.id][itemk.formName]" class="list_item_width_1"
type="date" size="small" clearable placeholder="选择日期" format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd" @change="handleFormChange(itemj.id,itemk.formName,itemk.itemType)">
</el-date-picker>
</template>
<template v-else-if="itemk.itemType == 'cascader1'">
<el-cascader v-model.trim="form[itemj.id].partyOrgId" :props="casProps"
:options="itemk.opction" class="list_item_width_1" clearable size="small"
@change="handlePartyOrgCascadarChange" ></el-cascader>
</template>
<template v-else-if="itemk.itemType == 'number'">
<el-input-number class="list_item_width_1" size="small" :min="1" :max="10"
v-model.trim="form[itemj.id][itemk.formName]"></el-input-number>
</template>
</el-form-item>
</section>
</template>
</div>
</el-form>
</div>
</template>
<script>
import { requestPost, requestGet } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
export default {
data() {
return {
@ -160,7 +148,6 @@ export default {
employmentSituation: null,
pubWelfareJobFlag: null
},
//
ensureHouseDto: {
liveCommunity: null,
@ -224,8 +211,6 @@ export default {
},
methods: {
handleFormChange(pid,id,type){
console.log(pid,id,type,'拓展组件');
console.log(this.formList);
this.changPid = pid;
this.changId = id;
this.changType = type;
@ -261,7 +246,6 @@ export default {
this.form[pid].resideSituation = 'kongchao'
item.form[0].children[1].disabled = true;
this.$forceUpdate()
} else {
itemJ.disabled = false;
this.$forceUpdate()
@ -302,7 +286,6 @@ export default {
const acc = await accPromise;
acc[childItem.formName] = null;
this.form[childItem.pformName].id = childItem.id;
if (childItem.itemType === 'checkbox') {
this.form[childItem.pformName][childItem.formName] = childItem.value || [];
} else if (childItem.itemType === 'cascader1') {
@ -316,7 +299,6 @@ export default {
} else {
this.form[childItem.pformName][childItem.formName] = childItem.value != null ? childItem.value : null;
}
if (childItem.opctionUrl) {
try {
childItem.opction = await this.getDictDataForm(childItem.opctionUrl, childItem.opctionParams);
@ -329,7 +311,6 @@ export default {
});
return Promise.all(groupPromises);
});
try {
await Promise.all(promises);
console.log('Form processing complete');
@ -337,7 +318,6 @@ export default {
console.error('Error processing form:', error);
}
},
async getDictDataForm(url, params) {
try {
const { data } = await this.$http.post(url, params);
@ -346,7 +326,6 @@ export default {
console.log(error, `获取 ${opctionParams.dictType} 字典`);
}
},
handlePartyOrgCascadarChange(selectedNode) {
this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];
this.handleFormChange('parymemberInfoDto','partyOrgId','cascader1')
@ -392,7 +371,6 @@ export default {
}
}
}
})
} catch (error) {
console.log(error);
@ -418,18 +396,14 @@ export default {
immediate: true
}
},
}
</script>
<style lang='scss' scoped>
@import "@/assets/scss/modules/management/list-main.scss";
h5 {
position: relative;
font-size: 16px;
margin: 22px 0;
&::after {
content: "";
position: absolute;

8
src/views/components/resiExpand/index.vue

@ -66,7 +66,6 @@
<el-input-number class="list_item_width_1" size="small" :min="1" :max="10"
v-model.trim="form[itemj.id][itemk.formName]"></el-input-number>
</template>
</el-form-item>
</section>
</template>
@ -79,7 +78,6 @@
</el-row>
</div>
</template>
<script>
import { requestPost, requestGet } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
@ -145,7 +143,6 @@ export default {
employmentSituation: null,
pubWelfareJobFlag: null
},
//
ensureHouseDto: {
liveCommunity: null,
@ -193,7 +190,6 @@ export default {
}
},
isLeaf: (data, node) => {
console.log(data);
//
//el-tree
if (data.partyOrgLevel == 7 || data.childrenQty == 0) {
@ -289,7 +285,6 @@ export default {
return acc;
}, Promise.resolve({}));
});
Promise.all(promises).then((results) => {
}).catch((error) => {
console.error('Error fetching options:', error);
@ -309,8 +304,6 @@ export default {
this.$emit('hideExpand', this.formType)
},
handleClickSUbmitExpand() {
console.log(this.formList);
console.log(this.form);
//
// this.formList.forEach((group) => {
// group.children.forEach((item) => {
@ -382,7 +375,6 @@ export default {
watch: {},
}
</script>
<style lang='scss' scoped>
@import "@/assets/scss/modules/management/list-main.scss";
.fourFont{

13
src/views/components/resiForm.vue

@ -436,7 +436,6 @@ export default {
this.handleNextOrgTreeClick(node, resolve)
},
isLeaf: (data, node) => {
console.log(data);
//
//el-tree
if(data.partyOrgLevel == 7 || data.childrenQty == 0) {
@ -1617,7 +1616,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
console.log('获取组织树成功', res.data);
this.orgOptions = [];
this.orgOptions.push(res.data);
}
@ -1629,9 +1627,6 @@ export default {
handleChangeAgency (val) {
let obj = this.$refs['myCascader'].getCheckedNodes()[0] ? this.$refs['myCascader'].getCheckedNodes()[0].data : null;
console.log('obj', obj);
console.log('gridId', this.gridId);
console.log('val', val);
if (obj) {
if (obj.level === 'grid') {
@ -1731,7 +1726,6 @@ export default {
await this.getTreeChildenList(node,resolve)
},
async getTreeChildenList (node, resolve) {
console.log(node);
if (node.data.partyOrgLevel === 7 ) {
resolve(null);
return;
@ -1880,7 +1874,6 @@ export default {
this.handleTabShow(item, val)
},
handleTabShow (item, val) {
console.log(item,val);
const mapping = {
partyFlag: { label: '党员', id: '0', groupId: 'parymemberInfoDto' },
ensureHouseFlag: { label: '保障房信息', id: '1', groupId: 'ensureHouseDto' },
@ -1952,7 +1945,6 @@ export default {
},
//
handleValidBlur (item) {
console.log(item);
if (item.formName !== 'idNum' && this.form.idType != 1) return
if (!isCard(this.form.idNum) && !isPassport(this.form.idNum)) return
const { user } = this.$store.state
@ -2120,11 +2112,9 @@ export default {
supportAdd: this.supportAdd,
list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
})
console.log(newForm);
})
return newForm
} else {
console.log('error submit!!')
return false
}
})
@ -2166,7 +2156,6 @@ export default {
let item = this.optionsH.find(item => item.value === val);
if (item && item.type == '1') {
this.form.IS_TENANT = '1'
console.log('item-----', item)
} else this.form.IS_TENANT = '0'
},
//
@ -2202,12 +2191,10 @@ export default {
async getListPartyOrgTreeRoot4Select(){
try {
const { data } = await this.$http.get('actual/base/party/org/listPartyOrgTreeRoot4Select')
console.log(data,'data懒加载');
this.footerInputList.forEach(c => {
for (let i of c.children) {
if (i.formName == 'partyOrgId') {
i.opction = [data.data];
console.log(i.opction,'option懒加载');
}
}
})

4
src/views/components/resiInfo.vue

@ -1703,7 +1703,6 @@ export default {
},
unemploymentText() {
let text = "--";
console.log(this.unemploymentArr);
this.unemploymentArr.forEach((item) => {
if (item.value == this.residentUnemployedObj.unemploymentReason) {
text = item.label;
@ -1713,7 +1712,6 @@ export default {
},
careerText() {
let text = "--";
console.log(this.careerArr);
this.careerArr.forEach((item) => {
if (item.value == this.residentUnemployedObj.employmentWish) {
text = item.label;
@ -1909,7 +1907,6 @@ export default {
.post(`/actual/base/residentBaseInfo/detail/${this.resiId}`)
.then((res) => {
this.resiDetailObj = res.data.data;
console.log('nationalityList', this.nationalityList)
this.resiDetailObj.nationalityName = ''
this.nationalityList.forEach(element => {
@ -1917,7 +1914,6 @@ export default {
this.resiDetailObj.nationalityName = element.label
}
});
console.log('idTypeList', this.idTypeList)
this.resiDetailObj.idTypeName = ''
this.idTypeList.forEach(element => {

3
src/views/components/resiInfo/ensureHouseDto/index.vue

@ -1,7 +1,6 @@
<template>
<div class=''>保障房</div>
</template>
<script>
export default {
data() {
@ -14,7 +13,5 @@ export default {
watch: {},
}
</script>
<style lang='scss'>
</style>

3
src/views/components/resiInfo/oldPeopleDto/index.vue

@ -1,7 +1,6 @@
<template>
<div class=''>老年人</div>
</template>
<script>
export default {
data() {
@ -14,7 +13,5 @@ export default {
watch: {},
}
</script>
<style lang='scss'>
</style>

3
src/views/components/resiInfo/parymemberInfoDto/index.vue

@ -1,7 +1,6 @@
<template>
<div class=''>党员</div>
</template>
<script>
export default {
data() {
@ -14,7 +13,5 @@ export default {
watch: {},
}
</script>
<style lang='scss'>
</style>

3
src/views/components/resiInfo/postDto/index.vue

@ -1,7 +1,6 @@
<template>
<div class=''>公益岗</div>
</template>
<script>
export default {
data() {
@ -14,7 +13,5 @@ export default {
watch: {},
}
</script>
<style lang='scss'>
</style>

3
src/views/components/resiInfo/specialSupportDto/index.vue

@ -1,7 +1,6 @@
<template>
<div class=''>特扶人员</div>
</template>
<script>
export default {
data() {
@ -14,7 +13,5 @@ export default {
watch: {},
}
</script>
<style lang='scss'>
</style>

3
src/views/components/resiInfo/unitedFrontDto/index.vue

@ -1,7 +1,6 @@
<template>
<div class=''>统战人员</div>
</template>
<script>
export default {
data() {
@ -14,7 +13,5 @@ export default {
watch: {},
}
</script>
<style lang='scss'>
</style>

3
src/views/components/resiInfo/veteranDto/index.vue

@ -1,7 +1,6 @@
<template>
<div class=''>退役军人</div>
</template>
<script>
export default {
data() {
@ -14,7 +13,5 @@ export default {
watch: {},
}
</script>
<style lang='scss'>
</style>

3
src/views/components/resiInfo/volunteerDto/index.vue

@ -1,7 +1,6 @@
<template>
<div class=''>志愿者</div>
</template>
<script>
export default {
data() {
@ -14,7 +13,5 @@ export default {
watch: {},
}
</script>
<style lang='scss'>
</style>

24
src/views/components/resiSearch.vue

@ -245,11 +245,8 @@
<smart-search-rule ref="ref_rule" :formType="formType"></smart-search-rule>
</el-col>
</el-row>
</div>
</template>
<script>
import inputRange from './rangeInput.vue'
import smartSearchRule from './smartSearchRule.vue'
@ -290,7 +287,6 @@ export default {
return _form
}
let itemList = this.formList.map(item => {
console.log(item);
if (item.itemType == 'inputRange' && item.funType == 'agetoyear') {
item.columnName = 'age'
}
@ -880,7 +876,6 @@ export default {
arrTemp.push([])
}
arrTemp[index].push(data[i])
// console.log(data[i],'zhi');
}
return arrTemp
}
@ -899,11 +894,9 @@ export default {
watch: {
form: {
handler(val, val2) {
// console.log('valpppp----', val, val2)
for (let n in val) {
if (this.constForm[n] !== val[n]) {
this.handleChangeForm(n)
// console.log('nnnnnn123', n)
}
}
this.constForm = { ...val }
@ -942,8 +935,6 @@ export default {
},
},
created() {
// this.initForm()
// console.log('formcccc---', this.form)
this.getOrgTreeList()
this.getEducation()
this.getDictList()
@ -1030,7 +1021,6 @@ export default {
this.formList.forEach((item) => {
this.$set(this.form, item.columnName, '')
})
console.log('formcccc---', this.form)
},
computdSpan(len) {
return len == 1 ? 24 : 6
@ -1106,7 +1096,6 @@ export default {
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);
@ -1118,7 +1107,6 @@ export default {
},
handleChangeGrid(val) {
console.log('val', val)
this.form.villageId = ''
this.form.buildId = ''
this.form.unitId = ''
@ -1126,20 +1114,17 @@ export default {
this.getValiheList()
},
handleChangeV(val) {
console.log('小区val', val)
this.form.buildId = ''
this.form.unitId = ''
this.form.homeId = ''
this.getBuildList()
},
handleChangeB(val) {
console.log('楼号val', val)
this.form.unitId = ''
this.form.homeId = ''
this.getUniList()
},
handleChangeD(val) {
console.log('单元val', val)
this.form.homeId = ''
this.getHouseList()
},
@ -1155,7 +1140,6 @@ export default {
hasVal = true
item.columnValue[0] = this.form[val]
if (!this.form[val]) this.fixedList.splice(index, 1)
console.log('fixedList----val', this.fixedList)
} else {
_item = {
queryType: this.queryType[val] ? this.queryType[val] : 'equal',//'equal',
@ -1163,7 +1147,6 @@ export default {
columnName: val,
columnValue: [this.form[val]]
}
console.log('fixedList----else', _item)
// this.$set(this.fixedList, index, _item)
}
})
@ -1178,7 +1161,6 @@ export default {
}
}
}
// console.log('fixedList----999', this.fixedList)
this.tempFormList.forEach((item) => {
if (item.columnName === val) item.isChange = true
})
@ -1190,7 +1172,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取组织树成功', res.data)
this.orgOptions = []
this.orgOptions.push(res.data)
}
@ -1217,7 +1198,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsV = [...this.optionsV, ...res.data];
}
})
@ -1234,7 +1214,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsB = res.data
}
})
@ -1251,7 +1230,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsD = res.data
}
})
@ -1266,7 +1244,6 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsH = res.data
}
})
@ -1294,7 +1271,6 @@ export default {
let { data } = await this.$http.post('sys/dict/data/education', { formCode: "resi_base_info" })
data.data = this.getTreeData(data.data)
this.Education = data.data
console.log(this.Education);
} catch (error) {
console.log(error, '获取民族字典');
}

1
src/views/components/resiTransfer.vue

@ -258,7 +258,6 @@ export default {
},
handleChangeAgency () {
console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
this.selGrid = this.$refs["myCascader"].getCheckedNodes()[0].data
this.dataForm.newAgencyId = this.selGrid.pid
this.dataForm.newGridId = this.selGrid.agencyId

1
src/views/components/selectStaff.vue

@ -899,7 +899,6 @@ export default {
};
subFn(data.subAgencyList);
console.log(rootSubAgencyList);
this.setData({
agencyLoading: false,
agency,

60
src/views/components/smartSearchRule.vue

@ -329,66 +329,9 @@ export default {
}
// } else {
// }
this.$set(this.smartRuleList, ruleIndex, oneData)
console.log(this.smartRuleList)
},
// async setRule (smartRuleList, smartRuleList) {
// // this.startLoading()
// if (this.groupList.length == 0 || this.houseItemList.length === 0) {
// setTimeout(() => {
// this.setRule(smartRuleList, smartRuleList);
// }, 500);
// return false
// }
// this.smartRuleList = smartRuleList
// if (this.smartRuleList && this.smartRuleList.length > 0) {
// this.personChecked = true
// for (let i = 0; i < this.smartRuleList.length; i++) {
// let element = this.smartRuleList[i]
// let selGroup = this.groupList.filter((item) =>
// element.itemGroupId === item.id
// );
// console.log(selGroup)
// if (selGroup.length > 0) {
// await this.handleSelGroup(i, selGroup[0], true)
// let selItem = element.itemList.filter((item) =>
// element.itemId === item.itemId);
// if (selItem.length > 0) {
// await this.handleSelGroupItem(i, selItem[0], true)
// }
// }
// }
// }
// this.smartRuleList = smartRuleList
// if (this.smartRuleList && this.smartRuleList.length > 0) {
// this.houseChecked = true
// this.smartRuleList.forEach((element, index) => {
// let selHouseItem = this.houseItemList.filter((item) =>
// element.colKey === item.colKey
// );
// if (selHouseItem.length > 0) {
// this.handleSelHouseItem(index, selHouseItem[0], true)
// }
// });
// }
// },
getRule () {
this.okflag = false
let messageObj = this.validateRule()
@ -401,7 +344,6 @@ export default {
if (this.smartRuleList.length > 0) {
this.smartRuleList[this.smartRuleList.length - 1].nextLogicalRel = ''
}
console.log('smartRuleList', this.smartRuleList)
this.okflag = true
}

8
src/views/components/tinymce/example/Index.vue

@ -3,16 +3,13 @@
<Tinymce v-model.trim="defaultValue" :height="300" placeholder="在这里输入文字" />
</div>
</template>
<script>
import Tinymce from '../index.vue'
export default {
components: {
Tinymce
},
props: {
},
data() {
return {
@ -20,19 +17,14 @@ export default {
}
},
computed: {
},
watch: {
},
created() {
},
mounted() {
},
methods: {
}
}
</script>

11
src/views/components/tinymce/index.vue

@ -2,7 +2,6 @@
<template>
<textarea :id="tinymceId" style="visibility: hidden" />
</template>
<script>
import loadTinymce from "@/utils/loadTinymce";
import { plugins, toolbar } from "./config";
@ -10,9 +9,7 @@ import { debounce } from "throttle-debounce";
import Cookie from "js-cookie";
// import constants from '@/utils/constants'
import nextTick from "dai-js/tools/nextTick";
let num = 1;
export default {
name: "Tinymce",
props: {
@ -42,7 +39,6 @@ export default {
// let uploadUrl = '1111'
let uploadUrl =
window.SITE_CONFIG["apiURL"] + "/oss/file/function/upload";
// :data="{customerId:customerId}"
// let uploadUrl = constants.userUploadUrl
// eslint-disable-next-line global-require
@ -98,11 +94,9 @@ export default {
failFun("Invalid JSON: " + xhr.responseText);
return;
}
succFun(json.data.url);
};
formData = new FormData();
formData.append("file", file, file.name); //
// formData.append('customerId', '111')
xhr.send(formData);
@ -113,7 +107,6 @@ export default {
if (this.value) editor.setContent(this.value);
this.vModel(editor);
};
tinymce.init(conf);
});
},
@ -130,19 +123,15 @@ export default {
debounceSetContent.call(editor, val);
}
});
editor.on("change keyup undo redo", () => {
this.$emit("input", editor.getContent());
});
editor.on("blur", () => {
this.$emit("blur");
});
console.log('init_instance_callback1111111111')
},
getUserToken() {
let token = localStorage.getItem("token");
// console.log('token', token)
// return this.$store.getters['user/isLogin']
return token;
},
destroyTinymce() {

16
src/views/components/tinymce2/index.vue

@ -2,7 +2,6 @@
<editor :id="id" v-model.trim="content" tag-name="div" :init="init" />
<!-- <textarea id="editors" v-model.trim="content" /> -->
</template>
<script>
import tinymce from "tinymce/tinymce";
import Editor from "@tinymce/tinymce-vue";
@ -72,7 +71,6 @@ export default {
let uploadUrl =
window.SITE_CONFIG["apiURL"] + "/oss/file/upload-resi-event-file";
let token = this.getUserToken();
let init = {
selector: `#${this.id}`,
language_url: require("./zh_CN.js"), //
@ -132,25 +130,20 @@ export default {
failFun("Invalid JSON: " + xhr.responseText);
return;
}
succFun(json.data.url);
};
formData = new FormData();
formData.append("file", file, file.name); //
formData.append("customerId", localStorage.getItem("customerId"));
xhr.send(formData);
},
};
// init = Object.assign(init, this.$attrs);
init.init_instance_callback = (editor) => {
if (this.value) editor.setContent(this.value);
this.vModel(editor);
};
// tinymce.init; //
const revert_data = (content) => {
// content =
// '<img> <img srt=""> <img style="width:100px;"> <img style="max-width:100%;width:100px;">';
@ -169,7 +162,6 @@ export default {
// });
this.$emit("input", content);
};
return {
content: this.value,
init,
@ -189,18 +181,12 @@ export default {
debounceSetContent.call(editor, val);
return;
}
// debounceSetContent.call(editor, this.dormatHtml(val));
});
editor.on("change keyup undo redo", () => {
// console.log('editor.getContent()---', editor.getContent({ format : 'p' }))
const c = editor.getContent({ format: "p" });
this.$emit("input", editor.getContent());
// debounce(500, this.$emit("input", editor.getContent({ format : 'p' })));
});
editor.on("blur", () => {
// console.log('editor.blur--', editor.getContent({ format : 'p' }))
// editor.getContent(editor.getContent({ format : 'p' }))
this.$emit("blur");
});
},
@ -209,7 +195,6 @@ export default {
if (content.indexOf("DOCTYPE") != -1) {
c = content.slice(45, -16);
}
console.log("content", typeof content);
return c || content;
},
getUserToken() {
@ -226,7 +211,6 @@ export default {
},
};
</script>
<style lang="scss">
//
.tox-tinymce-aux {

2
src/views/dataBoard/404.vue

@ -1,11 +1,9 @@
<template>
<div class="m-404">页面未找到或无权访问</div>
</template>
<script>
export default {};
</script>
<style lang="scss" scoped>
.m-404 {
margin-top: 200px;

3
src/views/dataBoard/cpts/CallPhone.vue

@ -1,7 +1,6 @@
<template>
<el-button class="tel-btn" :icon="icon" plain round size="small" type="primary">{{text}}</el-button>
</template>
<script>
export default {
name: "CallPhone",
@ -17,9 +16,7 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.tel-btn {
margin-left: 10px;
color: #06ebff;

2
src/views/dataBoard/cpts/NoData/index.vue

@ -6,7 +6,6 @@
</div>
</div>
</template>
<script>
export default {
name: "NoData",
@ -22,7 +21,6 @@ export default {
}
}
</script>
<style scoped>
.no-data {
display: flex;

5
src/views/dataBoard/cpts/Tabs.vue

@ -10,7 +10,6 @@
</span>
</div>
</template>
<script>
export default {
name: "Tabs",
@ -41,7 +40,6 @@ export default {
},
};
</script>
<style lang="scss" scoped>
.title {
// width: 100%;
@ -52,7 +50,6 @@ export default {
padding: 7px 0px 5px 34px;
background: url(@/assets/images/shuju/overview/title-small-bg.png) no-repeat;
background-size: 100% 100%;
.text {
font-size: 18px;
font-weight: 400;
@ -68,7 +65,6 @@ export default {
background: url("@/assets/images/overview/tab_cur.png") no-repeat;
opacity: 1;
}
.txt {
font-family: PingFang SC;
position: relative;
@ -78,7 +74,6 @@ export default {
}
}
}
.no-bg {
background: none;
}

5
src/views/dataBoard/cpts/Title/index.vue

@ -7,7 +7,6 @@
<slot></slot>
</div>
</template>
<script>
export default {
name: "Title",
@ -23,7 +22,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.title {
background: url("@/assets/images/manyidu/title-bg.png") no-repeat 0 0 fixed;
@ -32,13 +30,11 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
.text {
position: relative;
font-size: 22px;
font-family: HYShuYuanHeiJ;
font-weight: 400;
.txt {
color: #1f79ff;
background: linear-gradient(0deg, #2dc1ff 0%, #ffffff 58.5205078125%);
@ -47,7 +43,6 @@ export default {
position: relative;
z-index: 2;
}
.text-shadow {
top: 4px;
left: 3px;

15
src/views/dataBoard/cpts/bread.vue

@ -25,11 +25,9 @@
</div>
</div>
</template>
<script>
import ScreenLoading from "./loading";
import { mapGetters } from "vuex";
export default {
name: "bread",
components: {
@ -41,7 +39,6 @@ export default {
type: String,
default: "/",
},
//
breadList: {
type: Array,
@ -61,9 +58,7 @@ export default {
...mapGetters(["clientHeight", "iframeHeight"]),
},
mounted() {},
created() {},
methods: {
handleClickItem(item) {
this.$emit("tap", { item });
@ -71,42 +66,35 @@ export default {
},
};
</script>
<style lang="scss" scoped>
.m-bread {
padding: 0 0 15px 0;
.bread {
margin: 4px 0;
padding: 8px 16px;
height: 40px;
background: rgba(26, 149, 255, 0.15);
width: 100%;
/deep/ .el-breadcrumb__item {
line-height: 25px;
font-size: 14px;
}
/deep/ .el-breadcrumb__item .el-breadcrumb__inner {
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #ffffff;
}
/deep/ .el-breadcrumb__item:first-child .el-breadcrumb__inner {
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(255, 255, 255, 0.65);
}
.router_parents {
line-height: 25px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(255, 255, 255, 0.65);
.arrow {
padding: 0 5px;
}
@ -114,7 +102,6 @@ export default {
.router_parents:hover {
cursor: pointer;
}
.router_child {
line-height: 25px;
font-size: 14px;
@ -123,11 +110,9 @@ export default {
color: #ffffff;
}
}
.line {
display: flex;
width: 100%;
.line-left {
flex-grow: 0;
flex-shrink: 0;

31
src/views/dataBoard/cpts/details/jmxq.vue

@ -74,10 +74,8 @@
</div>
</el-dialog>
</template>
<script>
import titleBox from "@/views/dataBoard/satisfactionEval/components/Title";
export default {
name: "ReportAnEvent",
components: {
@ -93,7 +91,6 @@ export default {
default: false,
},
},
data() {
return {
item: {
@ -104,7 +101,6 @@ export default {
activities: [],
};
},
computed: {},
watch: {
showDialog: {
@ -117,24 +113,19 @@ export default {
},
},
mounted() {},
methods: {
handleClose() {
this.$emit("close", false);
this.item = {};
},
openImg(src) {
window.open(src);
},
getTrueTime(time) {
return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
},
getDetailsData(id) {
this.loading = true;
let params = {
demandRecId: id,
};
@ -153,99 +144,77 @@ export default {
},
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
<style lang="scss" scoped>
@import "@/assets/scss/modules/shequzhili/event-info.scss";
/deep/ .el-dialog {
background: url(~@/assets/images/manyidu/dialog-bg.png);
background-size: 100% 100%;
width: 818px;
height: 822px;
}
/deep/ .el-dialog__body {
padding: 0 20px 30px;
}
/deep/ .el-dialog__header {
border: 0 !important;
}
/deep/ .el-dialog__headerbtn {
top: 24px;
right: 32px;
.el-dialog__close {
color: #ffffff;
font-weight: 600;
}
}
@mixin fontStyle {
color: #fff !important;
font-size: 14px !important;
}
.eventWrap {
// width: 1094px;
height: 798px;
overflow-y: auto;
overflow-x: hidden;
padding: 24px;
.eventDetails {
font-size: 18px;
margin: 48px 24px 48px 0;
color: #ffffff;
img {
margin-top: -4px;
margin-right: 8px;
}
}
.m-info {
padding: 0px !important;
.m-process {
margin: 0 !important;
.name {
@include fontStyle;
}
.date {
@include fontStyle;
}
.detail {
@include fontStyle;
.detail-field {
flex: none !important;
}
}
}
}
.leftEvent {
color: #fff;
.eventItem {
font-size: 14px;
margin-bottom: 24px;
span:first-child {
}
span:last-child {
}
}
}
.rightEvent {
color: #fff;
}

29
src/views/dataBoard/cpts/details/smyd.vue

@ -68,10 +68,8 @@
</div>
</el-dialog>
</template>
<script>
import titleBox from "@/views/dataBoard/satisfactionEval/components/Title";
export default {
name: "ReportAnEvent",
components: {
@ -87,7 +85,6 @@ export default {
default: false,
},
},
data() {
return {
item: {
@ -112,21 +109,17 @@ export default {
},
},
mounted() {},
methods: {
handleClose() {
this.$emit("close", false);
this.item = {};
},
openImg(src) {
window.open(src);
},
getTrueTime(time) {
return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
},
getSxType(value) {
if (this.satisfactionCategoryOptions.length > 0 && value) {
return this.satisfactionCategoryOptions.filter(
@ -170,99 +163,77 @@ export default {
},
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
<style lang="scss" scoped>
@import "@/assets/scss/modules/shequzhili/event-info.scss";
/deep/ .el-dialog {
background: url(~@/assets/images/manyidu/dialog-bg.png);
background-size: 100% 100%;
width: 818px;
max-height: 822px;
}
/deep/ .el-dialog__body {
padding: 0 20px 30px;
}
/deep/ .el-dialog__header {
border: 0 !important;
}
/deep/ .el-dialog__headerbtn {
top: 24px;
right: 32px;
.el-dialog__close {
color: #ffffff;
font-weight: 600;
}
}
@mixin fontStyle {
color: #fff !important;
font-size: 14px !important;
}
.eventWrap {
// width: 1094px;
max-height: 798px;
overflow-y: auto;
overflow-x: hidden;
padding: 24px;
.eventDetails {
font-size: 18px;
margin: 48px 24px 48px 0;
color: #ffffff;
img {
margin-top: -4px;
margin-right: 8px;
}
}
.m-info {
padding: 0px !important;
.m-process {
margin: 0 !important;
.name {
@include fontStyle;
}
.date {
@include fontStyle;
}
.detail {
@include fontStyle;
.detail-field {
flex: none !important;
}
}
}
}
.leftEvent {
color: #fff;
.eventItem {
font-size: 14px;
margin-bottom: 24px;
span:first-child {
}
span:last-child {
}
}
}
.rightEvent {
color: #fff;
}

54
src/views/dataBoard/cpts/details/xqwmz.vue

@ -68,10 +68,8 @@
</div>
</el-dialog>
</template>
<script>
import titleBox from "@/views/dataBoard/satisfactionEval/components/Title";
export default {
name: "ReportAnEvent",
components: {
@ -87,7 +85,6 @@ export default {
default: false,
},
},
data() {
return {
item: {
@ -141,7 +138,6 @@ export default {
],
};
},
computed: {},
watch: {
showDialog: {
@ -154,21 +150,17 @@ export default {
},
},
mounted() {},
methods: {
handleClose() {
this.$emit("close", false);
this.item = {};
},
openImg(src) {
window.open(src);
},
getTrueTime(time) {
return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
},
getSxType(row) {
let arr = [];
let text = "";
@ -226,127 +218,81 @@ export default {
this.$message.error(msg);
}
});
// this.$http
// .post("/governance/provinceEvaluationRecord/" + id)
// .then((res) => {
// this.loading = false;
// const { code, data, msg } = res.data;
// if (code === 0) {
// this.item = data;
// } else {
// this.$message.error(msg);
// }
// });
// this.$http
// .get(
// "/governance/satisfactionDetailList/getUnsatisfiedCategory?satisfactionSource="
// )
// .then(({ data: { data } }) => {
// console.log('data::', data);
// this.satisfactionCategoryOptions = data.map((item) => {
// return {
// label: item.categoryName,
// value: item.categoryCode,
// };
// });
// });
},
},
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
<style lang="scss" scoped>
@import "@/assets/scss/modules/shequzhili/event-info.scss";
/deep/ .el-dialog {
background: url(~@/assets/images/manyidu/dialog-bg.png);
background-size: 100% 100%;
width: 818px;
max-height: 822px;
}
/deep/ .el-dialog__body {
padding: 0 20px 30px;
}
/deep/ .el-dialog__header {
border: 0 !important;
}
/deep/ .el-dialog__headerbtn {
top: 24px;
right: 32px;
.el-dialog__close {
color: #ffffff;
font-weight: 600;
}
}
@mixin fontStyle {
color: #fff !important;
font-size: 14px !important;
}
.eventWrap {
// width: 1094px;
max-height: 798px;
overflow-y: auto;
overflow-x: hidden;
padding: 24px;
.eventDetails {
font-size: 18px;
margin: 48px 24px 48px 0;
color: #ffffff;
img {
margin-top: -4px;
margin-right: 8px;
}
}
.m-info {
padding: 0px !important;
.m-process {
margin: 0 !important;
.name {
@include fontStyle;
}
.date {
@include fontStyle;
}
.detail {
@include fontStyle;
.detail-field {
flex: none !important;
}
}
}
}
.leftEvent {
color: #fff;
.eventItem {
font-size: 14px;
margin-bottom: 24px;
span:first-child {
}
span:last-child {
}
}
}
.rightEvent {
color: #fff;
}

10
src/views/dataBoard/cpts/details/yxwxfw.vue

@ -76,7 +76,6 @@
</div>
</el-dialog>
</template>
<script>
import titleBox from "@/views/dataBoard/satisfactionEval/components/Title";
export default {
@ -94,7 +93,6 @@ export default {
default: false,
},
},
data() {
return {
item: {},
@ -116,7 +114,6 @@ export default {
serviceTypesLevel1: [],
};
},
computed: {},
watch: {
showDialog: {
@ -142,21 +139,17 @@ export default {
return this.$message.error("网络错误");
});
},
methods: {
handleClose() {
this.$emit("close", false);
this.item = {};
},
openImg(src) {
window.open(src);
},
getTrueTime(time) {
return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
},
getFwType(value) {
if (this.serviceTypesLevel1.length > 0 && value) {
return this.serviceTypesLevel1.filter(
@ -195,12 +188,9 @@ export default {
},
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
<style lang="scss" scoped>
@import "@/assets/scss/modules/shequzhili/event-info.scss";
/deep/ .el-dialog {
background: url(~@/assets/images/manyidu/dialog-bg.png);
background-size: 100% 100%;

1
src/views/dataBoard/cpts/enterpriseInfo-detail.vue

@ -122,7 +122,6 @@
...this.info,
...data[0]
};
console.log("安全生产巡查详情", this.info)
// this.iniMap();
} else {
this.$message.error(msg);

27
src/views/dataBoard/cpts/event-details.vue

@ -6,7 +6,6 @@
:destroy-on-close="true"
:visible="showDialog"
@close="handleClose"
>
<div class="eventWrap"
v-loading="loading"
@ -21,7 +20,6 @@
<el-col
:span="13"
style="padding-left: 40px"
>
<div class="leftEvent">
<div class="eventDetails">
@ -203,10 +201,8 @@
</div>
</el-dialog>
</template>
<script>
import titleBox from "./Title";
export default {
name: "ReportAnEvent",
components: {
@ -226,7 +222,6 @@ export default {
default: false,
},
},
data() {
return {
item: {},
@ -235,7 +230,6 @@ export default {
activities: [],
};
},
computed: {},
watch: {
showDialog: {
@ -253,21 +247,17 @@ export default {
},
mounted() {
},
methods: {
handleClose() {
this.$emit("close", false);
this.item = {};
},
openImg(src) {
window.open(src);
},
getTrueTime(time) {
return this.$moment(time * 1000).format("YYYY-MM-DD hh:mm");
},
getDetailsData(id) {
this.loading = true;
this.$http
@ -300,75 +290,58 @@ export default {
},
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>
<style lang="scss" scoped>
@import "@/assets/scss/modules/shequzhili/event-info.scss";
@import "@/assets/scss/dataBoard/dialog.scss";
@mixin fontStyle {
color: #fff !important;
font-size: 14px !important;
}
.eventWrap {
width: 1094px;
//height: 798px;
overflow-y: auto;
overflow-x: hidden;
padding: 24px;
.eventDetails {
font-size: 18px;
margin: 48px 24px 48px 0;
color: #ffffff;
img {
margin-top: -4px;
margin-right: 8px;
}
}
.m-info {
padding: 0px !important;
.m-process {
margin: 0 !important;
.name {
@include fontStyle;
}
.date {
@include fontStyle;
}
.detail {
@include fontStyle;
.detail-field {
flex: none !important;
}
}
}
}
.leftEvent {
color: #fff;
.eventItem {
font-size: 14px;
margin-bottom: 24px;
span:first-child {
}
span:last-child {
}
}
}
.rightEvent {
color: #fff;
}

5
src/views/dataBoard/cpts/family/components/Breadcrumb/index.vue

@ -7,7 +7,6 @@
</div>
</div>
</template>
<script>
export default {
name: "Breadcrumb",
@ -19,9 +18,7 @@ export default {
}
}
</script>
<style scoped lang="scss">
.breadcrumb {
background: url("@/assets/images/manyidu/breadcrumb_bg.png") no-repeat left top;
height: 50px;
@ -29,10 +26,8 @@ export default {
padding-left: 20px;
display: flex;
align-items: center;
/deep/ .el-breadcrumb__inner {
color: #fff!important;
&.is-link {
color: #A3B9DA!important;
}

4
src/views/dataBoard/cpts/family/components/Pagination/index.vue

@ -14,9 +14,7 @@
/>
</div>
</template>
<script>
export default {
name: 'Pagination',
props: {
@ -95,14 +93,12 @@ export default {
}
}
</script>
<style scoped lang="scss">
.pagination-container {
padding: 32px 16px;
display: flex;
justify-content: flex-end;
position: relative;
/deep/ .el-pagination__total {
position: absolute;
left: 16px;

2
src/views/dataBoard/cpts/family/components/Tabs/index.vue

@ -5,7 +5,6 @@
</div>
</div>
</template>
<script>
export default {
name: "Tabs",
@ -36,7 +35,6 @@ export default {
}
}
</script>
<style scoped lang="scss">
.tabs {
display: flex;

5
src/views/dataBoard/cpts/family/components/Title/index.vue

@ -7,7 +7,6 @@
<slot></slot>
</div>
</template>
<script>
export default {
name: "Title",
@ -23,7 +22,6 @@ export default {
}
}
</script>
<style scoped lang="scss">
.title {
background: url(../../../../../assets/images/shuju/overview/title-bg.png)
@ -32,13 +30,11 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
.text {
position: relative;
font-size: 22px;
font-family: HYShuYuanHeiJ;
font-weight: 400;
.txt {
color: #1f79ff;
background: linear-gradient(0deg, #2dc1ff 0%, #ffffff 58.5205078125%);
@ -47,7 +43,6 @@ export default {
position: relative;
z-index: 2;
}
.text-shadow {
top: 4px;
left: 3px;

3
src/views/dataBoard/cpts/family/index.vue

@ -22,7 +22,6 @@
/>
</div>
</template>
<script>
import dataTitle from "@/views/dataBoard/renfang/visualizing/components/dataTitle.vue";
import MatterDetails from "./modules/MatterDetails";
@ -31,7 +30,6 @@ import BusinessRecords from "./modules/BusinessRecords";
import EnjoyService from "./modules/EnjoyService";
import PointsRecord from "./modules/PointsRecord";
import resiDetails from "@/views/dataBoard/cpts/resi-details";
export default {
name: "OrgPersonnel",
components: {
@ -61,7 +59,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.sub-title {
background: url("@/assets/images/manyidu/icon_fk.png") no-repeat left center;

6
src/views/dataBoard/cpts/family/modules/BusinessRecords.vue

@ -9,7 +9,6 @@
<giveService @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 6" />
</div>
</template>
<script>
import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue";
import complaint from "./businessTables/complaint.vue";
@ -18,7 +17,6 @@ import community from "./businessTables/community.vue";
import reportingEvents from "./businessTables/reporting-events.vue";
import resident from "./businessTables/resident.vue";
import giveService from "./businessTables/give-service.vue";
export default {
name: "BusinessRecords",
props: {
@ -104,7 +102,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.business-records {
margin-top: 12px;
@ -128,7 +125,6 @@ export default {
color: #ffffff;
text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
}
/deep/ .el-table tr {
background: none;
&:hover {
@ -138,10 +134,8 @@ export default {
/deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
background: rgba(14, 56, 115, 0.4);
}
/deep/ .el-table {
background: none !important;
&:before {
background: none;
}

6
src/views/dataBoard/cpts/family/modules/EnjoyService.vue

@ -40,7 +40,6 @@
<el-table-column label="操作人" prop="operatorName" width="120" />
<el-table-column label="调整时间" prop="changeTime" width="190" />
</el-table>
<div
v-else
style="width: 100%; height: 100%; text-align: center; padding-top: 120px"
@ -54,7 +53,6 @@
</div>
</div>
</template>
<script>
export default {
name: "community",
@ -109,7 +107,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.business-records {
margin-bottom: 25px;
@ -132,7 +129,6 @@ export default {
color: #ffffff;
text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
}
/deep/ .el-table tr {
background: none;
&:hover {
@ -142,10 +138,8 @@ export default {
/deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
background: rgba(14, 56, 115, 0.4);
}
/deep/ .el-table {
background: none !important;
&:before {
background: none;
}

2
src/views/dataBoard/cpts/family/modules/Family.vue

@ -19,7 +19,6 @@
</div>
</div>
</template>
<script>
export default {
name: "Family",
@ -106,7 +105,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.family {
width: 464px;

8
src/views/dataBoard/cpts/family/modules/MatterDetails.vue

@ -12,7 +12,6 @@
<!-- <div class="jtxxdz">四季景园1号楼1单元101</div>-->
</div>
</template>
<script>
export default {
name: "MatterDetails",
@ -23,7 +22,6 @@ export default {
genderArr: ["未知", "男", "女"],
};
},
created() {
this.getDatas();
},
@ -45,7 +43,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.jtxxdz {
width: 100%;
@ -107,7 +104,6 @@ export default {
left: 499px;
bottom: 157px;
}
&:nth-of-type(3) {
left: 194px;
bottom: 245px;
@ -116,22 +112,18 @@ export default {
left: 384px;
bottom: 240px;
}
&:nth-of-type(5) {
left: 0;
bottom: 15px;
}
&:nth-of-type(6) {
left: 453px;
bottom: 10px;
}
}
.smallFont {
font-size: 10px;
}
.user-name {
width: 174px;
text-align: center;

2
src/views/dataBoard/cpts/family/modules/PointsRecord.vue

@ -11,7 +11,6 @@
</div>
</div>
</template>
<script>
export default {
name: "PointsRecord",
@ -34,7 +33,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.enjoy-service {
padding-left: 26px;

5
src/views/dataBoard/cpts/family/modules/businessTables/community.vue

@ -19,7 +19,6 @@
<xqwmz :showDialog="showDialog" :id="rowId" @close="close" />
</div>
</template>
<script>
import xqwmz from "@/views/dataBoard/cpts/details/xqwmz.vue";
export default {
@ -85,7 +84,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.business-records {
margin-bottom: 25px;
@ -108,7 +106,6 @@ export default {
color: #ffffff;
text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
}
/deep/ .el-table tr {
background: none;
&:hover {
@ -118,10 +115,8 @@ export default {
/deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
background: rgba(14, 56, 115, 0.4);
}
/deep/ .el-table {
background: none !important;
&:before {
background: none;
}

5
src/views/dataBoard/cpts/family/modules/businessTables/complaint.vue

@ -21,7 +21,6 @@
<eventDetails :showDialog="showDialog" :resiId="rowId" @close="close" />
</div>
</template>
<script>
import eventDetails from "../../../event-details.vue";
export default {
@ -90,7 +89,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.business-records {
margin-bottom: 25px;
@ -113,7 +111,6 @@ export default {
color: #ffffff;
text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
}
/deep/ .el-table tr {
background: none;
&:hover {
@ -123,10 +120,8 @@ export default {
/deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
background: rgba(14, 56, 115, 0.4);
}
/deep/ .el-table {
background: none !important;
&:before {
background: none;
}

5
src/views/dataBoard/cpts/family/modules/businessTables/economize.vue

@ -19,7 +19,6 @@
<smyd :showDialog="showDialog" :id="rowId" @close="close" />
</div>
</template>
<script>
import smyd from "@/views/dataBoard/cpts/details/smyd.vue";
export default {
@ -73,7 +72,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.business-records {
margin-bottom: 25px;
@ -96,7 +94,6 @@ export default {
color: #ffffff;
text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
}
/deep/ .el-table tr {
background: none;
&:hover {
@ -106,10 +103,8 @@ export default {
/deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
background: rgba(14, 56, 115, 0.4);
}
/deep/ .el-table {
background: none !important;
&:before {
background: none;
}

5
src/views/dataBoard/cpts/family/modules/businessTables/give-service.vue

@ -19,7 +19,6 @@
<yxwxfw :showDialog="showDialog" :id="rowId" @close="close" />
</div>
</template>
<script>
import yxwxfw from "@/views/dataBoard/cpts/details/yxwxfw.vue";
export default {
@ -77,7 +76,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.business-records {
margin-bottom: 25px;
@ -100,7 +98,6 @@ export default {
color: #ffffff;
text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
}
/deep/ .el-table tr {
background: none;
&:hover {
@ -110,10 +107,8 @@ export default {
/deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
background: rgba(14, 56, 115, 0.4);
}
/deep/ .el-table {
background: none !important;
&:before {
background: none;
}

5
src/views/dataBoard/cpts/family/modules/businessTables/reporting-events.vue

@ -20,7 +20,6 @@
<eventDetails :showDialog="showDialog" :id="this.rowId" @close="close" />
</div>
</template>
<script>
import eventDetails from "../../../old-event-details.vue";
export default {
@ -87,7 +86,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.business-records {
margin-bottom: 25px;
@ -110,7 +108,6 @@ export default {
color: #ffffff;
text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
}
/deep/ .el-table tr {
background: none;
&:hover {
@ -120,10 +117,8 @@ export default {
/deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
background: rgba(14, 56, 115, 0.4);
}
/deep/ .el-table {
background: none !important;
&:before {
background: none;
}

5
src/views/dataBoard/cpts/family/modules/businessTables/resident.vue

@ -19,7 +19,6 @@
<jmxq :showDialog="showDialog" :id="rowId" @close="close" />
</div>
</template>
<script>
import jmxq from "@/views/dataBoard/cpts/details/jmxq.vue";
export default {
@ -77,7 +76,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.business-records {
margin-bottom: 25px;
@ -100,7 +98,6 @@ export default {
color: #ffffff;
text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
}
/deep/ .el-table tr {
background: none;
&:hover {
@ -110,10 +107,8 @@ export default {
/deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
background: rgba(14, 56, 115, 0.4);
}
/deep/ .el-table {
background: none !important;
&:before {
background: none;
}

2
src/views/dataBoard/cpts/homeDetails/PeopleMount/index.vue

@ -6,7 +6,6 @@
</div>
</div>
</template>
<script>
export default {
name: "PeopleMount",
@ -34,7 +33,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.peopleMount {
display: flex;

5
src/views/dataBoard/cpts/homeDetails/Title/index.vue

@ -8,7 +8,6 @@
<!-- <slot></slot> -->
</div>
</template>
<script>
export default {
name: "Title",
@ -24,7 +23,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.title {
background: url(../../../../../assets/images/shuju/overview/title-bg.png) no-repeat 0 0 fixed;
@ -32,13 +30,11 @@ export default {
display: flex;
align-items: center;
// justify-content: space-between;
.text {
position: relative;
font-size: 22px;
font-family: HYShuYuanHeiJ;
font-weight: 400;
.txt {
color: #1f79ff;
background: linear-gradient(0deg, #2dc1ff 0%, #ffffff 58.5205078125%);
@ -47,7 +43,6 @@ export default {
position: relative;
z-index: 2;
}
.text-shadow {
top: 4px;
left: 3px;

3
src/views/dataBoard/cpts/homeDetails/index.vue

@ -553,7 +553,6 @@ export default {
(unitInfos.buildingName ? unitInfos.buildingName : "") +
(unitInfos.unitNum ? unitInfos.unitNum + "单元" : "");
this.houseMountArr = this.getDoorNameList(houseList);
console.log(this.houseMountArr);
if (this.houseMountArr.length > 0) {
this.flexWidth = this.houseMountArr[0].length * 58;
}
@ -688,8 +687,6 @@ export default {
["LIVE_ALONE_FLAG", "kclr"],
["PUBLIC_WELFARE_FLAG", "gyg"],
]);
console.log(item);
console.log(homeTypeMap.get(item));
return homeTypeMap.get(item);
},

13
src/views/dataBoard/cpts/house-details.vue

@ -32,14 +32,12 @@
<div class="value">{{ info.house_state }}</div>
</div>
</div>
<div class="row">
<div class="item">
<div class="field">房主姓名</div>
<div class="value">{{ info.holder_name }}</div>
</div>
</div>
<div class="row">
<div class="item">
<div class="field">联系电话</div>
@ -58,11 +56,9 @@
</template>
</popup>
</template>
<script>
import popup from "@/views/dataBoard/cpts/popup";
import { requestPostBi } from "@/js/dai/request-bipass";
export default {
name: "houseDetails",
props: {
@ -71,9 +67,7 @@ export default {
default: "",
},
},
components: { popup },
data() {
return {
info: {
@ -92,24 +86,19 @@ export default {
},
};
},
mounted() {
this.getApiData();
},
methods: {
handleClose() {
this.$emit("close");
},
async getApiData() {
this.getInfo();
},
// id
async getInfo() {
const url = "house_info";
const { data, code, msg } = await requestPostBi(
url,
{
@ -121,7 +110,6 @@ export default {
// mockId: 60235478,
}
);
if (code === 0) {
this.info = { ...this.info, ...data[0] };
} else {
@ -131,5 +119,4 @@ export default {
},
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/popup-info.scss" scoped></style>

3
src/views/dataBoard/cpts/loading.vue

@ -20,7 +20,6 @@
dur="3s"
repeatCount="indefinite" />
</circle>
<circle cx="25"
cy="25"
r="10"
@ -45,13 +44,11 @@
</div>
</div>
</template>
<script>
export default {
name: 'DvLoading'
}
</script>
<style lang="scss" scoped>
.screen-loading {
width: 100%;

18
src/views/dataBoard/cpts/map/index.vue

@ -272,10 +272,8 @@ export default {
this.setStartScale(n);
},
level(n, v) {
console.log("level", n);
},
peopleType(n, v) {
console.log("peopleType", n);
},
},
@ -285,7 +283,6 @@ export default {
securityJsCode: "92ea2c965c6cf1ba7ee3a8fe01449ef2",
};
const scale = this.$store.state.chooseArea.realScale;
// console.log(scale);
if (scale) {
this.setStartScale(scale);
}
@ -353,7 +350,6 @@ export default {
//
iniMapBase(scene) {
// console.log("-----------------iniMapBase");
//
const baseLayer = new RasterLayer({
zIndex: 1,
@ -396,7 +392,6 @@ export default {
//
iniMapBase2(scene) {
// console.log("-----------------iniMapBase");
//
const baseLayer = new RasterLayer({
zIndex: 1,
@ -424,7 +419,6 @@ export default {
styleConfig = lightStyle;
}
// console.log("", polygonData);
//
polygonLayer = new PolygonLayer({
autoFit: true,
@ -572,7 +566,6 @@ export default {
this.$emit("clickAgency", e.feature.properties);
});
posLayer.on("click", (e) => {
console.log(e);
});
},
clearMarkert() {
@ -620,7 +613,6 @@ export default {
});
dotBgLayer.on("mousemove", (e) => {
// console.log(e);
if (e.feature.properties.content) {
const popup = new Popup({
offsets: [0, -0],
@ -658,7 +650,6 @@ export default {
});
dotLayer2.on("mousemove", (e) => {
// console.log(e);
if (e.feature.properties.content) {
const popup = new Popup({
offsets: [0, -0],
@ -744,7 +735,6 @@ export default {
points.push([x, y]);
}
}
console.log("points=======", points);
return points;
}
@ -773,7 +763,6 @@ export default {
}
if (searchBgLayer) {
console.log("searchBgLayer已经存在了", searchBgLayer);
searchBgLayer.setData(sourceData);
} else {
searchBgLayer = new PolygonLayer({
@ -801,7 +790,6 @@ export default {
name: "pointMarker",
});
for (let i in data) {
// console.log(data[i].longitude * 1, data[i].latitude * 1);
var el = document.createElement("div");
el.className = peopleType === "building" ? "label-pointLd-class" : "label-point-class";
el.classList.add(data[i].type);
@ -855,7 +843,6 @@ export default {
numMarker = new MarkerLayer({
name: "numMarker",
});
console.log("data:", data);
for (let i in data) {
var el = document.createElement("label");
el.className = "label-num-class";
@ -889,7 +876,6 @@ export default {
}
marker.on("click", (e) => {
console.log("click", e);
// this.handleClickDot(item, posArr);
marker.openPopup();
});
@ -901,12 +887,10 @@ export default {
},
removeDotMarker() {
console.log("removeDotMarker");
if (searchMarker) {
searchMarker.remove();
}
if (searchBgLayer) {
console.log("removeDotMarker-----searchBgLayer");
this.drawSearchBg();
}
},
@ -926,12 +910,10 @@ export default {
},
handleClickDotBtn(type, info) {
console.log(type, info);
this.$emit("clickDotBtn", type, info);
},
handleClickDotListItem(item) {
console.log("handleClickDotListItem", item);
this.handleClickDot(item, [parseFloat(item.longitude), parseFloat(item.latitude)]);
},
},

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save