diff --git a/jwtech-admin-page/package.json b/jwtech-admin-page/package.json index cb744f4f..8cd6d408 100644 --- a/jwtech-admin-page/package.json +++ b/jwtech-admin-page/package.json @@ -68,6 +68,7 @@ "node-sass": "^4.12.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", + "ol": "^6.4.0", "path-to-regexp": "2.4.0", "pdfjs-dist": "^3.1.81", "quill": "^2.0.0-dev.3", diff --git a/jwtech-admin-page/src/components/map/index.vue b/jwtech-admin-page/src/components/map/index.vue new file mode 100644 index 00000000..e9d88a68 --- /dev/null +++ b/jwtech-admin-page/src/components/map/index.vue @@ -0,0 +1,720 @@ + + + + diff --git a/jwtech-admin-page/src/views/building/projectInfo/index.vue b/jwtech-admin-page/src/views/building/projectInfo/index.vue index 9589e7c6..e5be23b8 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/index.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/index.vue @@ -931,11 +931,17 @@ :title="drawTitle" :visible.sync="drawOpen" custom-class="draw" - width="1200px" + width="1500px" append-to-body :close-on-click-modal="false" > - + @@ -1218,6 +1224,10 @@ export default { emitPath: false, checkStrictly: true, //选择任意一级 }, + // 地图坐标数据 + potMsg: [], + lineMsg: [], + allDrawMsg: [], }; }, created() { @@ -1295,6 +1305,13 @@ export default { }, }, methods: { + getMapData(potMsg, lineMsg, allDrawMsg) { + this.potMsg = potMsg; + this.lineMsg = lineMsg; + this.allDrawMsg = allDrawMsg; + console.log("地图坐标数据", this.potMsg, this.lineMsg, this.allDrawMsg); + this.drawOpen = false; + }, openDraw() { this.drawTitle = "项目标绘"; this.drawOpen = true; diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue index 771d7e07..d9d48998 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue @@ -416,6 +416,8 @@ export default { /** 查询分部工程列表 */ getList() { this.loading = true; + this.queryParams.data.proNo = this.proNo; + this.queryParams.data.proCode = this.proCode; listSubProject(this.queryParams).then((response) => { this.subProjectList = response.records; this.total = response.total; diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/segmentProject.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/segmentProject.vue index 5c1c8912..dd68a786 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/segmentProject.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/segmentProject.vue @@ -422,6 +422,8 @@ export default { /** 查询分部工程列表 */ getList() { this.loading = true; + this.queryParams.data.proNo = this.proNo; + this.queryParams.data.proCode = this.proCode; listSubProject(this.queryParams).then((response) => { this.subProjectList = response.records; this.total = response.total; diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue index c2645853..aca0b9e8 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue @@ -288,6 +288,8 @@ export default { /** 查询分部工程列表 */ getList() { this.loading = true; + this.queryParams.data.proNo = this.proNo; + this.queryParams.data.proCode = this.proCode; listSubProject(this.queryParams).then((response) => { this.subProjectList = response.records; this.total = response.total;