diff --git a/src/assets/map/gangkou_index/point/ico30.png b/src/assets/map/gangkou_index/point/ico30.png new file mode 100644 index 0000000..7efeafc Binary files /dev/null and b/src/assets/map/gangkou_index/point/ico30.png differ diff --git a/src/assets/map/gangkou_index/point/ico31.png b/src/assets/map/gangkou_index/point/ico31.png new file mode 100644 index 0000000..abc44b3 Binary files /dev/null and b/src/assets/map/gangkou_index/point/ico31.png differ diff --git a/src/views/map/components/zhongdian.vue b/src/views/map/components/zhongdian.vue index a8ea9e0..265c6be 100644 --- a/src/views/map/components/zhongdian.vue +++ b/src/views/map/components/zhongdian.vue @@ -39,10 +39,10 @@
隐患数量
-
{{ item.name }}
-
{{ item.num }}
-
{{ item.check }}
-
{{ item.count }}
+
{{ item.CORP_NAME }}
+
{{ item.OUTSOURCED_COUNT }}
+
{{ item.CHECK_COUNT }}
+
{{ item.HIDDEN_COUNT }}
@@ -53,12 +53,27 @@ @@ -267,7 +316,6 @@ export default { } } - .block3 { margin-top: 10px; width: 410px; diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index 44d559c..ad1b070 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -49,6 +49,10 @@ + + + + @@ -91,6 +95,8 @@ import peoplePositionCfdD from './peoplePositionCfdD.vue' import carPositionCfdD from './carPositionCfdD.vue' import peoplePositionOne from './peoplePositionOne.vue' import peoplePositionYGS from './peoplePositionYGS.vue' +import outSourceInfo from './outSourceInfo.vue' +import outSourceVideoInfo from './outSourceVideoInfo.vue' export default { components: { @@ -130,7 +136,9 @@ export default { carPositionCfdD, videoPlayBianjieruqin, peoplePositionOne, - peoplePositionYGS + peoplePositionYGS, + outSourceInfo, + outSourceVideoInfo }, props: { title: { diff --git a/src/views/map/dialog/outSourceInfo.vue b/src/views/map/dialog/outSourceInfo.vue new file mode 100644 index 0000000..2926d3e --- /dev/null +++ b/src/views/map/dialog/outSourceInfo.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/views/map/dialog/outSourceVideoInfo.vue b/src/views/map/dialog/outSourceVideoInfo.vue new file mode 100644 index 0000000..3a43c90 --- /dev/null +++ b/src/views/map/dialog/outSourceVideoInfo.vue @@ -0,0 +1,140 @@ +