From a7d9391e9a4e8e31efffd10b7a891de6a05f0cfd Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 21:16:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectdemand/demandcollection/detail.vue | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 7e986c6..8dab32e 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -62,7 +62,9 @@
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
-          <process-diagram-viewer v-if="processDiagramViewer"/>
+          <operation-render :operation-list="processInstanceData.operationList"
+                            :state="'1'"/>
+<!--          <process-diagram-viewer v-if="processDiagramViewer"/>-->
         </div>
       </div>
       <!--        </el-col>-->
@@ -76,6 +78,7 @@
 </template>
 
 <script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo} from "@/api/project-demand/index.js";
@@ -142,25 +145,10 @@ getTree()
 .detail-block {
   display: flex;
   justify-content: space-between;
-  overflow-x: hidden;
-  overflow-y: auto;
+  overflow: hidden;
+  //overflow-y: auto;
   padding-right: 10px;
-  &::-webkit-scrollbar {
-    width: 6px;
-    height: 6px;
-  }
 
-  // 滚动条轨道
-  &::-webkit-scrollbar-track {
-    background: rgb(239, 239, 239);
-    border-radius: 2px;
-  }
-
-  // 小滑块
-  &::-webkit-scrollbar-thumb {
-    background: rgba(80, 81, 82, 0.29);
-    border-radius: 10px;
-  }
   .left-info {
     flex: 0.6;
 
@@ -184,30 +172,32 @@ getTree()
 
   .approval-record {
     flex: 0.4;
+    padding-bottom: 30px;
+
     .process {
       //padding-top: 20px;
       position: relative;
       //max-height: calc(100vh - 96px);
       //height: calc(100vh - 250px);
       //height: auto;
-      //overflow: scroll;
+      //overflow: auto;
 
-      &::-webkit-scrollbar {
-        width: 6px;
-        height: 6px;
-      }
-
-      // 滚动条轨道
-      &::-webkit-scrollbar-track {
-        background: rgb(239, 239, 239);
-        border-radius: 2px;
-      }
-
-      // 小滑块
-      &::-webkit-scrollbar-thumb {
-        background: rgba(80, 81, 82, 0.29);
-        border-radius: 10px;
-      }
+      //&::-webkit-scrollbar {
+      //  width: 6px;
+      //  height: 6px;
+      //}
+      //
+      //// 滚动条轨道
+      //&::-webkit-scrollbar-track {
+      //  background: rgb(239, 239, 239);
+      //  border-radius: 2px;
+      //}
+      //
+      //// 小滑块
+      //&::-webkit-scrollbar-thumb {
+      //  background: rgba(80, 81, 82, 0.29);
+      //  border-radius: 10px;
+      //}
     }