From 9a873d979bc8ff08b1d3be87e7e0a54c004a76bf Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Fri, 28 Apr 2023 16:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=BB=91?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/common.scss                    | 47 ++++++++++++++++++-
 src/views/Report/ReportList.vue               |  7 ++-
 src/views/Report/ReportManager.vue            |  4 +-
 .../monitorProcesses/monitorDetail.vue        |  6 ++-
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss
index a68650c..2d170a8 100644
--- a/src/assets/css/common.scss
+++ b/src/assets/css/common.scss
@@ -59,9 +59,10 @@
 }
 .lef-tree {
   overflow: auto;
-  .el-scrollbar__wrap{
+  width: 100%;
+  .filter-tree{
     width: fit-content;
-    overflow: auto;
+
   }
 }
 
@@ -73,6 +74,48 @@
   border-radius: 10px;
   background-color: red;
 }
+.scroll-myself{
+  -ms-scroll-chaining: chained;
+  -ms-overflow-style: none;
+  -ms-content-zooming: zoom;
+  -ms-scroll-rails: none;
+  -ms-content-zoom-limit-min: 100%;
+  -ms-content-zoom-limit-max: 500%;
+  -ms-scroll-snap-type: proximity;
+  -ms-scroll-snap-points-x: snapList(100%, 200%, 300%, 400%, 500%);
+  -ms-overflow-style: none;
+  /*滚动条滑块按钮的颜色*/
+  scrollbar-face-color: #F0F0F0;
+  /*滚动条整体颜色*/
+  scrollbar-highlight-color:  #F0F0F0;
+  /*滚动条轨道颜色*/
+  scrollbar-track-color:  #F0F0F0;
+  /*三角箭头的颜色*/
+  scrollbar-arrow-color: #fff;
+  /*滚动条阴影*/
+  scrollbar-shadow-color:  #F0F0F0;
+  /*滚动条3d亮色阴影边框的外观颜色——左边和上边的阴影色*/
+  scrollbar-3dlight-color: #F0F0F0;
+  /*滚动条3d暗色阴影边框的外观颜色——右边和下边的阴影色*/
+  scrollbar-darkshadow-color: #F0F0F0;
+  /*滚动条基准颜色*/
+  scrollbar-base-color:  #F0F0F0;
+}
+.scroll-myself::-webkit-scrollbar{
+  background-color:  #fff;
+  width:5px;
+  height:5px;
+}
+/*滚动条的轨道*/
+.scroll-myself::-webkit-scrollbar-track{
+  background-color:  #fff;
+  border-radius: 10px;
+}
+/*滚动条的滑块按钮*/
+.scroll-myself::-webkit-scrollbar-thumb{
+  border-radius: 10px;
+  background-color:  #F0F0F0;
+}
 .showLimit {
 
   //.el-input__count {
diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index 6bfed7e..79efad6 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -101,11 +101,10 @@
     </el-row>
     <div class="table">
       <el-row>
-        <el-col :span="4" class="treeList">
+        <el-col :span="4" class="treeList ">
           <el-input placeholder="输入关键字进行过滤" v-model="filterText">
           </el-input>
-          <el-scrollbar wrap-class="scroll-wrap" view-class="scroll-view"
-          class="lef-tree">
+          <div class="lef-tree scroll-myself">
             <el-tree
               class="filter-tree"
               :data="treeData"
@@ -126,7 +125,7 @@
 <!--                </el-tooltip>-->
               </template>
             </el-tree>
-          </el-scrollbar>
+          </div>
         </el-col>
 
         <el-col :span="19">
diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index 6d139e2..b14ccc4 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -45,7 +45,7 @@
             <el-col :span="4"  class="treeList">
                 <el-input placeholder="输入关键字进行过滤" v-model="filterText">
                     </el-input>
-                  <el-scrollbar wrap-class="scroll-wrap" view-class="scroll-view">
+                  <div class="lef-tree scroll-myself" >
                     <el-tree
                     class="filter-tree"
                     :data="treeData"
@@ -65,7 +65,7 @@
 <!--                        </el-tooltip>-->
                       </template>
                     </el-tree>
-                   </el-scrollbar>
+                   </div>
             </el-col>
             <el-col :span="19 ">
                 <div class="table">
diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue
index a033b9b..5c8945a 100644
--- a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue
+++ b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue
@@ -220,21 +220,23 @@ export default {
         this.$message.warning("请选择一条数据")
         return
       }else{
-        if(this.checkList.length > 2){
+        if(this.checkList.length > 1){
           this.$message.warning("请选择一条数据")
           return
         }
         let check=[]
         check = this.checkList.filter(item=>{
           if(item.endTime ){
+            this.$message.warning("不是未完成的不允许操作")
               return item
           }
           if(item.name == '重新发起'){
+            this.$message.warning("发起人不允许调整")
             return item
           }
         })
         if(check.length > 0){
-          this.$message.warning("发起人不允许调整")
+
         }else{
           this.$refs.monitorModal.open(this.checkList[0].id,this.prcId,this.checkList[0].assigneeId,this.checkList[0].taskDefinitionKey,this.checkList[0].prcType)
         }