From bfa923b3ac87ea5921d61a482dbe0887d928b5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Wed, 6 Nov 2024 17:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=20=E9=A1=B9=E7=9B=AE=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=80=BB=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/list.vue                |  2 +-
 src/views/projectBank/projectProgress.vue | 50 ++++++++++++++++++++---
 src/views/worklog/index.vue               |  8 ++--
 3 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/views/project/list.vue b/src/views/project/list.vue
index 8a6f507..ca7246e 100644
--- a/src/views/project/list.vue
+++ b/src/views/project/list.vue
@@ -20,7 +20,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="项目状态" class="form-item">
-          <el-select v-model="searchForm.projectState" placeholder="项目状态">
+          <el-select v-model="searchForm.projectState" placeholder="项目状态" clearable>
             <el-option
               v-for="item in statusList"
               :key="item.dictValue"
diff --git a/src/views/projectBank/projectProgress.vue b/src/views/projectBank/projectProgress.vue
index 861b666..58fd1ab 100644
--- a/src/views/projectBank/projectProgress.vue
+++ b/src/views/projectBank/projectProgress.vue
@@ -5,6 +5,22 @@
       <div class="shadowBox"></div>
       <div class="flex-row aic mb20">
         <h2 class="textC">项目执行表</h2>
+        <div class="ml20">
+          项目状态：
+          <el-select
+            v-model="projectState"
+            placeholder="项目状态"
+            @change="getProjectProgress"
+            clearable
+          >
+            <el-option
+              v-for="item in statusList"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+          </el-select>
+        </div>
         <div class="date-range-container">
           <span class="date-range-label">统计时间：</span>
           <el-date-picker
@@ -53,6 +69,7 @@ export default {
       fixedColumns: [],
       executionData: [],
       statusList: [],
+      projectState: "",
     };
   },
   methods: {
@@ -69,6 +86,7 @@ export default {
       const res = await projectBank.porjectProgress({
         startDate: this.dateRange[0] + " 00:00:00",
         endDate: this.dateRange[1] + " 00:00:00",
+        projectState: this.projectState,
       });
       this.timeRange = [this.dateRange[0], this.dateRange[1]];
       this.executionData = res.data;
@@ -83,7 +101,7 @@ export default {
         }
         let values;
         if (column.property == "detailList") {
-          values = data.map((item) => Number(item[column.property][index - 4]));
+          values = data.map((item) => Number(item[column.property][index - 5]));
         } else if (column.property == "projectState") {
           values = [];
         } else {
@@ -219,6 +237,12 @@ export default {
             width: 100,
             fixed: "left",
           },
+          {
+            prop: "allDateWorkTime",
+            label: "总计工时\n（天）",
+            width: 100,
+            fixed: "left",
+          },
           {
             prop: "allWorkTime",
             label: "统计工时\n（天）",
@@ -320,7 +344,7 @@ export default {
   display: flex;
   align-items: center;
   width: 500px;
-  margin-left: 350px;
+  margin-left: 180px;
 }
 .date-range-label {
   white-space: nowrap;
@@ -353,7 +377,23 @@ export default {
   // left: 450px;
   // z-index: 100;
 }
-::v-deep .el-table__footer td {
-  border: none !important;
-}
+// ::v-deep .el-table__footer td {
+//   border: none !important;
+// }
+// ::v-deep .el-table__body-wrapper,::v-deep thead.has-gutter{
+//   position: relative;
+//   left: 550px;
+//   .el-table__cell{
+//     width: 100px !important;
+//   }
+//   .is-hidden {
+//     display: none;
+//   }
+// }
+// ::v-deep .el-table__body-wrapper{
+//   max-width: 68% !important;
+// }
+// ::v-deep .el-table--fit{
+//   overflow-x: hidden;
+// }
 </style>
diff --git a/src/views/worklog/index.vue b/src/views/worklog/index.vue
index fb552fc..590e597 100644
--- a/src/views/worklog/index.vue
+++ b/src/views/worklog/index.vue
@@ -170,7 +170,9 @@
           v-if="projectInfo.userId == $store.state.user.id"
         >
           <el-button @click="logDialogVisible = false">取消</el-button>
-          <el-button v-if="logForm.loggerId" type="danger" @click="delWorkLog">删除</el-button>
+          <el-button v-if="logForm.loggerId" type="danger" @click="delWorkLog"
+            >删除</el-button
+          >
           <el-button type="primary" @click="saveWorkLog">确定</el-button>
         </span>
       </template>
@@ -245,7 +247,7 @@ export default {
           if (item.state == -1) {
             ele.style = "background:#ecf5ff";
           } else {
-            ele.style = "background:#409eff;color:#fff";
+            ele.style = `background:linear-gradient(to right, #409eff ${(item.workTime||1)*100}% , #ecf5ff ${(item.workTime||1)*100}%);color:${item.workTime>0.65?'#fff':'#333'};`;
           }
         }
       });
@@ -455,7 +457,7 @@ export default {
       this.$modal.confirm(`是否确认删日志`).then(async () => {
         await workLogApi.delLog(this.logForm.loggerId);
         this.$modal.msgSuccess("操作成功");
-        this.logDialogVisible=false
+        this.logDialogVisible = false;
         this.changeMonth();
         const response = await workLogApi.userProject(this.projectInfo.userId);
         this.projectList = response.data;