diff --git a/src/pages/index.vue b/src/pages/index.vue index 884fb8c..6edf55c 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -50,7 +50,8 @@ @click="doShowAttendanceDetail">
在岗人数
-
今日出勤
+
离岗人数
+
今日出勤
@@ -549,12 +550,13 @@ export default { //查询在岗人数 loadAttendanceData(){ let data={ + id:this.infoNav, subDeptId:this.deptInfo.id||0, projectId:this.prj.id||0, attendanceTime: this.$dt(new Date()).format("YYYY-MM-DD") } let ajax=this.$api.attendance.groupByComany - if (this.infoNav == 0) { + if (this.infoNav != 2) { ajax=this.$api.attendance.groupAllByComany } ajax(data).then(d=>{ @@ -730,8 +732,8 @@ export default { //劳务人员概况 onWarningInfoNav(n) { this.infoNav = n - this.staffText = n == 0 ? '在岗人数' : '今日出勤' - if (n == 0) { + this.staffText = n == 0 ? '在岗人数' : n == 1?'离岗人数': '今日出勤' + if (n == 0||n==1) { this.surveyUrl = 'images/survey_icon_4.png' } else { this.surveyUrl = 'images/survey_icon_5.png' diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue index 577fb7a..5b32e85 100644 --- a/src/pages/projectDetail.vue +++ b/src/pages/projectDetail.vue @@ -5,19 +5,12 @@
-
+
项目简介
-
+
{{ getCurProject().projectName }}
@@ -69,10 +62,7 @@
总包单位
-
+
{{ getPrjUser("总包单位", "2") || " " }}
@@ -83,10 +73,7 @@
监理单位
-
+
{{ getPrjUser("监理单位", "4") || " " }}
@@ -98,25 +85,18 @@
-
+
在岗人数
-
+
+ 离岗人数 +
+
今日出勤
- +
@@ -132,11 +112,7 @@
- +
@@ -156,25 +132,16 @@
- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4551"> + fill="#3D3D3D" p-id="4552">
@@ -185,12 +152,8 @@ -
+
@@ -200,28 +163,17 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15828"> + fill="#070102" p-id="15829"> + fill="#070102" p-id="15830"> 总投资

@@ -235,28 +187,17 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15828"> + fill="#070102" p-id="15829"> + fill="#070102" p-id="15830"> 本月完成

@@ -270,28 +211,17 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15828"> + fill="#070102" p-id="15829"> + fill="#070102" p-id="15830"> 本年完成

@@ -305,28 +235,17 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15828"> + fill="#070102" p-id="15829"> + fill="#070102" p-id="15830"> laborPersonnelData 开累完成 @@ -341,75 +260,48 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16844"> + fill="#595959" p-id="16845"> + fill="#595959" p-id="16846"> + fill="#595959" p-id="16847"> + fill="#595959" p-id="16848"> + fill="#595959" p-id="16849"> + fill="#595959" p-id="16850"> + fill="#595959" p-id="16851"> + fill="#595959" p-id="16852"> + fill="#595959" p-id="16853"> + fill="#595959" p-id="16854"> 计划开工日期

{{ - fmtDate(getCurProject().scheduledStartTime || "") - }} + fmtDate(getCurProject().scheduledStartTime || "") + }}
@@ -418,75 +310,48 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16844"> + fill="#595959" p-id="16845"> + fill="#595959" p-id="16846"> + fill="#595959" p-id="16847"> + fill="#595959" p-id="16848"> + fill="#595959" p-id="16849"> + fill="#595959" p-id="16850"> + fill="#595959" p-id="16851"> + fill="#595959" p-id="16852"> + fill="#595959" p-id="16853"> + fill="#595959" p-id="16854"> 计划竣工日期

{{ - fmtDate(getCurProject().plannedCompletionTime || "") - }} + fmtDate(getCurProject().plannedCompletionTime || "") + }}
@@ -495,68 +360,41 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16844"> + fill="#595959" p-id="16845"> + fill="#595959" p-id="16846"> + fill="#595959" p-id="16847"> + fill="#595959" p-id="16848"> + fill="#595959" p-id="16849"> + fill="#595959" p-id="16850"> + fill="#595959" p-id="16851"> + fill="#595959" p-id="16852"> + fill="#595959" p-id="16853"> + fill="#595959" p-id="16854"> 实际开工日期

@@ -570,68 +408,41 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16844"> + fill="#595959" p-id="16845"> + fill="#595959" p-id="16846"> + fill="#595959" p-id="16847"> + fill="#595959" p-id="16848"> + fill="#595959" p-id="16849"> + fill="#595959" p-id="16850"> + fill="#595959" p-id="16851"> + fill="#595959" p-id="16852"> + fill="#595959" p-id="16853"> + fill="#595959" p-id="16854"> 合同工期

@@ -645,33 +456,20 @@

- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17500"> + fill="#666666" p-id="17501"> + fill="#666666" p-id="17502"> + fill="#666666" p-id="17503"> 建筑面积

@@ -709,15 +507,10 @@
实际:{{ item.endDate || "--" }}
-
+
{{ item.finish }}
@@ -734,71 +527,40 @@
-
+
方案设计
-
+
报建
-
+
招采
-
+
施工阶段
-
+
验收阶段
- + @@ -807,44 +569,30 @@
- + " @click="doFlowLabourDlg()" />
+ class="equipment-list-min equipment-list-min_div quality-target-index-min quality-target-index-min_div">
- {{ flowLabour.all }} + {{ flowLabour.all }}
- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3054"> + p-id="4373">
@@ -854,29 +602,20 @@
+ class="equipment-list-min equipment-list-min_div quality-target-index-min quality-target-index-min_div">
- {{ flowLabour.yb }} + {{ flowLabour.yb }}
- + " viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7849"> + p-id="7850">
@@ -886,17 +625,16 @@
+ class="equipment-list-min equipment-list-min_div quality-target-index-min quality-target-index-min_div">
- {{ flowLabour.db }} + {{ flowLabour.db }}
-
- -
-
+
+ +
+
待处理数
@@ -1210,7 +948,7 @@ export default { /** * 劳资预警详情弹窗 */ - doFlowLabourDlg(){ + doFlowLabourDlg() { this.$refs.flowLabourDlg.showDialog(this.project); }, getFloorArea() { @@ -1511,12 +1249,13 @@ export default { return; } let data = { + id:this.infoNav, subDeptId: this.dept.id || 0, projectId: id || 0, attendanceTime: this.$dt(new Date()).format("YYYY-MM-DD"), }; let ajax = this.$api.attendance.groupByComany; - if (this.infoNav == 0) { + if (this.infoNav != 2) { ajax = this.$api.attendance.groupAllByComany; } ajax(data).then((d) => { @@ -1670,7 +1409,7 @@ export default { } }, //项目概况 - timer() {}, + timer() { }, TimerEnter() { //鼠标移入停止滚动 clearInterval(this.introduceInterval); @@ -1684,7 +1423,7 @@ export default { this.infoNav = n; this.staffText = text; this.loadAttendanceData(); - if (n == 0) { + if (n == 0 || n==1) { this.surveyUrl = "images/survey_icon_4.png"; } else { this.surveyUrl = "images/survey_icon_5.png"; @@ -1831,16 +1570,20 @@ export default { .equipment-list-min_div { display: grid !important; } + .quality-target-index-min_div { padding: 40px 0px 0px 32px !important; } + .equipment-list-data_div_bottom { padding-bottom: 25px !important; } + .equipment-list-data_div_top { padding-left: 0 !important; padding-top: 25px !important; } + .equipment-list-data_div_top span { font-size: 18px !important; }