From 1b4bde84fe959915687fcb9349489886d5b15e8b Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Mon, 8 Apr 2024 01:54:38 +0800
Subject: [PATCH 1/5] update code

---
 src/api/costOut/index.js                 |  2 +-
 src/pages/components/MonitAndWarning.vue |  9 ++++++++-
 src/pages/index.vue                      | 11 +++--------
 src/pages/projectDetail.vue              |  5 +++--
 vue.config.js                            |  4 ++--
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/api/costOut/index.js b/src/api/costOut/index.js
index c482481..bd7b93a 100644
--- a/src/api/costOut/index.js
+++ b/src/api/costOut/index.js
@@ -7,7 +7,7 @@ const selectYearAndMonth=(data)=> {
         url: `/bgscreen/costOut/selectYearAndMonth`,
         method: 'post',
         data:data
-      }).then(d=>{        
+      }).then(d=>{
         const getValue=(tmps,type)=>{
             let objs=tmps.filter(d=>d.costType==type);
             return objs.length>0?objs[0]:{};
diff --git a/src/pages/components/MonitAndWarning.vue b/src/pages/components/MonitAndWarning.vue
index 9931e1a..0c566f3 100644
--- a/src/pages/components/MonitAndWarning.vue
+++ b/src/pages/components/MonitAndWarning.vue
@@ -46,7 +46,14 @@
           <div class="glr-login-number analyse-login-numbe">
             <div><img src="images/text_red_spot.png" />{{ item.name }}</div>
             <div class="glr-rate-value glr-rate-red-value">
-              <span>{{ item.data }}/{{ item.total }}</span>
+              <template v-if="idx==0">
+                <span  style="color: #c0dafb">{{ item.total }}</span>
+              </template>
+              <template v-else>
+                <span>{{ item.data }}</span>/
+                  <span  style="color: #c0dafb">{{item.total }}</span> 
+              </template>
+              
             </div>
           </div>
         </div>
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 386e24e..3219692 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -495,6 +495,7 @@ export default {
             this.elKey++;
             this.onWarningInfoNav(0);
             this.sumCostOutByDeptId();
+            this.groupByProjectCategory(this.deptInfo.id);
             
         }));
         this.$bus.$on("deptChange", debounce(dept => {
@@ -591,7 +592,7 @@ export default {
                 this.$refs.dlg2.showDetailDialog(this.prjProcessNav,idx,this.deptInfo);
             }
         },
-        sumCostOutByDeptId() {
+        sumCostOutByDeptId() {            
             let dt = this.$dt(new Date());
             let postData = {
                 year: dt.$y,
@@ -602,13 +603,7 @@ export default {
                 postData.projectId = this.prj.id;
             } else {
                 postData.id = this.deptInfo.id;
-            }
-            if (this.callSumCostTime) {
-                if (+new Date() - this.callSumCostTime < 400) {
-                    return;
-                }
-            }
-            this.callSumCostTime = +new Date();
+            }            
             this.$api.costOut.sumByDeptId(postData).then(d => {
                 this.sumCost = d;
             });
diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue
index 117fb57..4247d35 100644
--- a/src/pages/projectDetail.vue
+++ b/src/pages/projectDetail.vue
@@ -883,12 +883,13 @@ export default {
             }
             return "";
         },
-        getCurProject() {
+        getCurProject() {            
             if (!this.project) {
                 return {};
             }
             if (this.project.id == 0) {
                 if (this.prjs.length > 1) {
+
                     return this.prjs[1];
                 }
                 return {};
@@ -992,7 +993,7 @@ export default {
             this.$api.costOut.selectYearAndMonth({
                 projectId: id,
                 year: dt.$y,
-                month: dt.$M
+                month: dt.$M+1
             }).then(d => {
                 d.totalMonth = d.totalMonth.toFixed(2);
                 d.totalYear = d.totalYear.toFixed(2);
diff --git a/vue.config.js b/vue.config.js
index b12bb24..bbccaad 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,8 +38,8 @@ module.exports = defineConfig({
       },
       '/jhapi':{
         //target: `http://62.234.3.186/jhapi/`,
-        //target: `http://127.0.0.1:8090/jhapi/`,
-        target: `http://szgc.jhncidg.com/jhapi/`,
+        target: `http://127.0.0.1:8090/jhapi/`,
+        //target: `http://szgc.jhncidg.com/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'

From 390c0db92848e2a0ca61f7665ec20d685a5598f9 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 9 Apr 2024 00:00:54 +0800
Subject: [PATCH 2/5] update code

---
 .../components/AttendanceDetailDialog.vue     | 162 ++++++++++--------
 1 file changed, 91 insertions(+), 71 deletions(-)

diff --git a/src/pages/components/AttendanceDetailDialog.vue b/src/pages/components/AttendanceDetailDialog.vue
index 361d6a1..277f425 100644
--- a/src/pages/components/AttendanceDetailDialog.vue
+++ b/src/pages/components/AttendanceDetailDialog.vue
@@ -2,38 +2,43 @@
     <MyDialog v-if="show" v-model="show" width="1600px" height="850px" class="today-attendance-detail">
         <template slot="title">今日出勤</template>
         <div class="head-title-tab" style="padding: 10px 0px;">
-                <div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(101)">总包人员</div>
-                <div :class="nav == 8 ? 'head-nav active' : 'head-nav'" @click="doNav(102)">监理人员</div>
-                <div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(103)">劳务人员</div>
+            <div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(101)">总包人员</div>
+            <div :class="nav == 8 ? 'head-nav active' : 'head-nav'" @click="doNav(102)">监理人员</div>
+            <div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(103)">劳务人员</div>
         </div>
-        <el-table v-loading="loading" :data="tableData" class="mytable" height="650" style="width: 100%;background: transparent;"  ref="fbsubordinateUnit">
+        <el-table v-loading="loading" :data="tableData" class="mytable" height="650"
+            style="width: 100%;background: transparent;" ref="fbsubordinateUnit">
             <el-table-column label="照片" align="center" prop="id">
-        <template slot-scope="{row}">
-          <el-image v-if="row.scanPhoto||row.recentPhoto||row.workerPhoto" :src="row.scanPhoto||row.recentPhoto||row.workerPhoto" :preview-src-list="[row.recentPhoto||row.scanPhoto||row.workerPhoto]" style="height:60px"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="姓名" align="center" prop="workerName" />
-      <el-table-column label="性别" align="center" prop="attendanceType" >
-        <template slot-scope="{row}">{{ row.workerGender==1?'女':'男' }}</template>
-      </el-table-column>
-      <el-table-column label="分包商名称" align="center" prop="companyName" />      
-      <el-table-column label="所属班组" align="center" prop="groupName" />
-      <el-table-column label="工种" align="center" prop="workTypeName" />           
-      <el-table-column label="上午打卡(首次)" align="center" prop="inTime">
-        <template slot-scope="{row}">
-            <span v-if="row.attendanceTime">{{ row.attendanceTime|formatTime }}</span>
-            <i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i>            
-        </template>
-      </el-table-column>
-      <el-table-column label="下午打卡(末次)" align="center" prop="outTime" >
-        <template slot-scope="{row}">
-            <span v-if="row.attendanceOutTime">{{ row.attendanceOutTime|formatTime }}</span>
-            <i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i>            
-        </template>
-      </el-table-column>
+                <template slot-scope="{row}">
+                    <el-image v-if="row.scanPhoto || row.recentPhoto || row.workerPhoto"
+                        :src="row.scanPhoto || row.recentPhoto || row.workerPhoto"
+                        :preview-src-list="[row.recentPhoto || row.scanPhoto || row.workerPhoto]" style="height:60px" />
+                </template>
+            </el-table-column>
+            <el-table-column label="姓名" align="center" prop="workerName" />
+            <el-table-column label="性别" align="center" prop="attendanceType">
+                <template slot-scope="{row}">{{ row.workerGender == 1 ? '女' : '男' }}</template>
+            </el-table-column>
+            <el-table-column label="分包商名称" align="center" prop="companyName" />
+            <el-table-column label="所属班组" align="center" prop="groupName" />
+            <el-table-column label="工种" align="center" prop="workTypeName" />
+            <el-table-column label="上午打卡(首次)" align="center" prop="inTime">
+                <template slot-scope="{row}">
+                    <span v-if="row.attendanceTime">{{ row.attendanceTime | formatTime }}</span>
+                    <i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i>
+                </template>
+            </el-table-column>
+            <el-table-column label="下午打卡(末次)" align="center" prop="outTime">
+                <template slot-scope="{row}">
+                    <span v-if="row.attendanceOutTime">{{ row.attendanceOutTime | formatTime }}</span>
+                    <i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i>
+                </template>
+            </el-table-column>
         </el-table>
-       
-        <el-pagination  layout="total,prev, pager, next" :hide-on-single-page="true" @current-change="handleCurrentChange" :total="total"  :page-size="size"  :current-page.sync="index" class="bg-pagination"></el-pagination>
+
+        <el-pagination layout="total,prev, pager, next" :hide-on-single-page="true"
+            @current-change="handleCurrentChange" :total="total" :page-size="size" :current-page.sync="index"
+            class="bg-pagination"></el-pagination>
 
     </MyDialog>
 </template>
@@ -49,57 +54,69 @@ export default {
 
     data() {
         return {
-            loading:false, 
+            loading: false,
             show: false,
             tableData: [],
-            projectId:0,
-            deptId:0,
-            size:10,
-            index:1,
-            total:0,
-            nav:101
+            projectId: 0,
+            deptId: 0,
+            size: 10,
+            index: 1,
+            total: 0,
+            nav: 101
         };
     },
 
     mounted() {
-       
+
     },
 
     methods: {
-        handleCurrentChange(n){
-            this.index=n;
+        handleCurrentChange(n) {
+            this.index = n;
             this.loadData();
         },
-        doNav(n){
-            this.nav=n;
-            this.index=1;
+        doNav(n) {
+            this.nav = n;
+            this.index = 1;
             this.loadData();
         },
         showDialog(data) {
-            this.projectId=data?.projectId||0;
-            this.deptId=data?.deptId||0;
-            this.size=10;
-            this.index=1;
+            this.projectId = data?.projectId || 0;
+            this.deptId = data?.deptId || 0;
+            this.size = 10;
+            this.index = 1;
             this.loadData();
             this.show = true
         },
-        loadData(){
-            let postData={
-                attendanceTime:this.$dt(new Date()).format("YYYY-MM-DD"),
-                projectId:this.projectId,                
-                pageSize:this.size,
-                pageNum:this.index,
-                companyTypeId:this.nav
+        loadData() {
+            let postData = {
+                attendanceTime: this.$dt(new Date()).format("YYYY-MM-DD"),
+                projectId: this.projectId,
+                pageSize: this.size,
+                pageNum: this.index,
+                companyTypeId: this.nav
             }
-            this.tableData=[];
-            this.loading=true;
-            this.$api.attendance.listAttendance(postData).then(d=>{
-                this.total=d.total||0;
-                this.tableData=(d.rows||[]).map(it=>{
-                    it.scanPhoto=it.scanPhoto && it.scanPhoto.indexOf("/profile")==0?"/jhapi"+it.scanPhoto:it.scanPhoto;
+            this.tableData = [];
+            this.loading = true;
+            this.$api.attendance.listAttendance(postData).then(d => {
+                this.total = d.total || 0;
+                this.tableData = (d.rows || []).map(it => {
+                    let dt1 = it.attendanceTime;
+                    let dt2 = it.attendanceOutTime;
+                    if ((!dt1 || !dt2) || dt1 == dt2) {
+                        let dt = dt1 || dt2;
+                        if (it.remark == "E") {
+                            it.attendanceTime = dt;
+                            it.attendanceOutTime = "";
+                        } else {
+                            it.attendanceTime = "";
+                            it.attendanceOutTime = dt;
+                        }
+                    }
+                    it.scanPhoto = it.scanPhoto && it.scanPhoto.indexOf("/profile") == 0 ? "/jhapi" + it.scanPhoto : it.scanPhoto;
                     return it;
                 });
-                this.loading=false;
+                this.loading = false;
             })
         }
     },
@@ -107,27 +124,30 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.mytable{
-    /deep/ th .cell{
+.mytable {
+    /deep/ th .cell {
         color: aquamarine;
     }
 }
-.today-attendance-detail{
-   /deep/ .quality-table .el-table .el-table__row{
+
+.today-attendance-detail {
+    /deep/ .quality-table .el-table .el-table__row {
         background-image: none !important;
-        td{
-            border-bottom:solid 1px rgba(60,170,255,0.3);
+
+        td {
+            border-bottom: solid 1px rgba(60, 170, 255, 0.3);
         }
     }
 }
 </style>
 <style lang="less">
-.today-attendance-detail{
- .popup-project-introduction-min {
+.today-attendance-detail {
+    .popup-project-introduction-min {
         transform: translateY(100px);
-        .bg-pagination{
-            margin-top:20px;
+
+        .bg-pagination {
+            margin-top: 20px;
         }
- }
+    }
 }
 </style>
\ No newline at end of file

From 320afd6d2b5f67f6b23efe20d61d6a0b21f8c376 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 9 Apr 2024 00:27:31 +0800
Subject: [PATCH 3/5] update code

---
 src/pages/quality/projectChecking.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/quality/projectChecking.vue b/src/pages/quality/projectChecking.vue
index 4345be5..8c4176c 100644
--- a/src/pages/quality/projectChecking.vue
+++ b/src/pages/quality/projectChecking.vue
@@ -269,10 +269,14 @@ export default {
             }
 
         },
-        queryDataList(nav, t) {
+        queryDataList(nav, t) {            
             let postData = {
-                projectId: this.projectInfo.id,
-                dataTypeLvl2: nav
+                projectId: this.projectInfo.id,                
+            }
+            if(t=='a'){
+                postData.dataTypeLvl1=nav;
+            }else{
+                postData.dataTypeLvl2=nav;
             }
             this.$api.projectChecking.queryProjectCheckingList(1, 20, postData).then(d => {
                 if (t == "a") {

From 088e453c82d9ec4b61bf304ae6a28fbdbcd27a07 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 9 Apr 2024 00:54:37 +0800
Subject: [PATCH 4/5] update code

---
 src/pages/quality/projectChecking.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/quality/projectChecking.vue b/src/pages/quality/projectChecking.vue
index 8c4176c..0239a03 100644
--- a/src/pages/quality/projectChecking.vue
+++ b/src/pages/quality/projectChecking.vue
@@ -272,12 +272,8 @@ export default {
         queryDataList(nav, t) {            
             let postData = {
                 projectId: this.projectInfo.id,                
-            }
-            if(t=='a'){
-                postData.dataTypeLvl1=nav;
-            }else{
-                postData.dataTypeLvl2=nav;
-            }
+                dataTypeLvl2:nav
+            }            
             this.$api.projectChecking.queryProjectCheckingList(1, 20, postData).then(d => {
                 if (t == "a") {
                     this.dataList1 = d.rows || [];

From 00b050131e80dad749f5ba5f396a2a162cc8dfa4 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 9 Apr 2024 21:37:26 +0800
Subject: [PATCH 5/5] update code

---
 public/favicon.ico | Bin 16958 -> 5018 bytes
 public/index.html  |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index af9875b0176cb75a6bcd90b03fd271ec7c51699f..0908b50141564e06bcfa31436240b8cf32776c5c 100644
GIT binary patch
literal 5018
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

literal 16958
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

diff --git a/public/index.html b/public/index.html
index 75a709c..f9723c0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico?v=2">
     <title>产发工程数字管理平台-大屏</title>
     <link rel="stylesheet" href="/cdn/element-ui/lib/theme-chalk/index.css">
     <link rel="stylesheet" href="css/largeScreenLayout.css">