From 1b0eb695d907c634dbb06fd806672ee19a7664df Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 4 Oct 2023 21:54:50 +0800
Subject: [PATCH] update code

---
 .../project/attendance/attendanceDrawer.vue   | 32 +++++++++++++++----
 .../src/views/project/surProject/index.vue    | 21 +++---------
 .../src/views/project/surProject/myIndex.vue  | 12 +++++--
 ruoyi-ui/vue.config.js                        |  4 +--
 4 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue b/ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue
index 89f02a44..4d4c83a8 100644
--- a/ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue
+++ b/ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue
@@ -2,10 +2,18 @@
     <div class="project-attendance-data-drawer" v-if="isOpen">
         <el-drawer v-if="isOpen" :visible.sync="isOpen" direction="rtl" size="70%" style="padding-left: 20px">
             <template slot="title">
-                <div>{{ title + " 【劳务实名管理-考勤记录】" }}</div>
+                <div>{{ title + " 【劳务实名管理】" }}</div>
             </template>
             <div>
-             <main-index ref="main"></main-index>
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tab-pane label="考勤记录" name="first">
+                        <main-index ref="main"></main-index>
+                    </el-tab-pane>
+                    <el-tab-pane label="人员信息" name="second">
+                        <workerIndex ref="workerMain"></workerIndex>
+                    </el-tab-pane>
+                </el-tabs>
+               
             </div>
         </el-drawer>
     </div>
@@ -13,12 +21,15 @@
 
 <script>
 import mainIndex from './index.vue'
