From 371f2a2fe0ea7906916dce7bffce37ce97f48a49 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Thu, 28 Sep 2023 14:19:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=BB=9A=E5=8A=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/scss/dataBoard/overview/index.scss | 16 +++++-
src/assets/scss/dataBoard/renfang/index.scss | 2 +-
.../dataBoard/overview/components/sq12345.vue | 49 ++++++++++---------
.../dataBoard/overview/components/sqrfph.vue | 49 ++++++++++---------
4 files changed, 66 insertions(+), 50 deletions(-)
diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss
index 1878a00e1..c4537482c 100644
--- a/src/assets/scss/dataBoard/overview/index.scss
+++ b/src/assets/scss/dataBoard/overview/index.scss
@@ -41,7 +41,21 @@
.m-subbox {
@include scrollBar;
height: 334px;
- overflow-y: auto;
+ overflow-y: hidden;
+}
+
+.animation {
+ animation: move 10s linear infinite;
+}
+
+@keyframes move {
+ 0% {
+ transform: translateY(0px);
+ }
+
+ 100% {
+ transform: translateY(-320px);
+ }
}
.m-jdjs {
diff --git a/src/assets/scss/dataBoard/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss
index 5f277248e..d9543ccb9 100644
--- a/src/assets/scss/dataBoard/renfang/index.scss
+++ b/src/assets/scss/dataBoard/renfang/index.scss
@@ -325,7 +325,7 @@
.m-subbox {
@include scrollBar;
height: 423px;
- overflow-y: auto;
+ // overflow-y: auto;
}
.m-szsq {
diff --git a/src/views/dataBoard/overview/components/sq12345.vue b/src/views/dataBoard/overview/components/sq12345.vue
index bbbc092f8..a70babc86 100644
--- a/src/views/dataBoard/overview/components/sq12345.vue
+++ b/src/views/dataBoard/overview/components/sq12345.vue
@@ -8,14 +8,28 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -61,11 +61,15 @@
{{ getHouseType(scope.row.houseType) }}
-
-
+
+
+
+ {{ $sensitive(scope.row.ownerPhone, 3, 7) }}
+
+
-
- 查看
+
+ 查看
@@ -105,7 +109,7 @@ export default {
watch: {
"$route.query.id"() {
this.getList();
- }
+ },
},
mounted() {
this.getList();
@@ -147,16 +151,14 @@ export default {
this.$http.get(`/actual/base/streetOverview/getUnitHouseList?unitId=` + this.$route.query.id).then((res) => {
const {
code,
- data: {houseList, unitInfo},
+ data: { houseList, unitInfo },
} = res.data;
if (code === 0) {
- let unitInfos = unitInfo || {}
+ let unitInfos = unitInfo || {};
this.list = houseList;
this.homeMsg = unitInfos;
- this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : '') +
- (unitInfos.buildingName ? unitInfos.buildingName : '') +
- (unitInfos.unitNum ? unitInfos.unitNum + "单元" : '');
- console.log( this.homeText,' this.homeText')
+ this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : "");
+ console.log(this.homeText, " this.homeText");
this.houseMountArr = this.getDoorNameList(this.list);
this.loading = false;
} else {
diff --git a/src/views/dataBoard/organizational/microgrid/components/popDetails.vue b/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
index f2c8c0670..3f61089f8 100644
--- a/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
+++ b/src/views/dataBoard/organizational/microgrid/components/popDetails.vue
@@ -48,11 +48,11 @@
联系电话:
-
{{ info.telephone }}
+
{{ $sensitive(info.telephone, 3, 7) }}
证件号:
-
{{ info.idcard }}
+
{{ $sensitive(info.idcard, 6, 16) }}
备注:
diff --git a/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue b/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue
index d75c3476f..ae14edf4d 100644
--- a/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue
+++ b/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue
@@ -38,7 +38,7 @@
联系电话:
- {{ item.mobile }}
+ {{ $sensitive(item.mobile, 3, 7) }}
详细地址:
diff --git a/src/views/dataBoard/organizational/microgrid/index.vue b/src/views/dataBoard/organizational/microgrid/index.vue
index e5708f851..b823f0392 100644
--- a/src/views/dataBoard/organizational/microgrid/index.vue
+++ b/src/views/dataBoard/organizational/microgrid/index.vue
@@ -34,9 +34,17 @@
-
+
+
+ {{ $sensitive(scope.row.mobile, 3, 7) }}
+
+
-
+
+
+ {{ $sensitive(scope.row.idNum, 6, 16) }}
+
+
diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue
index 1378f1748..9651c3fdf 100644
--- a/src/views/dataBoard/overview/components/jdwgy.vue
+++ b/src/views/dataBoard/overview/components/jdwgy.vue
@@ -1,14 +1,7 @@
-
+
@@ -18,29 +11,23 @@
-
+
+
+ {{ $sensitive(scope.row.mobile, 3, 7) }}
+
+
-
- 查看
-
+ 查看
-
+
- {{
- types[scope.row.type]
- }}
+ {{ types[scope.row.type] }}
@@ -50,9 +37,7 @@
-
- 查看
-
+ 查看
@@ -84,11 +69,7 @@ export default {
},
watch: {
peopleType(val) {
- this.getData(
- val,
- this.currentLevelData.orgLevel,
- this.currentLevelData.orgId
- );
+ this.getData(val, this.currentLevelData.orgLevel, this.currentLevelData.orgId);
},
currentLevelData(val) {
if (val.orgId) {
@@ -98,46 +79,27 @@ export default {
},
mounted() {
if (this.currentLevelData.orgId) {
- this.getData(
- this.peopleType,
- this.currentLevelData.orgLevel,
- this.currentLevelData.orgId
- );
+ this.getData(this.peopleType, this.currentLevelData.orgLevel, this.currentLevelData.orgId);
}
},
methods: {
getData(peopleType, level = "", orgId = "") {
this.loading = true;
if (level == "grid") {
- this.$http
- .get(
- "/actual/base/streetOverview/queryPersonnelGridGroup?personnelType="+
- peopleType
- +"&level=" +
- level +
- "&orgId=" +
- orgId
- )
- .then(({ data: { data } }) => {
- this.loading = false;
- this.wglist = data;
- this.$emit('setPoint',data.filter(item => item.longitude && item.latitude))
- });
+ this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" + peopleType + "&level=" + level + "&orgId=" + orgId).then(({ data: { data } }) => {
+ this.loading = false;
+ this.wglist = data;
+ this.$emit(
+ "setPoint",
+ data.filter((item) => item.longitude && item.latitude)
+ );
+ });
} else {
- this.$http
- .get(
- "/actual/base/streetOverview/queryPersonnelGroup?level=" +
- level +
- "&orgId=" +
- orgId +
- "&personnelType=" +
- peopleType
- )
- .then(({ data: { data } }) => {
- this.loading = false;
- this.list = data.personnelInfoVOList;
- this.$emit('setNum',data.orgPersonnelVOList)
- });
+ this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" + level + "&orgId=" + orgId + "&personnelType=" + peopleType).then(({ data: { data } }) => {
+ this.loading = false;
+ this.list = data.personnelInfoVOList;
+ this.$emit("setNum", data.orgPersonnelVOList);
+ });
}
},
handleClick(item) {
@@ -161,11 +123,7 @@ export default {
},
};
-
+
\ No newline at end of file
+
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/details/yxwxfw.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/details/yxwxfw.vue
index 176375a78..d5048242a 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/details/yxwxfw.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/details/yxwxfw.vue
@@ -1,33 +1,13 @@
-
+
-
+
-
-

事项详情
-
+

事项详情
所属组织:
{{ item.organizationName }}
@@ -38,7 +18,7 @@
服务事项:
- {{item.serviceName}}
+ {{ item.serviceName }}
服务时间:
@@ -54,7 +34,7 @@
联系电话:
- {{ item.principalContact }}
+ {{ $sensitive(item.principalContact, 3, 7) }}
服务方:
@@ -66,44 +46,24 @@
-
+
-
-

办理进展
-
+

办理进展
-
+
-
{{item.serviceStatus}}
+
{{ item.serviceStatus }}
- {{
- item.createdTime
- }}
+ {{ item.createdTime }}
创建人:
-
- {{ item.createdBy }} ({{item.agencyName}})
-
+
{{ item.createdBy }} ({{ item.agencyName }})
@@ -128,7 +88,7 @@
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
index 34c4ff51a..996e2437b 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
@@ -1,15 +1,10 @@
-
+
-
-
+
@@ -19,145 +14,125 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ $sensitive(scope.row.mobile, 3, 7) }}
+
-
-
- {{ row.eventCount }}
+
+
+
+
+ {{ row.eventCount }}
-
-
- {{ row.demandCount }}
+
+
+ {{ row.demandCount }}
-
-
- {{ row.serviceCount }}
+
+
+ {{ row.serviceCount }}
-
- {{ row.countAll }}
-
+
+ {{ row.countAll }}
+
-
+
\ No newline at end of file
+
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
index dc9ce8f0d..c7d744611 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
@@ -1,80 +1,50 @@
-
+
-
+
-
+
-
-
-
+
+
+ {{ $sensitive(scope.row.mobile, 3, 7) }}
+
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
查看
-
-
-
-
+
+
\ No newline at end of file
+
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue
index b589a652a..7c6d2607f 100644
--- a/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue
@@ -1,74 +1,47 @@
-
+
-
+
-
+
-
-
-
+
+
+ {{ $sensitive(scope.row.mobile, 3, 7) }}
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
查看
-
-
-
+
+
\ No newline at end of file
+