diff --git a/pages/projectEnd/project/projectInfo.vue b/pages/projectEnd/project/projectInfo.vue index 981004be..2f39dfea 100644 --- a/pages/projectEnd/project/projectInfo.vue +++ b/pages/projectEnd/project/projectInfo.vue @@ -42,10 +42,10 @@ - 项目/场站负责人 + 项目经理 - {{projectDetail.projectSiteManager}} + {{projectDetail.projectManage}} @@ -58,57 +58,70 @@ - 新能源类型 + 工程类别 - {{projectDetail.renewableEnergyType}} + {{item.name}} - 装机容量(万kW) + 项目编号 - {{projectDetail.installedCapacity}} + {{projectDetail.projectNumber}} - 是否配储 + 结构类型 - {{projectDetail.storageRequired == 1 ? '是' : '否'}} + {{item.name}} - 配储容量 + 项目面积 - {{projectDetail.capacity}} + {{projectDetail.projectAcreage}} m² - - - + - + + @@ -200,176 +214,31 @@ projectDetail: { projectName: '' }, - markers: [], - BUILDSTATUS: [{ - id: 0, - name: '未开工' - }, { - id: 1, - name: '在建' - }, { - id: 2, - name: '停工' - }, { - id: 3, - name: '验收' - }, { - id: 4, - name: '完工' - }], - PROJECTTYPE: [{ - id: 1, - name: '房建' - }, { - id: 2, - name: '市政' - }, { - id: 3, - name: '安装' - }, { - id: 4, - name: '装饰' - }, { - id: 5, - name: '公路' - }, { - id: 6, - name: '冶炼' - }, { - id: 7, - name: '矿山' - }, - { - id: 8, - name: '化工石油' - }, { - id: 9, - name: '水利水电' - }, { - id: 10, - name: '电力' - }, { - id: 11, - name: '农林' - }, { - id: 12, - name: '港口与航道' - }, { - id: 13, - name: '航天航空' - }, { - id: 14, - name: '通信' - }, { - id: 15, - name: '其他' - } - ], //工程类别 - - // CONSTRUCTIONSTAGE:CONSTRUCTIONSTAGE,//施工阶段 - ENGINEERINGPRUPOSE: [{ - id: 1, - name: '住宅建筑' - }, { - id: 2, - name: '宿舍建筑' - }, { - id: 3, - name: '教育建筑' - }, { - id: 4, - name: '办公建筑' - }, { - id: 5, - name: '科研建筑' - }, - { - id: 6, - name: '文化建筑' - }, { - id: 7, - name: '商业建筑' - }, - { - id: 8, - name: '体育建筑' - }, { - id: 9, - name: '医疗建筑' - }, { - id: 10, - name: '交通建筑' - }, { - id: 11, - name: '司法建筑' - }, { - id: 12, - name: '纪念建筑' - }, { - id: 13, - name: '园林建筑' - }, { - id: 14, - name: '综合建筑' - }, - { - id: 15, - name: '工业厂房' - }, { - id: 16, - name: '电子厂房' - }, { - id: 17, - name: '其他' - } - ], //工程用途 - STRUCTURETYPE: [{ - id: 1, - name: '装配整体式框级结构' - }, { - id: 2, - name: '装配整体式剪力墙结构' - }, { - id: 3, - name: '装配整体式框级-现浇剪力墙结构' - }, { - id: 4, - name: '装配整体式框级-现浇核心筒结构' - }, - { - id: 5, - name: '装配整体式部分框支剪力墙结构' - }, { - id: 6, - name: '混合结构' - }, { - id: 7, - name: '框架结构' - }, - { - id: 8, - name: '剪力墙结构' - }, { - id: 9, - name: '框架-剪力墙结构' - }, { - id: 10, - name: '简体结构' - }, { - id: 11, - name: '钢结构' - }, { - id: 12, - name: '型钢混凝土结构' - }, { - id: 13, - name: '砖混结构' - }, { - id: 14, - name: '砖木结构' - } - ], //结构类型 - extendInfo: {} + markers:[], + BUILDSTATUS:[ + {id:0,name:'未开工'},{id:1,name:'在建'},{id:2,name:'停工'},{id:3,name:'验收'},{id:4,name:'完工'} + ], + PROJECTTYPE:[ + {id:1,name:'房建'},{id:2,name:'市政'},{id:3,name:'安装'},{id:4,name:'装饰'},{id:5,name:'公路'},{id:6,name:'冶炼'},{id:7,name:'矿山'}, + {id:8,name:'化工石油'},{id:9,name:'水利水电'},{id:10,name:'电力'} + ,{id:11,name:'农林'},{id:12,name:'港口与航道'},{id:13,name:'航天航空'},{id:14,name:'通信'},{id:15,name:'其他'} + ],//工程类别 + + // CONSTRUCTIONSTAGE:CONSTRUCTIONSTAGE,//施工阶段 + ENGINEERINGPRUPOSE:[ + {id:1,name:'住宅建筑'},{id:2,name:'宿舍建筑'},{id:3,name:'教育建筑'},{id:4,name:'办公建筑'},{id:5,name:'科研建筑'}, + {id:6,name:'文化建筑'},{id:7,name:'商业建筑'}, + {id:8,name:'体育建筑'},{id:9,name:'医疗建筑'},{id:10,name:'交通建筑'} + ,{id:11,name:'司法建筑'},{id:12,name:'纪念建筑'},{id:13,name:'园林建筑'},{id:14,name:'综合建筑'}, + {id:15,name:'工业厂房'},{id:16,name:'电子厂房'},{id:17,name:'其他'} + ],//工程用途 + STRUCTURETYPE:[ + {id:1,name:'装配整体式框级结构'},{id:2,name:'装配整体式剪力墙结构'},{id:3,name:'装配整体式框级-现浇剪力墙结构'},{id:4,name:'装配整体式框级-现浇核心筒结构'}, + {id:5,name:'装配整体式部分框支剪力墙结构'},{id:6,name:'混合结构'},{id:7,name:'框架结构'}, + {id:8,name:'剪力墙结构'},{id:9,name:'框架-剪力墙结构'},{id:10,name:'简体结构'} + ,{id:11,name:'钢结构'},{id:12,name:'型钢混凝土结构'},{id:13,name:'砖混结构'},{id:14,name:'砖木结构'} + ],//结构类型 + extendInfo:{} } }, mounted() { @@ -378,11 +247,11 @@ uni.getSystemInfo({ success(res) { that.mobileTopHeight = res.statusBarHeight ? res.statusBarHeight : 0; - uni.setStorageSync('systemInfo', res) + uni.setStorageSync('systemInfo',res) console.log(res) } }) - console.log('this.mobileTopHeight', this.mobileTopHeight) + console.log('this.mobileTopHeight',this.mobileTopHeight) // this.markers=[{ // longitude: this.projectDetail.longitude, // latitude: this.projectDetail.latitude, @@ -415,10 +284,10 @@ this.getExtendInfo() }, methods: { - viewBig(url) { + viewBig(url){ uni.previewImage({ - current: url, - urls: [this.projectDetail.layoutImage, this.projectDetail.constructionMapUrl] + current:url, + urls:[this.projectDetail.layoutImage,this.projectDetail.constructionMapUrl] }) }, getExtendInfo() { @@ -430,24 +299,24 @@ }, method: "POST", success(res) { - if (res.result != null) { + if(res.result!=null){ that.extendInfo = res.result - } else { - that.extendInfo = { - contractSignTime: "-", - contractPeriodStartTime: "-", - contractPeriodEndTime: "-", - realPeriodStartTime: "-", - realPeriodEndTime: "-", - bidWinner: "", - constructionUnit: "", - designUnit: "", - supervisorUnit: "", - ownerUnit: "", - projectOverview: "" + }else{ + that.extendInfo={ + contractSignTime:"-", + contractPeriodStartTime:"-", + contractPeriodEndTime:"-", + realPeriodStartTime:"-", + realPeriodEndTime:"-", + bidWinner:"", + constructionUnit:"", + designUnit:"", + supervisorUnit:"", + ownerUnit:"", + projectOverview:"" } } - + } }) }, @@ -456,43 +325,36 @@ \ No newline at end of file +} + diff --git a/pages/projectEnd/project/projectInfo_20251117.vue b/pages/projectEnd/project/projectInfo_20251117.vue deleted file mode 100644 index 2f39dfea..00000000 --- a/pages/projectEnd/project/projectInfo_20251117.vue +++ /dev/null @@ -1,360 +0,0 @@ - - - - -