|
@@ -23,6 +23,7 @@ const sendToWormhole = require('stream-wormhole');
|
|
const scheduleConst = require('../const/schedule');
|
|
const scheduleConst = require('../const/schedule');
|
|
const changeConst = require('../const/change');
|
|
const changeConst = require('../const/change');
|
|
const tenderInfoModel = require('../lib/tender_info');
|
|
const tenderInfoModel = require('../lib/tender_info');
|
|
|
|
+const mapConst = require('../const/map');
|
|
|
|
|
|
module.exports = app => {
|
|
module.exports = app => {
|
|
|
|
|
|
@@ -511,6 +512,24 @@ module.exports = app => {
|
|
const tenderALLInfo = await ctx.service.tender.getDataById(tender.id);
|
|
const tenderALLInfo = await ctx.service.tender.getDataById(tender.id);
|
|
const hadMap = tenderALLInfo.had_map === 1 ? 0 : 1;
|
|
const hadMap = tenderALLInfo.had_map === 1 ? 0 : 1;
|
|
const tenderMapList = await ctx.service.tenderMap.getAllDataByCondition({ where: { tid: tender.id } });
|
|
const tenderMapList = await ctx.service.tenderMap.getAllDataByCondition({ where: { tid: tender.id } });
|
|
|
|
+ // 默认坐标,否则则取办事处坐标
|
|
|
|
+ const projectData = await ctx.service.project.getDataById(ctx.session.sessionProject.id);
|
|
|
|
+ let map_json = {
|
|
|
|
+ province: mapConst.map[0].province,
|
|
|
|
+ lng: mapConst.map[0].lng,
|
|
|
|
+ lat: mapConst.map[0].lat,
|
|
|
|
+ level: 15,
|
|
|
|
+ };
|
|
|
|
+ if (projectData.map_json) {
|
|
|
|
+ map_json = JSON.parse(projectData.map_json);
|
|
|
|
+ } else {
|
|
|
|
+ const mapInfo = ctx.helper._.find(mapConst.map, { office: projectData.manager_office });
|
|
|
|
+ if (mapInfo) {
|
|
|
|
+ map_json.province = mapInfo.province;
|
|
|
|
+ map_json.lng = mapInfo.lng;
|
|
|
|
+ map_json.lat = mapInfo.lat;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
const renderData = {
|
|
const renderData = {
|
|
tenders,
|
|
tenders,
|
|
categoryData,
|
|
categoryData,
|
|
@@ -533,6 +552,7 @@ module.exports = app => {
|
|
jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.tender.tenderInfo),
|
|
jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.tender.tenderInfo),
|
|
gclChapter,
|
|
gclChapter,
|
|
tenderMapList,
|
|
tenderMapList,
|
|
|
|
+ map_json,
|
|
};
|
|
};
|
|
if (ctx.session.sessionUser.is_admin) {
|
|
if (ctx.session.sessionUser.is_admin) {
|
|
renderData.tourists = await ctx.service.tenderTourist.getTourists(tender.id);
|
|
renderData.tourists = await ctx.service.tenderTourist.getTourists(tender.id);
|