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 @@
+
+
+
+
重点工程详情
+
+
+
+
+ 重点工程名称 |
+ {{ pd.OUTSOURCED_NAME }} |
+
+
+ 股份主管部门 |
+ {{ pd.MANAGER_DEPARTMENT_NAME }} |
+ 股份监管部门 |
+ {{ pd.DEPARTMENT_NAME }} |
+
+
+ 辖区单位 |
+ {{ pd.JURISDICTION_UNIT_NAME }} |
+
+
+ 企业监督部门 |
+ {{ pd.DEPARTMENT_NAME }} |
+ 企业主管部门 |
+ {{ pd.Q_COMPETENT_DEPT_NAME }} |
+
+
+ 企业辖区部门 |
+ {{ pd.INVOLVING_CORPS_DEPART_NAME }} |
+
+
+ 集团单位 |
+ {{ pd.GROUP_UNIT_NAME }} |
+
+
+ 计划工期 |
+ {{ pd.STARTTIME }} 至 {{ pd.ENDTIME }} |
+
+
+ 施工相关方 |
+ {{ pd.UNITS_NAME }} |
+
+
+ 合同号 |
+ {{ pd.CONTRACT_NUM }} |
+ 监理单位名称 |
+ {{ pd.MANAGE_CORPS_NAME }} |
+
+
+ 相关方单位工程负责人 |
+ {{ pd.UNITS_PIC_NAME }} |
+ 相关方单位负责人手机 |
+ {{ pd.UNITS_PHONE }} |
+
+
+ 监理单位工程负责人 |
+ {{ pd.MANAGE_PIC }} |
+ 监理单位负责人手机 |
+ {{ pd.MANAGE_PHONE }} |
+
+
+ 是否发送短信 |
+
+ 是
+ 否
+ |
+ 状态 |
+
+ 未开工
+ 进行中
+ 已结束
+ 开工申请中
+ 结束申请中
+ |
+
+
+ 安全管理协议{{ index + 1 }} |
+ {{ item.FILE_NAME }} |
+ 下载 |
+
+
+
+
处罚相关:
+
+
+ 处罚人员部门 |
+ {{ item.punishname }} |
+ 处罚人员 |
+ {{ item.NAME }} |
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
视频信息
+
+
+
+
+ 视频名称 |
+ {{ pd.VIDEONAME }} |
+
+
+ 所属重点工程 |
+ {{ pd.OUTSOURCED_NAME }} |
+ 所属公司 |
+ {{ pd.CORP_NAME }} |
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 73ee4f0..3ee6b18 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -712,13 +712,13 @@ export default {
label: '重点工程',
containAuthorization: [],
eliminateAuthorization: [],
- pointUrl: '/map/mapPlatformelectronic/listAllLocation',
+ pointUrl: '/map/keyProject/listAllLocation',
list: [
{
label: '重点工程定位',
dialog_width: '1200px',
check: false,
- type: 'bianjieruqin',
+ type: 'PROJECT',
img: require('../../assets/map/gangkou_index/buttom/ico27.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico27_on.png'),
containAuthorization: [],
@@ -728,7 +728,7 @@ export default {
label: '视频定位',
dialog_width: '1200px',
check: false,
- type: 'bianjieruqin',
+ type: 'VIDEO',
img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
containAuthorization: [],
diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js
index 1658938..f538118 100644
--- a/src/views/map/js/dragentity.js
+++ b/src/views/map/js/dragentity.js
@@ -43,10 +43,13 @@ const img5_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
const img6_0 = require('../../../assets/map/gangkou_index/point/ico26.png')
-const img7_0 = require('../../../assets/map/gangkou_index/point/ico23.png')
-const img7_1 = require('../../../assets/map/gangkou_index/point/ico24.png')
-const img7_2 = require('../../../assets/map/gangkou_index/point/ico25.png')
-const img7_3 = require('../../../assets/map/gangkou_index/point/ico26.png')
+const img7_0 = require('../../../assets/map/gangkou_index/point/ico30.png')
+const img7_1 = require('../../../assets/map/gangkou_index/point/ico31.png')
+
+const img8_0 = require('../../../assets/map/gangkou_index/point/ico23.png')
+const img8_1 = require('../../../assets/map/gangkou_index/point/ico24.png')
+const img8_2 = require('../../../assets/map/gangkou_index/point/ico25.png')
+const img8_3 = require('../../../assets/map/gangkou_index/point/ico26.png')
const imgMap = {
img0_0, img0_1, img0_2,
@@ -56,7 +59,8 @@ const imgMap = {
img4_0, img4_0_1, img4_0_2, img4_0_3, img4_1,
img5_0,
img6_0,
- img7_0, img7_1, img7_2, img7_3,
+ img7_0, img7_1,
+ img8_0, img8_1, img8_2, img8_3,
cfd_img1_0, cfd_img1_0_1, cfd_img1_0_2, cfd_img1_0_3
}
export { imgMap }