From c077b2c206b0bc7b7b739bb82f0e6b70b37ddc63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Sun, 28 Apr 2024 10:03:15 +0800 Subject: [PATCH] Revert "Merge branch 'preview' of http://120.46.222.128:10021/elink-star/epmet-work-pc into fax" This reverts commit 7e589dbdb926bee187126ac8f2e443f4cfdb7124, reversing changes made to b17c0969aade7d0d369ae2b2247df131f9533c0e. --- src/assets/scss/modules/index.scss | 33 +- src/components/GridTree/nodeWrap.vue | 29 +- src/components/JwTree/nodeWrap.vue | 71 +-- src/components/NameSplit/index.vue | 2 +- src/views/components/editResi.vue | 91 +--- .../components/resiExpand/editExpand.vue | 18 +- src/views/components/resiSearch.vue | 76 +--- src/views/dataBoard/cpts/details/jmxq.vue | 2 +- src/views/dataBoard/cpts/details/smyd.vue | 2 +- src/views/dataBoard/cpts/details/xqwmz.vue | 2 +- src/views/dataBoard/cpts/details/yxwxfw.vue | 26 +- src/views/dataBoard/cpts/event-details.vue | 9 +- .../modules/businessTables/complaint.vue | 2 +- .../businessTables/reporting-events.vue | 3 +- src/views/dataBoard/organizational/index.vue | 415 +++++++++++++++++- .../dataBoard/organizational/jwTree/index.vue | 19 +- .../dataBoard/overview/components/Bmysxxq.vue | 1 - .../overview/components/EventDetail.vue | 3 +- .../overview/components/ResourceInfo.vue | 14 +- .../components/ResourceScheduling.vue | 42 +- .../overview/components/ServiceDetails.vue | 2 +- .../modules/base/community/community.vue | 12 +- .../modules/base/community/roomTable.vue | 8 +- src/views/modules/base/resi.vue | 46 +- .../base/smartImport/cpts/completeTask.vue | 52 +-- src/views/modules/base/smartImport/index.vue | 14 +- src/views/modules/home/index.vue | 66 ++- src/views/modules/portrayal/jumin/index.vue | 31 +- 28 files changed, 603 insertions(+), 488 deletions(-) diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index abf63be8b..f86d332f9 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -46,7 +46,7 @@ position: relative; // position: fixed; padding-left: 14px; - height: 16px; + height: 30px; margin-right: 10px; font-size: 15px; z-index: 1; @@ -109,12 +109,13 @@ } .header { + padding: 4px 0; font-size: 15px; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: rgba(0, 0, 0, 0.85); line-height: 17px; - margin-top: 16px; + margin-top: 10px; margin-left: 10px; >img { @@ -127,7 +128,7 @@ .newqsa { border-left: 4px solid #2683DB; - height: 100%; + height: 70%; // width: 4px; margin-left: -10px; padding-left: 8px; @@ -154,26 +155,28 @@ .m-search { box-sizing: border-box; - padding: 0px 16px; + padding: 40px 80px; margin-bottom: 10px; - height: 220px; - display: flex; - flex-direction: column; + height: 200px; // background-image: url("../../images/index/chaxun-bg.png"); background-size: cover; position: relative; .wrap { - + position: absolute; + top: 0; + left: 0; width: 100%; } .mewq { // background-color: #333; - margin-top: 24px; width: inherit; + margin-left: -69px; height: 64px; + margin-top: 85px; box-sizing: border-box; + margin-right: -68px; display: grid; grid-template-columns: repeat(7, 1fr); gap: 5px; @@ -246,12 +249,13 @@ margin-top: 15px; display: flex; align-items: center; + margin-left: 10px; .search-input { position: relative; left: 0; right: 0; - width: 100%; + width: 98%; height: 48px; background: #ffffff; border-radius: 4px; @@ -349,7 +353,7 @@ overflow: hidden; .flex_box { - height: 100%; + height: calc(100% - 30px); width: 100%; overflow: hidden; display: flex; @@ -558,9 +562,8 @@ } .m-tb { - height: 238px; - display: flex; - flex-direction: column; + height: 260px; + .cnt { box-sizing: border-box; margin-top: 20px; @@ -671,6 +674,4 @@ .update-settings { margin-right: 25px; - display: flex; - align-items: center; } \ No newline at end of file diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index 2032ddd83..731d2592e 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -35,7 +35,7 @@
-
+
{{ item.organizationName }}
@@ -62,7 +62,6 @@
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 1b5048f7e..763a14985 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -503,7 +503,6 @@ export default { const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form; // 深复制对象 let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form)); - _obj.attentionCrowds = _obj.attentionCrowds.flat() console.log('213', _obj) switch (this.valueb) { case '党员': @@ -602,7 +601,7 @@ export default { this.$refs.myResiSearch.form.categoryKey = categoryKey; this.$refs.myResiSearch.form.agencyId = agencyId; } - + // //呵呵呵哒 // if (this.valueb == '党员') { // _obj.partyFlag = 1 // this.getTableData(_obj); @@ -969,36 +968,16 @@ export default { } ); }, - async handelCLickShowCheckPassword(row) { - const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`; - const { data, code, msg } = await requestPost(url); - if(code==0){ - if(data==true){ - this.editUserId = row.resiId; - this.saveCheckPassword() - } - else{ - this.editUserId = row.resiId; - this.showCheckPassword = true; - } - } - else{ - this.$message.error(msg); - } + handelCLickShowCheckPassword(row) { + this.editUserId = row.resiId; + this.showCheckPassword = true; }, handelClickCheckPassword() { - this.$refs.checkPasswordFrom.validate((vali) => { + this.$refs.checkPasswordFrom.validate(async (vali) => { if (vali) { - this.saveCheckPassword(this.checkPasswordFrom.password); - } else { - return false; - } - }); - }, - async saveCheckPassword(password){ - const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`; + const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`; let parm = { - password, + password: this.checkPasswordFrom.password, }; const { data, code, msg } = await requestPost(url, parm); if (code === 0) { @@ -1012,7 +991,12 @@ export default { } else { this.$message.error(msg); } + } else { + return false; + } + }); }, + handleAdd() { this.$router.push({ name: "add-resi" }); }, @@ -1193,9 +1177,9 @@ export default { watch: { $route: { handler: function (newVal, oldVal) { - if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home')) { + if (newVal.name == "base-resi") { this.$nextTick(() => { - this.$refs.myResiSearch.form.attentionCrowds = []; + this.$refs.myResiSearch.form.attentionCrowds = []; this.$refs.myResiSearch.form.healthStatus = []; this.$refs.myResiSearch.form.specialCategoryCodes = []; this.$refs.myResiSearch.form.partyFlag=null; @@ -1212,7 +1196,7 @@ export default { }else if(newVal.params.category === 'PARTY_FLAG'){ this.$refs.myResiSearch.form.partyFlag =1; } - this.handleSearchFrom(); + this.handleSearchFrom(); }); } }, diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue index 494d87d82..6c50e0a90 100644 --- a/src/views/modules/base/smartImport/cpts/completeTask.vue +++ b/src/views/modules/base/smartImport/cpts/completeTask.vue @@ -42,11 +42,12 @@ >查看 - 下载导入失败数据下载导入失败数据 @@ -91,7 +92,6 @@ - diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index fcbd35342..f9619d9fa 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -21,7 +21,7 @@
{{ item.name }}