From eab54b9320350e2173e4073b9d3805c1deb70c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E6=98=AD=E6=9C=9D?= <18394339404@163.com>
Date: Sat, 27 Jul 2024 17:34:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dhistory=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E6=8A=A5=E9=94=99=20&=20fix:=20=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E9=A1=B5=E9=9D=A2=E6=95=85=E9=9A=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/select.js          | 3 ++-
 src/views/record/index.vue | 6 +++++-
 vue.config.js              | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/api/select.js b/src/api/select.js
index b091bf4..4a7ca1b 100644
--- a/src/api/select.js
+++ b/src/api/select.js
@@ -10,7 +10,8 @@ export const reqGetRegionAndCity = () => request({ url: `/WRD-admin/sys/user/Rei
 // export const reqSelectEngiStatus = (year, month, page, limit) => request({ url: `/WRD-admin/sys/workorder/page`, method: 'get', params: { year, month, page, limit } });
 
 // 带部门
-export const reqSelectEngiStatusByDept = (year, month, deptId, page, limit) => request({ url: `/WRD-admin/sys/workorder/pageSelect`, method: 'get', params: { year, month, deptId, page, limit }})
+// export const reqSelectEngiStatusByDept = (year, month, deptId, page, limit) => request({ url: `/WRD-admin/sys/workorder/pageSelect`, method: 'get', params: { year, month, deptId, page, limit }})
+export const reqSelectEngiStatusByDept = (year, month, deptId, page, limit, gids) => request({ url: `/WRD-admin/sys/workorder/pageSelectV2`, method: 'get', params: { year, month, deptId, page, limit, gids }})
 
 // 工程师状态查询
 export const reqSelectEngiStatusByMap = (year, month, page, limit) => request({ url: `/WRD-admin/sys/workorder/pageSelect`, method: 'get', params: { year, month, page, limit }})
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index 2569d64..b983474 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -1293,15 +1293,19 @@ export default {
         }
         this.engiArray = resultOfSelectEngisByDept.data.list
         this.total = resultOfSelectEngisByDept.data.total
+        console.log(this.engiArray.map(item => item.gid))
       }
 
+      const gids = this.engiArray.map(item => item.gid).join(',')
+      console.log(gids)
       const resOfSelectEngiStatusByMap =
         await this.$API.select.reqSelectEngiStatusByDept(
           year,
           month,
           departmentId,
           page,
-          limit
+          limit,
+          gids
         )
       console.log(this.engiArray, resOfSelectEngiStatusByMap)
       if (resOfSelectEngiStatusByMap.code === 0) {
diff --git a/vue.config.js b/vue.config.js
index d6ff8a2..4f19d21 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,7 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: './',
+  publicPath: '/',
   outputDir: 'dist',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',