diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss
index 5bde41dc0..00d63602c 100644
--- a/src/assets/scss/dataBoard/overview/index.scss
+++ b/src/assets/scss/dataBoard/overview/index.scss
@@ -294,7 +294,7 @@
}
.m-wtqd{
- padding: 0 16px;
+ padding: 20px 16px 0;
}
@keyframes move {
diff --git a/src/views/dataBoard/cpts/Tabs.vue b/src/views/dataBoard/cpts/Tabs.vue
index e9999a7a1..d0806d0de 100644
--- a/src/views/dataBoard/cpts/Tabs.vue
+++ b/src/views/dataBoard/cpts/Tabs.vue
@@ -48,8 +48,8 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
- height: 40px;
- padding: 8px 16px 8px 29px;
+ height: 30px;
+ padding: 7px 0px 5px 34px;
background: url(@/assets/images/shuju/overview/title-small-bg.png) no-repeat;
background-size: 100% 100%;
diff --git a/src/views/dataBoard/cpts/sjkb-map/index.vue b/src/views/dataBoard/cpts/sjkb-map/index.vue
index 4f995540c..ab6f7e8dd 100644
--- a/src/views/dataBoard/cpts/sjkb-map/index.vue
+++ b/src/views/dataBoard/cpts/sjkb-map/index.vue
@@ -948,7 +948,7 @@ export default {
console.log(type, 'type')
return type
})
- .size(36);
+ .size(32);
scene.addLayer(numPointMarker1);
numPointMarker2 = new PointLayer({
name: 'numPointMarker2',
@@ -963,7 +963,7 @@ export default {
})
.shape('num', 'text')
.color('#fff')
- .size(18)
+ .size(14)
.style({
textOffset: [0, 7],
fontWeight: "bold"
@@ -1140,6 +1140,7 @@ export default {
border-radius: 5px;
background: rgba(3, 31, 73, 0.72);
background: url("@/assets/images/overview/dia_con.png");
+ border: none;
&:before {
position: absolute;
diff --git a/src/views/dataBoard/overview/components/DemandSwiperList.vue b/src/views/dataBoard/overview/components/DemandSwiperList.vue
index 57d540567..d1c0ddb24 100644
--- a/src/views/dataBoard/overview/components/DemandSwiperList.vue
+++ b/src/views/dataBoard/overview/components/DemandSwiperList.vue
@@ -89,7 +89,7 @@ export default {
.swiper-container {
width: 100%;
- height: 120px;
+ height: 126px;
}
.item {
diff --git a/src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue b/src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue
index 4a5f82e7d..a9c785790 100644
--- a/src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue
+++ b/src/views/dataBoard/overview/components/MapDialog/DifficultyCharts.vue
@@ -81,7 +81,7 @@ export default {
return res;
},
},
- dataZoom: [
+ /* dataZoom: [
{
"type": "slider",
"start": 0,
@@ -92,7 +92,7 @@ export default {
"showDataShadow": false,
"borderColor": "transparent"
}
- ],
+ ],*/
grid: {
top: '18%',
left: '2%',
diff --git a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
index 7944eaa3c..9a921fcda 100644
--- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
+++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue
@@ -55,7 +55,7 @@
联系电话:
{{ detail.contactMobile }}
-
+
@@ -94,7 +94,7 @@
联系电话:
{{ detail.principalPhone }}
-
+
@@ -116,7 +116,7 @@
联系电话:
{{ detail.mobile }}
-
+
diff --git a/src/views/dataBoard/overview/components/RequirementList.vue b/src/views/dataBoard/overview/components/RequirementList.vue
index 0aec12465..d8fbf64a4 100644
--- a/src/views/dataBoard/overview/components/RequirementList.vue
+++ b/src/views/dataBoard/overview/components/RequirementList.vue
@@ -3,10 +3,10 @@
tabval = val"/>
-
+
- {{ data.demandUserName }}
- {{ data.content }}
+ {{ data.demandUserName }}
+ {{ data.content }}
@@ -79,6 +79,14 @@ export default {
console.log(this.currentLevelData,'this.currentLevelData32')
},
methods: {
+ goToPortrait({demandUserId}) {
+ this.$router.push({
+ path: "/dataBoard/overview/resident",
+ query: {
+ user_id: demandUserId,
+ },
+ });
+ },
showDetail({demandRecId}) {
this.$refs.ServiceDetails.open(demandRecId);
},
diff --git a/src/views/dataBoard/overview/components/jdjs.vue b/src/views/dataBoard/overview/components/jdjs.vue
index 9d348d2f9..866365fae 100644
--- a/src/views/dataBoard/overview/components/jdjs.vue
+++ b/src/views/dataBoard/overview/components/jdjs.vue
@@ -16,7 +16,7 @@
element-loading-text="加载中..."
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0,0,0,0.5)"
- style="height: 135px;margin-top: 10px"
+ style="height: 135px;margin-top: 12px"
/>
@@ -405,6 +405,9 @@ export default {
margin-top: 20px;
}
.f-darkGray{
- margin-top: 5px;
+ margin-top: 10px;
+}
+.event-statistics {
+ margin-bottom: 27px;
}
diff --git a/src/views/dataBoard/overview/components/wtqd.vue b/src/views/dataBoard/overview/components/wtqd.vue
index 4c30a0085..405018d99 100644
--- a/src/views/dataBoard/overview/components/wtqd.vue
+++ b/src/views/dataBoard/overview/components/wtqd.vue
@@ -1,108 +1,92 @@
-
+
-
+
{{ item.createdTime.substr(5, 5) }}
{{ item.eventContent }}
-
-
+
-
+
{{ item.createdTime.substr(5, 5) }}
{{ item.eventContent }}
-
+
-
+
-
+
{{ item.createdTime.substr(5, 5) }}
{{ item.eventContent }}
-
+
-
+
-
+
{{ item.createdTime.substr(5, 5) }}
{{ item.eventContent }}
-
+
diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue
index a80ef659e..36d49285d 100644
--- a/src/views/dataBoard/overview/index.vue
+++ b/src/views/dataBoard/overview/index.vue
@@ -504,7 +504,7 @@ export default {
item3.type = 'resources'
item3.num = item3.resources;
item3.offsets = [-50, 50];
- item3.latitude = centerLngLat.lat + 0.0018
+ item3.latitude = centerLngLat.lat + 0.002
item3.longitude = centerLngLat.lng
}
if (item3.hasOwnProperty("problems")) {
@@ -512,20 +512,24 @@ export default {
item3.num = item3.problems;
item3.offsets = [50, -50];
item3.latitude = centerLngLat.lat
- item3.longitude = centerLngLat.lng + .0018
+ item3.longitude = centerLngLat.lng + .002
}
if (item3.hasOwnProperty("events")) {
item3.type = 'events'
item3.num = item3.events;
item3.offsets = [-50, -50];
- item3.latitude = centerLngLat.lat + .0018
- item3.longitude = centerLngLat.lng + .0018
+ item3.latitude = centerLngLat.lat + .002
+ item3.longitude = centerLngLat.lng + .002
}
+ // item3.latitude = 59.62496862480762
+ // item3.longitude = 126.11233377322651
+
})
}
})
console.log(countData, 'countData')
this.$refs.map.setNumpoint(countData)
+
// console.log(countData,'countData')
})
diff --git a/src/views/dataBoard/satisfactionEval/components/Title/titleSmall.vue b/src/views/dataBoard/satisfactionEval/components/Title/titleSmall.vue
index aceea3d7b..bd01d2147 100644
--- a/src/views/dataBoard/satisfactionEval/components/Title/titleSmall.vue
+++ b/src/views/dataBoard/satisfactionEval/components/Title/titleSmall.vue
@@ -3,7 +3,6 @@
{{ text }}
- {{ text }}
@@ -29,10 +28,10 @@