diff --git a/yanzhu-bigscreen/package.json b/yanzhu-bigscreen/package.json index dd8e5c76..2eb41b5c 100644 --- a/yanzhu-bigscreen/package.json +++ b/yanzhu-bigscreen/package.json @@ -4,6 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", + "serve:prod": "vue-cli-service serve --mode production", "build": "vue-cli-service build", "lint": "vue-cli-service lint" }, diff --git a/yanzhu-bigscreen/src/views/index.vue b/yanzhu-bigscreen/src/views/index.vue index 9d663095..5723221d 100644 --- a/yanzhu-bigscreen/src/views/index.vue +++ b/yanzhu-bigscreen/src/views/index.vue @@ -14,8 +14,7 @@ export default { this.$store.dispatch('ChangeNav', 1); this.$bus.$on('projectChange', prj => { this.selProject = prj; - }); - this.$router.push("/detail"); + }); } } diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index bc5cb0d7..bc41a961 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -202,12 +202,6 @@ -
- -
- {{ it }} -
-
@@ -224,7 +218,7 @@ 总投资

- {{ costOutData.totalInv||0 }} 万元 + {{ costOutData.totalInv || 0 }} 万元
@@ -237,7 +231,7 @@ 本月完成

- {{ costOutData.curMonth||0 }} 万元 + {{ costOutData.curMonth || 0 }} 万元
@@ -251,7 +245,7 @@ 本年完成

- {{ costOutData.totalYear||0 }} 万元 + {{ costOutData.totalYear || 0 }} 万元
@@ -265,7 +259,7 @@ 开累完成

- {{ costOutData.totalMonth||0 }} 万元 + {{ costOutData.totalMonth || 0 }} 万元
@@ -280,7 +274,8 @@ 计划开工日期

- {{ selProject.scheduledStartTime | toDate }} + {{ selProject.scheduledStartTime | toDate + }}
@@ -295,7 +290,8 @@ 计划竣工日期

- {{ selProject.plannedCompletionTime | toDate }} + {{ selProject.plannedCompletionTime | toDate + }}
@@ -309,7 +305,8 @@ 实际开工日期

- {{ selProject.actualOperatingTime | toDate }} + {{ selProject.actualOperatingTime | toDate + }}
@@ -323,7 +320,7 @@ 合同工期

- {{ selProject.projectTimeLimit||'' }} 天 + {{ selProject.projectTimeLimit || '' }} 天
@@ -338,7 +335,7 @@ 建筑面积

- {{ selProject.floorArea||'' }} 平方米 + {{ selProject.floorArea || '' }} 平方米
@@ -351,11 +348,23 @@
- + + 效果图 + 视频 + + +
+ +
@@ -524,6 +533,9 @@ export default { deptType5: [],//检测单位 deptType6: [],//勘察单位 prjImgs: [], + prjVideo: null, + showImgVideo: false, + imgVideoSel: 1, attendanceNav: 0, attendanceTotal: 0, attendanceData: [ @@ -548,7 +560,7 @@ export default { projectBuildNode: [], maxWidth: 0, minWidth: 100, - costOutData:{}, + costOutData: {}, } }, mounted() { @@ -592,6 +604,9 @@ export default { return objs.length > 0 ? objs[0] : null; }; this.prjImgs = (this.prjInfo?.setting?.orgImage || '').split(",").filter(d => d); + this.prjVideo = this.prjInfo?.setting?.orgVideo || ''; + this.showImgVideo = this.prjImgs.length > 0 && this.prjVideo; + this.imgVideoSel = 1; this.deptType1 = func('建设单位'); this.deptType2 = func('设计单位'); this.deptType3 = { deptName: this.prjInfo.disDeptName, leader: this.prjInfo.projectPerson, phone: this.prjInfo.projectPersonPhone }; @@ -617,18 +632,18 @@ export default { this.loadMilestoneData(); this.loadCostOutput(); }, - loadCostOutput(){ + loadCostOutput() { let dt = this.$dt(new Date()); this.$api.detail.costOutputSelectYearAndMonth({ comId: this.selProject.comId, projectId: this.selProject.id, year: dt.$y, month: dt.$M + 1, - }).then(d=>{ - this.costOutData=d; + }).then(d => { + this.costOutData = d; }); }, - loadMilestoneData() { + loadMilestoneData() { this.$api.detail.milestoneList({ pageNum: 1, pageSize: 100, @@ -850,6 +865,36 @@ export default { .prj-img-list { height: calc(100% - 130px); + position: relative; + + .prj-img-nav { + position: absolute; + z-index: 999; + + .prj-img-nav-item { + display: inline-block; + line-height: 30px; + height: 30px; + width: 90px; + text-align: center; + background-color: #192c648a; + border: solid 1px #1e90ff8a; + color: #ccc; + cursor: pointer; + + &.is-active { + background-color: #50a2eb8a; + color: #fff; + } + } + } + + .prj-video-layout { + height: 100%; + display: flex; + justify-content: center; + justify-items: center; + } .el-carousel { height: 100%; @@ -1117,6 +1162,16 @@ export default { .prj-img-list { height: calc(100% - 150px); + .prj-img-nav { + .prj-img-nav-item { + line-height: 40px; + height: 40px; + width: 110px; + font-size: 18px; + + } + } + .el-carousel { height: 100%; @@ -1399,7 +1454,14 @@ export default { .prj-img-list { height: calc(100% - 190px); - + .prj-img-nav { + .prj-img-nav-item { + line-height: 60px; + height: 60px; + width: 130px; + font-size: 30px; + } + } .el-carousel { height: 100%; diff --git a/yanzhu-bigscreen/vue.config.js b/yanzhu-bigscreen/vue.config.js index 7e48aba3..30966fc3 100644 --- a/yanzhu-bigscreen/vue.config.js +++ b/yanzhu-bigscreen/vue.config.js @@ -16,15 +16,23 @@ module.exports = defineConfig({ proxy: { // https://cn.vitejs.dev/config/#server-proxy "/dev-api": { - target: "http://localhost:8080", - //target: 'http://62.234.3.186/prod-api/', + target: "http://localhost:8080", changeOrigin: true, pathRewrite: { "^/dev-api": "/", }, }, + "/prod-api": { + //target: "http://localhost:8080", + target: 'http://62.234.3.186/prod-api/', + changeOrigin: true, + pathRewrite: { + "^/prod-api": "/", + }, + }, "/xd/": { - target: "http://localhost/xd", + //target: "http://localhost/xd", + target: 'http://62.234.3.186/xd/', changeOrigin: true, pathRewrite: { "^/xd/": "/", @@ -45,7 +53,8 @@ module.exports = defineConfig({ }, }, "/statics/": { - target: `http://localhost:9300/statics/`, + //target: `http://localhost:9300/statics/`, + target: `http://62.234.3.186/statics/`, changeOrigin: true, pathRewrite: { "^/statics/": "/",