diff --git a/src/assets/images/zjsj/Group.png b/src/assets/images/zjsj/Group.png new file mode 100644 index 00000000..4b1291dc Binary files /dev/null and b/src/assets/images/zjsj/Group.png differ diff --git a/src/assets/images/zjsj/Group2.png b/src/assets/images/zjsj/Group2.png new file mode 100644 index 00000000..419ad074 Binary files /dev/null and b/src/assets/images/zjsj/Group2.png differ diff --git a/src/assets/images/zjsj/dateIcon.png b/src/assets/images/zjsj/dateIcon.png new file mode 100644 index 00000000..a20ed1f0 Binary files /dev/null and b/src/assets/images/zjsj/dateIcon.png differ diff --git a/src/assets/images/zjsj/framBG2.png b/src/assets/images/zjsj/framBG2.png new file mode 100644 index 00000000..b12c0b40 Binary files /dev/null and b/src/assets/images/zjsj/framBG2.png differ diff --git a/src/assets/images/zjsj/frameBG.png b/src/assets/images/zjsj/frameBG.png new file mode 100644 index 00000000..cf0c0c19 Binary files /dev/null and b/src/assets/images/zjsj/frameBG.png differ diff --git a/src/assets/js/api/zhongjianFourth.js b/src/assets/js/api/zhongjianFourth.js index 7203343a..be062423 100644 --- a/src/assets/js/api/zhongjianFourth.js +++ b/src/assets/js/api/zhongjianFourth.js @@ -51,6 +51,14 @@ export const getAllDevApi = params => get('xmgl/dev/getAllDev', params); */ export const listProgressOfTheTask = params => get('xmgl/progressItem/getScheduleList', params); +//进度管理--最近七天末级节点 +export const getLastSevenDaysApi = params => get('/xmgl/progressTask/lastSevenDays', params); +//进度管理--第一级任务列表 +export const getProgressTaskParentListApi = params => get('/xmgl/progressTask/parentList', params); + +//进度管理-无人机 +export const getUavVideoApi = params => get('/xmgl/uavVideo/listByShootingDate', params); + /* --------------安全管理------------ */ // 人员管理 diff --git a/src/store/index.js b/src/store/index.js index db345377..8080e5d8 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,9 +45,9 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 - BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 + // BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // + // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时，需要打开这两行代码 // UPLOADURL: 'http://139.9.66.234:6324/upload/image', @@ -57,9 +57,9 @@ export default new Vuex.Store({ // UPLOADURL: 'http://182.90.224.237:7000/upload/image', // FILEURL: 'http://182.90.224.237:7000/image/', // 邱平毅的 - // BASEURL:'http://192.168.34.116:6023/', - // UPLOADURL: 'http://192.168.34.116:6023/upload/image', - // FILEURL: 'http://192.168.34.116:6023/image/', + BASEURL:'http://192.168.34.116:6023/', + UPLOADURL: 'http://192.168.34.116:6023/upload/image', + FILEURL: 'http://192.168.34.116:6023/image/', // UPLOADURL: 'http://124.71.67.160:8088/upload/image', // FILEURL: 'http://124.71.67.160:8088/image/', diff --git a/src/views/projectAdmin/fourEngin/carbon/leftTopR.vue b/src/views/projectAdmin/fourEngin/carbon/leftTopR.vue index a8435ebe..82167c12 100644 --- a/src/views/projectAdmin/fourEngin/carbon/leftTopR.vue +++ b/src/views/projectAdmin/fourEngin/carbon/leftTopR.vue @@ -18,6 +18,7 @@

累计减少碳排放