+import workerIndex from '../attendanceWorker/index'
 export default {
     components:{
-        mainIndex
+        mainIndex,
+        workerIndex
     },
     data() {
         return {
+            activeName: 'first',
             isOpen: false,
             title: '',           
         };
@@ -29,14 +40,23 @@ export default {
     },
 
     methods: {              
+
         show(prj) {
             this.prj=prj;
+            this.activeName='first';
             this.title = prj.projectName||""
             this.isOpen = true;
-            setTimeout(()=>{
-                this.$refs.main.init(prj);
-            },400);    
+            this.handleClick();   
         },
+        handleClick(){
+            setTimeout(()=>{
+                if(this.activeName=='first'){   
+                    this.$refs.main.init(this.prj);
+                }else{
+                    this.$refs.workerMain.initMe(this.prj);
+                }
+            },400);    
+        }
 
     },
 };
diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue
index 798971c9..9799a9fb 100644
--- a/ruoyi-ui/src/views/project/surProject/index.vue
+++ b/ruoyi-ui/src/views/project/surProject/index.vue
@@ -474,17 +474,12 @@
                 command="handleStandard"
                 icon="el-icon-s-grid"
                 v-hasPermi="['project:projectStandard:list']"
-                >标准化管理</el-dropdown-item>
-              <el-dropdown-item
-                command="handleAttendanceWorker"
-                icon="el-icon-s-grid"
-                v-hasPermi="['project:attendanceWorker:list']"
-                >劳务实名管理</el-dropdown-item>
+                >标准化管理</el-dropdown-item>             
                 <el-dropdown-item
                 command="handleAttendanceData"
                 icon="el-icon-s-grid"
                 v-hasPermi="['project:attendance:list']"
-                >劳务实名管理-考勤记录</el-dropdown-item>
+                >劳务实名管理</el-dropdown-item>
               <el-dropdown-item
                 command="handleDelete"
                 icon="el-icon-delete"
@@ -768,8 +763,7 @@
     <costOutputDrawer ref="costOutput"></costOutputDrawer>
     <checkDetectionDrawer ref="checkDetection"></checkDetectionDrawer>
     <standardDrawer ref="standard"></standardDrawer>
-    <attendanceDataDrawer ref="attendanceData"></attendanceDataDrawer>
-    <attendanceWorkerDrawer ref="attendanceWorker"></attendanceWorkerDrawer>
+    <attendanceDataDrawer ref="attendanceData"></attendanceDataDrawer>    
   </div>
 </template>
 
@@ -802,7 +796,6 @@ import costOutputDrawer from "@/views/project/costOutput/costOutputDrawer.vue";
 import checkDetectionDrawer from "../checkDetection/checkDetectionDrawer.vue";
 import standardDrawer from '@/views/project/projectStandard/projectStandardDrawer.vue'
 import attendanceDataDrawer from '@/views/project/attendance/attendanceDrawer.vue'
-import attendanceWorkerDrawer from '@/views/project/attendanceWorker/attendanceWorkerDrawer.vue'
 import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 
 export default {
@@ -826,8 +819,7 @@ export default {
     costOutputDrawer,
     checkDetectionDrawer,
     standardDrawer,
-    attendanceDataDrawer,
-    attendanceWorkerDrawer
+    attendanceDataDrawer,    
   },
   dicts: [
     "sur_project_xmjd",
@@ -1082,10 +1074,7 @@ export default {
           break;
         case "handleStandard":
           this.$refs.standard.show(row);
-          break;
-        case "handleAttendanceWorker":
-          this.$refs.attendanceWorker.show(row);
-          break;
+          break;        
         case "handleAttendanceData":
           this.$refs.attendanceData.show(row);
           break;
diff --git a/ruoyi-ui/src/views/project/surProject/myIndex.vue b/ruoyi-ui/src/views/project/surProject/myIndex.vue
index d56a9d8e..63ea921a 100644
--- a/ruoyi-ui/src/views/project/surProject/myIndex.vue
+++ b/ruoyi-ui/src/views/project/surProject/myIndex.vue
@@ -150,8 +150,10 @@
         icon="el-icon-s-check">今日出勤</el-button>
       <el-button type="primary" @click="doPrjCostOutput" v-hasPermi="['project:costOutput:edit']"
         icon="el-icon-money">项目成本产值管理</el-button>
-      <el-button type="primary" @click="doPrjStandard" v-hasPermi="['project:projectStandard:list']"
+        <el-button type="primary" @click="doPrjStandard" v-hasPermi="['project:projectStandard:list']"
         icon="el-icon-s-grid">标准化管理</el-button>
+      <el-button type="primary" @click="doAttendanceData" v-hasPermi="['project:attendance:list']"
+        icon="el-icon-s-check">劳务实名管理</el-button>
 
       
     </div>
@@ -162,6 +164,7 @@
     <projectUserInfoDrawer  ref="prjUser" size="50%" :visible.sync="showPrjUser" :form-data="prj"/>
     <costOutputDrawer ref="costOutput"></costOutputDrawer>
     <standardDrawer ref="standard"></standardDrawer>
+    <attendanceDataDrawer ref="attendanceData"></attendanceDataDrawer>   
   </div>
 </template>
 
@@ -175,6 +178,7 @@ import buildNodeDrawer from "../surBuildNode/buildNodeDrawer.vue";
 import attendanceDrawer from "../surProjectAttendance/attendanceDrawer.vue";
 import costOutputDrawer from '@/views/project/costOutput/costOutputDrawer.vue'
 import standardDrawer from '@/views/project/projectStandard/projectStandardDrawer.vue'
+import attendanceDataDrawer from '@/views/project/attendance/attendanceDrawer.vue'
 
 export default {
   dicts: [
@@ -193,7 +197,8 @@ export default {
     attendanceDrawer,
     projectUserInfoDrawer,
     costOutputDrawer,
-    standardDrawer
+    standardDrawer,
+    attendanceDataDrawer
   },
   data() {
     return {
@@ -208,6 +213,9 @@ export default {
     this.loadData();
   },
   methods: {
+    doAttendanceData(){
+      this.$refs.attendanceData.show(this.prj);
+    },
     doPrjStandard(){
       this.$refs.standard.show(this.prj);
     },
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index f0a5359d..55103481 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -41,8 +41,8 @@ module.exports = {
       //   }
       // },   
       '/jhapi':{
-        //target: `http://62.234.3.186/jhapi/`,
-        target: `http://127.0.0.1:8090/jhapi/`,
+        target: `http://62.234.3.186/jhapi/`,
+        //target: `http://127.0.0.1:8090/jhapi/`,
         changeOrigin: true,
         pathRewrite: {
           '^/jhapi':'/'