+ @@ -29,6 +30,10 @@ :color="color" :grid="grid" /> + @@ -42,7 +47,7 @@ export default { data() { return { - xData: ["办公区", "生活区", "施工现场", "大门口", "其他"], + xData: [], series: [{ data: [] }, { data: [] }], color: ["#E7622A", "#6EE4F0"], grid: ["15%", "0%", "30%", "0%"], @@ -69,8 +74,8 @@ export default { console.log("看数据1", this.workercount); this.workercount.forEach((item) => { this.series[0].data.push(item.electric); - this.series[1].data.push(item.water); + this.xData.push(item.location) }); this.isShow = true; diff --git a/src/views/projectAdmin/fourEngin/carbon/rightTop.vue b/src/views/projectAdmin/fourEngin/carbon/rightTop.vue index 762edaa3..f0df1d10 100644 --- a/src/views/projectAdmin/fourEngin/carbon/rightTop.vue +++ b/src/views/projectAdmin/fourEngin/carbon/rightTop.vue @@ -105,7 +105,7 @@ list:{ .textKwh{ font-size: 32px; font-weight: bold; - margin: 19px 0 0 70px; + margin: 19px 0 0 43px; } .textBottom{ font-size: 20px; diff --git a/src/views/projectAdmin/fourEngin/cim/leftBottom.vue b/src/views/projectAdmin/fourEngin/cim/leftBottom.vue index 8203c70e..0738f0d5 100644 --- a/src/views/projectAdmin/fourEngin/cim/leftBottom.vue +++ b/src/views/projectAdmin/fourEngin/cim/leftBottom.vue @@ -1,7 +1,47 @@ @@ -19,23 +59,22 @@ export default { padding-top: 10px; width: 100%; height: 100%; - display: flex; - flex-wrap: wrap; - justify-content: space-between; - .video { - width: 48%; - height: 29%; - // border: 1px solid skyblue; - background-image: url(../assets/images/common/bgc_small.png); - background-repeat: no-repeat; - background-size: 100%; - - } - p{ - font-size: 14px; - color: #fff; - opacity: 0.7; - margin: 2px 2px; - } +.video{ + width: 350px; + border-bottom: 2px solid #ccc; + margin: 0px 0 0 8px; + height: 32px; + line-height: 32px; + +} +.videosList{ + width: 350px; + height: 32px; + line-height: 32px; + background-color: #66D3D8; + color:#00292A; + margin: 14px 0 0 8px; + font-size: 14px; +} } diff --git a/src/views/projectAdmin/fourEngin/cim/leftTop.vue b/src/views/projectAdmin/fourEngin/cim/leftTop.vue index 86f20624..abf45887 100644 --- a/src/views/projectAdmin/fourEngin/cim/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/cim/leftTop.vue @@ -1,16 +1,42 @@ @@ -35,36 +61,12 @@ export default { padding: 20px 10px 0; width: 100%; height: 100%; + margin-top: -20px; .row { - - margin-bottom: 12px; - height: 22px; - line-height: 22px; - font-size: 12px; - display: flex; - .td { - color: #fff; - // opacity: 0.5; - flex: 1; - text-align: center; - } - #tr{ - color: #66D4D9 ; - // opacity: 0.5; - } - &:nth-child(1) { - font-size: 14px; - color: #67d4d9; - } - &.warning { - background: linear-gradient(90deg, #a45133, #a4513338); - &::before { - content: ''; - width: 4px; - height: 100%; - background-color: #e7622a; - } - } + width: 100%; + margin-top: 25px; + font-size: 14.5px; + } } diff --git a/src/views/projectAdmin/fourEngin/cim/rightBottom.vue b/src/views/projectAdmin/fourEngin/cim/rightBottom.vue index 93fa11fb..3ada468a 100644 --- a/src/views/projectAdmin/fourEngin/cim/rightBottom.vue +++ b/src/views/projectAdmin/fourEngin/cim/rightBottom.vue @@ -1,86 +1,239 @@ diff --git a/src/views/projectAdmin/fourEngin/cim/rightTop.vue b/src/views/projectAdmin/fourEngin/cim/rightTop.vue index d9087ee3..424c1b05 100644 --- a/src/views/projectAdmin/fourEngin/cim/rightTop.vue +++ b/src/views/projectAdmin/fourEngin/cim/rightTop.vue @@ -1,76 +1,73 @@ diff --git a/src/views/projectAdmin/fourEngin/progress/index.vue b/src/views/projectAdmin/fourEngin/progress/index.vue index a40058b0..e9621883 100644 --- a/src/views/projectAdmin/fourEngin/progress/index.vue +++ b/src/views/projectAdmin/fourEngin/progress/index.vue @@ -17,9 +17,11 @@ -
+
+ +
-
+
-
+
+ +
-
+ +
-
+
+ ............ +
+
- {{ item.name }} + {{ item.taskName }} + {{ item.startDate }}
+
+
@@ -93,11 +93,15 @@ export default { } } .list { - padding-top: 50px; - padding-left: 25px; - height: calc(100% - 40px); + padding-top: 20px; + // padding-left: 25px; + height: calc(100% - 17px); color: #fff; .list-item { + width: 400px; + height: 220px; + background: url('~@/assets/images/zjsj/frameBG.png')no-repeat; + background-size: 88% 100%; font-size: 16px; .todo{ font-size: 24px; @@ -110,14 +114,36 @@ export default { } div { &:not(:first-child) { - margin-top: 6px; + margin-top: 15px; + margin-left: 20px; } } - } -} + } + .delayDiv{ + width: 120px; + height: 30px; + line-height: 30px; + background: url('~@/assets/images/zjsj/framBG2.png')no-repeat; + background-size: 100% 100%; + font-size: 14px; + margin-left: 20px; + text-align: center; + } +} +::v-deep .el-progress-bar{ + width: 88%; +} +::v-deep .el-progress__text { + color: #fff; +} +::v-deep .el-progress-bar__inner { + background-color: #5CE2F6 +} .grey { - color: #FFFFFF ; + color: #ccc ; + margin-left: 10px; + font-weight: normal; } .blue { color: #66D4D9 ; @@ -125,4 +151,5 @@ export default { .orange { color: #F56C35; } + diff --git a/src/views/projectAdmin/fourEngin/progress/uav.vue b/src/views/projectAdmin/fourEngin/progress/uav.vue new file mode 100644 index 00000000..ac93a884 --- /dev/null +++ b/src/views/projectAdmin/fourEngin/progress/uav.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectFront/scheduleManage/ganttwo.vue b/src/views/projectFront/scheduleManage/ganttwo.vue index eb4aca19..5332750b 100644 --- a/src/views/projectFront/scheduleManage/ganttwo.vue +++ b/src/views/projectFront/scheduleManage/ganttwo.vue @@ -358,7 +358,6 @@ export default { console.log("删除任务后触发,", id); deleteTaskAlarmApi({ id: id }).then((res) => { console.log("添加的数据", res); - gantt.parse(this.$props.tasks); this_.getParentChildList(); }); }); @@ -411,6 +410,7 @@ export default { //数据格式整理 changeTask() { // return + console.log("开始数据整理") const taskCount = gantt.getTaskCount(); let taskData = []; let openTask = []; @@ -418,8 +418,8 @@ export default { let taskOne = {}; const obj = gantt.getTaskByIndex(i); console.log("整理数据的 ", obj); - console.log("整理数据的 大小", taskCount); - if (obj == null) { + console.log("整理数据的 大小", typeof(obj.id)); + if (obj == null || typeof(obj.id) === "number") { continue; } taskOne.taskName = obj.taskName; @@ -460,7 +460,8 @@ export default { taskOne.description = obj.remark; taskOne.predecessorIds = obj.predecessorIds; taskOne.parent = obj.parent; - taskOne.color = "#3db9d3"; + // 0未开始 ,1进行中，2已完成 + taskOne.color = obj.status === 0 ? "#ccc" : obj.status === 1 ? "yellow" : "green"; taskOne.status = obj.status + 1; taskOne.taskTypeId = obj.taskTypeId + 1; @@ -470,7 +471,6 @@ export default { taskData.push(taskOne); } this.$props.tasks.data = taskData; - console.log(this.$props.tasks); //清空数据 gantt.clearAll(); //加载 @@ -482,11 +482,16 @@ export default { }, //获取甘特图父子节点数据 getParentChildList() { + this.tasks.data = [] getParentChildListApi({ projectSn: this.projectSn }).then((res) => { this.check(res.result); this.dataList = res.result; console.log("甘特图列表数据", this.tasks.data); - console.log(" this.dataList", this.dataList); + console.log(" this.$props.tasks", this.$props.tasks); + + this.$props.tasks.data = this.tasks.data + + console.log(" this.$props.tasks 赋值后", this.$props.tasks); gantt.parse(this.$props.tasks); this.changeTask();