From 9afb6bb1ccaadac3fb0c7813e2e579cf47354b3b Mon Sep 17 00:00:00 2001
From: panchichun <panchichun@rzdata.net>
Date: Tue, 20 Aug 2024 00:35:12 +0800
Subject: [PATCH 01/55] revert d95160d72cf30c03f813e09955e174118b3040f8

revert update
---
 .env.staging        |   4 +-
 .idea/workspace.xml | 286 +++++++++++++++++++++++---------------------
 default.conf        |  16 ---
 3 files changed, 150 insertions(+), 156 deletions(-)

diff --git a/.env.staging b/.env.staging
index 95953df..6aadf19 100644
--- a/.env.staging
+++ b/.env.staging
@@ -13,7 +13,7 @@ VUE_APP_BASE_API = 'https://www.rzdata.net/tool-tech-admin'
 VUE_APP_WS_URL = 'wss://www.rzdata.net/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://192.168.1.2:8012/tool-tech-file-view'
 
 # 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.1.2:8080/ebpm-process-manage'
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 92cba73..dd08a75 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="880b2c9e-bb63-49b5-a9b3-35bf50aa9da8" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.env.staging" beforeDir="false" afterPath="$PROJECT_DIR$/.env.staging" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/views/document/editDocument.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/views/document/uploadProgress.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/views/tool/toolDetail.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/.env.development" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/default.conf" beforeDir="false" afterPath="$PROJECT_DIR$/default.conf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/document/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/document/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/tool/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/tool/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/workstuff/apply/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/workstuff/apply/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/workstuff/dispose/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/workstuff/dispose/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/workstuff/message/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/workstuff/message/index.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -17,10 +24,56 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/views/document/index.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="228">
+              <caret line="69" column="40" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="40" />
+              <folding>
+                <element signature="n#pagination#0;n#div#1;n#el-card#1;n#div#0;n#template#0;n#!!top" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/views/workstuff/apply/index.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="190">
+              <caret line="34" column="38" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="38" />
+              <folding>
+                <element signature="n#style#0;n#el-table#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="114">
+              <caret line="6" column="18" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/views/workstuff/dispose/index.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="118">
+              <caret line="321" column="10" lean-forward="true" selection-start-line="298" selection-start-column="8" selection-end-line="321" selection-end-column="10" />
+              <folding>
+                <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/views/workstuff/message/index.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="722">
+            <state relative-caret-position="151">
               <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="45" selection-end-column="40" />
             </state>
           </provider>
@@ -29,7 +82,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/views/tool/index.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2356">
+            <state relative-caret-position="192">
               <caret line="177" column="132" selection-start-line="177" selection-start-column="96" selection-end-line="177" selection-end-column="132" />
               <folding>
                 <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
@@ -38,6 +91,7 @@
                 <element signature="n#style#0;n#el-input#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#el-select#0;n#el-form-item#0;n#el-col#0;n#el-row#3;n#el-form#0;n#div#0;n#el-drawer#0;n#div#0;n#template#0;n#!!top" expanded="true" />
                 <element signature="n#el-drawer#2;n#div#0;n#template#0;n#!!top" />
+                <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -55,60 +109,26 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/plugins/modal.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="266">
+            <state relative-caret-position="241">
               <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/views/document/editDocument.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2603">
-              <caret line="139" column="12" lean-forward="true" selection-start-line="139" selection-start-column="12" selection-end-line="139" selection-end-column="12" />
+            <state relative-caret-position="232">
+              <caret line="149" column="30" lean-forward="true" selection-start-line="149" selection-start-column="30" selection-end-line="149" selection-end-column="30" />
               <folding>
                 <element signature="n#style#0;n#el-table#0;n#div#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="e#3190#3196#1" expanded="true" />
+                <element signature="e#2350#2420#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.env.staging">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="342">
-              <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/default.conf">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="475">
-              <caret line="25" column="36" lean-forward="true" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.env.development">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="12" selection-start-line="12" selection-end-line="16" selection-end-column="75" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.env.production">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="19">
-              <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/views/workflow/config/index.vue">
           <provider selected="true" editor-type-id="text-editor">
@@ -191,6 +211,7 @@
         <option value="$PROJECT_DIR$/src/components/userSelector/userSelect.vue" />
         <option value="$PROJECT_DIR$/src/components/user-selector/src/user-selector.vue" />
         <option value="$PROJECT_DIR$/vue.config.js" />
+        <option value="$PROJECT_DIR$/default.conf" />
         <option value="$PROJECT_DIR$/Dockerfile" />
         <option value="$PROJECT_DIR$/public/css/index.css" />
         <option value="$PROJECT_DIR$/src/main.js" />
@@ -201,6 +222,7 @@
         <option value="$PROJECT_DIR$/src/store/modules/user.js" />
         <option value="$PROJECT_DIR$/public/css/tool.css" />
         <option value="$PROJECT_DIR$/.env.production" />
+        <option value="$PROJECT_DIR$/.env.staging" />
         <option value="$PROJECT_DIR$/src/layout/components/Navbar.vue" />
         <option value="$PROJECT_DIR$/src/components/Breadcrumb/index.vue" />
         <option value="$PROJECT_DIR$/src/router/index.js" />
@@ -221,6 +243,7 @@
         <option value="$PROJECT_DIR$/src/views/system/role/authUser.vue" />
         <option value="$PROJECT_DIR$/src/views/document/addDocument.vue" />
         <option value="$PROJECT_DIR$/src/views/tool/toolDetail.vue" />
+        <option value="$PROJECT_DIR$/.env.development" />
         <option value="$PROJECT_DIR$/src/views/document/uploadProgress.vue" />
         <option value="$PROJECT_DIR$/src/views/document/index.vue" />
         <option value="$PROJECT_DIR$/src/views/tool/index.vue" />
@@ -228,9 +251,6 @@
         <option value="$PROJECT_DIR$/src/views/workstuff/dispose/index.vue" />
         <option value="$PROJECT_DIR$/src/views/workstuff/message/index.vue" />
         <option value="$PROJECT_DIR$/src/views/document/editDocument.vue" />
-        <option value="$PROJECT_DIR$/.env.development" />
-        <option value="$PROJECT_DIR$/default.conf" />
-        <option value="$PROJECT_DIR$/.env.staging" />
       </list>
     </option>
   </component>
@@ -245,6 +265,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -338,7 +359,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -417,8 +437,6 @@
       <workItem from="1721611088644" duration="28182000" />
       <workItem from="1721717492928" duration="8889000" />
       <workItem from="1721783250517" duration="9602000" />
-      <workItem from="1721886425310" duration="2104000" />
-      <workItem from="1721896582395" duration="232000" />
     </task>
     <task id="LOCAL-00001" summary="update">
       <created>1721110878122</created>
@@ -455,25 +473,11 @@
       <option name="project" value="LOCAL" />
       <updated>1721632270841</updated>
     </task>
-    <task id="LOCAL-00006" summary="update">
-      <created>1721886526500</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1721886526500</updated>
-    </task>
-    <task id="LOCAL-00007" summary="update">
-      <created>1721888702083</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1721888702083</updated>
-    </task>
-    <option name="localTasksCounter" value="8" />
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="107954000" />
+    <option name="totallyTimeSpent" value="105618000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -517,6 +521,16 @@
     <option name="LAST_COMMIT_MESSAGE" value="update" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/工具管理.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="369" column="30" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="369" selection-end-column="30" />
+          <folding>
+            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/views/tool/index2.vue" />
     <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/我的申请.html">
       <provider selected="true" editor-type-id="text-editor">
@@ -607,6 +621,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/.env.production">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="19">
+          <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.env.staging">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="19">
+          <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/layout/components/Navbar.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="266">
@@ -850,24 +878,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/document/index.vue">
+    <entry file="file://$PROJECT_DIR$/.env.development">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1311">
-          <caret line="69" column="40" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="40" />
-          <folding>
-            <element signature="n#pagination#0;n#div#1;n#el-card#1;n#div#0;n#template#0;n#!!top" />
-          </folding>
+        <state relative-caret-position="190">
+          <caret line="10" column="35" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/workstuff/apply/index.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/workflow/config/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
-          <caret line="34" column="38" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="38" />
-          <folding>
-            <element signature="n#style#0;n#el-table#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="247">
+          <caret line="13" column="103" selection-start-line="13" selection-start-column="72" selection-end-line="13" selection-end-column="103" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/plugins/modal.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="241">
+          <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
         </state>
       </provider>
     </entry>
@@ -878,34 +906,30 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/workstuff/dispose/index.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/workstuff/message/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6099">
-          <caret line="321" column="10" selection-start-line="298" selection-start-column="8" selection-end-line="321" selection-end-column="10" />
+        <state relative-caret-position="151">
+          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="45" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/workstuff/apply/index.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="34" column="38" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="38" />
           <folding>
+            <element signature="n#style#0;n#el-table#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/workstuff/message/index.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/workstuff/dispose/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="722">
-          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="45" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/tool/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2356">
-          <caret line="177" column="132" selection-start-line="177" selection-start-column="96" selection-end-line="177" selection-end-column="132" />
+        <state relative-caret-position="118">
+          <caret line="321" column="10" lean-forward="true" selection-start-line="298" selection-start-column="8" selection-end-line="321" selection-end-column="10" />
           <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#style#0;n#el-select#0;n#el-form-item#2;n#div#0;n#div#0;n#div#0;n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#el-date-picker#0;n#el-form-item#3;n#div#0;n#div#0;n#div#0;n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#el-input#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#el-select#0;n#el-form-item#0;n#el-col#0;n#el-row#3;n#el-form#0;n#div#0;n#el-drawer#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#el-drawer#2;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -917,57 +941,43 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/plugins/modal.js">
+    <entry file="file://$PROJECT_DIR$/src/views/tool/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
+        <state relative-caret-position="192">
+          <caret line="177" column="132" selection-start-line="177" selection-start-column="96" selection-end-line="177" selection-end-column="132" />
+          <folding>
+            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#style#0;n#el-select#0;n#el-form-item#2;n#div#0;n#div#0;n#div#0;n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#el-date-picker#0;n#el-form-item#3;n#div#0;n#div#0;n#div#0;n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#el-input#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#el-select#0;n#el-form-item#0;n#el-col#0;n#el-row#3;n#el-form#0;n#div#0;n#el-drawer#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#el-drawer#2;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/document/index.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="69" column="40" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="40" />
+          <folding>
+            <element signature="n#pagination#0;n#div#1;n#el-card#1;n#div#0;n#template#0;n#!!top" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/views/document/editDocument.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2603">
-          <caret line="139" column="12" lean-forward="true" selection-start-line="139" selection-start-column="12" selection-end-line="139" selection-end-column="12" />
+        <state relative-caret-position="232">
+          <caret line="149" column="30" lean-forward="true" selection-start-line="149" selection-start-column="30" selection-end-line="149" selection-end-column="30" />
           <folding>
             <element signature="n#style#0;n#el-table#0;n#div#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="e#3190#3196#1" expanded="true" />
+            <element signature="e#2350#2420#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.env.development">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="12" selection-start-line="12" selection-end-line="16" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.env.production">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/workflow/config/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="13" column="103" selection-start-line="13" selection-start-column="72" selection-end-line="13" selection-end-column="103" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/default.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="25" column="36" lean-forward="true" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.env.staging">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/default.conf b/default.conf
index 1161bec..13c1d3a 100644
--- a/default.conf
+++ b/default.conf
@@ -15,22 +15,6 @@ server {
         }
     }
 
-    location /ebpm-process-manage/ {
-        proxy_pass http://192.168.1.2:8080/ebpm-process-manage/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /tool-tech-file-view/ {
-        proxy_pass http://192.168.1.2:8012/tool-tech-file-view/;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
     error_page   500 502 503 504  /50x.html;
     location = /50x.html {
         root   /usr/share/nginx/html;
-- 
2.35.1.windows.2


From 7c099c852bd307382a49d2c26b97d71ee90388ad Mon Sep 17 00:00:00 2001
From: liukang <lukg6892>
Date: Wed, 21 Aug 2024 18:07:06 +0800
Subject: [PATCH 02/55] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E4=BD=BF=E7=94=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/my_business/workflow.js               | 188 +++++
 src/api/tool/tool.js                          |  23 +-
 src/api/tool/userApply.js                     |  51 ++
 src/api/tool/userApplyItem.js                 |  44 +
 src/components/DealDrawer/index.vue           | 107 +++
 src/components/MonitorDrawer/index.vue        |  34 +
 src/components/mainComponent/index.vue        |  36 +
 src/main.js                                   |   4 +
 src/router/index.js                           |   6 +
 src/store/getters.js                          |   1 +
 src/store/modules/user.js                     |   6 +
 src/views/interchange/index.vue               |   1 -
 src/views/system/dept/index.vue               |   1 -
 src/views/system/menu/index.vue               |   1 -
 src/views/system/tool/gen/genInfoForm.vue     |   1 -
 src/views/system/user/index.vue               |   1 -
 src/views/tool/index.vue                      |  56 +-
 .../workflowList/addWorkflow/tool_release.vue | 738 +++++++++++++++++
 .../workflowList/addWorkflow/use_apply.vue    | 607 ++++++++++++++
 src/views/workflowList/processcode/index.vue  | 508 ++++++++++++
 src/views/workflowList/workflowLogs/index.vue |  60 ++
 src/views/workflowList/workflowRouter.vue     |  51 ++
 src/views/workstuff/dispose/index.vue         | 763 ++++++------------
 23 files changed, 2750 insertions(+), 538 deletions(-)
 create mode 100644 src/api/my_business/workflow.js
 create mode 100644 src/api/tool/userApply.js
 create mode 100644 src/api/tool/userApplyItem.js
 create mode 100644 src/components/DealDrawer/index.vue
 create mode 100644 src/components/MonitorDrawer/index.vue
 create mode 100644 src/components/mainComponent/index.vue
 create mode 100644 src/views/workflowList/addWorkflow/tool_release.vue
 create mode 100644 src/views/workflowList/addWorkflow/use_apply.vue
 create mode 100644 src/views/workflowList/processcode/index.vue
 create mode 100644 src/views/workflowList/workflowLogs/index.vue
 create mode 100644 src/views/workflowList/workflowRouter.vue

diff --git a/src/api/my_business/workflow.js b/src/api/my_business/workflow.js
new file mode 100644
index 0000000..23f4a1f
--- /dev/null
+++ b/src/api/my_business/workflow.js
@@ -0,0 +1,188 @@
+import request from '@/utils/request'
+
+
+// 审批记录
+export function workflowGetLog(data) {
+  return request({
+    url: '/workflow/getLog',
+    method: 'post',
+    data: data
+  })
+}
+//流程实例撤回到拟稿人环节
+export function workflowbacktostart(data) {
+  return request({
+    url: '/workflow/backtostart',
+    method: 'post',
+    data: data,
+    timeout: 30*60*1000
+  })
+}
+// 获取流程环节定义信息
+export function activitydefinition(procDefId, actDefId) {
+  return request({
+    url: '/workflow/activitydefinition/' + procDefId + '/' + actDefId,
+    method: 'get',
+
+  })
+}
+// 查询列表
+export function workflowToDoList(data) {
+  return request({
+    url: '/workflow/toDoList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新建流程，获取下一环节流程定义信息
+export function workflowNextactsNew(data) {
+  return request({
+    url: '/workflow/nextacts/new',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新建流程，获取下一环节流程定义信息
+// 获取下一环节集合，并可以标识已办和自动将未办理环节优先排序
+export function workflowNextactsNew2(data) {
+  return request({
+    url: '/workflow/nextacts/new2',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询流程审批记录列表
+export function processWorkflowGetList(businessId) {
+  return request({
+    url: '/process/workflowLog/list' + '?pageNum=1&pageSize=100&businessId=' + businessId,
+    method: 'get',
+
+  })
+}
+
+export function getNextactuserByPending(query) {
+  return request({
+    url: '/workflow/nextactuser/pending',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getNextActUsersByNew(query) {
+  return request({
+    url: '/workflow/nextactuser/new',
+    method: 'get',
+    params: query
+  })
+}
+
+export function workflowSubmit(data) {
+  return request({
+    url: '/workflow/submit',
+    method: 'post',
+    data: data
+  })
+}
+export function workflowCancel(data) {
+  return request({
+    url: '/workflow/cancel',
+    method: 'post',
+    data: data
+  })
+}
+export function workflowReject(data) {
+  return request({
+    url: '/workflow/reject',
+    method: 'post',
+    data: data
+  })
+}
+
+export function workflowBacktoprev(data) {
+  return request({
+    url: '/workflow/backtoprev',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getHistAskLogUrl(procInstId) {
+  return request({
+    url: '/workflow/histasklogurl/' + procInstId,
+    method: 'get',
+  })
+}
+
+export function getExtAttributeModel(procDefId, actDefId) {
+  return request({
+    url: '/workflow/getExtAttributeModel/?procDefId=' + procDefId + "&actDefId=" + actDefId,
+    method: 'get',
+  })
+}
+export function selectLogByBusinessId(query) {
+  return request({
+    url: '/process/workflowLog/selectLogByBusinessId?businessId' + query,
+    method: 'get',
+
+  })
+}
+export function workflowprocesskey(query) {
+  return request({
+    url: '/workflow/process/key/' + query,
+    method: 'get',
+
+  })
+}
+
+export function getStartActdef(procDefId) {
+  return request({
+    url: '/workflow/startactdef/' + procDefId,
+    method: 'get',
+  })
+}
+
+// 根据流程实例id获取流程实例信息和流程状态
+export function procInstInfoAndStatus(procInstId) {
+  return request({
+    url: '/workflow/procInstInfoAndStatus/' + procInstId,
+    method: 'get',
+  })
+}
+
+// 根据流程实例id获取流程实例信息
+export function getProcInstInfo(procInstId) {
+  return request({
+    url: '/workflow/procInstInfo/' + procInstId,
+    method: 'get',
+  })
+}
+
+export function selectLogByProcInstId(query) {
+  return request({
+    url: '/web/log/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取流程待选人员展示方式
+export function selectUserStyle() {
+  return request({
+    url: '/workflow/selectUserStyle',
+    method: 'get',
+  })
+}
+
+// 根据流程实例id获取流程实例信息
+export function getRecordbyPorcInstId(procInstId) {
+  return request({
+    url: '/workflow/getRecord/' + procInstId,
+    method: 'get',
+  })
+}
+
+
+
diff --git a/src/api/tool/tool.js b/src/api/tool/tool.js
index c6c0e47..1c5304e 100644
--- a/src/api/tool/tool.js
+++ b/src/api/tool/tool.js
@@ -17,20 +17,29 @@ export function getTool(toolId) {
   })
 }
 
+
+export function getInfoByBpmcId(bpmcId) {
+  return request({
+    url: '/tool/bpmc/' + bpmcId,
+    method: 'get'
+  })
+}
+
 // 新增工具信息
 export function addTool(data) {
   return request({
     url: '/tool',
     method: 'post',
-    data: data
+    data: data,
+    timeout: 30*60*1000
   })
 }
 
 // 修改工具信息
 export function updateTool(data) {
   return request({
-    url: '/tool',
-    method: 'put',
+    url: '/tool/edit',
+    method: 'post',
     data: data
   })
 }
@@ -42,3 +51,11 @@ export function delTool(toolId) {
     method: 'delete'
   })
 }
+
+export function checkToolExist(params) {
+  return request({
+    url: '/tool/checkToolExist',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/src/api/tool/userApply.js b/src/api/tool/userApply.js
new file mode 100644
index 0000000..339e730
--- /dev/null
+++ b/src/api/tool/userApply.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 查询使用申请列表
+export function listApply(query) {
+  return request({
+    url: '/use/apply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询使用申请详细
+export function getApply(id) {
+  return request({
+    url: '/use/apply/' + id,
+    method: 'get'
+  })
+}
+
+export function getInfoByBpmcId(bpmcId) {
+  return request({
+    url: '/use/apply/bpmc/' + bpmcId,
+    method: 'get'
+  })
+}
+
+// 新增使用申请
+export function addApply(data) {
+  return request({
+    url: '/use/apply',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改使用申请
+export function updateApply(data) {
+  return request({
+    url: '/use/apply/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除使用申请
+export function delApply(id) {
+  return request({
+    url: '/use/apply/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/tool/userApplyItem.js b/src/api/tool/userApplyItem.js
new file mode 100644
index 0000000..950a8ba
--- /dev/null
+++ b/src/api/tool/userApplyItem.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询使用申请详情列表
+export function listItem(query) {
+  return request({
+    url: '/use/apply/item/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询使用申请详情详细
+export function getItem(id) {
+  return request({
+    url: '/use/apply/item/' + id,
+    method: 'get'
+  })
+}
+
+// 新增使用申请详情
+export function addItem(data) {
+  return request({
+    url: '/use/apply/item',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改使用申请详情
+export function updateItem(data) {
+  return request({
+    url: '/use/apply/item',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除使用申请详情
+export function delItem(id) {
+  return request({
+    url: '/use/apply/item/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/components/DealDrawer/index.vue b/src/components/DealDrawer/index.vue
new file mode 100644
index 0000000..cb6d027
--- /dev/null
+++ b/src/components/DealDrawer/index.vue
@@ -0,0 +1,107 @@
+<template>
+  <div>
+  <el-drawer
+    :wrapperClosable="false"
+    :visible.sync="visible"
+    :append-to-body="true"
+    direction="rtl"
+    size="90%"
+    :with-header="false"
+    :show-close="false"
+    modal-append-to-body
+    :destroy-on-close="true"
+  >
+    <div style="width:100%; height:100%;overflow: hidden">
+      <iframe :src="src" width="100%" name="dmsDrawer" height="100%" title="myFrame" style="border: 0"></iframe>
+    </div>
+  </el-drawer>
+  <el-drawer
+    :visible.sync="drawerShow"
+    direction="rtl"
+    size="90%"
+    :append-to-body="true"
+    :with-header="false"
+    :wrapperClosable="false"
+    :show-close="false"
+    modal-append-to-body
+    :destroy-on-close="true"
+  >
+    <main-component ref="mainComponent" :code="path" :data="data" @close="handleCodeCloseChange"></main-component>
+  </el-drawer>
+  </div>
+</template>
+
+<script>
+/*
+流程处理抽屉组件
+*/
+import MainComponent from '@/components/mainComponent/index.vue'
+
+export default {
+  name: 'DealDrawer',
+  components: { MainComponent },
+  data() {
+    return {
+      workflowMessageCbAdded: false,
+      visible: false,
+      drawerShow: false,
+      data: undefined,
+      path: '',
+      src: ''
+    }
+  },
+  activated() {
+    this.setupMessageListener()
+  },
+  created() {
+    this.setupMessageListener()
+  },
+  deactivated() {
+    this.removeMessageListener()
+  },
+  beforeDestroy() {
+    this.removeMessageListener()
+  },
+  methods: {
+    //建立addEventListener事件
+    setupMessageListener() {
+      if (!this.workflowMessageCbAdded) {
+        window.addEventListener('message', this.handleMsg)
+        this.workflowMessageCbAdded = true
+      }
+    },
+    //销毁addEventListener事件
+    removeMessageListener() {
+      window.removeEventListener('message', this.handleMsg)
+      this.workflowMessageCbAdded = false
+    },
+    handleMsg(event) {
+      let _this = this
+      let data = event.data
+      if (data.type === 'close') {
+        _this.visible = false
+        if (data.msgType) {
+          _this.$modal[data.msgType](data.msg)
+        }
+        _this.$emit('closeDrawer')
+      }else if(data.type === 'pdfPreview'){
+        this.pdfPreview(data.pdfId)
+      }
+    },
+    pdfPreview(pdfId){
+      this.path = 'views/components/pdfPreview/index'
+      this.data = pdfId
+      this.drawerShow = true
+    },
+    init(url) {
+      let _this = this
+      _this.visible = true
+      // iframe加载URL地址
+      _this.src = url
+    },
+    handleCodeCloseChange() {
+      this.drawerShow = false
+    },
+  }
+}
+</script>
diff --git a/src/components/MonitorDrawer/index.vue b/src/components/MonitorDrawer/index.vue
new file mode 100644
index 0000000..fb17495
--- /dev/null
+++ b/src/components/MonitorDrawer/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <el-drawer
+    :wrapperClosable='false'
+    title="流程监控"
+    size="65%"
+    :visible.sync="visible"
+    :append-to-body="true"
+  >
+    <div style="width:100%;height:100%">
+      <iframe :src="src" width="100%" height="100%" title="myFrame" style="border: 0;"></iframe>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+    import { getHistAskLogUrl } from "@/api/my_business/workflow";
+    export default {
+        data() {
+            return {
+                visible: false,
+                src: ''
+            };
+        },
+        methods: {
+            init(procInstId) {
+                let _this = this
+                _this.visible = true
+                getHistAskLogUrl(procInstId).then(res => {
+                    _this.src=res.data
+                })
+            }
+        }
+    }
+</script>
diff --git a/src/components/mainComponent/index.vue b/src/components/mainComponent/index.vue
new file mode 100644
index 0000000..53cd8ba
--- /dev/null
+++ b/src/components/mainComponent/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <component :is="dashboard" ref="component" :data="data" :dataType="dataType"  @close="close">
+    <slot></slot>
+  </component>
+</template>
+<script>
+export default {
+  name: 'MainComponent',
+  props: ['code','data','dataType'],
+  data () {
+    return {
+      dashboard: null,
+    }
+  },
+  watch: {
+    code (val) {
+        this.init(val)
+    },
+  },
+  mounted () {
+      this.init(this.code)
+  },
+  methods: {
+    init (val) {
+        try {
+          if (val) {
+            this.dashboard = resolve => require(['@/' + val + '.vue'], resolve)
+          }
+        }catch (e) {}
+    },
+    close (value) {
+      this.$emit('close', value)
+    },
+  }
+}
+</script>
diff --git a/src/main.js b/src/main.js
index 50df872..4a5b32b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,7 @@ import  '../public/css/poctstyle.css'
 import  '../public/css/tool.css'
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import App from './App'
 import store from './store'
 import router from './router'
@@ -38,6 +39,8 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
+// 图形监控组件
+import MonitorDrawer from "@/components/MonitorDrawer"
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -58,6 +61,7 @@ Vue.component('Editor', Editor)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
+Vue.component('MonitorDrawer', MonitorDrawer)
 
 Vue.use(directive)
 Vue.use(plugins)
diff --git a/src/router/index.js b/src/router/index.js
index 91c00b1..ff03511 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,6 +41,12 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    // 统一流程处理前端页面（涉及待办、已办、办结）
+    path: '/workflowRouter',
+    component: (resolve) => require(['@/views/workflowList/workflowRouter.vue'], resolve),
+    hidden: true
+  },
   {
     path: '/login',
     component: () => import('@/views/login'),
diff --git a/src/store/getters.js b/src/store/getters.js
index 25475ce..f7f6256 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -7,6 +7,7 @@ const getters = {
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,
   avatar: state => state.user.avatar,
+  userInfo: state => state.user.info,
   name: state => state.user.name,
   nickName: state => state.user.nickName,
   introduction: state => state.user.introduction,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 0d1af8f..cced906 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,6 +7,7 @@ const user = {
     id: '',
     name: '',
     nickName: '',
+    info: {},
     avatar: '',
     roles: [],
     permissions: []
@@ -33,6 +34,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_INFO:(state, info) => {
+      state.info = info
     }
   },
 
@@ -70,6 +74,8 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_NICK_NAME', user.nickName)
           commit('SET_AVATAR', avatar)
+          commit('SET_INFO', user)
+
           resolve(res)
         }).catch(error => {
           reject(error)
diff --git a/src/views/interchange/index.vue b/src/views/interchange/index.vue
index 121c88a..ba76e9d 100644
--- a/src/views/interchange/index.vue
+++ b/src/views/interchange/index.vue
@@ -155,7 +155,6 @@ import { getToken } from "@/utils/auth";
 import { Base64 } from 'js-base64'
 import Treeselect from "@riophae/vue-treeselect";
 import blUserSelector from "@/components/user-selector/src/user-selector";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import toolDetail from "./toolDetail";
 
 export default {
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 3896dcb..13aa906 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -159,7 +159,6 @@
 <script>
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Dept",
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 836b78a..0e297ee 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -275,7 +275,6 @@
 <script>
 import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu";
 import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";
 
 export default {
diff --git a/src/views/system/tool/gen/genInfoForm.vue b/src/views/system/tool/gen/genInfoForm.vue
index 98daf6d..e3bf1a2 100644
--- a/src/views/system/tool/gen/genInfoForm.vue
+++ b/src/views/system/tool/gen/genInfoForm.vue
@@ -224,7 +224,6 @@
 
 <script>
 import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   components: { Treeselect },
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9d9016b..9a0c2da 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -325,7 +325,6 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { getToken } from "@/utils/auth";
 import { Base64 } from 'js-base64'
 import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "User",
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index bdc79c3..cb2899f 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -387,6 +387,19 @@
       </div><!--el-form-border 表单-->
     </el-drawer><!--el-drawer 导出抽屉-->
 
+    <el-drawer
+      :visible.sync="drawerShow"
+      direction="rtl"
+      size="90%"
+      :with-header="false"
+      :wrapperClosable="false"
+      :show-close="false"
+      modal-append-to-body
+      :destroy-on-close="true"
+    >
+      <main-component ref="mainComponent" :code="path+code"  :data="data"  @close="handleClose"></main-component>
+    </el-drawer>
+
     <!-- 工具详情对话框 -->
     <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" size="85%" class="no-padding">
       <template #title>
@@ -407,16 +420,20 @@ import { getToken } from "@/utils/auth";
 import { Base64 } from 'js-base64'
 import Treeselect from "@riophae/vue-treeselect";
 import blUserSelector from "@/components/user-selector/src/user-selector";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import toolDetail from "./toolDetail";
 import AddDoc from './AddDoc'
+import mainComponent from "@/components/mainComponent/index.vue";
 
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'tool_type'],
-  components: { Treeselect, blUserSelector, toolDetail, AddDoc },
+  components: { Treeselect, blUserSelector, toolDetail, AddDoc,mainComponent },
   data() {
     return {
+      drawerShow: false,
+      path: 'views/workflowList/addWorkflow/',
+      code: '',
+      data: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -629,12 +646,8 @@ export default {
     },
     /**=============================申请使用Start================================*/
     applyUse(row){
-      let toolIds = row?.id || '1'
-      if(toolIds.length == 0){
-        this.$modal.msgWarning("请选择需要申请使用的工具！");
-        return
-      }
-      this.applyDrawerOpen = true
+      let _this = this
+      _this.handleOpen({...row,type:'use_apply'})
     },
     submitApply(){
 
@@ -681,14 +694,22 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      getTool().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.addDrawerOpen = true;
-        this.title = "添加工具";
-        this.form.password = this.initPassword;
-      });
+      // this.reset();
+      // getTool().then(response => {
+      //   this.postOptions = response.posts;
+      //   this.roleOptions = response.roles;
+      //   this.addDrawerOpen = true;
+      //   this.title = "添加工具";
+      //   this.form.password = this.initPassword;
+      // });
+      let _this = this
+      _this.handleOpen({type:'tool_release'})
+    },
+    handleOpen(row){
+      let _this = this
+      _this.code = row.type
+      _this.data = row
+      _this.drawerShow = true
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -784,6 +805,9 @@ export default {
           this.loading = false;
         }
       );
+    },
+    handleClose(){
+      this.drawerShow = false
     }
   }
 };
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
new file mode 100644
index 0000000..15b9342
--- /dev/null
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -0,0 +1,738 @@
+<template>
+  <div  v-loading="loading||detailLoading">
+    <div class="drawer-head">
+      <div class="cell-title">
+        <div>
+          <p class="title">新增工具</p>
+        </div>
+      </div>
+      <div class="cell-btn">
+        <el-button v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
+        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">撤销</el-button>
+        <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm">提交</el-button>
+        <el-button v-if="editStatus" type="primary" @click="saveForm" >保存</el-button>
+        <el-button @click="close">关闭</el-button>
+      </div>
+    </div>
+    <el-tabs v-if="pListData&&pListData.procInstId" v-model="activeName">
+      <el-tab-pane label="信息内容" name="info"></el-tab-pane>
+      <el-tab-pane label="审批记录" name="log"></el-tab-pane>
+    </el-tabs>
+    <div class="el-form-border" v-show="activeName==='info'">
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <div>
+          <div class="box-title">
+            基本信息
+          </div>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="工具编号" prop="toolCode">
+                <el-input v-if="editStatus" v-model="form.toolCode" placeholder="请输入工具编号"/>
+                <span v-else>{{form.toolCode}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="工具名称" prop="toolName">
+                <el-input v-if="editStatus" v-model="form.toolName" placeholder="请输入工具名称"/>
+                <span v-else>{{form.toolName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="负责人" prop="toolPrincipalsName">
+                <el-input v-if="editStatus" v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11"/>
+                <span v-else>{{form.toolPrincipalsName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="归属部门" prop="toolRespDept">
+                <treeselect :disabled="!editStatus" v-model="form.toolRespDept" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="工具来源" prop="toolSource">
+                <el-input v-if="editStatus" v-model="form.toolSource" placeholder="请输入工具来源"/>
+                <span v-else>{{form.toolSource}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="工具用途" prop="toolUse">
+                <el-input v-if="editStatus" v-model="form.toolUse" placeholder="请输入工具用途" />
+                <span v-else>{{form.toolUse}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="工具类别">
+                <el-select v-if="editStatus" v-model="form.toolType" placeholder="请选择工具类别" style="width: 100%">
+                  <el-option
+                    v-for="dict in dict.type.tool_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+                <dict-tag v-else :options="dict.type.tool_type" :value="form.toolType"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态">
+                <el-radio-group v-model="form.status" v-if="editStatus">
+                  <el-radio
+                    v-for="dict in dict.type.sys_normal_disable"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >{{dict.label}}</el-radio>
+                </el-radio-group>
+                <dict-tag v-else :options="dict.type.sys_normal_disable" :value="form.status"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="测试情况">
+                <el-input :readonly="!editStatus" v-model="form.testSituation" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="功能描述">
+                <el-input :readonly="!editStatus" v-model="form.functionDesc" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="适用条件">
+                <el-input :readonly="!editStatus" v-model="form.applyCondition" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="操作说明">
+                <el-input :readonly="!editStatus" v-model="form.operateExplain" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input :readonly="!editStatus" v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="box-title">
+            关联附件
+          </div>
+          <div class="operate">
+            <el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
+            <el-button icon="el-icon-delete">删除</el-button>
+          </div><!--operate 操作按钮-->
+          <el-table :data="docList" style="width: 100%">
+            <el-table-column type="selection" width="50" align="center"> </el-table-column>
+            <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
+            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
+            <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
+            <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
+            <el-table-column label="来源" prop="docSource" width="100" />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="180">
+              <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-view"
+                  @click="handlePriew(scope.row)"
+                >预览</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                >删除</el-button>
+                <el-button type="text" icon="el-icon-download">下载</el-button>
+              </template>
+            </el-table-column>
+          </el-table><!--el-table-->
+        </div>
+        <div v-if="attributeModelBool('approve')&&workflowStatus">
+          <div class="box-title">
+            {{submitLabel}}
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="submitLabel+'结论:'" prop="pass">
+                <el-radio-group v-model.trim="formSubmit.pass">
+                  <el-radio
+                    v-for="dict in passoptions"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row >
+            <el-col :span="24">
+              <el-form-item :label="submitLabel+'意见:'">
+                <el-input
+                  v-model="formSubmit.summary"
+                  type="textarea"
+                  :placeholder="'请输入'+submitLabel+'意见'"
+                  maxlength="200"
+                  :autosize="{ minRows: 4, maxRows: 4 }"
+                  :style="{ width: '100%' }"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+      <!-- 上传 -->
+      <add-doc :show.sync="addDocShow" toolId="1111" @callback="openEvent"/>
+    </div><!--el-form-border 表单-->
+    <div v-show="activeName==='log'">
+      <workflow-logs :procInstId = "pListData.procInstId"></workflow-logs>
+    </div>
+    <!-- 流程选择下一环节及人员  开始 -->
+    <el-dialog
+      title="选择下一环节及人员"
+      v-if="dialogVisible" :visible.sync="dialogVisible"
+      width="60%"
+      append-to-body
+      v-loading = flowStepLoading
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <processcode
+        ref="prochild"
+        :searchQuery="searchQuery"
+        :pListData="pListData"
+        :isSummary="isSummary"
+      ></processcode>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleWorkflowSubmit"
+        >提 交</el-button
+        >
+      </span>
+    </el-dialog>
+    <!-- 流程选择下一环节及人员  结束 -->
+    <monitor-drawer
+      v-if="monitorDrawerVisible"
+      ref="monitorDrawer"
+    ></monitor-drawer>
+  </div>
+</template>
+<script>
+import { listDocument } from "@/api/document/document";
+import processcode from "@/views/workflowList/processcode/index.vue";
+import {
+  workflowprocesskey,
+  getStartActdef,
+  getExtAttributeModel,
+  procInstInfoAndStatus,
+} from '@/api/my_business/workflow'
+import WorkflowLogs from '@/views/workflowList/workflowLogs/index.vue'
+import AddDoc from '@/views/tool/AddDoc.vue'
+import Treeselect from '@riophae/vue-treeselect'
+import { deptTreeSelect } from "@/api/system/user";
+import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool'
+// PDF本地文件预览
+export default {
+  dicts: ['sys_normal_disable','tool_type'],
+  components: {
+    Treeselect, AddDoc,
+    WorkflowLogs,
+    processcode,
+  },
+  name: "Borrow_doc",
+  props: ['data'],
+  data() {
+    let validatorToolExist = (rule, value, callback) => {
+      let _this = this
+      if (_this.editStatus&&_this.form.toolCode&&_this.form.toolRespDept) {
+        checkToolExist(_this.form).then((response) => {
+          if (response.data) {
+            let deptName = _this.getDeptName(_this.deptOptions, _this.form.toolRespDept)
+            callback(new Error(deptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
+          } else {
+            callback()
+          }
+        })
+      } else {
+        callback()
+      }
+    }
+    return {
+      // 新增时的关联附件
+      docList: [],
+      addDocShow: false,
+      docQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        toolId: ''
+      },
+      defaultStaff: [],
+      yes: 'Y',
+      searchQuery: {},
+      deptList: [],
+      companyList: [],
+      deptOptions: [],
+      docClassList: [],
+      submitLabel:undefined,
+      passoptions: [
+        { value: true, label: "通过" },
+        { value: false, label: "不通过" },
+      ],
+      formSubmit: { summary: "", actionType: "", pass: "" },
+      isSummary: false,
+      activeName: "info",
+      nodeDetail: [],
+      procDefKey: undefined,
+      viewId: "",
+      userInfo: this.$store.getters.userInfo,
+      viewShow: false,
+      monitorDrawerVisible:false,
+      form: {},
+      rules: {
+        toolCode: [
+          { required: true, message: "工具编号不能为空", trigger: "blur" },
+          { min: 2, max: 30, message: '工具编号长度必须介于 2 和 30 之间', trigger: 'blur' },
+          { validator: validatorToolExist, trigger: "blur" },
+        ],
+        toolName: [
+          { required: true, message: "工具名称不能为空", trigger: "blur" },
+          { max: 50, message: '工具名称不能超过50个字', trigger: 'blur' }
+        ],
+        toolPrincipalsName: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+        toolSource: [
+          { max: 50, message: '工具来源不能超过50个字', trigger: 'blur' }
+        ],
+        toolUse: [
+          { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
+        ]
+      },
+      kuozhanshuju: {},
+      kuozhanshujuBool: {},
+      kuozhanshujuLabel: {},
+      pListData: {},
+      editStatus:false,
+      workflowStatus: false,
+      dialogVisible: false,
+      loading: false,
+      detailLoading: false,
+      flowStepLoading : false,
+      // 默认密码
+      initPassword: undefined,
+    };
+  },
+  computed: {},
+  watch: {
+    data (val) {
+      if (val) {
+        this.init(val)
+      }
+    },
+  },
+  mounted() {
+    if (this.data) {
+      this.init(this.data)
+    }
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+    this.getDeptTree()
+  },
+  methods: {
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    async init(row) {
+      let _this = this
+      _this.rest()
+      _this.loading = true
+      _this.procDefKey = 'Process_FHXOQXVP'
+      _this.form.type = row.type
+      //是否编辑模式
+      _this.$nextTick(() => {
+        if (row && row.procInstId) {
+          let procInstId = row.procInstId
+          _this.workflowStatus = row.status == '1'
+          _this.procInstInfoAndStatus(procInstId)
+          _this.getDetail(procInstId)
+        } else {
+          _this.workflowStatus = true
+          _this.loading = false
+          _this.editStatus = true
+          _this.getWorkflowprocesskey();
+        }
+      });
+    },
+    getDetail(procInstId) {
+      let _this = this
+      _this.detailLoading = true
+      getInfoByBpmcId(procInstId).then(async (res) => {
+        let formData = res.data;
+        formData.type = _this.form.type
+        _this.form = formData
+      }).finally(()=>{
+        _this.detailLoading = false
+      });
+    },
+    rest(){
+      let _this = this
+      _this.activeName = "info"
+      _this.openEvent()
+    },
+    procInstInfoAndStatus(procInstId){
+      let _this = this
+      procInstInfoAndStatus(procInstId).then((res) => {
+        if (res) {
+          _this.pListData = res
+        }else {
+          _this.pListData = {procInstId:procInstId}
+        }
+        _this.getExtAttributeModel()
+      });
+    },
+    getWorkflowprocesskey() {
+      let _this = this
+      _this.loading = true
+      _this.pListData = {}
+      if (_this.procDefKey) {
+        workflowprocesskey(_this.procDefKey).then((data) => {
+          getStartActdef(data.data.procDefId).then((res) => {
+            _this.pListData = res.data;
+            this.getExtAttributeModel()
+          });
+        });
+      }else {
+        _this.$message.warning("该文件类型尚未进行流程设置，将无法发起流程！");
+      }
+    },
+    getExtAttributeModel(){
+      let _this = this
+      let procDefId = _this.pListData.procDefId
+      let curActDefId = _this.pListData.curActDefId || _this.pListData.actDefId
+      if (procDefId&&curActDefId) {
+        getExtAttributeModel(
+          procDefId,
+          curActDefId
+        ).then((res) => {
+          let kuozhanshujuBool = {}
+          let kuozhanshuju = {}
+          let kuozhanshujuLabel = {}
+          res.data.forEach(item=>{
+            kuozhanshujuLabel[item.objKey] = item.objName
+            if (item.objType==='Boolean') {
+              kuozhanshujuBool[item.objKey] = item.objValue
+            } else {
+              kuozhanshuju[item.objKey] = item.objValue
+            }
+          })
+          _this.kuozhanshujuBool = kuozhanshujuBool;
+          _this.kuozhanshuju = kuozhanshuju;
+          _this.kuozhanshujuLabel = kuozhanshujuLabel;
+          _this.editStatus =_this.attributeModelBool('edit')&&_this.workflowStatus
+          _this.submitLabel = _this.attributeModelLabel('approve')
+        }).finally(()=>{
+          _this.loading = false
+        });
+      }else {
+        _this.kuozhanshujuBool = {}
+        _this.kuozhanshuju = {}
+        _this.loading = false
+      }
+    },
+    attributeModelBool(val){
+      if (this.kuozhanshujuBool&&this.kuozhanshujuBool!=={}) {
+        let obj = this.kuozhanshujuBool[val]
+        return obj?obj==='true':false
+      }else {
+        return false
+      }
+    },
+    attributeModel(val){
+      return this.kuozhanshuju[val]
+    },
+    attributeModelLabel(val){
+      return this.kuozhanshujuLabel[val]
+    },
+    close() {
+      this.viewShow = false;
+      this.$emit("close")
+    },
+    //不需要验证必填的保存
+    saveForm() {
+      let _this = this
+      if (!_this.procDefKey) {
+        _this.$message.warning("尚未进行流程设置，将无法发起流程！");
+        return;
+      }
+      _this.loading = true
+      let formData = JSON.parse(JSON.stringify(_this.form))
+      formData.recordStatus = "draft";
+      formData.editStatus = _this.editStatus
+      if (formData.toolId) {
+        updateTool(formData).then((res) => {
+          if (res.code===200) {
+            _this.$message({
+              message: '保存成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+          }
+        }).finally(()=>{
+          _this.loading = false
+        });
+      } else {
+        let wf_receivers = [];
+        wf_receivers.push({
+          receiveUserId: _this.userInfo.userName,
+          receiveUserOrgId: _this.userInfo.deptId
+        });
+        formData.bpmClientInputModel = {
+          model: {
+            wf_procDefId: _this.pListData.procDefId,
+            wf_procDefKey: _this.procDefKey,
+            wf_procTitle: formData.toolName,
+            wf_sendUserId: _this.userInfo.userName,
+            wf_sendUserOrgId: _this.userInfo.deptId,
+            wf_receivers: wf_receivers,
+            wf_curActDefName: _this.pListData.actDefName,
+            wf_curActDefId: _this.pListData.actDefId,
+            wf_nextActDefName: _this.pListData.actDefName,
+            wf_nextActDefId: _this.pListData.actDefId,
+          },
+          type: formData.type,
+          review: _this.attributeModelBool('approve'),
+        };
+        formData.editStatus = _this.editStatus
+        addTool(formData).then((res) => {
+          if (res.code===200) {
+            _this.form.toolId = res.data.businessKey;
+            _this.procInstInfoAndStatus(res.data.procInstId)
+            _this.$message({
+              message: '保存成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+          }
+        }).finally(()=>{
+          _this.loading = false
+        });
+      }
+    },
+    deleteForm(){
+      let _this = this
+      _this.$modal.confirm('撤销后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+        .then(()=> {
+          _this.loading = true
+          let formData = {
+            toolId: _this.form.toolId,
+            bpmClientInputModel: {
+              model: {
+                wf_procDefKey: _this.procDefKey,
+                wf_procDefId: _this.pListData.procDefId,
+                wf_procInstId: _this.pListData.procInstId,
+                wf_sendUserId: _this.userInfo.userName,
+                wf_sendUserOrgId: _this.userInfo.deptId,
+                wf_curActDefName: _this.pListData.curActDefName,
+                wf_curActDefId: _this.pListData.curActDefId,
+              },
+            },
+            review: false,
+            recordStatus: 'cancel',
+            editStatus: false
+          }
+          addTool(formData).then((res) => {
+            if (res.code === 200) {
+              this.$modal.msgSuccess("撤销成功");
+              this.close(true);
+            }
+          });
+        })
+    },
+    // 提交
+    async submitForm() {
+      let _this = this
+      // 首先页签调整为 信息内容
+      _this.activeName = 'info'
+      if (!_this.procDefKey) {
+        _this.$message.warning("尚未进行流程设置，将无法发起流程！");
+        return;
+      }
+      let dialogVisible = true
+      //审核
+      if (_this.attributeModelBool('approve')) {
+        if (_this.formSubmit.pass==='') {
+          _this.$modal.msgError(_this.submitLabel+"结论不能为空！");
+          return true;
+        } else if (!_this.formSubmit.pass&&!_this.formSubmit.summary) {
+          _this.$modal.msgError("请填写"+_this.submitLabel+"意见");
+          return true;
+        }
+      }
+      if (!!_this.$refs["form"]) {
+        let valid = await _this.$refs["form"].validate()
+        if (!valid) {
+          dialogVisible = false
+        }
+      }
+      _this.searchQuery.pass = _this.formSubmit.pass
+      let defaultStaff = []
+      this.defaultStaff=defaultStaff
+      this.dialogVisible = true;
+    },
+
+    //提交表单和流程数据
+    handleWorkflowSubmit() {
+      let _this = this
+      let formData = JSON.parse(JSON.stringify(_this.form))
+      let wf_receivers = [];
+      if (_this.$refs.prochild.receiveUserList.length < 1 &&_this.$refs.prochild.nextData.actDefType!=='endEvent') {
+        _this.$message.warning("请选择人员！");
+        return;
+      }
+      _this.$refs.prochild.receiveUserList.forEach((element) => {
+        wf_receivers.push({
+          receiveUserId: element.id,
+          receiveUserOrgId: element.parentId,
+        });
+      });
+      let wf_nextActDefId = _this.$refs.prochild.nextData.actDefId;
+      let wf_nextActDefName = _this.$refs.prochild.nextData.actDefName;
+        // 显示加载中
+        _this.flowStepLoading = true
+        _this.detailLoading = true
+        if (_this.pListData && _this.pListData.procInstId) {
+          //流程执行参数
+          formData.bpmClientInputModel = {
+            model: {
+              wf_procDefKey: _this.procDefKey,
+              wf_procDefId: _this.pListData.procDefId,
+              wf_procTitle: formData.toolName,
+              wf_curActInstId: _this.pListData.curActInstId,
+              wf_sendUserId: _this.userInfo.userName,
+              wf_sendUserOrgId: _this.userInfo.deptId,
+              wf_receivers: wf_receivers,
+              wf_nextActDefId: wf_nextActDefId,
+              wf_curComment: _this.formSubmit.summary,
+              wf_curActDefId: _this.pListData.curActDefId,
+              wf_curActDefName: _this.pListData.curActDefName,
+              wf_nextActDefName: wf_nextActDefName,
+            },
+            applyStatus: _this.formSubmit.pass,
+            review: _this.attributeModelBool('approve'),
+            type: formData.type
+          };
+        }else{
+          //创建流程参数
+          formData.bpmClientInputModel = {
+            model: {
+              wf_procTitle:  formData.toolName,
+              wf_nextActDefId: wf_nextActDefId,
+              wf_procDefId: _this.pListData.procDefId,
+              wf_procDefKey: _this.procDefKey,
+              wf_sendUserId: _this.userInfo.userName,
+              wf_sendUserOrgId: _this.userInfo.deptId,
+              wf_receivers: wf_receivers,
+              wf_curActDefName: _this.pListData.actDefName,
+              wf_curActDefId: _this.pListData.actDefId,
+              wf_nextActDefName: wf_nextActDefName,
+            },
+            review: _this.attributeModelBool('approve'),
+            type: formData.type,
+          };
+        }
+        if (_this.$refs.prochild.nextData.actDefType==='endEvent') {
+          //办结
+          formData.recordStatus = 'done'
+        } else {
+          //进行中
+          formData.recordStatus = 'doing'
+        }
+        formData.editStatus = _this.editStatus
+        addTool(formData).then((res) => {
+          if (res.code===200) {
+            _this.$message({
+              message: '流程提交成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+              onClose:()=>{
+                _this.flowStepLoading = false
+                _this.detailLoading = false
+                _this.dialogVisible = false;
+                _this.close();
+              }
+            });
+          }
+        });
+    },
+    handleMonitor() {
+      this.monitorDrawerVisible = true;
+      this.$nextTick(() => {
+        this.$refs.monitorDrawer.init(this.pListData.procInstId);
+      });
+    },
+    handleDelete(dataList,index){
+      dataList.splice(index,1)
+    },
+    /**
+     * 新增上传附件
+     */
+    handleDocAdd() {
+      this.addDocShow = true
+    },
+    /**
+     * 打开新增页面的回调事件
+     */
+    openEvent() {
+      this.loading = true
+      this.docQueryParams.toolId = '1111'
+      listDocument(this.queryParams).then(response => {
+          this.docList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    getDeptName(items, id) {
+      let label = ''
+      items.forEach(item => {
+        if(item['id'] == id){
+          label = item['label']
+          return
+        }
+      })
+      if(label == ''){
+        items.forEach(item => {
+          if (item.children) {
+            label = this.getDeptName(item.children, id)
+          }
+        })
+      }
+      return label
+    },
+  },
+};
+</script>
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
new file mode 100644
index 0000000..da13551
--- /dev/null
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -0,0 +1,607 @@
+<template>
+  <div  v-loading="loading||detailLoading">
+    <div class="drawer-head">
+      <div class="cell-title">
+        <div>
+          <p class="title">新增工具</p>
+        </div>
+      </div>
+      <div class="cell-btn">
+        <el-button v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
+        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">撤销</el-button>
+        <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm">提交</el-button>
+        <el-button v-if="editStatus" type="primary" @click="saveForm" >保存</el-button>
+        <el-button @click="close">关闭</el-button>
+      </div>
+    </div>
+    <el-tabs v-if="pListData&&pListData.procInstId" v-model="activeName">
+      <el-tab-pane label="信息内容" name="info"></el-tab-pane>
+      <el-tab-pane label="审批记录" name="log"></el-tab-pane>
+    </el-tabs>
+    <div class="el-form-border" v-show="activeName==='info'">
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <div>
+          <div class="box-title">
+            基本信息
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="申请人" prop="userName">
+                <el-input v-if="editStatus" v-model="form.userName" placeholder="请输入申请人"/>
+                <span v-else>{{form.userName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="申请部门" prop="deptId">
+                <el-input v-if="editStatus" v-model="form.deptId" placeholder="请选择申请部门" maxlength="11"/>
+                <span v-else>{{form.deptId}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="申请理由" prop="reason">
+                <el-input :readonly="!editStatus" v-model="form.reason" type="textarea" :rows="3" maxlength="1000" show-word-limit></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div>
+          <div class="box-title">
+            申请工具
+          </div>
+          <el-table :data="dataList" style="width: 100%">
+            <el-table-column label="工具编号" prop="toolCode" :show-overflow-tooltip="true" />
+            <el-table-column label="工具名称" prop="toolName" :show-overflow-tooltip="true" />
+            <el-table-column label="归属单位" prop="toolRespDept" :show-overflow-tooltip="true" />
+            <el-table-column label="负责人" prop="toolPrincipalsName" :show-overflow-tooltip="true" />
+            <el-table-column label="工具类别" prop="toolType" :show-overflow-tooltip="true" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div v-if="attributeModelBool('approve')&&workflowStatus">
+          <div class="box-title">
+            {{submitLabel}}
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="submitLabel+'结论:'" prop="pass">
+                <el-radio-group v-model.trim="formSubmit.pass">
+                  <el-radio
+                    v-for="dict in passoptions"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row >
+            <el-col :span="24">
+              <el-form-item :label="submitLabel+'意见:'">
+                <el-input
+                  v-model="formSubmit.summary"
+                  type="textarea"
+                  :placeholder="'请输入'+submitLabel+'意见'"
+                  maxlength="200"
+                  :autosize="{ minRows: 4, maxRows: 4 }"
+                  :style="{ width: '100%' }"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div><!--el-form-border 表单-->
+    <div v-show="activeName==='log'">
+      <workflow-logs :procInstId = "pListData.procInstId"></workflow-logs>
+    </div>
+    <!-- 流程选择下一环节及人员  开始 -->
+    <el-dialog
+      title="选择下一环节及人员"
+      v-if="dialogVisible" :visible.sync="dialogVisible"
+      width="60%"
+      append-to-body
+      v-loading = flowStepLoading
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <processcode
+        ref="prochild"
+        :searchQuery="searchQuery"
+        :pListData="pListData"
+        :isSummary="isSummary"
+      ></processcode>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleWorkflowSubmit"
+        >提 交</el-button
+        >
+      </span>
+    </el-dialog>
+    <!-- 流程选择下一环节及人员  结束 -->
+    <monitor-drawer
+      v-if="monitorDrawerVisible"
+      ref="monitorDrawer"
+    ></monitor-drawer>
+  </div>
+</template>
+<script>
+import { listDocument } from "@/api/document/document";
+import processcode from "@/views/workflowList/processcode/index.vue";
+import {
+  workflowprocesskey,
+  getStartActdef,
+  getExtAttributeModel,
+  procInstInfoAndStatus,
+} from '@/api/my_business/workflow'
+import WorkflowLogs from '@/views/workflowList/workflowLogs/index.vue'
+import AddDoc from '@/views/tool/AddDoc.vue'
+import Treeselect from '@riophae/vue-treeselect'
+import { deptTreeSelect } from "@/api/system/user";
+import { addApply, getInfoByBpmcId, updateApply } from '@/api/tool/userApply'
+import { listItem } from '@/api/tool/userApplyItem'
+// PDF本地文件预览
+export default {
+  dicts: ['sys_normal_disable','tool_type'],
+  components: {
+    Treeselect, AddDoc,
+    WorkflowLogs,
+    processcode,
+  },
+  name: "Borrow_doc",
+  props: ['data'],
+  data() {
+    return {
+      // 新增时的关联附件
+      dataList: [],
+      addDocShow: false,
+      docQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        toolId: ''
+      },
+      defaultStaff: [],
+      yes: 'Y',
+      searchQuery: {},
+      deptList: [],
+      companyList: [],
+      deptOptions: [],
+      docClassList: [],
+      submitLabel:undefined,
+      passoptions: [
+        { value: true, label: "通过" },
+        { value: false, label: "不通过" },
+      ],
+      formSubmit: { summary: "", actionType: "", pass: "" },
+      isSummary: false,
+      activeName: "info",
+      nodeDetail: [],
+      procDefKey: undefined,
+      viewId: "",
+      userInfo: this.$store.getters.userInfo,
+      viewShow: false,
+      monitorDrawerVisible:false,
+      form: {},
+      rules: {
+        userName: [
+          { required: true, message: "申请人不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: '申请人不能为空', trigger: 'blur' }
+        ],
+        reason: [
+          { required: true, message: '申请理由不能为空', trigger: 'blur' }
+        ]
+      },
+      kuozhanshuju: {},
+      kuozhanshujuBool: {},
+      kuozhanshujuLabel: {},
+      pListData: {},
+      editStatus:false,
+      workflowStatus: false,
+      dialogVisible: false,
+      loading: false,
+      detailLoading: false,
+      flowStepLoading : false,
+      // 默认密码
+      initPassword: undefined,
+    };
+  },
+  computed: {},
+  watch: {
+    data (val) {
+      if (val) {
+        this.init(val)
+      }
+    },
+  },
+  mounted() {
+    if (this.data) {
+      this.init(this.data)
+    }
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+    this.getDeptTree()
+  },
+  methods: {
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    async init(row) {
+      let _this = this
+      _this.rest(row)
+      _this.loading = true
+      _this.procDefKey = 'Process_DCMGS6M9'
+      _this.form.type = row.type
+      //是否编辑模式
+      _this.$nextTick(() => {
+        if (row && row.procInstId) {
+          let procInstId = row.procInstId
+          _this.workflowStatus = row.status == '1'
+          _this.procInstInfoAndStatus(procInstId)
+          _this.getDetail(procInstId)
+        } else {
+          _this.workflowStatus = true
+          _this.loading = false
+          _this.editStatus = true
+          _this.getWorkflowprocesskey();
+        }
+      });
+    },
+    getDetail(procInstId) {
+      let _this = this
+      _this.detailLoading = true
+      getInfoByBpmcId(procInstId).then(async (res) => {
+        let formData = res.data;
+        formData.type = _this.form.type
+        _this.form = formData
+        this.getItemList(res.data.id);
+      }).finally(()=>{
+        _this.detailLoading = false
+      });
+    },
+    getItemList(id){
+      let _this = this
+      listItem({applyId:id}).then(res=>{
+        _this.dataList = res.data
+      })
+    },
+    rest(data){
+      let _this = this
+      _this.activeName = "info"
+      this.dataList = [{...data}]
+    },
+    procInstInfoAndStatus(procInstId){
+      let _this = this
+      procInstInfoAndStatus(procInstId).then((res) => {
+        if (res) {
+          _this.pListData = res
+        }else {
+          _this.pListData = {procInstId:procInstId}
+        }
+        _this.getExtAttributeModel()
+      });
+    },
+    getWorkflowprocesskey() {
+      let _this = this
+      _this.loading = true
+      _this.pListData = {}
+      if (_this.procDefKey) {
+        workflowprocesskey(_this.procDefKey).then((data) => {
+          getStartActdef(data.data.procDefId).then((res) => {
+            _this.pListData = res.data;
+            this.getExtAttributeModel()
+          });
+        });
+      }else {
+        _this.$message.warning("该文件类型尚未进行流程设置，将无法发起流程！");
+      }
+    },
+    getExtAttributeModel(){
+      let _this = this
+      let procDefId = _this.pListData.procDefId
+      let curActDefId = _this.pListData.curActDefId || _this.pListData.actDefId
+      if (procDefId&&curActDefId) {
+        getExtAttributeModel(
+          procDefId,
+          curActDefId
+        ).then((res) => {
+          let kuozhanshujuBool = {}
+          let kuozhanshuju = {}
+          let kuozhanshujuLabel = {}
+          res.data.forEach(item=>{
+            kuozhanshujuLabel[item.objKey] = item.objName
+            if (item.objType==='Boolean') {
+              kuozhanshujuBool[item.objKey] = item.objValue
+            } else {
+              kuozhanshuju[item.objKey] = item.objValue
+            }
+          })
+          _this.kuozhanshujuBool = kuozhanshujuBool;
+          _this.kuozhanshuju = kuozhanshuju;
+          _this.kuozhanshujuLabel = kuozhanshujuLabel;
+          _this.editStatus =_this.attributeModelBool('edit')&&_this.workflowStatus
+          _this.submitLabel = _this.attributeModelLabel('approve')
+        }).finally(()=>{
+          _this.loading = false
+        });
+      }else {
+        _this.kuozhanshujuBool = {}
+        _this.kuozhanshuju = {}
+        _this.loading = false
+      }
+    },
+    attributeModelBool(val){
+      if (this.kuozhanshujuBool&&this.kuozhanshujuBool!=={}) {
+        let obj = this.kuozhanshujuBool[val]
+        return obj?obj==='true':false
+      }else {
+        return false
+      }
+    },
+    attributeModel(val){
+      return this.kuozhanshuju[val]
+    },
+    attributeModelLabel(val){
+      return this.kuozhanshujuLabel[val]
+    },
+    close() {
+      this.viewShow = false;
+      this.$emit("close")
+    },
+    //不需要验证必填的保存
+    saveForm() {
+      let _this = this
+      if (!_this.procDefKey) {
+        _this.$message.warning("尚未进行流程设置，将无法发起流程！");
+        return;
+      }
+      _this.loading = true
+      let formData = JSON.parse(JSON.stringify(_this.form))
+      formData.itemList = _this.dataList
+      formData.recordStatus = "draft";
+      formData.editStatus = _this.editStatus
+      if (formData.toolId) {
+        updateApply(formData).then((res) => {
+          if (res.code===200) {
+            _this.$message({
+              message: '保存成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+          }
+        }).finally(()=>{
+          _this.loading = false
+        });
+      } else {
+        let wf_receivers = [];
+        wf_receivers.push({
+          receiveUserId: _this.userInfo.userName,
+          receiveUserOrgId: _this.userInfo.deptId
+        });
+        let wf_procTitle = _this.dataList[0].toolName
+        formData.bpmClientInputModel = {
+          model: {
+            wf_procDefId: _this.pListData.procDefId,
+            wf_procDefKey: _this.procDefKey,
+            wf_procTitle: wf_procTitle,
+            wf_sendUserId: _this.userInfo.userName,
+            wf_sendUserOrgId: _this.userInfo.deptId,
+            wf_receivers: wf_receivers,
+            wf_curActDefName: _this.pListData.actDefName,
+            wf_curActDefId: _this.pListData.actDefId,
+            wf_nextActDefName: _this.pListData.actDefName,
+            wf_nextActDefId: _this.pListData.actDefId,
+          },
+          type: formData.type,
+          review: _this.attributeModelBool('approve'),
+        };
+        formData.editStatus = _this.editStatus
+        addApply(formData).then((res) => {
+          if (res.code===200) {
+            _this.form.id = res.data.businessKey;
+            _this.procInstInfoAndStatus(res.data.procInstId)
+            _this.$message({
+              message: '保存成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+          }
+        }).finally(()=>{
+          _this.loading = false
+        });
+      }
+    },
+    deleteForm(){
+      let _this = this
+      _this.$modal.confirm('撤销后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+        .then(()=> {
+          _this.loading = true
+          let formData = {
+            toolId: _this.form.toolId,
+            bpmClientInputModel: {
+              model: {
+                wf_procDefKey: _this.procDefKey,
+                wf_procDefId: _this.pListData.procDefId,
+                wf_procInstId: _this.pListData.procInstId,
+                wf_sendUserId: _this.userInfo.userName,
+                wf_sendUserOrgId: _this.userInfo.deptId,
+                wf_curActDefName: _this.pListData.curActDefName,
+                wf_curActDefId: _this.pListData.curActDefId,
+              },
+            },
+            review: false,
+            recordStatus: 'cancel',
+            editStatus: false
+          }
+          addApply(formData).then((res) => {
+            if (res.code === 200) {
+              this.$modal.msgSuccess("撤销成功");
+              this.close(true);
+            }
+          });
+        })
+    },
+    // 提交
+    async submitForm() {
+      let _this = this
+      // 首先页签调整为 信息内容
+      _this.activeName = 'info'
+      if (!_this.procDefKey) {
+        _this.$message.warning("尚未进行流程设置，将无法发起流程！");
+        return;
+      }
+      let dialogVisible = true
+      //审核
+      if (_this.attributeModelBool('approve')) {
+        if (_this.formSubmit.pass==='') {
+          _this.$modal.msgError(_this.submitLabel+"结论不能为空！");
+          return true;
+        } else if (!_this.formSubmit.pass&&!_this.formSubmit.summary) {
+          _this.$modal.msgError("请填写"+_this.submitLabel+"意见");
+          return true;
+        }
+      }
+      if (!!_this.$refs["form"]) {
+        let valid = await _this.$refs["form"].validate()
+        if (!valid) {
+          dialogVisible = false
+        }
+      }
+      _this.searchQuery.pass = _this.formSubmit.pass
+      let defaultStaff = []
+      this.defaultStaff=defaultStaff
+      this.dialogVisible = true;
+    },
+
+    //提交表单和流程数据
+    handleWorkflowSubmit() {
+      let _this = this
+      let formData = JSON.parse(JSON.stringify(_this.form))
+      formData.itemList = _this.dataList
+      let wf_receivers = [];
+      if (_this.$refs.prochild.receiveUserList.length < 1 &&_this.$refs.prochild.nextData.actDefType!=='endEvent') {
+        _this.$message.warning("请选择人员！");
+        return;
+      }
+      _this.$refs.prochild.receiveUserList.forEach((element) => {
+        wf_receivers.push({
+          receiveUserId: element.id,
+          receiveUserOrgId: element.parentId,
+        });
+      });
+      let wf_nextActDefId = _this.$refs.prochild.nextData.actDefId;
+      let wf_nextActDefName = _this.$refs.prochild.nextData.actDefName;
+        // 显示加载中
+        _this.flowStepLoading = true
+        _this.detailLoading = true
+      let wf_procTitle = _this.dataList[0].toolName
+        if (_this.pListData && _this.pListData.procInstId) {
+          //流程执行参数
+          formData.bpmClientInputModel = {
+            model: {
+              wf_procDefKey: _this.procDefKey,
+              wf_procDefId: _this.pListData.procDefId,
+              wf_procTitle: wf_procTitle,
+              wf_curActInstId: _this.pListData.curActInstId,
+              wf_sendUserId: _this.userInfo.userName,
+              wf_sendUserOrgId: _this.userInfo.deptId,
+              wf_receivers: wf_receivers,
+              wf_nextActDefId: wf_nextActDefId,
+              wf_curComment: _this.formSubmit.summary,
+              wf_curActDefId: _this.pListData.curActDefId,
+              wf_curActDefName: _this.pListData.curActDefName,
+              wf_nextActDefName: wf_nextActDefName,
+            },
+            applyStatus: _this.formSubmit.pass,
+            review: _this.attributeModelBool('approve'),
+            type: formData.type
+          };
+        }else{
+          //创建流程参数
+          formData.bpmClientInputModel = {
+            model: {
+              wf_procTitle:  wf_procTitle,
+              wf_nextActDefId: wf_nextActDefId,
+              wf_procDefId: _this.pListData.procDefId,
+              wf_procDefKey: _this.procDefKey,
+              wf_sendUserId: _this.userInfo.userName,
+              wf_sendUserOrgId: _this.userInfo.deptId,
+              wf_receivers: wf_receivers,
+              wf_curActDefName: _this.pListData.actDefName,
+              wf_curActDefId: _this.pListData.actDefId,
+              wf_nextActDefName: wf_nextActDefName,
+            },
+            review: _this.attributeModelBool('approve'),
+            type: formData.type,
+          };
+        }
+        if (_this.$refs.prochild.nextData.actDefType==='endEvent') {
+          //办结
+          formData.recordStatus = 'done'
+        } else {
+          //进行中
+          formData.recordStatus = 'doing'
+        }
+        formData.editStatus = _this.editStatus
+        addApply(formData).then((res) => {
+          if (res.code===200) {
+            _this.$message({
+              message: '流程提交成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+              onClose:()=>{
+                _this.flowStepLoading = false
+                _this.detailLoading = false
+                _this.dialogVisible = false;
+                _this.close();
+              }
+            });
+          }
+        });
+    },
+    handleMonitor() {
+      this.monitorDrawerVisible = true;
+      this.$nextTick(() => {
+        this.$refs.monitorDrawer.init(this.pListData.procInstId);
+      });
+    },
+    handleDelete(dataList,index){
+      dataList.splice(index,1)
+    },
+    /**
+     * 新增上传附件
+     */
+    handleDocAdd() {
+      this.addDocShow = true
+    },
+    getDeptName(items, id) {
+      let label = ''
+      items.forEach(item => {
+        if(item['id'] == id){
+          label = item['label']
+          return
+        }
+      })
+      if(label == ''){
+        items.forEach(item => {
+          if (item.children) {
+            label = this.getDeptName(item.children, id)
+          }
+        })
+      }
+      return label
+    },
+  },
+};
+</script>
diff --git a/src/views/workflowList/processcode/index.vue b/src/views/workflowList/processcode/index.vue
new file mode 100644
index 0000000..548714c
--- /dev/null
+++ b/src/views/workflowList/processcode/index.vue
@@ -0,0 +1,508 @@
+<template>
+  <div class="maincss" v-loading="loading">
+    <div class="title-box">
+      <div class="draw-title">
+        {{ title }}
+      </div>
+      <div class="draw-title">
+      </div>
+      <el-form
+        :model="formSubmit"
+        ref="formSubmit"
+        class="mt10"
+        :rules="formrules"
+        label-position="top"
+        label-width="120px"
+      >
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <div class="h28">办理步骤</div>
+            <el-tree
+              ref="myTree"
+              :data="processList"
+              :props="processProps"
+              node-key="actDefName"
+              @node-click="processNodeClick"
+              style="border: 1px solid rgb(230, 235, 245); height: 314px;overflow: auto"
+              highlight-current
+            >
+            </el-tree>
+          </el-col>
+          <el-col :span="8" v-show="processList&&processList.length>0&&nextData&&nextData.actDefType != 'endEvent'">
+            <div class="h28">待选用户
+<!--              <el-button type="primary" style="float: right" size="mini" @click="handleSelect">通讯录</el-button>-->
+            </div>
+            <div>
+              <el-input
+                v-model.trim="userTreeName"
+                placeholder="请输入"
+                clearable
+                size="small"
+                prefix-icon="el-icon-search"
+              />
+            </div>
+            <el-tree
+              ref="userTree"
+              :data="userList"
+              :props="userProps"
+              :filter-node-method="filterNode"
+              :highlight-current="true"
+              :default-expand-all="true"
+              @node-click="userNodeClick"
+              style="border: 1px solid rgb(230, 235, 245); height: 282px;overflow: auto"
+            >
+            </el-tree>
+          </el-col>
+          <el-col :span="8" v-show="processList&&processList.length>0&&nextData&&nextData.actDefType != 'endEvent'">
+            <div class="h28">已选用户</div>
+            <div
+              class="wordbox"
+              style="border: 1px solid rgb(230, 235, 245); height: 314px;overflow: auto"
+            >
+              <ul>
+                <li v-for="(item, index) in receiveUserList" :key="index">
+                  <div class="inli">
+                    <i class="el-icon-s-custom"></i>
+                    <span>{{ item.name }}</span>
+                    <i v-if="editStatus" class="el-icon-close" @click="removeData(item)"></i>
+                  </div>
+                </li>
+              </ul>
+            </div>
+          </el-col>
+          <el-col :span="24" class="mt10" v-if="istongguo">
+            <el-form-item label="是否通过" prop="pass">
+              <el-radio-group v-model.trim="pass">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="mt10">
+            <el-form-item
+              label="是否加入档案："
+              prop="joinDoc"
+              v-if="formSubmit.actDefId == 'EndEvent_0qwgu4i'"
+            >
+              <el-radio-group v-model.trim="formSubmit.joinDoc">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="isSummary" class="mt10">
+            <el-form-item label="审核意见：">
+              <el-input
+                v-model.trim="formSubmit.summary"
+                type="textarea"
+                placeholder="请输入审核意见"
+                maxlength="200"
+                :autosize="{ minRows: 4, maxRows: 4 }"
+                :style="{ width: '100%' }"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  workflowNextactsNew2,
+  getNextactuserByPending,
+  getNextActUsersByNew,
+  getExtAttributeModel,
+  selectUserStyle
+} from "@/api/my_business/workflow";
+
+export default {
+  props: {
+    searchQuery:{
+      type: Object,
+      default: {},
+    },
+    hideNodeCode: {
+      type: Array,
+      default: ()=>[],
+    },
+    isSummary: {
+      type: Boolean,
+      default: true,
+    },
+    defaultStaff: {
+      type: Object,
+      default: undefined,
+    },
+    pListData: {},
+    data: {},
+    title: {},
+    detatailsData: {},
+    promptContent: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      userInfo: this.$store.getters.userInfo,
+      summary: "",
+      editStatus: true,
+      formSubmit: { summary: "" },
+      processList: [],
+      processProps: {
+        children: "children",
+        label: "actDefName",
+      },
+      userProps: {
+        children: "children",
+        label: function (data, node) {
+          if (data.type == "USER") {
+            return data.id+' '+data.name
+          } else {
+             return data.name
+          }
+        }
+      },
+      formrules: {
+        summary: [{ required: true, message: " ", trigger: "change" }],
+        pass: [{ required: true, message: " ", trigger: "change" }],
+      },
+      userTreeName:undefined,
+      receiveUserList: [],
+      userList: [],
+      loading: true,
+      nextData: {},
+      procDefKey: "",
+      actionType: "",
+      wf_actionType: "",
+      actDefType: "", //actDefType: "endEvent" 判断流程到哪一步了
+      pass: "", //是否通过
+      kuozhanshuju: "",
+      istongguo: false,
+      morendta: undefined,
+    };
+  },
+  created() {
+    this.getOptionsList();
+    console.log("xuanren", this.pListData);
+    if (this.pListData.procDefKey != "") {
+      this.procDefKey = this.pListData.procDefKey;
+    }
+    //this.$emit("yingchanbohui", false);
+  },
+  watch: {
+    actionType: function (val) {
+      this.wf_actionType = val;
+    },
+    "formSubmit.summary": function (val) {
+      this.summary = val;
+      //console.log(val);
+    },
+    pass(val) {
+      console.log(val);
+    },
+    // 根据名称筛选树
+    userTreeName(val) {
+      this.$refs.userTree.filter(val);
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    getOptionsList() {
+      let _this = this
+      let searchQuery = this.searchQuery
+      searchQuery.procDefId = _this.pListData.procDefId
+      if (!!_this.pListData.curActInstId) {
+        searchQuery.curActInstId= _this.pListData.curActInstId
+        // 增加参数：当前环节定义ID【用于步骤已执行标记】
+        searchQuery.curActDefId = _this.pListData.curActDefId
+      }else{
+        searchQuery.curActDefId= _this.pListData.actDefId
+      }
+       // 增加参数：流程实例ID【用于步骤已执行标记】
+       searchQuery.procInstId = _this.pListData.procInstId
+       _this.loading = true
+      workflowNextactsNew2(searchQuery)
+        .then((res) => {
+          _this.processList = res.data.filter(item=>!_this.hideNodeCode.includes(item.actDefId));
+          // 关闭遮罩
+          _this.loading = false
+          // 自动识别是否默认选中第一个步骤
+          if(_this.processList.length > 0) {
+              // 默认选中第一个步骤
+              // 此方法内有打开遮罩和关闭遮罩
+              _this.processNodeClick(_this.processList[0]);
+              _this.actDefType = res.data[0].actDefType;
+              _this.$nextTick(() => {
+                // 步骤清单默认选中第一个步骤
+                _this.$refs.myTree.setCurrentKey(_this.processList[0].actDefName);
+              });
+          }
+        })
+        .catch((e) => {
+          _this.loading = false;
+        });
+    },
+    processNodeClick(val){
+      let _this = this
+      if (!!_this.pListData.curActInstId) {
+        _this.processNodeClick1(val);
+      }else {
+        _this.processNodeClick2(val);
+      }
+    },
+    //流程节点点击触发 带出可选成员
+    processNodeClick1(val) {
+      let _this = this
+      if (this.nextData != "") {
+        if (val.actDefName == this.nextData.actDefName) {
+          return;
+        }
+      }
+      this.nextData = val;
+      this.userList = []; //代选
+      this.receiveUserList = []; //已选
+      let params = {
+        userOrgId: _this.userInfo.deptId,
+        curActInstId: this.pListData.curActInstId,
+        destActDefId: val.actDefId,
+        // 当前环节ID、流程定义ID、流程实例ID
+        curActDefId: this.pListData.curActDefId,
+        procDefKey: this.pListData.procDefKey,
+        procInstId: this.pListData.procInstId,
+      };
+      _this.loading = true
+      getNextactuserByPending(params)
+        .then((res) => {
+          // 获取流程待选人员展示方式
+          _this.loading = true
+          selectUserStyle(params).then((selectRes) => {
+            if(selectRes.data == 'tree') {
+              // 树形结构展示
+              _this.userList = this.handleTree(res.data, "id");
+            } else {
+              // 平铺结构展示
+              _this.userList = res.data.filter(item => item.type==='USER')
+              if (_this.defaultStaff&&_this.defaultStaff.length>0) {
+                let item=_this.defaultStaff.find(item=>item.nodeCode===val.actDefId)
+                if (item&&item.users) {
+                  JSON.parse(item.users).forEach(item=>{
+                    let user = _this.userList.find(user=>user.id===item.userName)
+                    if (!user) {
+                      _this.userList.push({
+                        type: 'USER',
+                        id:item.userName,
+                        realId: item.userName,
+                        parentId: item.deptId,
+                        name: item.nickName,
+                      })
+                    }
+                  })
+                }
+              }
+            }
+            let defaultStaffIds = []
+            if (_this.defaultStaff&&_this.defaultStaff.length>0) {
+              //设定了流程默认执行人
+              let item=_this.defaultStaff.find(item=>item.nodeCode===val.actDefId)
+              if (item&&item.users) {
+                defaultStaffIds = JSON.parse(item.users).map(user=>user.userName)
+              }
+            }
+            if (defaultStaffIds.length>0) {
+              let userList = []
+              _this.defaultUserList(userList,defaultStaffIds,_this.userList)
+              userList.forEach(user=>{
+                _this.userNodeClick(user);
+              })
+              _this.editStatus = true
+            } else {
+              _this.editStatus = true
+              //如果待选人员里就一个人，自动加入到已选人员名单里z
+              this.rtuserList(res.data);
+              if (this.morendta) {
+                this.userNodeClick(this.morendta);
+              }
+            }
+            // 关闭遮挡
+            _this.loading = false;
+          });
+        })
+        .catch((e) => {
+          console.log(e)
+          _this.loading = false;
+        });
+    },
+    processNodeClick2(val) {
+      let _this = this
+      console.log("业务数据====>", this.pListData);
+      if (this.nextData != "") {
+        if (val.actDefName == this.nextData.actDefName) {
+          return;
+        }
+      }
+      this.nextData = val;
+      console.log("nextData", this.nextData);
+      this.userList = []; //代选
+      this.receiveUserList = []; //已选
+      let params = {
+        procDefId:this.pListData.procDefId,
+        userOrgId: this.userInfo.deptId,
+        curActDefId: this.pListData.actDefId,
+        destActDefId: val.actDefId,
+      };
+      _this.loading = true
+      getNextActUsersByNew(params).then((res) => {
+        // 获取流程待选人员展示方式
+        selectUserStyle(params).then((selectRes) => {
+          if(selectRes.data == 'tree') {
+            // 树形结构展示
+            _this.userList = this.handleTree(res.data, "id");
+          } else {
+            // 平铺结构展示
+            _this.userList = res.data.filter(item => item.type==='USER')
+            if (_this.defaultStaff&&_this.defaultStaff.length>0) {
+              let item=_this.defaultStaff.find(item=>item.nodeCode===val.actDefId)
+              if (item&&item.users) {
+                JSON.parse(item.users).forEach(item=>{
+                  let user = _this.userList.find(user=>user.id===item.userName)
+                  if (!user) {
+                    _this.userList.push({
+                      type: 'USER',
+                      id:item.userName,
+                      realId: item.userName,
+                      parentId: item.deptId,
+                      name: item.nickName,
+                    })
+                  }
+                })
+              }
+            }
+          }
+
+          let defaultStaffIds = []
+          if (_this.defaultStaff) {
+            //设定了流程默认执行人
+            let item=_this.defaultStaff.find(item=>item.nodeCode===val.actDefId)
+            if (item&&item.users) {
+              defaultStaffIds = JSON.parse(item.users).map(user=>user.userName)
+            }
+          }
+          if (defaultStaffIds.length>0) {
+            let userList = []
+            _this.defaultUserList(userList,defaultStaffIds,_this.userList)
+            userList.forEach(user=>{
+              this.userNodeClick(user);
+            })
+            _this.editStatus = false
+          } else {
+            _this.editStatus = true
+            //如果待选人员里就一个人，就自己加入到已选人员名单里z
+            this.rtuserList(res.data);
+            if (this.morendta) {
+              this.userNodeClick(this.morendta);
+            }
+          }
+          _this.loading = false
+        });
+
+      })
+        .catch((e) => {
+          this.loading = false;
+        });
+    },
+    //点击成员 导入可选成员
+    userNodeClick(val) {
+      // console.log("val", val);
+      if (val.type == "USER"&&this.editStatus) {
+        if (this.nextData.multi){
+          // 多人处理环节
+          let arr = this.receiveUserList.filter((x) => x.id === val.id);
+          if (arr.length <= 0) {
+            this.receiveUserList.push(val);
+          }
+        }else {
+          // 单人处理环节
+          this.receiveUserList = [val]
+        }
+      }
+    },
+    //移除成员
+    removeData(item) {
+      var arr = [];
+      this.receiveUserList.forEach((element) => {
+        if (element.id != item.id) {
+          arr.push(element);
+        }
+      });
+      this.receiveUserList = arr;
+    },
+    defaultUserList(userList,ids,data) {
+      data.forEach(item=>{
+        if (ids.includes(item.id)) {
+          userList.push(item)
+        }
+      })
+    },
+    rtuserList(originalData) {
+      let userList = originalData.filter(item => item.type==='USER')
+      if (userList.length == 1) {
+          // 若是用户节点直接设置成为已选用户
+          this.morendta = userList[0];
+      } else {
+        this.morendta = undefined
+      }
+    },
+    // 从组织用户结构树中寻找叶子节点，不需要的
+    filterUserNode(data) {
+      if(data.type == "USER") {
+        // 若是用户节点就返回
+        return data
+      } else if(data.hasOwnProperty("children")) {
+        let list = data.children;
+        for(var i=0;i<list.length;i++) {
+          let item = list[i];
+          if(item.type != "USER") {
+           let res = this.filterUserNode(item)
+           if(res != null) {
+             // 返回出方法
+             return res;
+           }
+          } else {
+            // 若是用户节点就返回
+            return item;
+          }
+        }
+      }
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.id.toLowerCase().indexOf(value.toLowerCase()) !== -1||data.name.toLowerCase().indexOf(value.toLowerCase()) !== -1
+    },
+    handleSelect() {
+      let _this = this
+      _this.$nextTick(()=>{
+        _this.$refs.userList.init(null,null,null)
+      })
+    },
+    handleSubmitUser(source,index,user) {
+      let val = {
+        type: 'USER',
+        id: user.userName,
+        name: user.nickName,
+        parentId: user.dept.deptId,
+        realId: user.userName,
+      }
+      this.userNodeClick(val);
+    },
+  },
+};
+</script>
+<style scoped>
+ .h28{
+   height: 28px;line-height: 28px
+ }
+</style>
diff --git a/src/views/workflowList/workflowLogs/index.vue b/src/views/workflowList/workflowLogs/index.vue
new file mode 100644
index 0000000..a61ee69
--- /dev/null
+++ b/src/views/workflowList/workflowLogs/index.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="app-container document_changeindex el-card is-always-shadow">
+    <el-card class="gray-card" style="width: 60%">
+      <el-table v-loading="loading" :data="dataList">
+        <el-table-column label="环节" align="left" prop="actDefName" width="200px"/>
+        <el-table-column label="意见" align="left" prop="opinion" >
+          <template slot-scope="scope">
+            <span :style="{color:passList[scope.row.pass].color}">{{ passList[scope.row.pass].label }}</span><br/>
+            <span>{{ scope.row.opinion }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作信息" align="left" prop="createTime" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.deptName }}</span>
+            <span style="margin-left:10px;">{{ scope.row.nickName }}</span>
+            <span style="margin-left:20px;color:#AAAAAA">{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { selectLogByProcInstId } from "@/api/my_business/workflow";
+
+export default {
+  name: "WorkflowLogs",
+  props: ["procInstId"],
+  data() {
+    return {
+      loading: true,
+      dataList: [],
+      passList: { 'true':{label:'通过',color:'#70B603'},'false':{label:'不通过',color:'#D9001B'}},
+    };
+  },
+  watch: {
+    procInstId (val) {
+      if (val) {
+        this.getList(val)
+      }
+    },
+  },
+  mounted() {
+    if (this.procInstId) {
+      this.getList(this.procInstId)
+    }
+  },
+  methods: {
+    /** 查询岗位列表 */
+    getList(procInstId) {
+      this.loading = true;
+      selectLogByProcInstId({procInstId:procInstId,review:true}).then(response => {
+        this.dataList = response.data;
+        this.loading = false;
+      });
+    },
+  }
+};
+</script>
diff --git a/src/views/workflowList/workflowRouter.vue b/src/views/workflowList/workflowRouter.vue
new file mode 100644
index 0000000..3a94cca
--- /dev/null
+++ b/src/views/workflowList/workflowRouter.vue
@@ -0,0 +1,51 @@
+<template>
+  <main-component ref="mainComponent" :code="code" :data="data"  @close="handleCloseChange"></main-component>
+</template>
+
+<script>
+import MainComponent from "@/components/mainComponent/index.vue";
+export default {
+  name: "workflowRouter",
+  dicts: [],
+  components: {
+    MainComponent,
+  },
+  data() {
+    return {
+      path: 'views/workflowList/addWorkflow/',
+      code: '',
+      data: undefined,
+      status: true,
+    }
+  },
+  created() {
+    this.$nextTick(()=>{
+      this.handleDetails(this.$route.query);
+    })
+  },
+  methods: {
+    /** 详情按钮操作 */
+    handleDetails(row) {
+      let _this = this
+      if (row.type&&_this.status) {
+        _this.code = _this.path + row.type
+        _this.data = row
+      }
+    },
+    init(row){
+      let _this = this
+      _this.code = _this.path + row.type
+      _this.data = row
+      _this.status = false
+    },
+    handleCloseChange() {
+      let _this = this
+      if (_this.status) {
+        window.parent.postMessage({type:"close"})
+      }else{
+        _this.$emit("closeDrawer")
+      }
+    }
+  },
+};
+</script>
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index e246a98..9443586 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -1,542 +1,277 @@
 <template>
   <div class="app-container"><!--从这一层开始嵌入页面-->
-
     <el-card>
       <el-form label-width="80px">
         <div class="search">
           <el-form-item label="流程标题">
-            <el-input placeholder="输入流程标题"></el-input>
+            <el-input placeholder="输入流程标题" v-model.trim="queryParams.title"></el-input>
           </el-form-item>
-          <el-button type="primary" icon="el-icon-search">搜索</el-button>
-          <el-button icon="el-icon-refresh-left">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
         </div><!--search 搜索-->
       </el-form><!--el-form-->
     </el-card><!--el-card-->
-
     <el-card>
-      <el-tabs v-model="activeName3"  @tab-click="handleClick">
-        <el-tab-pane label="待办(4)" name="first">
-          <el-table :data="tableData5" style="width: 100%" height="529">
-            <el-table-column prop="prop1" label="流程类型"></el-table-column>
-            <el-table-column prop="prop2" label="流程标题">【使用申请】工具名称11</el-table-column>
-            <el-table-column prop="prop3" label="当前环节"></el-table-column>
-            <el-table-column prop="prop4" label="上一环节"></el-table-column>
-            <el-table-column prop="prop5" label="上一环节处理人"></el-table-column>
-            <el-table-column prop="prop6" label="发起人"></el-table-column>
-            <el-table-column prop="prop7" label="接收时间"></el-table-column>
-            <el-table-column label="操作" width="100" >
-              <el-button type="text" icon="el-icon-info" @click="drawer1 = true">详情</el-button>
-            </el-table-column>
-          </el-table><!--el-table-->
-          <el-pagination  :current-page="currentPage4" :page-sizes="[100, 200, 300, 400]" :page-size="100" layout="total, sizes, prev, pager, next, jumper" :total="400"></el-pagination>
-        </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="已办(10)" name="second">
-          <el-table :data="tableData6" style="width: 100%" height="529">
-            <el-table-column prop="prop1" label="流程类型"></el-table-column>
-            <el-table-column prop="prop2" label="流程标题"><a>【使用申请】工具名称1</a></el-table-column>
-            <el-table-column prop="prop8" label="流程状态">
+      <el-tabs v-model="activeName"  @tab-click="state">
+        <el-tab-pane :label="'待办('+ statustotal+')'" name="taskToDo">
+          <el-table :data="postList" style="width: 100%" height="529">
+            <el-table-column prop="procDefName" label="流程类型"></el-table-column>
+            <el-table-column prop="title" label="流程标题"></el-table-column>
+            <el-table-column prop="curActDefName" label="当前环节"></el-table-column>
+            <el-table-column prop="prevActDefName" label="上一环节"></el-table-column>
+            <el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
+            <el-table-column prop="startUserName" label="发起人"></el-table-column>
+            <el-table-column prop="sendTime" label="接收时间">
               <template slot-scope="scope">
-                <span :class="getClassName(scope.row.prop8)">{{ scope.row.prop8 }}</span>
+                <span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="prop3" label="处理环节"></el-table-column>
-            <el-table-column prop="prop4" label="上一环节"></el-table-column>
-            <el-table-column prop="prop5" label="上一环节处理人"></el-table-column>
-            <el-table-column prop="prop6" label="发起人"></el-table-column>
-            <el-table-column prop="prop7" label="接收时间"></el-table-column>
             <el-table-column label="操作" width="100" >
-              <el-button type="text" icon="el-icon-info" @click="drawer1 = true">详情</el-button>
-            </el-table-column>
-          </el-table><!--el-table-->
-          <el-pagination  :current-page="currentPage4" :page-sizes="[100, 200, 300, 400]" :page-size="100" layout="total, sizes, prev, pager, next, jumper" :total="400"></el-pagination>
-        </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="办结(10)" name="third">
-          <el-table :data="tableData7" style="width: 100%" height="529">
-            <el-table-column prop="prop1" label="流程类型"></el-table-column>
-            <el-table-column prop="prop2" label="流程标题">【使用申请】工具名称1</el-table-column>
-            <el-table-column label="流程状态">
               <template slot-scope="scope">
-                <span :class="getClassName(scope.row.prop3)">{{ scope.row.prop3 }}</span>
+                <el-button type="text" icon="el-icon-info" @click="handleDeal(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table><!--el-table-->
+          <el-pagination @current-change="getListData" v-show="total > 0"  :current-page="queryParams.pageNumber" :page-sizes="pageSizes" :page-size="queryParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+        </el-tab-pane><!--el-tab-pane-->
+        <el-tab-pane :label="'已办('+doneTotal+')'" name="taskDealed">
+          <el-table :data="postList" style="width: 100%" height="529">
+            <el-table-column prop="procDefName" label="流程类型"></el-table-column>
+            <el-table-column prop="title" label="流程标题"></el-table-column>
+            <el-table-column prop="curActDefName" label="处理环节"></el-table-column>
+            <el-table-column prop="prevActDefName" label="上一环节"></el-table-column>
+            <el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
+            <el-table-column prop="startUserName" label="发起人"></el-table-column>
+            <el-table-column prop="sendTime" label="接收时间">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="prop4" label="发起人"></el-table-column>
-            <el-table-column prop="prop5" label="发起时间"></el-table-column>
-            <el-table-column prop="prop6" label="接收时间"></el-table-column>
             <el-table-column label="操作" width="100" >
-              <el-button type="text" icon="el-icon-info" @click="drawer1 = true">详情</el-button>
+              <template slot-scope="scope">
+                <el-button type="text" icon="el-icon-info" @click="handleDeal(scope.row)">详情</el-button>
+              </template>
             </el-table-column>
           </el-table><!--el-table-->
-          <el-pagination  :current-page="currentPage4" :page-sizes="[100, 200, 300, 400]" :page-size="100" layout="total, sizes, prev, pager, next, jumper" :total="400"></el-pagination>
+          <el-pagination @current-change="getListData" v-show="total > 0"  :current-page="queryParams.pageNumber" :page-sizes="pageSizes" :page-size="queryParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+        </el-tab-pane><!--el-tab-pane-->
+        <el-tab-pane :label="'办结('+finishedTotal+')'" name="taskFinish">
+          <el-table :data="postList" style="width: 100%" height="529">
+            <el-table-column prop="procDefName" label="流程类型"></el-table-column>
+            <el-table-column prop="title" label="流程标题"></el-table-column>
+            <el-table-column prop="startUserName" label="发起人"></el-table-column>
+            <el-table-column prop="startTime" label="发起时间">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.startTime,'{y}-{m}-{d}')}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="sendTime" label="接收时间">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100" >
+              <template slot-scope="scope">
+                <el-button type="text" icon="el-icon-info" @click="handleDeal(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table><!--el-table-->
+          <el-pagination @current-change="getListData" v-show="total > 0"  :current-page="queryParams.pageNumber" :page-sizes="pageSizes" :page-size="queryParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
         </el-tab-pane><!--el-tab-pane-->
       </el-tabs><!--el-tabs-->
-    </el-card><!--el-card-->
-
-    <el-drawer :visible.sync="drawer1" :direction="direction" :before-close="handleClose" size="75%">
-      <template #title>
-        <span>申请使用</span>
-        <div class="drawer-head-btn">
-          <el-button  @click="drawer2 = true">流程监控</el-button>
-          <el-button type="primary" v-if="activeName3 == 'first'">提交</el-button>
-          <el-button>取消</el-button>
-        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
-      </template>
-      <el-tabs v-model="activeName1"  @tab-click="handleClick">
-        <el-tab-pane label="信息内容" name="first">
-          <div class="el-form-border">
-            <el-form ref="form" label-width="150px">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="申请人">张莹</el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="申请部门">信息部</el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="申请理由">
-                    <el-input type="textarea"  maxlength="1000" placeholder="工作需要额外申请，请批准！" :disabled="true"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form><!--el-form-->
-          </div><!--el-form-border 表单-->
-          <div class="divide double"></div><!--divide 分隔-->
-          <div class="tboper">
-            <div class="tit">申请工具</div>
-          </div><!--tboper 标题与操作按钮-->
-          <el-table :data="tableData2" style="width: 100%">
-            <el-table-column prop="prop1"  label="工具编号"></el-table-column>
-            <el-table-column prop="prop2" label="工具名称"></el-table-column>
-            <el-table-column prop="prop5" label="工具类别"  ></el-table-column>
-            <el-table-column prop="prop3" label="归属单位"> </el-table-column>
-            <el-table-column prop="prop4" label="负责人"></el-table-column>
-          </el-table><!--el-table-->
-          <div class="divide double"></div><!--divide 分隔-->
-          <div class="tboper" v-if="activeName3 == 'first'">
-            <div class="tit">审批信息</div>
-          </div><!--tboper 标题与操作按钮-->
-          <div class="el-form-border" v-if="activeName3 == 'first'">
-            <el-form ref="form" label-width="150px">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="审批结论">
-                    <el-radio-group v-model="radio1">
-                      <el-radio label="1">通过</el-radio>
-                      <el-radio label="2" >不通过</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="审批理由">
-                    <el-input type="textarea" rows="4"  maxlength="1000" placeholder="请输入" show-word-limit></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form><!--el-form-->
-          </div><!--el-form-border 表单-->
-        </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="审批记录" name="second">
-          <el-table :data="tableData4" style="width: 100%">
-            <el-table-column prop="prop4" label="处理人"></el-table-column>
-            <el-table-column prop="prop3" label="处理环节"> </el-table-column>
-            <el-table-column prop="prop2" label="接收人"></el-table-column>
-            <el-table-column prop="prop1"  label="接收环节"></el-table-column>
-            <el-table-column prop="prop7" label="处理时间" ></el-table-column>
-            <el-table-column prop="prop5" label="审批意见" ></el-table-column>
-          </el-table><!--el-table-->
-        </el-tab-pane><!--el-tab-pane-->
-      </el-tabs><!--el-tabs-->
-    </el-drawer><!--el-drawer 申请详情-抽屉-->
-
-    <el-drawer :visible.sync="drawer2" :direction="direction" :before-close="handleClose" size="75%">
-      <template #title>
-        <span>流程监控</span>
-      </template>
-      <div class="lctitle">流程标题：【申请使用】工具名称1 ，流程定义名称：申请使用流程</div><!--lctitle-->
-      <img style="width:auto; max-width: 100%;" src="../../../../public/images/lcjk1.jpg" />
-    </el-drawer><!--el-drawer 流程监控-抽屉-->
-  </div><!--app-container-->
+    </el-card>
+    <!-- 流程处理抽屉组件 -->
+    <DealDrawer v-if="dealDrawerShow" ref="dealDrawer" @closeDrawer="handleCloseChange"></DealDrawer>
+  </div>
 </template>
 
 <script>
-  export default {
-    name: 'dispose',
-    data() {
-      return {
-        drawer1: false,
-        drawer2: false,
-        activeName1: 'first',
-        activeName2: 'second',
-        activeName3: 'first',
-        radio1: '1',
-        tableData1: [
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          }
-        ],
-        tableData2: [
-          {
-            prop1: '0021',
-            prop2: '工具名称1',
-            prop3: '人力资源部/培训组',
-            prop4: '赵宇',
-            prop5: '网络工具',
-          },
-          {
-            prop1: '0022',
-            prop2: '工具名称2',
-            prop3: '人力资源部/招聘组',
-            prop4: '钱多多',
-            prop5: '网络工具',
-          },
-          {
-            prop1: '0023',
-            prop2: '工具名称3',
-            prop3: '人力资源部/薪资组',
-            prop4: '孙瑶',
-            prop5: '网络工具',
-          }
-        ],
-        tableData3: [
-          {
-            prop1: '总监批准',
-            prop2: '不通过',
-            prop3: '赵宇 ',
-            prop4: '总裁办',
-            prop5: '2024/02/09 12:00',
-          },
-          {
-            prop1: '部门领导审核',
-            prop2: '通过',
-            prop3: '钱多多',
-            prop4: '设备部',
-            prop5: '2024/02/09 12:00',
-          },
-          {
-            prop1: '管理员审核',
-            prop2: '通过',
-            prop3: '孙瑶',
-            prop4: '人力资源部',
-            prop5: '2024/02/09 12:00',
-          }
-        ],
-        tableData4: [
-          {
-            prop1: '部门领导审核',
-            prop2: '张宇',
-            prop3: '管理员审核 ',
-            prop4: '赵定',
-            prop5: '同意',
-            prop6: '2024/02/09 12:00',
-            prop7: '2024/02/09 12:03',
-            prop8: '耗时0天',
-            prop9: '已完成',
-          },
-          {
-            prop1: '管理员审核',
-            prop2: '赵定',
-            prop3: '直接领导审核 ',
-            prop4: '钱多多',
-            prop5: '同意',
-            prop6: '2024/02/09 12:00',
-            prop7: '2024/02/09 12:03',
-            prop8: '耗时0天',
-            prop9: '已完成',
-          }
-        ],
-        tableData5: [
-          {
-            prop1: '使用申请',
-            prop3: '部门经理审核',
-            prop4: '直接领导审核',
-            prop5: '张鑫辉',
-            prop6: '张慧玉',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '管理员审核',
-            prop4: '总监审核',
-            prop5: '柳青',
-            prop6: '刘青',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '总经理审核',
-            prop4: '直接领导审核',
-            prop5: '张庆幸',
-            prop6: '王慧',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '总监审核',
-            prop4: '部门经理审核',
-            prop5: '刘宁',
-            prop6: '赵媛',
-            prop7: '2022/10/10  12:00',
-          }
-        ],
-        tableData6: [
-          {
-            prop1: '使用申请',
-            prop8: '通过',
-            prop3: '部门经理审核',
-            prop4: '直接领导审核',
-            prop5: '张鑫辉',
-            prop6: '张慧玉',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '通过',
-            prop3: '管理员审核',
-            prop4: '总监审核',
-            prop5: '柳青',
-            prop6: '刘青',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '通过',
-            prop3: '总经理审核',
-            prop4: '直接领导审核',
-            prop5: '张庆幸',
-            prop6: '王慧',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '通过',
-            prop3: '总监审核',
-            prop4: '部门经理审核',
-            prop5: '刘宁',
-            prop6: '赵媛',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '不通过',
-            prop3: '部门经理审核',
-            prop4: '直接领导审核',
-            prop5: '张鑫辉',
-            prop6: '张慧玉',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '通过',
-            prop3: '管理员审核',
-            prop4: '总监审核',
-            prop5: '柳青',
-            prop6: '刘青',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '不通过',
-            prop3: '总经理审核',
-            prop4: '直接领导审核',
-            prop5: '张庆幸',
-            prop6: '王慧',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '通过',
-            prop3: '总监审核',
-            prop4: '部门经理审核',
-            prop5: '刘宁',
-            prop6: '赵媛',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '通过',
-            prop3: '部门经理审核',
-            prop4: '直接领导审核',
-            prop5: '张鑫辉',
-            prop6: '张慧玉',
-            prop7: '2022/10/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop8: '通过',
-            prop3: '管理员审核',
-            prop4: '总监审核',
-            prop5: '柳青',
-            prop6: '刘青',
-            prop7: '2022/10/10  12:00',
-          },
-        ],
-        tableData7: [
-          {
-            prop1: '使用申请',
-            prop3: '通过',
-            prop4: '张鑫辉',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '不通过',
-            prop4: '柳青',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '通过',
-            prop4: '张庆幸',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '通过',
-            prop4: '刘宁',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '不通过',
-            prop4: '张鑫辉',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '通过',
-            prop4: '柳青',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '通过',
-            prop4: '张庆幸',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '通过',
-            prop4: '刘宁',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '通过',
-            prop4: '张鑫辉',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop3: '通过',
-            prop4: '柳青',
-            prop5: '2024/02/08  07:00',
-            prop6: '2024/02/10  12:00',
-          },
-        ],
-      }
-    },
-    methods: {
-      getClassName(prop2) {
-        // 根据不同的文本内容返回不同的类名
-        if (prop2 === '进行中') {
-          return 'blue';
-        } else if (prop2 === '已办结') {
-          return 'green';
-        }else if (prop2 === '不通过') {
-          return 'red';
-        } else if (prop2 === '通过') {
-          return 'green';
-        }
+import { workflowToDoList } from "@/api/my_business/workflow";
+import DealDrawer from "@/components/DealDrawer";
+export default {
+  name: "Post",
+  dicts: ["sys_normal_disable", "sys_operterType"],
+  components: {
+    DealDrawer
+  },
+  data() {
+    return {
+      pageSizes: [10,20,50,100],
+      dealDrawerShow: false,
+      boxClass: false,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      postList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNumber: 1,
+        pageSize: 10,
+        title: "",
+        status: 1,
       },
-    }
-  }
+      // 表单校验
+      rules: {
+        postName: [
+          {
+            required: true,
+            message: "不能为空",
+            trigger: "blur",
+          },
+        ],
+        postCode: [
+          {
+            required: true,
+            message: "不能为空",
+            trigger: "blur",
+          },
+        ],
+        postSort: [
+          {
+            required: true,
+            message: "不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      doneTotal: 0,
+      finishedTotal: 0,
+      taskData: [], // 任务数据
+      deptOptions: [],
+      drawer: false,
+      taskFormData: {},
+      varChangeColor1: true,
+      varChangeColor2: false,
+      pListData: {},
+      statustotal: "",
+      adUpdateDisuseDetails: "",
+      userInfo: this.$store.getters.userInfo,
+      activeName: "taskToDo",
+      classLevelOptions: [],
+    };
+  },
+  created() {
+    // 初始化获取待办清单
+    this.getListData()
+    // 获取已办、办结统计页签数量
+    this.getOtherActiveCount()
+  },
+  methods: {
+    // 流程处理事件
+    handleDeal(row) {
+      this.dealDrawerShow = true;
+      let flowUrl = this.buildFlowUrl(row)
+      // alert(flowUrl)
+      //window.open(flowUrl)
+      /*   */
+      this.$nextTick(() => {
+        this.$refs.dealDrawer.init(flowUrl);
+      });
+
+      //
+    },
+    buildFlowUrl(row) {
+      let res = row.url;
+      //待办=1、已办=2、办结=3
+      res += "&invokeFrom=list&status="+row.status
+      return res;
+    },
+    getOtherActiveCount() {
+      // 获取已办统计数量
+      this.loading = true
+      let params = {
+        pageNumber: 1,
+        pageSize: 10,
+        status: 2,
+      };
+      workflowToDoList(params).then((response) => {
+        this.doneTotal = response.data.totalCount || 0;
+        this.loading = false
+      });
+      // 获取办结统计数量
+      this.loading = true
+      let params2 = {
+        pageNumber: 1,
+        pageSize: 10,
+        status: 3,
+      };
+      workflowToDoList(params2).then((response) => {
+        this.finishedTotal = response.data.totalCount || 0;
+        this.loading = false
+      });
+    },
+    /** 查询列表 */
+    getListData() {
+      this.loading = true;
+      this.postList = [];
+      workflowToDoList(this.queryParams).then((response) => {
+        if (this.activeName == "taskToDo") {
+          // 待办
+          this.statustotal = response.data.totalCount;
+          // this.$store.commit("SET_THINGNUMBER", response.data.totalCount || 0);
+          this.total = response.data.totalCount;
+        }
+        if (this.activeName == "taskDealed") {
+          // 已办
+          this.doneTotal = response.data.totalCount;
+          this.total = response.data.totalCount;
+        }
+        if (this.activeName == "taskFinish") {
+          // 办结
+          this.finishedTotal = response.data.totalCount;
+          this.total = response.data.totalCount;
+        }
+
+        this.postList = response.data.result;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    handleCloseChange() {
+      this.dealDrawerShow = false
+      this.getListData();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNumber = 1;
+      this.getListData();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.pageNumber = 1;
+      this.queryParams.pageSize = 10;
+      this.queryParams.title = "";
+      this.handleQuery();
+    },
+    /** 详情按钮操作 */
+    handleDetails(row) {
+
+    },
+    state(tab) {
+      let p = Number(tab.index) + 1;
+      if (p == 1) {
+        this.varChangeColor1 = true;
+        this.varChangeColor2 = false;
+      }
+      if (p == 2 || p == 3) {
+        this.varChangeColor1 = false;
+        this.varChangeColor2 = true;
+      }
+      this.queryParams.status = p;
+      this.queryParams.pageNumber = 1;
+      this.queryParams.title = "";
+      this.total = 0;
+      this.getListData();
+      // this.getshulian();
+    },
+  },
+};
 </script>
-
-<style scoped>
-
-</style>
-- 
2.35.1.windows.2


From 12caaecf88c7149fd492faa4ac5cdf0c0c03ec1d Mon Sep 17 00:00:00 2001
From: liukang <lukg6892>
Date: Tue, 27 Aug 2024 18:18:10 +0800
Subject: [PATCH 03/55] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E4=BD=BF=E7=94=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   8 +-
 .../user-selector/src/user-selector.vue       |  19 +-
 src/store/getters.js                          |   1 +
 src/views/tool/index.vue                      | 337 +++---------------
 .../workflowList/addWorkflow/tool_release.vue | 108 +++---
 .../workflowList/addWorkflow/use_apply.vue    |  62 ++--
 6 files changed, 159 insertions(+), 376 deletions(-)

diff --git a/.env.development b/.env.development
index a145863..d511e49 100644
--- a/.env.development
+++ b/.env.development
@@ -7,14 +7,14 @@ ENV = 'development'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.2.85:8080/tool-tech-admin'
-VUE_APP_WS_URL = 'ws://192.168.2.85:8080/tool-tech-admin/websocket'
+VUE_APP_BASE_API = 'http://localhost:8080/tool-tech-admin'
+VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://192.168.1.2:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
 
 # 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.1.2:8080/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.2.20:8085/ebpm-process-manage'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/components/user-selector/src/user-selector.vue b/src/components/user-selector/src/user-selector.vue
index fb33469..4e45aa7 100644
--- a/src/components/user-selector/src/user-selector.vue
+++ b/src/components/user-selector/src/user-selector.vue
@@ -276,15 +276,16 @@
         return result;
       },
       submitForm() {
-        let checkedUserArr = []
-        let checkedUser = {}
-        this.checkedUsers.forEach(userName => {
-          checkedUser['userName'] = userName
-          checkedUser['userId'] = this.getUserIdByUserName(userName)
-          checkedUser['nickName'] = this.getNickNameByUserName(userName)
-          checkedUserArr.push(checkedUser)
-        })
-        this.$emit("submit", checkedUserArr); //返回username和nickname
+        // let checkedUserArr = []
+        // let checkedUser = {}
+        // this.checkedUsers.forEach(userName => {
+        //   checkedUser['userName'] = userName
+        //   checkedUser['userId'] = this.getUserIdByUserName(userName)
+        //   checkedUser['nickName'] = this.getNickNameByUserName(userName)
+        //   checkedUserArr.push(checkedUser)
+        // })
+        // this.$emit("submit", checkedUserArr); //返回username和nickname
+        this.$emit("submit", JSON.parse(JSON.stringify(this.selectedUserList)));
       },
       cancel() {
         this.$emit('cancel');
diff --git a/src/store/getters.js b/src/store/getters.js
index f7f6256..667e425 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -7,6 +7,7 @@ const getters = {
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,
   avatar: state => state.user.avatar,
+  userId: state => state.user.id,
   userInfo: state => state.user.info,
   name: state => state.user.name,
   nickName: state => state.user.nickName,
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index cb2899f..a0ffacb 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -89,13 +89,11 @@
             @click="handleAdd"
             v-hasPermi="['system:user:add']"
           >工具发布</el-button>
-          <!-- <el-button type="primary" icon="el-icon-position">发布</el-button> -->
-          <!-- <el-button icon="el-icon-thumb" @click="applyUse()">申请使用</el-button> -->
-          <el-button icon="el-icon-delete">批量删除</el-button>
+          <el-button icon="el-icon-delete" @click="handleDelete(selection)">批量删除</el-button>
           <el-button icon="el-icon-download" @click="exoportDrawerOpen = true">导出</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column type="selection" width="50" align="center" :selectable="selectable"/>
           <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" v-if="columns[0].visible" />
           <el-table-column label="工具名称" align="center" key="toolName" prop="toolName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="工具类别" align="center" key="toolType" prop="toolType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
@@ -125,16 +123,14 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
-              <el-button type="text" icon="el-icon-info" @click="applyUse(scope.row)">申请使用</el-button>
+              <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus==='done'" @click="applyUse(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
-              <el-button type="text" icon="el-icon-download">下载</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['tool:edit', 'tool:remove']">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+              <el-button type="text" icon="el-icon-download" v-if="scope.row.recordStatus==='done'">下载</el-button>
+              <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right" >更多</el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleUpdate" icon="el-icon-edit"
-                                    v-hasPermi="['tool:edit']">编辑</el-dropdown-item>
-                  <el-dropdown-item command="handleDelete" icon="el-icon-delete"
-                                    v-hasPermi="['tool:remove']">删除</el-dropdown-item>
+                  <el-dropdown-item command="handleUpdate" icon="el-icon-edit">编辑</el-dropdown-item>
+                  <el-dropdown-item command="handleDelete" icon="el-icon-delete">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -150,164 +146,6 @@
       </div><!--rt 右-->
     </el-card><!--el-card-->
 
-    <!-- 添加或修改工具信息对话框 -->
-    <el-drawer :visible.sync="addDrawerOpen" size="75%" @open="openEvent">
-      <template #title>
-        <span>新增工具</span>
-        <div class="drawer-head-btn">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
-      </template>
-      <div class="el-form-border">
-        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-          <div>
-            <div class="box-title">
-              基本信息
-            </div>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="工具编号" prop="toolCode">
-                  <el-input v-model="form.toolCode" placeholder="请输入工具编号"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="工具名称" prop="toolName">
-                  <el-input v-model="form.toolName" placeholder="请输入工具名称"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="负责人" prop="toolPrincipals">
-                  <el-input v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11" @focus="toolPrincipalsChoose = true"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="归属部门" prop="toolRespDept">
-                  <treeselect v-model="form.toolRespDept" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="工具来源" prop="toolSource">
-                  <el-input v-model="form.toolSource" placeholder="请输入工具来源"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="工具用途" prop="toolUse">
-                  <el-input v-model="form.toolUse" placeholder="请输入工具用途" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="工具类别">
-                  <el-select v-model="form.toolType" placeholder="请选择工具类别" style="width: 100%">
-                    <el-option
-                      v-for="dict in dict.type.tool_type"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="状态">
-                  <el-radio-group v-model="form.status">
-                    <el-radio
-                      v-for="dict in dict.type.sys_normal_disable"
-                      :key="dict.value"
-                      :label="dict.value"
-                    >{{dict.label}}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="测试情况">
-                  <el-input v-model="form.testSituation" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="功能描述">
-                  <el-input v-model="form.functionDesc" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="适用条件">
-                  <el-input v-model="form.applyCondition" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="操作说明">
-                  <el-input v-model="form.operateExplain" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="备注">
-                  <el-input v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-          <div>
-            <div class="box-title">
-              关联附件
-            </div>
-            <div class="operate">
-              <el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
-              <el-button icon="el-icon-delete">删除</el-button>
-            </div><!--operate 操作按钮-->
-            <el-table :data="docList" style="width: 100%">
-              <el-table-column type="selection" width="50" align="center"> </el-table-column>
-              <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-              <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
-              <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
-              <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
-              <el-table-column label="来源" prop="docSource" width="100" />
-              <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-                <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" width="180">
-                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-view"
-                    @click="handlePriew(scope.row)"
-                  >预览</el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="handleDelete(scope.row)"
-                  >删除</el-button>
-                  <el-button type="text" icon="el-icon-download">下载</el-button>
-                </template>
-              </el-table-column>
-            </el-table><!--el-table-->
-          </div>
-        </el-form>
-        <!-- 上传 -->
-        <AddDoc :show.sync="addDocShow" toolId="1111" @callback="openEvent"/>
-      </div><!--el-form-border 表单-->
-    </el-drawer><!--el-drawer 新增抽屉-->
-
     <!-- 工具申请使用对话框 -->
     <el-drawer :visible.sync="applyDrawerOpen" size="75%">
       <template #title>
@@ -408,18 +246,15 @@
       <tool-detail ref="toolDetailRef" :toolDetail="toolDetail"/>
     </el-drawer><!--el-drawer 详情-抽屉-->
 
-    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
   </div><!--app-container-->
 </template>
 
 <script>
-  import { listDocument } from "@/api/document/document";
   import { listTool, getTool, delTool, addTool, updateTool } from "@/api/tool/tool";
   import { deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { Base64 } from 'js-base64'
 import Treeselect from "@riophae/vue-treeselect";
-import blUserSelector from "@/components/user-selector/src/user-selector";
 import toolDetail from "./toolDetail";
 import AddDoc from './AddDoc'
 import mainComponent from "@/components/mainComponent/index.vue";
@@ -427,9 +262,10 @@ import mainComponent from "@/components/mainComponent/index.vue";
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'tool_type'],
-  components: { Treeselect, blUserSelector, toolDetail, AddDoc,mainComponent },
+  components: { Treeselect, toolDetail, AddDoc,mainComponent },
   data() {
     return {
+      userInfo: this.$store.getters.userInfo,
       drawerShow: false,
       path: 'views/workflowList/addWorkflow/',
       code: '',
@@ -444,6 +280,7 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      selection: undefined,
       toolPrincipalsChoose: false,
       // 总条数
       total: 0,
@@ -500,7 +337,8 @@ export default {
         pageSize: 10,
         toolCode: undefined,
         toolName: undefined,
-        status: undefined
+        status: undefined,
+        createBy: this.$store.getters.userId
       },
       // 列信息
       columns: [
@@ -512,33 +350,8 @@ export default {
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
-      // 表单校验
-      rules: {
-        toolCode: [
-          { required: true, message: "工具编号不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '工具编号长度必须介于 2 和 30 之间', trigger: 'blur' }
-        ],
-        toolName: [
-          { required: true, message: "工具名称不能为空", trigger: "blur" },
-          { max: 50, message: '工具名称不能超过50个字', trigger: 'blur' }
-        ],
-        toolPrincipals: [
-          { required: true, message: "负责人不能为空", trigger: "blur" }
-        ],
-        toolSource: [
-          { max: 50, message: '工具来源不能超过50个字', trigger: 'blur' }
-        ],
-        toolUse: [
-          { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
-        ]
-      },
       // 新增时的关联附件
       docList: [],
-      docQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        toolId: ''
-      },
       addDocShow: false,
       viewDialogOpen: false,
       viewDialogTitle: '',
@@ -572,12 +385,6 @@ export default {
     },
     handleClick(){
 
-    },
-    submitPeople(peopleList){
-      console.log(peopleList);
-      this.form.toolPrincipals = peopleList[0]['userId']
-      this.form.toolPrincipalsName = peopleList[0]['nickName']
-      this.toolPrincipalsChoose = false;
     },
     /** 查询用户列表 */
     getList() {
@@ -647,7 +454,7 @@ export default {
     /**=============================申请使用Start================================*/
     applyUse(row){
       let _this = this
-      _this.handleOpen({...row,type:'use_apply'})
+      _this.handleOpen({...row,type:'use_apply',procInstId:undefined})
     },
     submitApply(){
 
@@ -671,9 +478,10 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
+      this.selection=selection
+      // this.ids = selection.map(item => item.userId);
+      // this.single = selection.length != 1;
+      // this.multiple = !selection.length;
     },
     handleDetail(row){
       this.detailDrawerOpen = true
@@ -686,7 +494,7 @@ export default {
           this.handleUpdate(row);
           break;
         case "handleDelete":
-          this.handleDelete(row);
+          this.handleDelete([{...row}]);
           break;
         default:
           break;
@@ -694,14 +502,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      // this.reset();
-      // getTool().then(response => {
-      //   this.postOptions = response.posts;
-      //   this.roleOptions = response.roles;
-      //   this.addDrawerOpen = true;
-      //   this.title = "添加工具";
-      //   this.form.password = this.initPassword;
-      // });
       let _this = this
       _this.handleOpen({type:'tool_release'})
     },
@@ -713,61 +513,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const toolId = row.toolId || this.ids;
-      getTool(toolId).then(response => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.addDrawerOpen = true;
-        this.title = "修改工具";
-        this.form.password = "";
-      });
+      let _this = this
+      _this.handleOpen({type:'tool_release',procInstId:row.procInstId,status:'1'})
     },
     /** 发布按钮操作 */
     handlePublish(row) {
     },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateTool(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.addDrawerOpen = false;
-              this.getList();
-            });
-          } else {
-            addTool(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.addDrawerOpen = false;
-              this.getList();
-            }).catch((e) => {
-              if (e.response.data.code === 400001001) {
-                let deptName = this.getDeptName(this.deptOptions, this.form.toolRespDept)
-                this.$alert('<strong>' + deptName + '</strong> 下已存在编号为 <strong>' + this.form.toolCode + '</strong> 的工具，请勿重复添加！', '提示', {
-                  dangerouslyUseHTMLString: true,
-                  confirmButtonText: '确定',
-                  callback: action => { }
-                })
-              }
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const toolIds = row.toolId || this.ids;
-      this.$modal.confirm('是否确认删除？').then(function() {
-        return delTool(toolIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/user/export', {
@@ -793,21 +544,41 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     },
-    /**
-     * 打开新增页面的回调事件
-     */
-    openEvent() {
-      this.loading = true
-      this.docQueryParams.toolId = '1111'
-      listDocument(this.queryParams).then(response => {
-          this.docList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
     handleClose(){
       this.drawerShow = false
+      this.getList();
+    },
+    handleDelete(list){
+      let _this = this
+      if (!list||list.length<1) {
+        return
+      }
+      _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+        .then(async() => {
+          _this.loading = true
+          for (let row of list) {
+            let formData = {
+              toolId: row.toolId,
+              bpmClientInputModel: {
+                model: {
+                  wf_procInstId: row.procInstId,
+                  wf_sendUserId: _this.userInfo.userName,
+                  wf_sendUserOrgId: _this.userInfo.deptId,
+                },
+              },
+              review: false,
+              recordStatus: 'cancel',
+              editStatus: false
+            }
+            await addTool(formData)
+          }
+          _this.$modal.msgSuccess("删除成功");
+          _this.loading = false
+          _this.getList();
+        })
+    },
+    selectable(row,index){
+      return row.recordStatus==='draft'&&row.createBy==this.userInfo.userId
     }
   }
 };
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 15b9342..73a7208 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -8,7 +8,7 @@
       </div>
       <div class="cell-btn">
         <el-button v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
-        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">撤销</el-button>
+        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">删除</el-button>
         <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm">提交</el-button>
         <el-button v-if="editStatus" type="primary" @click="saveForm" >保存</el-button>
         <el-button @click="close">关闭</el-button>
@@ -19,7 +19,7 @@
       <el-tab-pane label="审批记录" name="log"></el-tab-pane>
     </el-tabs>
     <div class="el-form-border" v-show="activeName==='info'">
-      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <el-form ref="eForm" :model="form" :rules="rules" label-width="150px">
         <div>
           <div class="box-title">
             基本信息
@@ -40,8 +40,8 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="负责人" prop="toolPrincipalsName">
-                <el-input v-if="editStatus" v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11"/>
+              <el-form-item label="负责人" prop="toolPrincipals">
+                <el-input v-if="editStatus" v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11" @focus="toolPrincipalsChoose = true"/>
                 <span v-else>{{form.toolPrincipalsName}}</span>
               </el-form-item>
             </el-col>
@@ -68,7 +68,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="工具类别">
+              <el-form-item label="工具类别" prop="toolType">
                 <el-select v-if="editStatus" v-model="form.toolType" placeholder="请选择工具类别" style="width: 100%">
                   <el-option
                     v-for="dict in dict.type.tool_type"
@@ -81,7 +81,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="状态">
+              <el-form-item label="状态" prop="status">
                 <el-radio-group v-model="form.status" v-if="editStatus">
                   <el-radio
                     v-for="dict in dict.type.sys_normal_disable"
@@ -95,35 +95,35 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="测试情况">
+              <el-form-item label="测试情况" prop="testSituation">
                 <el-input :readonly="!editStatus" v-model="form.testSituation" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="功能描述">
+              <el-form-item label="功能描述" prop="functionDesc">
                 <el-input :readonly="!editStatus" v-model="form.functionDesc" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="适用条件">
+              <el-form-item label="适用条件" prop="applyCondition">
                 <el-input :readonly="!editStatus" v-model="form.applyCondition" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="操作说明">
+              <el-form-item label="操作说明" prop="operateExplain">
                 <el-input :readonly="!editStatus" v-model="form.operateExplain" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="备注">
+              <el-form-item label="备注" prop="remark">
                 <el-input :readonly="!editStatus" v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
               </el-form-item>
             </el-col>
@@ -134,7 +134,7 @@
             关联附件
           </div>
           <div class="operate">
-            <el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
+            <file-upload :isShowTip="false" :fileType="null" @input="handleFileAdd"></file-upload>
             <el-button icon="el-icon-delete">删除</el-button>
           </div><!--operate 操作按钮-->
           <el-table :data="docList" style="width: 100%">
@@ -201,8 +201,6 @@
           </el-row>
         </div>
       </el-form>
-      <!-- 上传 -->
-      <add-doc :show.sync="addDocShow" toolId="1111" @callback="openEvent"/>
     </div><!--el-form-border 表单-->
     <div v-show="activeName==='log'">
       <workflow-logs :procInstId = "pListData.procInstId"></workflow-logs>
@@ -235,6 +233,8 @@
       v-if="monitorDrawerVisible"
       ref="monitorDrawer"
     ></monitor-drawer>
+
+    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
   </div>
 </template>
 <script>
@@ -251,10 +251,12 @@ import AddDoc from '@/views/tool/AddDoc.vue'
 import Treeselect from '@riophae/vue-treeselect'
 import { deptTreeSelect } from "@/api/system/user";
 import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool'
+import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 // PDF本地文件预览
 export default {
   dicts: ['sys_normal_disable','tool_type'],
   components: {
+    blUserSelector,
     Treeselect, AddDoc,
     WorkflowLogs,
     processcode,
@@ -265,7 +267,7 @@ export default {
     let validatorToolExist = (rule, value, callback) => {
       let _this = this
       if (_this.editStatus&&_this.form.toolCode&&_this.form.toolRespDept) {
-        checkToolExist(_this.form).then((response) => {
+        checkToolExist({toolId:_this.form.toolId,toolCode:_this.form.toolCode,toolRespDept:_this.form.toolRespDept}).then((response) => {
           if (response.data) {
             let deptName = _this.getDeptName(_this.deptOptions, _this.form.toolRespDept)
             callback(new Error(deptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
@@ -278,9 +280,9 @@ export default {
       }
     }
     return {
+      toolPrincipalsChoose: false,
       // 新增时的关联附件
       docList: [],
-      addDocShow: false,
       docQueryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -318,15 +320,38 @@ export default {
           { required: true, message: "工具名称不能为空", trigger: "blur" },
           { max: 50, message: '工具名称不能超过50个字', trigger: 'blur' }
         ],
-        toolPrincipalsName: [
+        toolPrincipals: [
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
+        toolRespDept: [
+          { required: true, message: "请选择归属部门", trigger: "blur" }
+        ],
         toolSource: [
+          { required: true, message: "请输入工具来源", trigger: "blur" },
           { max: 50, message: '工具来源不能超过50个字', trigger: 'blur' }
         ],
+        toolType: [
+          { required: true, message: "请选择工具类别", trigger: "blur" }
+        ],
         toolUse: [
+          { required: true, message: "请输入工具用途", trigger: "blur" },
           { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
-        ]
+        ],
+        testSituation: [
+          { required: true, message: "请输入测试情况", trigger: "blur" },
+        ],
+        functionDesc: [
+          { required: true, message: "请输入功能描述", trigger: "blur" },
+        ],
+        applyCondition: [
+          { required: true, message: "请输入适用条件", trigger: "blur" },
+        ],
+        operateExplain: [
+          { required: true, message: "请选择状态", trigger: "blur" },
+        ],
+        status: [
+          { required: true, message: "请输入操作说明", trigger: "blur" },
+        ],
       },
       kuozhanshuju: {},
       kuozhanshujuBool: {},
@@ -394,6 +419,7 @@ export default {
         let formData = res.data;
         formData.type = _this.form.type
         _this.form = formData
+        _this.getDocumentList(res.data.toolId)
       }).finally(()=>{
         _this.detailLoading = false
       });
@@ -401,7 +427,6 @@ export default {
     rest(){
       let _this = this
       _this.activeName = "info"
-      _this.openEvent()
     },
     procInstInfoAndStatus(procInstId){
       let _this = this
@@ -510,11 +535,12 @@ export default {
           receiveUserId: _this.userInfo.userName,
           receiveUserOrgId: _this.userInfo.deptId
         });
+        let wf_procTitle = "【工具发布】" + (formData.toolName?formData.toolName:"")
         formData.bpmClientInputModel = {
           model: {
             wf_procDefId: _this.pListData.procDefId,
             wf_procDefKey: _this.procDefKey,
-            wf_procTitle: formData.toolName,
+            wf_procTitle: wf_procTitle,
             wf_sendUserId: _this.userInfo.userName,
             wf_sendUserOrgId: _this.userInfo.deptId,
             wf_receivers: wf_receivers,
@@ -544,20 +570,16 @@ export default {
     },
     deleteForm(){
       let _this = this
-      _this.$modal.confirm('撤销后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+      _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
         .then(()=> {
           _this.loading = true
           let formData = {
             toolId: _this.form.toolId,
             bpmClientInputModel: {
               model: {
-                wf_procDefKey: _this.procDefKey,
-                wf_procDefId: _this.pListData.procDefId,
                 wf_procInstId: _this.pListData.procInstId,
                 wf_sendUserId: _this.userInfo.userName,
                 wf_sendUserOrgId: _this.userInfo.deptId,
-                wf_curActDefName: _this.pListData.curActDefName,
-                wf_curActDefId: _this.pListData.curActDefId,
               },
             },
             review: false,
@@ -566,7 +588,7 @@ export default {
           }
           addTool(formData).then((res) => {
             if (res.code === 200) {
-              this.$modal.msgSuccess("撤销成功");
+              this.$modal.msgSuccess("删除成功");
               this.close(true);
             }
           });
@@ -592,8 +614,8 @@ export default {
           return true;
         }
       }
-      if (!!_this.$refs["form"]) {
-        let valid = await _this.$refs["form"].validate()
+      if (!!_this.$refs["eForm"]) {
+        let valid = await _this.$refs["eForm"].validate()
         if (!valid) {
           dialogVisible = false
         }
@@ -624,13 +646,14 @@ export default {
         // 显示加载中
         _this.flowStepLoading = true
         _this.detailLoading = true
+        let wf_procTitle = "【工具发布】" + (formData.toolName?formData.toolName:"")
         if (_this.pListData && _this.pListData.procInstId) {
           //流程执行参数
           formData.bpmClientInputModel = {
             model: {
               wf_procDefKey: _this.procDefKey,
               wf_procDefId: _this.pListData.procDefId,
-              wf_procTitle: formData.toolName,
+              wf_procTitle: wf_procTitle,
               wf_curActInstId: _this.pListData.curActInstId,
               wf_sendUserId: _this.userInfo.userName,
               wf_sendUserOrgId: _this.userInfo.deptId,
@@ -649,7 +672,7 @@ export default {
           //创建流程参数
           formData.bpmClientInputModel = {
             model: {
-              wf_procTitle:  formData.toolName,
+              wf_procTitle:  wf_procTitle,
               wf_nextActDefId: wf_nextActDefId,
               wf_procDefId: _this.pListData.procDefId,
               wf_procDefKey: _this.procDefKey,
@@ -697,19 +720,11 @@ export default {
     handleDelete(dataList,index){
       dataList.splice(index,1)
     },
-    /**
-     * 新增上传附件
-     */
-    handleDocAdd() {
-      this.addDocShow = true
-    },
-    /**
-     * 打开新增页面的回调事件
-     */
-    openEvent() {
+
+    getDocumentList(toolId) {
       this.loading = true
-      this.docQueryParams.toolId = '1111'
-      listDocument(this.queryParams).then(response => {
+      this.docQueryParams.toolId = toolId
+      listDocument(this.docQueryParams).then(response => {
           this.docList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -733,6 +748,15 @@ export default {
       }
       return label
     },
+    submitPeople(peopleList){
+      this.$set(this.form,'toolPrincipals',peopleList[0]['userId'])
+      this.$set(this.form,'toolPrincipalsName',peopleList[0]['nickName'])
+      this.toolPrincipalsChoose = false;
+      this.$refs['eForm'].validateField("toolPrincipals");
+    },
+    handleFileAdd(fileList){
+      console.log(fileList)
+    }
   },
 };
 </script>
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index da13551..0a66fa7 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -3,7 +3,7 @@
     <div class="drawer-head">
       <div class="cell-title">
         <div>
-          <p class="title">新增工具</p>
+          <p class="title">申请使用</p>
         </div>
       </div>
       <div class="cell-btn">
@@ -19,24 +19,23 @@
       <el-tab-pane label="审批记录" name="log"></el-tab-pane>
     </el-tabs>
     <div class="el-form-border" v-show="activeName==='info'">
-      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <el-form ref="eForm" :model="form" :rules="rules" label-width="150px">
         <div>
           <div class="box-title">
             基本信息
           </div>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="申请人" prop="userName">
-                <el-input v-if="editStatus" v-model="form.userName" placeholder="请输入申请人"/>
-                <span v-else>{{form.userName}}</span>
+              <el-form-item label="申请人" prop="userId">
+                <el-input v-if="editStatus" v-model="form.nickName" placeholder="请输入申请人" @focus="toolPrincipalsChoose = true"/>
+                <span v-else>{{form.nickName}}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="申请部门" prop="deptId">
-                <el-input v-if="editStatus" v-model="form.deptId" placeholder="请选择申请部门" maxlength="11"/>
-                <span v-else>{{form.deptId}}</span>
+                <span>{{form.deptName}}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -129,6 +128,7 @@
       v-if="monitorDrawerVisible"
       ref="monitorDrawer"
     ></monitor-drawer>
+    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
   </div>
 </template>
 <script>
@@ -146,10 +146,12 @@ import Treeselect from '@riophae/vue-treeselect'
 import { deptTreeSelect } from "@/api/system/user";
 import { addApply, getInfoByBpmcId, updateApply } from '@/api/tool/userApply'
 import { listItem } from '@/api/tool/userApplyItem'
+import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 // PDF本地文件预览
 export default {
   dicts: ['sys_normal_disable','tool_type'],
   components: {
+    blUserSelector,
     Treeselect, AddDoc,
     WorkflowLogs,
     processcode,
@@ -158,14 +160,10 @@ export default {
   props: ['data'],
   data() {
     return {
+      toolPrincipalsChoose: false,
       // 新增时的关联附件
       dataList: [],
       addDocShow: false,
-      docQueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        toolId: ''
-      },
       defaultStaff: [],
       yes: 'Y',
       searchQuery: {},
@@ -189,12 +187,9 @@ export default {
       monitorDrawerVisible:false,
       form: {},
       rules: {
-        userName: [
+        userId: [
           { required: true, message: "申请人不能为空", trigger: "blur" }
         ],
-        deptId: [
-          { required: true, message: '申请人不能为空', trigger: 'blur' }
-        ],
         reason: [
           { required: true, message: '申请理由不能为空', trigger: 'blur' }
         ]
@@ -371,7 +366,7 @@ export default {
       formData.itemList = _this.dataList
       formData.recordStatus = "draft";
       formData.editStatus = _this.editStatus
-      if (formData.toolId) {
+      if (formData.id) {
         updateApply(formData).then((res) => {
           if (res.code===200) {
             _this.$message({
@@ -389,7 +384,7 @@ export default {
           receiveUserId: _this.userInfo.userName,
           receiveUserOrgId: _this.userInfo.deptId
         });
-        let wf_procTitle = _this.dataList[0].toolName
+        let wf_procTitle = "【使用申请】"+_this.dataList[0].toolName
         formData.bpmClientInputModel = {
           model: {
             wf_procDefId: _this.pListData.procDefId,
@@ -428,7 +423,7 @@ export default {
         .then(()=> {
           _this.loading = true
           let formData = {
-            toolId: _this.form.toolId,
+            id: _this.form.id,
             bpmClientInputModel: {
               model: {
                 wf_procDefKey: _this.procDefKey,
@@ -472,8 +467,8 @@ export default {
           return true;
         }
       }
-      if (!!_this.$refs["form"]) {
-        let valid = await _this.$refs["form"].validate()
+      if (!!_this.$refs["eForm"]) {
+        let valid = await _this.$refs["eForm"].validate()
         if (!valid) {
           dialogVisible = false
         }
@@ -505,7 +500,7 @@ export default {
         // 显示加载中
         _this.flowStepLoading = true
         _this.detailLoading = true
-      let wf_procTitle = _this.dataList[0].toolName
+      let wf_procTitle = "【使用申请】"+_this.dataList[0].toolName
         if (_this.pListData && _this.pListData.procInstId) {
           //流程执行参数
           formData.bpmClientInputModel = {
@@ -585,22 +580,13 @@ export default {
     handleDocAdd() {
       this.addDocShow = true
     },
-    getDeptName(items, id) {
-      let label = ''
-      items.forEach(item => {
-        if(item['id'] == id){
-          label = item['label']
-          return
-        }
-      })
-      if(label == ''){
-        items.forEach(item => {
-          if (item.children) {
-            label = this.getDeptName(item.children, id)
-          }
-        })
-      }
-      return label
+    submitPeople(peopleList){
+      this.$set(this.form,'userId',peopleList[0]['userId'])
+      this.$set(this.form,'nickName',peopleList[0]['nickName'])
+      this.$set(this.form,'deptId',peopleList[0]['deptId'])
+      this.$set(this.form,'deptName',peopleList[0].dept.deptName)
+      this.toolPrincipalsChoose = false;
+      this.$refs['eForm'].validateField("userId");
     },
   },
 };
-- 
2.35.1.windows.2


From a1a238499425b0e650439163cb573fc6210e07b0 Mon Sep 17 00:00:00 2001
From: liukang <lukg6892>
Date: Wed, 28 Aug 2024 14:50:27 +0800
Subject: [PATCH 04/55] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E4=BD=BF=E7=94=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/views/tool/index.vue                      | 116 ++++++------------
 src/views/tool/toolDetail.vue                 |  25 ++--
 .../workflowList/addWorkflow/tool_release.vue |  37 +++---
 .../workflowList/addWorkflow/use_apply.vue    |   9 +-
 5 files changed, 74 insertions(+), 115 deletions(-)

diff --git a/.env.development b/.env.development
index d511e49..3b7e03a 100644
--- a/.env.development
+++ b/.env.development
@@ -14,7 +14,7 @@ VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
 VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
 
 # 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.2.20:8085/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.2.18:8085/ebpm-process-manage'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index a0ffacb..46925ed 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -90,7 +90,7 @@
             v-hasPermi="['system:user:add']"
           >工具发布</el-button>
           <el-button icon="el-icon-delete" @click="handleDelete(selection)">批量删除</el-button>
-          <el-button icon="el-icon-download" @click="exoportDrawerOpen = true">导出</el-button>
+          <el-button icon="el-icon-download" @click="handleOpenExport()">导出</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" :selectable="selectable"/>
@@ -98,17 +98,14 @@
           <el-table-column label="工具名称" align="center" key="toolName" prop="toolName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="工具类别" align="center" key="toolType" prop="toolType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
-              <template v-for="dict in dict.type.tool_type">
-                <span v-if="scope.row.toolType == dict.value">{{ dict.label }}</span>
-              </template>
+              <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
             </template>
           </el-table-column>
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="归属单位" align="center" key="toolRespDeptName" prop="toolRespDeptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="负责人" align="center" key="toolPrincipalsName" prop="toolPrincipalsName" v-if="columns[4].visible" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.status == '0'">正常</el-tag>
-              <el-tag type="info" v-if="scope.row.status == '1'">禁用</el-tag>
+              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -125,7 +122,7 @@
             <template slot-scope="scope">
               <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus==='done'" @click="applyUse(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
-              <el-button type="text" icon="el-icon-download" v-if="scope.row.recordStatus==='done'">下载</el-button>
+              <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right" >更多</el-button>
                 <el-dropdown-menu slot="dropdown">
@@ -146,57 +143,13 @@
       </div><!--rt 右-->
     </el-card><!--el-card-->
 
-    <!-- 工具申请使用对话框 -->
-    <el-drawer :visible.sync="applyDrawerOpen" size="75%">
-      <template #title>
-        <span>申请使用</span>
-        <div class="drawer-head-btn">
-          <el-button type="primary" icon="el-icon-check" @click="submitApply()">提交</el-button>
-          <el-button icon="el-icon-close" @click="cancelApply()">取消</el-button>
-        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
-      </template>
-      <div class="el-form-border">
-        <el-form ref="form" label-width="150px">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="申请人" required>
-                <el-input placeholder="张莹" ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="申请部门" required>信息部</el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="申请理由">
-                <el-input type="textarea" :rows="4" maxlength="1000" show-word-limit></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form><!--el-form-->
-      </div><!--el-form-border 表单-->
-      <div class="divide double"></div><!--divide 分隔-->
-      <div class="tboper">
-        <div class="tit">申请使用工具列表</div>
-      </div><!--tboper 标题与操作按钮-->
-      <el-table :data="tableData2" style="width: 100%">
-        <el-table-column prop="prop1"  label="工具编号"></el-table-column>
-        <el-table-column prop="prop2" label="工具名称"></el-table-column>
-        <el-table-column prop="prop5" label="工具类别"  ></el-table-column>
-        <el-table-column prop="prop3" label="归属单位" width="180"> </el-table-column>
-        <el-table-column prop="prop4" label="负责人" width="100" ></el-table-column>
-        <el-table-column label="操作" width="100">
-          <el-button type="text">删除</el-button>
-        </el-table-column>
-      </el-table><!--el-table-->
-    </el-drawer><!--el-drawer 申请使用-->
-
     <!-- 工具导出对话框 -->
-    <el-drawer :visible.sync="exoportDrawerOpen" size="75%">
+    <el-drawer :visible.sync="exoportDrawerOpen" size="75%" :show-close="false">
       <template #title>
         <span class="title">导出</span>
         <div class="drawer-head-btn">
-          <el-button type="primary">提交</el-button>
-          <el-button>取消</el-button>
+          <el-button type="primary" @click="handleExport">提交</el-button>
+          <el-button @click="exoportDrawerOpen=false">取消</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <div class="el-form-border">
@@ -204,19 +157,19 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="选择需要导出的字段信息">
-                <el-checkbox-group v-model="checkList1">
-                  <el-checkbox label="A">工具名称</el-checkbox>
-                  <el-checkbox label="B">工具类别</el-checkbox>
-                  <el-checkbox label="C">工具来源</el-checkbox>
-                  <el-checkbox label="D">负责人</el-checkbox>
-                  <el-checkbox label="E">归属单位</el-checkbox>
-                  <el-checkbox label="F">状态</el-checkbox>
-                  <el-checkbox label="G">工具名称</el-checkbox>
-                  <el-checkbox label="H">工具类别</el-checkbox>
-                  <el-checkbox label="I">工具来源</el-checkbox>
-                  <el-checkbox label="J">负责人</el-checkbox>
-                  <el-checkbox label="K">归属单位</el-checkbox>
-                  <el-checkbox label="L">状态</el-checkbox>
+                <el-checkbox-group v-model="checkList">
+                  <el-checkbox label="toolName">工具名称</el-checkbox>
+                  <el-checkbox label="toolType">工具类别</el-checkbox>
+                  <el-checkbox label="toolSource">工具来源</el-checkbox>
+                  <el-checkbox label="toolPrincipalsName">负责人</el-checkbox>
+                  <el-checkbox label="toolRespDeptName">归属单位</el-checkbox>
+                  <el-checkbox label="status">状态</el-checkbox>
+                  <el-checkbox label="toolUse">工具用途</el-checkbox>
+                  <el-checkbox label="testSituation">测评情况</el-checkbox>
+                  <el-checkbox label="functionDesc">功能描述</el-checkbox>
+                  <el-checkbox label="applyCondition">适用条件</el-checkbox>
+                  <el-checkbox label="operateExplain">操作说明</el-checkbox>
+                  <el-checkbox label="remark">备注</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
@@ -291,12 +244,11 @@ export default {
       // 部门树选项
       deptOptions: undefined,
       toolPrincipalsData: [],
-      tableData2: [],
-      checkList1: [],
+      columnList: ['toolName', 'toolType', 'toolSource', 'toolPrincipalsName', 'toolRespDeptName', 'status', 'toolUse', 'testSituation', 'functionDesc', 'applyCondition', 'operateExplain', 'remark'],
+      checkList: [],
       toolDetail: {},
       // 是否显示弹出层
       addDrawerOpen: false,
-      applyDrawerOpen: false,
       exoportDrawerOpen: false,
       detailDrawerOpen: false,
       detailActiveName: 'first',
@@ -338,7 +290,9 @@ export default {
         toolCode: undefined,
         toolName: undefined,
         status: undefined,
-        createBy: this.$store.getters.userId
+        createBy: this.$store.getters.userId,
+        permissionCheck: true,
+        downloadCheck:true
       },
       // 列信息
       columns: [
@@ -458,9 +412,6 @@ export default {
     },
     submitApply(){
 
-    },
-    cancelApply(){
-      this.applyDrawerOpen = false
     },
     /**=============================申请使用End================================*/
     /** 搜索按钮操作 */
@@ -517,13 +468,20 @@ export default {
       _this.handleOpen({type:'tool_release',procInstId:row.procInstId,status:'1'})
     },
     /** 发布按钮操作 */
-    handlePublish(row) {
+    handleOpenExport() {
+      if (this.checkList.length<1) {
+        this.checkList = JSON.parse(JSON.stringify(this.columnList))
+      }
+      this.exoportDrawerOpen = true
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
+      let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
+      this.download('/tool/export', {
+        ...this.queryParams,
+        downloadCheck:false,
+        excludeFields:excludeFields,
+      }, `工具信息数据_${new Date().getTime()}.xlsx`)
     },
     handleUseApply(){
 
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index a634fb7..0a7b881 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -6,18 +6,18 @@
           <div class="el-form-border">
             <el-form ref="form" label-width="150px">
               <el-row>
-                <el-col :span="12"> <el-form-item label="工具名称">工具名称2</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具类别">网络工具</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具来源">单位自建</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="负责人">赵宁宇</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="归属单位">人力资源部/员工关系组</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="状态"><span class="green">启用中</span></el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具用途">主要用于单位网络使用</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="测评情况">运行良好，可正常使用</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="功能描述">单位网络使用</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="适用条件">网络正常</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="操作说明">正常开启即可用</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="备注">工具使用完成后，请做好保养工作。</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具名称">{{toolDetail.toolName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具类别"><dict-tag :options="dict.type.tool_type" :value="toolDetail.toolType"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具来源">{{toolDetail.toolSource}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="负责人">{{toolDetail.toolPrincipalsName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="归属单位">{{toolDetail.toolRespDeptName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="状态"><dict-tag :options="dict.type.sys_normal_disable" :value="toolDetail.status"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具用途">{{toolDetail.toolUse}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="测评情况">{{toolDetail.testSituation}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="功能描述">{{toolDetail.functionDesc}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="适用条件">{{toolDetail.applyCondition}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="操作说明">{{toolDetail.operateExplain}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="备注">{{toolDetail.remark}}</el-form-item> </el-col>
               </el-row>
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
@@ -73,6 +73,7 @@
   export default {
     name: 'toolDetail',
     components: { editDocument, AddDoc },
+    dicts:['sys_normal_disable','tool_type'],
     props: {
       toolDetail: {
         type: Object,
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 73a7208..636e104 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -47,7 +47,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="归属部门" prop="toolRespDept">
-                <treeselect :disabled="!editStatus" v-model="form.toolRespDept" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+                <treeselect :disabled="!editStatus" v-model="form.toolRespDept" :options="deptOptions" @select="handleSelectNode" :show-count="true" placeholder="请选择归属部门" />
               </el-form-item>
             </el-col>
 
@@ -134,7 +134,7 @@
             关联附件
           </div>
           <div class="operate">
-            <file-upload :isShowTip="false" :fileType="null" @input="handleFileAdd"></file-upload>
+            <el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
             <el-button icon="el-icon-delete">删除</el-button>
           </div><!--operate 操作按钮-->
           <el-table :data="docList" style="width: 100%">
@@ -201,6 +201,8 @@
           </el-row>
         </div>
       </el-form>
+      <!-- 上传 -->
+      <add-doc :show.sync="addDocShow" toolId="1111"/>
     </div><!--el-form-border 表单-->
     <div v-show="activeName==='log'">
       <workflow-logs :procInstId = "pListData.procInstId"></workflow-logs>
@@ -269,8 +271,7 @@ export default {
       if (_this.editStatus&&_this.form.toolCode&&_this.form.toolRespDept) {
         checkToolExist({toolId:_this.form.toolId,toolCode:_this.form.toolCode,toolRespDept:_this.form.toolRespDept}).then((response) => {
           if (response.data) {
-            let deptName = _this.getDeptName(_this.deptOptions, _this.form.toolRespDept)
-            callback(new Error(deptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
+            callback(new Error(_this.form.toolRespDeptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
           } else {
             callback()
           }
@@ -283,6 +284,7 @@ export default {
       toolPrincipalsChoose: false,
       // 新增时的关联附件
       docList: [],
+      addDocShow: false,
       docQueryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -720,7 +722,12 @@ export default {
     handleDelete(dataList,index){
       dataList.splice(index,1)
     },
-
+    /**
+     * 新增上传附件
+     */
+    handleDocAdd() {
+      this.addDocShow = true
+    },
     getDocumentList(toolId) {
       this.loading = true
       this.docQueryParams.toolId = toolId
@@ -731,29 +738,15 @@ export default {
         }
       );
     },
-    getDeptName(items, id) {
-      let label = ''
-      items.forEach(item => {
-        if(item['id'] == id){
-          label = item['label']
-          return
-        }
-      })
-      if(label == ''){
-        items.forEach(item => {
-          if (item.children) {
-            label = this.getDeptName(item.children, id)
-          }
-        })
-      }
-      return label
-    },
     submitPeople(peopleList){
       this.$set(this.form,'toolPrincipals',peopleList[0]['userId'])
       this.$set(this.form,'toolPrincipalsName',peopleList[0]['nickName'])
       this.toolPrincipalsChoose = false;
       this.$refs['eForm'].validateField("toolPrincipals");
     },
+    handleSelectNode(node){
+      this.$set(this.form,'toolRespDeptName',node.label)
+    },
     handleFileAdd(fileList){
       console.log(fileList)
     }
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index 0a66fa7..97af939 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -274,7 +274,14 @@ export default {
     rest(data){
       let _this = this
       _this.activeName = "info"
-      this.dataList = [{...data}]
+      _this.dataList = [{...data}]
+      _this.form={
+        userId:_this.userInfo.userId,
+        nickName:_this.userInfo.nickName,
+        deptId:_this.userInfo.deptId,
+        deptName:_this.userInfo.dept.deptName,
+        reason: ""
+      }
     },
     procInstInfoAndStatus(procInstId){
       let _this = this
-- 
2.35.1.windows.2


From 6276978cc10246b944c958ad57ec393b963c8ee0 Mon Sep 17 00:00:00 2001
From: liukang <lukg6892>
Date: Wed, 28 Aug 2024 17:28:14 +0800
Subject: [PATCH 05/55] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=92=8C=E4=BD=BF=E7=94=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tool-selector/index.vue        | 180 ++++++++++++++++++
 src/views/tool/toolDetail.vue                 |   5 +
 .../workflowList/addWorkflow/tool_release.vue |  47 ++++-
 3 files changed, 229 insertions(+), 3 deletions(-)
 create mode 100644 src/components/tool-selector/index.vue

diff --git a/src/components/tool-selector/index.vue b/src/components/tool-selector/index.vue
new file mode 100644
index 0000000..65b9c9a
--- /dev/null
+++ b/src/components/tool-selector/index.vue
@@ -0,0 +1,180 @@
+<template>
+  <el-dialog
+    title="工具选择"
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    width="80%"
+    append-to-body>
+    <div class="el-card__body">
+      <el-form :model="queryParams" ref="queryForm"  v-show="showSearch" label-width="68px" :inline="true">
+        <el-form-item label="工具编号" prop="toolCode">
+          <el-input
+            v-model.trim="queryParams.toolCode"
+            placeholder="请输入"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="工具名称" prop="toolName">
+          <el-input
+            v-model.trim="queryParams.toolName"
+            placeholder="请输入"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-card class="gray-card">
+        <el-table
+          v-loading="loading"
+          :data="dataList"
+          border
+          @selection-change="handleSelectionChange"
+          ref="multipleTable"
+          header-align="left"
+        >
+          <el-table-column type="selection" width="50" align="center" v-if="multiple" :selectable="(row,index)=>selectableFun(row,index,toolData,selectInfoData)"/>
+          <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode"/>
+          <el-table-column label="工具名称" align="center" key="toolName" prop="toolName":show-overflow-tooltip="true" />
+          <el-table-column label="工具类别" align="center" key="toolType" prop="toolType" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="归属单位" align="center" key="toolRespDeptName" prop="toolRespDeptName"  :show-overflow-tooltip="true" />
+          <el-table-column label="负责人" align="center" key="toolPrincipalsName" prop="toolPrincipalsName" width="120" />
+          <el-table-column label="操作" v-if="!multiple" width="100px" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                @click="selectHandle(scope.row)"
+              >选择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+    <div slot="footer" v-if="multiple">
+      <el-button @click="visible = false">取 消</el-button>
+      <el-button type="primary" @click="selectHandle(selectInfoData)">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { listTool } from '@/api/tool/tool'
+export default {
+  name: "ToolSelector",
+  components: {},
+  dicts:['tool_type'],
+  props: {
+    toolData: {
+      type: Array,
+      default: ()=>[],
+    },
+    selectableFun: {
+      type: Function,
+      default: (row, index, toolData, selectInfoData)=>{
+        if (toolData) {
+          return toolData.findIndex(item=>item.id===row.id)<0
+        }else {
+          return true
+        }
+      },
+    },
+    selectValidate:{
+      type: Boolean,
+      default: false,
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      source: undefined,
+      index: undefined,
+      multiple: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      dataList: [],
+      // 弹出层标题
+      title: "",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        toolCode: undefined,
+        toolName: undefined,
+        status: undefined,
+        recordStatus: 'done',
+      },
+      selectInfoData: [],
+    };
+  },
+  methods: {
+    //来源、序号、是否多选
+    init(source,index,multiple){
+      this.visible = true
+      this.source = source
+      this.index = index
+      this.multiple= multiple
+      this.resetQuery()
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      listTool(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.dataList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.selectInfoData = selection;
+    },
+    selectHandle(data){
+      let _this = this
+      if (_this.selectValidate) {
+        this.$emit("selectHandle", this.source, this.index, data,(res)=>{_this.visible = !res})
+      }else{
+        this.$emit("selectHandle", this.source, this.index, data)
+        _this.visible = false
+      }
+    },
+  },
+};
+</script>
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 0a7b881..a246f14 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -18,6 +18,11 @@
                 <el-col :span="12"> <el-form-item label="适用条件">{{toolDetail.applyCondition}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="操作说明">{{toolDetail.operateExplain}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="备注">{{toolDetail.remark}}</el-form-item> </el-col>
+                <el-col :span="24">
+                  <el-form-item label="关联工具">
+                     <el-tag :key="tag.toolId" v-for="tag in JSON.parse(toolDetail.association)" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 636e104..a880b09 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -128,6 +128,29 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="关联工具" prop="association">
+                <el-select
+                  :disabled="!editStatus"
+                  v-model="form.association"
+                  ref="selectHeadTool"
+                  multiple
+                  value-key="toolId"
+                  filterable
+                  remote
+                  placeholder="请选择关联工具"
+                  @focus="toolSelect">
+                  <el-option
+                    v-for="item in form.association"
+                    :key="item.toolId"
+                    :label="item.toolName"
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
         <div>
           <div class="box-title">
@@ -235,7 +258,7 @@
       v-if="monitorDrawerVisible"
       ref="monitorDrawer"
     ></monitor-drawer>
-
+    <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
     <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
   </div>
 </template>
@@ -254,10 +277,12 @@ import Treeselect from '@riophae/vue-treeselect'
 import { deptTreeSelect } from "@/api/system/user";
 import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool'
 import blUserSelector from '@/components/user-selector/src/user-selector.vue'
+import ToolSelector from '@/components/tool-selector/index.vue'
 // PDF本地文件预览
 export default {
   dicts: ['sys_normal_disable','tool_type'],
   components: {
+    ToolSelector,
     blUserSelector,
     Treeselect, AddDoc,
     WorkflowLogs,
@@ -420,6 +445,7 @@ export default {
       getInfoByBpmcId(procInstId).then(async (res) => {
         let formData = res.data;
         formData.type = _this.form.type
+        formData.association = JSON.parse(res.data.association)
         _this.form = formData
         _this.getDocumentList(res.data.toolId)
       }).finally(()=>{
@@ -519,6 +545,7 @@ export default {
       let formData = JSON.parse(JSON.stringify(_this.form))
       formData.recordStatus = "draft";
       formData.editStatus = _this.editStatus
+      formData.association = JSON.stringify(_this.form.association)
       if (formData.toolId) {
         updateTool(formData).then((res) => {
           if (res.code===200) {
@@ -632,6 +659,7 @@ export default {
     handleWorkflowSubmit() {
       let _this = this
       let formData = JSON.parse(JSON.stringify(_this.form))
+      formData.association = JSON.stringify(_this.form.association)
       let wf_receivers = [];
       if (_this.$refs.prochild.receiveUserList.length < 1 &&_this.$refs.prochild.nextData.actDefType!=='endEvent') {
         _this.$message.warning("请选择人员！");
@@ -747,8 +775,21 @@ export default {
     handleSelectNode(node){
       this.$set(this.form,'toolRespDeptName',node.label)
     },
-    handleFileAdd(fileList){
-      console.log(fileList)
+    toolSelect(){
+      this.$refs.selectHeadTool.blur();
+      this.$nextTick(()=>{
+        this.$refs.toolSelect.init(null,null,true)
+      })
+    },
+    selectHandle(source,index,data){
+      let list = this.form.association
+      if (!list) {
+        list = []
+      }
+      data.forEach(itme=>{
+        list.push({toolId:itme.toolId,toolName:itme.toolName})
+      })
+      this.form.association = list
     }
   },
 };
-- 
2.35.1.windows.2


From 15a59707c6a5552c65146c4cabdfbb984742d1b1 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Thu, 29 Aug 2024 22:02:09 +0800
Subject: [PATCH 06/55] =?UTF-8?q?1=E3=80=81=E5=8F=91=E5=B8=83=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=B5=81=E7=A8=8B-=E5=85=B3=E8=81=94=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4=202=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/tool.css                           |   1 -
 src/api/document/document.js                  |  10 +
 src/components/FileUpload/optimizeUpload.vue  | 131 +++-----
 src/plugins/download.js                       |   2 +-
 src/views/document/editDocument.vue           | 299 ++++++++++--------
 src/views/document/index.vue                  | 119 +++++--
 src/views/tool/AddDoc.vue                     |  18 +-
 src/views/tool/toolDetail.vue                 | 115 +++++--
 .../workflowList/addWorkflow/tool_release.vue | 119 ++++++-
 9 files changed, 526 insertions(+), 288 deletions(-)

diff --git a/public/css/tool.css b/public/css/tool.css
index faf15b3..f4c3733 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -876,7 +876,6 @@ body .el-form-border .el-form-item .el-cascader ,
 body .el-form-border .el-form-item .el-select,
 body .el-form-border .el-form-item .el-date-editor{
   width: 100%;
-  max-width: 340px;
 }
 body .el-form-border .el-form-item .el-checkbox-group .el-checkbox{
   min-width: 200px;
diff --git a/src/api/document/document.js b/src/api/document/document.js
index 0eebd3d..080e497 100644
--- a/src/api/document/document.js
+++ b/src/api/document/document.js
@@ -42,3 +42,13 @@ export function delDocument(id) {
     method: 'delete'
   })
 }
+
+
+
+// 发布文档
+export function pushDoc(id) {
+  return request({
+    url: '/document/pushDoc/' + id,
+    method: 'put'
+  })
+}
diff --git a/src/components/FileUpload/optimizeUpload.vue b/src/components/FileUpload/optimizeUpload.vue
index bc99cf4..7ff90ae 100644
--- a/src/components/FileUpload/optimizeUpload.vue
+++ b/src/components/FileUpload/optimizeUpload.vue
@@ -33,22 +33,6 @@ export default {
             type: String,
             required: true
         },
-        headers: {
-            type: Object,
-            default: () => ({})
-        },
-        extraData: {
-            type: Object,
-            default: () => ({})
-        },
-        onSuccess: {
-            type: Function,
-            default: () => {}
-        },
-        onError: {
-            type: Function,
-            default: () => {}
-        },
       // 是否多选
         isMultiple: {
           type: Boolean,
@@ -75,6 +59,13 @@ export default {
           return 1
         }
       },
+      // 文件
+      dataFile: {
+        type: [Object, Array, String],
+        default() {
+          return ''
+        }
+      },
     },
     data() {
         return {
@@ -86,6 +77,18 @@ export default {
             partSize: 5 * 1024 * 1024,
         };
     },
+    watch: {
+      dataFile: {
+        handler(newValue, oldValue) {
+          if (newValue) {
+            this.fileList = Array.isArray(newValue) ? newValue : [newValue]
+          } else {
+            this.fileList = []
+          }
+        },
+        immediate: true
+      }
+    },
     methods: {
       // 上传前
       beforeUpload(file) {
@@ -99,67 +102,6 @@ export default {
           return false
         }*/
       },
-      /*  //上传函数
-        submitUpload(file) {
-            //重新命名 方便setTimeout函数 --因为setTimeout函数在vue内部中无效
-            var that = this;
-            // that.$refs.upload.submit();
-            //判断上传文件数量
-            if (this.fileList.length == 0) {
-                that.$message({
-                    message: '请选择导入的文件',
-                    type: 'warning',
-                    duration: '2000'
-                });
-                return;
-            }
-            //创建FormData();主要用于发送表单数据
-            let paramFormData = new FormData();
-            //遍历 fileList
-            that.fileList.forEach(file => {
-                paramFormData.append("file", file.raw);
-            });
-            //修改progressFlag值
-            that.progressFlag = true;
-            //axios 发出请求
-            axios({
-                url: that.uploadUrl,
-                method: 'post',
-                data: paramFormData,
-                headers: {
-                    'Authorization': 'Bearer ' + getToken(),
-                    'Content-Type': 'multipart/form-data'
-                },
-                onUploadProgress: progressEvent => {
-                    // progressEvent.loaded:已上传文件大小
-                    // progressEvent.total:被上传文件的总大小
-                    //进度条
-                    that.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
-                }
-            }).then(res => {
-                console.info("res===========", res)
-                if (res.data.code == 200 && that.progressPercent === 100) {
-                    setTimeout(function () {
-                        that.$message({
-                            message: '上传成功！',
-                            type: 'success',
-                            duration: '2000'
-                        });
-                        that.progressFlag = false;
-                        that.progressPercent = 0
-                    }, 500);
-                }
-            }).catch(error => {
-                that.progressFlag = false;
-                that.progressPercent = 0
-                that.$refs.upload.clearFiles();
-                that.$message({
-                    message: '上传失败！',
-                    type: 'error',
-                    duration: '2000'
-                });
-            })
-        },*/
         //文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
         onChange(file, fileList) {
             this.fileList = fileList;
@@ -205,6 +147,7 @@ export default {
                   });
                   self.progressFlag = false;
                   self.progressPercent = 0
+                  self.handleResult(res,file);
                 }, 500);
               } else {
                 self.$message({
@@ -227,7 +170,6 @@ export default {
             });
           })
         } else {
-          console.info("111111111111")
           file._shardCount = Math.ceil(file.size / this.partSize) //总片数
           file.uploaded = 0
           let formData = new FormData()
@@ -244,7 +186,6 @@ export default {
               'Content-Type': 'multipart/form-data'
             },
           }).then(function (res) {
-            console.info("res=====initUpload=======", res)
             if (res.status == 200) {
               //从第0块开始上传
               file.uploadId = res.data.uploadId
@@ -272,12 +213,6 @@ export default {
         //获取文件块MD5
         let reader = new FileReader()
         reader.readAsBinaryString(fileData)
-        // 读取成功后的回调
-        // reader.onloadend = function(e) {
-        //   用hex_md5生成md5值，与OSS的算法对应，并转换为大写，不是直接md5-js的算法
-        //   self.md5Str[index] = (CryptoJS(this.result)).toLocaleUpperCase()
-        //   self.md5Str[index] = CryptoJS.MD5(e.target.result)
-        // }
         let form1 = new FormData()//new一个form的实例，可以进行键值对的添加，
         form1.append('chunkFile', fileData) //slice方法用于切出文件的一部分
         form1.append('uploadId', file.uploadId)
@@ -300,7 +235,6 @@ export default {
             self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
           }
         }).then(response => {
-          console.info("response=======uploadChunk=====", response)
           if (response.status == 200) {
             //判断返回的MD5值是否一致，一致继续传下一块，否则重传本块（这里目前前后端MD5一直不一致，暂时先注释掉，有时间了我再研究一下）
             // self.md5Str[index] === response.msg ||
@@ -345,9 +279,8 @@ export default {
               'Authorization': 'Bearer ' + getToken(),
               'Content-Type': 'multipart/form-data'
             },
-          }).then(response => {
-            console.info("response====mergeFile========", response)
-            if (response.status == 200) {
+          }).then(res => {
+            if (res.status == 200) {
               setTimeout(function () {
                 self.$message({
                   message: '上传成功！',
@@ -356,6 +289,7 @@ export default {
                 });
                 self.progressFlag = false;
                 self.progressPercent = 0
+                self.handleResult(res,file);
               }, 500);
             } else {
               self.$message({
@@ -364,13 +298,30 @@ export default {
                 duration: '2000'
               });
             }
-            console.info("file===============", file)
           })
         }
       },
       resetData() {
         this.progress = 0;
       },
+      handleResult(res, file) {
+        let self = this
+        const data = {
+          fileName: file.name,
+          fileSize: file.size,
+          fileUrl: res.data.url,
+          filePath: res.data.filePath,
+          fileOldName: res.data.originalFilename,
+          fileNewName: res.data.newFileName,
+          suffixType: res.data.suffixType
+        }
+        self.$emit("handleSuccess", data)
+      },
+      /** 清空文件 **/
+      clearFile(){
+        this.$refs.upload.clearFiles();
+        this.fileList = []
+      }
     }
 };
 </script>
diff --git a/src/plugins/download.js b/src/plugins/download.js
index 42acd00..5dcfac3 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -9,7 +9,7 @@ const baseURL = process.env.VUE_APP_BASE_API
 let downloadLoadingInstance;
 
 export default {
-  name(name, isDelete = true) {
+  downloadByName(name, isDelete) {
     var url = baseURL + "/common/download?fileName=" + encodeURIComponent(name) + "&delete=" + isDelete
     axios({
       method: 'get',
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index 9427eca..2090b05 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -3,8 +3,8 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="150px">
       <el-row>
         <el-col :span="24">
-          <el-form-item label="文件分类" prop="docCode">
-            <treeselect v-model="form.categoryId" :options="docCategory" :show-count="true" placeholder="请选择文件分类"/>
+          <el-form-item label="文件分类" prop="docCategoryId">
+            <treeselect v-model="form.docCategoryId" :options="docCategory" :show-count="true" placeholder="请选择文件分类"/>
           </el-form-item>
         </el-col>
 
@@ -21,20 +21,51 @@
         </el-col>
 
         <el-col :span="24">
-          <el-form-item label="文档类别" prop="docType">
-            <el-input v-model="form.docType" placeholder="请输入文档类别" maxlength="50" show-word-limit/>
+          <el-form-item label="文档类别" prop="docType" style="width: 100%">
+            <el-select v-model="form.docType" placeholder="请选择文档来源" style="width: 100% !important;">
+              <el-option style="width: 100%"
+                v-for="dict in dict.type.doc_class"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
 
         <el-col :span="24">
           <el-form-item label="文档来源" prop="docSource">
-            <el-input v-model="form.docSource" placeholder="请输入文档来源" maxlength="50" show-word-limit/>
+            <el-select v-model="form.docSource" placeholder="请选择文档来源" style="width: 100%">
+              <el-option
+                v-for="dict in dict.type.doc_source"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+<!--            <el-input v-model="form.docSource" placeholder="请输入文档来源" maxlength="50" show-word-limit/>-->
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" v-if="relatedTool">
           <el-form-item label="关联工具" prop="toolId">
-            <el-input v-model="form.toolId" placeholder="请选择关联工具" @focus="drawer1 = true"/>
+            <el-select
+              v-model="toolDataInfo"
+              ref="selectHeadTool"
+              multiple
+              value-key="toolId"
+              filterable
+              remote
+              placeholder="请选择关联工具"
+              @focus="toolSelect">
+              <el-option
+                v-for="item in toolDataInfo"
+                :key="item.toolId"
+                :label="item.toolName"
+                :value="item">
+              </el-option>
+            </el-select>
           </el-form-item>
+
         </el-col>
         <el-col :span="24">
           <el-form-item label="负责人" prop="docPrincipals">
@@ -43,75 +74,39 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="归属单位" prop="docRespDept">
-            <treeselect v-model="form.docRespDept" :options="deptOptions" :show-count="true" placeholder="请输入归属单位" />
+            <treeselect v-model="form.docRespDept" :options="deptOptions" :show-count="true" placeholder="请输入归属单位"/>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="文件" required>
             <uploadVue
+              :display="editStatus"
               :uploadUrl="uploadFileUrl"
               :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
               :acceptType="acceptType"
               :limit="1"
-              :onSuccess="handleUploadSuccess"
-              :onError="handleUploadError"
+              :dataFile="dataFile"
+              ref="uploadFile"
+              @handleSuccess="handleUploadSuccess"
+              @handleError="handleUploadError"
             />
-<!--            <uploadVue-->
-<!--            <upload-progress/>
-            <el-upload
-              class="upload-component"
-              ref="upload"
-              :auto-upload="false"
-              :file-list="fileList"
-              :on-change="onChange"
-              :on-remove="onRemove"
-              :multiple="true"
-              action=""
-            >
-              <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
-              <div slot="tip" class="el-upload__tip"><el-progress :percentage="progress"></el-progress></div>
-            </el-upload>-->
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="备注">
+          <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form><!--el-form-->
 
-    <el-dialog title="选择关联工具" :visible.sync="drawer1" width="75%" append-to-body>
-      <div>
-        <el-table :data="tableData2" @row-click="singleElection" highlight-current-row style="width: 100%">
-          <!--<el-table-column label="选择" align="center" width="65">
-            <template slot-scope="scope">
-              <el-radio :label="scope.row.prop1" v-model="radio" @change.native="getCurrentRow(scope.row)" />
-            </template>
-          </el-table-column>-->
-          <el-table-column align="center" width="55">
-            <template slot-scope="scope">
-              <el-radio v-model="templateSelection" :label="scope.row.prop1"></el-radio>
-            </template>
-          </el-table-column>
-          <el-table-column prop="prop1"  label="工具编号"></el-table-column>
-          <el-table-column prop="prop2" label="工具名称"></el-table-column>
-          <el-table-column prop="prop5" label="工具类别"  ></el-table-column>
-          <el-table-column prop="prop3" label="归属单位" width="180"> </el-table-column>
-          <el-table-column prop="prop4" label="负责人" width="100" ></el-table-column>
-        </el-table><!--el-table-->
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="chooseToolConfirm()">确 定</el-button>
-        <el-button @click="cancel()">取 消</el-button>
-      </div>
-    </el-dialog><!--el-drawer 流程监控-抽屉-->
+    <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
+
   </div><!--el-form-border 表单-->
 </template>
 
 <script>
-  import { addDocument, updateDocument } from "@/api/document/document";
+  import { addDocument, updateDocument, getDocument } from "@/api/document/document";
   import axios from 'axios';
   import { getToken } from '@/utils/auth'
   import { deptTreeSelect } from "@/api/system/user";
@@ -119,15 +114,22 @@
   import Treeselect from "@riophae/vue-treeselect";
   import uploadProgress from "./uploadProgress";
   import uploadVue from '@/components/FileUpload/optimizeUpload.vue'
+  import ToolSelector from '@/components/tool-selector/index.vue'
 
   export default {
     name: 'editDocument',
-    components: { Treeselect, uploadProgress, uploadVue},
+    components: { Treeselect, uploadProgress, uploadVue, ToolSelector},
+    dicts:['doc_class','doc_source'],
     props: {
       tooId: {
         type: String,
         default: "",
-      }
+        required: false
+      },
+      relatedTool: {
+        type: Boolean,
+        default: true,
+      },
     },
     data(){
       return{
@@ -152,19 +154,24 @@
         ],
         // 表单参数
         form: {
-          categoryId: undefined,
+          docId: undefined,
+          docCategoryId: undefined,
           docCode: '',
           docName: '',
           docType: '',
           docPrincipals: '',
           docRespDept: undefined,
           docSource: '',
-          toolId: ''
+          toolId: '',
+          remark: undefined
         },
         fileList: [],
         progress: 0,
         // 表单校验
         rules: {
+          docCategoryId: [
+            { required: true, message: "文档分类不能为空", trigger: "blur" }
+          ],
           docCode: [
             { required: true, message: "文档编号不能为空", trigger: "blur" }
           ],
@@ -182,7 +189,10 @@
         deptOptions:[],
         uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
         fileData: null,
-        acceptType: ".txt,.doc,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg,.jpeg"
+        acceptType: ".txt,.doc,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg,.jpeg",
+        editStatus: true,
+        toolDataInfo: [],
+        dataFile: [],
       }
     },
     created(){
@@ -229,21 +239,6 @@
         this.drawer1 = false;
         this.reset();
       },
-      onChange(file, fileList) {
-        // valid the suffix of file
-        /*let validSuffix = ['pdf', 'docx', 'doc', 'txt', 'eml', 'mp4']
-        let splits = file.name.split('.')
-        let suffix = splits[splits.length - 1]
-        if (!validSuffix.includes(suffix)) {
-          this.$message.error(`只能上传 ${validSuffix.join(',')} 类型的文件！`)
-          this.fileList = fileList.filter(item => item.uid !== file.uid)
-          return
-        }*/
-        this.fileList = fileList
-      },
-      onRemove(file, fileList) {
-        this.fileList = fileList.filter(item => item.uid !== file.uid)
-      },
       generateUniqueID() {
         // 使用时间戳来生成唯一ID
         const timestamp = new Date().getTime();
@@ -253,80 +248,81 @@
       },
       /** 提交按钮 */
       submitForm: function() {
+        let fileName = []
+        //编辑时走该逻辑
+        if(this.form.docId && (this.fileList == null || this.fileList.length <= 0 )){
+          fileName = this.$refs.uploadFile.fileList[0]
+          this.fileList = this.$refs.uploadFile.fileList
+        }else{
+          fileName = this.fileList[0]
+          this.fileList = this.fileList
+        }
         //判断是否有文件再上传
-        if (this.fileList.length === 0) {
+        if (this.fileList.length == 0) {
           return this.$message.warning('请选取文件后再上传')
         }
-        this.fileList.map(file =>{
+        /*this.fileList.map(file =>{
           this.form.docName = file.name
-        })
-        this.form.toolId = this.toolId
+        })*/
+        if(fileName){
+          this.$set(this.form,"docUrl", fileName.filePath)
+          this.$set(this.form,"docStatus", "ysc")
+          this.$set(this.form,"attachment", fileName)
+        }
+        if(this.toolDataInfo && this.toolDataInfo.length > 0){
+          this.$set(this.form,"toolId", this.toolDataInfo[0].toolId)
+        }
+
         this.$refs["form"].validate(valid => {
           if (valid) {
-            if (this.form.id != undefined) {
-              updateDocument(this.form).then(response => {
+            if (this.form.docId) {
+              updateDocument(this.form).then(res => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.$emit("submit");
               });
             } else {
-              addDocument(this.form).then(response => {
+              addDocument(this.form).then(res => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
-                this.confirmSubmit(response.data);
+                // this.confirmSubmit(response.data);
                 this.$emit("submit");
               });
             }
           }
         });
       },
-      testUpdate(docId){
-        // 创建 formData 对象
-        const formData = new FormData()
-        // 将所有 的 upload 组件中的文件对象放入到 FormData 对象中
-        this.fileList.forEach((file) => {
-          formData.append('folder', file.raw)
-        })
-        formData.append('docId', '')
-        formData.append('requestId', this.generateUniqueID())
-        axios.post(process.env.VUE_APP_BASE_API + '/document/upload/folder', formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-            'Authorization': 'Bearer ' + getToken(),
+      /** 提交按钮 */
+      assembleSubmit: function() {
+        let self = this
+        let fileName = []
+        //编辑时走该逻辑
+        if(this.form.docId && (this.fileList == null || this.fileList.length <= 0 )){
+          fileName = this.$refs.uploadFile.fileList[0]
+          this.fileList = this.$refs.uploadFile.fileList
+        }else{
+          fileName = this.fileList[0]
+        }
+        //判断是否有文件再上传
+        if (this.fileList.length == 0) {
+          return this.$message.warning('请选取文件后再上传')
+        }
+        /*this.fileList.map(file =>{
+          this.form.docName = file.name
+        })*/
+        if(fileName){
+          this.$set(this.form,"docUrl", fileName.filePath)
+          this.$set(this.form,"docStatus", "ysc")
+          this.$set(this.form,"attachment", fileName)
+        }
+        if(this.toolDataInfo && this.toolDataInfo.length > 0){
+          this.$set(this.form,"toolId", this.toolDataInfo[0].toolId)
+        }
+
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            self.$emit("docSubmitData",self.form)
           }
-        }).then((response) => {
-          if(response.data.code===200){
-            this.$emit("submit");
-          }else{
-            // 弹框报错 response.data.message
-          }
-        }).catch((error) => {
-          console.error('Failed to upload file:', error);
-        });
-      },
-      confirmSubmit(docId) {
-        // 创建 formData 对象
-        const formData = new FormData()
-        // 将所有 的 upload 组件中的文件对象放入到 FormData 对象中
-        this.fileList.forEach((file) => {
-          formData.append('files', file.raw)
-        })
-        formData.append('docId', docId)
-        formData.append('requestId', this.generateUniqueID())
-        //自定义的接口也可以用ajax或者自己封装的接口
-        axios.post(process.env.VUE_APP_BASE_API + '/document/upload', formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-            'Authorization': 'Bearer ' + getToken(),
-          }
-        }).then((response) => {
-          if(response.data.code===200){
-            this.$emit("submit");
-          }else{
-            // 弹框报错 response.data.message
-          }
-        }).catch((error) => {
-          console.error('Failed to upload file:', error);
         });
       },
       /** 查询部门下拉树结构 */
@@ -354,20 +350,57 @@
       },
       // flag 为true表示新增
       getData(data, flag, index) {
-        console.info("data============", data)
-        console.info("flag============", flag)
-        console.info("index============", index)
       },
       getError(message) {
         this.$message.error(message);
       },
-      handleUploadSuccess(response) {
-        alert('File uploaded successfully');
+      handleUploadSuccess(res) {
+        this.fileList = []
+        this.fileList.push(res)
         // 处理上传成功后的逻辑
       },
       handleUploadError(error) {
-        alert('Failed to upload file');
         // 处理上传失败后的逻辑
+      },
+      toolSelect(){
+        this.$refs.selectHeadTool.blur();
+        this.$nextTick(()=>{
+          this.$refs.toolSelect.init(null,null,false)
+        })
+      },
+      selectHandle(source,index,data){
+        this.toolDataInfo = []
+        let toolInfo = {toolId:data.toolId,toolCode:data.toolCode,toolName:data.toolName}
+        this.toolDataInfo.push(toolInfo)
+      },
+      /**初始化 **/
+      resetForm() {
+        this.$refs.form.resetFields();
+        this.toolDataInfo = []
+        this.fileList = []
+        this.$nextTick(()=>{
+          this.$refs.uploadFile.clearFile();
+        })
+      },
+      editInit(docId, type){
+        this.$refs.form.resetFields();
+        this.toolDataInfo = []
+        this.$nextTick(()=>{
+          this.$refs.uploadFile.clearFile();
+
+          getDocument(docId).then(res => {
+            this.form = res.data
+            this.toolDataInfo = []
+            let toolInfo = {toolId:this.form.toolId,toolName:this.form.toolName}
+            this.toolDataInfo.push(toolInfo)
+
+            this.dataFile = []
+            let fileData = res.data.attachment
+            this.$set(fileData, "name", fileData.fileOldName)
+            this.$set(fileData, "size", fileData.fileSize)
+            this.dataFile.push(fileData)
+          });
+        })
       }
     }
   }
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index fc5a9d7..faa9a64 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -48,45 +48,63 @@
             size="mini"
             @click="handleAdd"
           >上传文档</el-button>
-          <el-button type="primary" icon="el-icon-position">发布</el-button>
+          <el-button type="primary" icon="el-icon-position" @click="handlePush">发布</el-button>
           <el-button icon="el-icon-delete" @click="handleDelete">批量删除</el-button>
         </div><!--operate 操作按钮-->
 
         <el-table v-loading="loading" :data="docList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="文档编号" prop="docCode" width="120" />
-          <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-          <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
-          <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
-          <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
-          <el-table-column label="来源" prop="docSource" width="100" />
-          <el-table-column label="关联工具" prop="roleSort" width="100" />
-          <el-table-column label="上传状态" prop="docUploadProgress" width="100" >
+          <el-table-column type="selection" width="55" align="center" :selectable="isSelectable"/>
+          <el-table-column label="文档编号" align="center" prop="docCode" width="120" />
+          <el-table-column label="文档名称" align="center" prop="docName" :show-overflow-tooltip="true" />
+          <el-table-column label="类别" align="center" prop="docType" :show-overflow-tooltip="true" width="80">
             <template slot-scope="scope">
-              <el-tag type="success" v-if="scope.row.docStatus == 'ysc'">已上传</el-tag>
-              <el-tag type="danger" v-else>上传失败</el-tag>
+              <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
+            </template>
+          </el-table-column>·
+          <el-table-column label="负责人" align="center" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
+          <el-table-column label="归属单位" align="center" prop="docRespDeptName" :show-overflow-tooltip="true" width="80" />
+          <el-table-column label="来源" align="center" prop="docSource" width="100">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <el-table-column label="关联工具" align="center" prop="toolName" width="100" />
+          <el-table-column label="上传状态" align="center" prop="docUploadProgress" width="100" >
+            <template slot-scope="scope">
+              <el-tag type="info" v-if="scope.row.docStatus == 'ysc'">已上传</el-tag>
+              <el-tag type="success" v-else-if="scope.row.docStatus == 'yfb'">已发布</el-tag>
+              <el-tag type="warning" v-else-if="scope.row.docStatus == 'shz'">审核中</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="180">
             <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'"
+                @click="handleEdit(scope.row)"
+              >编辑</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-view"
-                @click="handlePriew(scope.row)"
+                v-if="previewAuth(scope.row)"
+                @click="handlePreview(scope.row)"
               >预览</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
+                v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'"
                 @click="handleDelete(scope.row)"
               >删除</el-button>
-              <el-button type="text" icon="el-icon-download">下载</el-button>
+              <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -132,7 +150,7 @@
         <span class="title">新增文档资源</span>
         <div class="drawer-head-btn">
           <el-button type="primary" @click="$refs.editDocumentRef.submitForm()">确 定</el-button>
-          <el-button @click="$refs.editDocumentRef.cancel()">取 消</el-button>
+          <el-button @click="docCancel()">取 消</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <edit-document ref="editDocumentRef" @submit="editDocumentSubmit"/>
@@ -143,7 +161,7 @@
 </template>
 
 <script>
-import { listDocument, getDocument, delDocument, addDocument, updateDocument } from "@/api/document/document";
+import { listDocument, getDocument, delDocument, addDocument, updateDocument,pushDoc } from "@/api/document/document";
 import { deptTreeSelect } from "@/api/system/user";
 import { documentTree,addCategory,updateCategory,delCategory,getCategory } from "@/api/documentCategory/documentCategory.js";
 
@@ -153,10 +171,10 @@ import editDocument from "./editDocument";
 import uploadProgress from "./uploadProgress";
 import { w3cwebsocket as WebSocket } from 'websocket';
 import Treeselect from "@riophae/vue-treeselect";
-
 export default {
   name: "Document",
   components: { iFrame, editDocument, uploadProgress, Treeselect},
+  dicts:['doc_class','doc_source'],
   data() {
     return {
       // 遮罩层
@@ -243,6 +261,8 @@ export default {
         categoryDescription: null,
         parentId: null
       },
+      loadingDownload: false,
+      acceptType: "zip,rar,7z",
     };
   },
   created() {
@@ -297,9 +317,17 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true
+      this.$nextTick(()=>{
+        this.$refs.editDocumentRef.resetForm();
+      })
     },
-    handlePriew(row){
-      console.log('mmmmmmmmmmm',process.env.VUE_APP_BASE_API + row.docUrl)
+    handleEdit(row){
+      this.open = true
+      this.$nextTick(()=>{
+        this.$refs.editDocumentRef.editInit(row.docId, "edit");
+      })
+    },
+    handlePreview(row){
       this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
       this.viewDialogTitle = '文档在线预览'
       this.viewDialogOpen = true;
@@ -322,11 +350,10 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch((err) => {console.info(err)});
     },
     /** 新增按钮操作 */
     handleDocCategoryAdd(data) {
-      console.info("data================", data)
       this.docCategoryOpen = true;
       // this.docCategoryForm.parentId = data.id;
       this.$nextTick(() => {
@@ -385,6 +412,54 @@ export default {
     /** 重置 **/
     resetDocCategoryForm(){
       this.$refs.docCategoryForm.resetFields();
+    },
+    /**
+     * 处理下载
+     * **/
+    handleDownload(row){
+      let self = this
+      self.loadingDownload = true
+      this.$download.resource(row.docUrl);
+      setTimeout(()=>{
+        self.loadingDownload = false
+      },1000)
+    },
+    /** 删除按钮操作 */
+    handlePush(row) {
+      const docIds = row.docId || this.ids;
+      this.$modal.confirm('是否确认发布？').then(function() {
+        return pushDoc(docIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("发布成功");
+      }).catch((err) => {
+        console.error(err)
+      });
+    },
+    docCancel(){
+      this.$refs.editDocumentRef.resetForm();
+      this.open = false
+    },
+    previewAuth(row){
+      if(row.docUrl == null || row.docUrl == '' || row.docUrl == undefined){
+        return false
+      }
+      let extension = this.getExtension(row.docUrl);
+      const acceptedExtensions = this.acceptType.toLowerCase().split(',');
+      if(acceptedExtensions.includes(extension)){
+        return false
+      }
+      return true
+    },
+    getExtension(filePath) {
+      // 分割字符串，以 '.' 为分隔符
+      const parts = filePath.split('.');
+      // 取最后一个部分作为后缀名
+      const extension = parts.pop();
+      return extension;
+    },
+    isSelectable(row) {
+      return row.docStatus !== 'yfb' && row.docStatus !== 'shz';
     }
 
   }
diff --git a/src/views/tool/AddDoc.vue b/src/views/tool/AddDoc.vue
index 83b0f37..475e772 100644
--- a/src/views/tool/AddDoc.vue
+++ b/src/views/tool/AddDoc.vue
@@ -1,8 +1,8 @@
 <template>
-  <el-dialog title="新增文档" :visible.sync="visible" width="85%" append-to-body>
-    <edit-document ref="editDocumentRef" :toolId="toolId" @submit="editDocumentSubmit"/>
+  <el-dialog title="新增附件信息" :visible.sync="visible" width="85%" append-to-body>
+    <edit-document ref="editDocumentRef" :toolId="toolId" @docSubmitData="editDocumentSubmit" :relatedTool="false"/>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="$refs.editDocumentRef.submitForm()">确 定</el-button>
+      <el-button type="primary" @click="submitForm()">确 定</el-button>
       <el-button @click="cancel()">取 消</el-button>
     </div>
   </el-dialog>
@@ -26,7 +26,7 @@ export default {
      */
     toolId: {
       type: String,
-      default: true
+      default: ''
     }
   },
   computed: {
@@ -45,13 +45,19 @@ export default {
     }
   },
   methods: {
-    editDocumentSubmit(){
-      this.$emit('callback')
+    editDocumentSubmit(data){
+      this.$emit("addFileData", data)
       this.visible = false
     },
     cancel() {
       this.$refs.editDocumentRef.cancel()
       this.visible = false
+    },
+    submitForm(){
+      this.$refs.editDocumentRef.assembleSubmit()
+    },
+    resetForm(){
+      this.$refs.editDocumentRef.resetForm()
     }
   }
 }
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index a246f14..b12c35c 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -28,17 +28,20 @@
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
         <el-tab-pane label="关联文件" name="second">
-          <div class="operate">
-            <el-button type="primary" icon="el-icon-upload2" @click="handleAdd">上传</el-button>
-            <el-button icon="el-icon-delete">删除</el-button>
-          </div><!--operate 操作按钮-->
           <el-table :data="docList" style="width: 100%">
-            <el-table-column type="selection" width="50" align="center"> </el-table-column>
             <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
+            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
+              </template>
+            </el-table-column>
             <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
-            <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
-            <el-table-column label="来源" prop="docSource" width="100" />
+            <el-table-column label="归属单位" align="center" prop="docRespDeptName" :show-overflow-tooltip="true" width="80" />
+            <el-table-column label="来源" prop="docSource" width="100" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
+              </template>
+            </el-table-column>
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -52,19 +55,81 @@
                   icon="el-icon-view"
                   @click="handlePriew(scope.row)"
                 >预览</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                >删除</el-button>
-                <el-button type="text" icon="el-icon-download">下载</el-button>
+                <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
               </template>
             </el-table-column>
           </el-table><!--el-table-->
         </el-tab-pane><!--el-tab-pane-->
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
+    <div class="fr">
+      <div class="tboper">
+        <div class="tit">评论</div>
+      </div><!--tboper 标题与操作按钮-->
+      <div class="pltextarea">
+        <el-input type="textarea" placeholder="请输入您的意见" :rows="4" maxlength="1000" show-word-limit></el-input>
+        <div class="plbtn"><el-button>发布</el-button></div>
+      </div><!--pltextarea-->
+      <div class="pllist">
+        <div class="list">
+          <div class="luser"><span class="xuser">张</span></div>
+          <div class="ltext">
+            <div class="nt"><span class="name">张鑫辉</span><span class="time">05/01 12:00</span></div>
+            <div class="te">这个工具可以！</div>
+            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+            <div class="pltextarea">
+              <el-input type="textarea" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
+              <div class="plbtn"><el-button>取消</el-button><el-divider direction="vertical"></el-divider><el-button>发布</el-button></div>
+            </div><!--pltextarea-->
+          </div>
+        </div><!--list-->
+        <div class="list">
+          <div class="luser"><span class="xuser">钱</span></div>
+          <div class="ltext">
+            <div class="nt"><span class="name">钱多多</span><span class="time">05/01 12:00</span></div>
+            <div class="te">好用！</div>
+            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+            <div class="list">
+              <div class="luser"><span class="xuser">赵</span></div>
+              <div class="ltext">
+                <div class="nt"><span class="name">赵宇</span><span class="time">05/01 12:00</span></div>
+                <div class="te">希望再选代一下，还有待完善的地方。</div>
+                <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+              </div>
+            </div><!--list-->
+            <div class="list">
+              <div class="luser"><span class="xuser">李</span></div>
+              <div class="ltext">
+                <div class="nt"><span class="name">李志</span><span class="time">05/01 12:00</span></div>
+                <div class="te">很好的解决了我的问题，感谢！</div>
+                <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+              </div>
+            </div><!--list-->
+          </div>
+        </div><!--list-->
+        <div class="list">
+          <div class="luser"><span class="xuser">赵</span></div>
+          <div class="ltext">
+            <div class="nt"><span class="name">赵宇</span><span class="time">05/01 12:00</span></div>
+            <div class="te">希望再选代一下，还有待完善的地方。</div>
+            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+          </div>
+        </div><!--list-->
+        <div class="list">
+          <div class="luser"><span class="xuser">李</span></div>
+          <div class="ltext">
+            <div class="nt"><span class="name">李志</span><span class="time">05/01 12:00</span></div>
+            <div class="te">很好的解决了我的问题，感谢！</div>
+            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+          </div>
+        </div><!--list-->
+      </div><!--pllist-->
+    </div><!--fl 右侧评论-->
+
+    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body>
+      <i-frame :src="previewUrl" />
+    </el-dialog>
+
     <!-- 上传 -->
     <AddDoc :show.sync="open" :toolId="toolDetail.toolId" @callback="getDocList"/>
   </div><!--fbox1 左右分栏-->
@@ -75,10 +140,12 @@
   import AddDoc from './AddDoc'
   import editDocument from "../document/editDocument";
   import { Base64 } from 'js-base64';
+  import iFrame from "@/components/iFrame/index"
+
   export default {
     name: 'toolDetail',
-    components: { editDocument, AddDoc },
-    dicts:['sys_normal_disable','tool_type'],
+    components: { editDocument, AddDoc, iFrame },
+    dicts:['sys_normal_disable','tool_type','doc_class','doc_source'],
     props: {
       toolDetail: {
         type: Object,
@@ -99,6 +166,7 @@
         viewDialogOpen: false,
         title: '新增文档',
         open: false,
+        loadingDownload: false,
       }
     },
     created(){
@@ -136,7 +204,18 @@
           this.getList();
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {});
-      }
+      },
+      /**
+       * 处理下载
+       * **/
+      handleDownload(row){
+        let self = this
+        self.loadingDownload = true
+        this.$download.resource(row.docUrl);
+        setTimeout(()=>{
+          self.loadingDownload = false
+        },1000)
+      },
     }
   }
 </script>
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index a880b09..06ebc9f 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -157,16 +157,28 @@
             关联附件
           </div>
           <div class="operate">
-            <el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
-            <el-button icon="el-icon-delete">删除</el-button>
+            <el-button type="primary" icon="el-icon-upload2" v-if="editStatus" @click="handleDocAdd">上传</el-button>
+<!--            <el-button icon="el-icon-delete">删除</el-button>-->
           </div><!--operate 操作按钮-->
           <el-table :data="docList" style="width: 100%">
-            <el-table-column type="selection" width="50" align="center"> </el-table-column>
+<!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
             <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
+            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
+              </template>
+            </el-table-column>
             <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
-            <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
-            <el-table-column label="来源" prop="docSource" width="100" />
+            <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" >
+              <template slot-scope="scope">
+                {{convertDeptName(scope.row)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="来源" prop="docSource" width="100" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
+              </template>
+            </el-table-column>
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -178,15 +190,17 @@
                   size="mini"
                   type="text"
                   icon="el-icon-view"
-                  @click="handlePriew(scope.row)"
+                  v-if="isShowOperation(scope.row)"
+                  @click="handlePreview(scope.row)"
                 >预览</el-button>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
+                  v-if="editStatus"
                   @click="handleDelete(scope.row)"
                 >删除</el-button>
-                <el-button type="text" icon="el-icon-download">下载</el-button>
+                <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
               </template>
             </el-table-column>
           </el-table><!--el-table-->
@@ -225,7 +239,7 @@
         </div>
       </el-form>
       <!-- 上传 -->
-      <add-doc :show.sync="addDocShow" toolId="1111"/>
+      <add-doc :show.sync="addDocShow" ref="addDocRef" @addFileData="addFileData"/>
     </div><!--el-form-border 表单-->
     <div v-show="activeName==='log'">
       <workflow-logs :procInstId = "pListData.procInstId"></workflow-logs>
@@ -260,10 +274,16 @@
     ></monitor-drawer>
     <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
     <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
+
+
+    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body>
+      <i-frame :src="previewUrl" />
+    </el-dialog>
   </div>
 </template>
 <script>
-import { listDocument } from "@/api/document/document";
+import iFrame from "@/components/iFrame/index"
+import { listDocument,delDocument } from "@/api/document/document";
 import processcode from "@/views/workflowList/processcode/index.vue";
 import {
   workflowprocesskey,
@@ -278,15 +298,17 @@ import { deptTreeSelect } from "@/api/system/user";
 import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool'
 import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 import ToolSelector from '@/components/tool-selector/index.vue'
+import { Base64 } from 'js-base64'
 // PDF本地文件预览
 export default {
-  dicts: ['sys_normal_disable','tool_type'],
+  dicts: ['sys_normal_disable','tool_type','doc_source','doc_class'],
   components: {
     ToolSelector,
     blUserSelector,
     Treeselect, AddDoc,
     WorkflowLogs,
     processcode,
+    iFrame
   },
   name: "Borrow_doc",
   props: ['data'],
@@ -392,6 +414,10 @@ export default {
       flowStepLoading : false,
       // 默认密码
       initPassword: undefined,
+      viewDialogTitle: "",
+      viewDialogOpen: false,
+      previewUrl: '',
+      loadingDownload: false,
     };
   },
   computed: {},
@@ -445,6 +471,7 @@ export default {
       getInfoByBpmcId(procInstId).then(async (res) => {
         let formData = res.data;
         formData.type = _this.form.type
+        // _this.docList = formData.documentList
         formData.association = JSON.parse(res.data.association)
         _this.form = formData
         _this.getDocumentList(res.data.toolId)
@@ -547,6 +574,7 @@ export default {
       formData.editStatus = _this.editStatus
       formData.association = JSON.stringify(_this.form.association)
       if (formData.toolId) {
+        this.$set(formData,'documentList',_this.docList)
         updateTool(formData).then((res) => {
           if (res.code===200) {
             _this.$message({
@@ -582,6 +610,7 @@ export default {
           review: _this.attributeModelBool('approve'),
         };
         formData.editStatus = _this.editStatus
+        this.$set(formData,'documentList',_this.docList)
         addTool(formData).then((res) => {
           if (res.code===200) {
             _this.form.toolId = res.data.businessKey;
@@ -725,6 +754,7 @@ export default {
           formData.recordStatus = 'doing'
         }
         formData.editStatus = _this.editStatus
+        this.$set(formData,'documentList',_this.docList)
         addTool(formData).then((res) => {
           if (res.code===200) {
             _this.$message({
@@ -747,21 +777,25 @@ export default {
         this.$refs.monitorDrawer.init(this.pListData.procInstId);
       });
     },
-    handleDelete(dataList,index){
-      dataList.splice(index,1)
+    handleDelete(row){
+      this.docList.splice(row,1)
     },
     /**
      * 新增上传附件
      */
     handleDocAdd() {
       this.addDocShow = true
+      this.$nextTick(() => {
+        this.$refs.addDocRef.resetForm()
+      })
     },
     getDocumentList(toolId) {
       this.loading = true
       this.docQueryParams.toolId = toolId
-      listDocument(this.docQueryParams).then(response => {
-          this.docList = response.rows;
-          this.total = response.total;
+      this.$set(this.docQueryParams,'isDeleted',"0")
+      listDocument(this.docQueryParams).then(res => {
+          this.docList = res.rows;
+          this.total = res.total;
           this.loading = false;
         }
       );
@@ -790,7 +824,58 @@ export default {
         list.push({toolId:itme.toolId,toolName:itme.toolName})
       })
       this.form.association = list
-    }
+    },
+    /** 添加关联附件数据**/
+    addFileData(dataInfo){
+      let document = JSON.parse(JSON.stringify(dataInfo))
+      this.docList.push(document)
+    },
+    findDeptInTree(tree, id) {
+      for (const node of tree) {
+        if (node.id == id) {
+          return node;
+        }
+        if (node.children && node.children.length > 0) {
+          const found = this.findDeptInTree(node.children, id);
+          if (found) {
+            return found;
+          }
+        }
+      }
+      return null;
+    },
+    /** 获取部门名称 **/
+    convertDeptName(row){
+      let foundDept = this.findDeptInTree(this.deptOptions, row.docRespDept);
+      if(foundDept){
+        return foundDept.label
+      }
+      return null
+    },
+    isShowOperation(row){
+      let self = this
+      if(row.docId == null || row.docId == undefined || row.docId == ''){
+        return false
+      }
+      return true
+    },
+    handlePreview(row){
+      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
+      this.viewDialogTitle = '文档在线预览'
+      this.viewDialogOpen = true;
+    },
+    /**
+     * 处理下载
+     * **/
+    handleDownload(row){
+      let self = this
+      self.loadingDownload = true
+      this.$download.resource(row.docUrl);
+      setTimeout(()=>{
+        self.loadingDownload = false
+      },1000)
+    },
   },
+
 };
 </script>
-- 
2.35.1.windows.2


From 4920b416208eaa237ff5ecd0119ce45ca3171d79 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Fri, 30 Aug 2024 19:48:44 +0800
Subject: [PATCH 07/55] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E3=80=81=E5=9B=9E=E5=A4=8D=E5=8A=9F=E8=83=BD=202?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E5=85=B7=E5=8F=91=E5=B8=83=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=80=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/tool.css           |   5 +
 src/api/tool/discussions.js   |  44 ++++++
 src/api/tool/replies.js       |  44 ++++++
 src/views/document/index.vue  | 175 ++++++++++++++++++++---
 src/views/tool/index.vue      |  34 +++--
 src/views/tool/toolDetail.vue | 260 +++++++++++++++++++++++++++-------
 6 files changed, 476 insertions(+), 86 deletions(-)
 create mode 100644 src/api/tool/discussions.js
 create mode 100644 src/api/tool/replies.js

diff --git a/public/css/tool.css b/public/css/tool.css
index f4c3733..c9ce2d1 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -2495,6 +2495,11 @@ body .login-page .loright .locont .el-form--label-top .el-form-item .el-form-ite
   padding: 16px 32px;
   width: 420px;
 }
+body .el-drawer .el-drawer__body .fbox1 .fl,
+body .el-drawer .el-drawer__body .fbox1 .fr{
+  height: calc(100vh - 57px);
+  overflow: auto;
+}
 
 /*pltextarea 评论框*/
 body .pltextarea{
diff --git a/src/api/tool/discussions.js b/src/api/tool/discussions.js
new file mode 100644
index 0000000..7073fd8
--- /dev/null
+++ b/src/api/tool/discussions.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询讨论列表
+export function listDiscussions(query) {
+  return request({
+    url: '/discussions/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询讨论详细
+export function getDiscussions(id) {
+  return request({
+    url: '/discussions/' + id,
+    method: 'get'
+  })
+}
+
+// 新增讨论
+export function addDiscussions(data) {
+  return request({
+    url: '/discussions',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改讨论
+export function updateDiscussions(data) {
+  return request({
+    url: '/discussions',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除讨论
+export function delDiscussions(id) {
+  return request({
+    url: '/discussions/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/tool/replies.js b/src/api/tool/replies.js
new file mode 100644
index 0000000..c36c22b
--- /dev/null
+++ b/src/api/tool/replies.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询回复列表
+export function listReplies(query) {
+  return request({
+    url: '/system/replies/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询回复详细
+export function getReplies(id) {
+  return request({
+    url: '/replies/' + id,
+    method: 'get'
+  })
+}
+
+// 新增回复
+export function addReplies(data) {
+  return request({
+    url: '/replies',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改回复
+export function updateReplies(data) {
+  return request({
+    url: '/replies',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除回复
+export function delReplies(id) {
+  return request({
+    url: '/replies/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index faa9a64..7685c98 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -1,18 +1,78 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
         <div class="search">
           <div class="sl">
-            <el-form-item label="文档名称" prop="roleName">
+            <el-form-item label="文档编号" prop="docCode">
+              <el-input
+                v-model="queryParams.docCode"
+                placeholder="请输入文档名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="文档名称" prop="docName">
               <el-input
                 v-model="queryParams.docName"
                 placeholder="请输入文档名称"
                 clearable
-                style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="类别" prop="docType">
+              <el-select v-model="queryParams.docType" placeholder="请选择">
+                <el-option
+                  v-for="dict in dict.type.doc_class"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="负责人" prop="docPrincipals">
+              <el-input
+                v-model="queryParams.docPrincipals"
+                placeholder="请输入负责人"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+<!--            <el-form-item label="归属单位" prop="docRespDept">
+              <treeselect v-model="queryParams.docRespDept" :options="deptOptions"
+                          placeholder="请选择归属单位"
+                          :show-count="true" style="width: 150px"/>
+            </el-form-item>-->
+            <el-form-item label="来源" prop="docSource">
+              <el-select v-model="queryParams.docSource" placeholder="请选择" >
+                <el-option
+                  v-for="dict in dict.type.doc_source"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="状态" prop="docStatus">
+              <el-select v-model="queryParams.docStatus" placeholder="请选择" >
+                <el-option
+                  v-for="dict in dict.type.doc_upload_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="dateRange"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
           </div>
           <div class="sr">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -47,9 +107,11 @@
             icon="el-icon-upload2"
             size="mini"
             @click="handleAdd"
+            v-hasPermi="['document:add']"
           >上传文档</el-button>
-          <el-button type="primary" icon="el-icon-position" @click="handlePush">发布</el-button>
-          <el-button icon="el-icon-delete" @click="handleDelete">批量删除</el-button>
+          <el-button type="primary" icon="el-icon-position" @click="handlePush" v-hasPermi="['document:push']">发布</el-button>
+          <el-button icon="el-icon-delete" @click="handleDelete" v-hasPermi="['document:batch:remove']">批量删除</el-button>
+          <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['document:export']">导出</el-button>
         </div><!--operate 操作按钮-->
 
         <el-table v-loading="loading" :data="docList" @selection-change="handleSelectionChange">
@@ -69,12 +131,17 @@
             </template>
           </el-table-column>
           <el-table-column label="关联工具" align="center" prop="toolName" width="100" />
-          <el-table-column label="上传状态" align="center" prop="docUploadProgress" width="100" >
+          <el-table-column label="上传状态" align="center" prop="docStatus" width="100" >
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.doc_upload_status" :value="scope.row.docStatus"/>
+            </template>
+<!--
             <template slot-scope="scope">
               <el-tag type="info" v-if="scope.row.docStatus == 'ysc'">已上传</el-tag>
               <el-tag type="success" v-else-if="scope.row.docStatus == 'yfb'">已发布</el-tag>
               <el-tag type="warning" v-else-if="scope.row.docStatus == 'shz'">审核中</el-tag>
-            </template>
+            </template>-->
+
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -89,6 +156,7 @@
                 icon="el-icon-edit"
                 v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'"
                 @click="handleEdit(scope.row)"
+                v-hasPermi="['document:edit']"
               >编辑</el-button>
               <el-button
                 size="mini"
@@ -96,6 +164,7 @@
                 icon="el-icon-view"
                 v-if="previewAuth(scope.row)"
                 @click="handlePreview(scope.row)"
+                v-hasPermi="['document:preview']"
               >预览</el-button>
               <el-button
                 size="mini"
@@ -103,8 +172,11 @@
                 icon="el-icon-delete"
                 v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'"
                 @click="handleDelete(scope.row)"
+                v-hasPermi="['document:remove']"
               >删除</el-button>
-              <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+              <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)"
+                         v-hasPermi="['document:batch:remove']"
+                         v-loading="loadingDownload">下载</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -156,7 +228,39 @@
       <edit-document ref="editDocumentRef" @submit="editDocumentSubmit"/>
     </el-drawer>
 
-    <upload-progress/>
+
+    <!-- 工具导出对话框 -->
+    <el-drawer :visible.sync="exportDrawerOpen" size="75%" :show-close="false">
+      <template #title>
+        <span class="title">导出</span>
+        <div class="drawer-head-btn">
+          <el-button type="primary" @click="handleExport">提交</el-button>
+          <el-button @click="exportDrawerOpen=false">取消</el-button>
+        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
+      </template>
+      <div class="el-form-border">
+        <el-form ref="form" label-width="200px">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="选择需要导出的字段信息">
+                <el-checkbox-group v-model="checkList">
+                  <el-checkbox label="docCode">文档编号</el-checkbox>
+                  <el-checkbox label="docName">文档名称</el-checkbox>
+                  <el-checkbox label="docType">类别</el-checkbox>
+                  <el-checkbox label="docPrincipals">负责人</el-checkbox>
+                  <el-checkbox label="docRespDeptName">归属单位</el-checkbox>
+                  <el-checkbox label="docSource">来源</el-checkbox>
+                  <el-checkbox label="toolName">关联工具</el-checkbox>
+                  <el-checkbox label="docStatus">上传状态</el-checkbox>
+                  <el-checkbox label="createTime">创建时间</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form><!--el-form-->
+      </div><!--el-form-border 表单-->
+    </el-drawer><!--el-drawer 导出抽屉-->
+<!--    <upload-progress/>-->
   </div>
 </template>
 
@@ -174,7 +278,7 @@ import Treeselect from "@riophae/vue-treeselect";
 export default {
   name: "Document",
   components: { iFrame, editDocument, uploadProgress, Treeselect},
-  dicts:['doc_class','doc_source'],
+  dicts:['doc_class','doc_source','doc_upload_status'],
   data() {
     return {
       // 遮罩层
@@ -220,7 +324,13 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        docName: undefined
+        docName: '',
+        docCode: '',
+        docType: '',
+        docPrincipals: '',
+        docSource: '',
+        docStatus: '',
+        docCategoryId: '',
       },
       // 表单参数
       form: {
@@ -263,6 +373,10 @@ export default {
       },
       loadingDownload: false,
       acceptType: "zip,rar,7z",
+      //导出属性
+      columnList: ['docCode', 'docName', 'docType', 'docPrincipals', 'docRespDeptName', 'docSource', 'toolName', 'docStatus', 'createTime'],
+      checkList: [],
+      exportDrawerOpen: false,
     };
   },
   created() {
@@ -290,18 +404,22 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.queryParams.toolRespDept = data.id;
+      this.queryParams.docCategoryId = data.id;
       this.handleQuery();
     },
     /** 查询列表 */
     getList() {
-      this.loading = true;
+      let self = this
+      self.loading = true;
       listDocument(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.docList = response.rows;
-          this.total = response.total;
-          this.loading = false;
+        self.docList = response.rows;
+        self.total = response.total;
+        self.loading = false;
         }
-      );
+      ).catch(err=>{
+        console.error("getList=======", err)
+        self.loading = false;
+      });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -311,6 +429,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = [];
+      this.queryParams.docCategoryId = '';
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -350,7 +469,7 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch((err) => {console.info(err)});
+      }).catch((err) => {console.error(err)});
     },
     /** 新增按钮操作 */
     handleDocCategoryAdd(data) {
@@ -370,7 +489,7 @@ export default {
         this.getDocumentTree();
         this.$modal.msgSuccess("删除成功");
       }).catch((err) => {
-        console.info("err============", err)
+        console.error("err============", err)
       });
     },
     /** 修改按钮操作 */
@@ -460,7 +579,23 @@ export default {
     },
     isSelectable(row) {
       return row.docStatus !== 'yfb' && row.docStatus !== 'shz';
-    }
+    },
+    /** 导出按钮操作 */
+    handleOpenExport() {
+      if (this.checkList.length<1) {
+        this.checkList = JSON.parse(JSON.stringify(this.columnList))
+      }
+      this.exportDrawerOpen = true
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
+      this.download('/document/export', {
+        ...this.queryParams,
+        downloadCheck:false,
+        excludeFields:excludeFields,
+      }, `文档资源信息数据_${new Date().getTime()}.xlsx`)
+    },
 
   }
 };
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 46925ed..ec80dbe 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-form label-width="80px" ref="queryForm">
+      <el-form :model="queryParams" label-width="80px" ref="queryForm">
         <div class="grab"  id="add">
           <div class="search">
             <div class="sl">
@@ -50,7 +50,7 @@
             </div>
             <div class="sr">
               <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
+              <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
             </div>
           </div><!--search 默认查询-->
         </div><!--grab-->
@@ -58,7 +58,7 @@
     </el-card><!--el-card-->
 
     <el-card class="lrtt">
-      <div class="lt">
+      <div class="lt"  v-hasPermi="['tool:org:tree']">
         <el-input
           v-model="deptName"
           placeholder="请输入部门名称"
@@ -87,10 +87,9 @@
             plain
             icon="el-icon-plus"
             @click="handleAdd"
-            v-hasPermi="['system:user:add']"
           >工具发布</el-button>
-          <el-button icon="el-icon-delete" @click="handleDelete(selection)">批量删除</el-button>
-          <el-button icon="el-icon-download" @click="handleOpenExport()">导出</el-button>
+          <el-button icon="el-icon-delete" @click="handleDelete(selection)" v-hasPermi="['tool:batch:remove']">批量删除</el-button>
+          <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['tool:export']">导出</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" :selectable="selectable"/>
@@ -120,7 +119,7 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
-              <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus==='done'" @click="applyUse(scope.row)">申请使用</el-button>
+              <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus=='done'" @click="applyUse(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
               <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
@@ -192,11 +191,13 @@
     </el-drawer>
 
     <!-- 工具详情对话框 -->
-    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" size="85%" class="no-padding">
+    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" size="85%" class="no-padding" @close="handleCloseDetail()">
       <template #title>
         <span>工具名称</span>
       </template>
-      <tool-detail ref="toolDetailRef" :toolDetail="toolDetail"/>
+      <template v-if="detailOpen">
+        <tool-detail ref="toolDetailRef" :toolDetail="toolDetail"/>
+      </template>
     </el-drawer><!--el-drawer 详情-抽屉-->
 
   </div><!--app-container-->
@@ -251,6 +252,7 @@ export default {
       addDrawerOpen: false,
       exoportDrawerOpen: false,
       detailDrawerOpen: false,
+      detailOpen: false,
       detailActiveName: 'first',
       // 部门名称
       deptName: undefined,
@@ -436,6 +438,7 @@ export default {
     },
     handleDetail(row){
       this.detailDrawerOpen = true
+      this.detailOpen = true
       this.toolDetail = row
     },
     // 更多操作触发
@@ -482,9 +485,6 @@ export default {
         downloadCheck:false,
         excludeFields:excludeFields,
       }, `工具信息数据_${new Date().getTime()}.xlsx`)
-    },
-    handleUseApply(){
-
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -537,6 +537,16 @@ export default {
     },
     selectable(row,index){
       return row.recordStatus==='draft'&&row.createBy==this.userInfo.userId
+    },
+    /** 关闭详情 **/
+    handleCloseDetail(){
+      console.info("1111111111")
+      this.detailDrawerOpen = false;
+      this.detailOpen = false;
+      this.$refs.toolDetailRef.$destroy(); // 销毁组件
+      this.$nextTick(() => {
+        this.$refs.toolDetailRef = null; // 清空引用
+      });
     }
   }
 };
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index b12c35c..8a60542 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -67,65 +67,53 @@
         <div class="tit">评论</div>
       </div><!--tboper 标题与操作按钮-->
       <div class="pltextarea">
-        <el-input type="textarea" placeholder="请输入您的意见" :rows="4" maxlength="1000" show-word-limit></el-input>
-        <div class="plbtn"><el-button>发布</el-button></div>
+        <el-input v-model="discussionContent" type="textarea" placeholder="请输入您的意见" :rows="4" maxlength="1000" show-word-limit></el-input>
+        <div class="plbtn"><el-button @click="handleDiscussions">发布</el-button></div>
       </div><!--pltextarea-->
       <div class="pllist">
-        <div class="list">
-          <div class="luser"><span class="xuser">张</span></div>
-          <div class="ltext">
-            <div class="nt"><span class="name">张鑫辉</span><span class="time">05/01 12:00</span></div>
-            <div class="te">这个工具可以！</div>
-            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
-            <div class="pltextarea">
-              <el-input type="textarea" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
-              <div class="plbtn"><el-button>取消</el-button><el-divider direction="vertical"></el-divider><el-button>发布</el-button></div>
-            </div><!--pltextarea-->
-          </div>
-        </div><!--list-->
-        <div class="list">
-          <div class="luser"><span class="xuser">钱</span></div>
-          <div class="ltext">
-            <div class="nt"><span class="name">钱多多</span><span class="time">05/01 12:00</span></div>
-            <div class="te">好用！</div>
-            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
-            <div class="list">
-              <div class="luser"><span class="xuser">赵</span></div>
-              <div class="ltext">
-                <div class="nt"><span class="name">赵宇</span><span class="time">05/01 12:00</span></div>
-                <div class="te">希望再选代一下，还有待完善的地方。</div>
-                <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+        <template v-if="discussionsList && discussionsList.length > 0">
+          <div class="list" v-for="(item,index) in discussionsList" :key="item.id">
+            <div class="luser"><span class="xuser">{{getFirstChar(item.nickName)}}</span></div>
+            <div class="ltext">
+              <div class="nt"><span class="name">{{item.nickName}}</span><span class="time">{{ parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
+              <div class="te">{{item.content}}</div>
+              <div class="hb">
+                <a class="btn" @click="toggleReplyForm(index)">
+                  <i class="el-icon-chat-line-round"></i>回复
+                </a>
               </div>
-            </div><!--list-->
-            <div class="list">
-              <div class="luser"><span class="xuser">李</span></div>
-              <div class="ltext">
-                <div class="nt"><span class="name">李志</span><span class="time">05/01 12:00</span></div>
-                <div class="te">很好的解决了我的问题，感谢！</div>
-                <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+              <div class="pltextarea" v-if="showReplyForm[index]">
+                <el-input type="textarea" v-model="replyContent[index]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
+                <div class="plbtn">
+                  <el-button @click="cancelReply(index)">取消</el-button>
+                  <el-divider direction="vertical"></el-divider>
+                  <el-button @click="submitReply(index, item)">发布</el-button>
+                </div>
               </div>
-            </div><!--list-->
+              <!--第二层级-->
+              <template v-if="item.repliesList && item.repliesList.length > 0">
+                <div class="list" v-for="(repItem,repIdex) in item.repliesList" :key="repItem.id">
+                  <div class="luser"><span class="xuser">{{getFirstChar(repItem.nickName)}}</span></div>
+                  <div class="ltext">
+                    <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
+                    <div class="te">{{repItem.content}}</div>
+<!--                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
+                    <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
+                      <el-input type="textarea" v-model="item.replyContentSon[repIdex]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
+                      <div class="plbtn">
+                        <el-button @click="cancelReplySon(index,repIdex)">取消</el-button>
+                        <el-divider direction="vertical"></el-divider>
+                        <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
+                      </div>
+                    </div>-->
+                  </div>
+                </div>
+              </template>
+            </div>
           </div>
-        </div><!--list-->
-        <div class="list">
-          <div class="luser"><span class="xuser">赵</span></div>
-          <div class="ltext">
-            <div class="nt"><span class="name">赵宇</span><span class="time">05/01 12:00</span></div>
-            <div class="te">希望再选代一下，还有待完善的地方。</div>
-            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
-          </div>
-        </div><!--list-->
-        <div class="list">
-          <div class="luser"><span class="xuser">李</span></div>
-          <div class="ltext">
-            <div class="nt"><span class="name">李志</span><span class="time">05/01 12:00</span></div>
-            <div class="te">很好的解决了我的问题，感谢！</div>
-            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
-          </div>
-        </div><!--list-->
-      </div><!--pllist-->
-    </div><!--fl 右侧评论-->
-
+        </template>
+      </div>
+    </div>
     <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body>
       <i-frame :src="previewUrl" />
     </el-dialog>
@@ -137,6 +125,9 @@
 
 <script>
   import { listDocument, getDocument, delDocument, addDocument, updateDocument } from "@/api/document/document";
+  import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
+  import { listReplies, addReplies} from "@/api/tool/replies.js";
+
   import AddDoc from './AddDoc'
   import editDocument from "../document/editDocument";
   import { Base64 } from 'js-base64';
@@ -167,10 +158,25 @@
         title: '新增文档',
         open: false,
         loadingDownload: false,
+        discussionContent: null, // 评论内容
+        repliesContent: null, // 回复内容
+        // 评论列表
+        discussionsList: [],
+        // 回复列表
+        repliesList: [],
+        showReplyForm: [],
+        replyContent: [],
       }
     },
     created(){
       this.getDocList()
+      this.getDiscussionsList()
+    },
+    watch: {
+      discussionsList(newList) {
+        this.showReplyForm = new Array(newList.length).fill(false);
+        this.replyContent = new Array(newList.length).fill('');
+      }
     },
     methods:{
       getDocList() {
@@ -216,6 +222,152 @@
           self.loadingDownload = false
         },1000)
       },
+      getDiscussionsList() {
+        let self = this
+        listDiscussions({businessId:this.toolDetail.toolId}).then(res => {
+          self.discussionsList = res.rows
+          self.discussionsList.forEach(item => {
+            if(item.repliesList && item.repliesList.length > 0){
+              self.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
+              self.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
+            }else{
+              self.$set(item, 'showReplyFormSon', false)
+              self.$set(item, 'replyContentSon', '')
+            }
+          });
+        });
+      },
+      /** 评论 **/
+      handleDiscussions(){
+        let self = this
+        if (this.discussionContent == '' || this.discussionContent == null || this.discussionContent == undefined) {
+          self.$message({
+            message: '内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          businessId: this.toolDetail.toolId,
+          content: this.discussionContent,
+          type: "tool",
+        }
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addDiscussions(data).then(res => {
+            this.discussionContent = null
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.getDiscussionsList()
+          }).catch(err =>{
+            this.discussionContent = null
+            console.error("handleDiscussions==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+      },
+      getFirstChar(value) {
+        if(!value){return ''}
+        return value.charAt(0);
+      },
+      toggleReplyForm(index) {
+        this.$set(this.showReplyForm, index, !this.showReplyForm[index]);
+      },
+      cancelReply(index) {
+        this.$set(this.showReplyForm, index, false);
+        this.$set(this.replyContent, index, '');
+      },
+      /** 回复 **/
+      submitReply(index, item) {
+        let self = this
+        const content = this.replyContent[index];
+        if (content == '' || content == null || content == undefined) {
+          self.$message({
+            message: '回复内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          "discussionId": item.id,
+          "content": content,
+        }
+
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addReplies(data).then(res => {
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.cancelReply(index)
+            self.getDiscussionsList()
+          }).catch(err =>{
+            console.error("handleDiscussions==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+
+        // 清空回复内容并隐藏表单
+        this.replyContent[index] = '';
+        this.showReplyForm[index] = false;
+      },
+
+
+
+      /** 第二级 **/
+      toggleReplyFormSon(parentIndex, repIndex) {
+        const parentItem = this.discussionsList[parentIndex];
+        this.$set(parentItem.showReplyFormSon, repIndex, !parentItem.showReplyFormSon[repIndex]);
+        // this.$set(this.showReplyFormSon, index, !this.showReplyFormSon[index]);
+      },
+      /** 第二级，取消回复 **/
+      cancelReplySon(parentIndex, repIndex) {
+        const parentItem = this.discussionsList[parentIndex];
+        this.$set(parentItem.showReplyFormSon, repIndex, false);
+        this.$set(parentItem.replyContentSon, repIndex, '');
+      },
+      /** 第二级回复 **/
+      submitReplySon(parentIndex, repIndex, repItem) {
+        let self = this
+        const parentItem = this.discussionsList[parentIndex];
+        const content = parentItem.replyContentSon[repIndex];
+        if (content.trim() == '' || content == null || content == undefined) {
+          self.$message({
+            message: '回复内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          "discussionId": repItem.id,
+          "content": content,
+        }
+
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addReplies(data).then(res => {
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.cancelReplySon(parentIndex, repIndex)
+            self.getDiscussionsList()
+          }).catch(err =>{
+            console.error("submitReplySon==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+
+        // 清空回复内容并隐藏表单
+        this.$set(parentItem.replyContentSon, repIndex, '');
+        this.$set(parentItem.showReplyFormSon, repIndex, false);
+      },
     }
   }
 </script>
-- 
2.35.1.windows.2


From fd777e677496392492121628c2d5608f3e7e5e0f Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sat, 31 Aug 2024 10:37:58 +0800
Subject: [PATCH 08/55] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/documentCategory/documentCategory.js | 55 ++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/api/documentCategory/documentCategory.js

diff --git a/src/api/documentCategory/documentCategory.js b/src/api/documentCategory/documentCategory.js
new file mode 100644
index 0000000..c6d97bc
--- /dev/null
+++ b/src/api/documentCategory/documentCategory.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 查询文档资源分类管理列表
+export function listCategory(query) {
+  return request({
+    url: '/system/category/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询文档资源分类管理详细
+export function getCategory(id) {
+  return request({
+    url: '/system/category/' + id,
+    method: 'get'
+  })
+}
+
+// 新增文档资源分类管理
+export function addCategory(data) {
+  return request({
+    url: '/system/category',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改文档资源分类管理
+export function updateCategory(data) {
+  return request({
+    url: '/system/category',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除文档资源分类管理
+export function delCategory(id) {
+  return request({
+    url: '/system/category/' + id,
+    method: 'delete'
+  })
+}
+
+
+// 获取文档分类树列表
+export function documentTree(query) {
+  return request({
+    url: '/system/category/documentTree',
+    method: 'get',
+    params: query
+  })
+}
+
-- 
2.35.1.windows.2


From 4193ac47176a272fa4a846297933e88b13c96166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B4=E6=9C=97?= <464174023@qq.com>
Date: Sat, 31 Aug 2024 15:16:35 +0800
Subject: [PATCH 09/55] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=9A=84=E5=BD=92?=
 =?UTF-8?q?=E5=B1=9E=E9=83=A8=E9=97=A8=E5=BF=85=E5=A1=AB=EF=BC=9B=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=BC=E5=85=A5=E3=80=81=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9a0c2da..8b7b87d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -101,6 +101,7 @@
             @click="handleDelete"
             v-hasPermi="['system:user:remove']"
           >删除</el-button>
+          <!-- 
           <el-button
             plain
             icon="el-icon-upload2"
@@ -114,7 +115,7 @@
             size="mini"
             @click="handleExport"
             v-hasPermi="['system:user:export']"
-          >导出</el-button>
+          >导出</el-button>-->
         </div>
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
@@ -261,7 +262,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option
                   v-for="item in roleOptions"
@@ -411,6 +412,9 @@ export default {
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" }
+        ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
@@ -429,7 +433,10 @@ export default {
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
-        ]
+        ],
+        roleIds: [
+          { required: true, message: "角色不能为空", trigger: "blur" }
+        ],
       }
     };
   },
-- 
2.35.1.windows.2


From 5dfd87e1d1e26781dd3d9e5c782c06ae042fd331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B4=E6=9C=97?= <464174023@qq.com>
Date: Sat, 31 Aug 2024 15:16:55 +0800
Subject: [PATCH 10/55] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=9B=E6=93=8D=E4=BD=9C=E5=88=97=E7=9A=84=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90-=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E4=BF=9D=E7=95=99=E5=85=A8=E9=83=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E3=80=81=E6=9C=AC=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0bded8c..1d0ed6d 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -79,13 +79,14 @@
             @click="handleDelete"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
+          <!-- 
           <el-button
             plain
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
             v-hasPermi="['system:role:export']"
-          >导出</el-button>
+          >导出</el-button>-->
         </div>
 
         <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
@@ -285,14 +286,16 @@ export default {
           value: "1",
           label: "全部数据权限"
         },
+        /*
         {
           value: "2",
           label: "自定数据权限"
-        },
+        },*/
         {
           value: "3",
           label: "本部门数据权限"
-        },
+        }
+        /*,
         {
           value: "4",
           label: "本部门及以下数据权限"
@@ -300,7 +303,7 @@ export default {
         {
           value: "5",
           label: "仅本人数据权限"
-        }
+        }*/
       ],
       // 菜单列表
       menuOptions: [],
-- 
2.35.1.windows.2


From bc6f4a50ea300834261bc4ac2f03ffe2c4ce30e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B4=E6=9C=97?= <464174023@qq.com>
Date: Sat, 31 Aug 2024 15:17:15 +0800
Subject: [PATCH 11/55] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AD=97=E5=85=B8=EF=BC=8C=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=EF=BC=9B=E5=9C=A8=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=EF=BC=9B=20=E7=82=B9=E5=87=BB=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=AD=97=E5=85=B8=E5=88=97=E8=A1=A8=E5=86=85?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict/type.js        |   9 +
 src/views/system/bizdict/data.vue  | 392 +++++++++++++++++++++++++++++
 src/views/system/bizdict/index.vue | 341 +++++++++++++++++++++++++
 src/views/system/dict/index.vue    |   3 +-
 4 files changed, 744 insertions(+), 1 deletion(-)
 create mode 100644 src/views/system/bizdict/data.vue
 create mode 100644 src/views/system/bizdict/index.vue

diff --git a/src/api/system/dict/type.js b/src/api/system/dict/type.js
index a7a6e01..b281f58 100644
--- a/src/api/system/dict/type.js
+++ b/src/api/system/dict/type.js
@@ -9,6 +9,15 @@ export function listType(query) {
   })
 }
 
+// 查询业务字典类型列表（扩展）
+export function bizListType(query) {
+  return request({
+    url: '/system/dict/type/bizlist',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询字典类型详细
 export function getType(dictId) {
   return request({
diff --git a/src/views/system/bizdict/data.vue b/src/views/system/bizdict/data.vue
new file mode 100644
index 0000000..d626817
--- /dev/null
+++ b/src/views/system/bizdict/data.vue
@@ -0,0 +1,392 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="字典名称" prop="dictType">
+          <el-select v-model="queryParams.dictType">
+            <el-option
+              v-for="item in typeOptions"
+              :key="item.dictId"
+              :label="item.dictName"
+              :value="item.dictType"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="字典标签" prop="dictLabel">
+          <el-input
+            v-model="queryParams.dictLabel"
+            placeholder="请输入字典标签"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card class="lrtt">
+      <div class="rt">
+        <div class="operate">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['system:dict:add']"
+          >新增</el-button>
+          <el-button
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['system:dict:edit']"
+          >修改</el-button>
+          <el-button
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:dict:remove']"
+          >删除</el-button>
+          <el-button
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['system:dict:export']"
+          >导出</el-button>
+          <el-button
+            plain
+            icon="el-icon-close"
+            size="mini"
+            @click="handleClose"
+          >关闭</el-button>
+        </div>
+        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="字典编码" align="center" prop="dictCode" />
+          <el-table-column label="字典标签" align="center" prop="dictLabel">
+            <template slot-scope="scope">
+              <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+              <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="字典键值" align="center" prop="dictValue" />
+          <el-table-column label="字典排序" align="center" prop="dictSort" />
+          <el-table-column label="状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:dict:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:dict:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </el-card>
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="字典类型">
+          <el-input v-model="form.dictType" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="数据标签" prop="dictLabel">
+          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
+        </el-form-item>
+        <el-form-item label="数据键值" prop="dictValue">
+          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+        </el-form-item>
+        <el-form-item label="样式属性" prop="cssClass">
+          <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
+        </el-form-item>
+        <el-form-item label="显示排序" prop="dictSort">
+          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="回显样式" prop="listClass">
+          <el-select v-model="form.listClass">
+            <el-option
+              v-for="item in listClassOptions"
+              :key="item.value"
+              :label="item.label + '(' + item.value + ')'"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
+
+export default {
+  name: "Data",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      dataList: [],
+      // 默认字典类型
+      defaultDictType: "",
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 数据标签回显样式
+      listClassOptions: [
+        {
+          value: "default",
+          label: "默认"
+        },
+        {
+          value: "primary",
+          label: "主要"
+        },
+        {
+          value: "success",
+          label: "成功"
+        },
+        {
+          value: "info",
+          label: "信息"
+        },
+        {
+          value: "warning",
+          label: "警告"
+        },
+        {
+          value: "danger",
+          label: "危险"
+        }
+      ],
+      // 类型数据字典
+      typeOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictType: undefined,
+        dictLabel: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictLabel: [
+          { required: true, message: "数据标签不能为空", trigger: "blur" }
+        ],
+        dictValue: [
+          { required: true, message: "数据键值不能为空", trigger: "blur" }
+        ],
+        dictSort: [
+          { required: true, message: "数据顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    const dictId = this.$route.params && this.$route.params.dictId;
+    this.getType(dictId);
+    this.getTypeList();
+  },
+  methods: {
+    /** 查询字典类型详细 */
+    getType(dictId) {
+      getType(dictId).then(response => {
+        this.queryParams.dictType = response.data.dictType;
+        this.defaultDictType = response.data.dictType;
+        this.getList();
+      });
+    },
+    /** 查询字典类型列表 */
+    getTypeList() {
+      getDictOptionselect().then(response => {
+        this.typeOptions = response.data;
+      });
+    },
+    /** 查询字典数据列表 */
+    getList() {
+      this.loading = true;
+      listData(this.queryParams).then(response => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictCode: undefined,
+        dictLabel: undefined,
+        dictValue: undefined,
+        cssClass: undefined,
+        listClass: 'default',
+        dictSort: 0,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 返回按钮操作 */
+    handleClose() {
+      const obj = { path: "/system/dict" };
+      this.$tab.closeOpenPage(obj);
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.dictType = this.defaultDictType;
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典数据";
+      this.form.dictType = this.queryParams.dictType;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.dictCode)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const dictCode = row.dictCode || this.ids
+      getData(dictCode).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改字典数据";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.dictCode != undefined) {
+            updateData(this.form).then(response => {
+              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addData(this.form).then(response => {
+              this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictCodes = row.dictCode || this.ids;
+      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
+        return delData(dictCodes);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+        this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/dict/data/export', {
+        ...this.queryParams
+      }, `data_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/system/bizdict/index.vue b/src/views/system/bizdict/index.vue
new file mode 100644
index 0000000..49dc791
--- /dev/null
+++ b/src/views/system/bizdict/index.vue
@@ -0,0 +1,341 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="字典名称" prop="dictName">
+          <el-input
+            v-model="queryParams.dictName"
+            placeholder="请输入字典名称"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input
+            v-model="queryParams.dictType"
+            placeholder="请输入字典类型"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select
+            v-model="queryParams.status"
+            placeholder="字典状态"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card class="lrtt">
+      <div class="rt">
+        <div class="operate">
+          <!-- 
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['system:dict:add']"
+          >新增</el-button>
+          <el-button
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['system:dict:edit']"
+          >修改</el-button>
+          <el-button
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:dict:remove']"
+          >删除</el-button>-->
+          <!-- 
+          <el-button
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['system:dict:export']"
+          >导出</el-button>-->
+          <el-button
+            plain
+            icon="el-icon-refresh"
+            size="mini"
+            @click="handleRefreshCache"
+            v-hasPermi="['system:dict:remove']"
+          >刷新缓存</el-button>
+        </div>
+        <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="字典编号" align="center" prop="dictId" />
+          <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+          <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+                <span>{{ scope.row.dictType }}</span>
+              </router-link>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <!-- 
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:dict:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:dict:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+          -->
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </el-card>
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="字典名称" prop="dictName">
+          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
+        </el-form-item>
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { bizListType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+
+export default {
+  name: "Dict",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictName: [
+          { required: true, message: "字典名称不能为空", trigger: "blur" }
+        ],
+        dictType: [
+          { required: true, message: "字典类型不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询字典类型列表 */
+    getList() {
+      this.loading = true;
+      bizListType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.typeList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictId: undefined,
+        dictName: undefined,
+        dictType: undefined,
+        status: "0",
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加字典类型";
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.dictId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const dictId = row.dictId || this.ids
+      getType(dictId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改字典类型";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.dictId != undefined) {
+            updateType(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addType(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const dictIds = row.dictId || this.ids;
+      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
+        return delType(dictIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/dict/type/export', {
+        ...this.queryParams
+      }, `type_${new Date().getTime()}.xlsx`)
+    },
+    /** 刷新缓存按钮操作 */
+    handleRefreshCache() {
+      refreshCache().then(() => {
+        this.$modal.msgSuccess("刷新成功");
+        this.$store.dispatch('dict/cleanDict');
+      });
+    }
+  }
+};
+</script>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 520709a..de26be7 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -80,13 +80,14 @@
             @click="handleDelete"
             v-hasPermi="['system:dict:remove']"
           >删除</el-button>
+          <!-- 
           <el-button
             plain
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
             v-hasPermi="['system:dict:export']"
-          >导出</el-button>
+          >导出</el-button>-->
           <el-button
             plain
             icon="el-icon-refresh"
-- 
2.35.1.windows.2


From 398b49b910cfc4526738b861e80b95289f6bbfb7 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sat, 31 Aug 2024 16:12:39 +0800
Subject: [PATCH 12/55] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/message/message.js                    |  77 ++++++------
 src/api/tool/downloadCount.js                 |  55 +++++++++
 src/api/tool/tool.js                          |  10 ++
 src/views/message/index.vue                   |  99 ++++++++-------
 src/views/statistic/PieChart.vue              |   2 +-
 src/views/statistic/index.vue                 | 114 +++++++++++++-----
 src/views/tool/index.vue                      |   4 +-
 src/views/tool/toolDetail.vue                 |  10 +-
 .../workflowList/addWorkflow/tool_release.vue |  17 ++-
 9 files changed, 267 insertions(+), 121 deletions(-)
 create mode 100644 src/api/tool/downloadCount.js

diff --git a/src/api/message/message.js b/src/api/message/message.js
index bda0394..e6a0c2b 100644
--- a/src/api/message/message.js
+++ b/src/api/message/message.js
@@ -1,45 +1,54 @@
 import request from '@/utils/request'
 
-/**
- * 查询消息列表
- * @returns
- */
-export function getMessageList(params) {
-  return Promise.resolve({
-    total: 5,
-    rows: [
-      { id: 1, msgContent: '测试1111', msgRecTime: '2024-08-05 12:31:59', msgStatus: 'unread' },
-      { id: 2, msgContent: '测试2222', msgRecTime: '2024-08-05 13:32:01', msgStatus: 'readed' },
-      { id: 3, msgContent: '测试333', msgRecTime: '2024-08-05 14:09:07', msgStatus: 'unread' },
-      { id: 4, msgContent: '测试4444', msgRecTime: '2024-08-05 15:37:10', msgStatus: 'readed' },
-      { id: 5, msgContent: '测试5555', msgRecTime: '2024-08-05 17:29:39', msgStatus: 'unread' }
-    ],
-    code: 200,
-    msg: '操作成功'
+// 查询消息列表
+export function listMessage(query) {
+  return request({
+    url: '/system/message/list',
+    method: 'get',
+    params: query
   })
 }
 
-/**
- * 标记所有已读
- * @returns
- */
-export function markAllRead() {
-  return Promise.resolve({
-    result: {},
-    code: 200,
-    msg: '操作成功'
+// 查询消息详细
+export function getMessage(id) {
+  return request({
+    url: '/system/message/' + id,
+    method: 'get'
   })
 }
 
-/**
- * 根据id标记单个已读
- * @returns
- */
-export function markReadById(id) {
-  return Promise.resolve({
-    result: {},
-    code: 200,
-    msg: '操作成功'
+// 新增消息
+export function addMessage(data) {
+  return request({
+    url: '/system/message',
+    method: 'post',
+    data: data
   })
 }
 
+// 修改消息
+export function updateMessage(data) {
+  return request({
+    url: '/system/message',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除消息
+export function delMessage(id) {
+  return request({
+    url: '/system/message/' + id,
+    method: 'delete'
+  })
+}
+
+
+// 全部标记已读
+export function allMarkedRead(data) {
+  return request({
+    url: '/system/message/allMarkedRead',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/tool/downloadCount.js b/src/api/tool/downloadCount.js
new file mode 100644
index 0000000..517e36b
--- /dev/null
+++ b/src/api/tool/downloadCount.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 查询工具下载统计列表
+export function listCount(query) {
+  return request({
+    url: '/system/count/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据详情统计
+export function userDownList(query) {
+  return request({
+    url: '/system/count/user/down/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+// 查询工具下载统计详细
+export function getCount(id) {
+  return request({
+    url: '/system/count/' + id,
+    method: 'get'
+  })
+}
+
+// 新增工具下载统计
+export function addCount(data) {
+  return request({
+    url: '/system/count',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工具下载统计
+export function updateCount(data) {
+  return request({
+    url: '/system/count',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工具下载统计
+export function delCount(id) {
+  return request({
+    url: '/system/count/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/tool/tool.js b/src/api/tool/tool.js
index 1c5304e..6b1c674 100644
--- a/src/api/tool/tool.js
+++ b/src/api/tool/tool.js
@@ -59,3 +59,13 @@ export function checkToolExist(params) {
     params: params
   })
 }
+
+
+// 获取统计信息
+export function getStatistics(query) {
+  return request({
+    url: '/tool/statistics',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 8e4a34a..5227e8b 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -4,15 +4,25 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
         <div class="search">
           <div class="sl">
-            <el-form-item label="消息内容" prop="mesContent">
+            <el-form-item label="消息内容" prop="content">
               <el-input
-                v-model="queryParams.mesContent"
+                v-model="queryParams.content"
                 placeholder="请输入消息内容"
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="状态" prop="states">
+              <el-select v-model="queryParams.states" placeholder="状态" clearable>
+                <el-option
+                  v-for="dict in dict.type.msg_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
           </div>
           <div class="sr">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -22,40 +32,18 @@
       </el-form>
     </el-card>
     <el-card class="lrtt">
-      <div class="lt">
-        <el-input
-          v-model="deptName"
-          placeholder="请输入部门名称"
-          clearable
-          size="small"
-          prefix-icon="el-icon-search"
-          style="margin-bottom: 20px"
-        />
-        <div class="divide"></div><!--divide 分隔-->
-        <el-tree
-          :data="deptOptions"
-          :props="defaultProps"
-          :expand-on-click-node="false"
-          :filter-node-method="filterNode"
-          ref="tree"
-          node-key="id"
-          default-expand-all
-          highlight-current
-          @node-click="handleNodeClick"
-        />
-      </div><!--lt 左-->
       <div class="rt">
         <div class="operate">
-          <el-button type="primary" @click="markRead(null)">全部标记已读</el-button>
+          <el-button type="primary" @click="setAllMarkedRead">全部标记已读</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="tableList">
-          <el-table-column label="消息内容" prop="msgContent" min-width="120" />
-          <el-table-column label="接收时间" prop="msgRecTime" :show-overflow-tooltip="true" min-width="120"/>
-          <el-table-column label="消息状态" prop="msgStatus" :show-overflow-tooltip="true" min-width="80" >
+          <el-table-column label="消息内容" prop="content" min-width="120" />
+          <el-table-column label="接收时间" prop="createTime" :show-overflow-tooltip="true" min-width="120"/>
+          <el-table-column label="消息状态" prop="states" :show-overflow-tooltip="true" min-width="80" >
             <template  v-slot="{ row }">
               <template v-for="dict in dict.type.msg_status">
                 <!-- {{ dict }} -->
-                <el-tag :type="dict.raw.listClass" v-if="row.msgStatus == dict.value" :key="dict.value">{{ dict.label }}</el-tag>
+                <el-tag :type="dict.raw.listClass" v-if="row.states == dict.value" :key="dict.value">{{ dict.label }}</el-tag>
               </template>
             </template>
           </el-table-column>
@@ -64,8 +52,8 @@
               <el-button
                 size="mini"
                 type="text"
-                v-if="row.msgStatus === 'unread'"
-                @click="markRead(row.id)"
+                v-if="row.states == '1'"
+                @click="markRead(row)"
               >标记已读</el-button>
             </template>
           </el-table-column>
@@ -83,7 +71,7 @@
 </template>
 
 <script>
-import { markAllRead, markReadById, getMessageList } from "@/api/message/message"
+import { listMessage, getMessage, delMessage, addMessage, updateMessage,allMarkedRead } from "@/api/message/message"
 import { deptTreeSelect } from "@/api/system/user";
 
 export default {
@@ -128,7 +116,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        mesContent: ''
+        content: '',
+        states: '',
       },
     };
   },
@@ -145,7 +134,8 @@ export default {
     },
     getList() {
       this.loading = true
-      getMessageList(this.queryParams).then(response => {
+      this.$set(this.queryParams,"createById", this.$store.getters.userId)
+      listMessage(this.queryParams).then(response => {
         this.total = response?.total
         this.tableList = response?.rows || []
         this.loading = false
@@ -176,24 +166,41 @@ export default {
      * 标记已读：id为null时表示标记全部已读
      * @param id
      */
-    markRead(id) {
-      this.$confirm('确认标记已读吗？', '提示', {
+    markRead(row) {
+      let self = this
+      self.$confirm('确认标记已读吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        if(id) {
-          markReadById(id).then(response => {
-            this.$modal.msgSuccess(response?.msg || '操作成功')
-            this.getList();
-          })
-        } else {
-          markAllRead().then(response => {
-            this.$modal.msgSuccess(response?.msg || '操作成功')
-            this.getList();
+        let formData = JSON.parse(JSON.stringify(row))
+        self.$set(formData, "states", 2)
+          updateMessage(formData).then(response => {
+            self.$modal.msgSuccess(response?.msg || '操作成功')
+            self.getList();
           })
+      }).catch((err) => {console.error(err)});
+    },
+
+    /**
+     * 标记已读：id为null时表示标记全部已读
+     * @param id
+     */
+    setAllMarkedRead() {
+      let self = this
+      self.$confirm('确认全部标记已读吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let formData = {
+          "states": 2
         }
-      }).catch(() => {});
+        allMarkedRead(formData).then(response => {
+          self.$modal.msgSuccess(response?.msg || '操作成功')
+          self.getList();
+        })
+      }).catch((err) => {console.error(err)});
     },
   }
 };
diff --git a/src/views/statistic/PieChart.vue b/src/views/statistic/PieChart.vue
index b27039b..e6a7360 100644
--- a/src/views/statistic/PieChart.vue
+++ b/src/views/statistic/PieChart.vue
@@ -85,7 +85,7 @@ export default {
         },
         series: [
           {
-            name: 'WEEKLY WRITE ARTICLES',
+            name: '',
             type: 'pie',
             roseType: this.roseType,
             radius: this.radius,
diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue
index 91f277f..5ae676c 100644
--- a/src/views/statistic/index.vue
+++ b/src/views/statistic/index.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="pageloading">
     <el-row :gutter="20">
       <el-col :span="12">
         <el-card>
           <div slot="header" class="clearfix"><span class="tline">工具类别统计</span></div>
           <!--  -->
-          <div class="tjbox2">
+          <div class="tjbox2" v-if="isPieChart">
             <PieChart
               height="207px"
               :data="toolTypeData"
@@ -20,7 +20,7 @@
       <el-col :span="12">
         <el-card>
           <div slot="header" class="clearfix"><span class="tline">工具状态统计</span></div>
-          <div class="tjbox2">
+          <div class="tjbox2" v-if="isPieChart">
             <PieChart
               height="207px"
               :data="toolStatusData"
@@ -39,7 +39,7 @@
       <el-col :span="12">
         <el-card>
           <div slot="header" class="clearfix"><span class="tline">工具来源统计</span></div>
-          <div class="tjbox2">
+          <div class="tjbox2" v-if="isPieChart">
             <PieChart
               height="207px"
               :data="toolSourceData"
@@ -133,11 +133,15 @@
 </template>
 
 <script>
+import { getStatistics } from "@/api/tool/tool";
+import { listCount,userDownList } from "@/api/tool/downloadCount";
+
 import PieChart from './PieChart'
 import DownStatDetail from './DownStatDetail'
 import { getToolDownStat, getToolDownDetailStatistics } from '@/api/statistic/statistic'
 export default {
   name: 'statistic',
+  dicts: ['tool_type', 'flow_status', 'tool_source'],
   components: {
     PieChart,
     DownStatDetail
@@ -147,24 +151,27 @@ export default {
       toolDownDetailStatList: [],
       activeName: 'first',
       toolTypeData: [
-        { value: 320, name: '检测型' },
-        { value: 240, name: '服务型' }
+        /*{ value: 320, name: '检测型' },
+        { value: 240, name: '服务型' }*/
       ],
-      toolTypeLegendData:['检测型', '服务型'],
+      // toolTypeLegendData:['检测型', '服务型'],
+      toolTypeLegendData:[],
       toolStatusData: [
-        { value: 212, name: '已保存' },
+       /* { value: 212, name: '已保存' },
         { value: 76, name: '审批中' },
         { value: 32, name: '审批不通过' },
-        { value: 971, name: '已发布' }
+        { value: 971, name: '已发布' }*/
       ],
-      toolStatusLegendData: ['已保存','审批中','审批不通过','已发布'],
+      // toolStatusLegendData: ['已保存','审批中','审批不通过','已发布'],
+      toolStatusLegendData: [],
       toolSourceData: [
-        { value: 20, name: 'QQ' },
+        /*{ value: 20, name: 'QQ' },
         { value: 60, name: '微信' },
         { value: 18, name: '官网' },
-        { value: 47, name: '熟人介绍' }
+        { value: 47, name: '熟人介绍' }*/
       ],
-      toolSourceLegendData: ['QQ', '微信', '官网', '熟人介绍'],
+      // toolSourceLegendData: ['QQ', '微信', '官网', '熟人介绍'],
+      toolSourceLegendData: [],
       // 日期范围
       dateRange: [],
       toolDownStatList: [],
@@ -174,12 +181,11 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        mesContent: ''
       },
       queryParams1: {
         pageNum: 1,
         pageSize: 10,
-        mesContent: ''
+        toolId: ''
       },
       // 工具下载统计详情组件控制属性
       detailDrawerOpen: false,
@@ -188,10 +194,12 @@ export default {
       // 工具名称
       toolName: '',
       total: 0,
-      loading: false
+      loading: false,
+      isPieChart: false,
     }
   },
   created () {
+    this.getCountData()
     this.getToolDownStatistics()
   },
   methods: {
@@ -199,16 +207,19 @@ export default {
       this.getToolDownDetailStatistics()
     },
     getToolDownDetailStatistics() {
+      let self = this
       this.loading = true
-      getToolDownDetailStatistics({ ...this.detailQueryParams, toolId: this.toolId }).then(response => {
-        this.total = response?.total
-        this.toolDownDetailStatList = response?.rows || []
-        this.loading = false
-      }).catch(() => { this.loading = false });
+      userDownList(this.addDateRange(this.queryParams1)).then(res => {
+        console.info("res=========", res)
+        self.total = res?.total
+        self.toolDownDetailStatList = res?.rows || []
+        self.loading = false
+      }).catch(() => { self.loading = false });
     },
     // 工具下载重置查询
     reset() {
       this.toolDownStatList = []
+      this.dateRange = []
       this.resetForm("queryForm")
       this.handleQuery()
     },
@@ -223,18 +234,65 @@ export default {
      * 获取工具下载列表数据
      */
     getToolDownStatistics() {
+      let self = this
       this.downLoading = true
-      getToolDownStat(this.queryParams).then(response => {
-        this.downTotal = response?.total
-        this.toolDownStatList = response?.rows || []
-        this.downLoading = false
-      }).catch(() => { this.downLoading = false });
+      listCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+        console.info("res=========", res)
+        self.total = res?.total
+        self.toolDownStatList = res?.rows || []
+        self.downLoading = false
+      }).catch(() => { self.downLoading = false });
+
     },
     handleDetail(row){
-      this.toolId = row.id
-      this.toolName = row.toolName
+      this.$set(this.queryParams1, "toolId", row.toolId)
       this.detailDrawerOpen = true
     },
+    /** 统计类型、类别、状态**/
+    getCountData(){
+      let self = this
+      self.toolTypeData = []
+      self.toolTypeLegendData = []
+
+
+      self.toolStatusData = []
+      self.toolStatusLegendData = []
+
+      self.toolSourceData = []
+      self.toolSourceLegendData = []
+      self.pageloading = true
+
+      getStatistics(this.queryParams).then(res => {
+        console.info("res===========", res)
+        if(res.data){
+          //类别
+          self.toolTypeData = JSON.parse(JSON.stringify(res.data.countToolType))
+          self.toolTypeData.forEach(item => {
+            self.toolTypeLegendData.push(item.name)
+          })
+
+          //状态
+          self.toolStatusData = JSON.parse(JSON.stringify(res.data.recordStatus))
+          self.toolStatusData.forEach(item => {
+            self.toolStatusLegendData.push(item.name)
+          })
+
+          //来源
+          self.toolSourceData = JSON.parse(JSON.stringify(res.data.toolSource))
+          self.toolSourceData.forEach(item => {
+            self.toolSourceLegendData.push(item.name)
+          })
+          self.isPieChart= true
+          self.pageloading= false
+        }
+       /* console.info("countToolType==============", this.dict.type.tool_type)
+        console.info("res===========", res)*/
+      }).catch((err) => {
+        self.isPieChart= true
+        self.pageloading= false
+        console.error(err)
+      });
+    }
   }
 }
 </script>
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index ec80dbe..ab6afff 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -104,7 +104,7 @@
           <el-table-column label="负责人" align="center" key="toolPrincipalsName" prop="toolPrincipalsName" v-if="columns[4].visible" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+              <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -215,7 +215,7 @@ import mainComponent from "@/components/mainComponent/index.vue";
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'tool_type'],
+  dicts: ['sys_normal_disable', 'tool_type', 'tool_status'],
   components: { Treeselect, toolDetail, AddDoc,mainComponent },
   data() {
     return {
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 8a60542..c291293 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -8,10 +8,10 @@
               <el-row>
                 <el-col :span="12"> <el-form-item label="工具名称">{{toolDetail.toolName}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="工具类别"><dict-tag :options="dict.type.tool_type" :value="toolDetail.toolType"/></el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具来源">{{toolDetail.toolSource}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具来源"><dict-tag :options="dict.type.tool_source" :value="toolDetail.toolSource"/></el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="负责人">{{toolDetail.toolPrincipalsName}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="归属单位">{{toolDetail.toolRespDeptName}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="状态"><dict-tag :options="dict.type.sys_normal_disable" :value="toolDetail.status"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="状态"><dict-tag :options="dict.type.tool_status" :value="toolDetail.status"/></el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="工具用途">{{toolDetail.toolUse}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="测评情况">{{toolDetail.testSituation}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="功能描述">{{toolDetail.functionDesc}}</el-form-item> </el-col>
@@ -47,8 +47,8 @@
                 <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180">
-              <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+            <el-table-column label="操作" align="center" width="180" v-if="toolDetail.downloadStatus">
+              <template slot-scope="scope">
                 <el-button
                   size="mini"
                   type="text"
@@ -136,7 +136,7 @@
   export default {
     name: 'toolDetail',
     components: { editDocument, AddDoc, iFrame },
-    dicts:['sys_normal_disable','tool_type','doc_class','doc_source'],
+    dicts:['sys_normal_disable','tool_type','tool_source','tool_status','doc_class','doc_source'],
     props: {
       toolDetail: {
         type: Object,
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 06ebc9f..29aa52c 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -55,8 +55,15 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="工具来源" prop="toolSource">
-                <el-input v-if="editStatus" v-model="form.toolSource" placeholder="请输入工具来源"/>
-                <span v-else>{{form.toolSource}}</span>
+                <el-select v-if="editStatus" v-model="form.toolSource" placeholder="请选择工具来源" style="width: 100%">
+                  <el-option
+                    v-for="dict in dict.type.tool_source"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+                <dict-tag v-else :options="dict.type.tool_source" :value="form.toolSource"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -84,12 +91,12 @@
               <el-form-item label="状态" prop="status">
                 <el-radio-group v-model="form.status" v-if="editStatus">
                   <el-radio
-                    v-for="dict in dict.type.sys_normal_disable"
+                    v-for="dict in dict.type.tool_status"
                     :key="dict.value"
                     :label="dict.value"
                   >{{dict.label}}</el-radio>
                 </el-radio-group>
-                <dict-tag v-else :options="dict.type.sys_normal_disable" :value="form.status"/>
+                <dict-tag v-else :options="dict.type.tool_status" :value="form.status"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -301,7 +308,7 @@ import ToolSelector from '@/components/tool-selector/index.vue'
 import { Base64 } from 'js-base64'
 // PDF本地文件预览
 export default {
-  dicts: ['sys_normal_disable','tool_type','doc_source','doc_class'],
+  dicts: ['sys_normal_disable','tool_type', 'tool_source', 'tool_status', 'doc_source','doc_class'],
   components: {
     ToolSelector,
     blUserSelector,
-- 
2.35.1.windows.2


From 3a4591c75bf357b4abb98bd983651a393f8a5fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=B4=E6=9C=97?= <464174023@qq.com>
Date: Sat, 31 Aug 2024 17:57:40 +0800
Subject: [PATCH 13/55] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/document/document.js               |  10 ++
 src/views/filestatistic/DownStatDetail.vue |  87 +++++++++++
 src/views/filestatistic/PieChart.vue       | 102 +++++++++++++
 src/views/filestatistic/index.vue          | 163 +++++++++++++++++++++
 4 files changed, 362 insertions(+)
 create mode 100644 src/views/filestatistic/DownStatDetail.vue
 create mode 100644 src/views/filestatistic/PieChart.vue
 create mode 100644 src/views/filestatistic/index.vue

diff --git a/src/api/document/document.js b/src/api/document/document.js
index 080e497..a86601b 100644
--- a/src/api/document/document.js
+++ b/src/api/document/document.js
@@ -52,3 +52,13 @@ export function pushDoc(id) {
     method: 'put'
   })
 }
+
+
+// 获取统计信息
+export function getStatistics(query) {
+  return request({
+    url: '/document/statistics',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/views/filestatistic/DownStatDetail.vue b/src/views/filestatistic/DownStatDetail.vue
new file mode 100644
index 0000000..a8c7067
--- /dev/null
+++ b/src/views/filestatistic/DownStatDetail.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog
+    :title="`${toolName}下载详情统计`"
+    :visible.sync="visible"
+    width="85%"
+    append-to-body
+    @open="openEvent"
+    @close="visible = false"
+  >
+    <el-table v-loading="loading" :data="toolDownDetailStatList">
+      <el-table-column label="下载用户" align="center" key="userName" prop="userName" min-width="120" />
+      <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" min-width="120" />
+      <el-table-column label="下载时间" align="center" key="donwTime" prop="donwTime" min-width="120" />
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="detailQueryParams.pageNum"
+      :limit.sync="detailQueryParams.pageSize"
+      @pagination="getToolDownDetailStatistics"
+    />
+  </el-dialog>
+</template>
+<script>
+import { getToolDownDetailStatistics } from '@/api/statistic/statistic'
+export default {
+  props: {
+    /**
+     * 控制显示/隐藏
+     */
+    show: {
+      type: Boolean,
+      default: false
+    },
+    /**
+     * 工具id
+     */
+    toolId: {
+      type: String,
+      default: ''
+    },
+    /**
+     * 工具名称
+     */
+     toolName: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    visible: {
+      get() {
+        return this.show
+      },
+      set(val) {
+        this.$emit('update:show', false)
+      }
+    }
+  },
+  data () {
+    return {
+      toolDownDetailStatList: [],
+      total: 0,
+      loading: false,
+      // 查询参数
+      detailQueryParams: {
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  methods: {
+    openEvent(){
+      this.visible = false
+      this.getToolDownDetailStatistics()
+    },
+    getToolDownDetailStatistics() {
+      this.loading = true
+      getToolDownDetailStatistics({ ...this.detailQueryParams, toolId: this.toolId }).then(response => {
+        this.total = response?.total
+        this.toolDownDetailStatList = response?.rows || []
+        this.loading = false
+      }).catch(() => { this.loading = false });
+    }
+  }
+}
+</script>
diff --git a/src/views/filestatistic/PieChart.vue b/src/views/filestatistic/PieChart.vue
new file mode 100644
index 0000000..e6a7360
--- /dev/null
+++ b/src/views/filestatistic/PieChart.vue
@@ -0,0 +1,102 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from '@/views/dashboard/mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    },
+    /**
+     * 饼图数据
+     */
+    data: {
+      type: Array,
+      default: () => []
+    },
+    /**
+     * 底部提示数据
+     */
+    legendData: {
+      type: Array,
+      default: () => []
+    },
+    /**
+     * 底部提示距底部距离
+     */
+    legendBottom: {
+      type: String,
+      default: '5'
+    },
+    roseType: {
+      type: String,
+      default: 'radius'
+    },
+    radius: {
+      type: Array | String | Number,
+      default: 50
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          left: 'center',
+          bottom: this.legendBottom,
+          data: this.legendData
+        },
+        series: [
+          {
+            name: '',
+            type: 'pie',
+            roseType: this.roseType,
+            radius: this.radius,
+            center: ['50%', '50%'],
+            data: this.data,
+            animationEasing: 'cubicInOut',
+            animationDuration: 2600
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/filestatistic/index.vue b/src/views/filestatistic/index.vue
new file mode 100644
index 0000000..349743c
--- /dev/null
+++ b/src/views/filestatistic/index.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="app-container" v-loading="pageloading">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-card>
+          <div slot="header" class="clearfix"><span class="tline">文档类别统计</span></div>
+          <!--  -->
+          <div class="tjbox2" v-if="isPieChart">
+            <PieChart
+              height="400px"
+              :data="toolTypeData"
+              :legendData="toolTypeLegendData"
+              legendBottom="5"
+              chartRef="toolType"
+              :radius="['40%', '70%']"
+            />
+          </div>
+        </el-card><!--el-card-->
+      </el-col><!--el-col-->
+      <el-col :span="12">
+        <el-card>
+          <div slot="header" class="clearfix"><span class="tline">文档来源统计</span></div>
+          <div class="tjbox2" v-if="isPieChart">
+            <PieChart
+              height="400px"
+              :data="toolSourceData"
+              :legendData="toolSourceLegendData"
+              legendBottom="5"
+              :radius="['40%', '70%']"
+              chartRef="toolStatus"
+            />
+          </div>
+        </el-card><!--el-card-->
+      </el-col><!--el-col-->
+    </el-row><!--el-row-->
+
+  </div>
+</template>
+
+<script>
+import { getStatistics } from "@/api/document/document";
+
+import PieChart from './PieChart'
+export default {
+  name: 'statistic',
+  dicts: ['tool_type', 'flow_status', 'tool_source'],
+  components: {
+    PieChart
+  },
+  data() {
+    return {
+      toolDownDetailStatList: [],
+      activeName: 'first',
+      toolTypeData: [
+        /*{ value: 320, name: '检测型' },
+        { value: 240, name: '服务型' }*/
+      ],
+      // toolTypeLegendData:['检测型', '服务型'],
+      toolTypeLegendData:[],
+      toolStatusData: [
+       /* { value: 212, name: '已保存' },
+        { value: 76, name: '审批中' },
+        { value: 32, name: '审批不通过' },
+        { value: 971, name: '已发布' }*/
+      ],
+      // toolStatusLegendData: ['已保存','审批中','审批不通过','已发布'],
+      toolStatusLegendData: [],
+      toolSourceData: [
+        /*{ value: 20, name: 'QQ' },
+        { value: 60, name: '微信' },
+        { value: 18, name: '官网' },
+        { value: 47, name: '熟人介绍' }*/
+      ],
+      // toolSourceLegendData: ['QQ', '微信', '官网', '熟人介绍'],
+      toolSourceLegendData: [],
+      // 日期范围
+      dateRange: [],
+      toolDownStatList: [],
+      downTotal: 0,
+      downLoading: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        toolId: ''
+      },
+      // 工具下载统计详情组件控制属性
+      detailDrawerOpen: false,
+      // 工具id
+      toolId: '',
+      // 工具名称
+      toolName: '',
+      total: 0,
+      loading: false,
+      isPieChart: false,
+    }
+  },
+  created () {
+    this.getCountData()
+    // this.getToolDownStatistics()
+  },
+  methods: {
+    // 工具下载重置查询
+    reset() {
+      this.toolDownStatList = []
+      this.dateRange = []
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    /**
+     * 工具下载搜索
+     */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+    },
+    /** 统计类型、类别、状态**/
+    getCountData(){
+      let self = this
+      // 类别
+      self.toolTypeData = []
+      self.toolTypeLegendData = []
+      // 来源
+      self.toolSourceData = []
+      self.toolSourceLegendData = []
+      self.pageloading = true
+
+      getStatistics(this.queryParams).then(res => {
+        console.info("res===========", res)
+        if(res.data){
+          //类别
+          self.toolTypeData = JSON.parse(JSON.stringify(res.data.countType))
+          self.toolTypeData.forEach(item => {
+            self.toolTypeLegendData.push(item.name)
+          })
+
+
+          //来源
+          self.toolSourceData = JSON.parse(JSON.stringify(res.data.countSource))
+          self.toolSourceData.forEach(item => {
+            self.toolSourceLegendData.push(item.name)
+          })
+          self.isPieChart= true
+          self.pageloading= false
+        }
+       /* console.info("countToolType==============", this.dict.type.tool_type)
+        console.info("res===========", res)*/
+      }).catch((err) => {
+        self.isPieChart= true
+        self.pageloading= false
+        console.error(err)
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
-- 
2.35.1.windows.2


From b500c532189fd031325bd94da2960d612fb5614e Mon Sep 17 00:00:00 2001
From: hahabrother <297063445@qq.com>
Date: Sat, 31 Aug 2024 18:02:48 +0800
Subject: [PATCH 14/55] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A01.0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/optimizeUpload.vue | 178 +++-
 src/components/FileUpload/sgCollapseBtn.vue  | 133 +++
 src/components/FileUpload/sgDragMove.vue     | 255 +++++
 src/components/FileUpload/sgDragSize.vue     | 281 ++++++
 src/components/FileUpload/sgUploadTray.vue   | 999 +++++++++++++++++++
 5 files changed, 1829 insertions(+), 17 deletions(-)
 create mode 100644 src/components/FileUpload/sgCollapseBtn.vue
 create mode 100644 src/components/FileUpload/sgDragMove.vue
 create mode 100644 src/components/FileUpload/sgDragSize.vue
 create mode 100644 src/components/FileUpload/sgUploadTray.vue

diff --git a/src/components/FileUpload/optimizeUpload.vue b/src/components/FileUpload/optimizeUpload.vue
index 7ff90ae..227684f 100644
--- a/src/components/FileUpload/optimizeUpload.vue
+++ b/src/components/FileUpload/optimizeUpload.vue
@@ -1,33 +1,62 @@
 <template>
 <div>
-    <el-upload class="upload-demo" ref="upload" action="#"
-               :before-upload="beforeUpload"
-               :on-change="onChange"
-               :on-remove="handleRemove"
-               :multiple="isMultiple"
-               :on-exceed="handleExceed"
-               :accept="acceptType"
-               :limit="limit"
-               :file-list="fileList"
-               :auto-upload="true"
-               :http-request="uploadFile"
-               show-file-list>
-        <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-        <div slot="tip" class="el-upload__tip">只能上传{{acceptType}}文件</div>
-    </el-upload>
-    <div v-show="progressFlag" class="head-img">
-        <el-progress :text-inside="true" :stroke-width="14" :percentage="progressPercent" status="success"></el-progress>
+  <div class="container">
+    <div class="item">
+      <el-upload  action="#"
+                  ref="uploadFolder"
+                  :on-change="onChange"
+                  :on-remove="handleRemove"
+                  :show-file-list="false"
+                  :headers="headers"
+                  :accept="accept"
+                  :file-list="fileList"
+                  :before-upload="beforeUploadsg"
+                  :on-success="uploadSuccess"
+                  :on-error="uploadError"
+                  :on-exceed="exceed"
+                  :auto-upload="true"
+                  :http-request="uploadFile"
+                  :multiple="true">
+        <el-button slot="trigger" id="myButton"  size="small" type="primary" @click="uploadBtn.click()">选取文件夹</el-button>
+      </el-upload>
     </div>
+    <div></div>
+    <div class="item">
+      <el-upload class="upload-demo" ref="upload" action="#"
+                 :before-upload="beforeUpload"
+                 :on-change="onChange"
+                 :on-remove="handleRemove"
+                 :multiple="isMultiple"
+                 :on-exceed="handleExceed"
+                 :accept="acceptType"
+                 :limit="limit"
+                 :file-list="fileList"
+                 :auto-upload="true"
+                 :http-request="uploadFile"
+                 show-file-list>
+        <el-button id="myButton" slot="trigger" size="small" type="primary">选取文件</el-button>
+        <div slot="tip" class="el-upload__tip">只能上传{{acceptType}}文件</div>
+      </el-upload>
+      <div v-show="progressFlag" class="head-img">
+        <el-progress :text-inside="true" :stroke-width="14" :percentage="progressPercent" status="success"></el-progress>
+      </div>
+    </div>
+  </div>
 </div>
 </template>
 
 <script>
 import axios from 'axios'
+import sgUploadTray from "./sgUploadTray"
 import {
     getToken
 } from "@/utils/auth";
 
 export default {
+
+  components: {
+    sgUploadTray,
+  },
     props: {
         uploadUrl: {
             type: String,
@@ -75,8 +104,22 @@ export default {
             progressFlag: false, //进度条初始值隐藏
             progressPercent: 0, //进度条初始值
             partSize: 5 * 1024 * 1024,
+            headers: { kkToken: localStorage.token, }, //获取token(注意仔细看后端接受token的字段名是不是叫做“token”)
+            accept:`.${["png", "jpg", "jpeg", "bmp", "gif"].join(",.")}`,//允许上传的后缀名
+            actionURL: process.env.VUE_APP_BASE_API + "/common/initUpload",
+            dur: 100,
+            percent: 100,
+            uploadBtn: null,//上传按钮
+            uploadList: [],
+            showUploadTray: false,
         };
     },
+    mounted(d) {
+      this.$nextTick(() => {
+        this.uploadBtn = this.$refs.uploadFolder.$children[0].$refs.input;
+        this.uploadBtn.webkitdirectory = true;//让el-upload支持上传文件夹
+      })
+    },
     watch: {
       dataFile: {
         handler(newValue, oldValue) {
@@ -90,6 +133,98 @@ export default {
       }
     },
     methods: {
+      showFakeLoading(file) {
+        file = this.uploadList.find(v => v.uid == file.uid);
+        clearInterval(file.interval);
+        file.percent = 0;
+        file.interval = setInterval(() => {
+          file.percent++;
+          file.percent >= 99 && this.hideFakeLoading(file);
+        }, this.dur);
+      },
+      hideFakeLoading(file, { type, tip, color } = {}) {
+        console.log('file======>');
+        console.log(file)
+        file = this.uploadList.find(v => v.uid == file.uid);
+        clearInterval(file.interval);
+        switch (type) {
+          case 'error':
+            file.percent = 0;
+            break;
+          case 'success':
+          default:
+            file.percent = 100;
+        }
+        type && (file.type = type);
+        tip && (file.tip = tip);
+        color && (file.color = color);
+      },
+      exceed(file, fileList) {
+        this.$message.error("上传文件数量太大，分散上传吧！");
+      },
+      stopUpload(d) {
+        this.$refs.uploadFolder.abort();
+        //console.log(`取消上传`, d);
+      },
+      beforeUploadsg(file, id) {
+        console.log(this.uploadList)
+        this.uploadList = []
+        console.info("this.uploadList==", JSON.stringify(this.uploadList))
+        this.uploadList.unshift({
+          interval: false,
+          uid: file.uid,
+          percent: 0,//加载进度
+          name: file.name,
+          size: file.size,
+          type: file.type,
+          webkitRelativePath: file.webkitRelativePath,
+          tip: '',
+          color: '',
+        });
+        this.showUploadTray = true;
+        this.accept = ["png", "jpg", "jpeg", "bmp", "gif", "txt", "json", "pdf"]
+        // 判断是不是特定的格式________________________
+        let isFile = this.accept.includes(file.name.toLocaleLowerCase().split(".").pop());
+        const maxSize = 50; //限制大小
+        const isAllowSize = file.size / 1024 / 1024 <= maxSize;
+        isFile || this.$message.error("上传文件只能是" + this.accept+ "格式");
+        isAllowSize || this.$message.error("上传文件大小不能超过" + maxSize + "MB");
+        let allowUpload = isFile && isAllowSize;
+        return allowUpload; //若返回false则停止上传
+      },
+
+      uploadSuccess(response, file, fileList) {
+        if (response.data && response.data.key) {
+          // 下载失败原因的描述文件
+          this.$d.customer_downloadImportCustomerExcel({ key: response.data.key }, {
+            s: (d) => {
+              this.hideFakeLoading(file, { type: 'error', tip: "上传失败", color: "red" });
+              this.$g.downloadFile(d, `${file.name}-上传失败原因`, '.xls');
+              this.$message.error(`${file.name}-上传失败，请查看失败原因`);
+              // this.initList();//刷新列表
+              //console.log('上传失败', response, file, fileList);
+            }
+          });
+        } else if (response.success) {
+          // 上传成功了
+          this.hideFakeLoading(file, { type: 'success', tip: "上传成功", color: "green" });
+          this.$message.success(`“${file.name}上传成功`);
+          // this.initList();//刷新列表
+          //console.log('上传成功', response, file, fileList);
+        } else {
+          // 其他失败原因
+          this.hideFakeLoading(file, { type: 'error', tip: "上传失败", color: "red" });
+          this.$message.error(response.msg);
+          //console.log('上传失败', response, file, fileList);
+        }
+      },
+      //上传失败
+      uploadError(err, file, fileList) {
+        this.hideFakeLoading(file, { type: 'error', tip: "上传失败", color: "red" });
+        this.$message.error("上传失败");
+        //console.log('上传失败', err, file, fileList);
+      },
+
       // 上传前
       beforeUpload(file) {
        /* const fileType = file.type.toLowerCase()
@@ -325,3 +460,12 @@ export default {
     }
 };
 </script>
+<style>
+#myButton {
+  width: 90px; /* 设置按钮长度为200像素 */
+}
+.container {
+  display: flex; /* 设定为flex布局 */
+}
+</style>
+
diff --git a/src/components/FileUpload/sgCollapseBtn.vue b/src/components/FileUpload/sgCollapseBtn.vue
new file mode 100644
index 0000000..439f3d7
--- /dev/null
+++ b/src/components/FileUpload/sgCollapseBtn.vue
@@ -0,0 +1,133 @@
+<template>
+  <div :class="$options.name" @click="show = !show" :placement="placement">
+    <div class="collapse-btns">
+      <div class="collapse-btn" v-if="show">
+        <i class="el-icon-caret-top"></i>
+        <div class="label">折叠{{ collapseLabel || expandLabel || `` }}</div>
+      </div>
+      <div class="collapse-btn" v-else>
+        <i class="el-icon-caret-bottom"></i>
+        <div class="label">展开{{ expandLabel || collapseLabel || `` }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "sgCollapseBtn",
+  components: {},
+  data() {
+    return {
+      show: false,
+    };
+  },
+  props: ["data", "value", "collapseLabel", "expandLabel", "placement"],
+  watch: {
+    value: {
+      handler(d) {
+        this.show = d;
+      },
+      deep: true,
+      immediate: true,
+    },
+    show(d) {
+      this.$emit("input", d);
+    },
+  },
+  created() {},
+  mounted() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.sgCollapseBtn {
+  position: relative;
+  z-index: 1;
+  /*禁止选中文本*/
+  user-select: none;
+  width: 100%;
+  height: 30px;
+  line-height: 30px;
+  background-color: white;
+  cursor: pointer;
+
+  &[placement="bottom"] {
+    position: absolute;
+    top: revert;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+
+  .collapse-btns {
+    width: 100%;
+    $side: 20%; //渐变边界
+    /*左右渐变遮罩(兼容IOS)*/
+    -webkit-mask-image: linear-gradient(
+        to right,
+        transparent,
+        white $side,
+        white calc(100% - #{$side}),
+        transparent
+    );
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 14px;
+    background-color: white;
+    &::after {
+      content: "";
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      background: linear-gradient(white, #e2f0ff);
+      opacity: 0;
+      transition: 1s ease !important;
+      z-index: -1;
+    }
+    .collapse-btn {
+      transition: 0.4s !important;
+      display: flex;
+      align-items: center;
+      transform: translateX(40%);
+      i {
+        transition: 0.4s !important;
+        color: #d3dce6;
+      }
+      .label {
+        transition: 0.2s !important;
+        margin-left: 25px;
+        color: #409eff;
+        opacity: 0;
+      }
+    }
+  }
+
+  &:active,
+  &:hover {
+    .collapse-btns {
+      &::after {
+        opacity: 1;
+      }
+      .collapse-btn {
+        transform: translateX(0%);
+
+        i {
+          color: #409eff;
+        }
+        .label {
+          margin-left: 5px;
+          color: #409eff;
+          opacity: 1;
+          // width: 100%;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/FileUpload/sgDragMove.vue b/src/components/FileUpload/sgDragMove.vue
new file mode 100644
index 0000000..e4e6dbd
--- /dev/null
+++ b/src/components/FileUpload/sgDragMove.vue
@@ -0,0 +1,255 @@
+<template>
+  <div :class="$options.name"></div>
+</template>
+<script>
+export default {
+  name: "sgDragMove",
+  data() {
+    return {
+      offset: { x: 0, y: 0 }, //偏移量
+      style: { top: "0px", left: "0px" },
+      canDragDom: null, //触发拖拽事件的物体
+      moveDom: null, //可以移动的物体
+    };
+  },
+  props: [
+    "data", //可以被拖拽的元素数组(必选)
+    /* data格式说明：
+        [
+            ...
+            {
+                canDragDom: elementDOM,//可以拖拽的位置元素数组or单个元素
+                moveDom: elementDOM,//拖拽同步移动的元素数组or单个元素
+            },
+            ...
+        ]
+        */
+    "disabled", //屏蔽
+    "mousedownNearSide", //按下鼠标吸附边界
+    "mousemoveNearSide", //移动鼠标吸附边界
+    "mouseupNearSide", //弹起鼠标吸附边界
+    "nearPadding", //距离边界多少像素自动吸附（mousedownNearSide||mousemoveNearSide||mouseupNearSide=true的时候才能生效），值可以是number或array类型，例如：是5代表[5,5,5,5],其中数组以此代表[上,右,下,左]
+    "stopBoundary", //停靠边界距离，移动物体将按照这个值作为界限不再移出该范围（mousedownNearSide||mousemoveNearSide||mouseupNearSide=true的时候才能生效，值可以是number或array类型，例如：是5代表[5,5,5,5],其中数组以此代表[上,右,下,左]
+    "cursor", //鼠标样式
+    /*cursor格式说明：{
+            grab:'default',//移入可拖拽区域的鼠标样式
+            grabbing:'default',//拖拽过程中鼠标样式
+        } */
+  ],
+  watch: {
+    data: {
+      handler(newValue, oldValue) {
+        newValue ? this.__addDragsEvents(newValue) : this.__removeDragsEvents(oldValue);
+      },
+      deep: true,
+      immediate: true,
+    },
+    disabled: {
+      handler(newValue, oldValue) {
+        newValue ? this.__removeAllEvents() : this.__addAllEvents();
+      },
+      deep: true,
+      immediate: true,
+    },
+    style: {
+      handler(newValue, oldValue) {
+        if (this.moveDom && newValue && Object.keys(newValue).length) {
+          let d = newValue;
+          Object.keys(d).forEach((k) => (this.moveDom.style[k] = d[k]));
+          this.moveDom.style.right = "revert";
+          this.moveDom.style.bottom = "revert";
+          this.$emit(`getStyle`, d); //用这个方式抛出被移动物体的位置数据（解决多处修改同一DOM属性导致的冲突问题）
+        }
+      },
+      deep: true, //深度监听
+      immediate: true, //立即执行
+    },
+  },
+  destroyed() {
+    this.__removeAllEvents();
+  },
+  mounted() {
+    this.$parent.$el.style.setProperty(
+      "--sgDragMove-grab",
+      (this.cursor || {}).grab || "grab"
+    ); //js往css传递局部参数
+    this.$parent.$el.style.setProperty(
+      "--sgDragMove-grabbing",
+      (this.cursor || {}).grabbing || "grabbing"
+    ); //js往css传递局部参数
+  },
+
+  methods: {
+    __addAllEvents() {
+      this.__addDragsEvents(this.data);
+    },
+    __removeAllEvents() {
+      this.__removeWindowEvents();
+      this.__removeDragsEvents(this.data);
+    },
+    __addWindowEvents() {
+      this.__removeWindowEvents();
+      addEventListener("mousemove", this.mousemove_window);
+      addEventListener("mouseup", this.mouseup_window);
+    },
+    __removeWindowEvents() {
+      removeEventListener("mousemove", this.mousemove_window);
+      removeEventListener("mouseup", this.mouseup_window);
+    },
+    // 初始化需要拖拽的DIV
+    __addDragsEvents(doms) {
+      (doms || []).forEach((dom) => {
+        this.__removeDraggedEvents(dom.canDragDom);
+        this.__addDraggedEvents(dom.canDragDom);
+      });
+    },
+    __removeDragsEvents(doms) {
+      (doms || []).forEach((dom) => {
+        this.__removeDraggedEvents(dom.canDragDom);
+      });
+    },
+    __addDraggedEvents(dom) {
+      dom.setAttribute("sgDragMove_grab", "ready");
+      dom.addEventListener("dragstart", this.dragstart);
+      dom.addEventListener("mousedown", this.mousedown);
+    },
+    __removeDraggedEvents(dom) {
+      dom.removeEventListener("dragstart", this.dragstart);
+      dom.removeEventListener("mousedown", this.mousedown);
+    },
+    dragstart(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      return false;
+    },
+    mousedown(e) {
+      if (this.disabled) return this.mouseup_window(e);
+      if (e.button === 2) return this.mouseup_window(e); //点击了鼠标右键
+      this.canDragDom = e.currentTarget;
+      this.moveDom = this.data.find((v) => v.canDragDom == this.canDragDom).moveDom;
+      this.canDragDom.setAttribute("sgDragMove_grab", "down");
+      this.moveDom.setAttribute("sgDragMove_move", "ready");
+      let or = this.moveDom.getBoundingClientRect();
+      this.offset = { x: e.clientX - or.x, y: e.clientY - or.y };
+      (this.mousedownNearSide || this.mousedownNearSide === "") && this.nearSide();
+      this.$emit("dragStart", this.getResult(e));
+      this.__addWindowEvents();
+    },
+    setOffset(d) {
+      this.offset = {
+        ...this.offset,
+        ...d,
+      };
+    },
+    mousemove_window(e) {
+      this.canDragDom.setAttribute("sgDragMove_grab", "down");
+      this.moveDom.setAttribute("sgDragMove_move", "ing");
+      let x = e.clientX - this.offset.x;
+      let y = e.clientY - this.offset.y;
+      this.style = { left: x + "px", top: y + "px" };
+      this.style["transition-property"] = "left,top";
+      this.style["transition-duration"] = "0s,0s";
+      this.$nextTick(() => {
+        (this.mousemoveNearSide || this.mousemoveNearSide === "") && this.nearSide();
+        this.$emit("dragging", this.getResult(e));
+      });
+    },
+    mouseup_window(e) {
+      this.$emit("dragEnd", this.getResult(e));
+      (this.mouseupNearSide || this.mouseupNearSide === "") && this.nearSide();
+      this.offset = null;
+      this.style = null;
+      this.canDragDom.setAttribute("sgDragMove_grab", "ready");
+      this.moveDom.setAttribute("sgDragMove_move", "end");
+      setTimeout(() => {
+        this.moveDom && this.moveDom.removeAttribute("sgDragMove_move");
+      }, 100);
+      this.canDragDom = null;
+      this.moveDom = null;
+      this.__removeWindowEvents();
+    },
+    // 自动吸附网页边界
+    nearSide() {
+      let arr = this.nearPadding ? JSON.parse(JSON.stringify(this.nearPadding)) : 0;
+      Array.isArray(arr) || (arr = [...Array(4)].map((v) => arr));
+      let [dis_top, dis_right, dis_bottom, dis_left] = arr;
+      arr = this.stopBoundary ? JSON.parse(JSON.stringify(this.stopBoundary)) : 0;
+      Array.isArray(arr) || (arr = [...Array(4)].map((v) => arr));
+      let [
+        stopBoundary_top,
+        stopBoundary_right,
+        stopBoundary_bottom,
+        stopBoundary_left,
+      ] = arr;
+
+      let x = parseFloat(this.moveDom.style.left);
+      let y = parseFloat(this.moveDom.style.top);
+      let rect = this.moveDom.getBoundingClientRect();
+
+      let min_side_x = 0,
+        min_x = min_side_x + dis_left,
+        min_left = min_side_x + stopBoundary_left;
+      let min_side_y = 0,
+        min_y = min_side_y + dis_top,
+        min_top = min_side_y + stopBoundary_top;
+      x < min_x && (this.moveDom.style.left = `${min_left}px`);
+      y < min_y && (this.moveDom.style.top = `${min_top}px`);
+
+      let max_side_x = innerWidth - rect.width,
+        max_x = max_side_x - dis_right,
+        max_right = max_side_x - stopBoundary_right;
+      let max_side_y = innerHeight - rect.height,
+        max_y = max_side_y - dis_bottom,
+        max_bottom = max_side_y - stopBoundary_bottom;
+      x > max_x && (this.moveDom.style.left = `${max_right}px`);
+      y > max_y && (this.moveDom.style.top = `${max_bottom}px`);
+    },
+    getResult(e) {
+      return {
+        $event: e,
+        canDragDom: this.canDragDom,
+        moveDom: this.moveDom,
+        canDragDomRect: this.canDragDom ? this.canDragDom.getBoundingClientRect() : null,
+        moveDomRect: this.moveDom ? this.moveDom.getBoundingClientRect() : null,
+      };
+    },
+  },
+};
+</script>
+<style lang="scss">
+[sgDragMove_grab="ready"] {
+  cursor: var(--sgDragMove-grab); //css获取js传递的参数
+
+  * {
+    cursor: var(--sgDragMove-grab); //css获取js传递的参数
+  }
+
+  &:hover {
+    opacity: 1;
+  }
+
+  &:active {
+    opacity: 0.9;
+  }
+}
+
+[sgDragMove_grab="down"] {
+  cursor: var(--sgDragMove-grabbing); //css获取js传递的参数
+
+  * {
+    cursor: var(--sgDragMove-grabbing); //css获取js传递的参数
+  }
+}
+
+[sgDragMove_move="ready"] {
+  opacity: 1;
+}
+
+[sgDragMove_move="ing"] {
+  opacity: 0.9;
+}
+
+[sgDragMove_move="end"] {
+  transition: 0.1s;
+}
+</style>
diff --git a/src/components/FileUpload/sgDragSize.vue b/src/components/FileUpload/sgDragSize.vue
new file mode 100644
index 0000000..2c7fa5d
--- /dev/null
+++ b/src/components/FileUpload/sgDragSize.vue
@@ -0,0 +1,281 @@
+<template>
+  <div :class="$options.name" :disabled="disabled" draggable="false">
+    <div :class="`resize-handle resize-${a}`" draggable="false" @mousedown.stop="clickResizeHandle(a)"
+         @dblclick="dblclickResizeHandle(a, $event)" v-for="(a, i) in sizeIndexs" :key="i"></div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'sgDragSize',
+  data() {
+    return {
+      tbHeight: 0,
+      dragSizeIndex: '',
+      originRect: {},
+      dblclickOriginRect: {},
+      sizeIndexs: [
+        'top',
+        'right',
+        'bottom',
+        'left',
+        'top-left',
+        'top-right',
+        'bottom-left',
+        'bottom-right',
+      ],
+    }
+  },
+  props: [
+    "disabled",//屏蔽
+    "taskbarHeight",//任务栏高度
+    "minWidth",//拖拽的最小宽度
+    "minHeight",//拖拽的最小高度
+    "maxWidth",//拖拽的最大宽度
+    "maxHeight",//拖拽的最大高度
+  ],
+  watch: {
+    disabled: {
+      handler(newValue, oldValue) {
+        newValue && this.__removeWindowEvents();
+      }, deep: true, immediate: true,
+    },
+    taskbarHeight: {
+      handler(d) {
+        this.tbHeight = d || 0;
+      }, deep: true, immediate: true,
+    },
+  },
+  destroyed() {
+    this.__removeWindowEvents();
+  },
+  methods: {
+    view_innerHeight() {
+      return innerHeight - this.tbHeight;
+    },
+    clickResizeHandle(d) {
+      this.dragSizeIndex = d;
+      this.mousedown(d);
+    },
+    dblclickResizeHandle(d, $event) {
+      let rect = this.$el.getBoundingClientRect();
+      rect.width < innerWidth && rect.height < this.view_innerHeight() && (this.dblclickOriginRect = rect);
+      this.dblResize(d, rect, $event);
+    },
+    __addWindowEvents() {
+      this.__removeWindowEvents();
+      addEventListener('mousemove', this.mousemove_window);
+      addEventListener('mouseup', this.mouseup_window);
+    },
+    __removeWindowEvents() {
+      removeEventListener('mousemove', this.mousemove_window);
+      removeEventListener('mouseup', this.mouseup_window);
+    },
+    mousedown(e) {
+      this.originRect = this.$el.getBoundingClientRect();
+      this.originRect.bottomRightX = this.originRect.x + this.originRect.width;//右下角坐标.x
+      this.originRect.bottomRightY = this.originRect.y + this.originRect.height;//右下角坐标.y
+      this.$emit('dragStart', e);
+      this.__addWindowEvents();
+    },
+    mousemove_window(e) {
+      let { x, y } = e;
+      let minWidth = this.minWidth || 50, minHeight = this.minHeight || 50, maxWidth = this.maxWidth || innerWidth, maxHeight = this.maxHeight || innerHeight;
+      x < 0 && (x = 0), y < 0 && (y = 0), x > innerWidth && (x = innerWidth), y > this.view_innerHeight() && (y = this.view_innerHeight());
+      let style = {};
+      switch (this.dragSizeIndex) {
+        case 'top-left':
+          style.left = x;
+          style.top = y;
+          style.width = this.originRect.bottomRightX - x;
+          style.width <= minWidth && (style.width = minWidth, style.left = this.originRect.bottomRightX - minWidth);
+          style.height = this.originRect.bottomRightY - y;
+          style.height <= minHeight && (style.height = minHeight, style.top = this.originRect.bottomRightY - minHeight);
+          break;
+        case 'top':
+          style.left = this.originRect.x;
+          style.top = y;
+          style.width = this.originRect.width;
+          style.height = this.originRect.bottomRightY - y;
+          style.height <= minHeight && (style.height = minHeight, style.top = this.originRect.bottomRightY - minHeight);
+          break;
+        case 'top-right':
+          style.left = this.originRect.x;
+          style.top = y;
+          style.width = x - this.originRect.x;
+          style.width <= minWidth && (style.width = minWidth, style.left = this.originRect.x);
+          style.height = this.originRect.bottomRightY - y;
+          style.height <= minHeight && (style.height = minHeight, style.top = this.originRect.bottomRightY - minHeight);
+          break;
+        case 'left':
+          style.left = x;
+          style.top = this.originRect.y;
+          style.width = this.originRect.bottomRightX - x;
+          style.width <= minWidth && (style.width = minWidth, style.left = this.originRect.bottomRightX - minWidth);
+          style.height = this.originRect.height;
+          break;
+        case 'right':
+          style.left = this.originRect.x;
+          style.top = this.originRect.y;
+          style.width = x - this.originRect.x;
+          style.width <= minWidth && (style.width = minWidth, style.left = this.originRect.x);
+          style.height = this.originRect.height;
+          break;
+        case 'bottom-left':
+          style.left = x;
+          style.top = this.originRect.y;
+          style.width = this.originRect.bottomRightX - x;
+          style.width <= minWidth && (style.width = minWidth, style.left = this.originRect.bottomRightX - minWidth);
+          style.height = y - this.originRect.y;
+          style.height <= minHeight && (style.height = minHeight, style.top = this.originRect.y);
+          break;
+        case 'bottom':
+          style.left = this.originRect.x;
+          style.top = this.originRect.y;
+          style.width = this.originRect.width;
+          style.height = y - this.originRect.y;
+          style.height <= minHeight && (style.height = minHeight, style.top = this.originRect.y);
+          break;
+        case 'bottom-right':
+          style.left = this.originRect.x;
+          style.top = this.originRect.y;
+          style.width = x - this.originRect.x;
+          style.width <= minWidth && (style.width = minWidth, style.left = this.originRect.x);
+          style.height = y - this.originRect.y;
+          style.height <= minHeight && (style.height = minHeight, style.top = this.originRect.y);
+          break;
+        default:
+      }
+      style.width > maxWidth && (style.width = maxWidth);
+      style.height > maxHeight && (style.height = maxHeight);
+      Object.keys(style).forEach(k => style[k] = `${style[k]}px`);
+      style['transition-property'] = 'width,height';
+      style['transition-duration'] = '0,0';
+      this.$emit('dragging', { e, style });
+    },
+    dblResize(d, rect, e) {
+      let style = {};
+      switch (d) {
+        case 'top-left':
+          break;
+        case 'top':
+        case 'bottom':
+          style.left = this.originRect.x;
+          style.top = rect.height >= this.view_innerHeight() ? this.dblclickOriginRect.y : 0;
+          style.width = this.originRect.width;
+          style.height = rect.height >= this.view_innerHeight() ? this.dblclickOriginRect.height : this.view_innerHeight();
+          break;
+        case 'top-right':
+          break;
+        case 'left':
+        case 'right':
+          style.left = rect.width >= innerWidth ? this.dblclickOriginRect.x : 0;
+          style.top = this.originRect.y;
+          style.width = rect.width >= innerWidth ? this.dblclickOriginRect.width : innerWidth;
+          style.height = this.originRect.height;
+          break;
+        case 'bottom-left':
+          break;
+        case 'bottom-right':
+          break;
+        default:
+      }
+      Object.keys(style).forEach(k => style[k] = `${style[k]}px`);
+      style['transition-property'] = 'width,height';
+      style['transition-duration'] = '0.1s,0.1s';
+      this.$emit('dragging', { e, style });
+    },
+    mouseup_window(e) {
+      this.$emit('dragEnd', e);
+      this.__removeWindowEvents();
+    },
+  }
+};
+</script>
+<style lang="scss">
+.sgDragSize {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  pointer-events: none;
+
+  .resize-handle {
+    position: absolute;
+    z-index: 100;
+    display: block;
+    pointer-events: auto;
+  }
+
+  &[disabled] {
+    .resize-handle {
+      pointer-events: none;
+    }
+  }
+
+  .resize-top {
+    cursor: n-resize;
+    top: -3px;
+    left: 0px;
+    height: 7px;
+    width: 100%;
+  }
+
+  .resize-right {
+    cursor: e-resize;
+    right: -3px;
+    top: 0px;
+    width: 7px;
+    height: 100%;
+  }
+
+  .resize-bottom {
+    cursor: s-resize;
+    bottom: -3px;
+    left: 0px;
+    height: 7px;
+    width: 100%;
+  }
+
+  .resize-left {
+    cursor: w-resize;
+    left: -3px;
+    top: 0px;
+    width: 7px;
+    height: 100%;
+  }
+
+  .resize-top-right {
+    cursor: ne-resize;
+    width: 16px;
+    height: 16px;
+    right: -8px;
+    top: -8px;
+  }
+
+  .resize-bottom-right {
+    cursor: se-resize;
+    width: 20px;
+    height: 20px;
+    right: -8px;
+    bottom: -8px;
+    background: url('/static/img/desktop/Windows7/sgDragSize/resize_corner.png') no-repeat;
+  }
+
+  .resize-bottom-left {
+    cursor: sw-resize;
+    width: 16px;
+    height: 16px;
+    left: -8px;
+    bottom: -8px;
+  }
+
+  .resize-top-left {
+    cursor: nw-resize;
+    width: 16px;
+    height: 16px;
+    left: -8px;
+    top: -8px;
+  }
+}
+</style>
diff --git a/src/components/FileUpload/sgUploadTray.vue b/src/components/FileUpload/sgUploadTray.vue
new file mode 100644
index 0000000..0e28227
--- /dev/null
+++ b/src/components/FileUpload/sgUploadTray.vue
@@ -0,0 +1,999 @@
+<template>
+  <div :class="$options.name" :show="show" :size="size" :style="style">
+    <div class="upload-list-tray">
+      <!-- 托盘头部 -->
+      <div class="header" ref="header" @dblclick.stop.prevent="dblclickHeader">
+        <div class="left">
+          <div class="title">
+            <span class="upload-count" slot="reference">上传队列</span>
+            <div class="upload-info" v-if="liveSpeed && liveSpeed > 0">
+              <el-divider :direction="`vertical`" />
+              <div class="info-item live-speed">
+                <label>速度</label>
+                <span>{{ $g.getSize(liveSpeed) }}/s</span>
+              </div>
+              <div class="info-item taken-time" v-if="takenTime && takenTime > 0">
+                <label>已耗时</label>
+                <span>{{
+                    $g.date.toHourMinuteSecondByMillisecond(takenTime * 1000, {
+                      zh: true,
+                      hideMilliSecond: true,
+                      hideZero: true,
+                    })
+                  }}</span>
+              </div>
+              <div class="info-item remain-time" v-if="remainTime && remainTime > 0">
+                <label>剩余</label
+                ><span>{{
+                  $g.date.toHourMinuteSecondByMillisecond(remainTime * 1000, {
+                    zh: true,
+                    hideMilliSecond: true,
+                    hideZero: true,
+                  })
+                }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="right" @mousedown.stop>
+          <!-- 控制文件的图标按钮 -->
+          <div class="file-btns" v-if="showDelSuccessIconBtn || showErrorIconBtn">
+            <div
+              class="icon-btn"
+              v-if="showDelSuccessIconBtn"
+              @click.stop="clearAllSuccessFile"
+              title="清除所有已经成功的上传记录"
+            >
+              <i class="el-icon-delete" style="color: #67c23a"></i>
+            </div>
+            <div
+              class="icon-btn"
+              v-if="showErrorIconBtn"
+              @click.stop="clearAllErrorFile"
+              title="清除所有失败的上传记录"
+            >
+              <i class="el-icon-delete-solid" style="color: #f56c6c"></i>
+            </div>
+            <div
+              class="icon-btn"
+              v-if="showErrorIconBtn"
+              @click.stop="uploadAllErrorFile"
+              title="重新上传所有失败的文件"
+            >
+              <i class="el-icon-upload2" style="color: #409eff"></i>
+            </div>
+            <template v-if="uploadList.length > maxShowUploadFileCount">
+              <div
+                class="icon-btn"
+                v-if="expandAllUploadList"
+                @click.stop="expandAllUploadList = false"
+                title="折叠只显示前10条上传记录"
+              >
+                <i class="el-icon-folder" style="color: #409eff"></i>
+              </div>
+              <el-tooltip
+                v-else
+                :content="`请谨慎展开列表，这将导致您的网页很卡！`"
+                :effect="`dark`"
+                :enterable="false"
+                :placement="`top-start`"
+                :popper-class="`sg-el-tooltip`"
+                :transition="`none`"
+                :disabled="uploadList.length < 200"
+              >
+                <div
+                  class="icon-btn"
+                  @click.stop="expandAllUploadList = true"
+                  title="展开所有上传记录"
+                >
+                  <i class="el-icon-folder-opened" style="color: #409eff"></i>
+                </div>
+              </el-tooltip>
+            </template>
+          </div>
+          <!-- 控制托盘的图标按钮 -->
+          <div class="tray-btns">
+            <div
+              class="icon-btn"
+              v-if="size !== 'lg' && showRightBottomBtn"
+              @click.stop="toRightBottomPosition"
+              title="回到原来的位置"
+            >
+              <i class="el-icon-bottom-right"></i>
+            </div>
+            <div
+              class="icon-btn"
+              v-if="size !== 'mn'"
+              @click.stop="size = 'mn'"
+              title="最小化"
+            >
+              <i class="el-icon-minus"></i>
+            </div>
+            <div
+              class="icon-btn"
+              v-if="size !== 'md'"
+              @click.stop="size = 'md'"
+              title="还原"
+            >
+              <i :class="size === 'lg' ? 'el-icon-copy-document' : 'el-icon-d-caret'"></i>
+            </div>
+            <div
+              class="icon-btn"
+              v-if="size !== 'lg'"
+              @click.stop="size = 'lg'"
+              title="全屏"
+            >
+              <i class="el-icon-full-screen"></i>
+            </div>
+            <div class="icon-btn" @click.stop="close">
+              <i class="el-icon-close"></i>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 上传中的文件列表 -->
+      <div class="upload-file-list">
+        <ul>
+          <li
+            v-for="(a, i) in expandAllUploadList ? uploadList : uploadList.slice(0, 10)"
+            :key="i"
+            :title="
+              a.size > 1024 * 1024 * 500
+                ? `超大文件上传中，请耐心等待，切勿关闭或刷新浏览器！`
+                : ''
+            "
+          >
+            <div class="left">
+              <div class="icon-btns">
+                <el-button
+                  title="移出上传队列"
+                  :show="a.status === 'error'"
+                  class="remove-icon-btn icon-btn"
+                  type="danger"
+                  icon="el-icon-delete-solid"
+                  size="mini"
+                  plain
+                  circle
+                  @click.stop="removeUploadFile(a)"
+                ></el-button>
+              </div>
+              <!-- 动画加载旋转 -->
+              <div
+                class="fileLoading"
+                v-loading="a.percent < 100"
+                v-if="a.percent < 100 && a.status !== 'error'"
+              ></div>
+              <!-- 上传成功icon -->
+              <div class="loadingSuccessIcon" v-if="a.percent === 100">
+                <i class="el-icon-success" style="color: #67c23a"></i>
+              </div>
+              <!-- 上传失败icon -->
+              <div class="loadingEorrorIcon" v-if="a.status === 'error'">
+                <i class="el-icon-error" style="color: #f56c6c"></i>
+              </div>
+              <span class="name" :title="a.filePath || a.name">
+                {{ a.filePath || a.name }}
+                <!-- {{ a.filePath && a.filePath.includes(`/`) ? `[路径：${a.filePath}]` : "" }} -->
+              </span>
+              <el-tag class="size" size="mini"
+              >{{ $g.getSize(a.size * (a.percent / 100)) }}/{{
+                  $g.getSize(a.size)
+                }}</el-tag
+              >
+              <!-- <el-progress class="progress" :percentage="a.percent"></el-progress> -->
+              <el-progress
+                class="progress"
+                style="width: 100%"
+                type="line"
+                :percentage="parseInt(a.percent)"
+                :show-text="true"
+                :stroke-width="10"
+                :text-inside="false"
+                :color="'#409EFF'"
+                :define-back-color="'#eee'"
+              />
+            </div>
+            <div class="right">
+              <span class="tip" :color="a.color">{{ a.tip }}</span>
+              <div class="icon-btns">
+                <el-button
+                  :show="a.status === 'error'"
+                  title="重新上传"
+                  class="upload-icon-btn icon-btn"
+                  type="primary"
+                  icon="el-icon-upload2"
+                  size="mini"
+                  plain
+                  circle
+                  @click.stop="startUploadFile(a)"
+                ></el-button>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+      <!-- 折叠按钮 -->
+      <sgCollapseBtn
+        style="z-index: 1"
+        :collapseLabel="`上传记录`"
+        v-model="expandAllUploadList"
+        v-if="uploadList.length > maxShowUploadFileCount"
+      />
+      <div class="footer">
+        <div class="text" v-html="popoverContent"></div>
+        <div class="progress" v-if="uploadList.length > 1 && totalPercentage < 100">
+          <label>。总进度</label>
+          <el-progress
+            style="width: 100%"
+            type="line"
+            :percentage="parseInt(totalPercentage)"
+            :show-text="true"
+            :stroke-width="10"
+            :text-inside="false"
+            :color="'#409EFF'"
+            :define-back-color="'#eee'"
+          />
+        </div>
+      </div>
+    </div>
+
+    <!-- 拖拽移动窗体 -->
+    <sgDragMove
+      :data="dragMoveDoms"
+      :cursor="{
+        grab: 'default',
+        grabbing: 'default',
+      }"
+      nearPadding="10"
+      :disabled="size === 'lg' && disabledDragMove"
+      @dragStart="$emit(`dragStart`, dragMoveDoms)"
+      @dragging="
+        showRightBottomBtn = true;
+        $emit(`dragging`, dragMoveDoms);
+      "
+      @dragEnd="$emit(`dragEnd`, dragMoveDoms)"
+      mousemoveNearSide
+    />
+
+    <!-- 拖拽改变窗体尺寸 -->
+    <sgDragSize
+      v-if="resizeable_"
+      :disabled="size === 'lg'"
+      @dragStart="disabledDragMove = true"
+      @dragging="draggingSize"
+      @dragEnd="disabledDragMove = false"
+      :minWidth="minWidth"
+      :minHeight="minHeight"
+    />
+  </div>
+</template>
+<script>
+import sgCollapseBtn from "./sgCollapseBtn";
+import sgDragMove from "./sgDragMove";
+import sgDragSize from "./sgDragSize";
+export default {
+  name: "sgUploadTray",
+  components: {
+    sgCollapseBtn,
+    sgDragMove,
+    sgDragSize,
+  },
+  data() {
+    return {
+      maxShowUploadFileCount: 10, //默认展示上传数量
+      expandAllUploadList: false, //默认折叠
+
+      minWidth: 800,
+      minHeight: 40,
+      style_bk: null,
+      style: {},
+      resizeable_: true,
+      disabledDragMove: false, //屏蔽移动
+      show: false,
+      showRightBottomBtn: false,
+      size: "md", //lg全屏、md普通、mn最小
+      uploadList: [],
+      dragMoveDoms: [
+        /* {
+          canDragDom: elementDOM,//可以拖拽的位置元素
+          moveDom: elementDOM,//拖拽同步移动的元素
+      } */
+      ], //可以拖拽移动的物体
+
+      lastUploadedTotalSize: 0, //记录上次已经下载完成的总大小
+      liveSpeed: 0, //瞬时下载速度(单位B)
+      takenTime: 0, //已耗时
+      remainTime: 0, //剩余下载时长
+      interval: null,
+      second: 1, //轮训间隔秒钟
+
+      successFileList: [], //成功文件列表
+      errorFileList: [], //失败文件列表
+      remainFileList: [], //剩余文件列表
+    };
+  },
+  props: ["data", "value", "resizeable", "position"],
+  watch: {
+    value: {
+      handler(d) {
+        this.show = d;
+      },
+      deep: true,
+      immediate: true,
+    },
+    show: {
+      handler(d) {
+        this.$emit(`input`, d);
+      },
+      deep: true,
+      immediate: true,
+    },
+    data: {
+      handler(d) {
+        this.uploadList = d || [];
+      },
+      deep: true,
+      immediate: true,
+    },
+    uploadList: {
+      handler(newValue, oldValue) {
+        if (newValue && Object.keys(newValue).length) {
+          this.interval || this.startUploadCalcLiveSpeed();
+          this.successFileList = newValue.filter((v) => v.percent == 100);
+          this.errorFileList = newValue.filter((v) => v.status === "error");
+          this.remainFileList = newValue.filter(
+            (v) => v.status !== "error" && v.status !== "success"
+          );
+        } else {
+          this.successFileList = [];
+          this.errorFileList = [];
+          this.remainFileList = [];
+        }
+      },
+      deep: true, //深度监听
+      immediate: true, //立即执行
+    },
+    resizeable: {
+      handler(newValue, oldValue) {
+        this.resizeable_ = newValue === "" || newValue;
+      },
+      deep: true, //深度监听
+      immediate: true, //立即执行
+    },
+    size: {
+      handler(newValue, oldValue) {
+        switch (newValue) {
+          case "lg":
+          case "mn":
+            this.style_bk = JSON.parse(JSON.stringify(this.style));
+            delete this.style.width, delete this.style.height;
+            break;
+          case "md":
+            this.style_bk && (this.style = JSON.parse(JSON.stringify(this.style_bk)));
+            break;
+        }
+      },
+      deep: true, //深度监听
+      immediate: true, //立即执行
+    },
+  },
+  computed: {
+    showDelSuccessIconBtn(d) {
+      return this.uploadList.some((v) => v.percent == 100);
+    },
+    showErrorIconBtn(d) {
+      return this.uploadList.some((v) => v.status == "error");
+    },
+    popoverContent(d) {
+      let r = [];
+      this.successFileList.length &&
+      r.push(
+        `已上传成功<span style="color: #67C23A;">${this.successFileList.length}</span>个`
+      );
+      this.errorFileList.length &&
+      r.push(`失败<span style="color: #F56C6C;">${this.errorFileList.length}</span>个`);
+      this.remainFileList.length &&
+      r.push(
+        `剩余<span style="color: #409EFF;">${this.remainFileList.length}</span>个`
+      );
+      if (this.uploadList.length) {
+        return `共计${this.uploadList.length}个文件，${
+          r.length ? `${r.join("，")}文件` : ``
+        }`;
+      } else {
+        return `暂无待上传文件`;
+      }
+    },
+    // 总体进度
+    totalPercentage() {
+      if (this.uploadList.length) {
+        return parseFloat(
+          ((this.successFileList.length / this.uploadList.length) * 100).toFixed(2)
+        );
+      } else {
+        return 0;
+      }
+    },
+    // 真正上传中的文件对象数组
+    uploadingFiles(d) {
+      let uploadingFiles_ = (this.uploadList || []).filter(
+        (v) => v.percent < 100 && v.status !== "error" && v.status !== "success"
+      );
+      if (uploadingFiles_.length) {
+        this.$emit(`changeUploadingListClose`, {
+          path: this.position,
+          close: this.close,
+        });
+      } else {
+        this.$emit(`changeUploadingListClose`, null);
+      }
+      return uploadingFiles_;
+    },
+  },
+  mounted() {
+    this.$el.style.setProperty("--minWidth", `${this.minWidth}px`); //js往css传递局部参数
+    this.$el.style.setProperty("--minHeight", `${this.minHeight}px`); //js往css传递局部参数
+    this.dragMoveDoms = [
+      {
+        canDragDom: this.$refs.header, //托盘的头部可以拖拽
+        moveDom: this.$el, //拖拽的时候，整个上传列表一起跟随移动
+      },
+    ];
+  },
+  destroyed() {
+    clearInterval(this.interval);
+  },
+  methods: {
+    // 开始计算瞬时下载速度
+    startUploadCalcLiveSpeed() {
+      clearInterval(this.interval);
+      this.interval = setInterval(() => {
+        this.calcLiveSpeed();
+      }, 1000 * this.second);
+    },
+    // 结束计算瞬时下载速度
+    endUploadCalcLiveSpeed(d) {
+      clearInterval(this.interval);
+      this.interval = null;
+      this.liveSpeed = 0;
+      this.takenTime = 0;
+      this.remainTime = 0;
+    },
+    // 没有上传进程文件才结束计算速度
+    ifNoUploadingFile_EndCalcLiveSpeed(d) {
+      this.uploadingFiles.length || this.endUploadCalcLiveSpeed();
+    },
+    // 计算瞬时下载速度
+    calcLiveSpeed(d) {
+      this.takenTime++;
+      let uploadList = this.uploadList;
+      if (uploadList.length) {
+        let totalSize = uploadList.reduce(
+          (prevResult, current) => prevResult + current.size,
+          0
+        ); //求和需要上传的文件总大小
+        let uploadedTotalSize = uploadList.reduce(
+          (prevResult, current) => prevResult + current.size * (0.01 * current.percent),
+          0
+        ); //求和已经上传的文件总大小
+        let remainTotalSize = totalSize - uploadedTotalSize; //剩余需要上传的文件
+        if (this.lastUploadedTotalSize) {
+          this.liveSpeed = (uploadedTotalSize - this.lastUploadedTotalSize) / this.second; //瞬时速度
+          this.remainTime = remainTotalSize / this.liveSpeed; //瞬时剩余时长
+        } else {
+          this.liveSpeed = 0;
+        }
+        this.lastUploadedTotalSize = uploadedTotalSize; //记录本次已经上传的总大小
+      } else {
+        this.endUploadCalcLiveSpeed();
+      }
+    },
+    clearAllSuccessFile() {
+      let successFileList = this.uploadList.filter((v) => v.percent == 100);
+      if (successFileList.length === 0)
+        return this.$message(`暂无可以移除的成功记录，请稍后再试！`);
+      this.$emit(`clearAllSuccessFile`, successFileList);
+      this.$nextTick(() => {
+        successFileList.forEach((file) => {
+          file.removeFile(); //移除原始队列
+        });
+        this.uploadList = this.uploadList.filter((v) => v.percent < 100);
+      });
+    },
+    clearAllErrorFile() {
+      let errorFileList = this.uploadList.filter((v) => v.status == "error");
+      if (errorFileList.length === 0)
+        return this.$message(`暂无可以移除的失败记录，请稍后再试！`);
+      this.$emit(`clearAllErrorFile`, errorFileList);
+      this.$nextTick(() => {
+        errorFileList.forEach((file) => {
+          file.removeFile(); //移除原始队列
+        });
+        this.uploadList = this.uploadList.filter((v) => v.status !== "error");
+      });
+    },
+    uploadAllErrorFile(d) {
+      let errorFileList = this.uploadList.filter((v) => v.status == "error");
+      errorFileList.forEach((fileData) => this.startUploadFile(fileData));
+      if (errorFileList.length === 0) return this.$message(`暂无失败记录，请稍后再试！`);
+      this.$emit(`uploadAllErrorFile`, errorFileList);
+    },
+    draggingSize({ style }) {
+      this.disabledDragMove = true;
+      this.style = style;
+    },
+    toRightBottomPosition(d) {
+      this.showRightBottomBtn = false;
+      let rect = this.$el.getBoundingClientRect();
+      this.$el.style.left = `${innerWidth - rect.width}px`;
+      this.$el.style.top = `${innerHeight - rect.height}px`;
+      // 用下面的写法会清除掉setProperty属性
+      /* this.$el.style = {
+        left: innerWidth - rect.width + "px",
+        top: innerHeight - rect.height + "px",
+      }; */
+    },
+    dblclickHeader(d) {
+      switch (this.size) {
+        case "lg":
+          this.size = "md";
+          break;
+        case "md":
+          this.size = "mn";
+          break;
+        case "mn":
+          this.size = "md";
+          break;
+        default:
+      }
+    },
+    removeAllFilesFromList() {
+      this.uploadList.forEach((file) => {
+        file.removeFile(); //移除原始队列
+      });
+      this.uploadList = []; //移除托盘队列
+    },
+    removeFileFromList(d) {
+      let file = this.uploadList.find((v) => v.uid == d.uid);
+      file.removeFile(); //移除原始队列
+      this.uploadList.splice(
+        this.uploadList.findIndex((v) => v.uid == d.uid),
+        1
+      ); //移除托盘队列
+    },
+    // 重新上传失败的记录
+    startUploadFile(fileData) {
+      fileData.startUpload({ handleTrigger: true });
+    },
+    // 移出某一个队列文件
+    removeUploadFile(d) {
+      if (d.status === "error" || d.status === "success") {
+        this.removeFileFromList(d);
+      } else if (d.percent < 100) {
+        this.$confirm(`${d.name}正在上传中，确定要取消吗？`, `提示`, {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: `确定`,
+          cancelButtonText: `取消`,
+          type: "warning",
+        })
+          .then(() => {
+            this.$emit(`stopUpload`, [d]);
+            this.$nextTick(() => {
+              this.removeFileFromList(d);
+              this.ifNoUploadingFile_EndCalcLiveSpeed();
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.removeFileFromList(d);
+      }
+    },
+    // 关闭托盘
+    close({ cb } = {}) {
+      let stopUploadList = this.uploadingFiles;
+      if (stopUploadList.length) {
+        this.$confirm(`您还有正在上传中的文件，确定要取消吗？`, `提示`, {
+          dangerouslyUseHTMLString: true,
+          confirmButtonText: `确定`,
+          cancelButtonText: `取消`,
+          type: "warning",
+        })
+          .then(() => {
+            this.show = false;
+            this.$emit(`stopUpload`, stopUploadList);
+            this.$nextTick(() => {
+              this.endUploadCalcLiveSpeed();
+              this.removeAllFilesFromList();
+              cb && cb(stopUploadList); //完成后回调
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.show = false;
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.sgUploadTray {
+  $headerHeight: 40px; //头部高度
+  $footerHeight: 40px; //底部统计上传进度高度
+  $collapseBtnHeight: 30px; //折叠按钮高度
+  $minWidth: var(--minWidth); //托盘最小宽度
+  $minHeight: var(--minHeight); //托盘最小高度
+  $loadingWidth: 30px; //加载动画宽度（旋转全全）
+  $rightWidth: 200px; //右侧宽度
+  $sizeWidth: 200px; //文件大小宽度宽度
+  $progressWidth: 100px; //进度条宽度
+  $tipWidth: 100px; //提示文本宽度
+  // ----------------------------------------
+  z-index: 2001; //根据情况自己拿捏(太大了会遮住element的其他弹窗组件)，v-loading默认是2000的z-index
+  user-select: none;
+  position: fixed;
+  right: 10px;
+  bottom: 10px;
+  width: $minWidth;
+  background-color: white;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  overflow: hidden;
+  border: 1px solid #eee;
+  font-size: 14px;
+  display: none;
+
+  &[show] {
+    display: block;
+  }
+
+  &[size="lg"] {
+    left: 0 !important;
+    top: 0 !important;
+    width: 100vw;
+    height: 100vh;
+    transition: none;
+    .upload-file-list {
+      max-height: calc(100vh - 60px) !important;
+    }
+  }
+
+  &[size="md"] {
+    width: $minWidth;
+    height: revert;
+  }
+
+  &[size="mn"] {
+    width: $minWidth;
+    height: $minHeight;
+  }
+
+  .upload-list-tray {
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding-bottom: 20px;
+    width: 100%;
+    height: 100%;
+    position: relative;
+
+    .header {
+      flex-shrink: 0;
+      font-size: 16px;
+      font-weight: bold;
+      width: 100%;
+      height: $headerHeight;
+      box-sizing: border-box;
+      padding: 10px 20px;
+      /*从上往下线性渐变背景*/
+      background: linear-gradient(#409eff11, white);
+      color: #409eff;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .left {
+        display: flex;
+        align-items: center;
+        flex-grow: 1;
+
+        .title {
+          display: flex;
+          align-items: center;
+          flex-wrap: nowrap;
+          .upload-info {
+            display: flex;
+            align-items: center;
+            color: black;
+            flex-shrink: 0;
+            align-items: center;
+            font-weight: normal;
+            .info-item {
+              margin-right: 5px;
+              &:last-of-type {
+                margin-right: 0;
+              }
+              span {
+                font-family: DIN-Light;
+                color: #409eff;
+              }
+              &.live-speed {
+                span {
+                  font-family: DIN-Black;
+                }
+              }
+            }
+          }
+        }
+        .icon-btns {
+          display: flex;
+          align-items: center;
+          flex-wrap: nowrap;
+          .icon-btn {
+            cursor: pointer;
+            margin-right: 5px;
+            &:last-of-type {
+              margin-right: 0;
+            }
+            i {
+              pointer-events: none;
+            }
+
+            &:hover {
+              opacity: 0.618;
+            }
+          }
+        }
+      }
+
+      .right {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        flex-shrink: 0;
+        pointer-events: auto;
+
+        .icon-btn {
+          margin-left: 10px;
+          cursor: pointer;
+
+          i {
+            pointer-events: none;
+          }
+
+          &:hover {
+            opacity: 0.618;
+          }
+          &:first-of-type {
+            margin-left: 0;
+          }
+        }
+
+        .file-btns {
+          margin-left: 10px;
+          display: flex;
+          flex-wrap: nowrap;
+          justify-content: flex-end;
+          box-sizing: border-box;
+          padding: 0 10px;
+          border-right: 1px solid #eee;
+        }
+        .tray-btns {
+          margin-left: 10px;
+          display: flex;
+          flex-wrap: nowrap;
+          justify-content: flex-end;
+        }
+      }
+    }
+
+    .upload-file-list {
+      width: 100%;
+      flex-grow: 1;
+      overflow-y: auto;
+      height: max-content;
+      max-height: calc(
+        100vh - #{$headerHeight} - #{$footerHeight} - #{$collapseBtnHeight} - 40px
+      );
+      box-sizing: border-box;
+      padding: 0 20px;
+
+      ul {
+        width: 100%;
+
+        li {
+          line-height: 1.6;
+          box-sizing: border-box;
+          padding: 10px;
+          border-radius: 4px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          width: 100%;
+
+          .left {
+            width: calc(100% - #{$rightWidth});
+            display: flex;
+            align-items: center;
+            flex-grow: 1;
+            flex-shrink: 0;
+            // 上传队列记录左侧侧操作按钮
+            .icon-btns {
+              display: flex;
+              flex-wrap: nowrap;
+              .icon-btn {
+                display: none;
+                &[show] {
+                  margin-right: 15px;
+                  display: block;
+                }
+              }
+            }
+            .fileLoading {
+              flex-shrink: 0;
+              width: 30px;
+              margin-right: 5px;
+              height: 0;
+              transform: scale(0.5);
+            }
+            .loadingSuccessIcon,
+            .loadingEorrorIcon {
+              margin-right: 5px;
+              width: 30px;
+              height: 30px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              flex-shrink: 0;
+            }
+            .name {
+              text-align: left;
+              margin-right: 10px;
+              width: calc(
+                100% - #{$loadingWidth} - #{$sizeWidth} - #{$progressWidth} - #{$rightWidth} -
+                20px
+              );
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              flex-shrink: 0;
+              flex-grow: 1;
+            }
+
+            .size {
+              margin-right: 10px;
+              max-width: $sizeWidth;
+              /*单行省略号*/
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              flex-shrink: 0;
+            }
+
+            .progress {
+              max-width: $progressWidth;
+              display: flex;
+              align-items: center;
+              flex-wrap: nowrap;
+              flex-shrink: 0;
+            }
+          }
+
+          .right {
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            width: $rightWidth;
+
+            .tip {
+              width: $tipWidth;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              flex-shrink: 0;
+              text-align: right;
+
+              &[color="red"] {
+                color: #f56c6c;
+              }
+
+              &[color="green"] {
+                color: #67c23a;
+              }
+
+              &[color="blue"] {
+                color: #409eff;
+              }
+            }
+            // 上传队列记录右侧操作按钮
+            .icon-btns {
+              display: flex;
+              flex-wrap: nowrap;
+              .icon-btn {
+                display: none;
+                &[show] {
+                  margin-left: 15px;
+                  display: block;
+                }
+              }
+            }
+          }
+
+          &:hover {
+            background-color: #409eff11;
+            color: #409eff;
+            .left {
+              // 移入上传队列记录左侧操作按钮
+              .icon-btns {
+                .icon-btn {
+                  display: block;
+                  &:last-of-type {
+                    margin-right: 10px;
+                  }
+                }
+              }
+            }
+            .right {
+              .tip {
+                margin-right: 15px;
+              }
+              // 移入上传队列记录右侧操作按钮
+              .icon-btns {
+                .icon-btn {
+                  display: block;
+                  &:first-of-type {
+                    margin-left: 0;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .footer {
+      font-weight: normal;
+      flex-shrink: 0;
+      font-size: 14px;
+      font-weight: bold;
+      width: 100%;
+      height: $footerHeight;
+      box-sizing: border-box;
+      padding: 10px 20px;
+      margin-bottom: -20px;
+      background: linear-gradient(white, #eff2f7);
+      color: #909399;
+      display: flex;
+      align-items: center;
+      flex-wrap: nowrap;
+      white-space: nowrap;
+      * {
+        font-weight: normal;
+      }
+      .text {
+        white-space: nowrap;
+      }
+      .progress {
+        max-width: 200px;
+        flex-grow: 1;
+        white-space: nowrap;
+        display: flex;
+        align-items: center;
+        flex-wrap: nowrap;
+        label {
+          white-space: nowrap;
+          flex-shrink: 0;
+          margin-right: 5px;
+        }
+        >>> .el-progress {
+          white-space: nowrap;
+          .el-progress__text {
+            font-weight: normal;
+            font-size: 14px !important;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
-- 
2.35.1.windows.2


From 40525f5b499b122f80f254d59663bd47faab53e0 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sun, 1 Sep 2024 10:57:25 +0800
Subject: [PATCH 15/55] =?UTF-8?q?1=E3=80=81=E6=96=87=E6=A1=A3=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4=202=E3=80=81?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4=203?=
 =?UTF-8?q?=E3=80=81=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=204=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=A7=88=E5=85=B3=E9=97=AD=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E6=97=B6=E8=A7=86=E5=B1=8F=E6=92=AD=E6=94=BE=E6=9A=82?=
 =?UTF-8?q?=E5=81=9C=E4=B8=8D=E4=BA=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/document/index.vue                  |  25 +-
 src/views/statistic/index.vue                 |   4 +-
 src/views/tool/downloadFileDetail.vue         | 306 ++++++++++++++++++
 src/views/tool/index.vue                      |  40 ++-
 src/views/tool/toolDetail.vue                 |   7 +-
 .../workflowList/addWorkflow/tool_release.vue |   7 +-
 6 files changed, 373 insertions(+), 16 deletions(-)
 create mode 100644 src/views/tool/downloadFileDetail.vue

diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 7685c98..021c663 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -175,7 +175,7 @@
                 v-hasPermi="['document:remove']"
               >删除</el-button>
               <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)"
-                         v-hasPermi="['document:batch:remove']"
+                         v-if="scope.row.downloadStatus"
                          v-loading="loadingDownload">下载</el-button>
             </template>
           </el-table-column>
@@ -213,8 +213,8 @@
       </span>
     </el-dialog>
 
-    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body>
-      <i-frame :src="previewUrl" />
+    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
+      <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
     </el-dialog>
 
     <el-drawer :visible.sync="open" :modal-append-to-body="false" size="75%">
@@ -275,6 +275,8 @@ import editDocument from "./editDocument";
 import uploadProgress from "./uploadProgress";
 import { w3cwebsocket as WebSocket } from 'websocket';
 import Treeselect from "@riophae/vue-treeselect";
+import { addCount } from "@/api/tool/downloadCount";
+
 export default {
   name: "Document",
   components: { iFrame, editDocument, uploadProgress, Treeselect},
@@ -331,6 +333,9 @@ export default {
         docSource: '',
         docStatus: '',
         docCategoryId: '',
+        createById: this.$store.getters.userId,
+        permissionCheck: true,
+        downloadCheck:true
       },
       // 表单参数
       form: {
@@ -447,9 +452,9 @@ export default {
       })
     },
     handlePreview(row){
+      this.viewDialogOpen = true;
       this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
       this.viewDialogTitle = '文档在线预览'
-      this.viewDialogOpen = true;
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -539,6 +544,15 @@ export default {
       let self = this
       self.loadingDownload = true
       this.$download.resource(row.docUrl);
+      //保存下载记录
+      if(row.toolId){
+        let formData = {
+          toolId: row.toolId
+        }
+        addCount(formData).then(res => {
+          console.info("res==========", res)
+        });
+      }
       setTimeout(()=>{
         self.loadingDownload = false
       },1000)
@@ -596,6 +610,9 @@ export default {
         excludeFields:excludeFields,
       }, `文档资源信息数据_${new Date().getTime()}.xlsx`)
     },
+    handleBeforeClose() {
+      this.viewDialogOpen = false
+    }
 
   }
 };
diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue
index 5ae676c..dde0ced 100644
--- a/src/views/statistic/index.vue
+++ b/src/views/statistic/index.vue
@@ -117,9 +117,9 @@
       @close="detailDrawerOpen = false"
     >
       <el-table :data="toolDownDetailStatList" v-loading="loading">
-        <el-table-column label="下载用户" align="center" key="userName" prop="userName" min-width="120" />
+        <el-table-column label="下载用户" align="center" key="nickName" prop="nickName" min-width="120" />
         <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" min-width="120" />
-        <el-table-column label="下载时间" align="center" key="donwTime" prop="donwTime" min-width="120" />
+        <el-table-column label="下载时间" align="center" key="createTime" prop="createTime" min-width="120" />
       </el-table>
       <pagination
         v-show="total>0"
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
new file mode 100644
index 0000000..123900e
--- /dev/null
+++ b/src/views/tool/downloadFileDetail.vue
@@ -0,0 +1,306 @@
+<template>
+  <div class="fbox1">
+    <div class="fl">
+      <el-tabs v-model="detailActiveName">
+        <el-tab-pane label="文件信息" name="first">
+          <el-table :data="docList" style="width: 100%">
+            <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
+            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
+            <el-table-column label="归属单位" align="center" prop="docRespDeptName" :show-overflow-tooltip="true" width="80" />
+            <el-table-column label="来源" prop="docSource" width="100" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="180" v-if="toolDetail.downloadStatus">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-view"
+                  @click="handlePriew(scope.row)"
+                >预览</el-button>
+                <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+              </template>
+            </el-table-column>
+          </el-table><!--el-table-->
+        </el-tab-pane><!--el-tab-pane-->
+      </el-tabs><!--el-tabs-->
+    </div><!--fl 左侧页签-->
+  </div><!--fbox1 左右分栏-->
+</template>
+
+<script>
+  import { listDocument, getDocument, delDocument, addDocument, updateDocument } from "@/api/document/document";
+  import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
+  import { listReplies, addReplies} from "@/api/tool/replies.js";
+
+  import { addCount } from "@/api/tool/downloadCount";
+  import AddDoc from './AddDoc'
+  import editDocument from "../document/editDocument";
+  import { Base64 } from 'js-base64';
+  import iFrame from "@/components/iFrame/index"
+
+  export default {
+    name: 'toolDetail',
+    components: { editDocument, AddDoc, iFrame },
+    dicts:['sys_normal_disable','tool_type','tool_source','tool_status','doc_class','doc_source'],
+    props: {
+      toolDetail: {
+        type: Object,
+        default: {},
+      }
+    },
+    data(){
+      return{
+        detailActiveName: 'first',
+        docList: [],
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          toolId: ''
+        },
+        previewUrl: '',
+        viewDialogTitle: "",
+        viewDialogOpen: false,
+        title: '新增文档',
+        open: false,
+        loadingDownload: false,
+        discussionContent: null, // 评论内容
+        repliesContent: null, // 回复内容
+        // 评论列表
+        discussionsList: [],
+        // 回复列表
+        repliesList: [],
+        showReplyForm: [],
+        replyContent: [],
+      }
+    },
+    created(){
+      this.getDocList()
+      this.getDiscussionsList()
+    },
+    watch: {
+      discussionsList(newList) {
+        this.showReplyForm = new Array(newList.length).fill(false);
+        this.replyContent = new Array(newList.length).fill('');
+      }
+    },
+    methods:{
+      getDocList() {
+        this.loading = true;
+        this.queryParams.toolId = this.toolDetail.toolId
+        listDocument(this.queryParams).then(response => {
+            this.docList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }
+        );
+      },
+      handleAdd(){
+        this.open = true
+      },
+      editDocumentSubmit(){
+        this.open = false
+        this.getDocList()
+      },
+      handlePriew(row){
+        this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
+        this.viewDialogTitle = '文档在线预览'
+        this.viewDialogOpen = true;
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const docIds = row.docId || this.ids;
+        this.$modal.confirm('是否确认删除？').then(function() {
+          return delDocument(docIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /**
+       * 处理下载
+       * **/
+      handleDownload(row){
+        let self = this
+        self.loadingDownload = true
+        this.$download.resource(row.docUrl);
+
+        //保存下载记录
+        if(this.toolDetail.toolId){
+          let formData = {
+            toolId: this.toolDetail.toolId
+          }
+          addCount(formData).then(res => {
+            console.info("res==========", res)
+          });
+        }
+
+        setTimeout(()=>{
+          self.loadingDownload = false
+        },1000)
+      },
+      getDiscussionsList() {
+        let self = this
+        listDiscussions({businessId:this.toolDetail.toolId}).then(res => {
+          self.discussionsList = res.rows
+          self.discussionsList.forEach(item => {
+            if(item.repliesList && item.repliesList.length > 0){
+              self.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
+              self.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
+            }else{
+              self.$set(item, 'showReplyFormSon', false)
+              self.$set(item, 'replyContentSon', '')
+            }
+          });
+        });
+      },
+      /** 评论 **/
+      handleDiscussions(){
+        let self = this
+        if (this.discussionContent == '' || this.discussionContent == null || this.discussionContent == undefined) {
+          self.$message({
+            message: '内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          businessId: this.toolDetail.toolId,
+          content: this.discussionContent,
+          type: "tool",
+        }
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addDiscussions(data).then(res => {
+            this.discussionContent = null
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.getDiscussionsList()
+          }).catch(err =>{
+            this.discussionContent = null
+            console.error("handleDiscussions==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+      },
+      getFirstChar(value) {
+        if(!value){return ''}
+        return value.charAt(0);
+      },
+      toggleReplyForm(index) {
+        this.$set(this.showReplyForm, index, !this.showReplyForm[index]);
+      },
+      cancelReply(index) {
+        this.$set(this.showReplyForm, index, false);
+        this.$set(this.replyContent, index, '');
+      },
+      /** 回复 **/
+      submitReply(index, item) {
+        let self = this
+        const content = this.replyContent[index];
+        if (content == '' || content == null || content == undefined) {
+          self.$message({
+            message: '回复内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          "discussionId": item.id,
+          "content": content,
+        }
+
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addReplies(data).then(res => {
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.cancelReply(index)
+            self.getDiscussionsList()
+          }).catch(err =>{
+            console.error("handleDiscussions==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+
+        // 清空回复内容并隐藏表单
+        this.replyContent[index] = '';
+        this.showReplyForm[index] = false;
+      },
+
+
+
+      /** 第二级 **/
+      toggleReplyFormSon(parentIndex, repIndex) {
+        const parentItem = this.discussionsList[parentIndex];
+        this.$set(parentItem.showReplyFormSon, repIndex, !parentItem.showReplyFormSon[repIndex]);
+        // this.$set(this.showReplyFormSon, index, !this.showReplyFormSon[index]);
+      },
+      /** 第二级，取消回复 **/
+      cancelReplySon(parentIndex, repIndex) {
+        const parentItem = this.discussionsList[parentIndex];
+        this.$set(parentItem.showReplyFormSon, repIndex, false);
+        this.$set(parentItem.replyContentSon, repIndex, '');
+      },
+      /** 第二级回复 **/
+      submitReplySon(parentIndex, repIndex, repItem) {
+        let self = this
+        const parentItem = this.discussionsList[parentIndex];
+        const content = parentItem.replyContentSon[repIndex];
+        if (content.trim() == '' || content == null || content == undefined) {
+          self.$message({
+            message: '回复内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          "discussionId": repItem.id,
+          "content": content,
+        }
+
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addReplies(data).then(res => {
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.cancelReplySon(parentIndex, repIndex)
+            self.getDiscussionsList()
+          }).catch(err =>{
+            console.error("submitReplySon==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+
+        // 清空回复内容并隐藏表单
+        this.$set(parentItem.replyContentSon, repIndex, '');
+        this.$set(parentItem.showReplyFormSon, repIndex, false);
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index ab6afff..b842dcd 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -121,7 +121,7 @@
             <template slot-scope="scope">
               <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus=='done'" @click="applyUse(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
-              <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus">下载</el-button>
+              <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus" @click="handleFileDownload(scope.row)">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right" >更多</el-button>
                 <el-dropdown-menu slot="dropdown">
@@ -200,23 +200,36 @@
       </template>
     </el-drawer><!--el-drawer 详情-抽屉-->
 
+
+
+    <!-- 工具详情对话框 -->
+    <el-drawer :visible.sync="fileDetailDrawerOpen" :modal-append-to-body="false" size="85%" class="no-padding" @close="handleFileCloseDetail()">
+      <template #title>
+        <span>工具下载</span>
+      </template>
+      <template v-if="fileDetailOpen">
+        <download-file-detail ref="downloadFileDetailRef" :toolDetail="toolDetail"/>
+      </template>
+    </el-drawer><!--el-drawer 详情-抽屉-->
+
   </div><!--app-container-->
 </template>
 
 <script>
-  import { listTool, getTool, delTool, addTool, updateTool } from "@/api/tool/tool";
-  import { deptTreeSelect } from "@/api/system/user";
+import { listTool, getTool, delTool, addTool, updateTool } from "@/api/tool/tool";
+import { deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { Base64 } from 'js-base64'
 import Treeselect from "@riophae/vue-treeselect";
 import toolDetail from "./toolDetail";
+import downloadFileDetail from "./downloadFileDetail.vue";
 import AddDoc from './AddDoc'
 import mainComponent from "@/components/mainComponent/index.vue";
 
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'tool_type', 'tool_status'],
-  components: { Treeselect, toolDetail, AddDoc,mainComponent },
+  components: { Treeselect, toolDetail, AddDoc,mainComponent,downloadFileDetail },
   data() {
     return {
       userInfo: this.$store.getters.userInfo,
@@ -311,7 +324,9 @@ export default {
       addDocShow: false,
       viewDialogOpen: false,
       viewDialogTitle: '',
-      previewUrl: ''
+      previewUrl: '',
+      fileDetailDrawerOpen: false,
+      fileDetailOpen: false,
     };
   },
   watch: {
@@ -441,6 +456,11 @@ export default {
       this.detailOpen = true
       this.toolDetail = row
     },
+    handleFileDownload(row){
+      this.fileDetailDrawerOpen = true
+      this.fileDetailOpen = true
+      this.toolDetail = row
+    },
     // 更多操作触发
     handleCommand(command, row) {
       switch (command) {
@@ -540,13 +560,21 @@ export default {
     },
     /** 关闭详情 **/
     handleCloseDetail(){
-      console.info("1111111111")
       this.detailDrawerOpen = false;
       this.detailOpen = false;
       this.$refs.toolDetailRef.$destroy(); // 销毁组件
       this.$nextTick(() => {
         this.$refs.toolDetailRef = null; // 清空引用
       });
+    },
+    /** 关闭详情 **/
+    handleFileCloseDetail(){
+      this.fileDetailDrawerOpen = false;
+      this.fileDetailOpen = false;
+      this.$refs.downloadFileDetailRef.$destroy(); // 销毁组件
+      this.$nextTick(() => {
+        this.$refs.downloadFileDetailRef = null; // 清空引用
+      });
     }
   }
 };
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index c291293..a577625 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -114,8 +114,8 @@
         </template>
       </div>
     </div>
-    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body>
-      <i-frame :src="previewUrl" />
+    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
+      <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
     </el-dialog>
 
     <!-- 上传 -->
@@ -368,6 +368,9 @@
         this.$set(parentItem.replyContentSon, repIndex, '');
         this.$set(parentItem.showReplyFormSon, repIndex, false);
       },
+      handleBeforeClose() {
+        this.viewDialogOpen = false
+      }
     }
   }
 </script>
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 29aa52c..eea848e 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -283,8 +283,8 @@
     <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
 
 
-    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body>
-      <i-frame :src="previewUrl" />
+    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
+      <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
     </el-dialog>
   </div>
 </template>
@@ -882,6 +882,9 @@ export default {
         self.loadingDownload = false
       },1000)
     },
+    handleBeforeClose() {
+      this.viewDialogOpen = false
+    }
   },
 
 };
-- 
2.35.1.windows.2


From b689f6a51d95cad62b92a480d30d66f21be96492 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Mon, 2 Sep 2024 08:40:29 +0800
Subject: [PATCH 16/55] update

---
 .env.development                              |   2 +-
 public/index.html                             |   4 +-
 src/api/tool/{userApply.js => toolApply.js}   |  12 +-
 src/components/MonitorDrawer/index.vue        |  15 +-
 src/views/tool/index.vue                      |   2 +-
 .../workflowList/addWorkflow/tool_release.vue | 203 ++++++------
 .../workflowList/addWorkflow/use_apply.vue    | 156 +++++----
 src/views/workstuff/apply/index.vue           | 296 +++++++++++++-----
 src/views/workstuff/dispose/index.vue         |  30 +-
 vue.config.js                                 |   7 +
 10 files changed, 464 insertions(+), 263 deletions(-)
 rename src/api/tool/{userApply.js => toolApply.js} (79%)

diff --git a/.env.development b/.env.development
index 3b7e03a..cd871ae 100644
--- a/.env.development
+++ b/.env.development
@@ -14,7 +14,7 @@ VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
 VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
 
 # 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.2.18:8085/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/public/index.html b/public/index.html
index 925455c..b4c517f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -197,12 +197,12 @@
   </head>
   <body>
     <div id="app">
-	    <div id="loader-wrapper">
+<!--	    <div id="loader-wrapper">
 		    <div id="loader"></div>
 		    <div class="loader-section section-left"></div>
 		    <div class="loader-section section-right"></div>
 		    <div class="load_title">正在加载系统资源，请耐心等待</div>
-        </div>
+      </div>-->
 	</div>
   </body>
 </html>
diff --git a/src/api/tool/userApply.js b/src/api/tool/toolApply.js
similarity index 79%
rename from src/api/tool/userApply.js
rename to src/api/tool/toolApply.js
index 339e730..5237c71 100644
--- a/src/api/tool/userApply.js
+++ b/src/api/tool/toolApply.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询使用申请列表
 export function listApply(query) {
   return request({
-    url: '/use/apply/list',
+    url: '/tool/apply/list',
     method: 'get',
     params: query
   })
@@ -12,14 +12,14 @@ export function listApply(query) {
 // 查询使用申请详细
 export function getApply(id) {
   return request({
-    url: '/use/apply/' + id,
+    url: '/tool/apply/' + id,
     method: 'get'
   })
 }
 
 export function getInfoByBpmcId(bpmcId) {
   return request({
-    url: '/use/apply/bpmc/' + bpmcId,
+    url: '/tool/apply/bpmc/' + bpmcId,
     method: 'get'
   })
 }
@@ -27,7 +27,7 @@ export function getInfoByBpmcId(bpmcId) {
 // 新增使用申请
 export function addApply(data) {
   return request({
-    url: '/use/apply',
+    url: '/tool/apply',
     method: 'post',
     data: data
   })
@@ -36,7 +36,7 @@ export function addApply(data) {
 // 修改使用申请
 export function updateApply(data) {
   return request({
-    url: '/use/apply/edit',
+    url: '/tool/apply/edit',
     method: 'post',
     data: data
   })
@@ -45,7 +45,7 @@ export function updateApply(data) {
 // 删除使用申请
 export function delApply(id) {
   return request({
-    url: '/use/apply/' + id,
+    url: '/tool/apply/' + id,
     method: 'delete'
   })
 }
diff --git a/src/components/MonitorDrawer/index.vue b/src/components/MonitorDrawer/index.vue
index fb17495..81db554 100644
--- a/src/components/MonitorDrawer/index.vue
+++ b/src/components/MonitorDrawer/index.vue
@@ -1,11 +1,17 @@
 <template>
   <el-drawer
     :wrapperClosable='false'
-    title="流程监控"
     size="65%"
     :visible.sync="visible"
+    :show-close="false"
     :append-to-body="true"
   >
+    <template #title>
+      <span>流程监控</span>
+      <div class="drawer-head-btn">
+        <el-button @click="visible = false"><i class="el-icon-close"></i> 关闭</el-button>
+      </div><!--drawer-head-btn 抽屉顶部按钮区域-->
+    </template>
     <div style="width:100%;height:100%">
       <iframe :src="src" width="100%" height="100%" title="myFrame" style="border: 0;"></iframe>
     </div>
@@ -23,11 +29,8 @@
         },
         methods: {
             init(procInstId) {
-                let _this = this
-                _this.visible = true
-                getHistAskLogUrl(procInstId).then(res => {
-                    _this.src=res.data
-                })
+              this.visible = true
+              this.src = process.env.VUE_APP_WORKFLOW_MANAGE_URL + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
             }
         }
     }
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index b842dcd..3fd7c6d 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -187,7 +187,7 @@
       modal-append-to-body
       :destroy-on-close="true"
     >
-      <main-component ref="mainComponent" :code="path+code"  :data="data"  @close="handleClose"></main-component>
+      <main-component ref="mainComponent" :code="path + code"  :data="data"  @close="handleClose"></main-component>
     </el-drawer>
 
     <!-- 工具详情对话框 -->
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index eea848e..7c099ac 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -7,23 +7,58 @@
         </div>
       </div>
       <div class="cell-btn">
-        <el-button v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
-        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">删除</el-button>
-        <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm">提交</el-button>
-        <el-button v-if="editStatus" type="primary" @click="saveForm" >保存</el-button>
+        <el-button type="primary" v-if="pListData && pListData.procInstId" @click="handleMonitor">流程监控</el-button>
+        <el-button v-if="editStatus && pListData.procInstId" type="danger" @click="deleteForm">删除</el-button>
+        <el-button v-if="(editStatus || workflowStatus)" type="primary" @click="submitForm">提交</el-button>
+        <el-button v-if="editStatus" type="primary" @click="saveForm">保存</el-button>
         <el-button @click="close">关闭</el-button>
       </div>
     </div>
-    <el-tabs v-if="pListData&&pListData.procInstId" v-model="activeName">
-      <el-tab-pane label="信息内容" name="info"></el-tab-pane>
-      <el-tab-pane label="审批记录" name="log"></el-tab-pane>
-    </el-tabs>
-    <div class="el-form-border" v-show="activeName==='info'">
+    <template v-if="attributeModelBool('approve') && workflowStatus">
+      <div class="divide double"></div><!--divide 分隔-->
+      <div class="tboper">
+        <div class="tit"> {{submitLabel}}</div>
+      </div><!--tboper 标题与操作按钮-->
+      <div class="el-form-border">
+        <el-form>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="submitLabel+'结论:'" prop="pass">
+                <el-radio-group v-model.trim="formSubmit.pass">
+                  <el-radio
+                    v-for="dict in passoptions"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >{{ dict.label }}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row >
+            <el-col :span="24">
+              <el-form-item :label="submitLabel+'意见:'">
+                <el-input
+                  v-model="formSubmit.summary"
+                  type="textarea"
+                  :placeholder="'请输入'+submitLabel+'意见'"
+                  maxlength="200"
+                  :autosize="{ minRows: 4, maxRows: 4 }"
+                  :style="{ width: '100%' }"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </template>
+
+    <div class="divide double"></div><!--divide 分隔-->
+    <div class="tboper">
+      <div class="tit">工具信息</div>
+    </div>
+    <div class="el-form-border">
       <el-form ref="eForm" :model="form" :rules="rules" label-width="150px">
         <div>
-          <div class="box-title">
-            基本信息
-          </div>
           <el-row>
             <el-col :span="12">
               <el-form-item label="工具编号" prop="toolCode">
@@ -159,98 +194,66 @@
             </el-col>
           </el-row>
         </div>
-        <div>
-          <div class="box-title">
-            关联附件
-          </div>
-          <div class="operate">
-            <el-button type="primary" icon="el-icon-upload2" v-if="editStatus" @click="handleDocAdd">上传</el-button>
-<!--            <el-button icon="el-icon-delete">删除</el-button>-->
-          </div><!--operate 操作按钮-->
-          <el-table :data="docList" style="width: 100%">
-<!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
-            <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
-            <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" >
-              <template slot-scope="scope">
-                {{convertDeptName(scope.row)}}
-              </template>
-            </el-table-column>
-            <el-table-column label="来源" prop="docSource" width="100" >
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="180">
-              <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-view"
-                  v-if="isShowOperation(scope.row)"
-                  @click="handlePreview(scope.row)"
-                >预览</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  v-if="editStatus"
-                  @click="handleDelete(scope.row)"
-                >删除</el-button>
-                <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
-              </template>
-            </el-table-column>
-          </el-table><!--el-table-->
-        </div>
-        <div v-if="attributeModelBool('approve')&&workflowStatus">
-          <div class="box-title">
-            {{submitLabel}}
-          </div>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="submitLabel+'结论:'" prop="pass">
-                <el-radio-group v-model.trim="formSubmit.pass">
-                  <el-radio
-                    v-for="dict in passoptions"
-                    :key="dict.value"
-                    :label="dict.value"
-                  >{{ dict.label }}</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row >
-            <el-col :span="24">
-              <el-form-item :label="submitLabel+'意见:'">
-                <el-input
-                  v-model="formSubmit.summary"
-                  type="textarea"
-                  :placeholder="'请输入'+submitLabel+'意见'"
-                  maxlength="200"
-                  :autosize="{ minRows: 4, maxRows: 4 }"
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
       </el-form>
       <!-- 上传 -->
       <add-doc :show.sync="addDocShow" ref="addDocRef" @addFileData="addFileData"/>
     </div><!--el-form-border 表单-->
-    <div v-show="activeName==='log'">
-      <workflow-logs :procInstId = "pListData.procInstId"></workflow-logs>
+
+    <div class="divide double"></div><!--divide 分隔-->
+    <div class="tboper">
+      <div class="tit">关联附件</div>
     </div>
+    <div class="el-form-border">
+      <div class="operate">
+        <el-button type="primary" icon="el-icon-upload2" v-if="editStatus" @click="handleDocAdd">上传</el-button>
+        <!--            <el-button icon="el-icon-delete">删除</el-button>-->
+      </div><!--operate 操作按钮-->
+      <el-table :data="docList" style="width: 100%">
+        <!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
+        <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
+        <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
+        <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" >
+          <template slot-scope="scope">
+            {{convertDeptName(scope.row)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="来源" prop="docSource" width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="180">
+          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              v-if="isShowOperation(scope.row)"
+              @click="handlePreview(scope.row)"
+            >预览</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              v-if="editStatus"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+            <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+          </template>
+        </el-table-column>
+      </el-table><!--el-table-->
+    </div>
+
     <!-- 流程选择下一环节及人员  开始 -->
     <el-dialog
       title="选择下一环节及人员"
@@ -356,7 +359,7 @@ export default {
         { value: true, label: "通过" },
         { value: false, label: "不通过" },
       ],
-      formSubmit: { summary: "", actionType: "", pass: "" },
+      formSubmit: { summary: "", actionType: "", pass: true },
       isSummary: false,
       activeName: "info",
       nodeDetail: [],
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index 97af939..daf0575 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -1,5 +1,5 @@
 <template>
-  <div  v-loading="loading||detailLoading">
+  <div v-loading="loading || detailLoading">
     <div class="drawer-head">
       <div class="cell-title">
         <div>
@@ -7,66 +7,19 @@
         </div>
       </div>
       <div class="cell-btn">
-        <el-button v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
+        <el-button type="primary" v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
         <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">撤销</el-button>
         <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm">提交</el-button>
         <el-button v-if="editStatus" type="primary" @click="saveForm" >保存</el-button>
         <el-button @click="close">关闭</el-button>
       </div>
     </div>
-    <el-tabs v-if="pListData&&pListData.procInstId" v-model="activeName">
-      <el-tab-pane label="信息内容" name="info"></el-tab-pane>
-      <el-tab-pane label="审批记录" name="log"></el-tab-pane>
-    </el-tabs>
-    <div class="el-form-border" v-show="activeName==='info'">
-      <el-form ref="eForm" :model="form" :rules="rules" label-width="150px">
-        <div>
-          <div class="box-title">
-            基本信息
-          </div>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="申请人" prop="userId">
-                <el-input v-if="editStatus" v-model="form.nickName" placeholder="请输入申请人" @focus="toolPrincipalsChoose = true"/>
-                <span v-else>{{form.nickName}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="申请部门" prop="deptId">
-                <span>{{form.deptName}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="申请理由" prop="reason">
-                <el-input :readonly="!editStatus" v-model="form.reason" type="textarea" :rows="3" maxlength="1000" show-word-limit></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <div>
-          <div class="box-title">
-            申请工具
-          </div>
-          <el-table :data="dataList" style="width: 100%">
-            <el-table-column label="工具编号" prop="toolCode" :show-overflow-tooltip="true" />
-            <el-table-column label="工具名称" prop="toolName" :show-overflow-tooltip="true" />
-            <el-table-column label="归属单位" prop="toolRespDept" :show-overflow-tooltip="true" />
-            <el-table-column label="负责人" prop="toolPrincipalsName" :show-overflow-tooltip="true" />
-            <el-table-column label="工具类别" prop="toolType" :show-overflow-tooltip="true" >
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div v-if="attributeModelBool('approve')&&workflowStatus">
-          <div class="box-title">
-            {{submitLabel}}
-          </div>
+    <template v-if="attributeModelBool('approve') && workflowStatus">
+      <div class="tboper">
+        <div class="tit"> {{submitLabel}}</div>
+      </div><!--tboper 标题与操作按钮-->
+      <div class="el-form-border">
+        <el-form>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="submitLabel+'结论:'" prop="pass">
@@ -94,12 +47,91 @@
               </el-form-item>
             </el-col>
           </el-row>
+        </el-form>
+      </div>
+    </template>
+    <div class="divide double"></div><!--divide 分隔-->
+    <div class="tboper">
+      <div class="tit">申请信息</div>
+    </div>
+    <div class="el-form-border">
+      <el-form ref="eForm" :model="form" :rules="rules" label-width="150px">
+        <div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="申请人" prop="userId">
+                <el-input v-if="editStatus" v-model="form.nickName" placeholder="请输入申请人" @focus="toolPrincipalsChoose = true"/>
+                <span v-else>{{form.nickName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="申请部门" prop="deptId">
+                <span>{{form.deptName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="申请理由" prop="reason">
+                <el-input :readonly="!editStatus" v-model="form.reason" type="textarea" :rows="3" maxlength="1000" show-word-limit></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
       </el-form>
     </div><!--el-form-border 表单-->
-    <div v-show="activeName==='log'">
-      <workflow-logs :procInstId = "pListData.procInstId"></workflow-logs>
+    <div class="divide double"></div><!--divide 分隔-->
+    <div class="tboper">
+      <div class="tit">申请工具</div>
+    </div><!--tboper 标题与操作按钮-->
+    <div class="el-form-border">
+      <el-form ref="form" label-width="150px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工具编号">{{applyToolDetail ? applyToolDetail.toolCode:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工具名称">{{applyToolDetail ? applyToolDetail.toolName:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人">{{applyToolDetail ? applyToolDetail.toolPrincipalsName:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门">{{applyToolDetail ? applyToolDetail.toolRespDept:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工具来源">{{applyToolDetail ? applyToolDetail.toolSource:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工具用途">{{applyToolDetail ? applyToolDetail.toolUse:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工具类别">{{applyToolDetail ? applyToolDetail.toolType:''}}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">{{applyToolDetail ? applyToolDetail.status:''}}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="测试情况">{{applyToolDetail ? applyToolDetail.testSituation:''}}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="功能描述">{{applyToolDetail ? applyToolDetail.functionDesc:''}}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="适用条件">{{applyToolDetail ? applyToolDetail.applyCondition:''}}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="操作说明">{{applyToolDetail ? applyToolDetail.operateExplain:''}}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注">{{applyToolDetail ? applyToolDetail.remark:''}}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form><!--el-form-->
     </div>
+
     <!-- 流程选择下一环节及人员  开始 -->
     <el-dialog
       title="选择下一环节及人员"
@@ -144,9 +176,10 @@ import WorkflowLogs from '@/views/workflowList/workflowLogs/index.vue'
 import AddDoc from '@/views/tool/AddDoc.vue'
 import Treeselect from '@riophae/vue-treeselect'
 import { deptTreeSelect } from "@/api/system/user";
-import { addApply, getInfoByBpmcId, updateApply } from '@/api/tool/userApply'
+import { addApply, getInfoByBpmcId, updateApply } from '@/api/tool/toolApply'
 import { listItem } from '@/api/tool/userApplyItem'
 import blUserSelector from '@/components/user-selector/src/user-selector.vue'
+import { getTool } from "@/api/tool/tool";
 // PDF本地文件预览
 export default {
   dicts: ['sys_normal_disable','tool_type'],
@@ -163,6 +196,7 @@ export default {
       toolPrincipalsChoose: false,
       // 新增时的关联附件
       dataList: [],
+      applyToolDetail: {},
       addDocShow: false,
       defaultStaff: [],
       yes: 'Y',
@@ -176,7 +210,7 @@ export default {
         { value: true, label: "通过" },
         { value: false, label: "不通过" },
       ],
-      formSubmit: { summary: "", actionType: "", pass: "" },
+      formSubmit: { summary: "", actionType: "", pass: true },
       isSummary: false,
       activeName: "info",
       nodeDetail: [],
@@ -270,11 +304,15 @@ export default {
       listItem({applyId:id}).then(res=>{
         _this.dataList = res.data
       })
+      getTool(_this.form.toolId).then((response) => {
+        _this.applyToolDetail = response.data;
+      });
     },
     rest(data){
       let _this = this
       _this.activeName = "info"
       _this.dataList = [{...data}]
+      _this.applyToolDetail = {...data}
       _this.form={
         userId:_this.userInfo.userId,
         nickName:_this.userInfo.nickName,
diff --git a/src/views/workstuff/apply/index.vue b/src/views/workstuff/apply/index.vue
index 7e9a17a..f5049c0 100644
--- a/src/views/workstuff/apply/index.vue
+++ b/src/views/workstuff/apply/index.vue
@@ -2,25 +2,34 @@
   <div class="app-container"><!--从这一层开始嵌入页面-->
 
     <el-card>
-      <el-form label-width="80px">
+      <el-form ref="queryForm" label-width="80px">
         <div class="search">
           <div class="sl">
             <el-form-item label="流程标题">
-              <el-input placeholder="输入流程标题"></el-input>
+              <el-input v-model="queryParams.procTitle" placeholder="输入流程标题"></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
-              <el-select placeholder="请选择">
-                <el-option label="进行中" value=""></el-option>
-                <el-option label="已办结" value=""></el-option>
+              <el-select placeholder="请选择" v-model="queryParams.recordStatus" @change="handleQuery">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="审核中" value="doing"></el-option>
+                <el-option label="已审核" value="done"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="发起时间">
-              <el-date-picker type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+              <el-date-picker
+                v-model="dateRange"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
             </el-form-item>
           </div>
           <div class="sr">
-            <el-button type="primary" icon="el-icon-search">搜索</el-button>
-            <el-button icon="el-icon-refresh-left">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
           </div>
         </div><!--search 搜索-->
       </el-form><!--el-form-->
@@ -28,95 +37,166 @@
 
     <el-card>
       <el-table :data="tableData1" style="width: 100%" height="529">
-        <el-table-column prop="prop1" label="申请类型"></el-table-column>
-        <el-table-column prop="prop2" label="流程标题">【使用申请】工具名称11</el-table-column>
-        <el-table-column prop="prop2" label="流程状态" width="150">
+        <el-table-column label="申请类型">
           <template slot-scope="scope">
-            <span :class="getClassName(scope.row.prop2)"><a @click="drawer2 = true">{{ scope.row.prop2 }}</a></span>
+            <span v-if="scope.row.applyType === 'publish'">发布申请</span>
+            <span v-if="scope.row.applyType === 'use'">使用申请</span>
           </template>
         </el-table-column>
-        <el-table-column prop="prop5" label="发起时间"></el-table-column>
-        <el-table-column prop="prop6" label="结束时间"></el-table-column>
+        <el-table-column prop="procTitle" label="流程标题"></el-table-column>
+        <el-table-column label="流程状态" width="150">
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.recordStatus === 'doing'">审核中</el-tag>
+              <el-tag type="success" v-if="scope.row.recordStatus === 'done'">已审核</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="发起时间"></el-table-column>
+        <el-table-column prop="endTime" label="结束时间"></el-table-column>
         <el-table-column label="操作" width="100" >
-          <el-button type="text" icon="el-icon-info" @click="drawer1 = true">详情</el-button>
+          <template slot-scope="scope">
+            <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
+          </template>
         </el-table-column>
       </el-table><!--el-table-->
-      <el-pagination  :current-page="currentPage4" :page-sizes="[100, 200, 300, 400]" :page-size="100" layout="total, sizes, prev, pager, next, jumper" :total="400"></el-pagination>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getListData"
+      />
     </el-card><!--el-card-->
 
-    <el-drawer :visible.sync="drawer1" :direction="direction" :before-close="handleClose" size="75%">
+    <el-drawer :visible.sync="drawer1" size="75%" :show-close="false">
       <template #title>
         <span>申请使用</span>
         <div class="drawer-head-btn">
-          <el-button  @click="drawer2 = true">流程监控</el-button>
+          <el-button type="primary" @click="handleMonitor"><i class="el-icon-data-line"></i> 流程监控</el-button>
+          <el-button  @click="drawer1 = false"><i class="el-icon-close"></i> 关闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
-      <el-tabs v-model="activeName1"  @tab-click="handleClick">
-        <el-tab-pane label="信息内容" name="first">
-          <div class="el-form-border">
-            <el-form ref="form" label-width="150px">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="申请人">张莹</el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="申请部门">信息部</el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="申请理由">
-                    <el-input type="textarea"  maxlength="1000" placeholder="工作需要额外申请，请批准！" :disabled="true"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form><!--el-form-->
-          </div><!--el-form-border 表单-->
-          <div class="divide double"></div><!--divide 分隔-->
-          <div class="tboper">
-            <div class="tit">申请工具</div>
-          </div><!--tboper 标题与操作按钮-->
-          <el-table :data="tableData2" style="width: 100%">
-            <el-table-column prop="prop1"  label="工具编号"></el-table-column>
-            <el-table-column prop="prop2" label="工具名称"></el-table-column>
-            <el-table-column prop="prop3" label="归属单位" width="200"> </el-table-column>
-            <el-table-column prop="prop4" label="负责人" width="100" ></el-table-column>
-            <el-table-column prop="prop5" label="工具类别"  ></el-table-column>
-          </el-table><!--el-table-->
-          <div class="divide double"></div><!--divide 分隔-->
-        </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="审批记录" name="second">
-          <el-table :data="tableData3" style="width: 100%">
-            <el-table-column prop="prop4" label="处理人"></el-table-column>
-            <el-table-column prop="prop3" label="处理环节"> </el-table-column>
-            <el-table-column prop="prop2" label="接收人"></el-table-column>
-            <el-table-column prop="prop1"  label="接收环节"></el-table-column>
-            <el-table-column prop="prop7" label="处理时间" ></el-table-column>
-            <el-table-column prop="prop5" label="审批意见" ></el-table-column>
-          </el-table><!--el-table-->
-        </el-tab-pane><!--el-tab-pane-->
-      </el-tabs><!--el-tabs-->
+      <div class="tboper">
+        <div class="tit">基本信息</div>
+      </div><!--tboper 标题与操作按钮-->
+      <div class="el-form-border">
+        <el-form ref="form" label-width="150px">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="申请人">{{applyDetail.nickName}}</el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="申请部门">{{applyDetail.deptName}}</el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="申请理由">
+                <el-input type="textarea"  maxlength="1000" :placeholder="applyDetail.reason" :disabled="true"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form><!--el-form-->
+      </div><!--el-form-border 表单-->
+      <div class="divide double"></div><!--divide 分隔-->
+      <div class="tboper">
+        <div class="tit">申请工具</div>
+      </div><!--tboper 标题与操作按钮-->
+      <div class="el-form-border">
+        <el-form ref="form" label-width="150px">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="工具编号">{{applyToolDetail.toolCode}}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="工具名称">{{applyToolDetail.toolName}}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="负责人">{{applyToolDetail.toolPrincipalsName}}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="归属部门">{{applyToolDetail.toolRespDept}}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="工具来源">{{applyToolDetail.toolSource}}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="工具用途">{{applyToolDetail.toolUse}}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="工具类别">{{applyToolDetail.toolType}}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态">{{applyToolDetail.status}}</el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="测试情况">{{applyToolDetail.testSituation}}</el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="功能描述">{{applyToolDetail.functionDesc}}</el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="适用条件">{{applyToolDetail.applyCondition}}</el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="操作说明">{{applyToolDetail.operateExplain}}</el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注">{{applyToolDetail.remark}}</el-form-item>
+            </el-col>
+          </el-row>
+        </el-form><!--el-form-->
+      </div>
+      <div class="divide double"></div><!--divide 分隔-->
     </el-drawer><!--el-drawer 申请详情-抽屉-->
 
-    <el-drawer :visible.sync="drawer2" :direction="direction" :before-close="handleClose" size="75%">
-      <template #title>
-        <span>流程监控</span>
-      </template>
-      <div class="lctitle">流程标题：【申请使用】工具名称1 ，流程定义名称：申请使用流程</div><!--lctitle-->
-      <img style="width:auto; max-width: 100%;" src="../../../../public/images/lcjk1.jpg" />
-    </el-drawer><!--el-drawer 流程监控-抽屉-->
+    <el-drawer
+      :visible.sync="drawerShow"
+      direction="rtl"
+      size="90%"
+      :with-header="false"
+      :wrapperClosable="false"
+      :show-close="false"
+      modal-append-to-body
+      :destroy-on-close="true"
+    >
+      <main-component ref="mainComponent" :code="path + code"  :data="data"  @close="handleClose"></main-component>
+    </el-drawer>
 
+    <monitor-drawer
+      v-if="drawer2"
+      ref="monitorDrawer"
+    ></monitor-drawer>
   </div><!--app-container-->
 </template>
 
 <script>
+  import { listApply } from "@/api/tool/toolApply";
+  import { getTool } from "@/api/tool/tool";
+  import DealDrawer from '@/components/DealDrawer/index.vue'
+  import mainComponent from '@/components/mainComponent/index.vue'
   export default {
     name: 'apply',
+    components: { mainComponent, DealDrawer },
     data() {
       return {
         drawer1: false,
         drawer2: false,
-        activeName1: 'first',
-        activeName2: 'second',
-        radio1: '',
+        drawerShow: false,
+        path: 'views/workflowList/addWorkflow/',
+        code: '',
+        data: undefined,
+        // 日期范围
+        dateRange: [],
+        pageSizes: [10,20,50,100],
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams: {
+          pageNumber: 1,
+          pageSize: 10,
+          procTitle: "",
+          recordStatus: "",
+        },
+        applyDetail: {},
+        applyToolDetail: {},
         tableData1: [
           {
             prop1: '使用申请',
@@ -272,20 +352,72 @@
         ],
       }
     },
+    created() {
+      // 初始化获取待办清单
+      this.getListData()
+    },
     methods: {
-      getClassName(prop2) {
-        // 根据不同的文本内容返回不同的类名
-        if (prop2 === '进行中') {
-          return 'blue';
-        } else if (prop2 === '已办结') {
-          return 'green';
-        }else if (prop2 === '不通过') {
-          return 'red';
-        } else if (prop2 === '通过') {
-          return 'green';
-        }
+      handleDeal(row) {
+        this.dealDrawerShow = true;
+        let flowUrl = this.buildFlowUrl(row)
+        this.$nextTick(() => {
+          this.$refs.dealDrawer.init(flowUrl);
+        });
       },
+      /** 查询列表 */
+      getListData() {
+        this.loading = true;
+        this.tableData1 = [];
+        listApply(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
+          this.total = response.total;
+          this.tableData1 = response.rows;
+          this.loading = false;
+        });
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getListData();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        this.resetForm("queryForm");
+        this.queryParams.procTitle = "";
+        this.queryParams.recordStatus = "";
+        this.handleQuery();
+      },
+      showDetail(row){
+        getTool(row.toolId).then((response) => {
+          this.applyToolDetail = response.data;
+        });
+        this.drawer1 = true;
+        this.applyDetail = row;
+      },
+      handleOpen(row){
+        let _this = this
+        _this.code = row.type
+        _this.data = row
+        _this.drawerShow = true
+      },
+      handleDetail(row) {
+        let _this = this
+        if(row.applyType === 'use'){
+          _this.handleOpen({type:'use_apply', procInstId:row.procInstId, status:'2'})
+        } else {
+          _this.handleOpen({type:'tool_release', procInstId:row.procInstId, status:'2'})
+        }
 
+      },
+      handleClose(){
+        this.drawerShow = false
+      },
+      handleMonitor() {
+        this.drawer2 = true;
+        this.$nextTick(() => {
+          this.$refs.monitorDrawer.init(this.applyDetail.procInstId);
+        });
+      },
     },
   }
 </script>
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 9443586..365eddf 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -14,7 +14,7 @@
     <el-card>
       <el-tabs v-model="activeName"  @tab-click="state">
         <el-tab-pane :label="'待办('+ statustotal+')'" name="taskToDo">
-          <el-table :data="postList" style="width: 100%" height="529">
+          <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="curActDefName" label="当前环节"></el-table-column>
@@ -32,10 +32,16 @@
               </template>
             </el-table-column>
           </el-table><!--el-table-->
-          <el-pagination @current-change="getListData" v-show="total > 0"  :current-page="queryParams.pageNumber" :page-sizes="pageSizes" :page-size="queryParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getListData"
+          />
         </el-tab-pane><!--el-tab-pane-->
         <el-tab-pane :label="'已办('+doneTotal+')'" name="taskDealed">
-          <el-table :data="postList" style="width: 100%" height="529">
+          <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="curActDefName" label="处理环节"></el-table-column>
@@ -53,10 +59,16 @@
               </template>
             </el-table-column>
           </el-table><!--el-table-->
-          <el-pagination @current-change="getListData" v-show="total > 0"  :current-page="queryParams.pageNumber" :page-sizes="pageSizes" :page-size="queryParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getListData"
+          />
         </el-tab-pane><!--el-tab-pane-->
         <el-tab-pane :label="'办结('+finishedTotal+')'" name="taskFinish">
-          <el-table :data="postList" style="width: 100%" height="529">
+          <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="startUserName" label="发起人"></el-table-column>
@@ -76,7 +88,13 @@
               </template>
             </el-table-column>
           </el-table><!--el-table-->
-          <el-pagination @current-change="getListData" v-show="total > 0"  :current-page="queryParams.pageNumber" :page-sizes="pageSizes" :page-size="queryParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getListData"
+          />
         </el-tab-pane><!--el-tab-pane-->
       </el-tabs><!--el-tabs-->
     </el-card>
diff --git a/vue.config.js b/vue.config.js
index b1b1454..876cbf4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,6 +40,13 @@ module.exports = {
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
+      },
+      [process.env.VUE_APP_WORKFLOW_MANAGE_URL]: {
+        target: `http://124.223.108.21:9080/ebpm-process-manage`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_WORKFLOW_MANAGE_URL]: ''
+        }
       }
     },
     disableHostCheck: true
-- 
2.35.1.windows.2


From 25fab1b4eed4363d23234a57058a4b19d06a34be Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 2 Sep 2024 10:36:58 +0800
Subject: [PATCH 17/55] =?UTF-8?q?1=E3=80=81=E5=8F=91=E5=B8=83=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=96=B0=E5=A2=9E=E5=85=B3=E8=81=94=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=202=E3=80=81=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=203=E3=80=81=E5=85=88=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=A4=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/optimizeUpload.vue | 833 +++++++++----------
 src/views/tool/index.vue                     |  34 +
 src/views/tool/toolDetail.vue                |  55 +-
 3 files changed, 486 insertions(+), 436 deletions(-)

diff --git a/src/components/FileUpload/optimizeUpload.vue b/src/components/FileUpload/optimizeUpload.vue
index 227684f..41857ab 100644
--- a/src/components/FileUpload/optimizeUpload.vue
+++ b/src/components/FileUpload/optimizeUpload.vue
@@ -1,364 +1,140 @@
 <template>
-<div>
-  <div class="container">
-    <div class="item">
-      <el-upload  action="#"
-                  ref="uploadFolder"
-                  :on-change="onChange"
-                  :on-remove="handleRemove"
-                  :show-file-list="false"
-                  :headers="headers"
-                  :accept="accept"
-                  :file-list="fileList"
-                  :before-upload="beforeUploadsg"
-                  :on-success="uploadSuccess"
-                  :on-error="uploadError"
-                  :on-exceed="exceed"
-                  :auto-upload="true"
-                  :http-request="uploadFile"
-                  :multiple="true">
-        <el-button slot="trigger" id="myButton"  size="small" type="primary" @click="uploadBtn.click()">选取文件夹</el-button>
-      </el-upload>
-    </div>
-    <div></div>
-    <div class="item">
-      <el-upload class="upload-demo" ref="upload" action="#"
-                 :before-upload="beforeUpload"
-                 :on-change="onChange"
-                 :on-remove="handleRemove"
-                 :multiple="isMultiple"
-                 :on-exceed="handleExceed"
-                 :accept="acceptType"
-                 :limit="limit"
-                 :file-list="fileList"
-                 :auto-upload="true"
-                 :http-request="uploadFile"
-                 show-file-list>
-        <el-button id="myButton" slot="trigger" size="small" type="primary">选取文件</el-button>
-        <div slot="tip" class="el-upload__tip">只能上传{{acceptType}}文件</div>
-      </el-upload>
-      <div v-show="progressFlag" class="head-img">
-        <el-progress :text-inside="true" :stroke-width="14" :percentage="progressPercent" status="success"></el-progress>
-      </div>
+  <div>
+    <el-upload class="upload-demo" ref="upload" action="#"
+               :before-upload="beforeUpload"
+               :on-change="onChange"
+               :on-remove="handleRemove"
+               :multiple="isMultiple"
+               :on-exceed="handleExceed"
+               :accept="acceptType"
+               :limit="limit"
+               :file-list="fileList"
+               :auto-upload="true"
+               :http-request="uploadFile"
+               show-file-list>
+      <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+      <el-button size="small" type="primary" @click="handleUploadFile">
+        上传文件夹
+      </el-button>
+      <!--    上传-->
+      <input v-show="false" ref="fileRef" id="fileFolder" type="file" @change="handleFolderUpload" webkitdirectory
+             multiple="multiple" />
+
+<!--      <input v-show="false" type="file" ref="fileRef" webkitdirectory @change="handleFolderUpload">
+      <el-button slot="trigger" size="small" type="primary">选取文件夹</el-button>-->
+    </el-upload>
+    <div slot="tip" class="el-upload__tip">只能上传{{acceptType}}文件</div>
+    <div v-show="progressFlag" class="head-img">
+      <el-progress :text-inside="true" :stroke-width="14" :percentage="progressPercent" status="success"></el-progress>
     </div>
   </div>
-</div>
 </template>
 
 <script>
 import axios from 'axios'
-import sgUploadTray from "./sgUploadTray"
 import {
-    getToken
+  getToken
 } from "@/utils/auth";
+import JSZip from 'jszip'
 
 export default {
-
-  components: {
-    sgUploadTray,
-  },
-    props: {
-        uploadUrl: {
-            type: String,
-            required: true
-        },
-      // 是否多选
-        isMultiple: {
-          type: Boolean,
-          default() {
-            return false
-          }
-        },
-      // 文件类型
-      type: {
-        type: Array,
-        default() {
-          return []
-        }
-      },
-      //上传类型
-      acceptType: {
-        type: String,
-        required: true
-      },
-      // 上传数量
-      limit: {
-        type: Number,
-        default() {
-          return 1
-        }
-      },
-      // 文件
-      dataFile: {
-        type: [Object, Array, String],
-        default() {
-          return ''
-        }
-      },
+  props: {
+    uploadUrl: {
+      type: String,
+      required: true
     },
-    data() {
-        return {
-            fileList: [],
-            progress: 0,
-            isUploading: false,
-            progressFlag: false, //进度条初始值隐藏
-            progressPercent: 0, //进度条初始值
-            partSize: 5 * 1024 * 1024,
-            headers: { kkToken: localStorage.token, }, //获取token(注意仔细看后端接受token的字段名是不是叫做“token”)
-            accept:`.${["png", "jpg", "jpeg", "bmp", "gif"].join(",.")}`,//允许上传的后缀名
-            actionURL: process.env.VUE_APP_BASE_API + "/common/initUpload",
-            dur: 100,
-            percent: 100,
-            uploadBtn: null,//上传按钮
-            uploadList: [],
-            showUploadTray: false,
-        };
-    },
-    mounted(d) {
-      this.$nextTick(() => {
-        this.uploadBtn = this.$refs.uploadFolder.$children[0].$refs.input;
-        this.uploadBtn.webkitdirectory = true;//让el-upload支持上传文件夹
-      })
-    },
-    watch: {
-      dataFile: {
-        handler(newValue, oldValue) {
-          if (newValue) {
-            this.fileList = Array.isArray(newValue) ? newValue : [newValue]
-          } else {
-            this.fileList = []
-          }
-        },
-        immediate: true
+    // 是否多选
+    isMultiple: {
+      type: Boolean,
+      default() {
+        return false
       }
     },
-    methods: {
-      showFakeLoading(file) {
-        file = this.uploadList.find(v => v.uid == file.uid);
-        clearInterval(file.interval);
-        file.percent = 0;
-        file.interval = setInterval(() => {
-          file.percent++;
-          file.percent >= 99 && this.hideFakeLoading(file);
-        }, this.dur);
-      },
-      hideFakeLoading(file, { type, tip, color } = {}) {
-        console.log('file======>');
-        console.log(file)
-        file = this.uploadList.find(v => v.uid == file.uid);
-        clearInterval(file.interval);
-        switch (type) {
-          case 'error':
-            file.percent = 0;
-            break;
-          case 'success':
-          default:
-            file.percent = 100;
-        }
-        type && (file.type = type);
-        tip && (file.tip = tip);
-        color && (file.color = color);
-      },
-      exceed(file, fileList) {
-        this.$message.error("上传文件数量太大，分散上传吧！");
-      },
-      stopUpload(d) {
-        this.$refs.uploadFolder.abort();
-        //console.log(`取消上传`, d);
-      },
-      beforeUploadsg(file, id) {
-        console.log(this.uploadList)
-        this.uploadList = []
-        console.info("this.uploadList==", JSON.stringify(this.uploadList))
-        this.uploadList.unshift({
-          interval: false,
-          uid: file.uid,
-          percent: 0,//加载进度
-          name: file.name,
-          size: file.size,
-          type: file.type,
-          webkitRelativePath: file.webkitRelativePath,
-          tip: '',
-          color: '',
-        });
-        this.showUploadTray = true;
-        this.accept = ["png", "jpg", "jpeg", "bmp", "gif", "txt", "json", "pdf"]
-        // 判断是不是特定的格式________________________
-        let isFile = this.accept.includes(file.name.toLocaleLowerCase().split(".").pop());
-        const maxSize = 50; //限制大小
-        const isAllowSize = file.size / 1024 / 1024 <= maxSize;
-        isFile || this.$message.error("上传文件只能是" + this.accept+ "格式");
-        isAllowSize || this.$message.error("上传文件大小不能超过" + maxSize + "MB");
-        let allowUpload = isFile && isAllowSize;
-        return allowUpload; //若返回false则停止上传
-      },
-
-      uploadSuccess(response, file, fileList) {
-        if (response.data && response.data.key) {
-          // 下载失败原因的描述文件
-          this.$d.customer_downloadImportCustomerExcel({ key: response.data.key }, {
-            s: (d) => {
-              this.hideFakeLoading(file, { type: 'error', tip: "上传失败", color: "red" });
-              this.$g.downloadFile(d, `${file.name}-上传失败原因`, '.xls');
-              this.$message.error(`${file.name}-上传失败，请查看失败原因`);
-              // this.initList();//刷新列表
-              //console.log('上传失败', response, file, fileList);
-            }
-          });
-        } else if (response.success) {
-          // 上传成功了
-          this.hideFakeLoading(file, { type: 'success', tip: "上传成功", color: "green" });
-          this.$message.success(`“${file.name}上传成功`);
-          // this.initList();//刷新列表
-          //console.log('上传成功', response, file, fileList);
+    // 文件类型
+    type: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    //上传类型
+    acceptType: {
+      type: String,
+      required: true
+    },
+    // 上传数量
+    limit: {
+      type: Number,
+      default() {
+        return 1
+      }
+    },
+    // 文件
+    dataFile: {
+      type: [Object, Array, String],
+      default() {
+        return ''
+      }
+    },
+  },
+  data() {
+    return {
+      fileList: [],
+      progress: 0,
+      isUploading: false,
+      progressFlag: false, //进度条初始值隐藏
+      progressPercent: 0, //进度条初始值
+      partSize: 5 * 1024 * 1024,
+    };
+  },
+  watch: {
+    dataFile: {
+      handler(newValue, oldValue) {
+        if (newValue) {
+          this.fileList = Array.isArray(newValue) ? newValue : [newValue]
         } else {
-          // 其他失败原因
-          this.hideFakeLoading(file, { type: 'error', tip: "上传失败", color: "red" });
-          this.$message.error(response.msg);
-          //console.log('上传失败', response, file, fileList);
+          this.fileList = []
         }
       },
-      //上传失败
-      uploadError(err, file, fileList) {
-        this.hideFakeLoading(file, { type: 'error', tip: "上传失败", color: "red" });
-        this.$message.error("上传失败");
-        //console.log('上传失败', err, file, fileList);
-      },
-
-      // 上传前
-      beforeUpload(file) {
-       /* const fileType = file.type.toLowerCase()
-        console.info("fileType=======", fileType)
-        const typeFlag = this.type.some(item => {
-          return fileType.indexOf(item) != -1
-        })
-        if (!typeFlag) {
-          this.$message.error('上传类型有误，请重新上传')
-          return false
-        }*/
-      },
-        //文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
-        onChange(file, fileList) {
-            this.fileList = fileList;
-        },
-        handleRemove(file, fileList) {
-            this.fileList = fileList;
-        },
-        handleExceed(files, fileList) {
-            this.$message.warning(
-                "最多之能上传"+ this.limit +"个附件"
-            );
-        },
-      async uploadFile({ data, file }) {
-        let self = this
-        //初始化参数
-        this.progress++
-        if (file.size < this.partSize) {
-          let formData = new FormData()
-          formData.append("file", file)
-          self.progressFlag = true;
-          axios({
-            url: self.uploadUrl,
-            method: 'post',
-            data: formData,
-            headers: {
-              'Authorization': 'Bearer ' + getToken(),
-              'Content-Type': 'multipart/form-data'
-            },
-            onUploadProgress: progressEvent => {
-              // progressEvent.loaded:已上传文件大小
-              // progressEvent.total:被上传文件的总大小
-              //进度条
-              self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
-            }
-          }).then(res => {
-            setTimeout(() => {
-              if (res.data.code == 200 && self.progressPercent === 100) {
-                setTimeout(function () {
-                  self.$message({
-                    message: '上传成功！',
-                    type: 'success',
-                    duration: '2000'
-                  });
-                  self.progressFlag = false;
-                  self.progressPercent = 0
-                  self.handleResult(res,file);
-                }, 500);
-              } else {
-                self.$message({
-                  message: '上传失败！',
-                  type: 'error',
-                  duration: '2000'
-                });
-              }
-            }, 1000);
-
-          }).catch(error => {
-            console.error(error)
-            self.progressFlag = false;
-            self.progressPercent = 0
-            self.$refs.upload.clearFiles();
-            self.$message({
-              message: '上传失败！',
-              type: 'error',
-              duration: '2000'
-            });
-          })
-        } else {
-          file._shardCount = Math.ceil(file.size / this.partSize) //总片数
-          file.uploaded = 0
-          let formData = new FormData()
-          formData.append('fileName', file.name)
-          let self = this
-
-          //大文件上传初始化,返回uploadId  initUpload(formData)
-          axios({
-            url: process.env.VUE_APP_BASE_API + "/common/initUpload",
-            method: 'post',
-            data: formData,
-            headers: {
-              'Authorization': 'Bearer ' + getToken(),
-              'Content-Type': 'multipart/form-data'
-            },
-          }).then(function (res) {
-            if (res.status == 200) {
-              //从第0块开始上传
-              file.uploadId = res.data.uploadId
-              file.objectKey = res.data
-              file.chunkId = 0
-              self.uploadByChunk(file)
-            } else {
-              this.progress--
-              self.$message.error(res.msg)
-            }
-          }).catch(error => {
-            self.progressPercent = 0
-            self.progressFlag = false;
-            console.error(error)
-          })
-        }
-
-      },
-      //分片上传大文件
-      uploadByChunk(file) {
-        this._start = file.chunkId * this.partSize
-        this._end = Math.min(file.size, this._start + this.partSize)//结束时总大小，和 开始的大小+之前的大小比较
-        let self = this
-        let fileData = file.slice(this._start, this._end)
-        //获取文件块MD5
-        let reader = new FileReader()
-        reader.readAsBinaryString(fileData)
-        let form1 = new FormData()//new一个form的实例，可以进行键值对的添加，
-        form1.append('chunkFile', fileData) //slice方法用于切出文件的一部分
-        form1.append('uploadId', file.uploadId)
-        form1.append('chunkId', (file.chunkId + 1).toString())
-        form1.append('shardCount', file._shardCount.toString()) //是否最后一片
+      immediate: true
+    }
+  },
+  methods: {
+    // 上传前
+    beforeUpload(file) {
+      /* const fileType = file.type.toLowerCase()
+       console.info("fileType=======", fileType)
+       const typeFlag = this.type.some(item => {
+         return fileType.indexOf(item) != -1
+       })
+       if (!typeFlag) {
+         this.$message.error('上传类型有误，请重新上传')
+         return false
+       }*/
+    },
+    //文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
+    onChange(file, fileList) {
+      this.fileList = fileList;
+    },
+    handleRemove(file, fileList) {
+      this.fileList = fileList;
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        "最多之能上传"+ this.limit +"个附件"
+      );
+    },
+    async uploadFile({ data, file }) {
+      let self = this
+      //初始化参数
+      if (file.size < this.partSize) {
+        let formData = new FormData()
+        formData.append("file", file)
         self.progressFlag = true;
-        //上传大文件的Chunk 返回chunk的MD5 uploadChunk(form1)
         axios({
-          url: process.env.VUE_APP_BASE_API + "/common/uploadChunk",
+          url: self.uploadUrl,
           method: 'post',
-          data: form1,
+          data: formData,
           headers: {
             'Authorization': 'Bearer ' + getToken(),
             'Content-Type': 'multipart/form-data'
@@ -369,53 +145,9 @@ export default {
             //进度条
             self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
           }
-        }).then(response => {
-          if (response.status == 200) {
-            //判断返回的MD5值是否一致，一致继续传下一块，否则重传本块（这里目前前后端MD5一直不一致，暂时先注释掉，有时间了我再研究一下）
-            // self.md5Str[index] === response.msg ||
-            if (true) {
-              // this.$message.success('第' + (index + 1).toString() + '块文件上传成功')
-              file.uploaded++
-              self.percentageSend(file)
-              //如果没上传完成，继续上传一下块
-              file.chunkId++
-              if (file.chunkId < file._shardCount) {
-                this.uploadByChunk(file)
-              }
-            } else {
-              //不一致，重新传本块
-              this.$message.success('第' + (file.chunkId + 1).toString() + '块文件上传不成功，重新上传')
-              this.uploadByChunk(file.chunkId)
-            }
-          } else {
-            //出错，跳出循环显示错误
-            this.progress--
-            this.$message.error(response.msg)
-          }
-        })
-      },
-      //接收上传的百分值回调
-      percentageSend(file) {
-        let self = this
-        let perNum = Math.floor((file.uploaded / file._shardCount) * 100)
-        this.progressPercent = perNum
-        //如果上传完成，合并文件
-        if (perNum === 100) {
-          let form2 = new FormData()//new一个form的实例，可以进行键值对的添加，
-          form2.append('uploadId', file.uploadId)
-          form2.append('fileName', file.name)
-          // 大文件上传完成后合并
-          // 返回文件访问的URL
-          axios({
-            url: process.env.VUE_APP_BASE_API + "/common/mergeFile",
-            method: 'post',
-            data: form2,
-            headers: {
-              'Authorization': 'Bearer ' + getToken(),
-              'Content-Type': 'multipart/form-data'
-            },
-          }).then(res => {
-            if (res.status == 200) {
+        }).then(res => {
+          setTimeout(() => {
+            if (res.data.code == 200 && self.progressPercent === 100) {
               setTimeout(function () {
                 self.$message({
                   message: '上传成功！',
@@ -433,39 +165,300 @@ export default {
                 duration: '2000'
               });
             }
-          })
-        }
-      },
-      resetData() {
-        this.progress = 0;
-      },
-      handleResult(res, file) {
+          }, 1000);
+
+        }).catch(error => {
+          console.error(error)
+          self.progressFlag = false;
+          self.progressPercent = 0
+          self.$refs.upload.clearFiles();
+          self.$message({
+            message: '上传失败！',
+            type: 'error',
+            duration: '2000'
+          });
+        })
+      } else {
+        file._shardCount = Math.ceil(file.size / this.partSize) //总片数
+        file.uploaded = 0
+        let formData = new FormData()
+        formData.append('fileName', file.name)
         let self = this
-        const data = {
-          fileName: file.name,
-          fileSize: file.size,
-          fileUrl: res.data.url,
-          filePath: res.data.filePath,
-          fileOldName: res.data.originalFilename,
-          fileNewName: res.data.newFileName,
-          suffixType: res.data.suffixType
-        }
-        self.$emit("handleSuccess", data)
-      },
-      /** 清空文件 **/
-      clearFile(){
-        this.$refs.upload.clearFiles();
-        this.fileList = []
+        //大文件上传初始化,返回uploadId  initUpload(formData)
+        axios({
+          url: process.env.VUE_APP_BASE_API + "/common/initUpload",
+          method: 'post',
+          data: formData,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+        }).then(function (res) {
+          if (res.status == 200) {
+            //从第0块开始上传
+            file.uploadId = res.data.uploadId
+            file.objectKey = res.data
+            file.chunkId = 0
+            self.uploadByChunk(file)
+          } else {
+            this.progress--
+            self.$message.error(res.msg)
+          }
+        }).catch(error => {
+          self.progressPercent = 0
+          self.progressFlag = false;
+          console.error(error)
+        })
       }
-    }
+
+    },
+    //分片上传大文件
+    uploadByChunk(file) {
+      this._start = file.chunkId * this.partSize
+      this._end = Math.min(file.size, this._start + this.partSize)//结束时总大小，和 开始的大小+之前的大小比较
+
+      let self = this
+      let fileData = file.slice(this._start, this._end)
+      //获取文件块MD5
+      let reader = new FileReader()
+      reader.readAsBinaryString(fileData)
+      let form1 = new FormData()//new一个form的实例，可以进行键值对的添加，
+      form1.append('chunkFile', fileData) //slice方法用于切出文件的一部分
+      form1.append('uploadId', file.uploadId)
+      form1.append('chunkId', (file.chunkId + 1).toString())
+      form1.append('shardCount', file._shardCount.toString()) //是否最后一片
+      self.progressFlag = true;
+      //上传大文件的Chunk 返回chunk的MD5 uploadChunk(form1)
+      axios({
+        url: process.env.VUE_APP_BASE_API + "/common/uploadChunk",
+        method: 'post',
+        data: form1,
+        headers: {
+          'Authorization': 'Bearer ' + getToken(),
+          'Content-Type': 'multipart/form-data'
+        },
+        onUploadProgress: progressEvent => {
+          // progressEvent.loaded:已上传文件大小
+          // progressEvent.total:被上传文件的总大小
+          //进度条
+          self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
+        }
+      }).then(response => {
+        if (response.status == 200) {
+          //判断返回的MD5值是否一致，一致继续传下一块，否则重传本块（这里目前前后端MD5一直不一致，暂时先注释掉，有时间了我再研究一下）
+          // self.md5Str[index] === response.msg ||
+          if (true) {
+            // this.$message.success('第' + (index + 1).toString() + '块文件上传成功')
+            file.uploaded++
+            self.percentageSend(file)
+            //如果没上传完成，继续上传一下块
+            file.chunkId++
+            if (file.chunkId < file._shardCount) {
+              this.uploadByChunk(file)
+            }
+          } else {
+            //不一致，重新传本块
+            this.$message.success('第' + (file.chunkId + 1).toString() + '块文件上传不成功，重新上传')
+            this.uploadByChunk(file.chunkId)
+          }
+        } else {
+          //出错，跳出循环显示错误
+          this.progress--
+          this.$message.error(response.msg)
+        }
+      })
+    },
+    //接收上传的百分值回调
+    percentageSend(file) {
+      let self = this
+      let perNum = Math.floor((file.uploaded / file._shardCount) * 100)
+      this.progressPercent = perNum
+      //如果上传完成，合并文件
+      if (perNum === 100) {
+        let form2 = new FormData()//new一个form的实例，可以进行键值对的添加，
+        form2.append('uploadId', file.uploadId)
+        form2.append('fileName', file.name)
+        // 大文件上传完成后合并
+        // 返回文件访问的URL
+        axios({
+          url: process.env.VUE_APP_BASE_API + "/common/mergeFile",
+          method: 'post',
+          data: form2,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+        }).then(res => {
+          if (res.status == 200) {
+            setTimeout(function () {
+              self.$message({
+                message: '上传成功！',
+                type: 'success',
+                duration: '2000'
+              });
+              self.progressFlag = false;
+              self.progressPercent = 0
+              self.handleResult(res,file);
+            }, 500);
+          } else {
+            self.$message({
+              message: '上传失败！',
+              type: 'error',
+              duration: '2000'
+            });
+          }
+        })
+      }
+    },
+    resetData() {
+      this.progress = 0;
+    },
+    handleResult(res, file) {
+      let self = this
+      const data = {
+        fileName: file.name,
+        fileSize: file.size,
+        fileUrl: res.data.url,
+        filePath: res.data.filePath,
+        fileOldName: res.data.originalFilename,
+        fileNewName: res.data.newFileName,
+        suffixType: res.data.suffixType
+      }
+      console.info("data===========", data)
+      self.$emit("handleSuccess", data)
+    },
+    /** 清空文件 **/
+    clearFile(){
+      this.$refs.upload.clearFiles();
+      this.fileList = []
+    },
+    handleUploadFile() {
+      document.getElementById("fileFolder").value = null;
+      this.$refs.fileRef.dispatchEvent(new MouseEvent("click"));
+    },
+    async handleFolderUpload(event) {
+      let self = this;
+      const files = event.target.files;
+      this.fileslength = files.length;
+
+      // 获取文件夹名称
+      let folderName = "";
+      if (files.length > 0) {
+        let relativePath = files[0].webkitRelativePath;
+        folderName = relativePath.split("/")[0];
+      }
+
+      const zip = new JSZip();
+
+      // 将文件夹及其内容添加到 ZIP 中
+      Array.from(files).forEach(file => {
+        zip.file(file.webkitRelativePath, file);
+      });
+
+      // 生成 ZIP 文件
+      const zipBlob = await zip.generateAsync({ type: "blob" });
+
+      // 创建 FormData 对象
+     /* const formData = new FormData();
+      formData.append("file", zipBlob, folderName + ".zip");*/
+      let formData = new FormData()
+      formData.append('fileName', folderName + ".zip")
+
+      // 计算 shardCount
+      const _shardCount = Math.ceil(zipBlob.size / this.partSize);
+      const fileObj = {
+        _shardCount,
+        size: zipBlob.size,
+        file: zipBlob              // 将 zipBlob 添加到 fileObj 中
+      };
+      self.$set(fileObj.file, '_shardCount', _shardCount);
+      self.$set(fileObj.file, 'uploaded', 0);
+      self.$set(fileObj.file, 'name', folderName + ".zip");
+      self.fileList.push(fileObj.file)
+
+      if (zipBlob.size < this.partSize) {
+        let formDataSign = new FormData()
+        formDataSign.append("file", zipBlob, folderName + ".zip")
+        self.progressFlag = true;
+        axios({
+          url: self.uploadUrl,
+          method: 'post',
+          data: formDataSign,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+          onUploadProgress: progressEvent => {
+            // progressEvent.loaded:已上传文件大小
+            // progressEvent.total:被上传文件的总大小
+            //进度条
+            self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
+          }
+        }).then(res => {
+          setTimeout(() => {
+            if (res.data.code == 200 && self.progressPercent === 100) {
+              setTimeout(function () {
+                self.$message({
+                  message: '上传成功！',
+                  type: 'success',
+                  duration: '2000'
+                });
+                self.progressFlag = false;
+                self.progressPercent = 0
+                self.handleResult(res,fileObj.file);
+              }, 500);
+            } else {
+              self.$message({
+                message: '上传失败！',
+                type: 'error',
+                duration: '2000'
+              });
+            }
+          }, 1000);
+
+        }).catch(error => {
+          console.error(error)
+          self.progressFlag = false;
+          self.progressPercent = 0
+          self.$refs.upload.clearFiles();
+          self.$message({
+            message: '上传失败！',
+            type: 'error',
+            duration: '2000'
+          });
+        })
+      } else {
+        // 初始化上传，获取 uploadId
+        axios({
+          url: process.env.VUE_APP_BASE_API + "/common/initUpload",
+          method: 'post',
+          data: formData,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+        }).then(function (res) {
+          if (res.status === 200) {
+            self.$set(fileObj.file, 'uploadId', res.data.uploadId);
+            self.$set(fileObj.file, 'chunkId', 0);
+            self.$set(fileObj.file, 'objectKey', res.data);
+
+            /*//从第0块开始上传
+            fileObj.uploadId = res.data.uploadId;
+            fileObj.chunkId = 0;
+            fileObj.objectKey = res.data*/
+            self.uploadByChunk(fileObj.file);
+          } else {
+            self.progress--;
+            self.$message.error(res.msg);
+          }
+        }).catch(error => {
+          self.progressPercent = 0;
+          self.progressFlag = false;
+          console.error(error);
+        });
+      }
+    },
+  }
 };
 </script>
-<style>
-#myButton {
-  width: 90px; /* 设置按钮长度为200像素 */
-}
-.container {
-  display: flex; /* 设定为flex布局 */
-}
-</style>
-
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 3fd7c6d..e7d2b8c 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -107,6 +107,15 @@
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
+
+          <el-table-column label="关联工具" align="center" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span v-if="handleRelationTool(scope.row.relationToolList)">
+                  <el-link target="_blank" v-for="assItem in scope.row.relationToolList" :key="assItem.id" @click="handleToolDetail(assItem)">{{assItem.toolName}}</el-link>
+              </span>
+            </template>
+          </el-table-column>
+
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -362,6 +371,12 @@ export default {
       this.loading = true;
       listTool(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.toolList = response.rows;
+          for(let itemData of this.toolList){
+            this.$set(itemData, "relationToolList", [])
+            if(itemData.association != null && itemData.association != '' && itemData.association != undefined){
+              itemData.relationToolList = JSON.parse(itemData.association)
+            }
+          }
           this.total = response.total;
           this.loading = false;
         }
@@ -575,7 +590,26 @@ export default {
       this.$nextTick(() => {
         this.$refs.downloadFileDetailRef = null; // 清空引用
       });
+    },
+    /** 详情 **/
+    handleToolDetail(row){
+      this.detailDrawerOpen = true
+      this.detailOpen = true
+      let data = {
+        "toolId": row.toolId
+      }
+      this.toolDetail = data
+    },
+    /** association **/
+    handleRelationTool(value){
+      if(value == null || value == '' || value == undefined){
+        return false
+      }
+      if(value.length > 0){
+        return true
+      }
     }
+
   }
 };
 </script>
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index a577625..21fb24b 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -1,26 +1,28 @@
 <template>
   <div class="fbox1">
-    <div class="fl">
+    <div class="fl" v-loading="detailLoading">
       <el-tabs v-model="detailActiveName">
         <el-tab-pane label="基本信息" name="first">
           <div class="el-form-border">
             <el-form ref="form" label-width="150px">
               <el-row>
-                <el-col :span="12"> <el-form-item label="工具名称">{{toolDetail.toolName}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具类别"><dict-tag :options="dict.type.tool_type" :value="toolDetail.toolType"/></el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具来源"><dict-tag :options="dict.type.tool_source" :value="toolDetail.toolSource"/></el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="负责人">{{toolDetail.toolPrincipalsName}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="归属单位">{{toolDetail.toolRespDeptName}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="状态"><dict-tag :options="dict.type.tool_status" :value="toolDetail.status"/></el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具用途">{{toolDetail.toolUse}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="测评情况">{{toolDetail.testSituation}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="功能描述">{{toolDetail.functionDesc}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="适用条件">{{toolDetail.applyCondition}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="操作说明">{{toolDetail.operateExplain}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="备注">{{toolDetail.remark}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具名称">{{detailData.toolName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具类别"><dict-tag :options="dict.type.tool_type" :value="detailData.toolType"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具来源"><dict-tag :options="dict.type.tool_source" :value="detailData.toolSource"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="负责人">{{detailData.toolPrincipalsName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="归属单位">{{detailData.toolRespDeptName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="状态"><dict-tag :options="dict.type.tool_status" :value="detailData.status"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具用途">{{detailData.toolUse}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="测评情况">{{detailData.testSituation}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="功能描述">{{detailData.functionDesc}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="适用条件">{{detailData.applyCondition}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="操作说明">{{detailData.operateExplain}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="备注">{{detailData.remark}}</el-form-item> </el-col>
                 <el-col :span="24">
                   <el-form-item label="关联工具">
-                     <el-tag :key="tag.toolId" v-for="tag in JSON.parse(toolDetail.association)" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
+                    <span v-if="detailData.association != null && detailData.association != '' && detailData.association != undefined">
+                     <el-tag :key="tag.toolId" v-for="tag in JSON.parse(detailData.association)" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
+                    </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -47,7 +49,7 @@
                 <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180" v-if="toolDetail.downloadStatus">
+            <el-table-column label="操作" align="center" width="180" v-if="detailData.downloadStatus">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -119,7 +121,7 @@
     </el-dialog>
 
     <!-- 上传 -->
-    <AddDoc :show.sync="open" :toolId="toolDetail.toolId" @callback="getDocList"/>
+    <AddDoc :show.sync="open" :toolId="detailData.toolId" @callback="getDocList"/>
   </div><!--fbox1 左右分栏-->
 </template>
 
@@ -127,6 +129,7 @@
   import { listDocument, getDocument, delDocument, addDocument, updateDocument } from "@/api/document/document";
   import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
   import { listReplies, addReplies} from "@/api/tool/replies.js";
+  import { getTool } from "@/api/tool/tool.js";
 
   import AddDoc from './AddDoc'
   import editDocument from "../document/editDocument";
@@ -141,6 +144,7 @@
       toolDetail: {
         type: Object,
         default: {},
+        required: false
       }
     },
     data(){
@@ -166,9 +170,13 @@
         repliesList: [],
         showReplyForm: [],
         replyContent: [],
+        detailLoading: false,
+        //详细数据
+        detailData:{}
       }
     },
     created(){
+      this.getDetail()
       this.getDocList()
       this.getDiscussionsList()
     },
@@ -370,6 +378,21 @@
       },
       handleBeforeClose() {
         this.viewDialogOpen = false
+      },
+      /** 获取详情信息 **/
+      getDetail(){
+        let self = this
+        console.info("self.toolDetail==========", self.toolDetail)
+        self.detailLoading = true
+        getTool(self.toolDetail.toolId).then((res) => {
+          self.detailData = res.data
+          console.info("res========", res)
+          /*let formData = res.data;
+          formData.type = _this.form.type
+          _this.form = formData*/
+        }).finally(()=>{
+          self.detailLoading = false
+        });
       }
     }
   }
-- 
2.35.1.windows.2


From 8440f259d9aeff754dbfb15967fc51ec43fa5568 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 2 Sep 2024 10:55:49 +0800
Subject: [PATCH 18/55] =?UTF-8?q?=E4=B8=8B=E8=BD=BDzip=E5=8E=8B=E7=BC=A9?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 6b9ea89..965ed5b 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "js-base64": "^3.7.7",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "jszip": "3.10.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
-- 
2.35.1.windows.2


From ad32fba4395258e4adad7d243ede3d15e8a90fd0 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 2 Sep 2024 10:59:47 +0800
Subject: [PATCH 19/55] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84idea=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml                 |  27 -
 .idea/codeStyles/codeStyleConfig.xml         |   5 -
 .idea/inspectionProfiles/Project_Default.xml |   6 -
 .idea/misc.xml                               |   6 -
 .idea/modules.xml                            |   8 -
 .idea/tool-tech-front.iml                    |  12 -
 .idea/vcs.xml                                |   6 -
 .idea/workspace.xml                          | 983 -------------------
 8 files changed, 1053 deletions(-)
 delete mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/tool-tech-front.iml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index a8d7249..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JSCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_GENERATOR_MULT" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-      <option name="SPACE_BEFORE_ASYNC_ARROW_LPAREN" value="false" />
-    </JSCodeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="IF_BRACE_FORCE" value="1" />
-      <option name="DOWHILE_BRACE_FORCE" value="1" />
-      <option name="WHILE_BRACE_FORCE" value="1" />
-      <option name="FOR_BRACE_FORCE" value="1" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 03d9549..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 28a804d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index ccb200c..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/tool-tech-front.iml" filepath="$PROJECT_DIR$/.idea/tool-tech-front.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/tool-tech-front.iml b/.idea/tool-tech-front.iml
deleted file mode 100644
index 24643cc..0000000
--- a/.idea/tool-tech-front.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index dd08a75..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,983 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="880b2c9e-bb63-49b5-a9b3-35bf50aa9da8" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/views/document/editDocument.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/views/document/uploadProgress.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/views/tool/toolDetail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/.env.development" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/document/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/document/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/tool/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/tool/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/workstuff/apply/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/workstuff/apply/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/workstuff/dispose/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/workstuff/dispose/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/views/workstuff/message/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/workstuff/message/index.vue" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/.tmp/" />
-    <ignored path="$PROJECT_DIR$/temp/" />
-    <ignored path="$PROJECT_DIR$/tmp/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/document/index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="69" column="40" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="40" />
-              <folding>
-                <element signature="n#pagination#0;n#div#1;n#el-card#1;n#div#0;n#template#0;n#!!top" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/workstuff/apply/index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="190">
-              <caret line="34" column="38" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="38" />
-              <folding>
-                <element signature="n#style#0;n#el-table#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
-              <caret line="6" column="18" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="18" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/workstuff/dispose/index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="118">
-              <caret line="321" column="10" lean-forward="true" selection-start-line="298" selection-start-column="8" selection-end-line="321" selection-end-column="10" />
-              <folding>
-                <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/workstuff/message/index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="45" selection-end-column="40" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/tool/index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="192">
-              <caret line="177" column="132" selection-start-line="177" selection-start-column="96" selection-end-line="177" selection-end-column="132" />
-              <folding>
-                <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#style#0;n#el-select#0;n#el-form-item#2;n#div#0;n#div#0;n#div#0;n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#el-date-picker#0;n#el-form-item#3;n#div#0;n#div#0;n#div#0;n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#el-input#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#el-select#0;n#el-form-item#0;n#el-col#0;n#el-row#3;n#el-form#0;n#div#0;n#el-drawer#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="n#el-drawer#2;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/tool/toolDetail.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2451">
-              <caret line="129" column="50" selection-start-line="129" selection-start-column="50" selection-end-line="129" selection-end-column="50" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/plugins/modal.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="241">
-              <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/views/document/editDocument.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="232">
-              <caret line="149" column="30" lean-forward="true" selection-start-line="149" selection-start-column="30" selection-end-line="149" selection-end-column="30" />
-              <folding>
-                <element signature="n#style#0;n#el-table#0;n#div#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-                <element signature="e#3190#3196#1" expanded="true" />
-                <element signature="e#2350#2420#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/workflow/config/index.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="247">
-              <caret line="13" column="103" selection-start-line="13" selection-start-column="72" selection-end-line="13" selection-end-column="103" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Vue Single File Component" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>deptName</find>
-      <find>peopleSelect</find>
-      <find>onChange</find>
-      <find>submitForm</find>
-      <find>initWebSocket</find>
-      <find>generateUniqueID</find>
-      <find>progress</find>
-      <find>listDocument</find>
-      <find>previewUrl</find>
-      <find>toolPrincipalsChoose</find>
-      <find>showOpenHandle</find>
-      <find>toolDetail</find>
-      <find>editDocumentRef</find>
-      <find>checkDuplicate</find>
-      <find>申请使用</find>
-      <find>applyDrawerOpen</find>
-      <find>cancelApply</find>
-      <find>submitApply</find>
-      <find>applyUse</find>
-      <find>handleDelete</find>
-      <find>监控</find>
-      <find>审批记录</find>
-      <find>tableData4</find>
-      <find>drawer2</find>
-      <find>tableData7</find>
-      <find>getClassName</find>
-      <find>已通过</find>
-      <find>el-dialog</find>
-      <find>ids</find>
-      <find>drawer1</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>docList</replace>
-      <replace>toolList</replace>
-      <replace>handlePublish</replace>
-      <replace>applyDrawerOpen</replace>
-      <replace>exoportDrawerOpen</replace>
-      <replace>detailDrawerOpen</replace>
-      <replace>通过</replace>
-    </replaceStrings>
-    <dirStrings>
-      <dir>D:\rzdata\ToolTech\tool-tech-front</dir>
-      <dir>D:\rzdata\ToolTech\tool-tech-front\src</dir>
-    </dirStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/views/system/user/profile/userAvatar.vue" />
-        <option value="$PROJECT_DIR$/src/api/system/user.js" />
-        <option value="$PROJECT_DIR$/src/api/document/document.js" />
-        <option value="$PROJECT_DIR$/src/views/workflow/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/workflow/config/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/workflow/task/index.vue" />
-        <option value="$PROJECT_DIR$/src/api/tool/tool.js" />
-        <option value="$PROJECT_DIR$/public/css/poctstyle.css" />
-        <option value="$PROJECT_DIR$/src/components/userSelector/userSelect.vue" />
-        <option value="$PROJECT_DIR$/src/components/user-selector/src/user-selector.vue" />
-        <option value="$PROJECT_DIR$/vue.config.js" />
-        <option value="$PROJECT_DIR$/default.conf" />
-        <option value="$PROJECT_DIR$/Dockerfile" />
-        <option value="$PROJECT_DIR$/public/css/index.css" />
-        <option value="$PROJECT_DIR$/src/main.js" />
-        <option value="$PROJECT_DIR$/src/utils/request.js" />
-        <option value="$PROJECT_DIR$/src/views/login.vue" />
-        <option value="$PROJECT_DIR$/src/views/statistic/index.vue" />
-        <option value="$PROJECT_DIR$/src/store/getters.js" />
-        <option value="$PROJECT_DIR$/src/store/modules/user.js" />
-        <option value="$PROJECT_DIR$/public/css/tool.css" />
-        <option value="$PROJECT_DIR$/.env.production" />
-        <option value="$PROJECT_DIR$/.env.staging" />
-        <option value="$PROJECT_DIR$/src/layout/components/Navbar.vue" />
-        <option value="$PROJECT_DIR$/src/components/Breadcrumb/index.vue" />
-        <option value="$PROJECT_DIR$/src/router/index.js" />
-        <option value="$PROJECT_DIR$/src/views/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/user/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/user/authRole.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/role/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/menu/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/post/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/dict/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/config/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/notice/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/monitor/operlog/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/monitor/logininfor/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/tool/gen/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/dict/data.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/dept/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/system/role/authUser.vue" />
-        <option value="$PROJECT_DIR$/src/views/document/addDocument.vue" />
-        <option value="$PROJECT_DIR$/src/views/tool/toolDetail.vue" />
-        <option value="$PROJECT_DIR$/.env.development" />
-        <option value="$PROJECT_DIR$/src/views/document/uploadProgress.vue" />
-        <option value="$PROJECT_DIR$/src/views/document/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/tool/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/workstuff/apply/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/workstuff/dispose/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/workstuff/message/index.vue" />
-        <option value="$PROJECT_DIR$/src/views/document/editDocument.vue" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-12" />
-    <option name="y" value="-12" />
-    <option name="width" value="2904" />
-    <option name="height" value="1752" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="public" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="public" type="462c0819:PsiDirectoryNode" />
-              <item name="images" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="document" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="tool" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="workflow" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="workflow" type="462c0819:PsiDirectoryNode" />
-              <item name="config" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="workstuff" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="workstuff" type="462c0819:PsiDirectoryNode" />
-              <item name="apply" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="workstuff" type="462c0819:PsiDirectoryNode" />
-              <item name="dispose" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tool-tech-front" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tool-tech-front" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="workstuff" type="462c0819:PsiDirectoryNode" />
-              <item name="message" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="editor.config.ad.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="ts.external.directory.path" value="D:\Program Files\JetBrains\WebStorm 2019.1.1\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\public" />
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\public\css" />
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\src\components" />
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\src\components\userSelector" />
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\src\views\workflow\config" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\src\views\workstuff\message" />
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\src\views\workstuff\apply" />
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\src\assets\logo" />
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\public" />
-      <recent name="D:\rzdata\ToolTech\tool-tech-front\src\views\tool" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
-      <package-json value="$PROJECT_DIR$/package.json" />
-      <command value="run" />
-      <scripts>
-        <script value="dev" />
-      </scripts>
-      <node-interpreter value="project" />
-      <envs />
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="npm.dev" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="880b2c9e-bb63-49b5-a9b3-35bf50aa9da8" name="Default Changelist" comment="" />
-      <created>1720405215626</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1720405215626</updated>
-      <workItem from="1720405216920" duration="31083000" />
-      <workItem from="1720607146890" duration="646000" />
-      <workItem from="1721005856925" duration="23394000" />
-      <workItem from="1721114973364" duration="3160000" />
-      <workItem from="1721185818138" duration="662000" />
-      <workItem from="1721611088644" duration="28182000" />
-      <workItem from="1721717492928" duration="8889000" />
-      <workItem from="1721783250517" duration="9602000" />
-    </task>
-    <task id="LOCAL-00001" summary="update">
-      <created>1721110878122</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1721110878122</updated>
-    </task>
-    <task id="LOCAL-00002" summary="update">
-      <created>1721118453675</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1721118453676</updated>
-    </task>
-    <task id="LOCAL-00003" summary="update">
-      <created>1721122463517</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1721122463517</updated>
-    </task>
-    <task id="LOCAL-00004" summary="update">
-      <created>1721123161293</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1721123161293</updated>
-    </task>
-    <task id="LOCAL-00005" summary="update">
-      <created>1721632270841</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1721632270841</updated>
-    </task>
-    <option name="localTasksCounter" value="6" />
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="105618000" />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1935" height="1167" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4925865" visible="true" weight="0.24960506" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="npm" order="2" sideWeight="0.5074135" side_tool="true" weight="0.24960506" />
-      <window_info id="Favorites" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.27439612" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.3291506" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" />
-      <window_info anchor="bottom" id="TypeScript" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Terminal" order="11" weight="0.3291506" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="update" />
-    <option name="LAST_COMMIT_MESSAGE" value="update" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/工具管理.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="369" column="30" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="369" selection-end-column="30" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/tool/index2.vue" />
-    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/我的申请.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="213">
-          <caret line="167" column="3" lean-forward="true" selection-start-line="167" selection-start-column="3" selection-end-line="342" selection-end-column="6" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/我的办理.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="211">
-          <caret line="178" column="4" selection-start-line="178" selection-start-column="4" selection-end-line="551" selection-end-column="5" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="e#8535#15422#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/消息中心.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="93" column="5" selection-start-line="53" selection-start-column="4" selection-end-line="93" selection-end-column="5" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-            <element signature="e#1925#2492#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/文档资源统计.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="44" column="30" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="44" selection-end-column="30" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/工具统计.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="44" column="30" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="44" selection-end-column="30" />
-          <folding>
-            <element signature="n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/statistic/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
-          <folding>
-            <element signature="n#div#0;n#el-tab-pane#1;n#el-tabs#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/store/getters.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/store/modules/user.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="70" column="47" selection-start-line="70" selection-start-column="47" selection-end-line="70" selection-end-column="47" />
-          <folding>
-            <element signature="e#0#52#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/layout/components/Sidebar/Logo.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="8" column="60" lean-forward="true" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />
-          <folding>
-            <element signature="e#930#974#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.env.production">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.env.staging">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="19">
-          <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/layout/components/Navbar.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
-          <folding>
-            <element signature="n#style#0;n#span#0;n#div#0;n#el-dropdown#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="e#1293#1326#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/login.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="5" column="46" selection-start-line="5" selection-start-column="46" selection-end-line="5" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/Breadcrumb/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="36" column="8" selection-start-line="36" selection-start-column="6" selection-end-line="38" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/router/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="395">
-          <caret line="72" column="63" selection-start-line="71" selection-start-column="8" selection-end-line="72" selection-end-column="63" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="537">
-          <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/user/authRole.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="40" column="37" lean-forward="true" selection-start-line="40" selection-start-column="37" selection-end-line="40" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/monitor/job/index.vue">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/用户管理.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="14" column="30" lean-forward="true" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/post/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="423">
-          <caret line="64" column="17" lean-forward="true" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/config/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="85" column="17" lean-forward="true" selection-start-line="85" selection-start-column="17" selection-end-line="85" selection-end-column="17" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/menu/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="30" column="29" lean-forward="true" selection-start-line="28" selection-start-column="4" selection-end-line="30" selection-end-column="29" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-table#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/notice/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="494">
-          <caret line="57" column="17" lean-forward="true" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/monitor/operlog/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="82" column="29" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="82" selection-end-column="29" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-table#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/tool/gen/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="13" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/dict/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="57" column="29" lean-forward="true" selection-start-line="55" selection-start-column="4" selection-end-line="57" selection-end-column="29" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/dict/data.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="67" column="17" lean-forward="true" selection-start-line="67" selection-start-column="17" selection-end-line="67" selection-end-column="17" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-table#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/dept/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="55" column="55" selection-start-line="55" selection-start-column="55" selection-end-line="55" selection-end-column="55" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/role/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="54" column="4" selection-start-line="54" selection-start-column="4" selection-end-line="56" selection-end-column="29" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/role/authUser.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="423">
-          <caret line="53" column="25" selection-start-line="53" selection-start-column="25" selection-end-line="53" selection-end-column="25" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-table#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://D:/日常工作文件库/泛联睿展联合项目/工具管理及技术交流平台/昆明军工/原型静态页面/工具管理及技术交流平台/文档资源管理.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="85" selection-start-line="85" selection-end-line="143" />
-          <folding>
-            <element signature="n#style#0;n#el-table#0;n#div#1;n#el-card#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#el-drawer#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/api/document/document.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="551">
-          <caret line="29" column="38" selection-start-line="29" selection-start-column="38" selection-end-line="29" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/user-selector/src/user-selector.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3040">
-          <caret line="164" column="6" selection-start-line="164" selection-start-column="6" selection-end-line="167" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/tool.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="12996">
-          <caret line="684" column="37" selection-start-line="684" selection-start-column="31" selection-end-line="684" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/poctstyle.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="6" column="14" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/monitor/logininfor/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="58" column="29" lean-forward="true" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#el-table#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/system/user/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3610">
-          <caret line="287" column="12" lean-forward="true" selection-start-line="284" selection-start-column="6" selection-end-line="287" selection-end-column="12" />
-          <folding>
-            <element signature="n#el-form#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/document/uploadProgress.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="722">
-          <caret line="38" column="32" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="32" />
-          <folding>
-            <element signature="n#style#0;n#el-button#0;n#div#0;n#el-card#0;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.env.development">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="10" column="35" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/workflow/config/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="13" column="103" selection-start-line="13" selection-start-column="72" selection-end-line="13" selection-end-column="103" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/plugins/modal.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="241">
-          <caret line="14" column="2" selection-start-line="14" selection-start-column="2" selection-end-line="14" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="6" column="18" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/workstuff/message/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="45" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/workstuff/apply/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="34" column="38" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="38" />
-          <folding>
-            <element signature="n#style#0;n#el-table#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/workstuff/dispose/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="118">
-          <caret line="321" column="10" lean-forward="true" selection-start-line="298" selection-start-column="8" selection-end-line="321" selection-end-column="10" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#el-drawer#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/tool/toolDetail.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2451">
-          <caret line="129" column="50" selection-start-line="129" selection-start-column="50" selection-end-line="129" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/tool/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="177" column="132" selection-start-line="177" selection-start-column="96" selection-end-line="177" selection-end-column="132" />
-          <folding>
-            <element signature="n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#style#0;n#el-select#0;n#el-form-item#2;n#div#0;n#div#0;n#div#0;n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#el-date-picker#0;n#el-form-item#3;n#div#0;n#div#0;n#div#0;n#el-form#0;n#el-card#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#el-input#0;n#div#0;n#el-card#1;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#el-select#0;n#el-form-item#0;n#el-col#0;n#el-row#3;n#el-form#0;n#div#0;n#el-drawer#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="n#el-drawer#2;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/document/index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="69" column="40" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="40" />
-          <folding>
-            <element signature="n#pagination#0;n#div#1;n#el-card#1;n#div#0;n#template#0;n#!!top" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/document/editDocument.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="232">
-          <caret line="149" column="30" lean-forward="true" selection-start-line="149" selection-start-column="30" selection-end-line="149" selection-end-column="30" />
-          <folding>
-            <element signature="n#style#0;n#el-table#0;n#div#0;n#el-dialog#0;n#div#0;n#template#0;n#!!top" expanded="true" />
-            <element signature="e#3190#3196#1" expanded="true" />
-            <element signature="e#2350#2420#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
-- 
2.35.1.windows.2


From a04e154f94e673775988114c10ea5ffc37958865 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 2 Sep 2024 11:12:40 +0800
Subject: [PATCH 20/55] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.staging | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.staging b/.env.staging
index 6aadf19..43f3fad 100644
--- a/.env.staging
+++ b/.env.staging
@@ -16,4 +16,4 @@ VUE_APP_WS_URL = 'wss://www.rzdata.net/tool-tech-admin/websocket'
 VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://192.168.1.2:8012/tool-tech-file-view'
 
 # 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = 'http://192.168.1.2:8080/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
-- 
2.35.1.windows.2


From 0dae5b346bbaad739cd8b12d78c0cd56823615cd Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 2 Sep 2024 13:34:05 +0800
Subject: [PATCH 21/55] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/tool.css                       | 61 ++++++++++++++++++++++-
 src/views/message/index.vue               |  2 +-
 src/views/statistic/index.vue             | 13 ++---
 src/views/workflowList/workflowRouter.vue |  2 +-
 4 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/public/css/tool.css b/public/css/tool.css
index c9ce2d1..2dc6971 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -1067,6 +1067,59 @@ body .el-drawer .el-drawer__body{
   margin: 0;
   padding-top: 0;
 }
+body .el-drawer .el-drawer__body .drawer-head{
+  display: flex;
+  padding: 10px 32px 10px 32px;
+  border-bottom: 1px solid rgba(0 0 0 / 5%);
+  margin: -16px -32px 0 -32px;
+  position: sticky;
+  top: -16px;
+  z-index: 2;
+  background: #fff;
+}
+body .el-drawer .el-drawer__body .drawer-head .cell-title{
+  display: block;
+  flex: 1;
+  color: #141414;
+  font-size: 18px;
+  font-weight: 500;
+}
+body .el-drawer .el-drawer__body .drawer-head .cell-title .title{
+  display: block;
+  color: #141414;
+  font-size: 18px;
+  font-weight: 500;
+  line-height: 34px;
+}
+body .el-drawer .el-drawer__body .drawer-head .cell-btn{
+  display: block;
+}
+body .iframe-drawer{
+  background: #fff;
+}
+body .iframe-drawer .drawer-head{
+  display: flex;
+  padding: 0 0 10px 0;
+  border-bottom: 1px solid rgba(0 0 0 / 5%);
+  position: sticky;
+  top: 0;
+  z-index: 2;
+  background: #fff;
+}
+body .iframe-drawer .drawer-head .cell-title{
+  display: block;
+  flex: 1;
+  color: #141414;
+  font-size: 18px;
+  font-weight: 500;
+}
+body .iframe-drawer .drawer-head .cell-title .title{
+  display: block;
+  color: #141414;
+  font-size: 18px;
+  font-weight: 500;
+  line-height: 34px;
+}
 
 /*pagination-container 分页*/
 body .apparatus-card>.el-card__body .el-card.gray-card+.pagination-container{
@@ -1436,13 +1489,17 @@ body .el-radio-button__inner:hover {
 }
 
 /*el-upload 上传按钮组件*/
+body .el-upload+.el-button,
+body .el-button+.el-upload{
+  margin-left: 10px;
+}
 body .el-upload,
 body .registerbox .avatar-uploader .el-upload{
   background:#fff;
   border:1px solid #004098;
   color:#004098 !important;
   border-radius: 2px;
-  height: 36px;
+  height: 34px;
 }
 body .el-upload:hover,
 body .registerbox .avatar-uploader .el-upload:hover{
@@ -1463,6 +1520,8 @@ body .el-upload:hover .el-upload-dragger i{
 }
 body .el-upload .el-button,
 body .el-upload .el-button:hover{
+  height: 32px;
+  line-height: 30px;
   border: none !important;
   background: transparent !important;
 }
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 5227e8b..ec5ac40 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -134,7 +134,7 @@ export default {
     },
     getList() {
       this.loading = true
-      this.$set(this.queryParams,"createById", this.$store.getters.userId)
+      this.$set(this.queryParams,"receiverId", this.$store.getters.userId)
       listMessage(this.queryParams).then(response => {
         this.total = response?.total
         this.tableList = response?.rows || []
diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue
index dde0ced..2052d8a 100644
--- a/src/views/statistic/index.vue
+++ b/src/views/statistic/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" v-loading="pageloading">
-    <el-row :gutter="20">
-      <el-col :span="12">
+    <el-row :gutter="24">
+      <el-col :span="8">
         <el-card>
           <div slot="header" class="clearfix"><span class="tline">工具类别统计</span></div>
           <!--  -->
@@ -17,7 +17,7 @@
           </div>
         </el-card><!--el-card-->
       </el-col><!--el-col-->
-      <el-col :span="12">
+      <el-col :span="8">
         <el-card>
           <div slot="header" class="clearfix"><span class="tline">工具状态统计</span></div>
           <div class="tjbox2" v-if="isPieChart">
@@ -33,10 +33,7 @@
           </div>
         </el-card><!--el-card-->
       </el-col><!--el-col-->
-    </el-row><!--el-row-->
-
-    <el-row :gutter="20">
-      <el-col :span="12">
+      <el-col :span="8">
         <el-card>
           <div slot="header" class="clearfix"><span class="tline">工具来源统计</span></div>
           <div class="tjbox2" v-if="isPieChart">
@@ -51,7 +48,7 @@
           </div>
         </el-card><!--el-card-->
       </el-col><!--el-col-->
-    </el-row>
+    </el-row><!--el-row-->
     <el-row :gutter="20">
       <el-col :span="24">
         <el-card>
diff --git a/src/views/workflowList/workflowRouter.vue b/src/views/workflowList/workflowRouter.vue
index 3a94cca..8f485a3 100644
--- a/src/views/workflowList/workflowRouter.vue
+++ b/src/views/workflowList/workflowRouter.vue
@@ -1,5 +1,5 @@
 <template>
-  <main-component ref="mainComponent" :code="code" :data="data"  @close="handleCloseChange"></main-component>
+  <main-component ref="mainComponent" :code="code" :data="data"  @close="handleCloseChange" class="iframe-drawer"></main-component>
 </template>
 
 <script>
-- 
2.35.1.windows.2


From b13ea924b3957a17d930ccfda9fc1575594d3583 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 2 Sep 2024 17:15:27 +0800
Subject: [PATCH 22/55] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/index.vue                            | 7 +++++--
 src/views/workflowList/addWorkflow/tool_release.vue | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index e7d2b8c..254ff9e 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -605,10 +605,13 @@ export default {
       if(value == null || value == '' || value == undefined){
         return false
       }
-      if(value.length > 0){
+      if(value.length > 1){
         return true
       }
-    }
+    },
+    onPopoverShow(list) {
+      this.relationToolList = list; // 更新要显示的工具列表
+    },
 
   }
 };
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 7c099ac..5e123cd 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -2,9 +2,10 @@
   <div  v-loading="loading||detailLoading">
     <div class="drawer-head">
       <div class="cell-title">
-        <div>
-          <p class="title">新增工具</p>
+        <div v-if="pListData && pListData.procInstId">
+          <p class="title">审核工具</p>
         </div>
+        <div v-else>新增工具</div>
       </div>
       <div class="cell-btn">
         <el-button type="primary" v-if="pListData && pListData.procInstId" @click="handleMonitor">流程监控</el-button>
@@ -44,6 +45,7 @@
                   maxlength="200"
                   :autosize="{ minRows: 4, maxRows: 4 }"
                   :style="{ width: '100%' }"
+                  show-word-limit
                 ></el-input>
               </el-form-item>
             </el-col>
-- 
2.35.1.windows.2


From fc1603c786e9660e5557c78c31d319ff4434fddf Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 2 Sep 2024 18:07:02 +0800
Subject: [PATCH 23/55] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=92=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/data.vue        | 4 ++--
 src/views/tool/downloadFileDetail.vue | 8 ++++++++
 src/views/tool/index.vue              | 8 ++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index d626817..8e60bb0 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -71,12 +71,12 @@
             @click="handleExport"
             v-hasPermi="['system:dict:export']"
           >导出</el-button>
-          <el-button
+<!--          <el-button
             plain
             icon="el-icon-close"
             size="mini"
             @click="handleClose"
-          >关闭</el-button>
+          >关闭</el-button>-->
         </div>
         <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
index 123900e..cecbb19 100644
--- a/src/views/tool/downloadFileDetail.vue
+++ b/src/views/tool/downloadFileDetail.vue
@@ -37,6 +37,10 @@
         </el-tab-pane><!--el-tab-pane-->
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
+
+    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
+      <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
+    </el-dialog>
   </div><!--fbox1 左右分栏-->
 </template>
 
@@ -115,6 +119,7 @@
         this.getDocList()
       },
       handlePriew(row){
+        console.info("1111111==============")
         this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
         this.viewDialogTitle = '文档在线预览'
         this.viewDialogOpen = true;
@@ -297,6 +302,9 @@
         this.$set(parentItem.replyContentSon, repIndex, '');
         this.$set(parentItem.showReplyFormSon, repIndex, false);
       },
+      handleBeforeClose() {
+        this.viewDialogOpen = false
+      }
     }
   }
 </script>
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 254ff9e..2ac849b 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -29,7 +29,7 @@
                   style="width: 240px"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_normal_disable"
+                    v-for="dict in dict.type.tool_status"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -107,7 +107,11 @@
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
-
+          <el-table-column label="审核状态" align="center" key="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tool_status" :value="scope.row.recordStatus"/>
+            </template>
+          </el-table-column>
           <el-table-column label="关联工具" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="handleRelationTool(scope.row.relationToolList)">
-- 
2.35.1.windows.2


From 014341b67183104770c8a172814e5116dc4150b2 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Mon, 2 Sep 2024 20:53:58 +0800
Subject: [PATCH 24/55] update

---
 .env.development                             |  4 ++--
 .env.staging                                 |  6 ++---
 default.conf                                 | 24 ++++++++++++++++++++
 src/components/FileUpload/optimizeUpload.vue |  1 -
 src/views/document/index.vue                 |  5 +++-
 vue.config.js                                |  7 ++++++
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index cd871ae..eb0e48a 100644
--- a/.env.development
+++ b/.env.development
@@ -7,11 +7,11 @@ ENV = 'development'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:8080/tool-tech-admin'
+VUE_APP_BASE_API = '/tool-tech-admin'
 VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
 
 # 流程管理服务地址
 VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
diff --git a/.env.staging b/.env.staging
index 43f3fad..628655f 100644
--- a/.env.staging
+++ b/.env.staging
@@ -9,11 +9,11 @@ ENV = 'staging'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/测试环境
-VUE_APP_BASE_API = 'https://www.rzdata.net/tool-tech-admin'
-VUE_APP_WS_URL = 'wss://www.rzdata.net/tool-tech-admin/websocket'
+VUE_APP_BASE_API = '/tool-tech-admin'
+VUE_APP_WS_URL = '/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://192.168.1.2:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
 
 # 流程管理服务地址
 VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
diff --git a/default.conf b/default.conf
index 13c1d3a..8494b07 100644
--- a/default.conf
+++ b/default.conf
@@ -15,6 +15,30 @@ server {
         }
     }
 
+    location ^~/tool-tech-admin/ {
+       proxy_pass http://124.223.108.21:8080/tool-tech-admin/;
+       proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_ssl_verify off;
+    }
+
+    location ^~/tool-tech-file-view/ {
+       proxy_pass http://124.223.108.21:8012/tool-tech-file-view/;
+       proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_ssl_verify off;
+    }
+
+    location ^~/ebpm-process-manage/ {
+       proxy_pass http://124.223.108.21:9080/ebpm-process-manage/;
+       proxy_set_header Host $host;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_ssl_verify off;
+    }
+
     error_page   500 502 503 504  /50x.html;
     location = /50x.html {
         root   /usr/share/nginx/html;
diff --git a/src/components/FileUpload/optimizeUpload.vue b/src/components/FileUpload/optimizeUpload.vue
index 41857ab..1ae5a24 100644
--- a/src/components/FileUpload/optimizeUpload.vue
+++ b/src/components/FileUpload/optimizeUpload.vue
@@ -324,7 +324,6 @@ export default {
         fileNewName: res.data.newFileName,
         suffixType: res.data.suffixType
       }
-      console.info("data===========", data)
       self.$emit("handleSuccess", data)
     },
     /** 清空文件 **/
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 021c663..35ccd7d 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -453,7 +453,10 @@ export default {
     },
     handlePreview(row){
       this.viewDialogOpen = true;
-      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
+      let protocol = window.location.protocol
+      let hostname = window.location.hostname;
+      let getDocUrl = protocol + '//' + hostname + ':8080' + process.env.VUE_APP_BASE_API
+      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(getDocUrl + row.docUrl));
       this.viewDialogTitle = '文档在线预览'
     },
     // 多选框选中数据
diff --git a/vue.config.js b/vue.config.js
index 876cbf4..1234143 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -41,6 +41,13 @@ module.exports = {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       },
+      [process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API]: {
+        target: `http://localhost:8012/tool-tech-file-view`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API]: ''
+        }
+      },
       [process.env.VUE_APP_WORKFLOW_MANAGE_URL]: {
         target: `http://124.223.108.21:9080/ebpm-process-manage`,
         changeOrigin: true,
-- 
2.35.1.windows.2


From 522a40ae64474fc6d930065f466e2590779fb2cb Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Tue, 3 Sep 2024 09:31:21 +0800
Subject: [PATCH 25/55] =?UTF-8?q?1=E3=80=81=E6=96=87=E6=A1=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AF=A6=E6=83=85=E5=92=8C=E8=AF=84=E8=AE=BA=202?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BAword=203=E3=80=81?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4=204?=
 =?UTF-8?q?=E3=80=81=E9=A1=B5=E9=9D=A2=E4=B8=8A=E5=9B=BE=E6=A0=87=E7=AD=89?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   6 +-
 .env.production                               |   2 +-
 .env.staging                                  |   2 +-
 package.json                                  |   9 +-
 public/document.docx                          | Bin 0 -> 12579 bytes
 public/tool.docx                              | Bin 0 -> 12905 bytes
 src/api/document/document.js                  |  12 +-
 src/api/tool/tool.js                          |   9 +
 src/components/FileUpload/optimizeUpload.vue  |  49 +-
 src/layout/components/Sidebar/Logo.vue        |   1 +
 src/utils/docUtil/docutil.js                  |  58 +++
 src/views/document/editDocument.vue           | 454 +++++++++++++-----
 src/views/document/index.vue                  |  85 +++-
 src/views/login.vue                           |   4 +-
 src/views/tool/index.vue                      |  61 ++-
 .../workflowList/addWorkflow/tool_release.vue |   7 +-
 16 files changed, 596 insertions(+), 163 deletions(-)
 create mode 100644 public/document.docx
 create mode 100644 public/tool.docx
 create mode 100644 src/utils/docUtil/docutil.js

diff --git a/.env.development b/.env.development
index eb0e48a..a282f97 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 工具管理与技术交流平台
+VUE_APP_TITLE = 技术交流平台
 
 # 开发环境配置
 ENV = 'development'
@@ -7,11 +7,11 @@ ENV = 'development'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/开发环境
-VUE_APP_BASE_API = '/tool-tech-admin'
+VUE_APP_BASE_API = 'http://localhost:8080/tool-tech-admin'
 VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://127.0.0.1:8012/tool-tech-file-view'
 
 # 流程管理服务地址
 VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
diff --git a/.env.production b/.env.production
index 033f914..0fc4d3c 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 工具管理与技术交流平台
+VUE_APP_TITLE = 技术交流平台
 
 # 生产环境配置
 ENV = 'production'
diff --git a/.env.staging b/.env.staging
index 628655f..036b27c 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 工具管理与技术交流平台
+VUE_APP_TITLE = 技术交流平台
 
 NODE_ENV = production
 
diff --git a/package.json b/package.json
index 965ed5b..e59a278 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,6 @@
     "js-base64": "^3.7.7",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
-    "jszip": "3.10.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
@@ -56,7 +55,13 @@
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuex": "3.6.0",
-    "websocket": "^1.0.35"
+    "websocket": "^1.0.35",
+    "jszip": "3.10.1",
+    "jszip-utils": "0.1.0",
+    "file-save": "0.2.0",
+    "pizzip": "3.1.7",
+    "docxtemplater": "3.50.0",
+    "docxtemplater-image-module-free": "1.1.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
diff --git a/public/document.docx b/public/document.docx
new file mode 100644
index 0000000000000000000000000000000000000000..fbb77ff481d2fadd92ed51b70e13b75f780b96ae
GIT binary patch
literal 12579
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
a{QFc!=F9so<-H-i|4qE#Puw4WefvMT2$|3T

literal 0
HcmV?d00001

diff --git a/public/tool.docx b/public/tool.docx
new file mode 100644
index 0000000000000000000000000000000000000000..3ced47fb14150b51f08e5a4130fbf8d9a9ec5d90
GIT binary patch
literal 12905
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

literal 0
HcmV?d00001

diff --git a/src/api/document/document.js b/src/api/document/document.js
index a86601b..65ca21b 100644
--- a/src/api/document/document.js
+++ b/src/api/document/document.js
@@ -61,4 +61,14 @@ export function getStatistics(query) {
     method: 'get',
     params: query
   })
-}
\ No newline at end of file
+}
+
+
+// 查询【请填写功能名称】列表
+export function listAllDoc(query) {
+  return request({
+    url: '/document/all/list',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/tool/tool.js b/src/api/tool/tool.js
index 6b1c674..5fde9c7 100644
--- a/src/api/tool/tool.js
+++ b/src/api/tool/tool.js
@@ -69,3 +69,12 @@ export function getStatistics(query) {
     params: query
   })
 }
+
+// get导出word字段
+export function exportWordList(query) {
+  return request({
+    url: '/tool/export/word/list',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/components/FileUpload/optimizeUpload.vue b/src/components/FileUpload/optimizeUpload.vue
index 1ae5a24..daa5c9a 100644
--- a/src/components/FileUpload/optimizeUpload.vue
+++ b/src/components/FileUpload/optimizeUpload.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="!isDetail">
     <el-upload class="upload-demo" ref="upload" action="#"
                :before-upload="beforeUpload"
                :on-change="onChange"
@@ -12,8 +12,8 @@
                :auto-upload="true"
                :http-request="uploadFile"
                show-file-list>
-      <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-      <el-button size="small" type="primary" @click="handleUploadFile">
+      <el-button slot="trigger" size="small" type="primary" >选取文件</el-button>
+      <el-button size="small" type="primary" @click="handleUploadFile" >
         上传文件夹
       </el-button>
       <!--    上传-->
@@ -23,11 +23,15 @@
 <!--      <input v-show="false" type="file" ref="fileRef" webkitdirectory @change="handleFolderUpload">
       <el-button slot="trigger" size="small" type="primary">选取文件夹</el-button>-->
     </el-upload>
-    <div slot="tip" class="el-upload__tip">只能上传{{acceptType}}文件</div>
+    <div slot="tip" class="el-upload__tip" >只能上传{{acceptType}}文件</div>
     <div v-show="progressFlag" class="head-img">
       <el-progress :text-inside="true" :stroke-width="14" :percentage="progressPercent" status="success"></el-progress>
     </div>
   </div>
+  <div v-else>
+    {{fileDetailName}}
+<!--    {{fileList[0].name}}-->
+  </div>
 </template>
 
 <script>
@@ -41,59 +45,69 @@ export default {
   props: {
     uploadUrl: {
       type: String,
-      required: true
+      required: false
     },
     // 是否多选
     isMultiple: {
       type: Boolean,
       default() {
         return false
-      }
+      },
+      required: false
     },
     // 文件类型
     type: {
       type: Array,
       default() {
         return []
-      }
+      },
+      required: false
     },
     //上传类型
     acceptType: {
       type: String,
-      required: true
+      required: false
     },
     // 上传数量
     limit: {
       type: Number,
       default() {
         return 1
-      }
+      },
+      required: false
     },
     // 文件
     dataFile: {
       type: [Object, Array, String],
       default() {
         return ''
-      }
+      },
+      required: false
+    },
+    isDetail: {
+      type: Boolean,
+      default: false
     },
   },
   data() {
     return {
-      fileList: [],
+      fileList: [{name:null}],
       progress: 0,
       isUploading: false,
       progressFlag: false, //进度条初始值隐藏
       progressPercent: 0, //进度条初始值
       partSize: 5 * 1024 * 1024,
+      fileDetailName: null
     };
   },
   watch: {
     dataFile: {
       handler(newValue, oldValue) {
-        if (newValue) {
+        if (newValue && newValue.length > 0) {
           this.fileList = Array.isArray(newValue) ? newValue : [newValue]
+          this.fileDetailName = this.fileList[0].name
         } else {
-          this.fileList = []
+          this.fileList = [{name:null}]
         }
       },
       immediate: true
@@ -159,6 +173,7 @@ export default {
                 self.handleResult(res,file);
               }, 500);
             } else {
+              self.progressFlag = false;
               self.$message({
                 message: '上传失败！',
                 type: 'error',
@@ -301,6 +316,7 @@ export default {
               self.handleResult(res,file);
             }, 500);
           } else {
+            self.progressFlag = false;
             self.$message({
               message: '上传失败！',
               type: 'error',
@@ -328,7 +344,11 @@ export default {
     },
     /** 清空文件 **/
     clearFile(){
-      this.$refs.upload.clearFiles();
+      this.progressFlag = false;
+      if(this.$refs.upload){
+        this.$refs.upload.clearFiles();
+      }
+
       this.fileList = []
     },
     handleUploadFile() {
@@ -407,6 +427,7 @@ export default {
                 self.handleResult(res,fileObj.file);
               }, 500);
             } else {
+              self.progressFlag = false;
               self.$message({
                 message: '上传失败！',
                 type: 'error',
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 2774cc8..99b977c 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -36,6 +36,7 @@ export default {
   data() {
     return {
       title: process.env.VUE_APP_TITLE,
+      // title: process.env.VUE_APP_TITLE,
       logo: logoImg
     }
   }
diff --git a/src/utils/docUtil/docutil.js b/src/utils/docUtil/docutil.js
new file mode 100644
index 0000000..34d3993
--- /dev/null
+++ b/src/utils/docUtil/docutil.js
@@ -0,0 +1,58 @@
+import docxtemplater from 'docxtemplater';
+import PizZip from 'pizzip';
+import JSZipUtils from 'jszip-utils';
+import {saveAs} from 'file-saver';
+
+/**
+ 导出docx,导出word
+ @param { String } tempDocxPath 模板文件路径
+ @param { Object } data 文件中传入的数据
+ @param { String } fileName 导出文件名称
+ */
+export const exportDocx = (tempDocxPath, data, fileName) => {
+  // 读取并获得模板文件的二进制内容
+
+  JSZipUtils.getBinaryContent(tempDocxPath, (error, content) => {
+
+
+    // input.docx是模板。我们在导出的时候，会根据此模板来导出对应的数据
+    // 抛出异常
+    if (error) {
+      throw error
+    }
+    // 创建一个JSZip实例，内容为模板的内容
+    const zip = new PizZip(content)
+    // 创建并加载docxtemplater实例对象
+    const doc = new docxtemplater().loadZip(zip)
+    // 设置模板变量的值
+    doc.setData({
+      ...data.form,
+      list: data.list
+    })
+    // 模板导出word,去除未定义值所显示的undefined
+    doc.setOptions({nullGetter: function() { 
+        return ""; 
+    }}); // 设置角度解析器
+    try {
+      // render the document (replace all occurences of {first_name} by John, {last_name} by Doe, ...)
+      doc.render()
+    } catch (error) {
+      const e = {
+        message: error.message,
+        name: error.name,
+        stack: error.stack,
+        properties: error.properties
+      }
+      console.log({
+        error: e
+      })
+      // The error thrown here contains additional information when logged with JSON.stringify (it contains a property object).
+      throw error
+    }
+    const out = doc.getZip().generate({
+      type: 'blob',
+      mimeType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    }) // Output the document using Data-URI
+    saveAs(out, fileName)
+  })
+}
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index 2090b05..0860683 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -1,105 +1,179 @@
 <template>
-  <div class="el-form-border">
-    <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="文件分类" prop="docCategoryId">
-            <treeselect v-model="form.docCategoryId" :options="docCategory" :show-count="true" placeholder="请选择文件分类"/>
-          </el-form-item>
-        </el-col>
+  <div class="fbox1">
+    <div class="fl">
+      <div class="el-form-border">
+        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="文件分类" prop="docCategoryId">
+                <treeselect v-model="form.docCategoryId" :options="docCategory" :show-count="true"
+                            :disabled="detailBoolean"
+                            placeholder="请选择文件分类"/>
+              </el-form-item>
+            </el-col>
 
-        <el-col :span="24">
-          <el-form-item label="文档编号" prop="docCode">
-            <el-input v-model="form.docCode" placeholder="请输入文档编号" maxlength="50" show-word-limit/>
-          </el-form-item>
-        </el-col>
+            <el-col :span="24">
+              <el-form-item label="文档编号" prop="docCode">
+                <template v-if="detailBoolean">{{form.docCode}}</template>
+                <template v-else>
+                  <el-input v-model="form.docCode" placeholder="请输入文档编号" maxlength="50" show-word-limit/>
+                </template>
+              </el-form-item>
+            </el-col>
 
-        <el-col :span="24">
-          <el-form-item label="文档名称" prop="docName">
-            <el-input v-model="form.docName" placeholder="请输入文档名称" maxlength="200" show-word-limit/>
-          </el-form-item>
-        </el-col>
+            <el-col :span="24">
+              <el-form-item label="文档名称" prop="docName">
+                <template v-if="detailBoolean">{{form.docCode}}</template>
+                <template v-else>
+                  <el-input v-model="form.docName" placeholder="请输入文档名称" maxlength="200" show-word-limit/>
+                </template>
+              </el-form-item>
+            </el-col>
 
-        <el-col :span="24">
-          <el-form-item label="文档类别" prop="docType" style="width: 100%">
-            <el-select v-model="form.docType" placeholder="请选择文档来源" style="width: 100% !important;">
-              <el-option style="width: 100%"
-                v-for="dict in dict.type.doc_class"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
+            <el-col :span="24">
+              <el-form-item label="文档类别" prop="docType" style="width: 100%">
+                <el-select v-model="form.docType" placeholder="请选择文档来源" style="width: 100% !important;"
+                :disabled="detailBoolean">
+                  <el-option style="width: 100%"
+                    v-for="dict in dict.type.doc_class"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
 
-        <el-col :span="24">
-          <el-form-item label="文档来源" prop="docSource">
-            <el-select v-model="form.docSource" placeholder="请选择文档来源" style="width: 100%">
-              <el-option
-                v-for="dict in dict.type.doc_source"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-<!--            <el-input v-model="form.docSource" placeholder="请输入文档来源" maxlength="50" show-word-limit/>-->
-          </el-form-item>
-        </el-col>
-        <el-col :span="24" v-if="relatedTool">
-          <el-form-item label="关联工具" prop="toolId">
-            <el-select
-              v-model="toolDataInfo"
-              ref="selectHeadTool"
-              multiple
-              value-key="toolId"
-              filterable
-              remote
-              placeholder="请选择关联工具"
-              @focus="toolSelect">
-              <el-option
-                v-for="item in toolDataInfo"
-                :key="item.toolId"
-                :label="item.toolName"
-                :value="item">
-              </el-option>
-            </el-select>
-          </el-form-item>
+            <el-col :span="24">
+              <el-form-item label="文档来源" prop="docSource">
+                <el-select v-model="form.docSource" placeholder="请选择文档来源" style="width: 100%" :disabled="detailBoolean">
+                  <el-option
+                    v-for="dict in dict.type.doc_source"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+    <!--            <el-input v-model="form.docSource" placeholder="请输入文档来源" maxlength="50" show-word-limit/>-->
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="relatedTool">
+              <el-form-item label="关联工具" prop="toolId">
+                <el-select
+                  v-model="toolDataInfo"
+                  ref="selectHeadTool"
+                  multiple
+                  value-key="toolId"
+                  filterable
+                  remote
+                  placeholder="请选择关联工具"
+                  :disabled="detailBoolean"
+                  @focus="toolSelect">
+                  <el-option
+                    v-for="item in toolDataInfo"
+                    :key="item.toolId"
+                    :label="item.toolName"
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
 
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="负责人" prop="docPrincipals">
-            <el-input v-model="form.docPrincipals" placeholder="请输入负责人" maxlength="50" show-word-limit/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="归属单位" prop="docRespDept">
-            <treeselect v-model="form.docRespDept" :options="deptOptions" :show-count="true" placeholder="请输入归属单位"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="文件" required>
-            <uploadVue
-              :display="editStatus"
-              :uploadUrl="uploadFileUrl"
-              :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
-              :acceptType="acceptType"
-              :limit="1"
-              :dataFile="dataFile"
-              ref="uploadFile"
-              @handleSuccess="handleUploadSuccess"
-              @handleError="handleUploadError"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form><!--el-form-->
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="负责人" prop="docPrincipals">
+                <template v-if="detailBoolean">{{form.docPrincipals}}</template>
+                <template v-else>
+                  <el-input v-model="form.docPrincipals" placeholder="请输入负责人" maxlength="50" show-word-limit/>
+                </template>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="归属单位" prop="docRespDept">
+                <treeselect v-model="form.docRespDept" :options="deptOptions" :show-count="true"
+                            :disabled="detailBoolean" placeholder="请输入归属单位"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="文件" required>
+                <uploadVue
+                  :display="editStatus"
+                  :uploadUrl="uploadFileUrl"
+                  :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
+                  :acceptType="acceptType"
+                  :limit="1"
+                  :dataFile="dataFile"
+                  :isDetail="detailBoolean"
+                  ref="uploadFile"
+                  @handleSuccess="handleUploadSuccess"
+                  @handleError="handleUploadError"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <template v-if="detailBoolean">{{form.remark}}</template>
+                <template v-else>
+                  <el-input v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit></el-input>
+                </template>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form><!--el-form-->
+      </div>
+    </div><!--fl 左侧页签-->
 
+    <div class="fr" v-if="detailBoolean">
+      <div class="tboper">
+        <div class="tit">评论</div>
+      </div><!--tboper 标题与操作按钮-->
+      <div class="pltextarea">
+        <el-input v-model="discussionContent" type="textarea" placeholder="请输入您的意见" :rows="4" maxlength="1000" show-word-limit></el-input>
+        <div class="plbtn"><el-button @click="handleDiscussions">发布</el-button></div>
+      </div><!--pltextarea-->
+      <div class="pllist">
+        <template v-if="discussionsList && discussionsList.length > 0">
+          <div class="list" v-for="(item,index) in discussionsList" :key="item.id">
+            <div class="luser"><span class="xuser">{{getFirstChar(item.nickName)}}</span></div>
+            <div class="ltext">
+              <div class="nt"><span class="name">{{item.nickName}}</span><span class="time">{{ parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
+              <div class="te">{{item.content}}</div>
+              <div class="hb">
+                <a class="btn" @click="toggleReplyForm(index)">
+                  <i class="el-icon-chat-line-round"></i>回复
+                </a>
+              </div>
+              <div class="pltextarea" v-if="showReplyForm[index]">
+                <el-input type="textarea" v-model="replyContent[index]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
+                <div class="plbtn">
+                  <el-button @click="cancelReply(index)">取消</el-button>
+                  <el-divider direction="vertical"></el-divider>
+                  <el-button @click="submitReply(index, item)">发布</el-button>
+                </div>
+              </div>
+              <!--第二层级-->
+              <template v-if="item.repliesList && item.repliesList.length > 0">
+                <div class="list" v-for="(repItem,repIdex) in item.repliesList" :key="repItem.id">
+                  <div class="luser"><span class="xuser">{{getFirstChar(repItem.nickName)}}</span></div>
+                  <div class="ltext">
+                    <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
+                    <div class="te">{{repItem.content}}</div>
+                    <!--                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
+                                        <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
+                                          <el-input type="textarea" v-model="item.replyContentSon[repIdex]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
+                                          <div class="plbtn">
+                                            <el-button @click="cancelReplySon(index,repIdex)">取消</el-button>
+                                            <el-divider direction="vertical"></el-divider>
+                                            <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
+                                          </div>
+                                        </div>-->
+                  </div>
+                </div>
+              </template>
+            </div>
+          </div>
+        </template>
+      </div>
+    </div>
     <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
 
   </div><!--el-form-border 表单-->
@@ -115,6 +189,8 @@
   import uploadProgress from "./uploadProgress";
   import uploadVue from '@/components/FileUpload/optimizeUpload.vue'
   import ToolSelector from '@/components/tool-selector/index.vue'
+  import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
+  import { listReplies, addReplies} from "@/api/tool/replies.js";
 
   export default {
     name: 'editDocument',
@@ -193,6 +269,18 @@
         editStatus: true,
         toolDataInfo: [],
         dataFile: [],
+        //详情
+        detailBoolean: false,
+
+        discussionContent: null, // 评论内容
+        repliesContent: null, // 回复内容
+        // 评论列表
+        discussionsList: [],
+        // 回复列表
+        repliesList: [],
+        showReplyForm: [],
+        replyContent: [],
+        detailLoading: false,
       }
     },
     created(){
@@ -378,30 +466,180 @@
         this.$refs.form.resetFields();
         this.toolDataInfo = []
         this.fileList = []
+        this.detailBoolean = false
         this.$nextTick(()=>{
           this.$refs.uploadFile.clearFile();
         })
       },
       editInit(docId, type){
-        this.$refs.form.resetFields();
-        this.toolDataInfo = []
-        this.$nextTick(()=>{
-          this.$refs.uploadFile.clearFile();
+        let self = this
+        if(type == "detail"){
+          this.detailBoolean = true
+        }
+        self.$refs.form.resetFields();
+        self.toolDataInfo = []
+        self.$nextTick(()=>{
+          self.$refs.uploadFile.clearFile();
 
           getDocument(docId).then(res => {
-            this.form = res.data
-            this.toolDataInfo = []
-            let toolInfo = {toolId:this.form.toolId,toolName:this.form.toolName}
-            this.toolDataInfo.push(toolInfo)
+            self.form = res.data
+            self.toolDataInfo = []
+            let toolInfo = {toolId:self.form.toolId,toolName:self.form.toolName}
+            self.toolDataInfo.push(toolInfo)
 
-            this.dataFile = []
+            self.dataFile = []
             let fileData = res.data.attachment
-            this.$set(fileData, "name", fileData.fileOldName)
-            this.$set(fileData, "size", fileData.fileSize)
-            this.dataFile.push(fileData)
+            self.$set(fileData, "name", fileData.fileOldName)
+            self.$set(fileData, "size", fileData.fileSize)
+            self.dataFile.push(fileData)
+
+            self.getDiscussionsList()
           });
         })
-      }
+      },
+      /** 评论 **/
+      handleDiscussions(){
+        let self = this
+        if (this.discussionContent == '' || this.discussionContent == null || this.discussionContent == undefined) {
+          self.$message({
+            message: '内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          businessId: this.form.docId,
+          content: this.discussionContent,
+          type: "doc",
+        }
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addDiscussions(data).then(res => {
+            this.discussionContent = null
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.getDiscussionsList()
+          }).catch(err =>{
+            this.discussionContent = null
+            console.error("handleDiscussions==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+      },
+      getDiscussionsList() {
+        let self = this
+        listDiscussions({businessId:this.form.docId}).then(res => {
+          self.discussionsList = res.rows
+          self.discussionsList.forEach(item => {
+            if(item.repliesList && item.repliesList.length > 0){
+              self.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
+              self.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
+            }else{
+              self.$set(item, 'showReplyFormSon', false)
+              self.$set(item, 'replyContentSon', '')
+            }
+          });
+        });
+      },
+      getFirstChar(value) {
+        if(!value){return ''}
+        return value.charAt(0);
+      },
+      toggleReplyForm(index) {
+        this.$set(this.showReplyForm, index, !this.showReplyForm[index]);
+      },
+      cancelReply(index) {
+        this.$set(this.showReplyForm, index, false);
+        this.$set(this.replyContent, index, '');
+      },
+      /** 第二级 **/
+      toggleReplyFormSon(parentIndex, repIndex) {
+        const parentItem = this.discussionsList[parentIndex];
+        this.$set(parentItem.showReplyFormSon, repIndex, !parentItem.showReplyFormSon[repIndex]);
+        // this.$set(this.showReplyFormSon, index, !this.showReplyFormSon[index]);
+      },
+      /** 第二级，取消回复 **/
+      cancelReplySon(parentIndex, repIndex) {
+        const parentItem = this.discussionsList[parentIndex];
+        this.$set(parentItem.showReplyFormSon, repIndex, false);
+        this.$set(parentItem.replyContentSon, repIndex, '');
+      },
+      /** 第二级回复 **/
+      submitReplySon(parentIndex, repIndex, repItem) {
+        let self = this
+        const parentItem = this.discussionsList[parentIndex];
+        const content = parentItem.replyContentSon[repIndex];
+        if (content.trim() == '' || content == null || content == undefined) {
+          self.$message({
+            message: '回复内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          "discussionId": repItem.id,
+          "content": content,
+        }
+
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addReplies(data).then(res => {
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.cancelReplySon(parentIndex, repIndex)
+            self.getDiscussionsList()
+          }).catch(err =>{
+            console.error("submitReplySon==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+
+        // 清空回复内容并隐藏表单
+        this.$set(parentItem.replyContentSon, repIndex, '');
+        this.$set(parentItem.showReplyFormSon, repIndex, false);
+      },
+      /** 回复 **/
+      submitReply(index, item) {
+        let self = this
+        const content = this.replyContent[index];
+        if (content == '' || content == null || content == undefined) {
+          self.$message({
+            message: '回复内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          "discussionId": item.id,
+          "content": content,
+        }
+
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addReplies(data).then(res => {
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.cancelReply(index)
+            self.getDiscussionsList()
+          }).catch(err =>{
+            console.error("handleDiscussions==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+
+        // 清空回复内容并隐藏表单
+        this.replyContent[index] = '';
+        this.showReplyForm[index] = false;
+      },
     }
   }
 </script>
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 35ccd7d..16fbe3a 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
         <div class="search">
           <div class="sl">
             <el-form-item label="文档编号" prop="docCode">
@@ -20,7 +20,7 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="类别" prop="docType">
+            <el-form-item label="文档类别" prop="docType">
               <el-select v-model="queryParams.docType" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.doc_class"
@@ -43,7 +43,7 @@
                           placeholder="请选择归属单位"
                           :show-count="true" style="width: 150px"/>
             </el-form-item>-->
-            <el-form-item label="来源" prop="docSource">
+            <el-form-item label="文档来源" prop="docSource">
               <el-select v-model="queryParams.docSource" placeholder="请选择" >
                 <el-option
                   v-for="dict in dict.type.doc_source"
@@ -118,14 +118,14 @@
           <el-table-column type="selection" width="55" align="center" :selectable="isSelectable"/>
           <el-table-column label="文档编号" align="center" prop="docCode" width="120" />
           <el-table-column label="文档名称" align="center" prop="docName" :show-overflow-tooltip="true" />
-          <el-table-column label="类别" align="center" prop="docType" :show-overflow-tooltip="true" width="80">
+          <el-table-column label="文档类别" align="center" prop="docType" :show-overflow-tooltip="true" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
             </template>
           </el-table-column>·
           <el-table-column label="负责人" align="center" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
           <el-table-column label="归属单位" align="center" prop="docRespDeptName" :show-overflow-tooltip="true" width="80" />
-          <el-table-column label="来源" align="center" prop="docSource" width="100">
+          <el-table-column label="文档来源" align="center" prop="docSource" width="100">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
             </template>
@@ -158,6 +158,7 @@
                 @click="handleEdit(scope.row)"
                 v-hasPermi="['document:edit']"
               >编辑</el-button>
+              <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -219,8 +220,8 @@
 
     <el-drawer :visible.sync="open" :modal-append-to-body="false" size="75%">
       <template #title>
-        <span class="title">新增文档资源</span>
-        <div class="drawer-head-btn">
+        <span class="title">{{docTitle}}</span>
+        <div class="drawer-head-btn" v-if="docDetailDisable">
           <el-button type="primary" @click="$refs.editDocumentRef.submitForm()">确 定</el-button>
           <el-button @click="docCancel()">取 消</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
@@ -232,7 +233,12 @@
     <!-- 工具导出对话框 -->
     <el-drawer :visible.sync="exportDrawerOpen" size="75%" :show-close="false">
       <template #title>
-        <span class="title">导出</span>
+        <span class="title">导出
+          <el-select v-model="statevalue" placeholder="请选择要导出的格式">
+            <el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </span>
         <div class="drawer-head-btn">
           <el-button type="primary" @click="handleExport">提交</el-button>
           <el-button @click="exportDrawerOpen=false">取消</el-button>
@@ -246,10 +252,10 @@
                 <el-checkbox-group v-model="checkList">
                   <el-checkbox label="docCode">文档编号</el-checkbox>
                   <el-checkbox label="docName">文档名称</el-checkbox>
-                  <el-checkbox label="docType">类别</el-checkbox>
+                  <el-checkbox label="docType">文档类别</el-checkbox>
                   <el-checkbox label="docPrincipals">负责人</el-checkbox>
                   <el-checkbox label="docRespDeptName">归属单位</el-checkbox>
-                  <el-checkbox label="docSource">来源</el-checkbox>
+                  <el-checkbox label="docSource">文档来源</el-checkbox>
                   <el-checkbox label="toolName">关联工具</el-checkbox>
                   <el-checkbox label="docStatus">上传状态</el-checkbox>
                   <el-checkbox label="createTime">创建时间</el-checkbox>
@@ -265,7 +271,7 @@
 </template>
 
 <script>
-import { listDocument, getDocument, delDocument, addDocument, updateDocument,pushDoc } from "@/api/document/document";
+import { listDocument, getDocument, delDocument, addDocument, updateDocument,pushDoc, listAllDoc} from "@/api/document/document";
 import { deptTreeSelect } from "@/api/system/user";
 import { documentTree,addCategory,updateCategory,delCategory,getCategory } from "@/api/documentCategory/documentCategory.js";
 
@@ -276,6 +282,7 @@ import uploadProgress from "./uploadProgress";
 import { w3cwebsocket as WebSocket } from 'websocket';
 import Treeselect from "@riophae/vue-treeselect";
 import { addCount } from "@/api/tool/downloadCount";
+import { exportDocx } from '@/utils/docUtil/docutil.js';
 
 export default {
   name: "Document",
@@ -382,6 +389,21 @@ export default {
       columnList: ['docCode', 'docName', 'docType', 'docPrincipals', 'docRespDeptName', 'docSource', 'toolName', 'docStatus', 'createTime'],
       checkList: [],
       exportDrawerOpen: false,
+      docTitle: '',
+      //文件详情标识
+      docDetailDisable: true,
+      //导出类型
+      statevalue: 1,
+      stateoptions: [
+        {
+          value: 1,
+          label: 'excel'
+        },
+        {
+          value: 2,
+          label: 'word'
+        }
+      ],
     };
   },
   created() {
@@ -440,17 +462,29 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.docTitle="新增文档资源"
+      this.docDetailDisable=true
       this.open = true
       this.$nextTick(()=>{
         this.$refs.editDocumentRef.resetForm();
       })
     },
     handleEdit(row){
+      this.docTitle="编辑文档资源"
+      this.docDetailDisable=true
       this.open = true
       this.$nextTick(()=>{
         this.$refs.editDocumentRef.editInit(row.docId, "edit");
       })
     },
+    handleDetail(row){
+      this.docTitle="详情"
+      this.docDetailDisable=false
+      this.open = true
+      this.$nextTick(()=>{
+        this.$refs.editDocumentRef.editInit(row.docId, "detail");
+      })
+    },
     handlePreview(row){
       this.viewDialogOpen = true;
       let protocol = window.location.protocol
@@ -606,12 +640,29 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
-      this.download('/document/export', {
-        ...this.queryParams,
-        downloadCheck:false,
-        excludeFields:excludeFields,
-      }, `文档资源信息数据_${new Date().getTime()}.xlsx`)
+      if (this.statevalue == 1) {
+        let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
+        this.download('/document/export', {
+          ...this.queryParams,
+          downloadCheck:false,
+          excludeFields:excludeFields,
+        }, `文档资源信息数据_${new Date().getTime()}.xlsx`)
+      }
+      if (this.statevalue == 2) {
+        listAllDoc(this.queryParams).then(r => {
+          if (r.data.length != 0) {
+            const data = {
+              form: null,
+              list: r.data
+            }
+            //模板文件位置在public文件夹里N
+            exportDocx('document.docx', data, `document.docx`)
+          } else {
+            this.$message.error('没有数据');
+          }
+        })
+      }
+
     },
     handleBeforeClose() {
       this.viewDialogOpen = false
diff --git a/src/views/login.vue b/src/views/login.vue
index 7e4220d..279cb36 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -41,8 +41,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 2ac849b..853cd17 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -107,9 +107,9 @@
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
-          <el-table-column label="审核状态" align="center" key="status">
+          <el-table-column label="审核状态" align="center" key="recordStatus" width="90">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.tool_status" :value="scope.row.recordStatus"/>
+              <dict-tag :options="dict.type.flow_status" :value="scope.row.recordStatus"/>
             </template>
           </el-table-column>
           <el-table-column label="关联工具" align="center" :show-overflow-tooltip="true">
@@ -132,7 +132,8 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
-              <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus=='done'" @click="applyUse(scope.row)">申请使用</el-button>
+<!--              && !scope.row.downloadStatus-->
+              <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus=='done' && !scope.row.downloadStatus" @click="applyUse(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
               <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus" @click="handleFileDownload(scope.row)">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
@@ -158,7 +159,12 @@
     <!-- 工具导出对话框 -->
     <el-drawer :visible.sync="exoportDrawerOpen" size="75%" :show-close="false">
       <template #title>
-        <span class="title">导出</span>
+        <span class="title">导出
+          <el-select v-model="statevalue" placeholder="请选择要导出的格式">
+            <el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </span>
         <div class="drawer-head-btn">
           <el-button type="primary" @click="handleExport">提交</el-button>
           <el-button @click="exoportDrawerOpen=false">取消</el-button>
@@ -229,7 +235,7 @@
 </template>
 
 <script>
-import { listTool, getTool, delTool, addTool, updateTool } from "@/api/tool/tool";
+import { listTool, getTool, delTool, addTool, updateTool, exportWordList} from "@/api/tool/tool";
 import { deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { Base64 } from 'js-base64'
@@ -238,10 +244,11 @@ import toolDetail from "./toolDetail";
 import downloadFileDetail from "./downloadFileDetail.vue";
 import AddDoc from './AddDoc'
 import mainComponent from "@/components/mainComponent/index.vue";
+import { exportDocx } from '@/utils/docUtil/docutil.js';
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'tool_type', 'tool_status'],
+  dicts: ['sys_normal_disable', 'tool_type', 'tool_status','flow_status'],
   components: { Treeselect, toolDetail, AddDoc,mainComponent,downloadFileDetail },
   data() {
     return {
@@ -340,6 +347,18 @@ export default {
       previewUrl: '',
       fileDetailDrawerOpen: false,
       fileDetailOpen: false,
+      //导出类型
+      statevalue: 1,
+      stateoptions: [
+        {
+          value: 1,
+          label: 'excel'
+        },
+        {
+          value: 2,
+          label: 'word'
+        }
+      ],
     };
   },
   watch: {
@@ -460,6 +479,7 @@ export default {
       this.dateRange = [];
       this.resetForm("queryForm");
       this.queryParams.deptId = undefined;
+      this.queryParams.toolRespDept = undefined;
       this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
@@ -518,12 +538,29 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
-      this.download('/tool/export', {
-        ...this.queryParams,
-        downloadCheck:false,
-        excludeFields:excludeFields,
-      }, `工具信息数据_${new Date().getTime()}.xlsx`)
+      if (this.statevalue == 1) {
+        let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
+        this.download('/tool/export', {
+          ...this.queryParams,
+          downloadCheck:false,
+          excludeFields:excludeFields,
+        }, `工具信息数据_${new Date().getTime()}.xlsx`)
+      }
+      if (this.statevalue == 2) {
+        exportWordList(this.queryParams).then(r => {
+          if (r.data.length != 0) {
+            const data = {
+              form: null,
+              list: r.data
+            }
+            //模板文件位置在public文件夹里N
+            exportDocx('tool.docx', data, `tool.docx`)
+          } else {
+            this.$message.error('没有数据');
+          }
+        })
+      }
+
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 5e123cd..01084af 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -872,9 +872,12 @@ export default {
       return true
     },
     handlePreview(row){
-      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
-      this.viewDialogTitle = '文档在线预览'
       this.viewDialogOpen = true;
+      this.viewDialogTitle = '文档在线预览'
+      let protocol = window.location.protocol
+      let hostname = window.location.hostname;
+      let getDocUrl = protocol + '//' + hostname + ':8080' + process.env.VUE_APP_BASE_API
+      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(getDocUrl + row.docUrl));
     },
     /**
      * 处理下载
-- 
2.35.1.windows.2


From 8b01478e071bb5eb5662e4b00a371d4889267df6 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Tue, 3 Sep 2024 16:15:48 +0800
Subject: [PATCH 26/55] =?UTF-8?q?1.=E6=89=80=E6=9C=89=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=202.=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E8=B0=83=E6=95=B4=203.=E5=AF=BC=E5=87=BAword?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                           |   2 +-
 .env.production                            |  10 +-
 .env.staging                               |   2 +-
 public/css/tool.css                        |   4 +-
 src/components/Crontab/hour.vue            |   2 +-
 src/layout/components/Sidebar/Logo.vue     |   2 +-
 src/views/document/index.vue               | 149 +++++++++++++--------
 src/views/filestatistic/index.vue          |  17 ++-
 src/views/message/index.vue                |   4 +-
 src/views/statistic/index.vue              |  62 ++++++---
 src/views/system/bizdict/index.vue         | 106 ++++++++-------
 src/views/system/config/index.vue          |  90 +++++++------
 src/views/system/dept/index.vue            |  48 ++++---
 src/views/system/dict/index.vue            | 102 +++++++-------
 src/views/system/menu/index.vue            |  48 ++++---
 src/views/system/notice/index.vue          |  65 ++++-----
 src/views/system/post/index.vue            |  64 ++++-----
 src/views/system/role/index.vue            | 102 +++++++-------
 src/views/system/user/index.vue            | 102 +++++++-------
 src/views/system/user/profile/index.vue    |   8 +-
 src/views/system/user/profile/userInfo.vue |   6 +-
 src/views/tool/downloadFileDetail.vue      |   2 -
 src/views/tool/index.vue                   |  75 +++++++----
 src/views/tool/toolDetail.vue              |   2 -
 src/views/workstuff/dispose/index.vue      |  14 +-
 25 files changed, 610 insertions(+), 478 deletions(-)

diff --git a/.env.development b/.env.development
index a282f97..41ba73c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 技术交流平台
+VUE_APP_TITLE = 工具管理及技术交流平台
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.production b/.env.production
index 0fc4d3c..ece2f51 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 技术交流平台
+VUE_APP_TITLE = 工具管理及技术交流平台
 
 # 生产环境配置
 ENV = 'production'
@@ -7,11 +7,11 @@ ENV = 'production'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
-VUE_APP_WS_URL = 'wss://www.rzdata.net/tool-tech-admin/websocket'
+VUE_APP_BASE_API = '/tool-tech-admin'
+VUE_APP_WS_URL = '/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://localhost:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
 
 # 流程管理服务地址
-VUE_APP_WORKFLOW_MANAGE_URL = 'http://localhost:8085/ebpm-process-manage'
+VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
diff --git a/.env.staging b/.env.staging
index 036b27c..b0b8486 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 技术交流平台
+VUE_APP_TITLE = 工具管理及技术交流平台
 
 NODE_ENV = production
 
diff --git a/public/css/tool.css b/public/css/tool.css
index 2dc6971..58f1fc5 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -75,7 +75,7 @@ body #app .hideSidebar .sidebar-container {
   width: 65px !important;
 }
 body #app .openSidebar .sidebar-container {
-  width:180px !important;
+  width:220px !important;
 }
 body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
 body #app .sidebar-container .el-sub-menu .el-menu-item {
@@ -344,7 +344,7 @@ body #app .hideSidebar .main-container {
   margin-left: 65px;
 }
 body #app .main-container {
-  margin-left: 180px;
+  margin-left: 220px;
   background:#f9fafe;
   background-size:100%;
 }
diff --git a/src/components/Crontab/hour.vue b/src/components/Crontab/hour.vue
index 3216c33..b51a4d0 100644
--- a/src/components/Crontab/hour.vue
+++ b/src/components/Crontab/hour.vue
@@ -25,7 +25,7 @@
 		<el-form-item>
 			<el-radio v-model='radioValue' :label="4">
 				指定
-				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
+				<el-select clearable v-model="checkboxList" placeholder="可多选" multiple ·>
 					<el-option v-for="item in 24" :key="item" :value="item-1">{{item-1}}</el-option>
 				</el-select>
 			</el-radio>
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 99b977c..8047442 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -35,8 +35,8 @@ export default {
   },
   data() {
     return {
+      // title: "工具管理及技术交流平台",
       title: process.env.VUE_APP_TITLE,
-      // title: process.env.VUE_APP_TITLE,
       logo: logoImg
     }
   }
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 16fbe3a..e7db46a 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
         <div class="search">
           <div class="sl">
             <el-form-item label="文档编号" prop="docCode">
@@ -21,7 +21,7 @@
               />
             </el-form-item>
             <el-form-item label="文档类别" prop="docType">
-              <el-select v-model="queryParams.docType" placeholder="请选择">
+              <el-select v-model="queryParams.docType" placeholder="请选择" @change="handleQuery">
                 <el-option
                   v-for="dict in dict.type.doc_class"
                   :key="dict.value"
@@ -30,21 +30,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="负责人" prop="docPrincipals">
-              <el-input
-                v-model="queryParams.docPrincipals"
-                placeholder="请输入负责人"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-<!--            <el-form-item label="归属单位" prop="docRespDept">
-              <treeselect v-model="queryParams.docRespDept" :options="deptOptions"
-                          placeholder="请选择归属单位"
-                          :show-count="true" style="width: 150px"/>
-            </el-form-item>-->
             <el-form-item label="文档来源" prop="docSource">
-              <el-select v-model="queryParams.docSource" placeholder="请选择" >
+              <el-select v-model="queryParams.docSource" placeholder="请选择" @change="handleQuery">
                 <el-option
                   v-for="dict in dict.type.doc_source"
                   :key="dict.value"
@@ -53,16 +40,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="状态" prop="docStatus">
-              <el-select v-model="queryParams.docStatus" placeholder="请选择" >
-                <el-option
-                  v-for="dict in dict.type.doc_upload_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="创建时间">
               <el-date-picker
                 v-model="dateRange"
@@ -71,8 +48,34 @@
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                @change="handleQuery"
               ></el-date-picker>
             </el-form-item>
+            <el-form-item label="负责人" prop="docPrincipals">
+              <el-input
+                v-model="queryParams.docPrincipals"
+                placeholder="请输入负责人"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+<!--            <el-form-item label="归属单位" prop="docRespDept">
+              <treeselect v-model="queryParams.docRespDept" :options="deptOptions"
+                          placeholder="请选择归属单位"
+                          :show-count="true" style="width: 150px"/>
+            </el-form-item>-->
+
+            <el-form-item label="状态" prop="docStatus">
+              <el-select v-model="queryParams.docStatus" placeholder="请选择" @change="handleQuery">
+                <el-option
+                  v-for="dict in dict.type.doc_upload_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
           </div>
           <div class="sr">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -148,9 +151,20 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180">
-            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <el-table-column label="操作" align="center" width="180" fixed="right">
+            <template slot-scope="scope">
               <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-view"
+                v-if="previewAuth(scope.row)"
+                @click="handlePreview(scope.row)"
+                v-hasPermi="['document:preview']"
+              >预览</el-button>
+              <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)"
+                         v-if="scope.row.downloadStatus"
+                         v-loading="loadingDownload">下载</el-button>
+<!--              <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
@@ -159,14 +173,6 @@
                 v-hasPermi="['document:edit']"
               >编辑</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-view"
-                v-if="previewAuth(scope.row)"
-                @click="handlePreview(scope.row)"
-                v-hasPermi="['document:preview']"
-              >预览</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -174,10 +180,16 @@
                 v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['document:remove']"
-              >删除</el-button>
-              <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)"
-                         v-if="scope.row.downloadStatus"
-                         v-loading="loadingDownload">下载</el-button>
+              >删除</el-button>-->
+
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right" >更多</el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleEdit" icon="el-icon-edit"  v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'">编辑</el-dropdown-item>
+                  <el-dropdown-item command="handleDelete" icon="el-icon-delete"   v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'">删除</el-dropdown-item>
+                  <el-dropdown-item command="handleDetail" icon="el-icon-info" >详情</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
             </template>
           </el-table-column>
         </el-table>
@@ -231,24 +243,25 @@
 
 
     <!-- 工具导出对话框 -->
-    <el-drawer :visible.sync="exportDrawerOpen" size="75%" :show-close="false">
-      <template #title>
-        <span class="title">导出
-          <el-select v-model="statevalue" placeholder="请选择要导出的格式">
-            <el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
-        </span>
-        <div class="drawer-head-btn">
-          <el-button type="primary" @click="handleExport">提交</el-button>
-          <el-button @click="exportDrawerOpen=false">取消</el-button>
-        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
-      </template>
+    <el-dialog title="导出" :visible.sync="exportDrawerOpen"  width="980px" append-to-body>
       <div class="el-form-border">
-        <el-form ref="form" label-width="200px">
+          <el-form ref="exportFrom" label-width="180px">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="导出格式">
+                  <el-radio-group v-model="statevalue">
+                    <el-radio v-for="item in stateoptions"  :key="item.value"  :label="item.value" >{{item.label}}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+      </div><!--el-form-border 表单-->
+      <div class="el-form-border">
+        <el-form ref="form" label-width="180px">
           <el-row>
             <el-col :span="24">
-              <el-form-item label="选择需要导出的字段信息">
+              <el-form-item label="导出字段">
                 <el-checkbox-group v-model="checkList">
                   <el-checkbox label="docCode">文档编号</el-checkbox>
                   <el-checkbox label="docName">文档名称</el-checkbox>
@@ -265,7 +278,12 @@
           </el-row>
         </el-form><!--el-form-->
       </div><!--el-form-border 表单-->
-    </el-drawer><!--el-drawer 导出抽屉-->
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleExport">确 定</el-button>
+        <el-button @click="exportDrawerOpen=false">取 消</el-button>
+      </span>
+    </el-dialog>
+
 <!--    <upload-progress/>-->
   </div>
 </template>
@@ -587,7 +605,6 @@ export default {
           toolId: row.toolId
         }
         addCount(formData).then(res => {
-          console.info("res==========", res)
         });
       }
       setTimeout(()=>{
@@ -666,7 +683,23 @@ export default {
     },
     handleBeforeClose() {
       this.viewDialogOpen = false
-    }
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleEdit":
+          this.handleEdit(row);
+          break;
+        case "handleUpdate":
+          this.handleUpdate(row);
+          break;
+        case "handleDelete":
+          this.handleDelete(row);
+          break;
+        default:
+          break;
+      }
+    },
 
   }
 };
diff --git a/src/views/filestatistic/index.vue b/src/views/filestatistic/index.vue
index 349743c..104ab4f 100644
--- a/src/views/filestatistic/index.vue
+++ b/src/views/filestatistic/index.vue
@@ -129,19 +129,26 @@ export default {
       self.pageloading = true
 
       getStatistics(this.queryParams).then(res => {
-        console.info("res===========", res)
         if(res.data){
+
+          const countType = JSON.parse(JSON.stringify(res.data.countType)).filter(item => item.name)
           //类别
-          self.toolTypeData = JSON.parse(JSON.stringify(res.data.countType))
+          self.toolTypeData = countType
           self.toolTypeData.forEach(item => {
-            self.toolTypeLegendData.push(item.name)
+            if(item && item.name){
+              self.toolTypeLegendData.push(item.name)
+            }
           })
 
 
+          const countSource = JSON.parse(JSON.stringify(res.data.countSource)).filter(item => item.name)
+
           //来源
-          self.toolSourceData = JSON.parse(JSON.stringify(res.data.countSource))
+          self.toolSourceData = countSource
           self.toolSourceData.forEach(item => {
-            self.toolSourceLegendData.push(item.name)
+            if(item && item.name){
+              self.toolSourceLegendData.push(item.name)
+            }
           })
           self.isPieChart= true
           self.pageloading= false
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index ec5ac40..c9710f7 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -37,6 +37,7 @@
           <el-button type="primary" @click="setAllMarkedRead">全部标记已读</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="tableList">
+          <el-table-column type="index" label="序号" width="50" />
           <el-table-column label="消息内容" prop="content" min-width="120" />
           <el-table-column label="接收时间" prop="createTime" :show-overflow-tooltip="true" min-width="120"/>
           <el-table-column label="消息状态" prop="states" :show-overflow-tooltip="true" min-width="80" >
@@ -47,11 +48,12 @@
               </template>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="100">
+          <el-table-column label="操作" align="center" min-width="100" fixed="right">
             <template v-slot="{ row }">
               <el-button
                 size="mini"
                 type="text"
+                icon="el-icon-edit"
                 v-if="row.states == '1'"
                 @click="markRead(row)"
               >标记已读</el-button>
diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue
index 2052d8a..bf1a97d 100644
--- a/src/views/statistic/index.vue
+++ b/src/views/statistic/index.vue
@@ -7,12 +7,12 @@
           <!--  -->
           <div class="tjbox2" v-if="isPieChart">
             <PieChart
-              height="207px"
+              height="285px"
               :data="toolTypeData"
               :legendData="toolTypeLegendData"
               legendBottom="5"
               chartRef="toolType"
-              :radius="50"
+              :radius="['40%', '70%']"
             />
           </div>
         </el-card><!--el-card-->
@@ -22,7 +22,7 @@
           <div slot="header" class="clearfix"><span class="tline">工具状态统计</span></div>
           <div class="tjbox2" v-if="isPieChart">
             <PieChart
-              height="207px"
+              height="285px"
               :data="toolStatusData"
               :legendData="toolStatusLegendData"
               legendBottom="5"
@@ -38,7 +38,7 @@
           <div slot="header" class="clearfix"><span class="tline">工具来源统计</span></div>
           <div class="tjbox2" v-if="isPieChart">
             <PieChart
-              height="207px"
+              height="285px"
               :data="toolSourceData"
               :legendData="toolSourceLegendData"
               legendBottom="5"
@@ -54,13 +54,12 @@
         <el-card>
           <div slot="header" class="clearfix"><span class="tline">工具下载</span></div>
           <div class="tjbox2">
-            <el-form label-width="80px" ref="queryForm">
+            <el-form label-width="70px" ref="queryForm">
               <div class="search">
                 <div class="sl">
                   <el-form-item label="下载时间">
                     <el-date-picker
                       v-model="dateRange"
-                      style="width: 240px"
                       value-format="yyyy-MM-dd"
                       type="daterange"
                       range-separator="-"
@@ -68,6 +67,22 @@
                       end-placeholder="结束日期"
                     ></el-date-picker>
                   </el-form-item>
+                  <el-form-item label="工具编号" prop="toolCode">
+                    <el-input
+                      v-model="queryParams.toolCode"
+                      placeholder="请输入工具编号"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
+                  <el-form-item label="工具名称" prop="toolName">
+                    <el-input
+                      v-model="queryParams.toolName"
+                      placeholder="请输入工具名称"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
                 </div>
                 <div class="sr">
                   <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -79,9 +94,10 @@
           </div>
           <div class="rt">
             <el-table v-loading="downLoading" :data="toolDownStatList">
+              <el-table-column type="index" label="序号" width="50" />
               <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" />
               <el-table-column label="工具名称" align="center" key="toolName" prop="toolName"  :show-overflow-tooltip="true" />
-              <el-table-column label="下载数量" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
+              <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
               <el-table-column
                 label="操作"
                 align="center"
@@ -178,6 +194,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        toolCode: null,
+        toolName: null,
       },
       queryParams1: {
         pageNum: 1,
@@ -207,7 +225,6 @@ export default {
       let self = this
       this.loading = true
       userDownList(this.addDateRange(this.queryParams1)).then(res => {
-        console.info("res=========", res)
         self.total = res?.total
         self.toolDownDetailStatList = res?.rows || []
         self.loading = false
@@ -234,7 +251,6 @@ export default {
       let self = this
       this.downLoading = true
       listCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
-        console.info("res=========", res)
         self.total = res?.total
         self.toolDownStatList = res?.rows || []
         self.downLoading = false
@@ -260,25 +276,33 @@ export default {
       self.pageloading = true
 
       getStatistics(this.queryParams).then(res => {
-        console.info("res===========", res)
         if(res.data){
+          const countToolType = JSON.parse(JSON.stringify(res.data.countToolType)).filter(item => item.name)
           //类别
-          self.toolTypeData = JSON.parse(JSON.stringify(res.data.countToolType))
+          self.toolTypeData = countToolType
           self.toolTypeData.forEach(item => {
-            self.toolTypeLegendData.push(item.name)
+            if(item && item.name){
+              self.toolTypeLegendData.push(item.name)
+            }
           })
 
+          const recordStatus = JSON.parse(JSON.stringify(res.data.recordStatus)).filter(item => item.name)
           //状态
-          self.toolStatusData = JSON.parse(JSON.stringify(res.data.recordStatus))
+          self.toolStatusData = recordStatus
           self.toolStatusData.forEach(item => {
-            self.toolStatusLegendData.push(item.name)
+            if(item && item.name){
+              self.toolStatusLegendData.push(item.name)
+            }
+          })
+          const toolSource = JSON.parse(JSON.stringify(res.data.toolSource)).filter(item => item.name)
+          //来源
+          self.toolSourceData = toolSource
+          self.toolSourceData.forEach(item => {
+            if(item && item.name){
+              self.toolSourceLegendData.push(item.name)
+            }
           })
 
-          //来源
-          self.toolSourceData = JSON.parse(JSON.stringify(res.data.toolSource))
-          self.toolSourceData.forEach(item => {
-            self.toolSourceLegendData.push(item.name)
-          })
           self.isPieChart= true
           self.pageloading= false
         }
diff --git a/src/views/system/bizdict/index.vue b/src/views/system/bizdict/index.vue
index 49dc791..85c9c8d 100644
--- a/src/views/system/bizdict/index.vue
+++ b/src/views/system/bizdict/index.vue
@@ -2,61 +2,69 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="字典名称" prop="dictName">
-          <el-input
-            v-model="queryParams.dictName"
-            placeholder="请输入字典名称"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">
-          <el-input
-            v-model="queryParams.dictType"
-            placeholder="请输入字典类型"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="字典状态"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
+        <div class="search">
+          <div class="sl">
+              <el-form-item label="字典名称" prop="dictName">
+                <el-input
+                  v-model="queryParams.dictName"
+                  placeholder="请输入字典名称"
+                  clearable
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="字典类型" prop="dictType">
+                <el-input
+                  v-model="queryParams.dictType"
+                  placeholder="请输入字典类型"
+                  clearable
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="状态" prop="status">
+                <el-select
+                  v-model="queryParams.status"
+                  placeholder="字典状态"
+                  clearable
+                  style="width: 240px"
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_normal_disable"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="创建时间">
+                <el-date-picker
+                  v-model="dateRange"
+                  style="width: 240px"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
+<!--        <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
     </el-card>
 
     <el-card class="lrtt">
       <div class="rt">
         <div class="operate">
-          <!-- 
+          <!--
           <el-button
             type="primary"
             plain
@@ -81,7 +89,7 @@
             @click="handleDelete"
             v-hasPermi="['system:dict:remove']"
           >删除</el-button>-->
-          <!-- 
+          <!--
           <el-button
             plain
             icon="el-icon-download"
@@ -119,7 +127,7 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <!-- 
+          <!--
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 179136e..e92d7e6 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -2,49 +2,53 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="参数名称" prop="configName">
-          <el-input
-            v-model="queryParams.configName"
-            placeholder="请输入参数名称"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="参数键名" prop="configKey">
-          <el-input
-            v-model="queryParams.configKey"
-            placeholder="请输入参数键名"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="系统内置" prop="configType">
-          <el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
-            <el-option
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        <div class="search">
+          <div class="sl">
+            <el-form-item label="参数名称" prop="configName">
+              <el-input
+                v-model="queryParams.configName"
+                placeholder="请输入参数名称"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="参数键名" prop="configKey">
+              <el-input
+                v-model="queryParams.configKey"
+                placeholder="请输入参数键名"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="系统内置" prop="configType">
+              <el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="dateRange"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
       </el-form>
     </el-card>
 
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 13aa906..e0cc845 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -2,28 +2,32 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-        <el-form-item label="部门名称" prop="deptName">
-          <el-input
-            v-model="queryParams.deptName"
-            placeholder="请输入部门名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        <div class="search">
+          <div class="sl">
+            <el-form-item label="部门名称" prop="deptName">
+              <el-input
+                v-model="queryParams.deptName"
+                placeholder="请输入部门名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
+                <el-option
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
       </el-form>
     </el-card>
     <el-card class="lrtt">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index de26be7..4b51c13 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -2,54 +2,62 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="字典名称" prop="dictName">
-          <el-input
-            v-model="queryParams.dictName"
-            placeholder="请输入字典名称"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">
-          <el-input
-            v-model="queryParams.dictType"
-            placeholder="请输入字典类型"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="字典状态"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
+        <div class="search">
+          <div class="sl">
+            <el-form-item label="字典名称" prop="dictName">
+              <el-input
+                v-model="queryParams.dictName"
+                placeholder="请输入字典名称"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="字典类型" prop="dictType">
+              <el-input
+                v-model="queryParams.dictType"
+                placeholder="请输入字典类型"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="字典状态"
+                clearable
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="dateRange"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
+<!--        <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
     </el-card>
 
@@ -80,7 +88,7 @@
             @click="handleDelete"
             v-hasPermi="['system:dict:remove']"
           >删除</el-button>
-          <!-- 
+          <!--
           <el-button
             plain
             icon="el-icon-download"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 0e297ee..1e4d3be 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -2,28 +2,36 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-        <el-form-item label="菜单名称" prop="menuName">
-          <el-input
-            v-model="queryParams.menuName"
-            placeholder="请输入菜单名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
+        <div class="search">
+          <div class="sl">
+              <el-form-item label="菜单名称" prop="menuName">
+                <el-input
+                  v-model="queryParams.menuName"
+                  placeholder="请输入菜单名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
+                  <el-option
+                    v-for="dict in dict.type.sys_normal_disable"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
+<!--        <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
     </el-card>
     <el-card class="lrtt">
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index e73568b..5a99f5a 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -2,36 +2,41 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="公告标题" prop="noticeTitle">
-          <el-input
-            v-model="queryParams.noticeTitle"
-            placeholder="请输入公告标题"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="操作人员" prop="createBy">
-          <el-input
-            v-model="queryParams.createBy"
-            placeholder="请输入操作人员"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="类型" prop="noticeType">
-          <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
-            <el-option
-              v-for="dict in dict.type.sys_notice_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        <div class="search">
+          <div class="sl">
+            <el-form-item label="公告标题" prop="noticeTitle">
+              <el-input
+                v-model="queryParams.noticeTitle"
+                placeholder="请输入公告标题"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="操作人员" prop="createBy">
+              <el-input
+                v-model="queryParams.createBy"
+                placeholder="请输入操作人员"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="类型" prop="noticeType">
+              <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
+                <el-option
+                  v-for="dict in dict.type.sys_notice_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
+
       </el-form>
     </el-card>
 
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 3db1b0f..03ec6f4 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -2,36 +2,40 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="岗位编码" prop="postCode">
-          <el-input
-            v-model="queryParams.postCode"
-            placeholder="请输入岗位编码"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="岗位名称" prop="postName">
-          <el-input
-            v-model="queryParams.postName"
-            placeholder="请输入岗位名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        <div class="search">
+          <div class="sl">
+            <el-form-item label="岗位编码" prop="postCode">
+              <el-input
+                v-model="queryParams.postCode"
+                placeholder="请输入岗位编码"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="岗位名称" prop="postName">
+              <el-input
+                v-model="queryParams.postName"
+                placeholder="请输入岗位名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
+                <el-option
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
       </el-form>
     </el-card>
     <el-card class="lrtt">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 1d0ed6d..faa733b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -2,54 +2,58 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input
-            v-model="queryParams.roleName"
-            placeholder="请输入角色名称"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="权限字符" prop="roleKey">
-          <el-input
-            v-model="queryParams.roleKey"
-            placeholder="请输入权限字符"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="角色状态"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        <div class="search">
+          <div class="sl">
+            <el-form-item label="角色名称" prop="roleName">
+              <el-input
+                v-model="queryParams.roleName"
+                placeholder="请输入角色名称"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="权限字符" prop="roleKey">
+              <el-input
+                v-model="queryParams.roleKey"
+                placeholder="请输入权限字符"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="角色状态"
+                clearable
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="dateRange"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
       </el-form>
     </el-card>
     <el-card class="lrtt">
@@ -79,7 +83,7 @@
             @click="handleDelete"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
-          <!-- 
+          <!--
           <el-button
             plain
             icon="el-icon-download"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8b7b87d..a294b3d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,54 +2,58 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="用户名称" prop="userName">
-          <el-input
-            v-model="queryParams.userName"
-            placeholder="请输入用户名称"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="phonenumber">
-          <el-input
-            v-model="queryParams.phonenumber"
-            placeholder="请输入手机号码"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="用户状态"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
+        <div class="search">
+          <div class="sl">
+            <el-form-item label="用户名称" prop="userName">
+              <el-input
+                v-model="queryParams.userName"
+                placeholder="请输入用户名称"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input
+                v-model="queryParams.phonenumber"
+                placeholder="请输入手机号码"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="用户状态"
+                clearable
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="dateRange"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
       </el-form>
     </el-card>
     <el-card class="lrtt">
@@ -101,7 +105,7 @@
             @click="handleDelete"
             v-hasPermi="['system:user:remove']"
           >删除</el-button>
-          <!-- 
+          <!--
           <el-button
             plain
             icon="el-icon-upload2"
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 529c564..679b135 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -7,9 +7,9 @@
             <span>个人信息</span>
           </div>
           <div>
-            <div class="text-center">
+<!--            <div class="text-center">
               <userAvatar />
-            </div>
+            </div>-->
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称
@@ -19,10 +19,10 @@
                 <svg-icon icon-class="phone" />手机号码
                 <div class="pull-right">{{ user.phonenumber }}</div>
               </li>
-              <li class="list-group-item">
+<!--              <li class="list-group-item">
                 <svg-icon icon-class="email" />用户邮箱
                 <div class="pull-right">{{ user.email }}</div>
-              </li>
+              </li>-->
               <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属部门
                 <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index c970dc9..fdec04f 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -2,13 +2,13 @@
   <el-form ref="form" :model="form" :rules="rules" label-width="80px">
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="form.nickName" maxlength="30" />
-    </el-form-item> 
+    </el-form-item>
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="form.phonenumber" maxlength="11" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="email">
+<!--    <el-form-item label="邮箱" prop="email">
       <el-input v-model="form.email" maxlength="50" />
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item label="性别">
       <el-radio-group v-model="form.sex">
         <el-radio label="0">男</el-radio>
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
index cecbb19..3a6f664 100644
--- a/src/views/tool/downloadFileDetail.vue
+++ b/src/views/tool/downloadFileDetail.vue
@@ -119,7 +119,6 @@
         this.getDocList()
       },
       handlePriew(row){
-        console.info("1111111==============")
         this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
         this.viewDialogTitle = '文档在线预览'
         this.viewDialogOpen = true;
@@ -148,7 +147,6 @@
             toolId: this.toolDetail.toolId
           }
           addCount(formData).then(res => {
-            console.info("res==========", res)
           });
         }
 
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 853cd17..e9d0a2b 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-form :model="queryParams" label-width="80px" ref="queryForm">
+      <el-form :model="queryParams" label-width="70px" ref="queryForm">
         <div class="grab"  id="add">
           <div class="search">
             <div class="sl">
@@ -21,12 +21,23 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
+              <el-form-item label="创建时间">
+                <el-date-picker
+                  v-model="dateRange"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  @change="handleQuery"
+                ></el-date-picker>
+              </el-form-item>
               <el-form-item label="状态" prop="status">
                 <el-select
                   v-model="queryParams.status"
                   placeholder="状态"
                   clearable
-                  style="width: 240px"
+                  @change="handleQuery"
                 >
                   <el-option
                     v-for="dict in dict.type.tool_status"
@@ -36,17 +47,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="创建时间">
-                <el-date-picker
-                  v-model="dateRange"
-                  style="width: 240px"
-                  value-format="yyyy-MM-dd"
-                  type="daterange"
-                  range-separator="-"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                ></el-date-picker>
-              </el-form-item>
+
             </div>
             <div class="sr">
               <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -128,6 +129,7 @@
           <el-table-column
             label="操作"
             align="center"
+            fixed="right"
             width="250"
             class-name="small-padding fixed-width"
           >
@@ -157,24 +159,25 @@
     </el-card><!--el-card-->
 
     <!-- 工具导出对话框 -->
-    <el-drawer :visible.sync="exoportDrawerOpen" size="75%" :show-close="false">
-      <template #title>
-        <span class="title">导出
-          <el-select v-model="statevalue" placeholder="请选择要导出的格式">
-            <el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
-        </span>
-        <div class="drawer-head-btn">
-          <el-button type="primary" @click="handleExport">提交</el-button>
-          <el-button @click="exoportDrawerOpen=false">取消</el-button>
-        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
-      </template>
+    <el-dialog title="导出" :visible.sync="exoportDrawerOpen"  width="980px" append-to-body>
       <div class="el-form-border">
-        <el-form ref="form" label-width="200px">
+        <el-form ref="exportFrom" label-width="180px">
           <el-row>
             <el-col :span="24">
-              <el-form-item label="选择需要导出的字段信息">
+              <el-form-item label="导出格式">
+                <el-radio-group v-model="statevalue">
+                  <el-radio v-for="item in stateoptions"  :key="item.value"  :label="item.value" >{{item.label}}</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div><!--el-form-border 表单-->
+      <div class="el-form-border">
+        <el-form ref="form" label-width="180px">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="导出字段">
                 <el-checkbox-group v-model="checkList">
                   <el-checkbox label="toolName">工具名称</el-checkbox>
                   <el-checkbox label="toolType">工具类别</el-checkbox>
@@ -194,7 +197,14 @@
           </el-row>
         </el-form><!--el-form-->
       </div><!--el-form-border 表单-->
-    </el-drawer><!--el-drawer 导出抽屉-->
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleExport">确 定</el-button>
+        <el-button @click="exoportDrawerOpen=false">取 消</el-button>
+      </span>
+    </el-dialog>
+
+
+
 
     <el-drawer
       :visible.sync="drawerShow"
@@ -538,6 +548,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      let self = this
       if (this.statevalue == 1) {
         let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
         this.download('/tool/export', {
@@ -545,6 +556,9 @@ export default {
           downloadCheck:false,
           excludeFields:excludeFields,
         }, `工具信息数据_${new Date().getTime()}.xlsx`)
+        setTimeout(() => {
+          self.exoportDrawerOpen = false;
+        }, 1000);
       }
       if (this.statevalue == 2) {
         exportWordList(this.queryParams).then(r => {
@@ -555,6 +569,9 @@ export default {
             }
             //模板文件位置在public文件夹里N
             exportDocx('tool.docx', data, `tool.docx`)
+            setTimeout(() => {
+              self.exoportDrawerOpen = false;
+            }, 1000);
           } else {
             this.$message.error('没有数据');
           }
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 21fb24b..0afc8f6 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -382,11 +382,9 @@
       /** 获取详情信息 **/
       getDetail(){
         let self = this
-        console.info("self.toolDetail==========", self.toolDetail)
         self.detailLoading = true
         getTool(self.toolDetail.toolId).then((res) => {
           self.detailData = res.data
-          console.info("res========", res)
           /*let formData = res.data;
           formData.type = _this.form.type
           _this.form = formData*/
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 365eddf..00d8ec1 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -3,11 +3,15 @@
     <el-card>
       <el-form label-width="80px">
         <div class="search">
-          <el-form-item label="流程标题">
-            <el-input placeholder="输入流程标题" v-model.trim="queryParams.title"></el-input>
-          </el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
+          <div class="sl">
+            <el-form-item label="流程标题">
+              <el-input placeholder="输入流程标题" v-model.trim="queryParams.title"></el-input>
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
+          </div>
         </div><!--search 搜索-->
       </el-form><!--el-form-->
     </el-card><!--el-card-->
-- 
2.35.1.windows.2


From 38c8842f4d15c6fad0a498e26095492a6b97862f Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Tue, 3 Sep 2024 17:30:32 +0800
Subject: [PATCH 27/55] =?UTF-8?q?1=E3=80=81=E9=97=AE=E9=A2=98=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/document/index.vue | 2 +-
 src/views/message/index.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index e7db46a..ec74059 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -573,7 +573,7 @@ export default {
               this.getDocumentTree();
             });
           } else {
-            this.$set(this.docCategoryForm, "type", "user")
+            this.$set(this.docCategoryForm, "types", "user")
             addCategory(this.docCategoryForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.docCategoryOpen = false;
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index c9710f7..6b21096 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -34,7 +34,7 @@
     <el-card class="lrtt">
       <div class="rt">
         <div class="operate">
-          <el-button type="primary" @click="setAllMarkedRead">全部标记已读</el-button>
+          <el-button type="primary" v-if="tableList && tableList.length > 0" @click="setAllMarkedRead">全部标记已读</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="tableList">
           <el-table-column type="index" label="序号" width="50" />
-- 
2.35.1.windows.2


From a9cc1de148ef41bdc3a6f8bd98183d8a68fe6204 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Tue, 3 Sep 2024 19:28:43 +0800
Subject: [PATCH 28/55] update

---
 src/components/MonitorDrawer/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/MonitorDrawer/index.vue b/src/components/MonitorDrawer/index.vue
index 81db554..16897b4 100644
--- a/src/components/MonitorDrawer/index.vue
+++ b/src/components/MonitorDrawer/index.vue
@@ -30,7 +30,10 @@
         methods: {
             init(procInstId) {
               this.visible = true
-              this.src = process.env.VUE_APP_WORKFLOW_MANAGE_URL + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
+              let protocol = window.location.protocol
+              let hostname = window.location.hostname;
+              let workflowManageUrl = protocol + '//' + hostname + ':9080' + process.env.VUE_APP_WORKFLOW_MANAGE_URL
+              this.src = workflowManageUrl + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
             }
         }
     }
-- 
2.35.1.windows.2


From 2239ff215b1896273aa0714917011c23abbb0fd5 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Tue, 3 Sep 2024 20:33:12 +0800
Subject: [PATCH 29/55] update

---
 src/components/MonitorDrawer/index.vue        |   1 +
 src/views/tool/index.vue                      |  11 +-
 .../workflowList/addWorkflow/tool_release.vue | 139 +++++++++---------
 3 files changed, 79 insertions(+), 72 deletions(-)

diff --git a/src/components/MonitorDrawer/index.vue b/src/components/MonitorDrawer/index.vue
index 16897b4..36931a3 100644
--- a/src/components/MonitorDrawer/index.vue
+++ b/src/components/MonitorDrawer/index.vue
@@ -33,6 +33,7 @@
               let protocol = window.location.protocol
               let hostname = window.location.hostname;
               let workflowManageUrl = protocol + '//' + hostname + ':9080' + process.env.VUE_APP_WORKFLOW_MANAGE_URL
+              workflowManageUrl = 'http://124.223.108.21:9080/ebpm-process-manage'
               this.src = workflowManageUrl + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
             }
         }
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index e9d0a2b..a3f0137 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -501,9 +501,14 @@ export default {
       // this.multiple = !selection.length;
     },
     handleDetail(row){
-      this.detailDrawerOpen = true
-      this.detailOpen = true
-      this.toolDetail = row
+      if(row.recordStatus === 'done'){
+        this.detailDrawerOpen = true
+        this.detailOpen = true
+        this.toolDetail = row
+      } else {
+        let status = row.recordStatus === 'draft' ? '1' : '0'
+        this.handleOpen({type:'tool_release', procInstId:row.procInstId, status:status})
+      }
     },
     handleFileDownload(row){
       this.fileDetailDrawerOpen = true
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 01084af..8136466 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -2,17 +2,14 @@
   <div  v-loading="loading||detailLoading">
     <div class="drawer-head">
       <div class="cell-title">
-        <div v-if="pListData && pListData.procInstId">
-          <p class="title">审核工具</p>
-        </div>
-        <div v-else>新增工具</div>
+          <p class="title">工具发布</p>
       </div>
       <div class="cell-btn">
-        <el-button type="primary" v-if="pListData && pListData.procInstId" @click="handleMonitor">流程监控</el-button>
-        <el-button v-if="editStatus && pListData.procInstId" type="danger" @click="deleteForm">删除</el-button>
-        <el-button v-if="(editStatus || workflowStatus)" type="primary" @click="submitForm">提交</el-button>
-        <el-button v-if="editStatus" type="primary" @click="saveForm">保存</el-button>
-        <el-button @click="close">关闭</el-button>
+        <el-button type="primary" v-if="pListData && pListData.procInstId" @click="handleMonitor" icon="el-icon-data-line">流程监控</el-button>
+        <el-button v-if="(editStatus || workflowStatus)" type="primary" @click="submitForm" icon="el-icon-finished">提交</el-button>
+        <el-button v-if="editStatus && !pListData.procInstId" type="primary" @click="saveForm" icon="el-icon-check">暂存</el-button>
+        <el-button v-if="editStatus && pListData.procInstId" type="danger" @click="deleteForm" icon="el-icon-close">撤销</el-button>
+        <el-button @click="close" icon="el-icon-close">关闭</el-button>
       </div>
     </div>
     <template v-if="attributeModelBool('approve') && workflowStatus">
@@ -306,7 +303,7 @@ import {
 import WorkflowLogs from '@/views/workflowList/workflowLogs/index.vue'
 import AddDoc from '@/views/tool/AddDoc.vue'
 import Treeselect from '@riophae/vue-treeselect'
-import { deptTreeSelect } from "@/api/system/user";
+import { addUser, deptTreeSelect, updateUser } from '@/api/system/user'
 import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool'
 import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 import ToolSelector from '@/components/tool-selector/index.vue'
@@ -576,67 +573,71 @@ export default {
     //不需要验证必填的保存
     saveForm() {
       let _this = this
-      if (!_this.procDefKey) {
-        _this.$message.warning("尚未进行流程设置，将无法发起流程！");
-        return;
-      }
-      _this.loading = true
-      let formData = JSON.parse(JSON.stringify(_this.form))
-      formData.recordStatus = "draft";
-      formData.editStatus = _this.editStatus
-      formData.association = JSON.stringify(_this.form.association)
-      if (formData.toolId) {
-        this.$set(formData,'documentList',_this.docList)
-        updateTool(formData).then((res) => {
-          if (res.code===200) {
-            _this.$message({
-              message: '保存成功',//提示的信息
-              type:'success',　　//类型是成功
-              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+      _this.$refs["eForm"].validate(valid => {
+        if (valid) {
+          if (!_this.procDefKey) {
+            _this.$message.warning("尚未进行流程设置，将无法发起流程！");
+            return;
+          }
+          _this.loading = true
+          let formData = JSON.parse(JSON.stringify(_this.form))
+          formData.recordStatus = "draft";
+          formData.editStatus = _this.editStatus
+          formData.association = JSON.stringify(_this.form.association)
+          if (formData.toolId) {
+            this.$set(formData,'documentList',_this.docList)
+            updateTool(formData).then((res) => {
+              if (res.code===200) {
+                _this.$message({
+                  message: '保存成功',//提示的信息
+                  type:'success',　　//类型是成功
+                  duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+                });
+              }
+            }).finally(()=>{
+              _this.loading = false
+            });
+          } else {
+            let wf_receivers = [];
+            wf_receivers.push({
+              receiveUserId: _this.userInfo.userName,
+              receiveUserOrgId: _this.userInfo.deptId
+            });
+            let wf_procTitle = "【工具发布】" + (formData.toolName?formData.toolName:"")
+            formData.bpmClientInputModel = {
+              model: {
+                wf_procDefId: _this.pListData.procDefId,
+                wf_procDefKey: _this.procDefKey,
+                wf_procTitle: wf_procTitle,
+                wf_sendUserId: _this.userInfo.userName,
+                wf_sendUserOrgId: _this.userInfo.deptId,
+                wf_receivers: wf_receivers,
+                wf_curActDefName: _this.pListData.actDefName,
+                wf_curActDefId: _this.pListData.actDefId,
+                wf_nextActDefName: _this.pListData.actDefName,
+                wf_nextActDefId: _this.pListData.actDefId,
+              },
+              type: formData.type,
+              review: _this.attributeModelBool('approve'),
+            };
+            formData.editStatus = _this.editStatus
+            this.$set(formData,'documentList',_this.docList)
+            addTool(formData).then((res) => {
+              if (res.code===200) {
+                _this.form.toolId = res.data.businessKey;
+                _this.procInstInfoAndStatus(res.data.procInstId)
+                _this.$message({
+                  message: '保存成功',//提示的信息
+                  type:'success',　　//类型是成功
+                  duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+                });
+              }
+            }).finally(()=>{
+              _this.loading = false
             });
           }
-        }).finally(()=>{
-          _this.loading = false
-        });
-      } else {
-        let wf_receivers = [];
-        wf_receivers.push({
-          receiveUserId: _this.userInfo.userName,
-          receiveUserOrgId: _this.userInfo.deptId
-        });
-        let wf_procTitle = "【工具发布】" + (formData.toolName?formData.toolName:"")
-        formData.bpmClientInputModel = {
-          model: {
-            wf_procDefId: _this.pListData.procDefId,
-            wf_procDefKey: _this.procDefKey,
-            wf_procTitle: wf_procTitle,
-            wf_sendUserId: _this.userInfo.userName,
-            wf_sendUserOrgId: _this.userInfo.deptId,
-            wf_receivers: wf_receivers,
-            wf_curActDefName: _this.pListData.actDefName,
-            wf_curActDefId: _this.pListData.actDefId,
-            wf_nextActDefName: _this.pListData.actDefName,
-            wf_nextActDefId: _this.pListData.actDefId,
-          },
-          type: formData.type,
-          review: _this.attributeModelBool('approve'),
-        };
-        formData.editStatus = _this.editStatus
-        this.$set(formData,'documentList',_this.docList)
-        addTool(formData).then((res) => {
-          if (res.code===200) {
-            _this.form.toolId = res.data.businessKey;
-            _this.procInstInfoAndStatus(res.data.procInstId)
-            _this.$message({
-              message: '保存成功',//提示的信息
-              type:'success',　　//类型是成功
-              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
-            });
-          }
-        }).finally(()=>{
-          _this.loading = false
-        });
-      }
+        }
+      });
     },
     deleteForm(){
       let _this = this
-- 
2.35.1.windows.2


From a96e1c7bd911ccbce43dd57381455b01a5b069a7 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Tue, 3 Sep 2024 21:06:22 +0800
Subject: [PATCH 30/55] update

---
 src/components/MonitorDrawer/index.vue |  1 -
 src/views/tool/index.vue               |  2 +-
 src/views/workstuff/apply/index.vue    |  2 ++
 src/views/workstuff/dispose/index.vue  | 14 ++++++++++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/MonitorDrawer/index.vue b/src/components/MonitorDrawer/index.vue
index 36931a3..16897b4 100644
--- a/src/components/MonitorDrawer/index.vue
+++ b/src/components/MonitorDrawer/index.vue
@@ -33,7 +33,6 @@
               let protocol = window.location.protocol
               let hostname = window.location.hostname;
               let workflowManageUrl = protocol + '//' + hostname + ':9080' + process.env.VUE_APP_WORKFLOW_MANAGE_URL
-              workflowManageUrl = 'http://124.223.108.21:9080/ebpm-process-manage'
               this.src = workflowManageUrl + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
             }
         }
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index a3f0137..35c938b 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -108,7 +108,7 @@
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
-          <el-table-column label="审核状态" align="center" key="recordStatus" width="90">
+          <el-table-column label="流程状态" align="center" key="recordStatus" width="90">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.flow_status" :value="scope.row.recordStatus"/>
             </template>
diff --git a/src/views/workstuff/apply/index.vue b/src/views/workstuff/apply/index.vue
index f5049c0..546ff79 100644
--- a/src/views/workstuff/apply/index.vue
+++ b/src/views/workstuff/apply/index.vue
@@ -13,6 +13,7 @@
                 <el-option label="全部" value=""></el-option>
                 <el-option label="审核中" value="doing"></el-option>
                 <el-option label="已审核" value="done"></el-option>
+                <el-option label="拟稿" value="draft"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="发起时间">
@@ -48,6 +49,7 @@
           <template slot-scope="scope">
               <el-tag v-if="scope.row.recordStatus === 'doing'">审核中</el-tag>
               <el-tag type="success" v-if="scope.row.recordStatus === 'done'">已审核</el-tag>
+              <el-tag type="info" v-if="scope.row.recordStatus === 'draft'">拟稿</el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="发起时间"></el-table-column>
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 00d8ec1..110e3c0 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -22,7 +22,12 @@
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="curActDefName" label="当前环节"></el-table-column>
-            <el-table-column prop="prevActDefName" label="上一环节"></el-table-column>
+            <el-table-column prop="prevActDefName" label="上一环节">
+              <template slot-scope="scope">
+                <span v-if="!scope.row.prevActDefName">/</span>
+                <span v-else>{{ scope.row.prevActDefName }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
             <el-table-column prop="startUserName" label="发起人"></el-table-column>
             <el-table-column prop="sendTime" label="接收时间">
@@ -49,7 +54,12 @@
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="curActDefName" label="处理环节"></el-table-column>
-            <el-table-column prop="prevActDefName" label="上一环节"></el-table-column>
+            <el-table-column label="上一环节">
+              <template slot-scope="scope">
+                <span v-if="!scope.row.prevActDefName">/</span>
+                <span v-else>{{ scope.row.prevActDefName }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
             <el-table-column prop="startUserName" label="发起人"></el-table-column>
             <el-table-column prop="sendTime" label="接收时间">
-- 
2.35.1.windows.2


From aca571fda1b315ebf1b78b802af685a7bd0ba32d Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Wed, 4 Sep 2024 22:16:33 +0800
Subject: [PATCH 31/55] update

---
 src/api/system/user.js                        |  5 ++-
 src/components/MonitorDrawer/index.vue        |  7 +++
 src/components/mainComponent/index.vue        |  2 +-
 .../user-selector/src/user-selector.vue       | 31 +++++--------
 src/views/document/index.vue                  |  2 +-
 src/views/tool/index.vue                      | 15 +++++--
 .../workflowList/addWorkflow/tool_release.vue | 43 ++++++++++---------
 .../workflowList/addWorkflow/use_apply.vue    | 28 ++++++------
 src/views/workflowList/processcode/index.vue  |  5 +--
 src/views/workflowList/workflowRouter.vue     |  2 +-
 10 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 2d1be5e..57de53f 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -127,10 +127,11 @@ export function updateAuthRole(data) {
 }
 
 // 查询部门下拉树结构
-export function deptTreeSelect() {
+export function deptTreeSelect(query) {
   return request({
     url: '/system/user/deptTree',
-    method: 'get'
+    method: 'get',
+    params: query
   })
 }
 
diff --git a/src/components/MonitorDrawer/index.vue b/src/components/MonitorDrawer/index.vue
index 16897b4..26940f0 100644
--- a/src/components/MonitorDrawer/index.vue
+++ b/src/components/MonitorDrawer/index.vue
@@ -2,6 +2,7 @@
   <el-drawer
     :wrapperClosable='false'
     size="65%"
+    :modal="true"
     :visible.sync="visible"
     :show-close="false"
     :append-to-body="true"
@@ -33,8 +34,14 @@
               let protocol = window.location.protocol
               let hostname = window.location.hostname;
               let workflowManageUrl = protocol + '//' + hostname + ':9080' + process.env.VUE_APP_WORKFLOW_MANAGE_URL
+              workflowManageUrl = 'http://124.223.108.21:9080/ebpm-process-manage'
               this.src = workflowManageUrl + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
             }
         }
     }
 </script>
+<style>
+.el-drawer .el-drawer__body{
+  padding: 0px 0px !important;
+}
+</style>
diff --git a/src/components/mainComponent/index.vue b/src/components/mainComponent/index.vue
index 53cd8ba..dedf66c 100644
--- a/src/components/mainComponent/index.vue
+++ b/src/components/mainComponent/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <component :is="dashboard" ref="component" :data="data" :dataType="dataType"  @close="close">
+  <component :is="dashboard" ref="component" :data="data" :dataType="dataType" @close="close" style="padding: 16px 32px">
     <slot></slot>
   </component>
 </template>
diff --git a/src/components/user-selector/src/user-selector.vue b/src/components/user-selector/src/user-selector.vue
index 4e45aa7..dbf3109 100644
--- a/src/components/user-selector/src/user-selector.vue
+++ b/src/components/user-selector/src/user-selector.vue
@@ -25,18 +25,6 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="手机号码" prop="phonenumber">
-                  <el-input
-                    v-model="queryParams.phonenumber"
-                    placeholder="请输入手机号码"
-                    clearable
-                    style="width: 200px"
-                    size="mini"
-                    @keyup.enter.native="getList"
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="8">
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
@@ -177,6 +165,10 @@
       open: {
         type: Boolean,
         default:false,
+      },
+      deptFilter: {
+        type: Boolean,
+        default:false,
       }
       // value: {
       //     type: Object,
@@ -191,9 +183,7 @@
     },
     data() {
       return {
-
         loading: false,
-
         // open: false,
         activeName: 'first',
         defaultProps: {
@@ -204,7 +194,7 @@
         deptOptions: undefined,
         deptName: '',
         showSearch: true,
-
+        userInfo: this.$store.getters.userInfo,
         userList: [],
         allUserList: [],
         allUserMap: new Map(),
@@ -302,7 +292,8 @@
       },
       /** 查询部门下拉树结构 */
       getDeptTree() {
-        deptTreeSelect().then(response => {
+        let deptId = this.deptFilter ? this.userInfo.dept.deptId : ''
+        deptTreeSelect({deptId: deptId}).then(response => {
           this.deptOptions = response.data;
         });
       },
@@ -310,18 +301,15 @@
       //第一步要做的 checkedUsers 为数组如['admin','ry'] 在父组件调用此方法并传入要回显的数组可进行复选框回显操作
       getAllUserList(checkedUsers = []) {
         //查出所有的用户，用于根据不同情况筛选显示
-        listUser({pageNum: 1,pageSize: 2147483647,status: "0"}).then(response => {
+        let deptId = this.deptFilter ? this.userInfo.dept.deptId : ''
+        listUser({pageNum: 1, pageSize: 2147483647, status: "0", deptId: deptId}).then(response => {
             this.allUserList = response.rows;
-
             this.allUserMap = new Map();
-
             this.checkedUsers = checkedUsers;
-
             this.allUserList.forEach(item => {
               this.allUserMap.set(item.userName, item);
             });
             this.updateCheckedUsers();
-            //   console.log(this.allUserList, this.allUserMap);
             this.getList();
           }
         );
@@ -329,6 +317,7 @@
 
       /** 查询用户列表 */
       getList() {
+        this.queryParams.deptId = this.deptFilter ? this.userInfo.dept.deptId : ''
         listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
             this.userList = response.rows;
             //   console.log(this.userList);
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index ec74059..fbc174b 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -134,7 +134,7 @@
             </template>
           </el-table-column>
           <el-table-column label="关联工具" align="center" prop="toolName" width="100" />
-          <el-table-column label="上传状态" align="center" prop="docStatus" width="100" >
+          <el-table-column label="文档状态" align="center" prop="docStatus" width="100" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.doc_upload_status" :value="scope.row.docStatus"/>
             </template>
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 35c938b..355e76b 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -135,7 +135,7 @@
           >
             <template slot-scope="scope">
 <!--              && !scope.row.downloadStatus-->
-              <el-button type="text" icon="el-icon-info" v-if="scope.row.recordStatus=='done' && !scope.row.downloadStatus" @click="applyUse(scope.row)">申请使用</el-button>
+              <el-button type="text" icon="el-icon-info" v-if="checkApplyUseBtn(scope.row)" @click="applyUse(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
               <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus" @click="handleFileDownload(scope.row)">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
@@ -209,7 +209,7 @@
     <el-drawer
       :visible.sync="drawerShow"
       direction="rtl"
-      size="90%"
+      size="80%"
       :with-header="false"
       :wrapperClosable="false"
       :show-close="false"
@@ -475,8 +475,15 @@ export default {
       let _this = this
       _this.handleOpen({...row,type:'use_apply',procInstId:undefined})
     },
-    submitApply(){
-
+    checkApplyUseBtn(row){
+      let result = false;
+      if(row.recordStatus=='done' && !row.downloadStatus){
+        result = true;
+      }
+      if(row.isHasApplyUse){
+        result = false;
+      }
+      return result;
     },
     /**=============================申请使用End================================*/
     /** 搜索按钮操作 */
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 8136466..d9b3814 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -72,20 +72,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="负责人" prop="toolPrincipals">
-                <el-input v-if="editStatus" v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11" @focus="toolPrincipalsChoose = true"/>
-                <span v-else>{{form.toolPrincipalsName}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="归属部门" prop="toolRespDept">
-                <treeselect :disabled="!editStatus" v-model="form.toolRespDept" :options="deptOptions" @select="handleSelectNode" :show-count="true" placeholder="请选择归属部门" />
-              </el-form-item>
-            </el-col>
-
-          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="工具来源" prop="toolSource">
@@ -134,6 +120,21 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="负责人" prop="toolPrincipals">
+                <el-input v-if="editStatus" v-model="form.toolPrincipalsName" placeholder="请选择负责人" maxlength="11" @focus="toolPrincipalsChoose = true"/>
+                <span v-else>{{form.toolPrincipalsName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="归属部门">
+                {{userInfo.dept.deptName}}
+                <!--                <treeselect :disabled="!editStatus" v-model="form.toolRespDept" :options="deptOptions" @select="handleSelectNode" :show-count="true" placeholder="请选择归属部门" />-->
+              </el-form-item>
+            </el-col>
+
+          </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="测试情况" prop="testSituation">
@@ -282,7 +283,7 @@
       ref="monitorDrawer"
     ></monitor-drawer>
     <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
-    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
+    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" :deptFilter="true" @cancel="toolPrincipalsChoose=false" @submit="submitPeople"></bl-user-selector>
 
 
     <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
@@ -382,14 +383,13 @@ export default {
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
         toolRespDept: [
-          { required: true, message: "请选择归属部门", trigger: "blur" }
+          { required: true, message: "请选择归属部门", trigger: "change" }
         ],
         toolSource: [
-          { required: true, message: "请输入工具来源", trigger: "blur" },
-          { max: 50, message: '工具来源不能超过50个字', trigger: 'blur' }
+          { required: true, message: "请选择工具来源", trigger: "change" }
         ],
         toolType: [
-          { required: true, message: "请选择工具类别", trigger: "blur" }
+          { required: true, message: "请选择工具类别", trigger: "change" }
         ],
         toolUse: [
           { required: true, message: "请输入工具用途", trigger: "blur" },
@@ -405,10 +405,10 @@ export default {
           { required: true, message: "请输入适用条件", trigger: "blur" },
         ],
         operateExplain: [
-          { required: true, message: "请选择状态", trigger: "blur" },
+          { required: true, message: "请输入操作说明", trigger: "blur" },
         ],
         status: [
-          { required: true, message: "请输入操作说明", trigger: "blur" },
+          { required: true, message: "请选择状态", trigger: "change" },
         ],
       },
       kuozhanshuju: {},
@@ -584,6 +584,7 @@ export default {
           formData.recordStatus = "draft";
           formData.editStatus = _this.editStatus
           formData.association = JSON.stringify(_this.form.association)
+          formData.toolRespDept = _this.userInfo.dept.deptId
           if (formData.toolId) {
             this.$set(formData,'documentList',_this.docList)
             updateTool(formData).then((res) => {
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index daf0575..6dc1ce5 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -8,10 +8,9 @@
       </div>
       <div class="cell-btn">
         <el-button type="primary" v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
-        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm">撤销</el-button>
-        <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm">提交</el-button>
-        <el-button v-if="editStatus" type="primary" @click="saveForm" >保存</el-button>
-        <el-button @click="close">关闭</el-button>
+        <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm" icon="el-icon-close">撤销</el-button>
+        <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm" icon="el-icon-finished">提交</el-button>
+        <el-button @click="close" icon="el-icon-close">关闭</el-button>
       </div>
     </div>
     <template v-if="attributeModelBool('approve') && workflowStatus">
@@ -59,9 +58,8 @@
         <div>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="申请人" prop="userId">
-                <el-input v-if="editStatus" v-model="form.nickName" placeholder="请输入申请人" @focus="toolPrincipalsChoose = true"/>
-                <span v-else>{{form.nickName}}</span>
+              <el-form-item label="申请人">
+                <span>{{form.nickName}}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -99,19 +97,25 @@
             <el-form-item label="负责人">{{applyToolDetail ? applyToolDetail.toolPrincipalsName:''}}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门">{{applyToolDetail ? applyToolDetail.toolRespDept:''}}</el-form-item>
+            <el-form-item label="归属部门">{{applyToolDetail ? applyToolDetail.toolRespDeptName:''}}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="工具来源">{{applyToolDetail ? applyToolDetail.toolSource:''}}</el-form-item>
+            <el-form-item label="工具来源">
+              <dict-tag :options="dict.type.tool_source" :value="applyToolDetail.toolSource"/>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="工具用途">{{applyToolDetail ? applyToolDetail.toolUse:''}}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="工具类别">{{applyToolDetail ? applyToolDetail.toolType:''}}</el-form-item>
+            <el-form-item label="工具类别">
+              <dict-tag :options="dict.type.tool_type" :value="applyToolDetail.toolType"/>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="状态">{{applyToolDetail ? applyToolDetail.status:''}}</el-form-item>
+            <el-form-item label="状态">
+              <dict-tag :options="dict.type.tool_status" :value="applyToolDetail.status"/>
+            </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="测试情况">{{applyToolDetail ? applyToolDetail.testSituation:''}}</el-form-item>
@@ -182,7 +186,7 @@ import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 import { getTool } from "@/api/tool/tool";
 // PDF本地文件预览
 export default {
-  dicts: ['sys_normal_disable','tool_type'],
+  dicts: ['sys_normal_disable','tool_type', 'tool_source', 'tool_status'],
   components: {
     blUserSelector,
     Treeselect, AddDoc,
diff --git a/src/views/workflowList/processcode/index.vue b/src/views/workflowList/processcode/index.vue
index 548714c..d01365c 100644
--- a/src/views/workflowList/processcode/index.vue
+++ b/src/views/workflowList/processcode/index.vue
@@ -28,7 +28,7 @@
             >
             </el-tree>
           </el-col>
-          <el-col :span="8" v-show="processList&&processList.length>0&&nextData&&nextData.actDefType != 'endEvent'">
+          <el-col :span="8" v-show="processList && processList.length>0 &&nextData&&nextData.actDefType != 'endEvent'">
             <div class="h28">待选用户
 <!--              <el-button type="primary" style="float: right" size="mini" @click="handleSelect">通讯录</el-button>-->
             </div>
@@ -186,7 +186,6 @@ export default {
   },
   created() {
     this.getOptionsList();
-    console.log("xuanren", this.pListData);
     if (this.pListData.procDefKey != "") {
       this.procDefKey = this.pListData.procDefKey;
     }
@@ -338,14 +337,12 @@ export default {
     },
     processNodeClick2(val) {
       let _this = this
-      console.log("业务数据====>", this.pListData);
       if (this.nextData != "") {
         if (val.actDefName == this.nextData.actDefName) {
           return;
         }
       }
       this.nextData = val;
-      console.log("nextData", this.nextData);
       this.userList = []; //代选
       this.receiveUserList = []; //已选
       let params = {
diff --git a/src/views/workflowList/workflowRouter.vue b/src/views/workflowList/workflowRouter.vue
index 8f485a3..31bed86 100644
--- a/src/views/workflowList/workflowRouter.vue
+++ b/src/views/workflowList/workflowRouter.vue
@@ -1,5 +1,5 @@
 <template>
-  <main-component ref="mainComponent" :code="code" :data="data"  @close="handleCloseChange" class="iframe-drawer"></main-component>
+  <main-component ref="mainComponent" :code="code" :data="data"  @close="handleCloseChange" class="iframe-drawer" style="padding: 16px 32px"></main-component>
 </template>
 
 <script>
-- 
2.35.1.windows.2


From e9c7b39f1bd18b840f239afa04cbaefefa5596da Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Wed, 4 Sep 2024 22:22:40 +0800
Subject: [PATCH 32/55] update

---
 src/components/DealDrawer/index.vue              | 4 ++--
 src/views/message/index.vue                      | 4 ++--
 src/views/tool/index.vue                         | 4 ++--
 src/views/workflowList/addWorkflow/use_apply.vue | 2 +-
 src/views/workstuff/apply/index.vue              | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/DealDrawer/index.vue b/src/components/DealDrawer/index.vue
index cb6d027..8afd7f6 100644
--- a/src/components/DealDrawer/index.vue
+++ b/src/components/DealDrawer/index.vue
@@ -5,7 +5,7 @@
     :visible.sync="visible"
     :append-to-body="true"
     direction="rtl"
-    size="90%"
+    size="80%"
     :with-header="false"
     :show-close="false"
     modal-append-to-body
@@ -18,7 +18,7 @@
   <el-drawer
     :visible.sync="drawerShow"
     direction="rtl"
-    size="90%"
+    size="80%"
     :append-to-body="true"
     :with-header="false"
     :wrapperClosable="false"
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 6b21096..05ad9ea 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -34,7 +34,7 @@
     <el-card class="lrtt">
       <div class="rt">
         <div class="operate">
-          <el-button type="primary" v-if="tableList && tableList.length > 0" @click="setAllMarkedRead">全部标记已读</el-button>
+          <el-button type="primary" v-if="tableList && tableList.length > 0" @click="setAllMarkedRead" icon="el-icon-check">全部标记已读</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="tableList">
           <el-table-column type="index" label="序号" width="50" />
@@ -53,7 +53,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                icon="el-icon-check"
                 v-if="row.states == '1'"
                 @click="markRead(row)"
               >标记已读</el-button>
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 355e76b..8c2547a 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -220,7 +220,7 @@
     </el-drawer>
 
     <!-- 工具详情对话框 -->
-    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" size="85%" class="no-padding" @close="handleCloseDetail()">
+    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" size="80%" class="no-padding" @close="handleCloseDetail()">
       <template #title>
         <span>工具名称</span>
       </template>
@@ -232,7 +232,7 @@
 
 
     <!-- 工具详情对话框 -->
-    <el-drawer :visible.sync="fileDetailDrawerOpen" :modal-append-to-body="false" size="85%" class="no-padding" @close="handleFileCloseDetail()">
+    <el-drawer :visible.sync="fileDetailDrawerOpen" :modal-append-to-body="false" size="80%" class="no-padding" @close="handleFileCloseDetail()">
       <template #title>
         <span>工具下载</span>
       </template>
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index 6dc1ce5..dfec49d 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -7,7 +7,7 @@
         </div>
       </div>
       <div class="cell-btn">
-        <el-button type="primary" v-if="pListData&&pListData.procInstId" @click="handleMonitor">流程监控</el-button>
+        <el-button type="primary" v-if="pListData&&pListData.procInstId" @click="handleMonitor" icon="el-icon-data-line">流程监控</el-button>
         <el-button v-if="editStatus&&pListData.procInstId" type="danger" @click="deleteForm" icon="el-icon-close">撤销</el-button>
         <el-button v-if="(editStatus||workflowStatus)" type="primary" @click="submitForm" icon="el-icon-finished">提交</el-button>
         <el-button @click="close" icon="el-icon-close">关闭</el-button>
diff --git a/src/views/workstuff/apply/index.vue b/src/views/workstuff/apply/index.vue
index 546ff79..749a219 100644
--- a/src/views/workstuff/apply/index.vue
+++ b/src/views/workstuff/apply/index.vue
@@ -69,7 +69,7 @@
       />
     </el-card><!--el-card-->
 
-    <el-drawer :visible.sync="drawer1" size="75%" :show-close="false">
+    <el-drawer :visible.sync="drawer1" size="80%" :show-close="false">
       <template #title>
         <span>申请使用</span>
         <div class="drawer-head-btn">
@@ -152,7 +152,7 @@
     <el-drawer
       :visible.sync="drawerShow"
       direction="rtl"
-      size="90%"
+      size="80%"
       :with-header="false"
       :wrapperClosable="false"
       :show-close="false"
-- 
2.35.1.windows.2


From 2a933ea8cbb8e978d5aae8e00e20783a050638ba Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Thu, 5 Sep 2024 08:57:44 +0800
Subject: [PATCH 33/55] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/attachment/attachment.js              |  44 ++
 .../FileUpload/optimizeToolUpload.vue         | 396 ++++++++++++++++++
 src/components/tool-selector/index.vue        |   4 +-
 src/views/document/index.vue                  |  12 +-
 src/views/tool/downloadFileDetail.vue         |  43 +-
 src/views/tool/index.vue                      |   1 +
 src/views/tool/toolDetail.vue                 |  72 +++-
 .../workflowList/addWorkflow/tool_release.vue | 162 +++++--
 .../workflowList/addWorkflow/use_apply.vue    |  20 +-
 9 files changed, 663 insertions(+), 91 deletions(-)
 create mode 100644 src/api/attachment/attachment.js
 create mode 100644 src/components/FileUpload/optimizeToolUpload.vue

diff --git a/src/api/attachment/attachment.js b/src/api/attachment/attachment.js
new file mode 100644
index 0000000..200f09a
--- /dev/null
+++ b/src/api/attachment/attachment.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询附件列表
+export function listAttachment(query) {
+  return request({
+    url: '/system/attachment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询附件详细
+export function getAttachment(id) {
+  return request({
+    url: '/system/attachment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增附件
+export function addAttachment(data) {
+  return request({
+    url: '/system/attachment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改附件
+export function updateAttachment(data) {
+  return request({
+    url: '/system/attachment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除附件
+export function delAttachment(id) {
+  return request({
+    url: '/system/attachment/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
new file mode 100644
index 0000000..6429d53
--- /dev/null
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -0,0 +1,396 @@
+<template>
+  <div>
+    <el-upload class="upload-demo" ref="upload" action="#"
+               :before-upload="beforeUpload"
+               :on-change="onChange"
+               :on-remove="handleRemove"
+               :multiple="isMultiple"
+               :on-exceed="handleExceed"
+               :accept="acceptType"
+               :file-list="fileList"
+               :auto-upload="true"
+               :http-request="uploadFile"
+               show-file-list>
+      <el-button slot="trigger" size="small" type="primary" @click="isFolder = false">选取文件</el-button>
+      <el-button size="small" type="primary" @click="handleUploadFile" >
+        上传文件夹
+      </el-button>
+      <!--    上传-->
+      <input v-show="false" ref="fileRef" id="fileFolder" type="file" @change="handleFolderUpload" webkitdirectory
+             multiple="multiple" />
+
+<!--      <input v-show="false" type="file" ref="fileRef" webkitdirectory @change="handleFolderUpload">
+      <el-button slot="trigger" size="small" type="primary">选取文件夹</el-button>-->
+    </el-upload>
+<!--    <div slot="tip" class="el-upload__tip" >只能上传{{acceptType}}文件</div>-->
+    <div v-show="progressFlag" class="head-img">
+      <el-progress :text-inside="true" :stroke-width="14" :percentage="progressPercent" status="success"></el-progress>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import {
+  getToken
+} from "@/utils/auth";
+import JSZip from 'jszip'
+
+export default {
+  props: {
+    uploadUrl: {
+      type: String,
+      required: false
+    },
+    // 是否多选
+    isMultiple: {
+      type: Boolean,
+      default() {
+        return false
+      },
+      required: false
+    },
+    // 文件类型
+    type: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: false
+    },
+    //上传类型
+    acceptType: {
+      type: String,
+      required: false
+    },
+    // 上传数量
+    limit: {
+      type: Number,
+      default() {
+        return 1
+      },
+      required: false
+    },
+    // 文件
+    dataFile: {
+      type: [Object, Array, String],
+      default() {
+        return ''
+      },
+      required: false
+    },
+    isDetail: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data() {
+    return {
+      fileList: [],
+      progress: 0,
+      isUploading: false,
+      progressFlag: false, //进度条初始值隐藏
+      progressPercent: 0, //进度条初始值
+      partSize: 5 * 1024 * 1024,
+      fileDetailName: null,
+      uploadedNum: 0,
+      _shardCount: null, //是否最后一片
+      isFolder: false,
+    };
+  },
+  watch: {
+    dataFile: {
+      handler(newValue, oldValue) {
+        if (newValue && newValue.length > 0) {
+          this.fileList = Array.isArray(newValue) ? newValue : [newValue]
+          this.fileDetailName = this.fileList[0].name
+        } else {
+          this.fileList = []
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    // 上传前
+    beforeUpload(file) {
+      /* const fileType = file.type.toLowerCase()
+       console.info("fileType=======", fileType)
+       const typeFlag = this.type.some(item => {
+         return fileType.indexOf(item) != -1
+       })
+       if (!typeFlag) {
+         this.$message.error('上传类型有误，请重新上传')
+         return false
+       }*/
+    },
+    //文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
+    onChange(file, fileList) {
+      this.fileList = fileList;
+    },
+    handleRemove(file, fileList) {
+      this.fileList = fileList;
+    },
+    handleExceed(files, fileList) {
+      /* this.$message.warning(
+        "最多之能上传"+ this.limit +"个附件"
+      ); */
+    },
+    async uploadFile({ data, file }) {
+      let self = this
+      //初始化参数
+      if (file.size < this.partSize) {
+        let formData = new FormData()
+        formData.append("file", file)
+        self.progressFlag = true;
+        axios({
+          url: self.uploadUrl,
+          method: 'post',
+          data: formData,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+          onUploadProgress: progressEvent => {
+            // progressEvent.loaded:已上传文件大小
+            // progressEvent.total:被上传文件的总大小
+            //进度条
+            self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
+          }
+        }).then(res => {
+          console.info("11111111uploadFile1111111")
+          setTimeout(() => {
+            if (res.data.code == 200) {
+              setTimeout(function () {
+                //文件夹上传
+                if(self.isFolder){
+                  self.fileList.push(file)
+                }
+                self.$message({
+                  message: '上传成功！',
+                  type: 'success',
+                  duration: '2000'
+                });
+                self.progressFlag = false;
+                self.progressPercent = 0
+                self.handleResult(res,file);
+              }, 500);
+            } else {
+              console.info("11111上传失败11111", error)
+              self.progressFlag = false;
+              self.$message({
+                message: '上传失败！',
+                type: 'error',
+                duration: '2000'
+              });
+            }
+          }, 1000);
+
+        }).catch(error => {
+          console.info("1111111uploadFile1uploadFile1111111", error)
+          console.error(error)
+          self.progressFlag = false;
+          self.progressPercent = 0
+          self.$refs.upload.clearFiles();
+          self.$message({
+            message: '上传失败！',
+            type: 'error',
+            duration: '2000'
+          });
+        })
+      } else {
+        self.uploadedNum = 0
+        file._shardCount = Math.ceil(file.size / this.partSize) //总片数
+        file.uploaded = 0
+        let formData = new FormData()
+        formData.append('fileName', file.name)
+        //大文件上传初始化,返回uploadId  initUpload(formData)
+        axios({
+          url: process.env.VUE_APP_BASE_API + "/common/initUpload",
+          method: 'post',
+          data: formData,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+        }).then(function (res) {
+          console.info("222222222upload222")
+          if (res.status == 200) {
+            //从第0块开始上传
+            file.uploadId = res.data.uploadId
+            file.objectKey = res.data
+            file.chunkId = 0
+            self.uploadByChunk(file)
+          } else {
+            this.progress--
+            self.$message.error(res.msg)
+          }
+        }).catch(error => {
+          self.progressPercent = 0
+          self.progressFlag = false;
+          console.error(error)
+        })
+      }
+
+    },
+    //分片上传大文件
+    uploadByChunk(file) {
+      this._start = file.chunkId * this.partSize
+      this._end = Math.min(file.size, this._start + this.partSize)//结束时总大小，和 开始的大小+之前的大小比较
+
+      let self = this
+      let fileData = file.slice(this._start, this._end)
+      //获取文件块MD5
+      let reader = new FileReader()
+      reader.readAsBinaryString(fileData)
+      let form1 = new FormData()//new一个form的实例，可以进行键值对的添加，
+      form1.append('chunkFile', fileData) //slice方法用于切出文件的一部分
+      form1.append('uploadId', file.uploadId)
+      form1.append('chunkId', (file.chunkId + 1).toString())
+      form1.append('shardCount', file._shardCount.toString()) //是否最后一片
+      self.progressFlag = true;
+      //上传大文件的Chunk 返回chunk的MD5 uploadChunk(form1)
+      axios({
+        url: process.env.VUE_APP_BASE_API + "/common/uploadChunk",
+        method: 'post',
+        data: form1,
+        headers: {
+          'Authorization': 'Bearer ' + getToken(),
+          'Content-Type': 'multipart/form-data'
+        },
+
+      }).then(response => {
+        if (response.status == 200) {
+          //判断返回的MD5值是否一致，一致继续传下一块，否则重传本块（这里目前前后端MD5一直不一致，暂时先注释掉，有时间了我再研究一下）
+          // self.md5Str[index] === response.msg ||
+          if (true) {
+            // this.$message.success('第' + (index + 1).toString() + '块文件上传成功')
+            self.uploadedNum++
+            let percent = Math.floor((self.uploadedNum / file._shardCount) * 100)
+            self.percentageSend(file, percent)
+            //如果没上传完成，继续上传一下块
+            file.chunkId++
+            if (file.chunkId < file._shardCount) {
+              this.uploadByChunk(file)
+            }
+          } else {
+            //不一致，重新传本块
+            this.$message.success('第' + (file.chunkId + 1).toString() + '块文件上传不成功，重新上传')
+            this.uploadByChunk(file.chunkId)
+          }
+        } else {
+          //出错，跳出循环显示错误
+          this.progress--
+          this.$message.error(response.msg)
+        }
+      })
+    },
+    //接收上传的百分值回调
+    percentageSend(file, perNum) {
+      let self = this
+      self.progressPercent = perNum
+      //如果上传完成，合并文件
+      if (perNum === 100) {
+        let form2 = new FormData()//new一个form的实例，可以进行键值对的添加，
+        form2.append('uploadId', file.uploadId)
+        form2.append('fileName', file.name)
+        // 大文件上传完成后合并
+        // 返回文件访问的URL
+        axios({
+          url: process.env.VUE_APP_BASE_API + "/common/mergeFile",
+          method: 'post',
+          data: form2,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+        }).then(res => {
+          if (res.status == 200) {
+            setTimeout(function () {
+              self.$message({
+                message: '上传成功！',
+                type: 'success',
+                duration: '2000'
+              });
+              self.progressFlag = false;
+              self.progressPercent = 0
+              self.handleResult(res,file);
+            }, 500);
+            //文件夹上传
+            if(self.isFolder){
+              self.fileList.push(file)
+            }
+          } else {
+            self.progressFlag = false;
+            self.$message({
+              message: '上传失败！',
+              type: 'error',
+              duration: '2000'
+            });
+          }
+        })
+      }
+    },
+    resetData() {
+      this.progress = 0;
+    },
+    handleResult(res, file) {
+      let self = this
+      const data = {
+        fileName: file.name,
+        fileSize: file.size,
+        fileUrl: res.data.filePath,
+        filePath: res.data.filePath,
+        fileOldName: res.data.originalFilename,
+        fileNewName: res.data.newFileName,
+        suffixType: res.data.suffixType
+      }
+      self.$emit("handleSuccess", data)
+      self.clearFile()
+    },
+    /** 清空文件 **/
+    clearFile(){
+      this.progressFlag = false;
+      if(this.$refs.upload){
+        this.$refs.upload.clearFiles();
+      }
+
+      this.fileList = []
+    },
+    handleUploadFile() {
+      document.getElementById("fileFolder").value = null;
+      this.$refs.fileRef.dispatchEvent(new MouseEvent("click"));
+    },
+    async handleFolderUpload(event) {
+      let self = this;
+      self.isFolder = true
+      const files = event.target.files;
+      self.fileslength = files.length;
+      let filesper = Math.floor( 100 / files.length * 100)/100;
+      self.progressShow = true;
+      if (self.fileslength == 0) {
+        self.progressShow = false;
+        self.$modal.msg("上传完成0个，未完成0个");
+      }
+
+      for (const file of files) {
+        let temp = {
+          "data": null,
+          "file": file
+        }
+        await self.uploadFile(temp);
+      }
+    /*   console.info("files=========", files)
+      let fileListTemp = []
+      for(let item of files){
+        fileListTemp.push(item);
+      }
+      self.fileList = fileListTemp; */
+     /*  files.for()
+      self.onChange(null, files); */
+      // self.fileList = files;
+      // this.$refs.fileRef.value = null;
+    },
+  }
+};
+</script>
diff --git a/src/components/tool-selector/index.vue b/src/components/tool-selector/index.vue
index 65b9c9a..fc87c17 100644
--- a/src/components/tool-selector/index.vue
+++ b/src/components/tool-selector/index.vue
@@ -4,7 +4,9 @@
     :visible.sync="visible"
     :close-on-click-modal="false"
     width="80%"
-    append-to-body>
+    append-to-body
+    :show-close="false"
+  >
     <div class="el-card__body">
       <el-form :model="queryParams" ref="queryForm"  v-show="showSearch" label-width="68px" :inline="true">
         <el-form-item label="工具编号" prop="toolCode">
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index fbc174b..ed37fd8 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -230,7 +230,7 @@
       <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
     </el-dialog>
 
-    <el-drawer :visible.sync="open" :modal-append-to-body="false" size="75%">
+    <el-drawer :visible.sync="open" :modal-append-to-body="false" size="75%" :show-close="false">
       <template #title>
         <span class="title">{{docTitle}}</span>
         <div class="drawer-head-btn" v-if="docDetailDisable">
@@ -524,6 +524,10 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const docIds = row.docId || this.ids;
+      if(docIds == null || docIds == undefined || docIds =='' || docIds.length < 0){
+        this.$modal.msgError(`最少选择一条数据`);
+        return;
+      }
       this.$modal.confirm('是否确认删除？').then(function() {
         return delDocument(docIds);
       }).then(() => {
@@ -611,9 +615,13 @@ export default {
         self.loadingDownload = false
       },1000)
     },
-    /** 删除按钮操作 */
+    /** 发布操作 */
     handlePush(row) {
       const docIds = row.docId || this.ids;
+      if(docIds == null || docIds == undefined || docIds =='' || docIds.length < 0){
+        this.$modal.msgError(`最少选择一条数据`);
+        return;
+      }
       this.$modal.confirm('是否确认发布？').then(function() {
         return pushDoc(docIds);
       }).then(() => {
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
index 3a6f664..182ff9f 100644
--- a/src/views/tool/downloadFileDetail.vue
+++ b/src/views/tool/downloadFileDetail.vue
@@ -3,23 +3,11 @@
     <div class="fl">
       <el-tabs v-model="detailActiveName">
         <el-tab-pane label="文件信息" name="first">
-          <el-table :data="docList" style="width: 100%">
-            <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
-            <el-table-column label="归属单位" align="center" prop="docRespDeptName" :show-overflow-tooltip="true" width="80" />
-            <el-table-column label="来源" prop="docSource" width="100" >
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
-              </template>
-            </el-table-column>
+          <el-table :data="attachmentList" style="width: 100%">
+            <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
+                <span>{{ parseTime(scope.row.createDate) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="180" v-if="toolDetail.downloadStatus">
@@ -54,6 +42,7 @@
   import editDocument from "../document/editDocument";
   import { Base64 } from 'js-base64';
   import iFrame from "@/components/iFrame/index"
+  import { listAttachment } from "@/api/attachment/attachment";
 
   export default {
     name: 'toolDetail',
@@ -68,7 +57,7 @@
     data(){
       return{
         detailActiveName: 'first',
-        docList: [],
+        attachmentList: [],
         queryParams: {
           pageNum: 1,
           pageSize: 10,
@@ -91,7 +80,7 @@
       }
     },
     created(){
-      this.getDocList()
+      this.getAttachmentList()
       this.getDiscussionsList()
     },
     watch: {
@@ -101,11 +90,12 @@
       }
     },
     methods:{
-      getDocList() {
+      getAttachmentList() {
         this.loading = true;
-        this.queryParams.toolId = this.toolDetail.toolId
-        listDocument(this.queryParams).then(response => {
-            this.docList = response.rows;
+        this.$set(this.queryParams,'del',"0")
+        this.$set(this.queryParams,'businessId',this.toolDetail.toolId)
+        listAttachment(this.queryParams).then(response => {
+            this.attachmentList = response.rows;
             this.total = response.total;
             this.loading = false;
           }
@@ -116,7 +106,7 @@
       },
       editDocumentSubmit(){
         this.open = false
-        this.getDocList()
+        this.getAttachmentList()
       },
       handlePriew(row){
         this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
@@ -139,12 +129,15 @@
       handleDownload(row){
         let self = this
         self.loadingDownload = true
-        this.$download.resource(row.docUrl);
+        this.$download.resource(row.fileUrl);
 
         //保存下载记录
-        if(this.toolDetail.toolId){
+        if(row.businessId){
           let formData = {
-            toolId: this.toolDetail.toolId
+            'businessId': row.businessId,
+            'businessType': 'tool',
+            'attId': row.id,
+            'attName': row.fileOldName
           }
           addCount(formData).then(res => {
           });
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 8c2547a..8f14b3c 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -614,6 +614,7 @@ export default {
     handleDelete(list){
       let _this = this
       if (!list||list.length<1) {
+        this.$modal.msgError(`最少选择一条数据`);
         return
       }
       _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 0afc8f6..7f7dbc0 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -30,9 +30,9 @@
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
         <el-tab-pane label="关联文件" name="second">
-          <el-table :data="docList" style="width: 100%">
-            <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
+          <el-table :data="attachmentList" style="width: 100%">
+            <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
+<!--            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
               </template>
@@ -43,10 +43,10 @@
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
+                <span>{{ parseTime(scope.row.createDate) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="180" v-if="detailData.downloadStatus">
@@ -55,7 +55,8 @@
                   size="mini"
                   type="text"
                   icon="el-icon-view"
-                  @click="handlePriew(scope.row)"
+                  v-if="previewAuth(scope.row)"
+                  @click="handlePreview(scope.row)"
                 >预览</el-button>
                 <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
               </template>
@@ -121,7 +122,7 @@
     </el-dialog>
 
     <!-- 上传 -->
-    <AddDoc :show.sync="open" :toolId="detailData.toolId" @callback="getDocList"/>
+    <AddDoc :show.sync="open" :toolId="detailData.toolId" @callback="getAttachmentList"/>
   </div><!--fbox1 左右分栏-->
 </template>
 
@@ -135,6 +136,8 @@
   import editDocument from "../document/editDocument";
   import { Base64 } from 'js-base64';
   import iFrame from "@/components/iFrame/index"
+  import { addCount } from "@/api/tool/downloadCount";
+  import { listAttachment } from "@/api/attachment/attachment";
 
   export default {
     name: 'toolDetail',
@@ -150,7 +153,7 @@
     data(){
       return{
         detailActiveName: 'first',
-        docList: [],
+        attachmentList: [],
         queryParams: {
           pageNum: 1,
           pageSize: 10,
@@ -172,12 +175,13 @@
         replyContent: [],
         detailLoading: false,
         //详细数据
-        detailData:{}
+        detailData:{},
+        attFileType: "zip,rar,7z",
       }
     },
     created(){
       this.getDetail()
-      this.getDocList()
+      this.getAttachmentList()
       this.getDiscussionsList()
     },
     watch: {
@@ -187,11 +191,12 @@
       }
     },
     methods:{
-      getDocList() {
+      getAttachmentList() {
         this.loading = true;
-        this.queryParams.toolId = this.toolDetail.toolId
-        listDocument(this.queryParams).then(response => {
-            this.docList = response.rows;
+        this.$set(this.queryParams,'del',"0")
+        this.$set(this.queryParams,'businessId',this.toolDetail.toolId)
+        listAttachment(this.queryParams).then(response => {
+            this.attachmentList = response.rows;
             this.total = response.total;
             this.loading = false;
           }
@@ -202,9 +207,9 @@
       },
       editDocumentSubmit(){
         this.open = false
-        this.getDocList()
+        this.getAttachmentList()
       },
-      handlePriew(row){
+      handlePreview(row){
         this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
         this.viewDialogTitle = '文档在线预览'
         this.viewDialogOpen = true;
@@ -225,7 +230,20 @@
       handleDownload(row){
         let self = this
         self.loadingDownload = true
-        this.$download.resource(row.docUrl);
+        this.$download.resource(row.fileUrl);
+
+        //保存下载记录
+        if(row.businessId){
+          let formData = {
+            'businessId': row.businessId,
+            'businessType': 'tool',
+            'attId': row.id,
+            'attName': row.fileOldName
+          }
+          addCount(formData).then(res => {
+          });
+        }
+
         setTimeout(()=>{
           self.loadingDownload = false
         },1000)
@@ -391,7 +409,25 @@
         }).finally(()=>{
           self.detailLoading = false
         });
-      }
+      },
+      previewAuth(row){
+        if(row.fileUrl == null || row.fileUrl == '' || row.fileUrl == undefined){
+          return false
+        }
+        let extension = this.getExtension(row.fileUrl);
+        const acceptedExtensions = this.attFileType.toLowerCase().split(',');
+        if(acceptedExtensions.includes(extension)){
+          return false
+        }
+        return true
+      },
+      getExtension(filePath) {
+        // 分割字符串，以 '.' 为分隔符
+        const parts = filePath.split('.');
+        // 取最后一个部分作为后缀名
+        const extension = parts.pop();
+        return extension;
+      },
     }
   }
 </script>
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index d9b3814..21b703c 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -72,6 +72,25 @@
               </el-form-item>
             </el-col>
           </el-row>
+<!--          <el-row>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="toolPrincipals">
+              <el-input v-if="editStatus" v-model="form.toolPrincipalsName" placeholder="请选择负责人"
+                        maxlength="11" @focus="toolPrincipalsChoose = true"/>
+              <span v-else>{{form.toolPrincipalsName}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属部门" prop="toolRespDept">
+              <treeselect :disabled="!editStatus" v-model="form.toolRespDept" :options="deptOptions"
+                          :multiple="false"
+                          :disable-branch-nodes="true" noOptionsText="暂无数据"
+                          noChildrenText="没有子选项" noResultsText="没有匹配的结果"
+                          @select="handleSelectNode" placeholder="请选择归属部门" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>-->
           <el-row>
             <el-col :span="12">
               <el-form-item label="工具来源" prop="toolSource">
@@ -205,40 +224,37 @@
     </div>
     <div class="el-form-border">
       <div class="operate">
-        <el-button type="primary" icon="el-icon-upload2" v-if="editStatus" @click="handleDocAdd">上传</el-button>
+<!--        <el-form-item label="文件" required>
+
+        </el-form-item>
+        <el-button type="primary" icon="el-icon-upload2" v-if="editStatus" @click="handleDocAdd">上传</el-button>-->
+        <template v-if="editStatus">
+          <uploadVue
+            :display="editStatus"
+            :uploadUrl="uploadFileUrl"
+            :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
+            :acceptType="acceptType"
+            :isMultiple="true"
+            :dataFile="dataFile"
+            :isDetail="detailBoolean"
+            ref="uploadFile"
+            @handleSuccess="handleUploadSuccess"
+            @handleError="handleUploadError"
+          />
+        </template>
         <!--            <el-button icon="el-icon-delete">删除</el-button>-->
       </div><!--operate 操作按钮-->
-      <el-table :data="docList" style="width: 100%">
+      <el-table :data="attachmentList" style="width: 100%">
         <!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
-        <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
-        <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
-        <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" >
-          <template slot-scope="scope">
-            {{convertDeptName(scope.row)}}
-          </template>
-        </el-table-column>
-        <el-table-column label="来源" prop="docSource" width="100" >
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column label="序号" width="60" type="index"></el-table-column>
+        <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
         <el-table-column label="操作" align="center" width="180">
           <template slot-scope="scope" v-if="scope.row.roleId !== 1">
             <el-button
               size="mini"
               type="text"
               icon="el-icon-view"
-              v-if="isShowOperation(scope.row)"
+              v-if="previewAuth(scope.row)"
               @click="handlePreview(scope.row)"
             >预览</el-button>
             <el-button
@@ -294,6 +310,7 @@
 <script>
 import iFrame from "@/components/iFrame/index"
 import { listDocument,delDocument } from "@/api/document/document";
+import { listAttachment } from "@/api/attachment/attachment";
 import processcode from "@/views/workflowList/processcode/index.vue";
 import {
   workflowprocesskey,
@@ -309,6 +326,9 @@ import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool
 import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 import ToolSelector from '@/components/tool-selector/index.vue'
 import { Base64 } from 'js-base64'
+import uploadVue from '@/components/FileUpload/optimizeToolUpload.vue'
+import { addCount } from "@/api/tool/downloadCount";
+
 // PDF本地文件预览
 export default {
   dicts: ['sys_normal_disable','tool_type', 'tool_source', 'tool_status', 'doc_source','doc_class'],
@@ -318,7 +338,8 @@ export default {
     Treeselect, AddDoc,
     WorkflowLogs,
     processcode,
-    iFrame
+    iFrame,
+    uploadVue
   },
   name: "Borrow_doc",
   props: ['data'],
@@ -339,8 +360,6 @@ export default {
     }
     return {
       toolPrincipalsChoose: false,
-      // 新增时的关联附件
-      docList: [],
       addDocShow: false,
       docQueryParams: {
         pageNum: 1,
@@ -368,7 +387,9 @@ export default {
       userInfo: this.$store.getters.userInfo,
       viewShow: false,
       monitorDrawerVisible:false,
-      form: {},
+      form: {
+        toolRespDept: this.$store.getters.userInfo.deptId
+      },
       rules: {
         toolCode: [
           { required: true, message: "工具编号不能为空", trigger: "blur" },
@@ -383,7 +404,7 @@ export default {
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
         toolRespDept: [
-          { required: true, message: "请选择归属部门", trigger: "change" }
+          { required: true, message: "请选择归属部门", trigger: ['blur','change'] }
         ],
         toolSource: [
           { required: true, message: "请选择工具来源", trigger: "change" }
@@ -427,6 +448,16 @@ export default {
       viewDialogOpen: false,
       previewUrl: '',
       loadingDownload: false,
+      //当前部门
+      curDeptId: null,
+      curDeptName: null,
+
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
+      acceptType: ".txt,.doc,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg,.jpeg",
+      dataFile: [],
+      detailBoolean: false,
+      attachmentList: [],
+      attFileType: "zip,rar,7z",
     };
   },
   computed: {},
@@ -438,6 +469,8 @@ export default {
     },
   },
   mounted() {
+    this.curDeptId = this.$store.getters.userInfo.deptId
+    this.curDeptName = this.$store.getters.userInfo.dept.deptName
     if (this.data) {
       this.init(this.data)
     }
@@ -480,7 +513,7 @@ export default {
       getInfoByBpmcId(procInstId).then(async (res) => {
         let formData = res.data;
         formData.type = _this.form.type
-        // _this.docList = formData.documentList
+        // _this.attachmentList = formData.attachmentList
         formData.association = JSON.parse(res.data.association)
         _this.form = formData
         _this.getDocumentList(res.data.toolId)
@@ -586,7 +619,7 @@ export default {
           formData.association = JSON.stringify(_this.form.association)
           formData.toolRespDept = _this.userInfo.dept.deptId
           if (formData.toolId) {
-            this.$set(formData,'documentList',_this.docList)
+            this.$set(formData,'attachmentList',_this.attachmentList)
             updateTool(formData).then((res) => {
               if (res.code===200) {
                 _this.$message({
@@ -622,7 +655,7 @@ export default {
               review: _this.attributeModelBool('approve'),
             };
             formData.editStatus = _this.editStatus
-            this.$set(formData,'documentList',_this.docList)
+            this.$set(formData,'attachmentList',_this.attachmentList)
             addTool(formData).then((res) => {
               if (res.code===200) {
                 _this.form.toolId = res.data.businessKey;
@@ -768,7 +801,7 @@ export default {
           formData.recordStatus = 'doing'
         }
         formData.editStatus = _this.editStatus
-        this.$set(formData,'documentList',_this.docList)
+        this.$set(formData,'attachmentList',_this.attachmentList)
         addTool(formData).then((res) => {
           if (res.code===200) {
             _this.$message({
@@ -792,7 +825,7 @@ export default {
       });
     },
     handleDelete(row){
-      this.docList.splice(row,1)
+      this.attachmentList.splice(row,1)
     },
     /**
      * 新增上传附件
@@ -805,10 +838,10 @@ export default {
     },
     getDocumentList(toolId) {
       this.loading = true
-      this.docQueryParams.toolId = toolId
-      this.$set(this.docQueryParams,'isDeleted',"0")
-      listDocument(this.docQueryParams).then(res => {
-          this.docList = res.rows;
+      this.$set(this.docQueryParams,'del',"0")
+      this.$set(this.docQueryParams,'businessId',toolId)
+      listAttachment(this.docQueryParams).then(res => {
+          this.attachmentList = res.rows;
           this.total = res.total;
           this.loading = false;
         }
@@ -822,6 +855,8 @@ export default {
     },
     handleSelectNode(node){
       this.$set(this.form,'toolRespDeptName',node.label)
+      this.$set(this.form,'toolRespDept',node.id)
+      this.$refs.eForm.validateField('toolRespDept');
     },
     toolSelect(){
       this.$refs.selectHeadTool.blur();
@@ -842,7 +877,7 @@ export default {
     /** 添加关联附件数据**/
     addFileData(dataInfo){
       let document = JSON.parse(JSON.stringify(dataInfo))
-      this.docList.push(document)
+      this.attachmentList.push(document)
     },
     findDeptInTree(tree, id) {
       for (const node of tree) {
@@ -868,11 +903,29 @@ export default {
     },
     isShowOperation(row){
       let self = this
-      if(row.docId == null || row.docId == undefined || row.docId == ''){
+      if(row.businessId == null || row.businessId == undefined || row.businessId == ''){
         return false
       }
       return true
     },
+    previewAuth(row){
+      if(row.fileUrl == null || row.fileUrl == '' || row.fileUrl == undefined){
+        return false
+      }
+      let extension = this.getExtension(row.fileUrl);
+      const acceptedExtensions = this.attFileType.toLowerCase().split(',');
+      if(acceptedExtensions.includes(extension)){
+        return false
+      }
+      return true
+    },
+    getExtension(filePath) {
+      // 分割字符串，以 '.' 为分隔符
+      const parts = filePath.split('.');
+      // 取最后一个部分作为后缀名
+      const extension = parts.pop();
+      return extension;
+    },
     handlePreview(row){
       this.viewDialogOpen = true;
       this.viewDialogTitle = '文档在线预览'
@@ -887,15 +940,36 @@ export default {
     handleDownload(row){
       let self = this
       self.loadingDownload = true
-      this.$download.resource(row.docUrl);
+      this.$download.resource(row.fileUrl);
+
+      //保存下载记录
+      if(row.businessId){
+        let formData = {
+          'businessId': row.businessId,
+          'businessType': 'tool',
+          'attId': row.id,
+          'attName': row.fileOldName
+        }
+        addCount(formData).then(res => {
+        });
+      }
+
       setTimeout(()=>{
         self.loadingDownload = false
       },1000)
     },
     handleBeforeClose() {
       this.viewDialogOpen = false
-    }
-  },
+    },
+    handleUploadSuccess(res) {
+      this.attachmentList.push(res)
+      // 处理上传成功后的逻辑
+    },
+    handleUploadError(error) {
+      // 处理上传失败后的逻辑
+    },
+
+},
 
 };
 </script>
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index dfec49d..372c412 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -403,8 +403,26 @@ export default {
       this.viewShow = false;
       this.$emit("close")
     },
+    // 提交
+    async saveForm() {
+      let _this = this
+      // 首先页签调整为 信息内容
+      _this.activeName = 'info'
+      if (!_this.procDefKey) {
+        _this.$message.warning("尚未进行流程设置，将无法发起流程！");
+        return;
+      }
+      let dialogVisible = true
+      if (!!_this.$refs["eForm"]) {
+        let valid = await _this.$refs["eForm"].validate()
+        if (!valid) {
+          dialogVisible = false
+        }
+      }
+      _this.tempForm()
+    },
     //不需要验证必填的保存
-    saveForm() {
+    tempForm() {
       let _this = this
       if (!_this.procDefKey) {
         _this.$message.warning("尚未进行流程设置，将无法发起流程！");
-- 
2.35.1.windows.2


From f7f98ee72383f8310cdb5ff630663bf89bcb34a5 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Thu, 5 Sep 2024 21:23:42 +0800
Subject: [PATCH 34/55] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=8B=AC=E7=AB=8B=E5=A4=84=E7=90=86=202=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9A=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=99=84=E4=BB=B6=E7=8B=AC=E7=AB=8B=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  21 +-
 src/api/document/document.js                  |   4 +-
 src/api/tool/tool.js                          |   4 +-
 .../FileUpload/optimizeToolUpload.vue         |   2 +-
 src/components/PreviewUtil/previewUtil.vue    | 232 ++++++++++++
 .../user-selector/src/user-selector.vue       |   9 +-
 src/main.js                                   |  19 +
 src/views/document/downloadFileDetail.vue     | 148 ++++++++
 src/views/document/editDocument.vue           | 340 +++++++++++++-----
 src/views/document/index.vue                  | 160 +++++++--
 src/views/tool/downloadFileDetail.vue         | 224 ++----------
 src/views/tool/index.vue                      | 143 +++++++-
 src/views/tool/toolDetail.vue                 |  36 +-
 .../workflowList/addWorkflow/tool_release.vue |  32 +-
 .../workflowList/addWorkflow/use_apply.vue    |   1 +
 15 files changed, 1014 insertions(+), 361 deletions(-)
 create mode 100644 src/components/PreviewUtil/previewUtil.vue
 create mode 100644 src/views/document/downloadFileDetail.vue

diff --git a/package.json b/package.json
index e59a278..7067494 100644
--- a/package.json
+++ b/package.json
@@ -32,36 +32,42 @@
   ],
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
+    "@vue-office/docx": "1.6.1",
+    "@vue-office/pdf": "1.6.5",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.37.1",
+    "docxtemplater": "3.50.0",
+    "docxtemplater-image-module-free": "1.1.1",
     "echarts": "5.4.0",
     "element-ui": "2.15.14",
+    "file-save": "0.2.0",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
     "js-base64": "^3.7.7",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "jszip": "3.10.1",
+    "jszip-utils": "0.1.0",
     "nprogress": "0.2.0",
+    "pizzip": "3.1.7",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sockjs-client": "^1.6.1",
     "sortablejs": "1.10.2",
+    "v-viewer": "1.6.4",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-demi": "^0.14.10",
     "vue-iframe": "0.0.0",
+    "vue-json-viewer": "2.2.22",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
+    "vue-video-player": "5.0.1",
     "vuex": "3.6.0",
-    "websocket": "^1.0.35",
-    "jszip": "3.10.1",
-    "jszip-utils": "0.1.0",
-    "file-save": "0.2.0",
-    "pizzip": "3.1.7",
-    "docxtemplater": "3.50.0",
-    "docxtemplater-image-module-free": "1.1.1"
+    "websocket": "^1.0.35"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
@@ -80,6 +86,7 @@
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",
+    "@vue/composition-api": "1.7.2",
     "vue-template-compiler": "2.6.12"
   },
   "engines": {
diff --git a/src/api/document/document.js b/src/api/document/document.js
index 65ca21b..5974d65 100644
--- a/src/api/document/document.js
+++ b/src/api/document/document.js
@@ -65,9 +65,9 @@ export function getStatistics(query) {
 
 
 // 查询【请填写功能名称】列表
-export function listAllDoc(query) {
+export function getExportWordList(query) {
   return request({
-    url: '/document/all/list',
+    url: '/document/export/word/list',
     method: 'get',
     params: query
   })
diff --git a/src/api/tool/tool.js b/src/api/tool/tool.js
index 5fde9c7..9cc30f0 100644
--- a/src/api/tool/tool.js
+++ b/src/api/tool/tool.js
@@ -74,7 +74,7 @@ export function getStatistics(query) {
 export function exportWordList(query) {
   return request({
     url: '/tool/export/word/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
index 6429d53..4c51a22 100644
--- a/src/components/FileUpload/optimizeToolUpload.vue
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -339,7 +339,7 @@ export default {
       const data = {
         fileName: file.name,
         fileSize: file.size,
-        fileUrl: res.data.filePath,
+        fileUrl: res.data.url,
         filePath: res.data.filePath,
         fileOldName: res.data.originalFilename,
         fileNewName: res.data.newFileName,
diff --git a/src/components/PreviewUtil/previewUtil.vue b/src/components/PreviewUtil/previewUtil.vue
new file mode 100644
index 0000000..b5a18dc
--- /dev/null
+++ b/src/components/PreviewUtil/previewUtil.vue
@@ -0,0 +1,232 @@
+<template>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="预览文件"
+      :visible.sync="dialogVisible"
+      width="70%"
+      :destroy-on-close="true"
+      :append-to-body="true"
+      :close-on-press-escape="false"
+      @close="handleClose"
+    >
+      <template v-if="isTxt">
+        <!-- 在文本框中预览文件内容 -->
+        <el-input type="textarea" :rows="40" v-model="resultContentObj">
+        </el-input>
+      </template>
+      <template v-if="isDocx">
+        <vue-office-docx
+          :src="docxData"
+          style="height: 100vh;"
+          @rendered="rendered"
+        />
+      </template>
+      <template v-if="isPdf">
+        <vue-office-pdf
+          :src="pdfFileData"
+          style="height: 100vh;"
+          @rendered="renderedHandler"
+          @error="errorHandler"
+        />
+      </template>
+      <template v-if="isVideos">
+        <div class="input_video">
+          <video-player  class="video-player vjs-custom-skin"
+                         ref="videoPlayer"
+                         :playsinline="true"
+                         :options="playerOptions"
+          ></video-player>
+        </div>
+      </template>
+    </el-dialog>
+</template>
+
+<script>
+import axios from 'axios'
+import {
+  getToken
+} from "@/utils/auth";
+import { videoPlayer } from "vue-video-player";
+
+export default {
+  components: { videoPlayer},
+
+  props: {
+    uploadUrl: {
+      type: String,
+      required: false
+    },
+    // 是否多选
+    isMultiple: {
+      type: Boolean,
+      default() {
+        return false
+      },
+      required: false
+    },
+    // 文件类型
+    type: {
+      type: Array,
+      default() {
+        return []
+      },
+      required: false
+    },
+    //上传类型
+    acceptType: {
+      type: String,
+      required: false
+    },
+    // 上传数量
+    limit: {
+      type: Number,
+      default() {
+        return 1
+      },
+      required: false
+    },
+    // 文件
+    dataFile: {
+      type: [Object, Array, String],
+      default() {
+        return ''
+      },
+      required: false
+    },
+    isDetail: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data() {
+    return {
+      // txt
+      dialogVisible:false,
+      isTxt:false,
+      resultContentObj:'',
+      // docx
+      isDocx:false,
+      docxData: null,
+      //pdf文件
+      isPdf:false,
+      pdfFileData: null, // 默认文档类型
+      previewLoading:false,
+      previewUseFront: "txt,doc,docx,pdf",
+      isVideos:false,
+      // 视频播放
+      playerOptions : {
+        playbackRates : [ 0.5, 1.0, 1.5, 2.0 ], //可选择的播放速度
+        autoplay : false, //如果true,浏览器准备好时开始回放。
+        muted : false, // 默认情况下将会消除任何音频。
+        loop : false, // 视频一结束就重新开始。
+        preload : 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
+        language : 'zh-CN',
+        aspectRatio : '16:9', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
+        fluid : true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
+        sources : [],
+        poster : "", //你的封面地址
+        // width: document.documentElement.clientWidth,
+        notSupportedMessage : '此视频暂无法播放，请稍后再试', //允许覆盖Video.js无法播放媒体源时显示的默认信息。
+        controlBar : {
+          timeDivider : true,//当前时间和持续时间的分隔符
+          durationDisplay : true,//显示持续时间
+          remainingTimeDisplay : false,//是否显示剩余时间功能
+          fullscreenToggle : true  //全屏按钮
+        }
+      }
+    };
+  },
+  watch: {
+  },
+  methods: {
+    //前端组件预览
+    frontModulePreview(row){
+      let self = this
+      self.initPreviewData()
+      console.info("row=================", row)
+      self.previewLoading = true
+      if(row.fileName.endsWith(".jpg") || row.fileName.endsWith(".png")){
+        this.$viewerApi({images: [row.fileUrl]})
+        self.previewLoading = false
+        return
+      }
+      if(row.fileName.endsWith(".mp4")){
+        this.playerOptions.sources = [
+          {
+            src: row.fileUrl,
+            type: 'video/mp4'
+          }
+        ]
+        self.dialogVisible = true
+        self.isVideos = true;
+        self.previewLoading = false
+        return
+      }
+
+      axios({
+        method: 'post',
+        url: process.env.VUE_APP_BASE_API + "/common/preview/download",
+        responseType: 'blob',
+        data: {
+          'filePath': row.filePath,
+          'fileOldName': row.fileOldName
+        },
+        headers: { 'Authorization': 'Bearer ' + getToken() }
+      }).then(res => {
+        const content = res.data;
+        if(row.fileName.endsWith(".txt")){
+          self.dialogVisible = true
+          self.previewLoading = false
+          let blob = new Blob([res.data]);
+          blob.text().then(data =>{
+            self.resultContentObj = data;
+            self.isTxt = true;
+            self.previewLoading = false; // 确保在数据处理完成后关闭加载状态
+          })
+          // self.previewLoading = false
+        }else if (row.fileName.endsWith(".docx")) {
+          // renderAsync(response.data, self.$refs.file);
+          self.isDocx = true
+          self.dialogVisible = true; // 打开预览弹窗
+          content.arrayBuffer().then(res=>{
+            self.docxData = res
+          })
+          self.previewLoading = false
+
+        }else if(row.fileName.endsWith(".doc") || row.fileName.endsWith(".pdf")){
+          self.isPdf = true
+          self.dialogVisible = true; // 打开预览弹窗
+          content.arrayBuffer().then(res=>{
+            self.pdfFileData = res
+          })
+          self.previewLoading = false
+        }
+      }).catch(err => {
+        console.info("err===============", err)
+        self.previewLoading = false
+      });
+    },
+    //初始化预览组件
+    initPreviewData(){
+      this.isTxt = false
+      this.isDocx = false
+      this.isPdf = false
+      this.resultcontentObj = ''
+      this.docxData = null
+      this.pdfFileData = null
+    },
+    rendered(){
+      console.log("渲染完成1")
+    },
+    renderedHandler(){
+      console.log("pdf渲染完成2")
+    },
+    errorHandler(){
+      console.log("pdf渲染失败3")
+    },
+    handleClose(){
+      this.$emit("previewClose");
+    }
+  }
+};
+</script>
diff --git a/src/components/user-selector/src/user-selector.vue b/src/components/user-selector/src/user-selector.vue
index dbf3109..208ef3a 100644
--- a/src/components/user-selector/src/user-selector.vue
+++ b/src/components/user-selector/src/user-selector.vue
@@ -6,6 +6,9 @@
       :width="width || '900px'"
       :height="height || '650px'"
       :before-close="handleClose"
+      :show-close="false"
+      :close-on-press-escape="false"
+      :close-on-click-modal="false"
       append-to-body
     >
 
@@ -230,11 +233,7 @@
     },
     methods: {
       handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            this.cancel();
-          })
-          .catch(_ => {});
+        this.cancel();
       },
       handleClick(tab, event) {
         console.log(tab, event);
diff --git a/src/main.js b/src/main.js
index 4a5b32b..f6ac096 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,6 +42,15 @@ import DictData from '@/components/DictData'
 // 图形监控组件
 import MonitorDrawer from "@/components/MonitorDrawer"
 
+//引入VueOfficeDocx组件
+import VueOfficeDocx from '@vue-office/docx'
+//引入相关样式
+import '@vue-office/docx/lib/index.css'
+import VueOfficePdf from '@vue-office/pdf'
+//视频组件
+import 'video.js/dist/video-js.css'
+import 'vue-video-player/src/custom-theme.css'
+
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
@@ -52,6 +61,9 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
+import 'viewerjs/dist/viewer.css'
+import Viewer from 'v-viewer'
+
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
@@ -62,7 +74,14 @@ Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('MonitorDrawer', MonitorDrawer)
+Vue.component('VueOfficeDocx', VueOfficeDocx)
+Vue.component('VueOfficePdf', VueOfficePdf)
 
+Vue.use(Viewer, {
+  defaultOptions: {
+    zIndex: 9999
+  }
+})
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
diff --git a/src/views/document/downloadFileDetail.vue b/src/views/document/downloadFileDetail.vue
new file mode 100644
index 0000000..63027ba
--- /dev/null
+++ b/src/views/document/downloadFileDetail.vue
@@ -0,0 +1,148 @@
+<template>
+  <div class="fbox1">
+    <div class="fl">
+      <el-tabs v-model="detailActiveName">
+        <el-tab-pane label="附件信息" name="first">
+          <el-table :data="attachmentList" style="width: 100%">
+            <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createDate) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="180" v-if="docDetail.downloadStatus">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-view"
+                  @click="handlePreview(scope.row)"
+                >预览</el-button>
+                <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+              </template>
+            </el-table-column>
+          </el-table><!--el-table-->
+        </el-tab-pane><!--el-tab-pane-->
+      </el-tabs><!--el-tabs-->
+    </div><!--fl 左侧页签-->
+
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+
+  </div><!--fbox1 左右分栏-->
+</template>
+
+<script>
+  import { listAttachment } from "@/api/attachment/attachment";
+  import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
+  import { addCount } from "@/api/tool/downloadCount";
+
+  export default {
+    name: 'docDetailFile',
+    components: { previewUtil},
+    dicts:[],
+    props: {
+      docDetail: {
+        type: Object,
+        default: {},
+      }
+    },
+    data(){
+      return{
+        detailActiveName: 'first',
+        attachmentList: [],
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          docId: ''
+        },
+        previewUrl: '',
+        viewDialogTitle: "",
+        viewDialogOpen: false,
+        open: false,
+        loadingDownload: false,
+        discussionContent: null, // 评论内容
+        repliesContent: null, // 回复内容
+        // 评论列表
+        discussionsList: [],
+        // 回复列表
+        repliesList: [],
+        showReplyForm: [],
+        replyContent: [],
+        isPreviewDisable: false,
+        attFileType: "zip,rar,7z",
+      }
+    },
+    created(){
+      this.getAttachmentList()
+    },
+    methods:{
+      getAttachmentList() {
+        this.loading = true;
+        this.$set(this.queryParams,'del',"0")
+        this.$set(this.queryParams,'businessId',this.docDetail.docId)
+        listAttachment(this.queryParams).then(response => {
+            this.attachmentList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }
+        );
+      },
+      handlePreview(row){
+        this.isPreviewDisable = true
+        this.$nextTick(() => {
+          this.$refs.previewForm.frontModulePreview(row)
+        })
+      },
+      /** 关闭预览 **/
+      previewClose(){
+        this.isPreviewDisable = false
+      },
+      previewAuth(row){
+        if(row.fileUrl == null || row.fileUrl == '' || row.fileUrl == undefined){
+          return false
+        }
+        let extension = this.getExtension(row.fileUrl);
+        const acceptedExtensions = this.attFileType.toLowerCase().split(',');
+        if(acceptedExtensions.includes(extension)){
+          return false
+        }
+        return true
+      },
+      getExtension(filePath) {
+        // 分割字符串，以 '.' 为分隔符
+        const parts = filePath.split('.');
+        // 取最后一个部分作为后缀名
+        const extension = parts.pop();
+        return extension;
+      },
+      /**
+       * 处理下载
+       * **/
+      handleDownload(row){
+        let self = this
+        self.loadingDownload = true
+        this.$download.resource(row.fileUrl);
+
+        //保存下载记录
+        if(row.businessId){
+          let formData = {
+            'businessId': row.businessId,
+            'businessType': 'doc',
+            'attId': row.id,
+            'attName': row.fileOldName
+          }
+          addCount(formData).then(res => {
+          });
+        }
+
+        setTimeout(()=>{
+          self.loadingDownload = false
+        },1000)
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index 0860683..bb9c9c8 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -57,7 +57,23 @@
     <!--            <el-input v-model="form.docSource" placeholder="请输入文档来源" maxlength="50" show-word-limit/>-->
               </el-form-item>
             </el-col>
-            <el-col :span="24" v-if="relatedTool">
+            <el-col :span="24">
+              <el-form-item label="负责人" prop="docPrincipals">
+                <template v-if="detailBoolean">{{form.docPrincipalsName}}</template>
+                <template v-else>
+                  <el-input v-model="form.docPrincipalsName" placeholder="请选择负责人" maxlength="11" @focus="toolPrincipalsChoose = true"/>
+                  <!--                  <el-input v-model="form.docPrincipals" placeholder="请输入负责人" maxlength="50" show-word-limit/>-->
+                </template>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="归属单位" prop="docRespDept">
+                {{userInfo.dept.deptName}}
+                <!--                <treeselect v-model="form.docRespDept" :options="deptOptions" :show-count="true"
+                                            :disabled="detailBoolean" placeholder="请输入归属单位"/>-->
+              </el-form-item>
+            </el-col>
+<!--            <el-col :span="24" v-if="relatedTool">
               <el-form-item label="关联工具" prop="toolId">
                 <el-select
                   v-model="toolDataInfo"
@@ -78,22 +94,9 @@
                 </el-select>
               </el-form-item>
 
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="负责人" prop="docPrincipals">
-                <template v-if="detailBoolean">{{form.docPrincipals}}</template>
-                <template v-else>
-                  <el-input v-model="form.docPrincipals" placeholder="请输入负责人" maxlength="50" show-word-limit/>
-                </template>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="归属单位" prop="docRespDept">
-                <treeselect v-model="form.docRespDept" :options="deptOptions" :show-count="true"
-                            :disabled="detailBoolean" placeholder="请输入归属单位"/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
+            </el-col>-->
+
+<!--            <el-col :span="24">
               <el-form-item label="文件" required>
                 <uploadVue
                   :display="editStatus"
@@ -108,7 +111,7 @@
                   @handleError="handleUploadError"
                 />
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col :span="24">
               <el-form-item label="备注" prop="remark">
                 <template v-if="detailBoolean">{{form.remark}}</template>
@@ -120,6 +123,58 @@
           </el-row>
         </el-form><!--el-form-->
       </div>
+
+      <div class="divide double"></div><!--divide 分隔-->
+      <div class="tboper">
+        <div class="tit">关联附件</div>
+      </div>
+      <div class="el-form-border">
+        <div class="operate">
+          <!--        <el-form-item label="文件" required>
+
+                  </el-form-item>
+                  <el-button type="primary" icon="el-icon-upload2" v-if="editStatus" @click="handleDocAdd">上传</el-button>-->
+          <template v-if="editStatus && !detailBoolean">
+            <uploadVue
+              :display="editStatus"
+              :uploadUrl="uploadFileUrl"
+              :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
+              :acceptType="acceptType"
+              :isMultiple="true"
+              :dataFile="dataFile"
+              :isDetail="detailBoolean"
+              ref="uploadFile"
+              @handleSuccess="handleUploadSuccess"
+              @handleError="handleUploadError"
+            />
+          </template>
+          <!--            <el-button icon="el-icon-delete">删除</el-button>-->
+        </div><!--operate 操作按钮-->
+        <el-table :data="attachmentList" style="width: 100%">
+          <!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
+          <el-table-column label="序号" width="60" type="index"></el-table-column>
+          <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
+          <el-table-column label="操作" align="center" width="180">
+            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-view"
+                v-if="previewAuth(scope.row)"
+                @click="handlePreview(scope.row)"
+              >预览</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                v-if="editStatus && !detailBoolean"
+                @click="handleDelete(scope.row)"
+              >删除</el-button>
+              <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+            </template>
+          </el-table-column>
+        </el-table><!--el-table-->
+      </div>
     </div><!--fl 左侧页签-->
 
     <div class="fr" v-if="detailBoolean">
@@ -174,27 +229,33 @@
         </template>
       </div>
     </div>
+
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+
     <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
+    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" :deptFilter="true" @cancel="toolPrincipalsChoose=false" @submit="submitPeople"></bl-user-selector>
 
   </div><!--el-form-border 表单-->
 </template>
 
 <script>
   import { addDocument, updateDocument, getDocument } from "@/api/document/document";
-  import axios from 'axios';
-  import { getToken } from '@/utils/auth'
   import { deptTreeSelect } from "@/api/system/user";
   import { documentTree } from "@/api/documentCategory/documentCategory.js";
   import Treeselect from "@riophae/vue-treeselect";
   import uploadProgress from "./uploadProgress";
-  import uploadVue from '@/components/FileUpload/optimizeUpload.vue'
+  import uploadVue from '@/components/FileUpload/optimizeToolUpload.vue'
   import ToolSelector from '@/components/tool-selector/index.vue'
   import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
   import { listReplies, addReplies} from "@/api/tool/replies.js";
+  import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
+  import blUserSelector from '@/components/user-selector/src/user-selector.vue'
+  import { listAttachment } from "@/api/attachment/attachment";
+  import { addCount } from "@/api/tool/downloadCount";
 
   export default {
     name: 'editDocument',
-    components: { Treeselect, uploadProgress, uploadVue, ToolSelector},
+    components: { Treeselect, uploadProgress, uploadVue, ToolSelector, previewUtil, blUserSelector},
     dicts:['doc_class','doc_source'],
     props: {
       tooId: {
@@ -235,11 +296,12 @@
           docCode: '',
           docName: '',
           docType: '',
-          docPrincipals: '',
-          docRespDept: undefined,
+          docPrincipals: null,
+          docPrincipalsName: null,
+          docRespDept: this.$store.getters.userInfo.deptId,
           docSource: '',
           toolId: '',
-          remark: undefined
+          remark: undefined,
         },
         fileList: [],
         progress: 0,
@@ -259,7 +321,13 @@
           ],
           docSource: [
             { required: true, message: "文档来源不能为空", trigger: "blur" }
-          ]
+          ],
+          docPrincipals: [
+            { required: true, message: "负责人不能为空", trigger: ['change','blur']  }
+          ],
+          docRespDept: [
+            { required: true, message: "请选择归属部门", trigger: ['blur','change'] }
+          ],
         },
         docCategory:[],
         deptOptions:[],
@@ -281,6 +349,17 @@
         showReplyForm: [],
         replyContent: [],
         detailLoading: false,
+        attachmentList: [],
+        attFileType: "zip,rar,7z",
+        isPreviewDisable: false,
+        loadingDownload: false,
+        userInfo: this.$store.getters.userInfo,
+        toolPrincipalsChoose: false,
+        docQueryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+
       }
     },
     created(){
@@ -336,47 +415,61 @@
       },
       /** 提交按钮 */
       submitForm: function() {
+        let self = this
         let fileName = []
         //编辑时走该逻辑
-        if(this.form.docId && (this.fileList == null || this.fileList.length <= 0 )){
-          fileName = this.$refs.uploadFile.fileList[0]
-          this.fileList = this.$refs.uploadFile.fileList
+       /*  if(self.form.docId && (self.fileList == null || self.fileList.length <= 0 )){
+          fileName = self.$refs.uploadFile.fileList[0]
+          self.fileList = self.$refs.uploadFile.fileList
         }else{
-          fileName = this.fileList[0]
-          this.fileList = this.fileList
-        }
+          fileName = self.fileList[0]
+          self.fileList = self.fileList
+        } */
         //判断是否有文件再上传
-        if (this.fileList.length == 0) {
-          return this.$message.warning('请选取文件后再上传')
+        if (self.attachmentList.length <= 0) {
+          return self.$message.warning('最少上传一个附件')
         }
         /*this.fileList.map(file =>{
           this.form.docName = file.name
         })*/
-        if(fileName){
-          this.$set(this.form,"docUrl", fileName.filePath)
-          this.$set(this.form,"docStatus", "ysc")
-          this.$set(this.form,"attachment", fileName)
-        }
-        if(this.toolDataInfo && this.toolDataInfo.length > 0){
-          this.$set(this.form,"toolId", this.toolDataInfo[0].toolId)
+        /* if(fileName){
+          self.$set(self.form,"docUrl", fileName.filePath)
+          self.$set(self.form,"docStatus", "ysc")
+        } */
+        self.$set(self.form,"docStatus", "ysc")
+        if(self.toolDataInfo && self.toolDataInfo.length > 0){
+          self.$set(self.form,"toolId", self.toolDataInfo[0].toolId)
         }
+        self.$set(self.form,'attachmentList',self.attachmentList)
 
-        this.$refs["form"].validate(valid => {
+
+        self.$refs["form"].validate(valid => {
           if (valid) {
-            if (this.form.docId) {
-              updateDocument(this.form).then(res => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.$emit("submit");
-              });
-            } else {
-              addDocument(this.form).then(res => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                // this.confirmSubmit(response.data);
-                this.$emit("submit");
-              });
+            let tipName = '';
+            if (self.form.docId){
+              tipName = '更新'
+            }else{
+              tipName = '保存'
             }
+            this.$modal.confirm('是否确认' + tipName+  '？').then(() => {
+              if (self.form.docId) {
+                updateDocument(self.form).then(res => {
+                  self.$modal.msgSuccess("修改成功");
+                  self.open = false;
+                  self.$emit("submit");
+                });
+              } else {
+                addDocument(self.form).then(res => {
+                  self.$modal.msgSuccess("新增成功");
+                  self.open = false;
+                  // self.confirmSubmit(response.data);
+                  self.$emit("submit");
+                });
+              }
+            }).catch((err) => {
+              console.error(err)
+            });
+
           }
         });
       },
@@ -442,14 +535,6 @@
       getError(message) {
         this.$message.error(message);
       },
-      handleUploadSuccess(res) {
-        this.fileList = []
-        this.fileList.push(res)
-        // 处理上传成功后的逻辑
-      },
-      handleUploadError(error) {
-        // 处理上传失败后的逻辑
-      },
       toolSelect(){
         this.$refs.selectHeadTool.blur();
         this.$nextTick(()=>{
@@ -463,23 +548,32 @@
       },
       /**初始化 **/
       resetForm() {
+        let self = this
+        self.form.docPrincipalsName = null
         this.$refs.form.resetFields();
         this.toolDataInfo = []
         this.fileList = []
+        this.attachmentList = []
         this.detailBoolean = false
+        this.setAllRequiredTrue(true)
         this.$nextTick(()=>{
-          this.$refs.uploadFile.clearFile();
+          if(self.$refs.uploadFile){
+            self.$refs.uploadFile.clearFile();
+          }
         })
       },
       editInit(docId, type){
         let self = this
         if(type == "detail"){
           this.detailBoolean = true
+          self.setAllRequiredTrue(false)
         }
         self.$refs.form.resetFields();
         self.toolDataInfo = []
         self.$nextTick(()=>{
-          self.$refs.uploadFile.clearFile();
+          if(self.$refs.uploadFile){
+            self.$refs.uploadFile.clearFile();
+          }
 
           getDocument(docId).then(res => {
             self.form = res.data
@@ -488,12 +582,12 @@
             self.toolDataInfo.push(toolInfo)
 
             self.dataFile = []
-            let fileData = res.data.attachment
+           /*  let fileData = res.data.attachment
             self.$set(fileData, "name", fileData.fileOldName)
             self.$set(fileData, "size", fileData.fileSize)
-            self.dataFile.push(fileData)
+            self.dataFile.push(fileData) */
 
-            self.getDiscussionsList()
+            self.getAttachemntList()
           });
         })
       },
@@ -521,7 +615,7 @@
               type:'success',　　//类型是成功
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
-            self.getDiscussionsList()
+            self.getAttachemntList()
           }).catch(err =>{
             this.discussionContent = null
             console.error("handleDiscussions==err==", err)
@@ -529,19 +623,14 @@
           });
         })
       },
-      getDiscussionsList() {
+      getAttachemntList() {
         let self = this
-        listDiscussions({businessId:this.form.docId}).then(res => {
-          self.discussionsList = res.rows
-          self.discussionsList.forEach(item => {
-            if(item.repliesList && item.repliesList.length > 0){
-              self.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
-              self.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
-            }else{
-              self.$set(item, 'showReplyFormSon', false)
-              self.$set(item, 'replyContentSon', '')
-            }
-          });
+        this.$set(this.docQueryParams,'del',"0")
+        this.$set(this.docQueryParams,'businessId',this.form.docId)
+        listAttachment({businessId:this.form.docId}).then(res => {
+          self.attachmentList = res.rows;
+          self.total = res.total;
+          self.loading = false;
         });
       },
       getFirstChar(value) {
@@ -593,7 +682,7 @@
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
             self.cancelReplySon(parentIndex, repIndex)
-            self.getDiscussionsList()
+            self.getAttachemntList()
           }).catch(err =>{
             console.error("submitReplySon==err==", err)
             self.$modal.msgError("发布失败");
@@ -629,7 +718,7 @@
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
             self.cancelReply(index)
-            self.getDiscussionsList()
+            self.getAttachemntList()
           }).catch(err =>{
             console.error("handleDiscussions==err==", err)
             self.$modal.msgError("发布失败");
@@ -640,6 +729,91 @@
         this.replyContent[index] = '';
         this.showReplyForm[index] = false;
       },
+      previewAuth(row){
+        if(row.fileUrl == null || row.fileUrl == '' || row.fileUrl == undefined){
+          return false
+        }
+        let extension = this.getExtension(row.fileUrl);
+        const acceptedExtensions = this.attFileType.toLowerCase().split(',');
+        if(acceptedExtensions.includes(extension)){
+          return false
+        }
+        return true
+      },
+      getExtension(filePath) {
+        // 分割字符串，以 '.' 为分隔符
+        const parts = filePath.split('.');
+        // 取最后一个部分作为后缀名
+        const extension = parts.pop();
+        return extension;
+      },
+      handlePreview(row){
+        this.isPreviewDisable = true
+        this.$nextTick(() => {
+          this.$refs.previewForm.frontModulePreview(row)
+        })
+      },
+      /** 关闭预览 **/
+      previewClose(){
+        this.isPreviewDisable = false
+      },
+      /**
+       * 处理下载
+       * **/
+      handleDownload(row){
+        let self = this
+        self.loadingDownload = true
+        this.$download.resource(row.fileUrl);
+
+        //保存下载记录
+        if(row.businessId){
+          let formData = {
+            'businessId': row.businessId,
+            'businessType': 'doc',
+            'attId': row.id,
+            'attName': row.fileOldName
+          }
+          addCount(formData).then(res => {
+          });
+        }
+
+        setTimeout(()=>{
+          self.loadingDownload = false
+        },1000)
+      },
+      handleDelete(row){
+        this.attachmentList.splice(row,1)
+      },
+      handleBeforeClose() {
+        this.viewDialogOpen = false
+      },
+      handleUploadSuccess(res) {
+        this.attachmentList.push(res)
+        // 处理上传成功后的逻辑
+      },
+      handleUploadError(error) {
+        // 处理上传失败后的逻辑
+      },
+      isShowOperation(row){
+        let self = this
+        if(row.businessId == null || row.businessId == undefined || row.businessId == ''){
+          return false
+        }
+        return true
+      },
+      submitPeople(peopleList){
+        this.$set(this.form,'docPrincipals',peopleList[0]['userId'])
+        this.$set(this.form,'docPrincipalsName',peopleList[0]['nickName'])
+        this.toolPrincipalsChoose = false;
+      },
+      setAllRequiredTrue(value) {
+        Object.keys(this.rules).forEach(key => {
+          this.rules[key].forEach(rule => {
+            rule.required = value;
+          });
+        });
+      }
+
     }
   }
 </script>
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index ed37fd8..46bb70a 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -115,10 +115,12 @@
           <el-button type="primary" icon="el-icon-position" @click="handlePush" v-hasPermi="['document:push']">发布</el-button>
           <el-button icon="el-icon-delete" @click="handleDelete" v-hasPermi="['document:batch:remove']">批量删除</el-button>
           <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['document:export']">导出</el-button>
+          <el-button icon="el-icon-download" @click="handleOpenBatchExport()" v-hasPermi="['document:batch:export']">批量导出</el-button>
+
         </div><!--operate 操作按钮-->
 
         <el-table v-loading="loading" :data="docList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" :selectable="isSelectable"/>
+          <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="文档编号" align="center" prop="docCode" width="120" />
           <el-table-column label="文档名称" align="center" prop="docName" :show-overflow-tooltip="true" />
           <el-table-column label="文档类别" align="center" prop="docType" :show-overflow-tooltip="true" width="80">
@@ -126,14 +128,14 @@
               <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
             </template>
           </el-table-column>·
-          <el-table-column label="负责人" align="center" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
+          <el-table-column label="负责人" align="center" prop="docPrincipalsName" :show-overflow-tooltip="true" width="100" />
           <el-table-column label="归属单位" align="center" prop="docRespDeptName" :show-overflow-tooltip="true" width="80" />
           <el-table-column label="文档来源" align="center" prop="docSource" width="100">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
             </template>
           </el-table-column>
-          <el-table-column label="关联工具" align="center" prop="toolName" width="100" />
+<!--          <el-table-column label="关联工具" align="center" prop="toolName" width="100" />-->
           <el-table-column label="文档状态" align="center" prop="docStatus" width="100" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.doc_upload_status" :value="scope.row.docStatus"/>
@@ -153,14 +155,14 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="180" fixed="right">
             <template slot-scope="scope">
-              <el-button
+<!--              <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-view"
                 v-if="previewAuth(scope.row)"
                 @click="handlePreview(scope.row)"
                 v-hasPermi="['document:preview']"
-              >预览</el-button>
+              >预览</el-button>-->
               <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)"
                          v-if="scope.row.downloadStatus"
                          v-loading="loadingDownload">下载</el-button>
@@ -226,24 +228,27 @@
       </span>
     </el-dialog>
 
-    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
-      <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
-    </el-dialog>
-
-    <el-drawer :visible.sync="open" :modal-append-to-body="false" size="75%" :show-close="false">
+    <el-drawer :visible.sync="open"
+               :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
+               size="75%">
       <template #title>
         <span class="title">{{docTitle}}</span>
         <div class="drawer-head-btn" v-if="docDetailDisable">
-          <el-button type="primary" @click="$refs.editDocumentRef.submitForm()">确 定</el-button>
+          <el-button type="primary" @click="docConfrim()">确 定</el-button>
           <el-button @click="docCancel()">取 消</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
+        <div class="drawer-head-btn" v-else>
+          <el-button @click="docCancel()">关 闭</el-button>
+        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <edit-document ref="editDocumentRef" @submit="editDocumentSubmit"/>
     </el-drawer>
 
 
     <!-- 工具导出对话框 -->
-    <el-dialog title="导出" :visible.sync="exportDrawerOpen"  width="980px" append-to-body>
+    <el-dialog :title="exportTitle" :visible.sync="exportDrawerOpen"
+               :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
+               width="980px" append-to-body>
       <div class="el-form-border">
           <el-form ref="exportFrom" label-width="180px">
             <el-row>
@@ -269,8 +274,7 @@
                   <el-checkbox label="docPrincipals">负责人</el-checkbox>
                   <el-checkbox label="docRespDeptName">归属单位</el-checkbox>
                   <el-checkbox label="docSource">文档来源</el-checkbox>
-                  <el-checkbox label="toolName">关联工具</el-checkbox>
-                  <el-checkbox label="docStatus">上传状态</el-checkbox>
+                  <el-checkbox label="docStatus">文档状态</el-checkbox>
                   <el-checkbox label="createTime">创建时间</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
@@ -284,27 +288,38 @@
       </span>
     </el-dialog>
 
+    <!-- 工具详情对话框 -->
+    <el-drawer :visible.sync="fileDetailDrawerOpen"
+               :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
+               size="80%" class="no-padding" @close="handleFileCloseDetail()">
+      <template #title>
+        <span>文档附件下载</span>
+        <div class="drawer-head-btn">
+          <el-button @click="fileDetailDrawerOpen = false">关 闭</el-button>
+        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
+      </template>
+      <template v-if="fileDetailOpen">
+        <download-file-detail ref="downloadFileDetailRef" :docDetail="docDetail"/>
+      </template>
+    </el-drawer><!--el-drawer 详情-抽屉-->
 <!--    <upload-progress/>-->
   </div>
 </template>
 
 <script>
-import { listDocument, getDocument, delDocument, addDocument, updateDocument,pushDoc, listAllDoc} from "@/api/document/document";
+import { listDocument, getDocument, delDocument, addDocument, updateDocument,pushDoc, getExportWordList} from "@/api/document/document";
 import { deptTreeSelect } from "@/api/system/user";
 import { documentTree,addCategory,updateCategory,delCategory,getCategory } from "@/api/documentCategory/documentCategory.js";
-
 import { Base64 } from 'js-base64';
-import iFrame from "@/components/iFrame/index"
 import editDocument from "./editDocument";
 import uploadProgress from "./uploadProgress";
-import { w3cwebsocket as WebSocket } from 'websocket';
 import Treeselect from "@riophae/vue-treeselect";
-import { addCount } from "@/api/tool/downloadCount";
 import { exportDocx } from '@/utils/docUtil/docutil.js';
+import downloadFileDetail from "./downloadFileDetail.vue";
 
 export default {
   name: "Document",
-  components: { iFrame, editDocument, uploadProgress, Treeselect},
+  components: { editDocument, uploadProgress, Treeselect, downloadFileDetail},
   dicts:['doc_class','doc_source','doc_upload_status'],
   data() {
     return {
@@ -404,7 +419,7 @@ export default {
       loadingDownload: false,
       acceptType: "zip,rar,7z",
       //导出属性
-      columnList: ['docCode', 'docName', 'docType', 'docPrincipals', 'docRespDeptName', 'docSource', 'toolName', 'docStatus', 'createTime'],
+      columnList: ['docCode', 'docName', 'docType', 'docPrincipals', 'docRespDeptName', 'docSource', 'docStatus', 'createTime'],
       checkList: [],
       exportDrawerOpen: false,
       docTitle: '',
@@ -422,6 +437,16 @@ export default {
           label: 'word'
         }
       ],
+      docTipAddOrEdit: null,
+      //详情
+      fileDetailDrawerOpen: false,
+      fileDetailOpen: false,
+      toolDetail: {},
+      //导出
+      exportTitle:'',
+      batchExportFlag: false,
+      //查询
+      selection: undefined,
     };
   },
   created() {
@@ -481,6 +506,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.docTitle="新增文档资源"
+      this.docTipAddOrEdit = 'add'
       this.docDetailDisable=true
       this.open = true
       this.$nextTick(()=>{
@@ -489,6 +515,7 @@ export default {
     },
     handleEdit(row){
       this.docTitle="编辑文档资源"
+      this.docTipAddOrEdit = 'edit'
       this.docDetailDisable=true
       this.open = true
       this.$nextTick(()=>{
@@ -497,6 +524,7 @@ export default {
     },
     handleDetail(row){
       this.docTitle="详情"
+      this.docTipAddOrEdit = 'detail'
       this.docDetailDisable=false
       this.open = true
       this.$nextTick(()=>{
@@ -513,6 +541,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.selection=selection
       this.ids = selection.map(item => item.docId)
       this.single = selection.length!=1
       this.multiple = !selection.length
@@ -523,11 +552,24 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      let self = this
       const docIds = row.docId || this.ids;
       if(docIds == null || docIds == undefined || docIds =='' || docIds.length < 0){
         this.$modal.msgError(`最少选择一条数据`);
         return;
       }
+      //只能删除已上传数据
+      let delFlag = false;
+      for(let item of self.selection){
+        if(!(item.docStatus == 'ysc')){
+          delFlag = true;
+        }
+      }
+      if(delFlag){
+        this.$modal.msgError(`只能删除文档状态为[已上传]数据,请重新选择`);
+        return
+      }
+
       this.$modal.confirm('是否确认删除？').then(function() {
         return delDocument(docIds);
       }).then(() => {
@@ -600,20 +642,9 @@ export default {
      * 处理下载
      * **/
     handleDownload(row){
-      let self = this
-      self.loadingDownload = true
-      this.$download.resource(row.docUrl);
-      //保存下载记录
-      if(row.toolId){
-        let formData = {
-          toolId: row.toolId
-        }
-        addCount(formData).then(res => {
-        });
-      }
-      setTimeout(()=>{
-        self.loadingDownload = false
-      },1000)
+      this.fileDetailDrawerOpen = true
+      this.fileDetailOpen = true
+      this.docDetail = row
     },
     /** 发布操作 */
     handlePush(row) {
@@ -631,6 +662,12 @@ export default {
         console.error(err)
       });
     },
+    /**
+     * 确认
+     */
+    docConfrim(){
+      this.$refs.editDocumentRef.submitForm();
+    },
     docCancel(){
       this.$refs.editDocumentRef.resetForm();
       this.open = false
@@ -656,31 +693,64 @@ export default {
     isSelectable(row) {
       return row.docStatus !== 'yfb' && row.docStatus !== 'shz';
     },
+    /** 批量导出 */
+    handleOpenBatchExport() {
+      let self = this
+      if(self.selection == null || self.selection == '' || self.selection == undefined || self.selection.length <= 0){
+        this.$modal.msgError(`最少选择一条数据`);
+        return;
+      }
+      if (this.checkList.length<1) {
+        this.checkList = JSON.parse(JSON.stringify(this.columnList))
+      }
+      this.exportTitle = '批量导出'
+      this.batchExportFlag = true
+      this.exportDrawerOpen = true
+    },
     /** 导出按钮操作 */
     handleOpenExport() {
       if (this.checkList.length<1) {
         this.checkList = JSON.parse(JSON.stringify(this.columnList))
       }
+      this.exportTitle = '导出'
       this.exportDrawerOpen = true
+      this.batchExportFlag = false
     },
     /** 导出按钮操作 */
     handleExport() {
+      let self = this
       if (this.statevalue == 1) {
         let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
-        this.download('/document/export', {
+
+        let params = {
           ...this.queryParams,
           downloadCheck:false,
           excludeFields:excludeFields,
-        }, `文档资源信息数据_${new Date().getTime()}.xlsx`)
+        }
+        if(this.batchExportFlag){
+          params = {
+            downloadCheck:false,
+            docIdList: self.selection.map(item=>item.docId),
+            excludeFields:excludeFields,
+          }
+        }
+        this.download('/document/export', params , `文档资源信息数据_${new Date().getTime()}.xlsx`)
       }
       if (this.statevalue == 2) {
-        listAllDoc(this.queryParams).then(r => {
+        let params = {
+          ...this.queryParams
+        }
+        if(this.batchExportFlag){
+          params = {
+            docIdList: self.selection.map(item=>item.docId)
+          }
+        }
+        getExportWordList(params).then(r => {
           if (r.data.length != 0) {
             const data = {
               form: null,
               list: r.data
             }
-            //模板文件位置在public文件夹里N
             exportDocx('document.docx', data, `document.docx`)
           } else {
             this.$message.error('没有数据');
@@ -704,10 +774,22 @@ export default {
         case "handleDelete":
           this.handleDelete(row);
           break;
+        case "handleDetail":
+          this.handleDetail(row);
+          break;
         default:
           break;
       }
     },
+    /** 关闭详情 **/
+    handleFileCloseDetail(){
+      this.fileDetailDrawerOpen = false;
+      this.fileDetailOpen = false;
+      this.$refs.downloadFileDetailRef.$destroy(); // 销毁组件
+      this.$nextTick(() => {
+        this.$refs.downloadFileDetailRef = null; // 清空引用
+      });
+    },
 
   }
 };
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
index 182ff9f..a6956cc 100644
--- a/src/views/tool/downloadFileDetail.vue
+++ b/src/views/tool/downloadFileDetail.vue
@@ -2,7 +2,7 @@
   <div class="fbox1">
     <div class="fl">
       <el-tabs v-model="detailActiveName">
-        <el-tab-pane label="文件信息" name="first">
+        <el-tab-pane label="附件信息" name="first">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -16,7 +16,8 @@
                   size="mini"
                   type="text"
                   icon="el-icon-view"
-                  @click="handlePriew(scope.row)"
+                  v-if="previewAuth(scope.row)"
+                  @click="handlePreview(scope.row)"
                 >预览</el-button>
                 <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
               </template>
@@ -26,28 +27,20 @@
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
 
-    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
-      <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
-    </el-dialog>
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+
   </div><!--fbox1 左右分栏-->
 </template>
 
 <script>
-  import { listDocument, getDocument, delDocument, addDocument, updateDocument } from "@/api/document/document";
-  import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
-  import { listReplies, addReplies} from "@/api/tool/replies.js";
-
   import { addCount } from "@/api/tool/downloadCount";
-  import AddDoc from './AddDoc'
-  import editDocument from "../document/editDocument";
-  import { Base64 } from 'js-base64';
-  import iFrame from "@/components/iFrame/index"
   import { listAttachment } from "@/api/attachment/attachment";
+  import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
 
   export default {
     name: 'toolDetail',
-    components: { editDocument, AddDoc, iFrame },
-    dicts:['sys_normal_disable','tool_type','tool_source','tool_status','doc_class','doc_source'],
+    components: { previewUtil},
+    dicts:[],
     props: {
       toolDetail: {
         type: Object,
@@ -77,17 +70,13 @@
         repliesList: [],
         showReplyForm: [],
         replyContent: [],
+        isPreviewDisable: false,
+        attFileType: "zip,rar,7z",
+
       }
     },
     created(){
       this.getAttachmentList()
-      this.getDiscussionsList()
-    },
-    watch: {
-      discussionsList(newList) {
-        this.showReplyForm = new Array(newList.length).fill(false);
-        this.replyContent = new Array(newList.length).fill('');
-      }
     },
     methods:{
       getAttachmentList() {
@@ -101,27 +90,33 @@
           }
         );
       },
-      handleAdd(){
-        this.open = true
+      handlePreview(row){
+        this.isPreviewDisable = true
+        this.$nextTick(() => {
+          this.$refs.previewForm.frontModulePreview(row)
+        })
       },
-      editDocumentSubmit(){
-        this.open = false
-        this.getAttachmentList()
+      /** 关闭预览 **/
+      previewClose(){
+        this.isPreviewDisable = false
       },
-      handlePriew(row){
-        this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
-        this.viewDialogTitle = '文档在线预览'
-        this.viewDialogOpen = true;
+      previewAuth(row){
+        if(row.fileUrl == null || row.fileUrl == '' || row.fileUrl == undefined){
+          return false
+        }
+        let extension = this.getExtension(row.fileUrl);
+        const acceptedExtensions = this.attFileType.toLowerCase().split(',');
+        if(acceptedExtensions.includes(extension)){
+          return false
+        }
+        return true
       },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const docIds = row.docId || this.ids;
-        this.$modal.confirm('是否确认删除？').then(function() {
-          return delDocument(docIds);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      getExtension(filePath) {
+        // 分割字符串，以 '.' 为分隔符
+        const parts = filePath.split('.');
+        // 取最后一个部分作为后缀名
+        const extension = parts.pop();
+        return extension;
       },
       /**
        * 处理下载
@@ -147,155 +142,6 @@
           self.loadingDownload = false
         },1000)
       },
-      getDiscussionsList() {
-        let self = this
-        listDiscussions({businessId:this.toolDetail.toolId}).then(res => {
-          self.discussionsList = res.rows
-          self.discussionsList.forEach(item => {
-            if(item.repliesList && item.repliesList.length > 0){
-              self.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
-              self.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
-            }else{
-              self.$set(item, 'showReplyFormSon', false)
-              self.$set(item, 'replyContentSon', '')
-            }
-          });
-        });
-      },
-      /** 评论 **/
-      handleDiscussions(){
-        let self = this
-        if (this.discussionContent == '' || this.discussionContent == null || this.discussionContent == undefined) {
-          self.$message({
-            message: '内容不能为空',//提示的信息
-            type:'warning',　　//类型是成功
-            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
-          });
-          return;
-        }
-        let data = {
-          businessId: this.toolDetail.toolId,
-          content: this.discussionContent,
-          type: "tool",
-        }
-        self.$modal.confirm('是否确认发布？').then(()=> {
-          addDiscussions(data).then(res => {
-            this.discussionContent = null
-            self.$message({
-              message: '发布成功',//提示的信息
-              type:'success',　　//类型是成功
-              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
-            });
-            self.getDiscussionsList()
-          }).catch(err =>{
-            this.discussionContent = null
-            console.error("handleDiscussions==err==", err)
-            self.$modal.msgError("发布失败");
-          });
-        })
-      },
-      getFirstChar(value) {
-        if(!value){return ''}
-        return value.charAt(0);
-      },
-      toggleReplyForm(index) {
-        this.$set(this.showReplyForm, index, !this.showReplyForm[index]);
-      },
-      cancelReply(index) {
-        this.$set(this.showReplyForm, index, false);
-        this.$set(this.replyContent, index, '');
-      },
-      /** 回复 **/
-      submitReply(index, item) {
-        let self = this
-        const content = this.replyContent[index];
-        if (content == '' || content == null || content == undefined) {
-          self.$message({
-            message: '回复内容不能为空',//提示的信息
-            type:'warning',　　//类型是成功
-            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
-          });
-          return;
-        }
-        let data = {
-          "discussionId": item.id,
-          "content": content,
-        }
-
-        self.$modal.confirm('是否确认发布？').then(()=> {
-          addReplies(data).then(res => {
-            self.$message({
-              message: '发布成功',//提示的信息
-              type:'success',　　//类型是成功
-              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
-            });
-            self.cancelReply(index)
-            self.getDiscussionsList()
-          }).catch(err =>{
-            console.error("handleDiscussions==err==", err)
-            self.$modal.msgError("发布失败");
-          });
-        })
-
-        // 清空回复内容并隐藏表单
-        this.replyContent[index] = '';
-        this.showReplyForm[index] = false;
-      },
-
-
-
-      /** 第二级 **/
-      toggleReplyFormSon(parentIndex, repIndex) {
-        const parentItem = this.discussionsList[parentIndex];
-        this.$set(parentItem.showReplyFormSon, repIndex, !parentItem.showReplyFormSon[repIndex]);
-        // this.$set(this.showReplyFormSon, index, !this.showReplyFormSon[index]);
-      },
-      /** 第二级，取消回复 **/
-      cancelReplySon(parentIndex, repIndex) {
-        const parentItem = this.discussionsList[parentIndex];
-        this.$set(parentItem.showReplyFormSon, repIndex, false);
-        this.$set(parentItem.replyContentSon, repIndex, '');
-      },
-      /** 第二级回复 **/
-      submitReplySon(parentIndex, repIndex, repItem) {
-        let self = this
-        const parentItem = this.discussionsList[parentIndex];
-        const content = parentItem.replyContentSon[repIndex];
-        if (content.trim() == '' || content == null || content == undefined) {
-          self.$message({
-            message: '回复内容不能为空',//提示的信息
-            type:'warning',　　//类型是成功
-            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
-          });
-          return;
-        }
-        let data = {
-          "discussionId": repItem.id,
-          "content": content,
-        }
-
-        self.$modal.confirm('是否确认发布？').then(()=> {
-          addReplies(data).then(res => {
-            self.$message({
-              message: '发布成功',//提示的信息
-              type:'success',　　//类型是成功
-              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
-            });
-            self.cancelReplySon(parentIndex, repIndex)
-            self.getDiscussionsList()
-          }).catch(err =>{
-            console.error("submitReplySon==err==", err)
-            self.$modal.msgError("发布失败");
-          });
-        })
-
-        // 清空回复内容并隐藏表单
-        this.$set(parentItem.replyContentSon, repIndex, '');
-        this.$set(parentItem.showReplyFormSon, repIndex, false);
-      },
-      handleBeforeClose() {
-        this.viewDialogOpen = false
-      }
     }
   }
 </script>
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 8f14b3c..1cd05cd 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -91,9 +91,10 @@
           >工具发布</el-button>
           <el-button icon="el-icon-delete" @click="handleDelete(selection)" v-hasPermi="['tool:batch:remove']">批量删除</el-button>
           <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['tool:export']">导出</el-button>
+          <el-button icon="el-icon-download" @click="handleOpenBatchExport()" v-hasPermi="['tool:batch:export']">批量导出</el-button>
         </div><!--operate 操作按钮-->
-        <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" :selectable="selectable"/>
+        <el-table v-loading="loading" :data="toolList" ref="tableRef" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center"/>
           <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" v-if="columns[0].visible" />
           <el-table-column label="工具名称" align="center" key="toolName" prop="toolName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="工具类别" align="center" key="toolType" prop="toolType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
@@ -113,14 +114,38 @@
               <dict-tag :options="dict.type.flow_status" :value="scope.row.recordStatus"/>
             </template>
           </el-table-column>
-          <el-table-column label="关联工具" align="center" :show-overflow-tooltip="true">
+<!--          <el-table-column label="引用工具" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="handleRelationTool(scope.row.relationToolList)">
                   <el-link target="_blank" v-for="assItem in scope.row.relationToolList" :key="assItem.id" @click="handleToolDetail(assItem)">{{assItem.toolName}}</el-link>
               </span>
             </template>
+          </el-table-column>-->
+
+          <el-table-column label="引用工具" align="center" :show-overflow-tooltip="true" width="100">
+            <template slot-scope="scope">
+              <el-popover
+                trigger="click"
+                placement="top-start"
+                v-if="Array.isArray(scope.row.relationToolList) && scope.row.relationToolList.length > 0"
+              >
+                <!-- 这里展示引用工具的详细信息 -->
+                <ul>
+                  <li v-for="assItem in scope.row.relationToolList" :key="assItem.id">
+                    <el-link target="_blank" @click="handleToolDetail(assItem)">
+                      {{ assItem.toolName }}
+                    </el-link>
+                  </li>
+                </ul>
+                <!-- 弹出框触发器 -->
+                <el-link slot="reference">
+                  引用工具 ({{ scope.row.relationToolList.length }})
+                </el-link>
+              </el-popover>
+            </template>
           </el-table-column>
 
+
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -130,7 +155,7 @@
             label="操作"
             align="center"
             fixed="right"
-            width="250"
+            width="270px"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -159,7 +184,7 @@
     </el-card><!--el-card-->
 
     <!-- 工具导出对话框 -->
-    <el-dialog title="导出" :visible.sync="exoportDrawerOpen"  width="980px" append-to-body>
+    <el-dialog :title="exportTitle" :visible.sync="exoportDrawerOpen"  width="980px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false" :show-close="false">
       <div class="el-form-border">
         <el-form ref="exportFrom" label-width="180px">
           <el-row>
@@ -203,9 +228,6 @@
       </span>
     </el-dialog>
 
-
-
-
     <el-drawer
       :visible.sync="drawerShow"
       direction="rtl"
@@ -215,14 +237,19 @@
       :show-close="false"
       modal-append-to-body
       :destroy-on-close="true"
+      :close-on-press-escape="false"
     >
       <main-component ref="mainComponent" :code="path + code"  :data="data"  @close="handleClose"></main-component>
     </el-drawer>
 
     <!-- 工具详情对话框 -->
-    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" size="80%" class="no-padding" @close="handleCloseDetail()">
+    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" :show-close="false"
+               size="80%" class="no-padding" :close-on-press-escape="false"	@close="handleCloseDetail()">
       <template #title>
-        <span>工具名称</span>
+        <span>{{toolTitle}}</span>
+        <div class="drawer-head-btn">
+          <el-button @click="detailDrawerOpen = false">关 闭</el-button>
+        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <template v-if="detailOpen">
         <tool-detail ref="toolDetailRef" :toolDetail="toolDetail"/>
@@ -232,15 +259,20 @@
 
 
     <!-- 工具详情对话框 -->
-    <el-drawer :visible.sync="fileDetailDrawerOpen" :modal-append-to-body="false" size="80%" class="no-padding" @close="handleFileCloseDetail()">
+    <el-drawer :visible.sync="fileDetailDrawerOpen" :modal-append-to-body="false" :show-close="false"
+               size="80%" class="no-padding" :close-on-press-escape="false" @close="handleFileCloseDetail()">
       <template #title>
-        <span>工具下载</span>
+        <span>工具附件下载</span>
+        <div class="drawer-head-btn">
+          <el-button @click="fileDetailDrawerOpen = false">关 闭</el-button>
+        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <template v-if="fileDetailOpen">
         <download-file-detail ref="downloadFileDetailRef" :toolDetail="toolDetail"/>
       </template>
     </el-drawer><!--el-drawer 详情-抽屉-->
 
+
   </div><!--app-container-->
 </template>
 
@@ -255,6 +287,7 @@ import downloadFileDetail from "./downloadFileDetail.vue";
 import AddDoc from './AddDoc'
 import mainComponent from "@/components/mainComponent/index.vue";
 import { exportDocx } from '@/utils/docUtil/docutil.js';
+import { addCount } from "@/api/tool/downloadCount";
 
 export default {
   name: "User",
@@ -369,6 +402,12 @@ export default {
           label: 'word'
         }
       ],
+      //详情名称
+      toolTitle:'',
+      exportTitle:'',
+      batchExportFlag: false,
+      selectedRows: [], // 保存所有选中的数据
+
     };
   },
   watch: {
@@ -512,9 +551,10 @@ export default {
         this.detailDrawerOpen = true
         this.detailOpen = true
         this.toolDetail = row
+        this.toolTitle = '工具详情'
       } else {
         let status = row.recordStatus === 'draft' ? '1' : '0'
-        this.handleOpen({type:'tool_release', procInstId:row.procInstId, status:status})
+        this.handleOpen({type:'tool_release', procInstId:row.procInstId, status:status, title: '工具发布'})
       }
     },
     handleFileDownload(row){
@@ -551,11 +591,27 @@ export default {
       let _this = this
       _this.handleOpen({type:'tool_release',procInstId:row.procInstId,status:'1'})
     },
-    /** 发布按钮操作 */
+    /** 导出 */
     handleOpenExport() {
       if (this.checkList.length<1) {
         this.checkList = JSON.parse(JSON.stringify(this.columnList))
       }
+      this.exportTitle = '导出'
+      this.batchExportFlag = false
+      this.exoportDrawerOpen = true
+    },
+    /** 批量导出 */
+    handleOpenBatchExport() {
+      let self = this
+      if(self.selection == null || self.selection == '' || self.selection == undefined || self.selection.length <= 0){
+        this.$modal.msgError(`最少选择一条数据`);
+        return;
+      }
+      if (this.checkList.length<1) {
+        this.checkList = JSON.parse(JSON.stringify(this.columnList))
+      }
+      this.exportTitle = '批量导出'
+      this.batchExportFlag = true
       this.exoportDrawerOpen = true
     },
     /** 导出按钮操作 */
@@ -563,17 +619,36 @@ export default {
       let self = this
       if (this.statevalue == 1) {
         let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
-        this.download('/tool/export', {
+        let params = {
           ...this.queryParams,
           downloadCheck:false,
           excludeFields:excludeFields,
-        }, `工具信息数据_${new Date().getTime()}.xlsx`)
+        }
+        if(this.batchExportFlag){
+          params = {
+            downloadCheck:false,
+            toolIdList: self.selection.map(item=>item.toolId),
+            excludeFields:excludeFields,
+          }
+        }
+        this.download('/tool/export',params, `工具信息数据_${new Date().getTime()}.xlsx`)
         setTimeout(() => {
+          if(self.batchExportFlag){
+            self.clearSelected()
+          }
           self.exoportDrawerOpen = false;
         }, 1000);
       }
       if (this.statevalue == 2) {
-        exportWordList(this.queryParams).then(r => {
+        let params = {
+          ...this.queryParams
+        }
+        if(this.batchExportFlag){
+          params = {
+            toolIdList: self.selection.map(item=>item.toolId)
+          }
+        }
+        exportWordList(params).then(r => {
           if (r.data.length != 0) {
             const data = {
               form: null,
@@ -582,6 +657,9 @@ export default {
             //模板文件位置在public文件夹里N
             exportDocx('tool.docx', data, `tool.docx`)
             setTimeout(() => {
+              if(self.batchExportFlag){
+                self.clearSelected()
+              }
               self.exoportDrawerOpen = false;
             }, 1000);
           } else {
@@ -590,6 +668,7 @@ export default {
         })
       }
 
+
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -617,6 +696,18 @@ export default {
         this.$modal.msgError(`最少选择一条数据`);
         return
       }
+      //只能删除草稿数据
+      let delFlag = false;
+      for(let item of list){
+        if(!(item.recordStatus == 'draft')){
+          delFlag = true;
+        }
+      }
+      if(delFlag){
+        this.$modal.msgError(`只能删除流程状态为[拟稿]数据,请重新选择`);
+        return
+      }
+
       _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
         .then(async() => {
           _this.loading = true
@@ -680,9 +771,27 @@ export default {
         return true
       }
     },
+    clearSelected() {
+      // 清空选中的tab
+      this.$refs.tableRef.clearSelection();
+    },
     onPopoverShow(list) {
       this.relationToolList = list; // 更新要显示的工具列表
     },
+    /* handlePageChange(page) {
+      this.$nextTick(() => {
+        this.restoreSelection();
+      });
+    },
+    // 根据保存的选中数据，恢复选中状态
+    restoreSelection() {
+      this.$refs.tableRef.clearSelection();
+      this.toolList.forEach(row => {
+        if (this.selectedRows.some(selected => selected.toolId == row.toolId)) {
+          this.$refs.tableRef.toggleRowSelection(row, true);
+        }
+      });
+    }, */
 
   }
 };
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 7f7dbc0..631e9dd 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -19,7 +19,7 @@
                 <el-col :span="12"> <el-form-item label="操作说明">{{detailData.operateExplain}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="备注">{{detailData.remark}}</el-form-item> </el-col>
                 <el-col :span="24">
-                  <el-form-item label="关联工具">
+                  <el-form-item label="引用工具">
                     <span v-if="detailData.association != null && detailData.association != '' && detailData.association != undefined">
                      <el-tag :key="tag.toolId" v-for="tag in JSON.parse(detailData.association)" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
                     </span>
@@ -121,6 +121,8 @@
       <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
     </el-dialog>
 
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+
     <!-- 上传 -->
     <AddDoc :show.sync="open" :toolId="detailData.toolId" @callback="getAttachmentList"/>
   </div><!--fbox1 左右分栏-->
@@ -138,10 +140,15 @@
   import iFrame from "@/components/iFrame/index"
   import { addCount } from "@/api/tool/downloadCount";
   import { listAttachment } from "@/api/attachment/attachment";
+  import axios from 'axios'
+  import {
+    getToken
+  } from "@/utils/auth";
+  import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
 
   export default {
     name: 'toolDetail',
-    components: { editDocument, AddDoc, iFrame },
+    components: { editDocument, AddDoc, iFrame, previewUtil },
     dicts:['sys_normal_disable','tool_type','tool_source','tool_status','doc_class','doc_source'],
     props: {
       toolDetail: {
@@ -177,6 +184,20 @@
         //详细数据
         detailData:{},
         attFileType: "zip,rar,7z",
+        // json
+        dialogVisible:false,
+        isJson:false,
+        resultContentObj:[],
+        // docx
+        isDocx:false,
+        docxData: null,
+        //pdf文件
+        isPdf:false,
+        pdfFileData: null, // 默认文档类型
+        previewLoading:false,
+        previewUseFront: "txt,doc,docx,pdf",
+        isPreviewDisable: false
+
       }
     },
     created(){
@@ -210,9 +231,14 @@
         this.getAttachmentList()
       },
       handlePreview(row){
-        this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
-        this.viewDialogTitle = '文档在线预览'
-        this.viewDialogOpen = true;
+        this.isPreviewDisable = true
+        this.$nextTick(() => {
+          this.$refs.previewForm.frontModulePreview(row)
+        })
+      },
+      /** 关闭预览 **/
+      previewClose(){
+        this.isPreviewDisable = false
       },
       /** 删除按钮操作 */
       handleDelete(row) {
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 21b703c..2a26221 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -2,7 +2,7 @@
   <div  v-loading="loading||detailLoading">
     <div class="drawer-head">
       <div class="cell-title">
-          <p class="title">工具发布</p>
+          <p class="title">{{title}}</p>
       </div>
       <div class="cell-btn">
         <el-button type="primary" v-if="pListData && pListData.procInstId" @click="handleMonitor" icon="el-icon-data-line">流程监控</el-button>
@@ -191,7 +191,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="关联工具" prop="association">
+              <el-form-item label="引用工具" prop="association">
                 <el-select
                   :disabled="!editStatus"
                   v-model="form.association"
@@ -200,7 +200,7 @@
                   value-key="toolId"
                   filterable
                   remote
-                  placeholder="请选择关联工具"
+                  placeholder="请选择引用工具"
                   @focus="toolSelect">
                   <el-option
                     v-for="item in form.association"
@@ -279,6 +279,7 @@
       v-loading = flowStepLoading
       :close-on-click-modal="false"
       :close-on-press-escape="false"
+      :show-close="false"
     >
       <processcode
         ref="prochild"
@@ -301,6 +302,7 @@
     <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
     <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" :deptFilter="true" @cancel="toolPrincipalsChoose=false" @submit="submitPeople"></bl-user-selector>
 
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
 
     <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
       <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
@@ -325,9 +327,9 @@ import { addUser, deptTreeSelect, updateUser } from '@/api/system/user'
 import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool'
 import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 import ToolSelector from '@/components/tool-selector/index.vue'
-import { Base64 } from 'js-base64'
 import uploadVue from '@/components/FileUpload/optimizeToolUpload.vue'
 import { addCount } from "@/api/tool/downloadCount";
+import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
 
 // PDF本地文件预览
 export default {
@@ -339,7 +341,8 @@ export default {
     WorkflowLogs,
     processcode,
     iFrame,
-    uploadVue
+    uploadVue,
+    previewUtil
   },
   name: "Borrow_doc",
   props: ['data'],
@@ -458,6 +461,8 @@ export default {
       detailBoolean: false,
       attachmentList: [],
       attFileType: "zip,rar,7z",
+      isPreviewDisable: false,
+      title: '工具发布'
     };
   },
   computed: {},
@@ -472,6 +477,9 @@ export default {
     this.curDeptId = this.$store.getters.userInfo.deptId
     this.curDeptName = this.$store.getters.userInfo.dept.deptName
     if (this.data) {
+      if(this.data.title){
+        this.title = this.data.title
+      }
       this.init(this.data)
     }
     this.getConfigKey("sys.user.initPassword").then(response => {
@@ -927,12 +935,14 @@ export default {
       return extension;
     },
     handlePreview(row){
-      this.viewDialogOpen = true;
-      this.viewDialogTitle = '文档在线预览'
-      let protocol = window.location.protocol
-      let hostname = window.location.hostname;
-      let getDocUrl = protocol + '//' + hostname + ':8080' + process.env.VUE_APP_BASE_API
-      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(getDocUrl + row.docUrl));
+      this.isPreviewDisable = true
+      this.$nextTick(() => {
+        this.$refs.previewForm.frontModulePreview(row)
+      })
+    },
+    /** 关闭预览 **/
+    previewClose(){
+      this.isPreviewDisable = false
     },
     /**
      * 处理下载
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index 372c412..7d60149 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -145,6 +145,7 @@
       v-loading = flowStepLoading
       :close-on-click-modal="false"
       :close-on-press-escape="false"
+      :show-close="false"
     >
       <processcode
         ref="prochild"
-- 
2.35.1.windows.2


From 72d894b846ffd6f9b034612c8fcfc0332290f1c0 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Thu, 5 Sep 2024 21:24:50 +0800
Subject: [PATCH 35/55] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B2=A1=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/optimizeToolUpload.vue | 4 ----
 src/components/PreviewUtil/previewUtil.vue       | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
index 4c51a22..4ec4efe 100644
--- a/src/components/FileUpload/optimizeToolUpload.vue
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -158,7 +158,6 @@ export default {
             self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
           }
         }).then(res => {
-          console.info("11111111uploadFile1111111")
           setTimeout(() => {
             if (res.data.code == 200) {
               setTimeout(function () {
@@ -176,7 +175,6 @@ export default {
                 self.handleResult(res,file);
               }, 500);
             } else {
-              console.info("11111上传失败11111", error)
               self.progressFlag = false;
               self.$message({
                 message: '上传失败！',
@@ -187,7 +185,6 @@ export default {
           }, 1000);
 
         }).catch(error => {
-          console.info("1111111uploadFile1uploadFile1111111", error)
           console.error(error)
           self.progressFlag = false;
           self.progressPercent = 0
@@ -214,7 +211,6 @@ export default {
             'Content-Type': 'multipart/form-data'
           },
         }).then(function (res) {
-          console.info("222222222upload222")
           if (res.status == 200) {
             //从第0块开始上传
             file.uploadId = res.data.uploadId
diff --git a/src/components/PreviewUtil/previewUtil.vue b/src/components/PreviewUtil/previewUtil.vue
index b5a18dc..e5a4c3c 100644
--- a/src/components/PreviewUtil/previewUtil.vue
+++ b/src/components/PreviewUtil/previewUtil.vue
@@ -143,7 +143,6 @@ export default {
     frontModulePreview(row){
       let self = this
       self.initPreviewData()
-      console.info("row=================", row)
       self.previewLoading = true
       if(row.fileName.endsWith(".jpg") || row.fileName.endsWith(".png")){
         this.$viewerApi({images: [row.fileUrl]})
-- 
2.35.1.windows.2


From dd9940e78efd4a3fb242dfd3de08ce137c2f307b Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Thu, 5 Sep 2024 22:35:43 +0800
Subject: [PATCH 36/55] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=92=8C=E5=B7=A5=E5=85=B7=E7=BB=9F=E8=AE=A1=202?=
 =?UTF-8?q?=E3=80=81=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=203=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=88=86=E9=A1=B5=EF=BC=88?=
 =?UTF-8?q?=E8=BF=98=E6=9C=89=E4=B8=80=E9=83=A8=E5=88=86=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tool/downloadCount.js                 |  10 ++
 src/views/document/downloadFileDetail.vue     |   9 ++
 src/views/document/editDocument.vue           |  26 +++-
 src/views/document/index.vue                  |  12 +-
 src/views/filestatistic/index.vue             | 140 +++++++++++++++++-
 src/views/statistic/index.vue                 |  14 +-
 src/views/tool/downloadFileDetail.vue         |  10 +-
 src/views/tool/index.vue                      |  10 +-
 src/views/tool/toolDetail.vue                 |  10 +-
 .../workflowList/addWorkflow/tool_release.vue |   2 +-
 10 files changed, 211 insertions(+), 32 deletions(-)

diff --git a/src/api/tool/downloadCount.js b/src/api/tool/downloadCount.js
index 517e36b..61b48a6 100644
--- a/src/api/tool/downloadCount.js
+++ b/src/api/tool/downloadCount.js
@@ -9,6 +9,16 @@ export function listCount(query) {
   })
 }
 
+// 查询工具下载统计列表
+export function listDocCount(query) {
+  return request({
+    url: '/system/count/doc/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
 // 根据详情统计
 export function userDownList(query) {
   return request({
diff --git a/src/views/document/downloadFileDetail.vue b/src/views/document/downloadFileDetail.vue
index 63027ba..e2c4a3b 100644
--- a/src/views/document/downloadFileDetail.vue
+++ b/src/views/document/downloadFileDetail.vue
@@ -4,6 +4,7 @@
       <el-tabs v-model="detailActiveName">
         <el-tab-pane label="附件信息" name="first">
           <el-table :data="attachmentList" style="width: 100%">
+            <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template slot-scope="scope">
@@ -22,6 +23,13 @@
               </template>
             </el-table-column>
           </el-table><!--el-table-->
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getAttachmentList"
+          />
         </el-tab-pane><!--el-tab-pane-->
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
@@ -70,6 +78,7 @@
         replyContent: [],
         isPreviewDisable: false,
         attFileType: "zip,rar,7z",
+        total: 0
       }
     },
     created(){
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index bb9c9c8..242f428 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -173,6 +173,13 @@
               <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
             </template>
           </el-table-column>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getAttachmentList"
+          />
         </el-table><!--el-table-->
       </div>
     </div><!--fl 左侧页签-->
@@ -359,6 +366,11 @@
           pageNum: 1,
           pageSize: 10,
         },
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        total: 0
 
       }
     },
@@ -587,7 +599,7 @@
             self.$set(fileData, "size", fileData.fileSize)
             self.dataFile.push(fileData) */
 
-            self.getAttachemntList()
+            self.getAttachmentList()
           });
         })
       },
@@ -615,7 +627,7 @@
               type:'success',　　//类型是成功
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
-            self.getAttachemntList()
+            self.getAttachmentList()
           }).catch(err =>{
             this.discussionContent = null
             console.error("handleDiscussions==err==", err)
@@ -623,10 +635,10 @@
           });
         })
       },
-      getAttachemntList() {
+      getAttachmentList() {
         let self = this
-        this.$set(this.docQueryParams,'del',"0")
-        this.$set(this.docQueryParams,'businessId',this.form.docId)
+        this.$set(this.queryParams,'del',"0")
+        this.$set(this.queryParams,'businessId',this.form.docId)
         listAttachment({businessId:this.form.docId}).then(res => {
           self.attachmentList = res.rows;
           self.total = res.total;
@@ -682,7 +694,7 @@
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
             self.cancelReplySon(parentIndex, repIndex)
-            self.getAttachemntList()
+            self.getAttachmentList()
           }).catch(err =>{
             console.error("submitReplySon==err==", err)
             self.$modal.msgError("发布失败");
@@ -718,7 +730,7 @@
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
             self.cancelReply(index)
-            self.getAttachemntList()
+            self.getAttachmentList()
           }).catch(err =>{
             console.error("handleDiscussions==err==", err)
             self.$modal.msgError("发布失败");
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 46bb70a..dd00dfb 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -121,16 +121,16 @@
 
         <el-table v-loading="loading" :data="docList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="文档编号" align="center" prop="docCode" width="120" />
-          <el-table-column label="文档名称" align="center" prop="docName" :show-overflow-tooltip="true" />
-          <el-table-column label="文档类别" align="center" prop="docType" :show-overflow-tooltip="true" width="80">
+          <el-table-column label="文档编号"  prop="docCode" width="120" />
+          <el-table-column label="文档名称"  prop="docName" :show-overflow-tooltip="true" />
+          <el-table-column label="文档类别"  prop="docType" :show-overflow-tooltip="true" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.doc_class" :value="scope.row.docType"/>
             </template>
           </el-table-column>·
-          <el-table-column label="负责人" align="center" prop="docPrincipalsName" :show-overflow-tooltip="true" width="100" />
-          <el-table-column label="归属单位" align="center" prop="docRespDeptName" :show-overflow-tooltip="true" width="80" />
-          <el-table-column label="文档来源" align="center" prop="docSource" width="100">
+          <el-table-column label="负责人"   prop="docPrincipalsName" :show-overflow-tooltip="true" width="100" />
+          <el-table-column label="归属单位" prop="docRespDeptName" :show-overflow-tooltip="true" width="80" />
+          <el-table-column label="文档来源" prop="docSource" width="100">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.doc_source" :value="scope.row.docSource"/>
             </template>
diff --git a/src/views/filestatistic/index.vue b/src/views/filestatistic/index.vue
index 104ab4f..6c2cdc4 100644
--- a/src/views/filestatistic/index.vue
+++ b/src/views/filestatistic/index.vue
@@ -7,7 +7,7 @@
           <!--  -->
           <div class="tjbox2" v-if="isPieChart">
             <PieChart
-              height="400px"
+              height="285px"
               :data="toolTypeData"
               :legendData="toolTypeLegendData"
               legendBottom="5"
@@ -22,7 +22,7 @@
           <div slot="header" class="clearfix"><span class="tline">文档来源统计</span></div>
           <div class="tjbox2" v-if="isPieChart">
             <PieChart
-              height="400px"
+              height="285px"
               :data="toolSourceData"
               :legendData="toolSourceLegendData"
               legendBottom="5"
@@ -34,11 +34,109 @@
       </el-col><!--el-col-->
     </el-row><!--el-row-->
 
+
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <el-card>
+          <div slot="header" class="clearfix"><span class="tline">文档下载统计</span></div>
+          <div class="tjbox2">
+            <el-form label-width="70px" ref="queryForm" :model="queryParams">
+              <div class="search">
+                <div class="sl">
+                  <el-form-item label="下载时间">
+                    <el-date-picker
+                      v-model="dateRange"
+                      value-format="yyyy-MM-dd"
+                      type="daterange"
+                      range-separator="-"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="文档编号" prop="docCode">
+                    <el-input
+                      v-model="queryParams.docCode"
+                      placeholder="请输入文档编号"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
+                  <el-form-item label="文档名称" prop="docName">
+                    <el-input
+                      v-model="queryParams.docName"
+                      placeholder="请输入文档名称"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
+                </div>
+                <div class="sr">
+                  <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
+                </div>
+              </div>
+            </el-form>
+            <!-- <img src="images/tjt6.jpg" /> -->
+          </div>
+          <div class="rt">
+            <el-table v-loading="downLoading" :data="toolDownStatList">
+              <el-table-column type="index" label="序号" width="50" />
+              <el-table-column label="文档编号" align="center" key="docCode" prop="docCode" />
+              <el-table-column label="文档名称" align="center" key="docName" prop="docName"  :show-overflow-tooltip="true" />
+              <el-table-column label="下载次数" align="center" key="docDownNum" prop="docDownNum" width="120" />
+              <el-table-column
+                label="操作"
+                align="center"
+                width="250"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="scope">
+                  <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination
+              v-show="downTotal>0"
+              :total="downTotal"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getDocDownStatistics"
+            />
+          </div><!--rt 右-->
+        </el-card><!--el-card-->
+      </el-col><!--el-col-->
+    </el-row><!--el-row-->
+    <!-- <DownStatDetail :show.sync="detailDrawerOpen" :toolId="toolId" :toolName="toolName" /> -->
+    <el-dialog
+      :title="`${toolName}下载详情统计`"
+      :visible.sync="detailDrawerOpen"
+      width="85%"
+      append-to-body
+      @open="openEvent"
+      @close="detailDrawerOpen = false"
+    >
+      <el-table :data="toolDownDetailStatList" v-loading="loading">
+        <el-table-column label="下载用户" align="center" key="nickName" prop="nickName" min-width="120" />
+        <el-table-column label="附件名称" align="center" key="attName" prop="attName"  :show-overflow-tooltip="true" />
+        <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" min-width="120" />
+        <el-table-column label="下载时间" align="center" key="createTime" prop="createTime" min-width="120" />
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams1.pageNum"
+        :limit.sync="queryParams1.pageSize"
+        @pagination="getDocDownDetailStatistics"
+      />
+    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
 import { getStatistics } from "@/api/document/document";
+import { listDocCount,userDownList } from "@/api/tool/downloadCount";
 
 import PieChart from './PieChart'
 export default {
@@ -82,11 +180,13 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        docCode: null,
+        docName: null,
       },
       queryParams1: {
         pageNum: 1,
         pageSize: 10,
-        toolId: ''
+        businessId: ''
       },
       // 工具下载统计详情组件控制属性
       detailDrawerOpen: false,
@@ -101,9 +201,21 @@ export default {
   },
   created () {
     this.getCountData()
-    // this.getToolDownStatistics()
+    this.getDocDownStatistics()
   },
   methods: {
+    openEvent() {
+      this.getDocDownDetailStatistics()
+    },
+    getDocDownDetailStatistics() {
+      let self = this
+      this.loading = true
+      userDownList(this.addDateRange(this.queryParams1)).then(res => {
+        self.total = res?.total
+        self.toolDownDetailStatList = res?.rows || []
+        self.loading = false
+      }).catch(() => { self.loading = false });
+    },
     // 工具下载重置查询
     reset() {
       this.toolDownStatList = []
@@ -116,6 +228,7 @@ export default {
      */
     handleQuery() {
       this.queryParams.pageNum = 1
+      this.getDocDownStatistics()
     },
     /** 统计类型、类别、状态**/
     getCountData(){
@@ -160,7 +273,24 @@ export default {
         self.pageloading= false
         console.error(err)
       });
-    }
+    },
+    handleDetail(row){
+      this.$set(this.queryParams1, "businessId", row.businessId)
+      this.detailDrawerOpen = true
+    },
+    /**
+     * 获取工具下载列表数据
+     */
+    getDocDownStatistics() {
+      let self = this
+      this.downLoading = true
+      listDocCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
+        console.info("res.total=============", res.total)
+        self.downTotal = res.total
+        self.toolDownStatList = res?.rows || []
+        self.downLoading = false
+      }).catch(() => { self.downLoading = false });
+    },
   }
 }
 </script>
diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue
index bf1a97d..0b67ab7 100644
--- a/src/views/statistic/index.vue
+++ b/src/views/statistic/index.vue
@@ -49,12 +49,13 @@
         </el-card><!--el-card-->
       </el-col><!--el-col-->
     </el-row><!--el-row-->
+
     <el-row :gutter="20">
       <el-col :span="24">
         <el-card>
-          <div slot="header" class="clearfix"><span class="tline">工具下载</span></div>
+          <div slot="header" class="clearfix"><span class="tline">工具下载统计</span></div>
           <div class="tjbox2">
-            <el-form label-width="70px" ref="queryForm">
+            <el-form label-width="70px" ref="queryForm" :model="queryParams" >
               <div class="search">
                 <div class="sl">
                   <el-form-item label="下载时间">
@@ -131,6 +132,7 @@
     >
       <el-table :data="toolDownDetailStatList" v-loading="loading">
         <el-table-column label="下载用户" align="center" key="nickName" prop="nickName" min-width="120" />
+        <el-table-column label="附件名称" align="center" key="attName" prop="attName"  :show-overflow-tooltip="true" />
         <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" min-width="120" />
         <el-table-column label="下载时间" align="center" key="createTime" prop="createTime" min-width="120" />
       </el-table>
@@ -142,6 +144,7 @@
         @pagination="getToolDownDetailStatistics"
       />
     </el-dialog>
+
   </div>
 </template>
 
@@ -200,7 +203,7 @@ export default {
       queryParams1: {
         pageNum: 1,
         pageSize: 10,
-        toolId: ''
+        businessId: ''
       },
       // 工具下载统计详情组件控制属性
       detailDrawerOpen: false,
@@ -251,14 +254,13 @@ export default {
       let self = this
       this.downLoading = true
       listCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
-        self.total = res?.total
+        self.downTotal = res?.total
         self.toolDownStatList = res?.rows || []
         self.downLoading = false
       }).catch(() => { self.downLoading = false });
-
     },
     handleDetail(row){
-      this.$set(this.queryParams1, "toolId", row.toolId)
+      this.$set(this.queryParams1, "businessId", row.businessId)
       this.detailDrawerOpen = true
     },
     /** 统计类型、类别、状态**/
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
index a6956cc..3d0a547 100644
--- a/src/views/tool/downloadFileDetail.vue
+++ b/src/views/tool/downloadFileDetail.vue
@@ -4,6 +4,7 @@
       <el-tabs v-model="detailActiveName">
         <el-tab-pane label="附件信息" name="first">
           <el-table :data="attachmentList" style="width: 100%">
+            <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180">
               <template slot-scope="scope">
@@ -23,6 +24,13 @@
               </template>
             </el-table-column>
           </el-table><!--el-table-->
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getAttachmentList"
+          />
         </el-tab-pane><!--el-tab-pane-->
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
@@ -72,7 +80,7 @@
         replyContent: [],
         isPreviewDisable: false,
         attFileType: "zip,rar,7z",
-
+        total: 0
       }
     },
     created(){
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 1cd05cd..4df0b82 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -95,15 +95,15 @@
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" ref="tableRef" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
-          <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" v-if="columns[0].visible" />
-          <el-table-column label="工具名称" align="center" key="toolName" prop="toolName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="工具类别" align="center" key="toolType" prop="toolType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
+          <el-table-column label="工具编号"  key="toolCode" prop="toolCode" v-if="columns[0].visible" />
+          <el-table-column label="工具名称"  key="toolName" prop="toolName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="工具类别"  key="toolType" prop="toolType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
             </template>
           </el-table-column>
-          <el-table-column label="归属单位" align="center" key="toolRespDeptName" prop="toolRespDeptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="负责人" align="center" key="toolPrincipalsName" prop="toolPrincipalsName" v-if="columns[4].visible" width="120" />
+          <el-table-column label="归属单位"  key="toolRespDeptName" prop="toolRespDeptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" v-if="columns[4].visible" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 631e9dd..1cba752 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -63,6 +63,13 @@
             </el-table-column>
           </el-table><!--el-table-->
         </el-tab-pane><!--el-tab-pane-->
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getAttachmentList"
+        />
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
     <div class="fr">
@@ -196,7 +203,8 @@
         pdfFileData: null, // 默认文档类型
         previewLoading:false,
         previewUseFront: "txt,doc,docx,pdf",
-        isPreviewDisable: false
+        isPreviewDisable: false,
+        total: 0
 
       }
     },
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 2a26221..aecc12e 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -246,7 +246,7 @@
       </div><!--operate 操作按钮-->
       <el-table :data="attachmentList" style="width: 100%">
         <!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
-        <el-table-column label="序号" width="60" type="index"></el-table-column>
+        <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
         <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
         <el-table-column label="操作" align="center" width="180">
           <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-- 
2.35.1.windows.2


From c567ca9176f9b52abab5a71c1f6a10c116bd1cbc Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Fri, 6 Sep 2024 19:57:10 +0800
Subject: [PATCH 37/55] =?UTF-8?q?1=E3=80=81=E5=8F=B3=E4=B8=8A=E8=A7=92?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=202=E3=80=81=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=9E=E6=8E=A5=E7=82=B9=E5=87=BB=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=203=E3=80=81=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=85=B3=E8=81=94=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/tool.css                           |  48 +-
 src/api/message/message.js                    |   9 +
 src/layout/components/Navbar.vue              |  30 +-
 src/store/getters.js                          |   1 +
 src/store/modules/user.js                     |   7 +-
 src/views/document/detail.vue                 | 575 ++++++++++++++++++
 src/views/document/editDocument.vue           |  90 ++-
 src/views/document/index.vue                  |  60 +-
 src/views/filestatistic/index.vue             |   2 +-
 src/views/message/index.vue                   | 129 +++-
 src/views/monitor/cache/list.vue              |   2 +
 src/views/statistic/index.vue                 |   2 +-
 src/views/system/role/index.vue               |   7 +-
 src/views/tool/index.vue                      |  20 +-
 src/views/tool/toolDetail.vue                 |  34 +-
 .../workflowList/addWorkflow/tool_release.vue |  63 +-
 .../workflowList/addWorkflow/use_apply.vue    |   5 +
 src/views/workstuff/dispose/index.vue         |   5 +
 18 files changed, 991 insertions(+), 98 deletions(-)
 create mode 100644 src/views/document/detail.vue

diff --git a/public/css/tool.css b/public/css/tool.css
index 58f1fc5..db14df0 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -75,7 +75,7 @@ body #app .hideSidebar .sidebar-container {
   width: 65px !important;
 }
 body #app .openSidebar .sidebar-container {
-  width:220px !important;
+  width:180px !important;
 }
 body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
 body #app .sidebar-container .el-sub-menu .el-menu-item {
@@ -344,7 +344,7 @@ body #app .hideSidebar .main-container {
   margin-left: 65px;
 }
 body #app .main-container {
-  margin-left: 220px;
+  margin-left: 180px;
   background:#f9fafe;
   background-size:100%;
 }
@@ -440,6 +440,34 @@ body #app .main-container .navbar .right-menu{
   float: inherit;
   top: 8px;
   right: 16px;
+  display: flex;
+  align-items: center;
+}
+body #app .main-container .navbar .right-menu .el-badge{
+  margin: 0 20px 0 0;
+}
+body #app .main-container .navbar .right-menu .el-badge .el-badge__content.is-fixed{
+  top: 5px;
+  right: 14px;
+  border: 0;
+  padding: 0 4px;
+  min-width: 18px;
+  text-align: center;
+}
+body #app .main-container .navbar .right-menu .el-badge .top-msg{
+  background: rgba(0 64 152 / 6%);
+  color: #004098;
+  font-size: 14px;
+  height: 36px;
+  display: block;
+  padding: 0 12px;
+  line-height: 36px;
+  border-radius: 2px;
+  cursor: pointer;
+}
+body #app .main-container .navbar .right-menu .top-version{
+  margin: 0 10px 0 0;
+  font-size: 14px;
 }
 body #app .main-container .navbar .right-menu>.el-select{
   margin-right: 15px;
@@ -1752,22 +1780,26 @@ body .el-card>.el-card__body .el-tabs--border-card{
 body .el-card>.el-card__body .search-btn .el-tabs--border-card{
   border: 0;
 }
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header{
   border-bottom: 1px solid #e6e6e6;
   background: transparent;
 }
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item{
   margin: 0;
   border: none;
 }
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
   border: 0;
   background: transparent;
   color: #034aac;
   font-weight: bold;
   position: relative;
 }
-body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active::after{
+body .el-card>.el-card__body .search-btn .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active::after,
+body .el-card>.el-card__body .search-btn .el-tabs--card>.el-tabs__header .el-tabs__item.is-active::after{
   position: absolute;
   left: 0;
   bottom: 0;
@@ -2080,7 +2112,7 @@ body .etable1.el-table  .el-table__expanded-cell tr>td:nth-child(2){
 .search .el-form-item>.el-form-item__content>.el-cascader,
 .search .el-form-item>.el-form-item__content>.el-date-editor.el-range-editor,
 .search .el-form-item>.el-form-item__content>.el-date-editor.el-date-editor{
-  width: 250px;
+  width: 230px;
 }
 .grab .filtrate{
   display: none;
@@ -2109,7 +2141,7 @@ body .etable1.el-table  .el-table__expanded-cell tr>td:nth-child(2){
 .filtrate .el-form-item>.el-form-item__content>.el-cascader,
 .filtrate .el-form-item>.el-form-item__content>.el-date-editor.el-range-editor,
 .filtrate .el-form-item>.el-form-item__content>.el-date-editor.el-date-editor{
-  width: 250px;
+  width: 230px;
 }
 
 /*operate 操作区域*/
diff --git a/src/api/message/message.js b/src/api/message/message.js
index e6a0c2b..451ff97 100644
--- a/src/api/message/message.js
+++ b/src/api/message/message.js
@@ -52,3 +52,12 @@ export function allMarkedRead(data) {
     data: data
   })
 }
+
+
+// 获取用户统计
+export function getUserMsgCount(id) {
+  return request({
+    url: '/system/message/user/msg/count/' + id,
+    method: 'get'
+  })
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 99cc36d..6a35b7f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -5,13 +5,22 @@
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
+
     <div class="right-menu">
-      <!--<template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+<!--      <span @click="toMyCartPage">
+        <el-badge :value="totalCartCount >= 99 ? '99+' : totalCartCount" class="item">
+          <span class="top-msg">消息</span>
+        </el-badge>
+      </span>-->
+      <span class="top-version">v1.0.0</span>
+      <span style="cursor: pointer;" @click="toMyCartPage">
+        <el-badge :value="totalCartCount >= 99 ? '99+' : totalCartCount" class="item">
+          <el-tooltip class="item" effect="light" content="消息通知" placement="bottom">
+            <i class="el-icon-bell"></i>
+          </el-tooltip>
+        </el-badge>
+      </span>
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
-
-      </template>-->
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <span style="font-size: 16px"><i class="el-icon-user"/> {{nickName}}</span>
@@ -68,7 +77,10 @@ export default {
       get() {
         return this.$store.state.settings.topNav
       }
-    }
+    },
+    totalCartCount() {
+      return this.$store.state.user.unreadMsgNumber ? this.$store.state.user.unreadMsgNumber : 0
+    },
   },
   methods: {
     toggleSideBar() {
@@ -84,7 +96,11 @@ export default {
           location.href = '/index';
         })
       }).catch(() => {});
-    }
+    },
+    // 跳转到购物车
+    toMyCartPage() {
+      this.$router.push({ path: '/message' })
+    },
   }
 }
 </script>
diff --git a/src/store/getters.js b/src/store/getters.js
index 667e425..e9c105e 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -11,6 +11,7 @@ const getters = {
   userInfo: state => state.user.info,
   name: state => state.user.name,
   nickName: state => state.user.nickName,
+  unreadMsgNumber: state => state.user.unreadMsgNumber,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cced906..5370465 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -10,7 +10,8 @@ const user = {
     info: {},
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    unreadMsgNumber: 0,
   },
 
   mutations: {
@@ -37,6 +38,9 @@ const user = {
     },
     SET_INFO:(state, info) => {
       state.info = info
+    },
+    SET_UNREAD_MSG_NUMBER:(state, info) => {
+      state.unreadMsgNumber = info
     }
   },
 
@@ -71,6 +75,7 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_ID', user.userId)
+          commit('SET_UNREAD_MSG_NUMBER', res.unMsgNumber)
           commit('SET_NAME', user.userName)
           commit('SET_NICK_NAME', user.nickName)
           commit('SET_AVATAR', avatar)
diff --git a/src/views/document/detail.vue b/src/views/document/detail.vue
new file mode 100644
index 0000000..3aa35df
--- /dev/null
+++ b/src/views/document/detail.vue
@@ -0,0 +1,575 @@
+<template>
+  <div class="fbox1">
+    <div class="fl" v-loading="detailLoading">
+      <el-tabs v-model="detailActiveName">
+        <el-tab-pane label="基本信息" name="first">
+          <div class="el-form-border">
+            <el-form ref="form" label-width="150px">
+              <el-row>
+                <el-col :span="24"> <el-form-item label="文件分类">{{form.docCategoryName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="文档编号">{{form.docCode}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="文档名称">{{form.docName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="文档类别"><dict-tag :options="dict.type.doc_class" :value="form.docType"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="文档来源"><dict-tag :options="dict.type.doc_source" :value="form.docSource"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="负责人">{{form.docPrincipalsName}}</el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="归属单位">{{form.docRespDeptName}}</el-form-item> </el-col>
+                <el-col :span="24"> <el-form-item label="备注">{{form.remark}}</el-form-item> </el-col>
+              </el-row>
+            </el-form><!--el-form-->
+          </div><!--el-form-border 表单-->
+        </el-tab-pane><!--el-tab-pane-->
+        <el-tab-pane label="关联附件" name="second">
+          <el-table :data="attachmentList" style="width: 100%">
+            <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
+            <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
+<!--            <el-table-column label="操作" align="center" width="180" v-if="!detailBoolean">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-view"
+                  v-if="previewAuth(scope.row)"
+                  @click="handlePreview(scope.row)"
+                >预览</el-button>
+                <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)"
+                           @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+              </template>
+            </el-table-column>-->
+          </el-table><!--el-table-->
+          <!-- 分页组件 -->
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getAttachmentList"
+          />
+        </el-tab-pane><!--el-tab-pane-->
+      </el-tabs><!--el-tabs-->
+    </div><!--fl 左侧页签-->
+
+    <div class="fr" v-if="isComment">
+      <div class="tboper">
+        <div class="tit">评论</div>
+      </div><!--tboper 标题与操作按钮-->
+      <div class="pltextarea">
+        <el-input v-model="discussionContent" type="textarea" placeholder="请输入您的意见" :rows="4" maxlength="1000" show-word-limit></el-input>
+        <div class="plbtn"><el-button @click="handleDiscussions">发布</el-button></div>
+      </div><!--pltextarea-->
+      <div class="pllist">
+        <template v-if="discussionsList && discussionsList.length > 0">
+          <div class="list" v-for="(item,index) in discussionsList" :key="item.id">
+            <div class="luser"><span class="xuser">{{getFirstChar(item.nickName)}}</span></div>
+            <div class="ltext">
+              <div class="nt"><span class="name">{{item.nickName}}</span><span class="time">{{ parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
+              <div class="te">{{item.content}}</div>
+              <div class="hb">
+                <a class="btn" @click="toggleReplyForm(index)">
+                  <i class="el-icon-chat-line-round"></i>回复
+                </a>
+              </div>
+              <div class="pltextarea" v-if="showReplyForm[index]">
+                <el-input type="textarea" v-model="replyContent[index]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
+                <div class="plbtn">
+                  <el-button @click="cancelReply(index)">取消</el-button>
+                  <el-divider direction="vertical"></el-divider>
+                  <el-button @click="submitReply(index, item)">发布</el-button>
+                </div>
+              </div>
+              <!--第二层级-->
+              <template v-if="item.repliesList && item.repliesList.length > 0">
+                <div class="list" v-for="(repItem,repIdex) in item.repliesList" :key="repItem.id">
+                  <div class="luser"><span class="xuser">{{getFirstChar(repItem.nickName)}}</span></div>
+                  <div class="ltext">
+                    <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
+                    <div class="te">{{repItem.content}}</div>
+                    <!--                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
+                                        <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
+                                          <el-input type="textarea" v-model="item.replyContentSon[repIdex]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
+                                          <div class="plbtn">
+                                            <el-button @click="cancelReplySon(index,repIdex)">取消</el-button>
+                                            <el-divider direction="vertical"></el-divider>
+                                            <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
+                                          </div>
+                                        </div>-->
+                  </div>
+                </div>
+              </template>
+            </div>
+          </div>
+        </template>
+      </div>
+    </div>
+
+
+  </div><!--el-form-border 表单-->
+</template>
+
+<script>
+  import { addDocument, updateDocument, getDocument } from "@/api/document/document";
+  import { deptTreeSelect } from "@/api/system/user";
+  import { documentTree } from "@/api/documentCategory/documentCategory.js";
+  import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
+  import { listReplies, addReplies} from "@/api/tool/replies.js";
+  import { listAttachment } from "@/api/attachment/attachment";
+  import { addCount } from "@/api/tool/downloadCount";
+
+  export default {
+    name: 'editDocument',
+    components: {},
+    dicts:['doc_class','doc_source'],
+    props: {
+      tooId: {
+        type: String,
+        default: "",
+        required: false
+      },
+      relatedTool: {
+        type: Boolean,
+        default: true,
+      },
+      //是否展示下载
+      isDownload: {
+        type: Boolean,
+        default() {
+          return true
+        },
+        required: false
+      },
+      //是否展示评论
+      isComment: {
+        type: Boolean,
+        default() {
+          return true
+        },
+        required: false
+      },
+    },
+    data(){
+      return{
+        detailActiveName: 'first',
+        templateSelection: '',
+        drawer1: false,
+        checkList: [],
+        // 表单参数
+        form: {
+          docId: undefined,
+          docCategoryId: undefined,
+          docCode: '',
+          docName: '',
+          docType: '',
+          docPrincipals: null,
+          docPrincipalsName: null,
+          docRespDept: this.$store.getters.userInfo.deptId,
+          docSource: '',
+          toolId: '',
+          remark: undefined,
+          docCategoryName: undefined,
+        },
+        fileList: [],
+        progress: 0,
+        // 表单校验
+        rules: {
+        },
+        docCategory:[],
+        deptOptions:[],
+        uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
+        fileData: null,
+        editStatus: true,
+        toolDataInfo: [],
+        dataFile: [],
+        //详情
+        detailBoolean: false,
+
+        discussionContent: null, // 评论内容
+        repliesContent: null, // 回复内容
+        // 评论列表
+        discussionsList: [],
+        // 回复列表
+        repliesList: [],
+        showReplyForm: [],
+        replyContent: [],
+        detailLoading: false,
+        attachmentList: [],
+        attFileType: "zip,rar,7z",
+        isPreviewDisable: false,
+        loadingDownload: false,
+        userInfo: this.$store.getters.userInfo,
+        toolPrincipalsChoose: false,
+        docQueryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        total: 0,
+      }
+    },
+    computed: {
+    },
+    created(){
+      // this.getDeptTree();
+      this.getDocumentTree();
+    },
+    mounted(){
+    },
+    methods:{
+      chooseToolConfirm(){
+        this.$set(this.form, "toolId", this.templateSelection)
+        this.drawer1 = false;
+      },
+      getCurrentRow(row){
+        // 获取选中数据   row表示选中这一行的数据，可以从里面提取所需要的值
+      },
+      showOpenHandle(){
+        this.reset();
+        this.title = "上传文档";
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          docName: '',
+          docType: '',
+          docPrincipals: '',
+          docRespDept: '',
+          docSource: '',
+          toolId: ''
+        };
+        this.fileList = []
+        this.resetForm("form");
+      },
+      // 取消按钮
+      cancel() {
+        this.drawer1 = false;
+        this.reset();
+      },
+      generateUniqueID() {
+        // 使用时间戳来生成唯一ID
+        const timestamp = new Date().getTime();
+        // 在ID前面添加一个前缀，以防止与其他ID冲突
+        const uniqueID = 'file_' + timestamp;
+        return uniqueID;
+      },
+      /** 查询部门下拉树结构 */
+      getDeptTree() {
+        deptTreeSelect().then(response => {
+          this.deptOptions = response.data;
+        });
+      },
+      /** 查询树形下拉树结构 */
+      getDocumentTree() {
+        documentTree().then(res => {
+          this.docCategory = res.data;
+        });
+      },
+      /**初始化 **/
+      resetForm() {
+        let self = this
+        self.form.docPrincipalsName = null
+        this.$refs.form.resetFields();
+        this.toolDataInfo = []
+        this.fileList = []
+        this.attachmentList = []
+        this.detailBoolean = false
+        this.setAllRequiredTrue(true)
+        this.$nextTick(()=>{
+          if(self.$refs.uploadFile){
+            self.$refs.uploadFile.clearFile();
+          }
+        })
+      },
+      editInit(docId, type){
+        let self = this
+        if(type == "detail"){
+          this.detailBoolean = true
+          self.setAllRequiredTrue(false)
+        }
+        self.$refs.form.resetFields();
+        self.toolDataInfo = []
+        self.$nextTick(()=>{
+          if(self.$refs.uploadFile){
+            self.$refs.uploadFile.clearFile();
+          }
+
+          getDocument(docId).then(res => {
+            self.form = res.data
+            self.toolDataInfo = []
+            let toolInfo = {toolId:self.form.toolId,toolName:self.form.toolName}
+            self.toolDataInfo.push(toolInfo)
+
+            self.dataFile = []
+           /*  let fileData = res.data.attachment
+            self.$set(fileData, "name", fileData.fileOldName)
+            self.$set(fileData, "size", fileData.fileSize)
+            self.dataFile.push(fileData) */
+
+            self.getAttachmentList()
+
+            setTimeout(() => {
+              self.$set(self.form, "docCategoryName" , self.findLabelById(self.docCategory, self.form.docCategoryId) )
+            }, 300);
+
+          });
+        })
+      },
+      /** 评论 **/
+      handleDiscussions(){
+        let self = this
+        if (this.discussionContent == '' || this.discussionContent == null || this.discussionContent == undefined) {
+          self.$message({
+            message: '内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          businessId: this.form.docId,
+          content: this.discussionContent,
+          type: "doc",
+        }
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addDiscussions(data).then(res => {
+            this.discussionContent = null
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.getAttachmentList()
+          }).catch(err =>{
+            this.discussionContent = null
+            console.error("handleDiscussions==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+      },
+      getAttachmentList() {
+        let self = this
+        this.$set(this.queryParams,'del',"0")
+        this.$set(this.queryParams,'businessId',this.form.docId)
+        listAttachment(this.queryParams).then(res => {
+          self.attachmentList = res.rows;
+          self.total = res.total;
+          self.loading = false;
+        });
+
+      },
+      getFirstChar(value) {
+        if(!value){return ''}
+        return value.charAt(0);
+      },
+      toggleReplyForm(index) {
+        this.$set(this.showReplyForm, index, !this.showReplyForm[index]);
+      },
+      cancelReply(index) {
+        this.$set(this.showReplyForm, index, false);
+        this.$set(this.replyContent, index, '');
+      },
+      /** 第二级 **/
+      toggleReplyFormSon(parentIndex, repIndex) {
+        const parentItem = this.discussionsList[parentIndex];
+        this.$set(parentItem.showReplyFormSon, repIndex, !parentItem.showReplyFormSon[repIndex]);
+        // this.$set(this.showReplyFormSon, index, !this.showReplyFormSon[index]);
+      },
+      /** 第二级，取消回复 **/
+      cancelReplySon(parentIndex, repIndex) {
+        const parentItem = this.discussionsList[parentIndex];
+        this.$set(parentItem.showReplyFormSon, repIndex, false);
+        this.$set(parentItem.replyContentSon, repIndex, '');
+      },
+      /** 第二级回复 **/
+      submitReplySon(parentIndex, repIndex, repItem) {
+        let self = this
+        const parentItem = this.discussionsList[parentIndex];
+        const content = parentItem.replyContentSon[repIndex];
+        if (content.trim() == '' || content == null || content == undefined) {
+          self.$message({
+            message: '回复内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          "discussionId": repItem.id,
+          "content": content,
+        }
+
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addReplies(data).then(res => {
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.cancelReplySon(parentIndex, repIndex)
+            self.getAttachmentList()
+          }).catch(err =>{
+            console.error("submitReplySon==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+
+        // 清空回复内容并隐藏表单
+        this.$set(parentItem.replyContentSon, repIndex, '');
+        this.$set(parentItem.showReplyFormSon, repIndex, false);
+      },
+      /** 回复 **/
+      submitReply(index, item) {
+        let self = this
+        const content = this.replyContent[index];
+        if (content == '' || content == null || content == undefined) {
+          self.$message({
+            message: '回复内容不能为空',//提示的信息
+            type:'warning',　　//类型是成功
+            duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+          });
+          return;
+        }
+        let data = {
+          "discussionId": item.id,
+          "content": content,
+        }
+
+        self.$modal.confirm('是否确认发布？').then(()=> {
+          addReplies(data).then(res => {
+            self.$message({
+              message: '发布成功',//提示的信息
+              type:'success',　　//类型是成功
+              duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
+            });
+            self.cancelReply(index)
+            self.getAttachmentList()
+          }).catch(err =>{
+            console.error("handleDiscussions==err==", err)
+            self.$modal.msgError("发布失败");
+          });
+        })
+
+        // 清空回复内容并隐藏表单
+        this.replyContent[index] = '';
+        this.showReplyForm[index] = false;
+      },
+      previewAuth(row){
+        if(row.fileUrl == null || row.fileUrl == '' || row.fileUrl == undefined){
+          return false
+        }
+        let extension = this.getExtension(row.fileUrl);
+        const acceptedExtensions = this.attFileType.toLowerCase().split(',');
+        if(acceptedExtensions.includes(extension)){
+          return false
+        }
+        return true
+      },
+      getExtension(filePath) {
+        // 分割字符串，以 '.' 为分隔符
+        const parts = filePath.split('.');
+        // 取最后一个部分作为后缀名
+        const extension = parts.pop();
+        return extension;
+      },
+      handlePreview(row){
+        this.isPreviewDisable = true
+        this.$nextTick(() => {
+          this.$refs.previewForm.frontModulePreview(row)
+        })
+      },
+      /** 关闭预览 **/
+      previewClose(){
+        this.isPreviewDisable = false
+      },
+      /**
+       * 处理下载
+       * **/
+      handleDownload(row){
+        let self = this
+        self.loadingDownload = true
+        this.$download.resource(row.fileUrl);
+
+        //保存下载记录
+        if(row.businessId){
+          let formData = {
+            'businessId': row.businessId,
+            'businessType': 'doc',
+            'attId': row.id,
+            'attName': row.fileOldName
+          }
+          addCount(formData).then(res => {
+          });
+        }
+
+        setTimeout(()=>{
+          self.loadingDownload = false
+        },1000)
+      },
+      handleDelete(row){
+        const index = this.attachmentList.findIndex(item => item.fileNewName == row.fileNewName);
+        if (index !== -1) {
+          // 从 attachmentList 中删除数据
+          this.attachmentList.splice(index, 1);
+          // 处理当前页面可能没有数据的情况，跳到上一页
+          if (this.paginatedData.length === 0 && this.currentPage > 1) {
+            this.currentPage--;
+          }
+        }
+        // this.attachmentList.splice(row,1)
+      },
+      handleBeforeClose() {
+        this.viewDialogOpen = false
+      },
+      handleUploadSuccess(res) {
+        this.attachmentList.push(res)
+        // 处理上传成功后的逻辑
+      },
+      handleUploadError(error) {
+        // 处理上传失败后的逻辑
+      },
+      isShowOperation(row){
+        let self = this
+        if(row.businessId == null || row.businessId == undefined || row.businessId == ''){
+          return false
+        }
+        return true
+      },
+      submitPeople(peopleList){
+        this.$set(this.form,'docPrincipals',peopleList[0]['userId'])
+        this.$set(this.form,'docPrincipalsName',peopleList[0]['nickName'])
+        this.toolPrincipalsChoose = false;
+      },
+      setAllRequiredTrue(value) {
+        Object.keys(this.rules).forEach(key => {
+          this.rules[key].forEach(rule => {
+            rule.required = value;
+          });
+        });
+      },
+      handlePageChange(newPage) {
+        this.currentPage = newPage;
+      },
+      // 递归查找方法
+      findLabelById(treeData, id) {
+        for (let i = 0; i < treeData.length; i++) {
+          let item = treeData[i];
+          if (item.id == id) {
+            return item.label;
+          }
+          if (item.children && item.children.length) {
+            const label = this.findLabelById(item.children, id);
+            if (label) {
+              return label;
+            }
+          }
+        }
+        return null;
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index 242f428..cfcdb44 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -23,7 +23,7 @@
 
             <el-col :span="24">
               <el-form-item label="文档名称" prop="docName">
-                <template v-if="detailBoolean">{{form.docCode}}</template>
+                <template v-if="detailBoolean">{{form.docName}}</template>
                 <template v-else>
                   <el-input v-model="form.docName" placeholder="请输入文档名称" maxlength="200" show-word-limit/>
                 </template>
@@ -130,10 +130,6 @@
       </div>
       <div class="el-form-border">
         <div class="operate">
-          <!--        <el-form-item label="文件" required>
-
-                  </el-form-item>
-                  <el-button type="primary" icon="el-icon-upload2" v-if="editStatus" @click="handleDocAdd">上传</el-button>-->
           <template v-if="editStatus && !detailBoolean">
             <uploadVue
               :display="editStatus"
@@ -150,12 +146,12 @@
           </template>
           <!--            <el-button icon="el-icon-delete">删除</el-button>-->
         </div><!--operate 操作按钮-->
-        <el-table :data="attachmentList" style="width: 100%">
+        <el-table :data="paginatedData" style="width: 100%">
           <!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
-          <el-table-column label="序号" width="60" type="index"></el-table-column>
+          <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
           <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
-          <el-table-column label="操作" align="center" width="180">
-            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <el-table-column label="操作" align="center" width="180" v-if="!detailBoolean">
+            <template slot-scope="scope">
               <el-button
                 size="mini"
                 type="text"
@@ -167,24 +163,27 @@
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
-                v-if="editStatus && !detailBoolean"
+                v-if="editStatus"
                 @click="handleDelete(scope.row)"
               >删除</el-button>
-              <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+              <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)"
+                         @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
             </template>
           </el-table-column>
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getAttachmentList"
-          />
         </el-table><!--el-table-->
+        <!-- 分页组件 -->
+        <el-pagination
+          v-show="total > 0"
+          :current-page.sync="currentPage"
+          :page-size.sync="pageSize"
+          :total="total"
+          @current-change="handlePageChange"
+          layout="total, prev, pager, next"
+        />
       </div>
     </div><!--fl 左侧页签-->
 
-    <div class="fr" v-if="detailBoolean">
+    <div class="fr" v-if="detailBoolean && isComment">
       <div class="tboper">
         <div class="tit">评论</div>
       </div><!--tboper 标题与操作按钮-->
@@ -274,6 +273,22 @@
         type: Boolean,
         default: true,
       },
+      //是否展示下载
+      isDownload: {
+        type: Boolean,
+        default() {
+          return true
+        },
+        required: false
+      },
+      //是否展示评论
+      isComment: {
+        type: Boolean,
+        default() {
+          return true
+        },
+        required: false
+      },
     },
     data(){
       return{
@@ -368,12 +383,25 @@
         },
         queryParams: {
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 99999,
         },
-        total: 0
+        currentPage: 1,     // 当前页
+        pageSize: 10,       // 每页显示数量
 
       }
     },
+    computed: {
+      // 分页后的数据
+      paginatedData() {
+        const start = (this.currentPage - 1) * this.pageSize;
+        const end = this.currentPage * this.pageSize;
+        return this.attachmentList.slice(start, end);
+      },
+      // 总数据条数
+      total() {
+        return this.attachmentList.length;
+      },
+    },
     created(){
       this.getDeptTree();
       this.getDocumentTree();
@@ -639,9 +667,9 @@
         let self = this
         this.$set(this.queryParams,'del',"0")
         this.$set(this.queryParams,'businessId',this.form.docId)
-        listAttachment({businessId:this.form.docId}).then(res => {
+        listAttachment(this.queryParams).then(res => {
           self.attachmentList = res.rows;
-          self.total = res.total;
+          // self.total = res.total;
           self.loading = false;
         });
       },
@@ -794,7 +822,16 @@
         },1000)
       },
       handleDelete(row){
-        this.attachmentList.splice(row,1)
+        const index = this.attachmentList.findIndex(item => item.fileNewName == row.fileNewName);
+        if (index !== -1) {
+          // 从 attachmentList 中删除数据
+          this.attachmentList.splice(index, 1);
+          // 处理当前页面可能没有数据的情况，跳到上一页
+          if (this.paginatedData.length === 0 && this.currentPage > 1) {
+            this.currentPage--;
+          }
+        }
+        // this.attachmentList.splice(row,1)
       },
       handleBeforeClose() {
         this.viewDialogOpen = false
@@ -824,7 +861,10 @@
             rule.required = value;
           });
         });
-      }
+      },
+      handlePageChange(newPage) {
+        this.currentPage = newPage;
+      },
 
     }
   }
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index dd00dfb..d43cd76 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -228,6 +228,7 @@
       </span>
     </el-dialog>
 
+    <!--文档修改-->
     <el-drawer :visible.sync="open"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
                size="75%">
@@ -245,7 +246,21 @@
     </el-drawer>
 
 
-    <!-- 工具导出对话框 -->
+    <!--文档详情-->
+    <el-drawer :visible.sync="detailDocOpen"
+               :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
+               size="75%">
+      <template #title>
+        <span class="title">{{docTitle}}</span>
+        <div class="drawer-head-btn">
+          <el-button @click="docDetailCancel()">关 闭</el-button>
+        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
+      </template>
+      <doc-detail ref="docDetailRef" @submit="docDetailFormSubmit"/>
+    </el-drawer>
+
+
+    <!-- 文档导出对话框 -->
     <el-dialog :title="exportTitle" :visible.sync="exportDrawerOpen"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
                width="980px" append-to-body>
@@ -288,7 +303,7 @@
       </span>
     </el-dialog>
 
-    <!-- 工具详情对话框 -->
+    <!-- 文档下载对话框 -->
     <el-drawer :visible.sync="fileDetailDrawerOpen"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
                size="80%" class="no-padding" @close="handleFileCloseDetail()">
@@ -302,7 +317,8 @@
         <download-file-detail ref="downloadFileDetailRef" :docDetail="docDetail"/>
       </template>
     </el-drawer><!--el-drawer 详情-抽屉-->
-<!--    <upload-progress/>-->
+
+
   </div>
 </template>
 
@@ -316,10 +332,12 @@ import uploadProgress from "./uploadProgress";
 import Treeselect from "@riophae/vue-treeselect";
 import { exportDocx } from '@/utils/docUtil/docutil.js';
 import downloadFileDetail from "./downloadFileDetail.vue";
+import docDetail from "@/views/document/detail";
+import store from "@/store";
 
 export default {
   name: "Document",
-  components: { editDocument, uploadProgress, Treeselect, downloadFileDetail},
+  components: { editDocument, uploadProgress, Treeselect, downloadFileDetail, docDetail},
   dicts:['doc_class','doc_source','doc_upload_status'],
   data() {
     return {
@@ -447,6 +465,8 @@ export default {
       batchExportFlag: false,
       //查询
       selection: undefined,
+      docDetail: {},
+      detailDocOpen: false,
     };
   },
   created() {
@@ -523,12 +543,12 @@ export default {
       })
     },
     handleDetail(row){
-      this.docTitle="详情"
+      this.docTitle="文档详情"
       this.docTipAddOrEdit = 'detail'
       this.docDetailDisable=false
-      this.open = true
+      this.detailDocOpen = true
       this.$nextTick(()=>{
-        this.$refs.editDocumentRef.editInit(row.docId, "detail");
+        this.$refs.docDetailRef.editInit(row.docId, "detail");
       })
     },
     handlePreview(row){
@@ -550,6 +570,10 @@ export default {
       this.open = false;
       this.getList();
     },
+    docDetailFormSubmit: function() {
+      this.detailDocOpen = false;
+      this.getList();
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       let self = this
@@ -648,16 +672,30 @@ export default {
     },
     /** 发布操作 */
     handlePush(row) {
+      let self = this
       const docIds = row.docId || this.ids;
       if(docIds == null || docIds == undefined || docIds =='' || docIds.length < 0){
         this.$modal.msgError(`最少选择一条数据`);
         return;
       }
+      //只能删除已上传数据
+      let delFlag = false;
+      for(let item of self.selection){
+        if(!(item.docStatus == 'ysc')){
+          delFlag = true;
+        }
+      }
+      if(delFlag){
+        this.$modal.msgError(`只能发布文档状态为[已上传]数据,请重新选择`);
+        return
+      }
+
       this.$modal.confirm('是否确认发布？').then(function() {
         return pushDoc(docIds);
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("发布成功");
+        self.getList();
+        store.commit('SET_UNREAD_MSG_NUMBER', this.$store.state.user.unreadMsgNumber+1);
+        self.$modal.msgSuccess("发布成功");
       }).catch((err) => {
         console.error(err)
       });
@@ -672,6 +710,10 @@ export default {
       this.$refs.editDocumentRef.resetForm();
       this.open = false
     },
+    docDetailCancel(){
+      this.$refs.docDetailRef.resetForm();
+      this.detailDocOpen = false
+    },
     previewAuth(row){
       if(row.docUrl == null || row.docUrl == '' || row.docUrl == undefined){
         return false
diff --git a/src/views/filestatistic/index.vue b/src/views/filestatistic/index.vue
index 6c2cdc4..bfdf9ac 100644
--- a/src/views/filestatistic/index.vue
+++ b/src/views/filestatistic/index.vue
@@ -80,7 +80,7 @@
           </div>
           <div class="rt">
             <el-table v-loading="downLoading" :data="toolDownStatList">
-              <el-table-column type="index" label="序号" width="50" />
+              <el-table-column type="index" label="序号" width="50" align="center"/>
               <el-table-column label="文档编号" align="center" key="docCode" prop="docCode" />
               <el-table-column label="文档名称" align="center" key="docName" prop="docName"  :show-overflow-tooltip="true" />
               <el-table-column label="下载次数" align="center" key="docDownNum" prop="docDownNum" width="120" />
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 05ad9ea..11e6046 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -13,8 +13,19 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="消息类型" prop="businessType">
+              <el-select v-model="queryParams.businessType" placeholder="请选择消息类型" clearable>
+                <el-option
+                  v-for="dict in dict.type.msg_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+
             <el-form-item label="状态" prop="states">
-              <el-select v-model="queryParams.states" placeholder="状态" clearable>
+              <el-select v-model="queryParams.states" placeholder="请选择状态" clearable>
                 <el-option
                   v-for="dict in dict.type.msg_status"
                   :key="dict.value"
@@ -37,10 +48,24 @@
           <el-button type="primary" v-if="tableList && tableList.length > 0" @click="setAllMarkedRead" icon="el-icon-check">全部标记已读</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="tableList">
-          <el-table-column type="index" label="序号" width="50" />
-          <el-table-column label="消息内容" prop="content" min-width="120" />
-          <el-table-column label="接收时间" prop="createTime" :show-overflow-tooltip="true" min-width="120"/>
-          <el-table-column label="消息状态" prop="states" :show-overflow-tooltip="true" min-width="80" >
+          <el-table-column type="index" label="序号" width="50" align="center" />
+          <el-table-column label="消息内容" prop="content" min-width="120">
+            <template  v-slot="{ row }">
+              <el-link target="_blank" @click="handleDetail(row)">
+                {{ row.content }}
+              </el-link>
+            </template>
+          </el-table-column>
+          <el-table-column label="消息类型" align="center" prop="businessType" width="80px">
+            <template  v-slot="{ row }">
+              <template v-for="dict in dict.type.msg_type">
+                <!-- {{ dict }} -->
+                <el-tag :type="dict.raw.listClass" v-if="row.businessType == dict.value" :key="dict.value">{{ dict.label }}</el-tag>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column label="接收时间" prop="createTime" :show-overflow-tooltip="true" width="160px"/>
+          <el-table-column label="消息状态" prop="states" align="center" :show-overflow-tooltip="true" width="80px" >
             <template  v-slot="{ row }">
               <template v-for="dict in dict.type.msg_status">
                 <!-- {{ dict }} -->
@@ -48,7 +73,7 @@
               </template>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="100" fixed="right">
+          <el-table-column label="操作" align="center" width="160px" fixed="right">
             <template v-slot="{ row }">
               <el-button
                 size="mini"
@@ -69,16 +94,52 @@
         />
       </div>
     </el-card>
+
+
+    <!-- 工具详情对话框 -->
+    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" :show-close="false"
+               size="80%" class="no-padding" :close-on-press-escape="false"	@close="handleCloseDetail()">
+      <template #title>
+        <span>{{toolTitle}}</span>
+        <div class="drawer-head-btn">
+          <el-button @click="detailDrawerOpen = false">关 闭</el-button>
+        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
+      </template>
+      <template v-if="detailOpen">
+        <tool-detail ref="toolDetailRef" :toolDetail="toolDetail" :isDownload="false" :isComment="false"/>
+      </template>
+    </el-drawer><!--el-drawer 详情-抽屉-->
+
+
+
+    <!--文档详情-->
+    <el-drawer :visible.sync="detailDocOpen"
+               :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
+               size="75%">
+      <template #title>
+        <span class="title">{{docTitle}}</span>
+        <div class="drawer-head-btn">
+          <el-button @click="docCancel()">关 闭</el-button>
+        </div><!--drawer-head-btn 抽屉顶部按钮区域-->
+      </template>
+      <doc-detail ref="editDocumentRef" @submit="editDocumentSubmit" :isDownload="false" :isComment="false"/>
+    </el-drawer>
+
   </div>
 </template>
 
 <script>
-import { listMessage, getMessage, delMessage, addMessage, updateMessage,allMarkedRead } from "@/api/message/message"
+import { listMessage, updateMessage,allMarkedRead } from "@/api/message/message"
 import { deptTreeSelect } from "@/api/system/user";
+import docDetail from "@/views/document/detail";
+import toolDetail from "@/views/tool/toolDetail";
+import {  getUserMsgCount } from "@/api/message/message"
 
 export default {
   name: "Document",
-  dicts: ['msg_status'],
+  dicts: ['msg_status', 'msg_type'],
+  components: { docDetail, toolDetail},
+
   data() {
     return {
       // 遮罩层
@@ -120,7 +181,18 @@ export default {
         pageSize: 10,
         content: '',
         states: '',
+        businessType: '',
       },
+      //工具
+      detailDrawerOpen: false,
+      toolTitle:'',
+      detailOpen: false,
+      toolDetail: {},
+      //文档
+      docTitle: '',
+      detailDocOpen: false,
+      docTipAddOrEdit: null,
+      docDetailDisable: true,
     };
   },
   created() {
@@ -179,6 +251,9 @@ export default {
         self.$set(formData, "states", 2)
           updateMessage(formData).then(response => {
             self.$modal.msgSuccess(response?.msg || '操作成功')
+            getUserMsgCount(self.$store.getters.userId).then(res => {
+              self.$store.commit("SET_UNREAD_MSG_NUMBER", res.data);
+            });
             self.getList();
           })
       }).catch((err) => {console.error(err)});
@@ -200,10 +275,48 @@ export default {
         }
         allMarkedRead(formData).then(response => {
           self.$modal.msgSuccess(response?.msg || '操作成功')
+
+          getUserMsgCount(self .$store.getters.userId).then(res => {
+            self.$store.commit("SET_UNREAD_MSG_NUMBER", res.data);
+          });
+
           self.getList();
         })
       }).catch((err) => {console.error(err)});
     },
+    /** 查看详情 **/
+    handleDetail(row){
+      if(row.businessType == 'tool'){
+        this.detailDrawerOpen = true
+        this.detailOpen = true
+        this.toolDetail = {toolId: row.businessId}
+        this.toolTitle = '工具详情'
+      }else if(row.businessType == 'doc'){
+        this.docTitle="文档详情"
+        this.docTipAddOrEdit = 'detail'
+        this.docDetailDisable=false
+        this.detailDocOpen = true
+        this.$nextTick(()=>{
+          this.$refs.editDocumentRef.editInit(row.businessId, "detail");
+        })
+      }
+    },
+    /** 关闭详情 **/
+    handleCloseDetail(){
+      this.detailDrawerOpen = false;
+      this.detailOpen = false;
+      this.$refs.toolDetailRef.$destroy(); // 销毁组件
+      this.$nextTick(() => {
+        this.$refs.toolDetailRef = null; // 清空引用
+      });
+    },
+    docCancel(){
+      this.$refs.editDocumentRef.resetForm();
+      this.detailDocOpen = false
+    },
+    editDocumentSubmit: function() {
+      this.detailDocOpen = false;
+    },
   }
 };
 </script>
diff --git a/src/views/monitor/cache/list.vue b/src/views/monitor/cache/list.vue
index 29a7c74..e9da267 100644
--- a/src/views/monitor/cache/list.vue
+++ b/src/views/monitor/cache/list.vue
@@ -23,6 +23,7 @@
             <el-table-column
               label="序号"
               width="60"
+              align="center"
               type="index"
             ></el-table-column>
 
@@ -81,6 +82,7 @@
             <el-table-column
               label="序号"
               width="60"
+              align="center"
               type="index"
             ></el-table-column>
             <el-table-column
diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue
index 0b67ab7..779f1ee 100644
--- a/src/views/statistic/index.vue
+++ b/src/views/statistic/index.vue
@@ -95,7 +95,7 @@
           </div>
           <div class="rt">
             <el-table v-loading="downLoading" :data="toolDownStatList">
-              <el-table-column type="index" label="序号" width="50" />
+              <el-table-column type="index" label="序号" width="50" align="center"/>
               <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" />
               <el-table-column label="工具名称" align="center" key="toolName" prop="toolName"  :show-overflow-tooltip="true" />
               <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index faa733b..d4d7b78 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -290,16 +290,15 @@ export default {
           value: "1",
           label: "全部数据权限"
         },
-        /*
         {
           value: "2",
           label: "自定数据权限"
-        },*/
+        },
         {
           value: "3",
           label: "本部门数据权限"
         }
-        /*,
+        ,
         {
           value: "4",
           label: "本部门及以下数据权限"
@@ -307,7 +306,7 @@ export default {
         {
           value: "5",
           label: "仅本人数据权限"
-        }*/
+        }
       ],
       // 菜单列表
       menuOptions: [],
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 4df0b82..311f1a5 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -95,16 +95,16 @@
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" ref="tableRef" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
-          <el-table-column label="工具编号"  key="toolCode" prop="toolCode" v-if="columns[0].visible" />
-          <el-table-column label="工具名称"  key="toolName" prop="toolName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="工具类别"  key="toolType" prop="toolType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
+          <el-table-column label="工具编号"  key="toolCode" prop="toolCode"  width="150px"/>
+          <el-table-column label="工具名称"  key="toolName" prop="toolName" :show-overflow-tooltip="true" width="150px"/>
+          <el-table-column label="工具类别"  key="toolType" prop="toolType" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
             </template>
           </el-table-column>
-          <el-table-column label="归属单位"  key="toolRespDeptName" prop="toolRespDeptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+          <el-table-column label="归属单位"  key="toolRespDeptName" prop="toolRespDeptName" :show-overflow-tooltip="true" />
+          <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" width="120" />
+          <el-table-column label="状态" align="center" key="status" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
@@ -146,7 +146,7 @@
           </el-table-column>
 
 
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建时间" align="center" prop="createTime" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -155,12 +155,12 @@
             label="操作"
             align="center"
             fixed="right"
-            width="270px"
+            width="260px"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
-<!--              && !scope.row.downloadStatus-->
-              <el-button type="text" icon="el-icon-info" v-if="checkApplyUseBtn(scope.row)" @click="applyUse(scope.row)">申请使用</el-button>
+<!--              && !scope.row.downloadStatus v-if="checkApplyUseBtn(scope.row)"-->
+              <el-button type="text" icon="el-icon-info"  @click="applyUse(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
               <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus" @click="handleFileDownload(scope.row)">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 1cba752..bd2e3a2 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -29,7 +29,7 @@
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="关联文件" name="second">
+        <el-tab-pane label="关联附件" name="second">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
 <!--            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
@@ -58,21 +58,21 @@
                   v-if="previewAuth(scope.row)"
                   @click="handlePreview(scope.row)"
                 >预览</el-button>
-                <el-button type="text" icon="el-icon-download" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+                <el-button type="text" icon="el-icon-download" v-if="isDownload" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
               </template>
             </el-table-column>
           </el-table><!--el-table-->
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getAttachmentList"
+          />
         </el-tab-pane><!--el-tab-pane-->
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getAttachmentList"
-        />
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
-    <div class="fr">
+    <div class="fr" v-if="isComment">
       <div class="tboper">
         <div class="tit">评论</div>
       </div><!--tboper 标题与操作按钮-->
@@ -162,7 +162,19 @@
         type: Object,
         default: {},
         required: false
-      }
+      },
+      //是否展示下载
+      isDownload: {
+        type: Boolean,
+        default: true,
+        required: false
+      },
+      //是否展示评论
+      isComment: {
+        type: Boolean,
+        default: true,
+        required: false
+      },
     },
     data(){
       return{
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index aecc12e..52daeef 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -244,7 +244,7 @@
         </template>
         <!--            <el-button icon="el-icon-delete">删除</el-button>-->
       </div><!--operate 操作按钮-->
-      <el-table :data="attachmentList" style="width: 100%">
+      <el-table :data="paginatedData" style="width: 100%">
         <!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
         <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
         <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
@@ -268,6 +268,15 @@
           </template>
         </el-table-column>
       </el-table><!--el-table-->
+      <!-- 分页组件 -->
+      <el-pagination
+        v-show="total > 0"
+        :current-page.sync="currentPage"
+        :page-size.sync="pageSize"
+        :total="total"
+        @current-change="handlePageChange"
+        layout="total, prev, pager, next"
+      />
     </div>
 
     <!-- 流程选择下一环节及人员  开始 -->
@@ -330,6 +339,7 @@ import ToolSelector from '@/components/tool-selector/index.vue'
 import uploadVue from '@/components/FileUpload/optimizeToolUpload.vue'
 import { addCount } from "@/api/tool/downloadCount";
 import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
+import store from "@/store";
 
 // PDF本地文件预览
 export default {
@@ -364,10 +374,9 @@ export default {
     return {
       toolPrincipalsChoose: false,
       addDocShow: false,
-      docQueryParams: {
+      attQueryParams: {
         pageNum: 1,
-        pageSize: 10,
-        toolId: ''
+        pageSize: 99999,
       },
       defaultStaff: [],
       yes: 'Y',
@@ -462,10 +471,23 @@ export default {
       attachmentList: [],
       attFileType: "zip,rar,7z",
       isPreviewDisable: false,
-      title: '工具发布'
+      title: '工具发布',
+      currentPage: 1,     // 当前页
+      pageSize: 10,       // 每页显示数量
     };
   },
-  computed: {},
+  computed: {
+    // 分页后的数据
+    paginatedData() {
+      const start = (this.currentPage - 1) * this.pageSize;
+      const end = this.currentPage * this.pageSize;
+      return this.attachmentList.slice(start, end);
+    },
+    // 总数据条数
+    total() {
+      return this.attachmentList.length;
+    },
+  },
   watch: {
     data (val) {
       if (val) {
@@ -524,7 +546,7 @@ export default {
         // _this.attachmentList = formData.attachmentList
         formData.association = JSON.parse(res.data.association)
         _this.form = formData
-        _this.getDocumentList(res.data.toolId)
+        _this.getAttachmentList(res.data.toolId)
       }).finally(()=>{
         _this.detailLoading = false
       });
@@ -812,6 +834,10 @@ export default {
         this.$set(formData,'attachmentList',_this.attachmentList)
         addTool(formData).then((res) => {
           if (res.code===200) {
+            /* if(formData.recordStatus == 'done'){
+              console.info("2222222222222222", _this.$store.state.user.unreadMsgNumber+1)
+              store.commit('SET_UNREAD_MSG_NUMBER', _this.$store.state.user.unreadMsgNumber+1);
+            } */
             _this.$message({
               message: '流程提交成功',//提示的信息
               type:'success',　　//类型是成功
@@ -833,7 +859,15 @@ export default {
       });
     },
     handleDelete(row){
-      this.attachmentList.splice(row,1)
+      const index = this.attachmentList.findIndex(item => item.fileNewName == row.fileNewName);
+      if (index !== -1) {
+        // 从 attachmentList 中删除数据
+        this.attachmentList.splice(index, 1);
+        // 处理当前页面可能没有数据的情况，跳到上一页
+        if (this.paginatedData.length === 0 && this.currentPage > 1) {
+          this.currentPage--;
+        }
+      }
     },
     /**
      * 新增上传附件
@@ -844,13 +878,13 @@ export default {
         this.$refs.addDocRef.resetForm()
       })
     },
-    getDocumentList(toolId) {
+    getAttachmentList(toolId) {
       this.loading = true
-      this.$set(this.docQueryParams,'del',"0")
-      this.$set(this.docQueryParams,'businessId',toolId)
-      listAttachment(this.docQueryParams).then(res => {
+      this.$set(this.attQueryParams,'del',"0")
+      this.$set(this.attQueryParams,'businessId',toolId)
+      listAttachment(this.attQueryParams).then(res => {
           this.attachmentList = res.rows;
-          this.total = res.total;
+          // this.total = res.total;
           this.loading = false;
         }
       );
@@ -978,6 +1012,9 @@ export default {
     handleUploadError(error) {
       // 处理上传失败后的逻辑
     },
+    handlePageChange(newPage) {
+      this.currentPage = newPage;
+    },
 
 },
 
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index 7d60149..eeecb5a 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -185,6 +185,8 @@ import { addApply, getInfoByBpmcId, updateApply } from '@/api/tool/toolApply'
 import { listItem } from '@/api/tool/userApplyItem'
 import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 import { getTool } from "@/api/tool/tool";
+import store from "@/store";
+
 // PDF本地文件预览
 export default {
   dicts: ['sys_normal_disable','tool_type', 'tool_source', 'tool_status'],
@@ -619,6 +621,9 @@ export default {
         formData.editStatus = _this.editStatus
         addApply(formData).then((res) => {
           if (res.code===200) {
+            if(formData.recordStatus == 'done'){
+              store.commit('SET_UNREAD_MSG_NUMBER', _this.$store.state.user.unreadMsgNumber+1);
+            }
             _this.$message({
               message: '流程提交成功',//提示的信息
               type:'success',　　//类型是成功
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 110e3c0..8c2b3d3 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -120,6 +120,8 @@
 <script>
 import { workflowToDoList } from "@/api/my_business/workflow";
 import DealDrawer from "@/components/DealDrawer";
+import {  getUserMsgCount } from "@/api/message/message"
+
 export default {
   name: "Post",
   dicts: ["sys_normal_disable", "sys_operterType"],
@@ -269,6 +271,9 @@ export default {
     // 取消按钮
     handleCloseChange() {
       this.dealDrawerShow = false
+      getUserMsgCount(this.$store.getters.userId).then(res => {
+        this.$store.commit("SET_UNREAD_MSG_NUMBER", res.data);
+      });
       this.getListData();
     },
     /** 搜索按钮操作 */
-- 
2.35.1.windows.2


From 37230039da9d92dc2dec017714b82b4478251a7b Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sat, 7 Sep 2024 10:51:49 +0800
Subject: [PATCH 38/55] =?UTF-8?q?1=E3=80=81=E5=B7=A6=E4=BE=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=91=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=202?=
 =?UTF-8?q?=E3=80=81=E2=80=9C=E5=AF=BC=E5=87=BA=E2=80=9D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=85=A8=E9=87=8F=E5=AF=BC=E5=87=BA=203=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=8A=9F=E8=83=BD=204=E3=80=81=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=81=AE=E7=BD=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/tool.css                        |  2 +-
 src/components/FileUpload/sgDragSize.vue   | 72 ++++++++++++++++++++++
 src/components/PreviewUtil/previewUtil.vue |  6 ++
 src/views/document/detail.vue              | 23 +++++--
 src/views/document/downloadFileDetail.vue  | 15 +++--
 src/views/document/index.vue               |  4 +-
 src/views/tool/downloadFileDetail.vue      | 11 +++-
 src/views/tool/index.vue                   | 16 +++--
 src/views/tool/toolDetail.vue              | 24 +++-----
 9 files changed, 137 insertions(+), 36 deletions(-)

diff --git a/public/css/tool.css b/public/css/tool.css
index db14df0..20cf340 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -2162,7 +2162,7 @@ body .el-card.lrtt>.el-card__body{
 .lrtt .lt{
   display: block;
   padding: 16px;
-  width: 310px;
+  width: 250px;
   height: 700px;
   overflow: auto;
 }
diff --git a/src/components/FileUpload/sgDragSize.vue b/src/components/FileUpload/sgDragSize.vue
index 2c7fa5d..f7ab10c 100644
--- a/src/components/FileUpload/sgDragSize.vue
+++ b/src/components/FileUpload/sgDragSize.vue
@@ -5,6 +5,8 @@
   </div>
 </template>
 <script>
+import axios from 'axios'
+
 export default {
   name: 'sgDragSize',
   data() {
@@ -49,6 +51,76 @@ export default {
     this.__removeWindowEvents();
   },
   methods: {
+    uploadFile({ data, file }) {
+      let self = this
+      //初始化参数
+      return new Promise((resolve, reject) => {
+        //初始化参数
+        if (file.size < this.partSize) {
+          let formData = new FormData();
+          formData.append("file", file);
+          self.progressFlag = true;
+
+          axios({
+            url: self.uploadUrl,
+            method: 'post',
+            data: formData,
+            headers: {
+              'Authorization': 'Bearer ' + getToken(),
+              'Content-Type': 'multipart/form-data'
+            },
+            onUploadProgress: progressEvent => {
+              // 更新进度条
+              self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
+            }
+          })
+            .then(res => {
+              setTimeout(() => {
+                if (res.data.code == 200) {
+                  setTimeout(function () {
+                    // 文件夹上传逻辑
+                    if (self.isFolder) {
+                      self.fileList.push(file);
+                    }
+                    self.$message({
+                      message: '上传成功！',
+                      type: 'success',
+                      duration: '2000'
+                    });
+                    self.progressFlag = false;
+                    self.progressPercent = 0;
+                    self.handleResult(res, file);
+                    resolve(res);  // 成功后 resolve
+                  }, 500);
+                } else {
+                  self.progressFlag = false;
+                  self.$message({
+                    message: '上传失败！',
+                    type: 'error',
+                    duration: '2000'
+                  });
+                  reject(new Error('上传失败'));  // 失败后 reject
+                }
+              }, 1000);
+            })
+            .catch(error => {
+              console.error(error);
+              self.progressFlag = false;
+              self.progressPercent = 0;
+              self.$refs.upload.clearFiles();
+              self.$message({
+                message: '上传失败！',
+                type: 'error',
+                duration: '2000'
+              });
+              reject(error);  // 上传异常时 reject
+            });
+        } else {
+          // 大文件分片逻辑
+          reject(new Error('文件过大，使用分片上传'));
+        }
+      });
+    },
     view_innerHeight() {
       return innerHeight - this.tbHeight;
     },
diff --git a/src/components/PreviewUtil/previewUtil.vue b/src/components/PreviewUtil/previewUtil.vue
index e5a4c3c..886958a 100644
--- a/src/components/PreviewUtil/previewUtil.vue
+++ b/src/components/PreviewUtil/previewUtil.vue
@@ -147,6 +147,7 @@ export default {
       if(row.fileName.endsWith(".jpg") || row.fileName.endsWith(".png")){
         this.$viewerApi({images: [row.fileUrl]})
         self.previewLoading = false
+        self.$emit('previewLoadingClose')
         return
       }
       if(row.fileName.endsWith(".mp4")){
@@ -159,6 +160,7 @@ export default {
         self.dialogVisible = true
         self.isVideos = true;
         self.previewLoading = false
+        self.$emit('previewLoadingClose')
         return
       }
 
@@ -181,6 +183,7 @@ export default {
             self.resultContentObj = data;
             self.isTxt = true;
             self.previewLoading = false; // 确保在数据处理完成后关闭加载状态
+            self.$emit('previewLoadingClose')
           })
           // self.previewLoading = false
         }else if (row.fileName.endsWith(".docx")) {
@@ -191,6 +194,7 @@ export default {
             self.docxData = res
           })
           self.previewLoading = false
+          self.$emit('previewLoadingClose')
 
         }else if(row.fileName.endsWith(".doc") || row.fileName.endsWith(".pdf")){
           self.isPdf = true
@@ -199,10 +203,12 @@ export default {
             self.pdfFileData = res
           })
           self.previewLoading = false
+          self.$emit('previewLoadingClose')
         }
       }).catch(err => {
         console.info("err===============", err)
         self.previewLoading = false
+        self.$emit('previewLoadingClose')
       });
     },
     //初始化预览组件
diff --git a/src/views/document/detail.vue b/src/views/document/detail.vue
index 3aa35df..0a44b54 100644
--- a/src/views/document/detail.vue
+++ b/src/views/document/detail.vue
@@ -18,11 +18,11 @@
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="关联附件" name="second">
+        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" element-loading-text="加载中">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
-<!--            <el-table-column label="操作" align="center" width="180" v-if="!detailBoolean">
+            <el-table-column label="操作" align="center" width="100px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -31,10 +31,10 @@
                   v-if="previewAuth(scope.row)"
                   @click="handlePreview(scope.row)"
                 >预览</el-button>
-                <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row)"
-                           @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+<!--                <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row) && !detailBoolean"
+                           @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>-->
               </template>
-            </el-table-column>-->
+            </el-table-column>
           </el-table><!--el-table-->
           <!-- 分页组件 -->
           <pagination
@@ -101,6 +101,9 @@
       </div>
     </div>
 
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose" @previewLoadingClose="previewLoadingClose"></preview-util>
+
+
 
   </div><!--el-form-border 表单-->
 </template>
@@ -113,10 +116,11 @@
   import { listReplies, addReplies} from "@/api/tool/replies.js";
   import { listAttachment } from "@/api/attachment/attachment";
   import { addCount } from "@/api/tool/downloadCount";
+  import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
 
   export default {
     name: 'editDocument',
-    components: {},
+    components: {previewUtil},
     dicts:['doc_class','doc_source'],
     props: {
       tooId: {
@@ -205,6 +209,7 @@
           pageSize: 10,
         },
         total: 0,
+        previewLoading: false,
       }
     },
     computed: {
@@ -473,7 +478,9 @@
       },
       handlePreview(row){
         this.isPreviewDisable = true
+        this.previewLoading = true
         this.$nextTick(() => {
+          console.info("this.$refs.previewForm====999999=======", this.$refs.previewForm)
           this.$refs.previewForm.frontModulePreview(row)
         })
       },
@@ -481,6 +488,10 @@
       previewClose(){
         this.isPreviewDisable = false
       },
+      /** 关闭预览遮罩 **/
+      previewLoadingClose(){
+        this.previewLoading = false
+      },
       /**
        * 处理下载
        * **/
diff --git a/src/views/document/downloadFileDetail.vue b/src/views/document/downloadFileDetail.vue
index e2c4a3b..f3cd28a 100644
--- a/src/views/document/downloadFileDetail.vue
+++ b/src/views/document/downloadFileDetail.vue
@@ -2,7 +2,7 @@
   <div class="fbox1">
     <div class="fl">
       <el-tabs v-model="detailActiveName">
-        <el-tab-pane label="附件信息" name="first">
+        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" element-loading-text="加载中">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
@@ -34,14 +34,14 @@
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
 
-    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose" @previewLoadingClose="previewLoadingClose"></preview-util>
 
   </div><!--fbox1 左右分栏-->
 </template>
 
 <script>
-  import { listAttachment } from "@/api/attachment/attachment";
   import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
+  import { listAttachment } from "@/api/attachment/attachment";
   import { addCount } from "@/api/tool/downloadCount";
 
   export default {
@@ -78,10 +78,12 @@
         replyContent: [],
         isPreviewDisable: false,
         attFileType: "zip,rar,7z",
-        total: 0
+        total: 0,
+        previewLoading: false,
       }
     },
     created(){
+      this.previewLoading = false
       this.getAttachmentList()
     },
     methods:{
@@ -98,6 +100,7 @@
       },
       handlePreview(row){
         this.isPreviewDisable = true
+        this.previewLoading = true
         this.$nextTick(() => {
           this.$refs.previewForm.frontModulePreview(row)
         })
@@ -106,6 +109,10 @@
       previewClose(){
         this.isPreviewDisable = false
       },
+      /** 关闭预览遮罩 **/
+      previewLoadingClose(){
+        this.previewLoading = false
+      },
       previewAuth(row){
         if(row.fileUrl == null || row.fileUrl == '' || row.fileUrl == undefined){
           return false
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index d43cd76..558a34c 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -114,7 +114,7 @@
           >上传文档</el-button>
           <el-button type="primary" icon="el-icon-position" @click="handlePush" v-hasPermi="['document:push']">发布</el-button>
           <el-button icon="el-icon-delete" @click="handleDelete" v-hasPermi="['document:batch:remove']">批量删除</el-button>
-          <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['document:export']">导出</el-button>
+          <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['document:export']">全量导出</el-button>
           <el-button icon="el-icon-download" @click="handleOpenBatchExport()" v-hasPermi="['document:batch:export']">批量导出</el-button>
 
         </div><!--operate 操作按钮-->
@@ -153,7 +153,7 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="180" fixed="right">
+          <el-table-column label="操作" align="center" width="160px" fixed="right">
             <template slot-scope="scope">
 <!--              <el-button
                 size="mini"
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
index 3d0a547..e027fdb 100644
--- a/src/views/tool/downloadFileDetail.vue
+++ b/src/views/tool/downloadFileDetail.vue
@@ -2,7 +2,7 @@
   <div class="fbox1">
     <div class="fl">
       <el-tabs v-model="detailActiveName">
-        <el-tab-pane label="附件信息" name="first">
+        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" element-loading-text="加载中">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
@@ -35,7 +35,7 @@
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
 
-    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose" @previewLoadingClose="previewLoadingClose"></preview-util>
 
   </div><!--fbox1 左右分栏-->
 </template>
@@ -80,7 +80,8 @@
         replyContent: [],
         isPreviewDisable: false,
         attFileType: "zip,rar,7z",
-        total: 0
+        total: 0,
+        previewLoading:false,
       }
     },
     created(){
@@ -108,6 +109,10 @@
       previewClose(){
         this.isPreviewDisable = false
       },
+      /** 关闭预览遮罩 **/
+      previewLoadingClose(){
+        this.previewLoading = false
+      },
       previewAuth(row){
         if(row.fileUrl == null || row.fileUrl == '' || row.fileUrl == undefined){
           return false
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 311f1a5..ed83ee6 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -90,7 +90,7 @@
             @click="handleAdd"
           >工具发布</el-button>
           <el-button icon="el-icon-delete" @click="handleDelete(selection)" v-hasPermi="['tool:batch:remove']">批量删除</el-button>
-          <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['tool:export']">导出</el-button>
+          <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['tool:export']">全量导出</el-button>
           <el-button icon="el-icon-download" @click="handleOpenBatchExport()" v-hasPermi="['tool:batch:export']">批量导出</el-button>
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" ref="tableRef" @selection-change="handleSelectionChange">
@@ -155,12 +155,12 @@
             label="操作"
             align="center"
             fixed="right"
-            width="260px"
+            width="180px"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
 <!--              && !scope.row.downloadStatus v-if="checkApplyUseBtn(scope.row)"-->
-              <el-button type="text" icon="el-icon-info"  @click="applyUse(scope.row)">申请使用</el-button>
+              <el-button type="text" icon="el-icon-info"  @click="applyUse(scope.row)" v-if="checkApplyUseBtn(scope.row)">申请使用</el-button>
               <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
               <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus" @click="handleFileDownload(scope.row)">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
@@ -516,12 +516,16 @@ export default {
     },
     checkApplyUseBtn(row){
       let result = false;
-      if(row.recordStatus=='done' && !row.downloadStatus){
+      //有下载权限就不需要了
+      if(row.downloadStatus){
+        return false;
+      }
+      if(row.recordStatus=='done'){
         result = true;
       }
-      if(row.isHasApplyUse){
+      /* if(row.isHasApplyUse){
         result = false;
-      }
+      } */
       return result;
     },
     /**=============================申请使用End================================*/
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index bd2e3a2..237556e 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -29,7 +29,7 @@
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="关联附件" name="second">
+        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" element-loading-text="加载中">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
 <!--            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
@@ -49,7 +49,7 @@
                 <span>{{ parseTime(scope.row.createDate) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180" v-if="detailData.downloadStatus">
+            <el-table-column label="操作" align="center" width="100px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -58,7 +58,7 @@
                   v-if="previewAuth(scope.row)"
                   @click="handlePreview(scope.row)"
                 >预览</el-button>
-                <el-button type="text" icon="el-icon-download" v-if="isDownload" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
+<!--                <e-button type="text" icon="el-icon-download" v-if="isDownload && detailData.downloadStatus" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</e-button>-->
               </template>
             </el-table-column>
           </el-table><!--el-table-->
@@ -128,10 +128,10 @@
       <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
     </el-dialog>
 
-    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose" @previewLoadingClose="previewLoadingClose"></preview-util>
 
     <!-- 上传 -->
-    <AddDoc :show.sync="open" :toolId="detailData.toolId" @callback="getAttachmentList"/>
+<!--    <AddDoc :show.sync="open" :toolId="detailData.toolId" @callback="getAttachmentList"/>-->
   </div><!--fbox1 左右分栏-->
 </template>
 
@@ -140,22 +140,14 @@
   import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
   import { listReplies, addReplies} from "@/api/tool/replies.js";
   import { getTool } from "@/api/tool/tool.js";
-
-  import AddDoc from './AddDoc'
-  import editDocument from "../document/editDocument";
-  import { Base64 } from 'js-base64';
   import iFrame from "@/components/iFrame/index"
   import { addCount } from "@/api/tool/downloadCount";
   import { listAttachment } from "@/api/attachment/attachment";
-  import axios from 'axios'
-  import {
-    getToken
-  } from "@/utils/auth";
   import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
 
   export default {
     name: 'toolDetail',
-    components: { editDocument, AddDoc, iFrame, previewUtil },
+    components: { iFrame, previewUtil },
     dicts:['sys_normal_disable','tool_type','tool_source','tool_status','doc_class','doc_source'],
     props: {
       toolDetail: {
@@ -260,6 +252,10 @@
       previewClose(){
         this.isPreviewDisable = false
       },
+      /** 关闭预览遮罩 **/
+      previewLoadingClose(){
+        this.previewLoading = false
+      },
       /** 删除按钮操作 */
       handleDelete(row) {
         const docIds = row.docId || this.ids;
-- 
2.35.1.windows.2


From 7fe80361f7cf71e3e1da623d988a6c1c23ba9ae2 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sat, 7 Sep 2024 10:53:14 +0800
Subject: [PATCH 39/55] =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/sgDragSize.vue | 72 ------------------------
 1 file changed, 72 deletions(-)

diff --git a/src/components/FileUpload/sgDragSize.vue b/src/components/FileUpload/sgDragSize.vue
index f7ab10c..2c7fa5d 100644
--- a/src/components/FileUpload/sgDragSize.vue
+++ b/src/components/FileUpload/sgDragSize.vue
@@ -5,8 +5,6 @@
   </div>
 </template>
 <script>
-import axios from 'axios'
-
 export default {
   name: 'sgDragSize',
   data() {
@@ -51,76 +49,6 @@ export default {
     this.__removeWindowEvents();
   },
   methods: {
-    uploadFile({ data, file }) {
-      let self = this
-      //初始化参数
-      return new Promise((resolve, reject) => {
-        //初始化参数
-        if (file.size < this.partSize) {
-          let formData = new FormData();
-          formData.append("file", file);
-          self.progressFlag = true;
-
-          axios({
-            url: self.uploadUrl,
-            method: 'post',
-            data: formData,
-            headers: {
-              'Authorization': 'Bearer ' + getToken(),
-              'Content-Type': 'multipart/form-data'
-            },
-            onUploadProgress: progressEvent => {
-              // 更新进度条
-              self.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
-            }
-          })
-            .then(res => {
-              setTimeout(() => {
-                if (res.data.code == 200) {
-                  setTimeout(function () {
-                    // 文件夹上传逻辑
-                    if (self.isFolder) {
-                      self.fileList.push(file);
-                    }
-                    self.$message({
-                      message: '上传成功！',
-                      type: 'success',
-                      duration: '2000'
-                    });
-                    self.progressFlag = false;
-                    self.progressPercent = 0;
-                    self.handleResult(res, file);
-                    resolve(res);  // 成功后 resolve
-                  }, 500);
-                } else {
-                  self.progressFlag = false;
-                  self.$message({
-                    message: '上传失败！',
-                    type: 'error',
-                    duration: '2000'
-                  });
-                  reject(new Error('上传失败'));  // 失败后 reject
-                }
-              }, 1000);
-            })
-            .catch(error => {
-              console.error(error);
-              self.progressFlag = false;
-              self.progressPercent = 0;
-              self.$refs.upload.clearFiles();
-              self.$message({
-                message: '上传失败！',
-                type: 'error',
-                duration: '2000'
-              });
-              reject(error);  // 上传异常时 reject
-            });
-        } else {
-          // 大文件分片逻辑
-          reject(new Error('文件过大，使用分片上传'));
-        }
-      });
-    },
     view_innerHeight() {
       return innerHeight - this.tbHeight;
     },
-- 
2.35.1.windows.2


From d60b5adb62fb7a176c96a645cc38b83e7da87af4 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sat, 7 Sep 2024 20:52:35 +0800
Subject: [PATCH 40/55] =?UTF-8?q?1=E3=80=81=E5=B7=A6=E4=BE=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=91=E5=92=8C=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=202=E3=80=81=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=203?=
 =?UTF-8?q?=E3=80=81=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E8=A7=88=204=E3=80=81=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=81=AE=E7=BD=A9=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FileUpload/optimizeToolUpload.vue         | 315 +++++++++++++++---
 src/layout/components/Navbar.vue              |   4 +-
 src/views/document/detail.vue                 |   3 +-
 src/views/document/downloadFileDetail.vue     |   2 +-
 src/views/document/editDocument.vue           |  11 +-
 src/views/filestatistic/index.vue             |   1 -
 src/views/message/index.vue                   |   4 +
 src/views/tool/downloadFileDetail.vue         |   3 +-
 src/views/tool/toolDetail.vue                 |   2 +-
 .../workflowList/addWorkflow/tool_release.vue |  15 +-
 10 files changed, 296 insertions(+), 64 deletions(-)

diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
index 4ec4efe..a13e58a 100644
--- a/src/components/FileUpload/optimizeToolUpload.vue
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -4,7 +4,7 @@
                :before-upload="beforeUpload"
                :on-change="onChange"
                :on-remove="handleRemove"
-               :multiple="isMultiple"
+               :multiple="false"
                :on-exceed="handleExceed"
                :accept="acceptType"
                :file-list="fileList"
@@ -18,11 +18,7 @@
       <!--    上传-->
       <input v-show="false" ref="fileRef" id="fileFolder" type="file" @change="handleFolderUpload" webkitdirectory
              multiple="multiple" />
-
-<!--      <input v-show="false" type="file" ref="fileRef" webkitdirectory @change="handleFolderUpload">
-      <el-button slot="trigger" size="small" type="primary">选取文件夹</el-button>-->
     </el-upload>
-<!--    <div slot="tip" class="el-upload__tip" >只能上传{{acceptType}}文件</div>-->
     <div v-show="progressFlag" class="head-img">
       <el-progress :text-inside="true" :stroke-width="14" :percentage="progressPercent" status="success"></el-progress>
     </div>
@@ -34,7 +30,6 @@ import axios from 'axios'
 import {
   getToken
 } from "@/utils/auth";
-import JSZip from 'jszip'
 
 export default {
   props: {
@@ -96,6 +91,8 @@ export default {
       uploadedNum: 0,
       _shardCount: null, //是否最后一片
       isFolder: false,
+      totalFiles: 0,    // 总文件数量
+      uploadedCount: 0, // 已上传文件数量
     };
   },
   watch: {
@@ -196,38 +193,42 @@ export default {
           });
         })
       } else {
-        self.uploadedNum = 0
-        file._shardCount = Math.ceil(file.size / this.partSize) //总片数
-        file.uploaded = 0
-        let formData = new FormData()
-        formData.append('fileName', file.name)
-        //大文件上传初始化,返回uploadId  initUpload(formData)
-        axios({
-          url: process.env.VUE_APP_BASE_API + "/common/initUpload",
-          method: 'post',
-          data: formData,
-          headers: {
-            'Authorization': 'Bearer ' + getToken(),
-            'Content-Type': 'multipart/form-data'
-          },
-        }).then(function (res) {
-          if (res.status == 200) {
-            //从第0块开始上传
-            file.uploadId = res.data.uploadId
-            file.objectKey = res.data
-            file.chunkId = 0
-            self.uploadByChunk(file)
-          } else {
-            this.progress--
-            self.$message.error(res.msg)
-          }
-        }).catch(error => {
-          self.progressPercent = 0
-          self.progressFlag = false;
-          console.error(error)
-        })
+       self.uploadIdSharding(file);
       }
+    },
 
+    uploadIdSharding(file){
+      let self = this
+      self.uploadedNum = 0
+      file._shardCount = Math.ceil(file.size / this.partSize) //总片数
+      file.uploaded = 0
+      let formData = new FormData()
+      formData.append('fileName', file.name)
+      //大文件上传初始化,返回uploadId  initUpload(formData)
+      axios({
+        url: process.env.VUE_APP_BASE_API + "/common/initUpload",
+        method: 'post',
+        data: formData,
+        headers: {
+          'Authorization': 'Bearer ' + getToken(),
+          'Content-Type': 'multipart/form-data'
+        },
+      }).then(function (res) {
+        if (res.status == 200) {
+          //从第0块开始上传
+          file.uploadId = res.data.uploadId
+          file.objectKey = res.data
+          file.chunkId = 0
+          self.uploadByChunk(file)
+        } else {
+          this.progress--
+          self.$message.error(res.msg)
+        }
+      }).catch(error => {
+        self.progressPercent = 0
+        self.progressFlag = false;
+        console.error(error)
+      })
     },
     //分片上传大文件
     uploadByChunk(file) {
@@ -254,7 +255,6 @@ export default {
           'Authorization': 'Bearer ' + getToken(),
           'Content-Type': 'multipart/form-data'
         },
-
       }).then(response => {
         if (response.status == 200) {
           //判断返回的MD5值是否一致，一致继续传下一块，否则重传本块（这里目前前后端MD5一直不一致，暂时先注释掉，有时间了我再研究一下）
@@ -327,6 +327,7 @@ export default {
         })
       }
     },
+
     resetData() {
       this.progress = 0;
     },
@@ -346,7 +347,6 @@ export default {
     },
     /** 清空文件 **/
     clearFile(){
-      this.progressFlag = false;
       if(this.$refs.upload){
         this.$refs.upload.clearFiles();
       }
@@ -357,7 +357,7 @@ export default {
       document.getElementById("fileFolder").value = null;
       this.$refs.fileRef.dispatchEvent(new MouseEvent("click"));
     },
-    async handleFolderUpload(event) {
+/*     async handleFolderUpload(event) {
       let self = this;
       self.isFolder = true
       const files = event.target.files;
@@ -376,17 +376,236 @@ export default {
         }
         await self.uploadFile(temp);
       }
-    /*   console.info("files=========", files)
-      let fileListTemp = []
-      for(let item of files){
-        fileListTemp.push(item);
+    }, */
+
+   /*  // 处理文件夹上传
+    async handleFolderUpload(event) {
+      const files = event.target.files;
+      this.isFolder = true;
+      this.progressFlag = true;
+
+      if (files.length === 0) {
+        this.$message.warning('没有选择文件');
+        return;
+      }
+
+      let successCount = 0;
+      let failCount = 0;
+      for (const file of files) {
+        try {
+          await this.uploadFolderFile({ file });
+          successCount++;
+        } catch (error) {
+          failCount++;
+        }
+      }
+
+      this.$message.success(`上传完成！成功：${successCount}，失败：${failCount}`);
+      this.progressFlag = false;
+      this.progressPercent = 0;
+    }, */
+    // 单个文件上传
+    uploadFolderFile({ data, file }) {
+      let self = this
+      //初始化参数
+      if (file.size < this.partSize) {
+        return new Promise((resolve, reject) => {
+          const formData = new FormData();
+          formData.append("file", file);
+          this.progressFlag = true;
+
+          axios({
+            url: self.uploadUrl,
+            method: 'post',
+            data: formData,
+            headers: {
+              'Authorization': 'Bearer ' + getToken(),
+              'Content-Type': 'multipart/form-data'
+            },
+           /*  onUploadProgress: progressEvent => {
+              this.progressPercent = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
+            } */
+          }).then(res => {
+            setTimeout(() => {
+              if (res.data.code === 200) {
+                // self.progressFlag = false;
+                // self.progressPercent = 0;
+                self.handleResult(res,file);
+                resolve();  // 上传成功后，调用 resolve
+              } else {
+                // self.progressFlag = false;
+                self.$message.error(file.name + '上传失败！');
+                reject();  // 上传失败时调用 reject
+              }
+            }, 500);
+          }).catch(error => {
+            // self.progressFlag = false;
+            // self.progressPercent = 0;
+            self.$message.error(file.name + '上传失败！');
+            reject(error);  // 上传失败时调用 reject
+          });
+        });
+      }else{
+        return new Promise((resolve, reject) => {
+          self.uploadIdShardingFolder(file)
+            .then(() => {
+              resolve(); // 上传成功，继续下一个文件
+            })
+            .catch(error => {
+              reject(error); // 上传失败，触发 reject
+            });
+        });
       }
-      self.fileList = fileListTemp; */
-     /*  files.for()
-      self.onChange(null, files); */
-      // self.fileList = files;
-      // this.$refs.fileRef.value = null;
     },
+
+
+    async handleFolderUpload(event) {
+      const files = Array.from(event.target.files);
+      this.totalFiles = files.length;
+      this.uploadedCount = 0;
+      this.progressFlag = true;
+      let failCount = 0;
+      for (let i = 0; i < files.length; i++) {
+        try {
+          await this.uploadFolderFile(
+            {
+              data: null,
+              file: files[i]
+            }
+          );
+          this.uploadedCount++;
+          this.updateProgress();
+        } catch (error) {
+          failCount++;
+        }
+      }
+      this.$message.success('上传完成！成功：' + this.uploadedCount+'，失败：' + failCount);
+      this.progressFlag = false;
+      this.progressPercent = 0;
+    },
+    updateProgress() {
+      if (this.uploadedCount === this.totalFiles) {
+        this.progressPercent = 100;
+      } else {
+        this.progressPercent = Math.min(100, Math.floor((this.uploadedCount / this.totalFiles) * 100));
+      }
+/*
+      if (this.uploadedCount % 10 === 0 || this.uploadedCount === this.totalFiles) {
+        this.$message.success(`已上传 ${this.uploadedCount} 个文件`);
+      } */
+    },
+
+    // 初始化分片上传
+    uploadIdShardingFolder(file) {
+      let self = this
+      return new Promise((resolve, reject) => {
+        file._shardCount = Math.ceil(file.size / this.partSize); // 总片数
+        file.uploaded = 0;
+
+        const formData = new FormData();
+        formData.append('fileName', file.name);
+
+        // 大文件上传初始化, 返回 uploadId
+        axios({
+          url: process.env.VUE_APP_BASE_API + "/common/initUpload",
+          method: 'post',
+          data: formData,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+        }).then(res => {
+          if (res.status === 200) {
+            file.uploadId = res.data.uploadId;
+            file.chunkId = 0;
+            this.uploadByChunkFolder(file)
+              .then(() => resolve())  // 全部分片上传完成，返回 resolve
+              .catch(error => reject(error));  // 分片上传出错，返回 reject
+          } else {
+            reject(new Error('初始化上传失败'));
+          }
+        }).catch(error => {
+          reject(error);
+        });
+      });
+    },
+
+    // 分片上传逻辑
+    uploadByChunkFolder(file) {
+      let self = this
+      return new Promise((resolve, reject) => {
+        const uploadChunk = (chunkId) => {
+          const _start = chunkId * this.partSize;
+          const _end = Math.min(file.size, _start + this.partSize);
+          const fileData = file.slice(_start, _end);
+
+          const form1 = new FormData();
+          form1.append('chunkFile', fileData);
+          form1.append('uploadId', file.uploadId);
+          form1.append('chunkId', (chunkId + 1).toString());
+          form1.append('shardCount', file._shardCount.toString());
+
+          axios({
+            url: process.env.VUE_APP_BASE_API + "/common/uploadChunk",
+            method: 'post',
+            data: form1,
+            headers: {
+              'Authorization': 'Bearer ' + getToken(),
+              'Content-Type': 'multipart/form-data'
+            },
+          }).then(response => {
+            if (response.status === 200) {
+              file.uploadedNum++;
+              // const percent = Math.floor((file.uploadedNum / file._shardCount) * 100);
+              // this.percentageSend(file, percent);
+              if (chunkId + 1 < file._shardCount) {
+                // 继续上传下一片
+                uploadChunk(chunkId + 1);
+              } else {
+                // 所有分片上传完成，合并文件
+                this.mergeFileFolder(file).then(() => resolve()).catch(error => reject(error));
+              }
+            } else {
+              reject(new Error('分片上传失败'));
+            }
+          }).catch(error => {
+            reject(error);
+          });
+        };
+
+        // 从第0块开始上传
+        uploadChunk(0);
+      });
+    },
+
+    // 合并文件
+    mergeFileFolder(file) {
+      let self = this
+      return new Promise((resolve, reject) => {
+        const form2 = new FormData();
+        form2.append('uploadId', file.uploadId);
+        form2.append('fileName', file.name);
+
+        axios({
+          url: process.env.VUE_APP_BASE_API + "/common/mergeFile",
+          method: 'post',
+          data: form2,
+          headers: {
+            'Authorization': 'Bearer ' + getToken(),
+            'Content-Type': 'multipart/form-data'
+          },
+        }).then(res => {
+          if (res.status === 200) {
+            self.handleResult(res,file);
+            resolve(); // 合并成功
+          } else {
+            reject(new Error('文件合并失败'));
+          }
+        }).catch(error => {
+          reject(error);
+        });
+      });
+    }
   }
 };
 </script>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 6a35b7f..df028f6 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -97,9 +97,9 @@ export default {
         })
       }).catch(() => {});
     },
-    // 跳转到购物车
+    // 跳转到消息中心
     toMyCartPage() {
-      this.$router.push({ path: '/message' })
+      this.$router.push({ path: '/message', query: {'states':'1'} })
     },
   }
 }
diff --git a/src/views/document/detail.vue b/src/views/document/detail.vue
index 0a44b54..fe72b94 100644
--- a/src/views/document/detail.vue
+++ b/src/views/document/detail.vue
@@ -18,7 +18,7 @@
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" element-loading-text="加载中">
+        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" >
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
@@ -480,7 +480,6 @@
         this.isPreviewDisable = true
         this.previewLoading = true
         this.$nextTick(() => {
-          console.info("this.$refs.previewForm====999999=======", this.$refs.previewForm)
           this.$refs.previewForm.frontModulePreview(row)
         })
       },
diff --git a/src/views/document/downloadFileDetail.vue b/src/views/document/downloadFileDetail.vue
index f3cd28a..74a57b9 100644
--- a/src/views/document/downloadFileDetail.vue
+++ b/src/views/document/downloadFileDetail.vue
@@ -2,7 +2,7 @@
   <div class="fbox1">
     <div class="fl">
       <el-tabs v-model="detailActiveName">
-        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" element-loading-text="加载中">
+        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" >
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index cfcdb44..2451cfd 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -128,7 +128,7 @@
       <div class="tboper">
         <div class="tit">关联附件</div>
       </div>
-      <div class="el-form-border">
+      <div class="el-form-border"  v-loading="previewLoading" >
         <div class="operate">
           <template v-if="editStatus && !detailBoolean">
             <uploadVue
@@ -236,7 +236,7 @@
       </div>
     </div>
 
-    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"  @previewLoadingClose="previewLoadingClose"></preview-util>
 
     <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
     <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" :deptFilter="true" @cancel="toolPrincipalsChoose=false" @submit="submitPeople"></bl-user-selector>
@@ -387,7 +387,7 @@
         },
         currentPage: 1,     // 当前页
         pageSize: 10,       // 每页显示数量
-
+        previewLoading: false,
       }
     },
     computed: {
@@ -789,6 +789,7 @@
       },
       handlePreview(row){
         this.isPreviewDisable = true
+        this.previewLoading = true
         this.$nextTick(() => {
           this.$refs.previewForm.frontModulePreview(row)
         })
@@ -797,6 +798,10 @@
       previewClose(){
         this.isPreviewDisable = false
       },
+      /** 关闭预览遮罩 **/
+      previewLoadingClose(){
+        this.previewLoading = false
+      },
       /**
        * 处理下载
        * **/
diff --git a/src/views/filestatistic/index.vue b/src/views/filestatistic/index.vue
index bfdf9ac..6637757 100644
--- a/src/views/filestatistic/index.vue
+++ b/src/views/filestatistic/index.vue
@@ -285,7 +285,6 @@ export default {
       let self = this
       this.downLoading = true
       listDocCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
-        console.info("res.total=============", res.total)
         self.downTotal = res.total
         self.toolDownStatList = res?.rows || []
         self.downLoading = false
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 11e6046..b04a121 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -196,8 +196,12 @@ export default {
     };
   },
   created() {
+    if(this.$route.query.states){
+      this.queryParams.states = this.$route.query.states
+    }
     this.getList();
     this.getDeptTree();
+
   },
   methods: {
     /** 查询部门下拉树结构 */
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
index e027fdb..9a14c2c 100644
--- a/src/views/tool/downloadFileDetail.vue
+++ b/src/views/tool/downloadFileDetail.vue
@@ -2,7 +2,7 @@
   <div class="fbox1">
     <div class="fl">
       <el-tabs v-model="detailActiveName">
-        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" element-loading-text="加载中">
+        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" >
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
@@ -101,6 +101,7 @@
       },
       handlePreview(row){
         this.isPreviewDisable = true
+        this.previewLoading = true
         this.$nextTick(() => {
           this.$refs.previewForm.frontModulePreview(row)
         })
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 237556e..f999527 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -29,7 +29,7 @@
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" element-loading-text="加载中">
+        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" >
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
 <!--            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 52daeef..f20ce98 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -225,7 +225,6 @@
     <div class="el-form-border">
       <div class="operate">
 <!--        <el-form-item label="文件" required>
-
         </el-form-item>
         <el-button type="primary" icon="el-icon-upload2" v-if="editStatus" @click="handleDocAdd">上传</el-button>-->
         <template v-if="editStatus">
@@ -244,7 +243,7 @@
         </template>
         <!--            <el-button icon="el-icon-delete">删除</el-button>-->
       </div><!--operate 操作按钮-->
-      <el-table :data="paginatedData" style="width: 100%">
+      <el-table :data="paginatedData" style="width: 100%" v-loading="previewLoading" >
         <!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
         <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
         <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
@@ -311,7 +310,7 @@
     <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
     <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" :deptFilter="true" @cancel="toolPrincipalsChoose=false" @submit="submitPeople"></bl-user-selector>
 
-    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose"></preview-util>
+    <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose" @previewLoadingClose="previewLoadingClose"></preview-util>
 
     <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
       <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
@@ -339,7 +338,6 @@ import ToolSelector from '@/components/tool-selector/index.vue'
 import uploadVue from '@/components/FileUpload/optimizeToolUpload.vue'
 import { addCount } from "@/api/tool/downloadCount";
 import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
-import store from "@/store";
 
 // PDF本地文件预览
 export default {
@@ -400,7 +398,8 @@ export default {
       viewShow: false,
       monitorDrawerVisible:false,
       form: {
-        toolRespDept: this.$store.getters.userInfo.deptId
+        toolRespDept: this.$store.getters.userInfo.deptId,
+        status: "zy"
       },
       rules: {
         toolCode: [
@@ -474,6 +473,7 @@ export default {
       title: '工具发布',
       currentPage: 1,     // 当前页
       pageSize: 10,       // 每页显示数量
+      previewLoading: false,
     };
   },
   computed: {
@@ -970,6 +970,7 @@ export default {
     },
     handlePreview(row){
       this.isPreviewDisable = true
+      this.previewLoading = true
       this.$nextTick(() => {
         this.$refs.previewForm.frontModulePreview(row)
       })
@@ -978,6 +979,10 @@ export default {
     previewClose(){
       this.isPreviewDisable = false
     },
+    /** 关闭预览遮罩 **/
+    previewLoadingClose(){
+      this.previewLoading = false
+    },
     /**
      * 处理下载
      * **/
-- 
2.35.1.windows.2


From 2874b1c1396d6556543a9797673cbb2802a76d66 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sat, 7 Sep 2024 21:01:24 +0800
Subject: [PATCH 41/55] =?UTF-8?q?1.=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/optimizeToolUpload.vue   | 14 +++++++++++++-
 src/views/document/editDocument.vue                |  2 +-
 .../workflowList/addWorkflow/tool_release.vue      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
index a13e58a..8b8994c 100644
--- a/src/components/FileUpload/optimizeToolUpload.vue
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -18,6 +18,7 @@
       <!--    上传-->
       <input v-show="false" ref="fileRef" id="fileFolder" type="file" @change="handleFolderUpload" webkitdirectory
              multiple="multiple" />
+      <div slot="tip" class="el-upload__tip" >只能上传{{acceptType}}格式</div>
     </el-upload>
     <div v-show="progressFlag" class="head-img">
       <el-progress :text-inside="true" :stroke-width="14" :percentage="progressPercent" status="success"></el-progress>
@@ -460,17 +461,28 @@ export default {
 
 
     async handleFolderUpload(event) {
+      let self = this
       const files = Array.from(event.target.files);
       this.totalFiles = files.length;
       this.uploadedCount = 0;
       this.progressFlag = true;
       let failCount = 0;
       for (let i = 0; i < files.length; i++) {
+        const file = files[i];
+        const fileExtension = file.name.slice(file.name.lastIndexOf('.')).toLowerCase();
+
+        // 校验文件格式
+        if (!self.acceptType.includes(fileExtension)) {
+          failCount++;
+          this.$message.error('文件格式不支持: ' + file.name);
+          continue;
+        }
+
         try {
           await this.uploadFolderFile(
             {
               data: null,
-              file: files[i]
+              file: file
             }
           );
           this.uploadedCount++;
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index 2451cfd..51a8b9b 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -355,7 +355,7 @@
         deptOptions:[],
         uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
         fileData: null,
-        acceptType: ".txt,.doc,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg,.jpeg",
+        acceptType: ".txt,.doc,.docx,.pdf,.mp4,.avi,.rmvb,.zip,.rar,.7z,.png,.jpg,.jpeg,.bmp",
         editStatus: true,
         toolDataInfo: [],
         dataFile: [],
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index f20ce98..9937bc0 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -464,7 +464,7 @@ export default {
       curDeptName: null,
 
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
-      acceptType: ".txt,.doc,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg,.jpeg",
+      acceptType: ".txt,.doc,.docx,.pdf,.mp4,.avi,.rmvb,.zip,.rar,.7z,.png,.jpg,.jpeg,.bmp",
       dataFile: [],
       detailBoolean: false,
       attachmentList: [],
-- 
2.35.1.windows.2


From de770f0b3346b80b024c6ca487f4b62d7af324b5 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Sun, 8 Sep 2024 20:32:09 +0800
Subject: [PATCH 42/55] update

---
 src/App.vue                                   |  8 +++
 src/api/my_business/workflow.js               |  7 +++
 src/layout/components/Navbar.vue              | 55 ++++++++++++++++++-
 src/store/modules/user.js                     | 11 ++++
 src/views/message/index.vue                   | 11 +---
 .../workflowList/addWorkflow/tool_release.vue |  7 +--
 .../workflowList/addWorkflow/use_apply.vue    |  5 +-
 7 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b92ea37..39ca9b3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,6 +7,8 @@
 
 <script>
 import ThemePicker from "@/components/ThemePicker";
+import store from '@/store'
+import { Message } from 'element-ui'
 
 export default {
   name: "App",
@@ -18,6 +20,12 @@ export default {
         return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
       }
     }
+  },
+  created() {
+    store.dispatch('GetUserMsgCount').then(() => { })
+  },
+  methods:{
+
   }
 };
 </script>
diff --git a/src/api/my_business/workflow.js b/src/api/my_business/workflow.js
index 23f4a1f..a9acfc2 100644
--- a/src/api/my_business/workflow.js
+++ b/src/api/my_business/workflow.js
@@ -184,5 +184,12 @@ export function getRecordbyPorcInstId(procInstId) {
   })
 }
 
+export function getUserMsgCount() {
+  return request({
+    url: '/workflow/msg/count/',
+    method: 'get',
+  })
+}
+
 
 
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index df028f6..4ec20dc 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -35,6 +35,30 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
+
+      <el-dialog
+        title="消息通知"
+        :visible.sync="msgVisible"
+        width="40%">
+        <el-table
+          :data="msgTableData"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="name"
+            label="消息通知类型">
+          </el-table-column>
+          <el-table-column
+            prop="count"
+            label="消息通知数量">
+          </el-table-column>
+          <el-table-column label="操作" width="100" >
+            <template slot-scope="scope">
+              <el-button type="text"@click="handleToMsgView(scope.row)">前往查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -46,6 +70,7 @@ import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import Search from '@/components/HeaderSearch'
+import { getUserMsgCount } from '@/api/my_business/workflow'
 
 export default {
   components: {
@@ -82,6 +107,12 @@ export default {
       return this.$store.state.user.unreadMsgNumber ? this.$store.state.user.unreadMsgNumber : 0
     },
   },
+  data() {
+    return {
+      msgVisible: false,
+      msgTableData: []
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
@@ -99,8 +130,30 @@ export default {
     },
     // 跳转到消息中心
     toMyCartPage() {
-      this.$router.push({ path: '/message', query: {'states':'1'} })
+      getUserMsgCount().then(res => {
+        this.msgTableData = [];
+        let msgItem = {};
+        msgItem['type'] = 'msg';
+        msgItem['name'] = '消息中心数量';
+        msgItem['count'] = res.msgCount;
+        let taskItem = {};
+        taskItem['type'] = 'task';
+        taskItem['name'] = '代办消息数量';
+        taskItem['count'] = res.taskCount;
+        this.msgTableData.push(msgItem);
+        this.msgTableData.push(taskItem);
+      }).catch(error => {
+      })
+      this.msgVisible = true;
     },
+    handleToMsgView(row){
+      this.msgVisible = false;
+      if(row.type === 'msg'){
+        this.$router.push({ path: '/message', query: {'states':'1'} })
+      } else {
+        this.$router.push({ path: '/workstuff/dispose'})
+      }
+    }
   }
 }
 </script>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 5370465..193aa57 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,6 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import { getUserMsgCount } from '@/api/my_business/workflow'
 
 const user = {
   state: {
@@ -102,6 +103,16 @@ const user = {
         })
       })
     },
+    GetUserMsgCount({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        getUserMsgCount().then(res => {
+          commit('SET_UNREAD_MSG_NUMBER', res.totalMsgCount)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
 
     // 前端 登出
     FedLogOut({ commit }) {
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index b04a121..5007713 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -134,6 +134,7 @@ import { deptTreeSelect } from "@/api/system/user";
 import docDetail from "@/views/document/detail";
 import toolDetail from "@/views/tool/toolDetail";
 import {  getUserMsgCount } from "@/api/message/message"
+import store from '@/store'
 
 export default {
   name: "Document",
@@ -255,9 +256,7 @@ export default {
         self.$set(formData, "states", 2)
           updateMessage(formData).then(response => {
             self.$modal.msgSuccess(response?.msg || '操作成功')
-            getUserMsgCount(self.$store.getters.userId).then(res => {
-              self.$store.commit("SET_UNREAD_MSG_NUMBER", res.data);
-            });
+            store.dispatch('GetUserMsgCount').then(() => { })
             self.getList();
           })
       }).catch((err) => {console.error(err)});
@@ -279,11 +278,7 @@ export default {
         }
         allMarkedRead(formData).then(response => {
           self.$modal.msgSuccess(response?.msg || '操作成功')
-
-          getUserMsgCount(self .$store.getters.userId).then(res => {
-            self.$store.commit("SET_UNREAD_MSG_NUMBER", res.data);
-          });
-
+          store.dispatch('GetUserMsgCount').then(() => { })
           self.getList();
         })
       }).catch((err) => {console.error(err)});
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 9937bc0..bac13eb 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -338,6 +338,7 @@ import ToolSelector from '@/components/tool-selector/index.vue'
 import uploadVue from '@/components/FileUpload/optimizeToolUpload.vue'
 import { addCount } from "@/api/tool/downloadCount";
 import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
+import store from '@/store'
 
 // PDF本地文件预览
 export default {
@@ -834,10 +835,6 @@ export default {
         this.$set(formData,'attachmentList',_this.attachmentList)
         addTool(formData).then((res) => {
           if (res.code===200) {
-            /* if(formData.recordStatus == 'done'){
-              console.info("2222222222222222", _this.$store.state.user.unreadMsgNumber+1)
-              store.commit('SET_UNREAD_MSG_NUMBER', _this.$store.state.user.unreadMsgNumber+1);
-            } */
             _this.$message({
               message: '流程提交成功',//提示的信息
               type:'success',　　//类型是成功
@@ -849,6 +846,8 @@ export default {
                 _this.close();
               }
             });
+
+            store.dispatch('GetUserMsgCount').then(() => { })
           }
         });
     },
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index eeecb5a..53a4500 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -621,9 +621,6 @@ export default {
         formData.editStatus = _this.editStatus
         addApply(formData).then((res) => {
           if (res.code===200) {
-            if(formData.recordStatus == 'done'){
-              store.commit('SET_UNREAD_MSG_NUMBER', _this.$store.state.user.unreadMsgNumber+1);
-            }
             _this.$message({
               message: '流程提交成功',//提示的信息
               type:'success',　　//类型是成功
@@ -635,6 +632,8 @@ export default {
                 _this.close();
               }
             });
+
+            store.dispatch('GetUserMsgCount').then(() => { })
           }
         });
     },
-- 
2.35.1.windows.2


From a1a3cec4212b1e7b925db9ca2584117b064323f4 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sun, 8 Sep 2024 20:34:08 +0800
Subject: [PATCH 43/55] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/tool.css                           |   4 +-
 src/api/tool/toolRelation.js                  |  53 +++++
 src/components/FileUpload/index.vue           |   2 +-
 .../FileUpload/optimizeToolUpload.vue         |   2 +-
 src/components/FileUpload/optimizeUpload.vue  |   4 +-
 src/components/PreviewUtil/previewUtil.vue    |   7 +-
 src/components/tool-selector/index.vue        |  11 +-
 src/views/document/detail.vue                 |  31 ++-
 src/views/document/downloadFileDetail.vue     |   2 +-
 src/views/document/editDocument.vue           |  14 +-
 src/views/document/index.vue                  |  33 ++-
 src/views/message/index.vue                   |   8 +-
 src/views/monitor/job/index.vue               |   2 +-
 src/views/monitor/job/log.vue                 |   2 +-
 src/views/monitor/operlog/index.vue           |   2 +-
 src/views/tool/AddDoc.vue                     |   4 +-
 src/views/tool/downloadFileDetail.vue         |   2 +-
 src/views/tool/index.vue                      |  28 +--
 src/views/tool/toolDetail.vue                 | 103 ++++++++-
 .../workflowList/addWorkflow/tool_release.vue | 203 ++++++++++++++++--
 20 files changed, 434 insertions(+), 83 deletions(-)
 create mode 100644 src/api/tool/toolRelation.js

diff --git a/public/css/tool.css b/public/css/tool.css
index 20cf340..718a9c5 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -75,7 +75,7 @@ body #app .hideSidebar .sidebar-container {
   width: 65px !important;
 }
 body #app .openSidebar .sidebar-container {
-  width:180px !important;
+  width:220px !important;
 }
 body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
 body #app .sidebar-container .el-sub-menu .el-menu-item {
@@ -344,7 +344,7 @@ body #app .hideSidebar .main-container {
   margin-left: 65px;
 }
 body #app .main-container {
-  margin-left: 180px;
+  margin-left: 220px;
   background:#f9fafe;
   background-size:100%;
 }
diff --git a/src/api/tool/toolRelation.js b/src/api/tool/toolRelation.js
new file mode 100644
index 0000000..1bbf1d7
--- /dev/null
+++ b/src/api/tool/toolRelation.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询tool_relation列表
+export function listRelation(query) {
+  return request({
+    url: '/system/relation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询tool_relation详细
+export function getRelation(id) {
+  return request({
+    url: '/system/relation/' + id,
+    method: 'get'
+  })
+}
+
+// 新增tool_relation
+export function addRelation(data) {
+  return request({
+    url: '/system/relation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改tool_relation
+export function updateRelation(data) {
+  return request({
+    url: '/system/relation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除tool_relation
+export function delRelation(id) {
+  return request({
+    url: '/system/relation/' + id,
+    method: 'delete'
+  })
+}
+
+// 获取关联树列表
+export function getDataThree(data) {
+  return request({
+    url: '/system/relation/get/three',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index c7f6b0a..899e5ce 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -15,7 +15,7 @@
       ref="fileUpload"
     >
       <!-- 上传按钮 -->
-      <el-button size="mini" type="primary">选取文件</el-button>
+      <el-button size="mini" type="primary">上传文件</el-button>
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传
diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
index 8b8994c..9c33613 100644
--- a/src/components/FileUpload/optimizeToolUpload.vue
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -11,7 +11,7 @@
                :auto-upload="true"
                :http-request="uploadFile"
                show-file-list>
-      <el-button slot="trigger" size="small" type="primary" @click="isFolder = false">选取文件</el-button>
+      <el-button slot="trigger" size="small" type="primary" @click="isFolder = false">上传文件</el-button>
       <el-button size="small" type="primary" @click="handleUploadFile" >
         上传文件夹
       </el-button>
diff --git a/src/components/FileUpload/optimizeUpload.vue b/src/components/FileUpload/optimizeUpload.vue
index daa5c9a..20a50de 100644
--- a/src/components/FileUpload/optimizeUpload.vue
+++ b/src/components/FileUpload/optimizeUpload.vue
@@ -12,7 +12,7 @@
                :auto-upload="true"
                :http-request="uploadFile"
                show-file-list>
-      <el-button slot="trigger" size="small" type="primary" >选取文件</el-button>
+      <el-button slot="trigger" size="small" type="primary" >上传文件</el-button>
       <el-button size="small" type="primary" @click="handleUploadFile" >
         上传文件夹
       </el-button>
@@ -21,7 +21,7 @@
              multiple="multiple" />
 
 <!--      <input v-show="false" type="file" ref="fileRef" webkitdirectory @change="handleFolderUpload">
-      <el-button slot="trigger" size="small" type="primary">选取文件夹</el-button>-->
+      <el-button slot="trigger" size="small" type="primary">上传文件夹</el-button>-->
     </el-upload>
     <div slot="tip" class="el-upload__tip" >只能上传{{acceptType}}文件</div>
     <div v-show="progressFlag" class="head-img">
diff --git a/src/components/PreviewUtil/previewUtil.vue b/src/components/PreviewUtil/previewUtil.vue
index 886958a..18b83e9 100644
--- a/src/components/PreviewUtil/previewUtil.vue
+++ b/src/components/PreviewUtil/previewUtil.vue
@@ -8,23 +8,24 @@
       :append-to-body="true"
       :close-on-press-escape="false"
       @close="handleClose"
+      style="height: 100%"
     >
       <template v-if="isTxt">
         <!-- 在文本框中预览文件内容 -->
-        <el-input type="textarea" :rows="40" v-model="resultContentObj">
+        <el-input type="textarea" :rows="30" v-model="resultContentObj" >
         </el-input>
       </template>
       <template v-if="isDocx">
         <vue-office-docx
           :src="docxData"
-          style="height: 100vh;"
+          style="height: 600px;"
           @rendered="rendered"
         />
       </template>
       <template v-if="isPdf">
         <vue-office-pdf
           :src="pdfFileData"
-          style="height: 100vh;"
+          style="height: 600px;"
           @rendered="renderedHandler"
           @error="errorHandler"
         />
diff --git a/src/components/tool-selector/index.vue b/src/components/tool-selector/index.vue
index fc87c17..fc8ed18 100644
--- a/src/components/tool-selector/index.vue
+++ b/src/components/tool-selector/index.vue
@@ -92,7 +92,7 @@ export default {
       type: Function,
       default: (row, index, toolData, selectInfoData)=>{
         if (toolData) {
-          return toolData.findIndex(item=>item.id===row.id)<0
+          return toolData.findIndex(item=>item.toolId===row.toolId)<0
         }else {
           return true
         }
@@ -133,20 +133,27 @@ export default {
         recordStatus: 'done',
       },
       selectInfoData: [],
+      //需要过滤的ids
+      filterToolIds: [],
     };
   },
   methods: {
     //来源、序号、是否多选
-    init(source,index,multiple){
+    init(source,index,multiple,ids){
+      this.filterToolIds = []
       this.visible = true
       this.source = source
       this.index = index
       this.multiple= multiple
+      this.filterToolIds = ids
       this.resetQuery()
     },
     /** 查询列表 */
     getList() {
       this.loading = true;
+      if(this.filterToolIds && this.filterToolIds.length > 0){
+        this.$set(this.queryParams, "filterToolIds", this.filterToolIds )
+      }
       listTool(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.dataList = response.rows;
           this.total = response.total;
diff --git a/src/views/document/detail.vue b/src/views/document/detail.vue
index fe72b94..cbf8fa8 100644
--- a/src/views/document/detail.vue
+++ b/src/views/document/detail.vue
@@ -18,7 +18,7 @@
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" >
+        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" element-loading-text="预览转换中，请耐心等待">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
@@ -48,7 +48,7 @@
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
 
-    <div class="fr" v-if="isComment">
+    <div class="fr" v-if="isComment && form.docStatus == 'yfb'">
       <div class="tboper">
         <div class="tit">评论</div>
       </div><!--tboper 标题与操作按钮-->
@@ -112,11 +112,11 @@
   import { addDocument, updateDocument, getDocument } from "@/api/document/document";
   import { deptTreeSelect } from "@/api/system/user";
   import { documentTree } from "@/api/documentCategory/documentCategory.js";
-  import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
   import { listReplies, addReplies} from "@/api/tool/replies.js";
   import { listAttachment } from "@/api/attachment/attachment";
   import { addCount } from "@/api/tool/downloadCount";
   import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
+  import { listDiscussions, addDiscussions } from "@/api/tool/discussions.js";
 
   export default {
     name: 'editDocument',
@@ -217,6 +217,7 @@
     created(){
       // this.getDeptTree();
       this.getDocumentTree();
+      // this.getDiscussionsList()
     },
     mounted(){
     },
@@ -311,6 +312,7 @@
             self.dataFile.push(fileData) */
 
             self.getAttachmentList()
+            self.getDiscussionsList()
 
             setTimeout(() => {
               self.$set(self.form, "docCategoryName" , self.findLabelById(self.docCategory, self.form.docCategoryId) )
@@ -343,7 +345,7 @@
               type:'success',　　//类型是成功
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
-            self.getAttachmentList()
+            self.getDiscussionsList()
           }).catch(err =>{
             this.discussionContent = null
             console.error("handleDiscussions==err==", err)
@@ -411,7 +413,7 @@
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
             self.cancelReplySon(parentIndex, repIndex)
-            self.getAttachmentList()
+            self.getDiscussionsList()
           }).catch(err =>{
             console.error("submitReplySon==err==", err)
             self.$modal.msgError("发布失败");
@@ -447,7 +449,7 @@
               duration:1200,　　//显示时间, 毫秒。设为 0 则不会自动关闭，建议1200
             });
             self.cancelReply(index)
-            self.getAttachmentList()
+            self.getDiscussionsList()
           }).catch(err =>{
             console.error("handleDiscussions==err==", err)
             self.$modal.msgError("发布失败");
@@ -574,7 +576,22 @@
           }
         }
         return null;
-      }
+      },
+      getDiscussionsList() {
+        let self = this
+        listDiscussions({businessId:self.form.docId}).then(res => {
+          self.discussionsList = res.rows
+          self.discussionsList.forEach(item => {
+            if(item.repliesList && item.repliesList.length > 0){
+              self.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
+              self.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
+            }else{
+              self.$set(item, 'showReplyFormSon', false)
+              self.$set(item, 'replyContentSon', '')
+            }
+          });
+        });
+      },
 
     }
   }
diff --git a/src/views/document/downloadFileDetail.vue b/src/views/document/downloadFileDetail.vue
index 74a57b9..d7d085f 100644
--- a/src/views/document/downloadFileDetail.vue
+++ b/src/views/document/downloadFileDetail.vue
@@ -2,7 +2,7 @@
   <div class="fbox1">
     <div class="fl">
       <el-tabs v-model="detailActiveName">
-        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" >
+        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" element-loading-text="预览转换中，请耐心等待">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index 51a8b9b..8dc94cd 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -128,7 +128,7 @@
       <div class="tboper">
         <div class="tit">关联附件</div>
       </div>
-      <div class="el-form-border"  v-loading="previewLoading" >
+      <div class="el-form-border"  v-loading="previewLoading" element-loading-text="预览转换中，请耐心等待">
         <div class="operate">
           <template v-if="editStatus && !detailBoolean">
             <uploadVue
@@ -330,7 +330,7 @@
         // 表单校验
         rules: {
           docCategoryId: [
-            { required: true, message: "文档分类不能为空", trigger: "blur" }
+            { required: true, message: "文档分类不能为空", trigger: "change" }
           ],
           docCode: [
             { required: true, message: "文档编号不能为空", trigger: "blur" }
@@ -339,23 +339,23 @@
             { required: true, message: "文档名称不能为空", trigger: "blur" }
           ],
           docType: [
-            { required: true, message: "类别不能为空", trigger: "blur" }
+            { required: true, message: "类别不能为空", trigger: "change" }
           ],
           docSource: [
-            { required: true, message: "文档来源不能为空", trigger: "blur" }
+            { required: true, message: "文档来源不能为空", trigger: "change" }
           ],
           docPrincipals: [
             { required: true, message: "负责人不能为空", trigger: ['change','blur']  }
           ],
           docRespDept: [
-            { required: true, message: "请选择归属部门", trigger: ['blur','change'] }
+            { required: true, message: "请选择归属部门", trigger: ['change','change'] }
           ],
         },
         docCategory:[],
         deptOptions:[],
         uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
         fileData: null,
-        acceptType: ".txt,.doc,.docx,.pdf,.mp4,.avi,.rmvb,.zip,.rar,.7z,.png,.jpg,.jpeg,.bmp",
+        acceptType: ".txt,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg",
         editStatus: true,
         toolDataInfo: [],
         dataFile: [],
@@ -526,7 +526,7 @@
         }
         //判断是否有文件再上传
         if (this.fileList.length == 0) {
-          return this.$message.warning('请选取文件后再上传')
+          return self.$message.warning('最少上传一个附件')
         }
         /*this.fileList.map(file =>{
           this.form.docName = file.name
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 558a34c..5d1e9d9 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -113,9 +113,10 @@
             v-hasPermi="['document:add']"
           >上传文档</el-button>
           <el-button type="primary" icon="el-icon-position" @click="handlePush" v-hasPermi="['document:push']">发布</el-button>
+          <el-button type="primary" icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['document:export']">全量导出</el-button>
+          <el-button type="primary" icon="el-icon-download" @click="handleOpenBatchExport()" v-hasPermi="['document:batch:export']">批量导出</el-button>
           <el-button icon="el-icon-delete" @click="handleDelete" v-hasPermi="['document:batch:remove']">批量删除</el-button>
-          <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['document:export']">全量导出</el-button>
-          <el-button icon="el-icon-download" @click="handleOpenBatchExport()" v-hasPermi="['document:batch:export']">批量导出</el-button>
+
 
         </div><!--operate 操作按钮-->
 
@@ -230,16 +231,17 @@
 
     <!--文档修改-->
     <el-drawer :visible.sync="open"
+               :wrapperClosable="false"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
                size="75%">
       <template #title>
         <span class="title">{{docTitle}}</span>
         <div class="drawer-head-btn" v-if="docDetailDisable">
-          <el-button type="primary" @click="docConfrim()">确 定</el-button>
-          <el-button @click="docCancel()">取 消</el-button>
+          <el-button icon="el-icon-check" type="primary" @click="docConfrim()">保 存</el-button>
+          <el-button icon="el-icon-close"  @click="docCancel()">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
         <div class="drawer-head-btn" v-else>
-          <el-button @click="docCancel()">关 闭</el-button>
+          <el-button icon="el-icon-close" @click="docCancel()">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <edit-document ref="editDocumentRef" @submit="editDocumentSubmit"/>
@@ -248,20 +250,24 @@
 
     <!--文档详情-->
     <el-drawer :visible.sync="detailDocOpen"
+               :wrapperClosable="false"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
                size="75%">
       <template #title>
         <span class="title">{{docTitle}}</span>
         <div class="drawer-head-btn">
-          <el-button @click="docDetailCancel()">关 闭</el-button>
+          <el-button icon="el-icon-close" @click="docDetailCancel()">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
-      <doc-detail ref="docDetailRef" @submit="docDetailFormSubmit"/>
+      <template v-if="detailOpen">
+        <doc-detail ref="docDetailRef" @submit="docDetailFormSubmit"/>
+      </template>
     </el-drawer>
 
 
     <!-- 文档导出对话框 -->
     <el-dialog :title="exportTitle" :visible.sync="exportDrawerOpen"
+               :wrapperClosable="false"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
                width="980px" append-to-body>
       <div class="el-form-border">
@@ -305,12 +311,13 @@
 
     <!-- 文档下载对话框 -->
     <el-drawer :visible.sync="fileDetailDrawerOpen"
+               :wrapperClosable="false"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
                size="80%" class="no-padding" @close="handleFileCloseDetail()">
       <template #title>
         <span>文档附件下载</span>
         <div class="drawer-head-btn">
-          <el-button @click="fileDetailDrawerOpen = false">关 闭</el-button>
+          <el-button icon="el-icon-close" @click="fileDetailDrawerOpen = false">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <template v-if="fileDetailOpen">
@@ -467,6 +474,7 @@ export default {
       selection: undefined,
       docDetail: {},
       detailDocOpen: false,
+      detailOpen: false,
     };
   },
   created() {
@@ -547,6 +555,7 @@ export default {
       this.docTipAddOrEdit = 'detail'
       this.docDetailDisable=false
       this.detailDocOpen = true
+      this.detailOpen = true
       this.$nextTick(()=>{
         this.$refs.docDetailRef.editInit(row.docId, "detail");
       })
@@ -572,6 +581,7 @@ export default {
     },
     docDetailFormSubmit: function() {
       this.detailDocOpen = false;
+      this.detailOpen = false;
       this.getList();
     },
     /** 删除按钮操作 */
@@ -579,7 +589,7 @@ export default {
       let self = this
       const docIds = row.docId || this.ids;
       if(docIds == null || docIds == undefined || docIds =='' || docIds.length < 0){
-        this.$modal.msgError(`最少选择一条数据`);
+        this.$modal.msgWarning(`最少选择一条数据`);
         return;
       }
       //只能删除已上传数据
@@ -675,7 +685,7 @@ export default {
       let self = this
       const docIds = row.docId || this.ids;
       if(docIds == null || docIds == undefined || docIds =='' || docIds.length < 0){
-        this.$modal.msgError(`最少选择一条数据`);
+        this.$modal.msgWarning(`最少选择一条数据`);
         return;
       }
       //只能删除已上传数据
@@ -713,6 +723,7 @@ export default {
     docDetailCancel(){
       this.$refs.docDetailRef.resetForm();
       this.detailDocOpen = false
+      this.detailOpen = false
     },
     previewAuth(row){
       if(row.docUrl == null || row.docUrl == '' || row.docUrl == undefined){
@@ -739,7 +750,7 @@ export default {
     handleOpenBatchExport() {
       let self = this
       if(self.selection == null || self.selection == '' || self.selection == undefined || self.selection.length <= 0){
-        this.$modal.msgError(`最少选择一条数据`);
+        this.$modal.msgWarning(`最少选择一条数据`);
         return;
       }
       if (this.checkList.length<1) {
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 5007713..b622302 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -14,7 +14,7 @@
               />
             </el-form-item>
             <el-form-item label="消息类型" prop="businessType">
-              <el-select v-model="queryParams.businessType" placeholder="请选择消息类型" clearable>
+              <el-select v-model="queryParams.businessType" placeholder="请选择消息类型" clearable @change="handleQuery">
                 <el-option
                   v-for="dict in dict.type.msg_type"
                   :key="dict.value"
@@ -25,7 +25,7 @@
             </el-form-item>
 
             <el-form-item label="状态" prop="states">
-              <el-select v-model="queryParams.states" placeholder="请选择状态" clearable>
+              <el-select v-model="queryParams.states" placeholder="请选择状态" clearable @change="handleQuery">
                 <el-option
                   v-for="dict in dict.type.msg_status"
                   :key="dict.value"
@@ -102,7 +102,7 @@
       <template #title>
         <span>{{toolTitle}}</span>
         <div class="drawer-head-btn">
-          <el-button @click="detailDrawerOpen = false">关 闭</el-button>
+          <el-button icon="el-icon-close" @click="detailDrawerOpen = false">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <template v-if="detailOpen">
@@ -119,7 +119,7 @@
       <template #title>
         <span class="title">{{docTitle}}</span>
         <div class="drawer-head-btn">
-          <el-button @click="docCancel()">关 闭</el-button>
+          <el-button icon="el-icon-close" @click="docCancel()">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <doc-detail ref="editDocumentRef" @submit="editDocumentSubmit" :isDownload="false" :isComment="false"/>
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 892c727..f6a560b 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -284,7 +284,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="openView = false">关 闭</el-button>
+        <el-button icon="el-icon-close" @click="openView = false">关 闭</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 60bee1d..d76f121 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -173,7 +173,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="open = false">关 闭</el-button>
+        <el-button icon="el-icon-close" @click="open = false">关 闭</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 4c9457c..aea89fa 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -195,7 +195,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="open = false">关 闭</el-button>
+        <el-button icon="el-icon-close" @click="open = false">关 闭</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/tool/AddDoc.vue b/src/views/tool/AddDoc.vue
index 475e772..8d5481d 100644
--- a/src/views/tool/AddDoc.vue
+++ b/src/views/tool/AddDoc.vue
@@ -2,8 +2,8 @@
   <el-dialog title="新增附件信息" :visible.sync="visible" width="85%" append-to-body>
     <edit-document ref="editDocumentRef" :toolId="toolId" @docSubmitData="editDocumentSubmit" :relatedTool="false"/>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm()">确 定</el-button>
-      <el-button @click="cancel()">取 消</el-button>
+      <el-button type="primary" icon="el-icon-check" @click="submitForm()">保 存</el-button>
+      <el-button icon="el-icon-close" @click="cancel()">关 闭</el-button>
     </div>
   </el-dialog>
 </template>
diff --git a/src/views/tool/downloadFileDetail.vue b/src/views/tool/downloadFileDetail.vue
index 9a14c2c..f343e17 100644
--- a/src/views/tool/downloadFileDetail.vue
+++ b/src/views/tool/downloadFileDetail.vue
@@ -2,7 +2,7 @@
   <div class="fbox1">
     <div class="fl">
       <el-tabs v-model="detailActiveName">
-        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" >
+        <el-tab-pane label="附件信息" name="first" v-loading="previewLoading" element-loading-text="预览转换中，请耐心等待">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index ed83ee6..1229c36 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -89,9 +89,10 @@
             icon="el-icon-plus"
             @click="handleAdd"
           >工具发布</el-button>
+          <el-button type="primary" icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['tool:export']">全量导出</el-button>
+          <el-button type="primary" icon="el-icon-download" @click="handleOpenBatchExport()" v-hasPermi="['tool:batch:export']">批量导出</el-button>
           <el-button icon="el-icon-delete" @click="handleDelete(selection)" v-hasPermi="['tool:batch:remove']">批量删除</el-button>
-          <el-button icon="el-icon-download" @click="handleOpenExport()" v-hasPermi="['tool:export']">全量导出</el-button>
-          <el-button icon="el-icon-download" @click="handleOpenBatchExport()" v-hasPermi="['tool:batch:export']">批量导出</el-button>
+
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" ref="tableRef" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
@@ -114,7 +115,7 @@
               <dict-tag :options="dict.type.flow_status" :value="scope.row.recordStatus"/>
             </template>
           </el-table-column>
-<!--          <el-table-column label="引用工具" align="center" :show-overflow-tooltip="true">
+<!--          <el-table-column label="关联工具" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="handleRelationTool(scope.row.relationToolList)">
                   <el-link target="_blank" v-for="assItem in scope.row.relationToolList" :key="assItem.id" @click="handleToolDetail(assItem)">{{assItem.toolName}}</el-link>
@@ -122,14 +123,14 @@
             </template>
           </el-table-column>-->
 
-          <el-table-column label="引用工具" align="center" :show-overflow-tooltip="true" width="100">
+          <el-table-column label="关联工具" align="center" :show-overflow-tooltip="true" width="100">
             <template slot-scope="scope">
               <el-popover
                 trigger="click"
                 placement="top-start"
                 v-if="Array.isArray(scope.row.relationToolList) && scope.row.relationToolList.length > 0"
               >
-                <!-- 这里展示引用工具的详细信息 -->
+                <!-- 这里展示关联工具的详细信息 -->
                 <ul>
                   <li v-for="assItem in scope.row.relationToolList" :key="assItem.id">
                     <el-link target="_blank" @click="handleToolDetail(assItem)">
@@ -139,7 +140,7 @@
                 </ul>
                 <!-- 弹出框触发器 -->
                 <el-link slot="reference">
-                  引用工具 ({{ scope.row.relationToolList.length }})
+                  关联工具 ({{ scope.row.relationToolList.length }})
                 </el-link>
               </el-popover>
             </template>
@@ -184,7 +185,8 @@
     </el-card><!--el-card-->
 
     <!-- 工具导出对话框 -->
-    <el-dialog :title="exportTitle" :visible.sync="exoportDrawerOpen"  width="980px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false" :show-close="false">
+    <el-dialog :title="exportTitle" :visible.sync="exoportDrawerOpen"  width="980px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false">
       <div class="el-form-border">
         <el-form ref="exportFrom" label-width="180px">
           <el-row>
@@ -243,12 +245,12 @@
     </el-drawer>
 
     <!-- 工具详情对话框 -->
-    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" :show-close="false"
+    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" :show-close="false" :wrapperClosable="false"
                size="80%" class="no-padding" :close-on-press-escape="false"	@close="handleCloseDetail()">
       <template #title>
         <span>{{toolTitle}}</span>
         <div class="drawer-head-btn">
-          <el-button @click="detailDrawerOpen = false">关 闭</el-button>
+          <el-button icon="el-icon-close" @click="detailDrawerOpen = false">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <template v-if="detailOpen">
@@ -259,12 +261,12 @@
 
 
     <!-- 工具详情对话框 -->
-    <el-drawer :visible.sync="fileDetailDrawerOpen" :modal-append-to-body="false" :show-close="false"
+    <el-drawer :visible.sync="fileDetailDrawerOpen" :modal-append-to-body="false" :show-close="false" :wrapperClosable="false"
                size="80%" class="no-padding" :close-on-press-escape="false" @close="handleFileCloseDetail()">
       <template #title>
         <span>工具附件下载</span>
         <div class="drawer-head-btn">
-          <el-button @click="fileDetailDrawerOpen = false">关 闭</el-button>
+          <el-button icon="el-icon-close" @click="fileDetailDrawerOpen = false">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
       <template v-if="fileDetailOpen">
@@ -608,7 +610,7 @@ export default {
     handleOpenBatchExport() {
       let self = this
       if(self.selection == null || self.selection == '' || self.selection == undefined || self.selection.length <= 0){
-        this.$modal.msgError(`最少选择一条数据`);
+        this.$modal.msgWarning(`最少选择一条数据`);
         return;
       }
       if (this.checkList.length<1) {
@@ -697,7 +699,7 @@ export default {
     handleDelete(list){
       let _this = this
       if (!list||list.length<1) {
-        this.$modal.msgError(`最少选择一条数据`);
+        this.$modal.msgWarning(`最少选择一条数据`);
         return
       }
       //只能删除草稿数据
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index f999527..157deec 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -19,17 +19,19 @@
                 <el-col :span="12"> <el-form-item label="操作说明">{{detailData.operateExplain}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="备注">{{detailData.remark}}</el-form-item> </el-col>
                 <el-col :span="24">
-                  <el-form-item label="引用工具">
-                    <span v-if="detailData.association != null && detailData.association != '' && detailData.association != undefined">
-                     <el-tag :key="tag.toolId" v-for="tag in JSON.parse(detailData.association)" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
-                    </span>
+                  <el-form-item label="关联工具">
+                    <el-button type="primary" icon="el-icon-search" size="mini"  v-if="detailData.association != null && detailData.association != '' && detailData.association != undefined" @click="getToolRelationTree">查看</el-button>
+
+                    <!--     <span v-if="detailData.association != null && detailData.association != '' && detailData.association != undefined">
+                                         <el-tag :key="tag.toolId" v-for="tag in JSON.parse(detailData.association)" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
+                                        </span>-->
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->
         </el-tab-pane><!--el-tab-pane-->
-        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" >
+        <el-tab-pane label="关联附件" name="second" v-loading="previewLoading" element-loading-text="预览转换中，请耐心等待">
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
 <!--            <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" >
@@ -130,6 +132,44 @@
 
     <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose" @previewLoadingClose="previewLoadingClose"></preview-util>
 
+
+    <!-- 关联工具展示 -->
+    <el-dialog title="关联工具" :visible.sync="toolTreeVisible"  width="980px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false" v-loading="toolTreeLoading">
+      <el-tree :data="toolRelationOptions" :props="defaultProps"></el-tree>
+      <!--      <el-table
+              :data="relationToolData"
+              border
+              ref="multipleTable"
+              header-align="left"
+            >
+              <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
+              <el-table-column label="工具编号"  key="toolCode" prop="toolCode"/>
+              <el-table-column label="工具名称"  key="toolName" prop="toolName":show-overflow-tooltip="true" />
+              <el-table-column label="操作" width="100px" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    @click="selectDelete(scope.row)"
+                  >删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            &lt;!&ndash; 分页组件 &ndash;&gt;
+            <el-pagination
+              v-show="relationToolTotal > 0"
+              :current-page.sync="currentToolPage"
+              :page-size.sync="pageToolSize"
+              :total="relationToolTotal"
+              @current-change="handlePageToolChange"
+              layout="total, prev, pager, next"
+            />-->
+      <span slot="footer" class="dialog-footer">
+        <el-button icon="el-icon-close" @click="toolTreeVisible = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+
     <!-- 上传 -->
 <!--    <AddDoc :show.sync="open" :toolId="detailData.toolId" @callback="getAttachmentList"/>-->
   </div><!--fbox1 左右分栏-->
@@ -144,6 +184,7 @@
   import { addCount } from "@/api/tool/downloadCount";
   import { listAttachment } from "@/api/attachment/attachment";
   import previewUtil from '@/components/PreviewUtil/previewUtil.vue'
+  import { getDataThree } from '@/api/tool/toolRelation'
 
   export default {
     name: 'toolDetail',
@@ -208,7 +249,17 @@
         previewLoading:false,
         previewUseFront: "txt,doc,docx,pdf",
         isPreviewDisable: false,
-        total: 0
+        total: 0,
+        //工具树显示
+        toolTreeVisible: false,
+        toolTreeLoading: false,
+        toolDataList: [],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+        //工具关系选择项
+        toolRelationOptions: [],
 
       }
     },
@@ -445,6 +496,7 @@
         self.detailLoading = true
         getTool(self.toolDetail.toolId).then((res) => {
           self.detailData = res.data
+          self.detailData.association = JSON.parse(res.data.association)
           /*let formData = res.data;
           formData.type = _this.form.type
           _this.form = formData*/
@@ -470,6 +522,45 @@
         const extension = parts.pop();
         return extension;
       },
+      /** 获取工具关联树展示 */
+      getToolRelationTree() {
+        let self = this
+        let toolRelation ={
+          resourceId: "",
+        }
+        let toolIds = []
+        if(self.detailData.toolId){
+          self.$set(toolRelation,"resourceIds",[self.detailData.toolId])
+        }else if(self.detailData.association && self.detailData.association.length > 0){
+          self.detailData.association.forEach(item=>{
+            toolIds.push(item.toolId)
+          })
+          self.$set(toolRelation,"resourceIds",toolIds)
+        }
+
+        self.toolTreeVisible = true;
+        self.toolTreeLoading = true;
+        getDataThree(toolRelation).then(res => {
+          if(self.detailData.toolName){
+            let treeArray = []
+            let treeData = {
+              "id": "20240908001",
+              "label": self.detailData.toolName,
+              "types": null,
+              "children": res.data
+            }
+            treeArray.push(treeData)
+            this.toolRelationOptions = treeArray;
+            self.toolTreeLoading = false;
+            return
+          }
+          this.toolRelationOptions = res.data;
+          self.toolTreeLoading = false;
+        }).catch(err => {
+          console.error("err========", err)
+          self.toolTreeLoading = false;
+        });
+      },
     }
   }
 </script>
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index bac13eb..ca983ab 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -191,8 +191,11 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="引用工具" prop="association">
-                <el-select
+              <el-form-item label="关联工具" prop="association">
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="getToolRelationTree">查看</el-button>
+                <el-button type="primary" icon="el-icon-check" size="mini" @click="handleToolSelect">新增关联工具</el-button>
+                <el-button type="primary" icon="el-icon-edit" size="mini"  @click="handleToolEdit">编辑关联工具</el-button>
+<!--                <el-select
                   :disabled="!editStatus"
                   v-model="form.association"
                   ref="selectHeadTool"
@@ -200,7 +203,7 @@
                   value-key="toolId"
                   filterable
                   remote
-                  placeholder="请选择引用工具"
+                  placeholder="请选择关联工具"
                   @focus="toolSelect">
                   <el-option
                     v-for="item in form.association"
@@ -208,7 +211,7 @@
                     :label="item.toolName"
                     :value="item">
                   </el-option>
-                </el-select>
+                </el-select>-->
               </el-form-item>
             </el-col>
           </el-row>
@@ -243,7 +246,7 @@
         </template>
         <!--            <el-button icon="el-icon-delete">删除</el-button>-->
       </div><!--operate 操作按钮-->
-      <el-table :data="paginatedData" style="width: 100%" v-loading="previewLoading" >
+      <el-table :data="paginatedData" style="width: 100%" v-loading="previewLoading" element-loading-text="预览转换中，请耐心等待">
         <!--            <el-table-column type="selection" width="50" align="center"> </el-table-column>-->
         <el-table-column label="序号" width="60" align="center" type="index"></el-table-column>
         <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
@@ -297,9 +300,7 @@
       ></processcode>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handleWorkflowSubmit"
-        >提 交</el-button
-        >
+        <el-button type="primary" @click="handleWorkflowSubmit">提 交</el-button>
       </span>
     </el-dialog>
     <!-- 流程选择下一环节及人员  结束 -->
@@ -307,7 +308,7 @@
       v-if="monitorDrawerVisible"
       ref="monitorDrawer"
     ></monitor-drawer>
-    <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
+    <tool-selector ref="toolSelect" @selectHandle="selectHandle" :toolData="form.association"></tool-selector>
     <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" :deptFilter="true" @cancel="toolPrincipalsChoose=false" @submit="submitPeople"></bl-user-selector>
 
     <preview-util v-if="isPreviewDisable" ref="previewForm" @previewClose="previewClose" @previewLoadingClose="previewLoadingClose"></preview-util>
@@ -315,11 +316,85 @@
     <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
       <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
     </el-dialog>
+
+
+    <!-- 关联工具展示 -->
+    <el-dialog title="编辑关联工具" :visible.sync="editToolVisible"  width="980px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false">
+      <el-table
+        :data="relationToolData"
+        border
+        ref="multipleTable"
+        header-align="left"
+      >
+        <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
+        <el-table-column label="工具编号"  key="toolCode" prop="toolCode"/>
+        <el-table-column label="工具名称"  key="toolName" prop="toolName":show-overflow-tooltip="true" />
+        <el-table-column label="操作" width="100px" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="selectDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页组件 -->
+      <el-pagination
+        v-show="relationToolTotal > 0"
+        :current-page.sync="currentToolPage"
+        :page-size.sync="pageToolSize"
+        :total="relationToolTotal"
+        @current-change="handlePageToolChange"
+        layout="total, prev, pager, next"
+      />
+      <span slot="footer" class="dialog-footer">
+        <el-button icon="el-icon-close" @click="editToolVisible = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 关联工具展示 -->
+    <el-dialog title="关联工具" :visible.sync="toolTreeVisible"  width="980px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false" v-loading="toolTreeLoading">
+      <el-tree :data="toolRelationOptions" :props="defaultProps" @node-click="handleToolNodeClick"></el-tree>
+      <!--      <el-table
+              :data="relationToolData"
+              border
+              ref="multipleTable"
+              header-align="left"
+            >
+              <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
+              <el-table-column label="工具编号"  key="toolCode" prop="toolCode"/>
+              <el-table-column label="工具名称"  key="toolName" prop="toolName":show-overflow-tooltip="true" />
+              <el-table-column label="操作" width="100px" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    @click="selectDelete(scope.row)"
+                  >删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            &lt;!&ndash; 分页组件 &ndash;&gt;
+            <el-pagination
+              v-show="relationToolTotal > 0"
+              :current-page.sync="currentToolPage"
+              :page-size.sync="pageToolSize"
+              :total="relationToolTotal"
+              @current-change="handlePageToolChange"
+              layout="total, prev, pager, next"
+            />-->
+      <span slot="footer" class="dialog-footer">
+        <el-button icon="el-icon-close" @click="toolTreeVisible = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 <script>
 import iFrame from "@/components/iFrame/index"
-import { listDocument,delDocument } from "@/api/document/document";
 import { listAttachment } from "@/api/attachment/attachment";
 import processcode from "@/views/workflowList/processcode/index.vue";
 import {
@@ -333,6 +408,7 @@ import AddDoc from '@/views/tool/AddDoc.vue'
 import Treeselect from '@riophae/vue-treeselect'
 import { addUser, deptTreeSelect, updateUser } from '@/api/system/user'
 import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool'
+import { getDataThree } from '@/api/tool/toolRelation'
 import blUserSelector from '@/components/user-selector/src/user-selector.vue'
 import ToolSelector from '@/components/tool-selector/index.vue'
 import uploadVue from '@/components/FileUpload/optimizeToolUpload.vue'
@@ -400,7 +476,8 @@ export default {
       monitorDrawerVisible:false,
       form: {
         toolRespDept: this.$store.getters.userInfo.deptId,
-        status: "zy"
+        status: "zy",
+        association: []
       },
       rules: {
         toolCode: [
@@ -465,7 +542,7 @@ export default {
       curDeptName: null,
 
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
-      acceptType: ".txt,.doc,.docx,.pdf,.mp4,.avi,.rmvb,.zip,.rar,.7z,.png,.jpg,.jpeg,.bmp",
+      acceptType: ".txt,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg",
       dataFile: [],
       detailBoolean: false,
       attachmentList: [],
@@ -475,6 +552,21 @@ export default {
       currentPage: 1,     // 当前页
       pageSize: 10,       // 每页显示数量
       previewLoading: false,
+      editToolVisible: false,
+      //编辑
+      currentToolPage: 1,     // 当前页
+      pageToolSize: 10,       // 每页显示数量
+      //工具树显示
+      toolTreeVisible: false,
+      toolTreeLoading: false,
+      toolDataList: [],
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+      //工具关系选择项
+      toolRelationOptions: [],
+
     };
   },
   computed: {
@@ -488,6 +580,16 @@ export default {
     total() {
       return this.attachmentList.length;
     },
+    // 分页后的数据
+    relationToolData() {
+      const start = (this.currentToolPage - 1) * this.pageToolSize;
+      const end = this.currentToolPage * this.pageToolSize;
+      return this.form.association.slice(start, end);
+    },
+    // 总数据条数
+    relationToolTotal() {
+      return this.form.association.length;
+    },
   },
   watch: {
     data (val) {
@@ -899,19 +1001,32 @@ export default {
       this.$set(this.form,'toolRespDept',node.id)
       this.$refs.eForm.validateField('toolRespDept');
     },
-    toolSelect(){
-      this.$refs.selectHeadTool.blur();
+    handleToolSelect(){
+      let self = this
+      let toolIds = []
+      if(self.form.association && self.form.association.length > 0){
+        self.form.association.forEach(item=>{
+          toolIds.push(item.toolId)
+        })
+      }
+      // this.form.association.list();
+      // this.$refs.selectHeadTool.blur();
       this.$nextTick(()=>{
-        this.$refs.toolSelect.init(null,null,true)
+        this.$refs.toolSelect.init(null,null,true, toolIds)
       })
     },
+    /** 处理工具编辑 **/
+    handleToolEdit(){
+      let self = this
+      self.editToolVisible = true
+    },
     selectHandle(source,index,data){
       let list = this.form.association
       if (!list) {
         list = []
       }
-      data.forEach(itme=>{
-        list.push({toolId:itme.toolId,toolName:itme.toolName})
+      data.forEach(item=>{
+        list.push({toolId:item.toolId,toolCode:item.toolCode,toolName:item.toolName})
       })
       this.form.association = list
     },
@@ -1019,6 +1134,60 @@ export default {
     handlePageChange(newPage) {
       this.currentPage = newPage;
     },
+    /** 删除 **/
+    selectDelete(row){
+      const index = this.form.association.findIndex(item => item.toolId == row.toolId);
+      if (index !== -1) {
+        // 从 attachmentList 中删除数据
+        this.form.association.splice(index, 1);
+      }
+    },
+    handlePageToolChange(newPage) {
+      this.currentToolPage = newPage;
+    },
+    //处理树节点点击事件
+    handleToolNodeClick(data){
+      console.log(data);
+    },
+    /** 获取工具关联树展示 */
+    getToolRelationTree() {
+      let self = this
+      let toolRelation ={
+        resourceId: "",
+      }
+      let toolIds = []
+      if(this.form.toolId){
+        self.$set(toolRelation,"resourceIds",[this.form.toolId])
+      }else if(self.form.association && self.form.association.length > 0){
+        self.form.association.forEach(item=>{
+          toolIds.push(item.toolId)
+        })
+        self.$set(toolRelation,"resourceIds",toolIds)
+      }
+
+      self.toolTreeVisible = true;
+      self.toolTreeLoading = true;
+      getDataThree(toolRelation).then(res => {
+        /* if(self.form.toolName){
+          let treeArray = []
+          let treeData = {
+            "id": "20240908",
+            "label": self.form.toolName,
+            "types": null,
+            "children": res.data
+          }
+          treeArray.push(treeData)
+          this.toolRelationOptions = treeArray;
+          self.toolTreeLoading = false;
+          return
+        } */
+        this.toolRelationOptions = res.data;
+        self.toolTreeLoading = false;
+      }).catch(err => {
+        console.error("err========", err)
+        self.toolTreeLoading = false;
+      });
+    },
 
 },
 
-- 
2.35.1.windows.2


From 937f2826f0b215e6c4bcfada59087a3771d211ee Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sun, 8 Sep 2024 23:11:17 +0800
Subject: [PATCH 44/55] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E7=A6=85?=
 =?UTF-8?q?=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/document.docx                          | Bin 12579 -> 12494 bytes
 public/tool.docx                              | Bin 12905 -> 12633 bytes
 src/api/document/document.js                  |   4 +-
 .../FileUpload/optimizeToolUpload.vue         |   8 +-
 src/utils/auth.js                             |   2 +-
 src/views/document/detail.vue                 |  11 +-
 src/views/document/index.vue                  | 102 ++++++++++++++----
 src/views/system/dept/index.vue               |  13 ++-
 src/views/system/role/index.vue               |  14 ++-
 src/views/system/user/index.vue               |  10 +-
 src/views/tool/index.vue                      |  48 ++++++---
 src/views/tool/toolDetail.vue                 |  11 +-
 .../workflowList/addWorkflow/tool_release.vue |   6 +-
 src/views/workstuff/dispose/index.vue         |  39 ++++---
 14 files changed, 189 insertions(+), 79 deletions(-)

diff --git a/public/document.docx b/public/document.docx
index fbb77ff481d2fadd92ed51b70e13b75f780b96ae..2a0622e3da409e12cb3f384421575de8a7e77363 100644
GIT binary patch
delta 4605
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

delta 4710
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

diff --git a/public/tool.docx b/public/tool.docx
index 3ced47fb14150b51f08e5a4130fbf8d9a9ec5d90..c03eb7863f4f3a63e5d5bca2cdad3afeffa78faa 100644
GIT binary patch
delta 4362
zcmV+l5%uorWZ7b{#{mTKx1b%9%K<HaPT4}+fy%BN2u>95LUOhhn=~ZRZoY~4f=}V&
zh_7MVb#<a3<R<z5^PN9A$)+1w1y5jXS*sky5kUbcUW-z#a&)tpg<}+0$CO}ItsqBR
zuxMHwA7xxqUK_YFwFcu#uz@EjOS#U`+Br=zwtNke*~mMT7nik>%=xWZVa@n|16u)3
z2sy<P923kj+yX;A5K)g5d_d|)Q*{8rF;pNyIg8^c#@}8CM%q6MI_1DAOSjejPJP@%
zw%|K)aBplm7@MYvnzW1I^T+sZetF$pH7r&8Rvb`~3Es7%+yHYR0uP|Oc6;SEJ-=AY
zP?3;i6q0e6j29%Pg!pxz;k~OwuWx}nR&5IN+&)+98IIa{RLr`$AKkJ9akec!Uf(`n
z-ZT7L8N$il{cpO754ea^I-1b*<RIN1P;_m6eu&}=P)h>@lj|=Uvs44X3<@}pYnK8C
z003PRlO7Nme_2!GND_YEi2V<Q-@$dNB*(ZXbavAV^kHaX`mHP#Sd9)xNyZJoep45A
z2RY2d%mYEWvhw~it5U!H{<ADj9*u4Cx?0ZY8JV4!Dy_4;x?j$2u9H)DcG9%E%5+gz
zW;uH@&FuGg|NYNz`$c2g7LGM1Afjp(WxAYg+IG8`f6tqAV@lne)mu{m@vgR|ZsDiB
zpO@M`?6#+AU2b)ouk#{rpXQ7ZXEutdm$RL%7NdyMGEZ&Y)OT&ivZ(Lw^3;s~CJy^|
z^bVX+o$g9gwY|o<H3isESIs8hHj}jSpGpH4H<OUZx14w^i|O2+lDAHd?(S=wy>R>;
z^E!sDf2~u~G?1XO7~Cy&UcHE+;+3G6P@h4l=Y#HfCkogp=~oBKo8lEelI<aj7x~(1
zJER!^aAd`{33p9fmyvGui@g1Qf41K?XK6JWag;U6=Ri6z%}&a6aeiObR<8?y=bnn$
zJHY01U6&{O#n#vq(hb07WH#>zYw!oq9@STMf4kaQTkopugVC@D#~(F#^~S-ZuG?1!
zvk_CDEfCWVPaw%u0Q%H)SbLF}nLE8J+H1XDwe@yVCnn1>tM`zt_cqVI8QbQmE>>He
z!q#+@N@s8)%bRVXpFY$!f3B-m7tw(?hGKqt;rQkJB=#>(SM}#zmA1RSHvVU9b!@^Q
ze=yx>t5b-@XkiFe*t(e1cGYbGd`EIdzP{|cJT%~%Nosp@F{DKox=PIoR23$8YE4w{
zAfesrHqY8ke<<scc473R33U3<6uQ~?U03RfyW-mFybsy1(VvcgZlQOrHu+uq)wIx9
z`m;Lw0kFHsEAzqR_nY>-f}|8jY`0c#f3MBY_BL-fy%PuhH;svP)A~)WtH2ul@O4+1
zW-y^KNqnK7>RtQG`SU6R9Qe)Eu3Q@nE{+iB4-K7gHS|&lV5LjI@vuAg$ICi1Ga&73
z{!%1Ui~ZB0?HGDILq)uys0O$I;!GcaRr^#xQmS^9KO4WwK0=go=(s%+{)Gi^e;Ht^
zF7%(^rnr9En#5?x65KKW+}*d7^_WPCe0!Ng>DwVO|5n+2zZlZh;TpQZH*K54@;Ies
z4fklPUs7Y9KGxsg7Z2w@>ip_D+kATe<@tN`?cwtFhFo5si$88-eig;?)Abkl^T{7S
zz82qq`1#$J<+5`VG#}}MJ3Q+Ze|L+o(5fZ`5JDC6nHnO~Q4f?r(ZrDmg$5B-NrX^1
zqcREtj1mh)CcOQk#}U4Cn1}E<k_!>V2t|2ZDu(HC6(_NS`QsBw6OSX(d?uO0F;4>_
zi0fgt1)k@`9Mcnpl7=A?9ZFcllZ3vufKu+VP#~UC8c`};L=P1rmc(a>e>4#)CJ4qO
zeb;drW}EUAb0Z|8)b#^GeIy1H_KB2Z4>`^$jS|XLoFKNvk)VDQB9uhBLSWdTiDF!Z
zh&0AMpGq-aea99s;ZflvNDP=FjJlWwOgSEnd`y}GX+A;n!(1<9A;WC*f=ERi@f7Nf
z3yPtN#ZgE?tmZgPzyhpJe>nu2i2%tD4}3`+K0aEGqr-zZCJd`N9<qo;5<wLQyNHMp
zgm8cx3yJ$Wr#uP;3nUT)9y`L3E>a6TR<U$F1XY3r94ZKrCZObbgz`}66CA5XK@~I?
ztQG_lN>B{FfKQ+)q<(}<92F=8Z^H8w4}AnX!b>Q1D3TvZnWx+sf60PmGL*iD^ePE$
zlrf29K{`AnBtUGFP$4|QI;`{}K^&}yNI(^ju|6uJL=i#wYaGZ#a>YU<+cNQ(h&`l!
z9O^iNasRb6heE?93F4_EJpx%k5aKwYPofZsffEFRM+t&ACrlvL67k20SwtNV$&Zte
zM8yG;ZABaxd_trtf9g^aQp9SwfL+HAF$!bA<006A>m2$^f^;!}VMu}mvyF!dkFoqH
z5h;$|fXX3`@&pnC<#IwotdA<VVI&DK+uQ_tB332JgA0{ANPbl4DTQ`_l}PH4sJ9Is
zLS5^F*H5|V=J3yUT6M44lX7?ohq_$bT%TNalR7+~%Ej6~e*}3o(boosHgil_?bZ|V
z^mHIJr7nsDrk{z>r>9(WGg)Nrda=c&w)Y3Q;|YuI!c_S2MOHVg8v7om((Rya4}-|?
zN}bfflVFsWS1`hq(|)sCuO_YvrtKpVjJTg3Z6|Pk2+w}e!bh6^wSS=xGp4CdZ&uv{
z)r>>Va`wDAe+{oXZg}SwcGZ2`F_(I~9mc}-JzdU<Zi=EETMNH3_{P)!Sl_de#(En3
z>S+BBop#Q`>2c8=7?yBqTpafJw8sy7@C9QyCk}gZ+LMPpXWD~rO#8(KrVLx;)dP%D
z)3V#YtBa!Eo9x51xtzV)8iLRd5$9D}>@ouYffsml4qmNV_`=mi`0!oq-TwiTkpvo(
zz$*!}Iu}s}f0P&(M9l{P05m}W01*HH0C#V4WG`fIV|8t1ZgehqZEWpa|7+Vu6#sp&
z{~>5UCzdQ(vP_*Ke`^C>2~E5HIL@+cYms&0bdH*o!TQ6XtQ5+|=nrGt52I`_7%Oxw
zr1Zb3lkUIRyE{p?Vkb?UCUI6#sI1f7dw1{Nz0bXOfA@0b>b-%twB?Y{#eP*%R%B_(
z@on63{a#hNbGx-%mX<<_{0{Q4?^LC2CzP(Pe)`FksM5jqaNziK2}t;1B?|1S)TcD4
z6bhl;cLpe28MrpVA@0%@8xIP&+jVWH5Mk0O6lF!`zXF17Ck%mK9r;@*lwxv&X=*rd
zeBjl^e`J7YxPnQqFhFE;7%T(z08zK?dM@1t+OnRI!BuHU{7T%R<+MYrNkw!hek3i(
z)F@`~6)hXF1USb6aXjb)_QSp#jE6BVH5g()>C)CwgV-8)Nxdjgv?+e+kdHG54T2(=
ziZQ_{ax;X{5se0(kOQ0F@vI)CcpQRR3JKi-e{%h_WAhDkLR5-;lu%>MU>zB=EKT+O
zNZA&-eowFrU`d^3fm|ba7^K|^+|yB8^EXpkY-OLIXR<yuwD3d(rq=#O9|ca@ogl0a
zLy89tL{UmNilUV$2v=-BHY5|PPf-i-Y1~L!8rYS!o{tG?doZ?0(Uu~mw8R#Ov<kMX
ze~mla>={6@RtXS6Yn`f8RIHY+nL4i$tP@_-?YK)(Wea&#NtOz%h=?zwg?$>rx4!Gs
zs?>41Xy{Q<#Y28CY32CKcQzz=b5KaF(1juG^q1>5S<OOB4W2PS&U7}1r2Tv>q6%HT
z|C#58^lQeJ3g-O(U|JMfvsJQmy*w$3e_(@ddrmSeRdl00Eg#qKK&7rrLVCkxs-+ec
zl?fm%s`n8AjZtJd7U@@ZLbi>;?p<~<6DPch2F`3j)3(Rt4G*D5@FOEwT?`+J?}AVw
zrgre8+W|-t4Jl4PuW>nND|GIm^m`4g7a%)lhC$PX5;LgvV68<J8+#bgj?;wKe{iQN
zX{<a9kPW=zsqvgHowqGaCM@H5TNAg}pPRMohi=EYJ}+<4{EPXTv*p$HCdJ?OZlG;E
zWTP2RWY>+Y1yrs(p7%N8i=XnjI%Hbo*?_N#3|q5=TsrNk#1Cno$n+2bqUUL6#A~Xi
z*NEF;+SG$*9eco?k<nyLs9dJle^8V%D;6Y@mXu@-Zdui3(`s=m15#Kg&3p0Mn3P_w
zyeC_-A6$7;g#dk9Jnf8i#^#!1$J%Pg#*?e(^g8kJU4l}Z7@N8+%X51^ROV<8BTW=I
zCYs$X=tiw<TADHmkz*XQ!83A*SQxY6JlQY+KNQ+7Z0AOQJ$n1*2ezvFe-@ap$$|v?
zC(CSr(6|W)Om5GU-j9(2ygQm1SQ~|o2f!>kceY!VV-4<N1_HXgI(qeN^zEzBlgInN
z|2<<@#Ee(0Rx_208#x%Fu<5B0{t(JlYLpwYWlbvA(Q3q1;6ms6EPB8u=|08SJ8VA{
zPZ4_v^voiRQdXO#nq}q)f0NzSE!y@dM;NZXS%gs(xgob|Il?gGd%)dJ0Fj~P`{DDV
z5oZ7S>(RqM7YboiO|cBas^th1Bg}2^u;)Y>)lgKc*iv(p$x(*esyK3SGA}#!W8!Td
zCD)zF0EnuX+%vc}WD!k7Z!im(I4DV*^Y(#Cb;VRo!<aN8xep`)f5N9jsDnXgx6VS%
zlVNBZ1ye;VqL)+~dw^_FLeww$5PQ4fPEt@*gew^CjG3fmeHP5+d~MG`gz4acz+u<*
zAUNK#*uVLFO18@vuGrqs&-QkoEEG`6hE{K>t;VE|f7Gtn1|AZ7UZ|AKVpDI*!eZnh
zzckFAJ7hB>+9G_Me|m@FH4PJ=JKUMFZYgHwR4j+P4*_@Q6T4(M^X|p3?_T`&c6WE7
zKt|C^T0^ag)9K_W`2FY1|KE7uI&pp54Ul)}N$Ptdf2yIXCB59teX`sqJGD=C-aw-k
zb*0#9h_H2R4sxKmTtG8=^Zn@gFQdmlzJ2p}p|D2P8%o2}e}!etu?Bm$oG@rO0i84Y
zXBe%Tp*Ko7(&R{U>5xWN8|9j&W$rwl8PZ(LF$`=J6D!B3XXdv0bkVx=b6@tqd%5?`
zgN4EqO|NUUMlGX4A8mjPk|pSHUY|v8wX~XHiUZ#~IF<*;PIHcQ?mmlZnWcIubD(@?
zNRpWA^adO|f0oGa!=2`09}AA{{qtb|k4FoLF>1XeTV^wlkFoo3#IfOO|3->5ncV<O
zZo!)@F%BvacH`WI)E1sY;6qMARr>N8t|5C<oYW<Cn>?35)a3X0$T7A`XLaFkR^G&W
zqJ2t9F-@(O-@rJKy^$X)U4~;NqX?&>r99flZB90=e=Y&~g}>+b@Tbx1-MyzT|9$!*
zV~?5lDbir#4H+9GJ(#9&b~njo$h2<NbveJj0LW<*2T|v?J3BWoi!tm?r0QjF<r;EX
zX{oi$KKB^z?%C#9a40@03%29CUpPD^G<0k#f+az3gWVQl_t_LU1Lqgf;J02@d6E~X
zcn`AIf1m~=&9Ia(jqf*jvKhRVA<YxMiQKgDXO_!0{@QmCWGhysa!Fy8yBI_MOjR<?
zB75x(DSwUcE<wD7-F=GVjYd&yZ-xUPC-yb)#|c=@8PpNE87$uglJcVp`?2m)yANrp
z3MXwtGU~=e$|KBsGI01QGKJws^5+g#{{v7<0s{n-Au$@W$0p_n0^lo?uP#3VOevG_
zE;0geDU&2Gk_7R$pdFLCFUbOyDwBmUHv+#ZlfE!68<ZFqM9l{P05m}W01*HH00000
z0096X0001;lLs+A0+}U~M=>M{IFD<W0tWy9T@#aaF^mB>lL9h00br9mGAIUfEdT%j
E0Q#af5C8xG

delta 4635
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
RH~~PDD={brgDwC7001w@)#m^J

diff --git a/src/api/document/document.js b/src/api/document/document.js
index 5974d65..cec496c 100644
--- a/src/api/document/document.js
+++ b/src/api/document/document.js
@@ -68,7 +68,7 @@ export function getStatistics(query) {
 export function getExportWordList(query) {
   return request({
     url: '/document/export/word/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
index 9c33613..b9cdac6 100644
--- a/src/components/FileUpload/optimizeToolUpload.vue
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -491,9 +491,11 @@ export default {
           failCount++;
         }
       }
-      this.$message.success('上传完成！成功：' + this.uploadedCount+'，失败：' + failCount);
-      this.progressFlag = false;
-      this.progressPercent = 0;
+      setTimeout(function () {
+        self.$message.success('上传完成！成功：' + this.uploadedCount+'，失败：' + failCount);
+        self.progressFlag = false;
+        self.progressPercent = 0;
+      }, 500);
     },
     updateProgress() {
       if (this.uploadedCount === this.totalFiles) {
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 08a43d6..df9f40a 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'Admin-Token-Tool'
 
 export function getToken() {
   return Cookies.get(TokenKey)
diff --git a/src/views/document/detail.vue b/src/views/document/detail.vue
index cbf8fa8..153aaa8 100644
--- a/src/views/document/detail.vue
+++ b/src/views/document/detail.vue
@@ -83,7 +83,7 @@
                   <div class="ltext">
                     <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
                     <div class="te">{{repItem.content}}</div>
-                    <!--                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
+                                        <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
                                         <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
                                           <el-input type="textarea" v-model="item.replyContentSon[repIdex]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
                                           <div class="plbtn">
@@ -91,7 +91,7 @@
                                             <el-divider direction="vertical"></el-divider>
                                             <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
                                           </div>
-                                        </div>-->
+                                        </div>
                   </div>
                 </div>
               </template>
@@ -414,15 +414,14 @@
             });
             self.cancelReplySon(parentIndex, repIndex)
             self.getDiscussionsList()
+            // 清空回复内容并隐藏表单
+            this.$set(parentItem.replyContentSon, repIndex, '');
+            this.$set(parentItem.showReplyFormSon, repIndex, false);
           }).catch(err =>{
             console.error("submitReplySon==err==", err)
             self.$modal.msgError("发布失败");
           });
         })
-
-        // 清空回复内容并隐藏表单
-        this.$set(parentItem.replyContentSon, repIndex, '');
-        this.$set(parentItem.showReplyFormSon, repIndex, false);
       },
       /** 回复 **/
       submitReply(index, item) {
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 5d1e9d9..8d738f9 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -86,17 +86,33 @@
     </el-card>
     <el-card class="lrtt">
       <div class="lt">
-        <el-input placeholder="请输入..." prefix-icon="el-icon-search"></el-input>
+        <el-input
+          v-model="categoryNameParam"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          prefix-icon="el-icon-search"
+          style="margin-bottom: 20px"
+        />
+<!--        <el-input placeholder="请输入..." prefix-icon="el-icon-search"
+                  clearable size="small" style="margin-bottom: 20px"
+                  v-model="categoryNameParam"></el-input>-->
         <div class="divide"></div><!--divide 分隔-->
-        <el-tree :data="docCategory" :props="docCategoryProps" @node-click="handleNodeClick">
+        <el-tree :data="docCategory" :props="docCategoryProps"
+                 ref="tree" :expand-on-click-node="false"
+                 :filter-node-method="filterNode"
+                 node-key="id"
+                 default-expand-all
+                 highlight-current
+                 @node-click="handleNodeClick">
 					<span class="custom-tree-node" slot-scope="{ node, data }">
 					    <span>{{ node.label }}</span>
                 <el-dropdown>
                   <span class="el-dropdown-link"><i class="el-icon-more"></i></span>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item  @click.native="handleDocCategoryAdd(data)"><i class="el-icon-plus"></i>添加</el-dropdown-item>
-                    <el-dropdown-item v-if="data.types != 'system'" @@click.native="handleDocCategoryUpdate(data)"><i class="el-icon-edit"></i>编辑</el-dropdown-item>
-                    <el-dropdown-item v-if="data.types != 'system'" @@click.native="handleDocCategoryDelete(data)"><i class="el-icon-delete"></i>删除</el-dropdown-item>
+                    <el-dropdown-item v-if="data.types != 'system'" @click.native="handleDocCategoryUpdate(data)"><i class="el-icon-edit"></i>编辑</el-dropdown-item>
+                    <el-dropdown-item v-if="data.types != 'system'" @click.native="handleDocCategoryDelete(data)"><i class="el-icon-delete"></i>删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
           </span>
@@ -120,7 +136,7 @@
 
         </div><!--operate 操作按钮-->
 
-        <el-table v-loading="loading" :data="docList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="docList" ref="tableRef" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="文档编号"  prop="docCode" width="120" />
           <el-table-column label="文档名称"  prop="docName" :show-overflow-tooltip="true" />
@@ -209,8 +225,11 @@
 
 
 
-    <el-dialog :title="docCategoryTitle" :visible.sync="docCategoryOpen"  width="50%" append-to-body>
-      <el-form ref="docCategoryForm" :model="docCategoryForm" :rules="docCategoryRules" label-width="80px">
+    <el-dialog :title="docCategoryTitle" :visible.sync="docCategoryOpen"  width="50%"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
+      <el-form ref="docCategoryFormRefs" :model="docCategoryForm" :rules="docCategoryRules" label-width="80px">
         <el-form-item label="父分类" prop="parentId">
           <treeselect v-model="docCategoryForm.parentId" :options="docCategory" :show-count="true" placeholder="如果不选择，默认为顶级节点" />
         </el-form-item>
@@ -269,6 +288,7 @@
     <el-dialog :title="exportTitle" :visible.sync="exportDrawerOpen"
                :wrapperClosable="false"
                :modal-append-to-body="false" :show-close="false" :close-on-press-escape="false"
+               v-loading="wordLoading"  element-loading-text="正在下载数据，请稍候"
                width="980px" append-to-body>
       <div class="el-form-border">
           <el-form ref="exportFrom" label-width="180px">
@@ -292,7 +312,7 @@
                   <el-checkbox label="docCode">文档编号</el-checkbox>
                   <el-checkbox label="docName">文档名称</el-checkbox>
                   <el-checkbox label="docType">文档类别</el-checkbox>
-                  <el-checkbox label="docPrincipals">负责人</el-checkbox>
+                  <el-checkbox label="docPrincipalsName">负责人</el-checkbox>
                   <el-checkbox label="docRespDeptName">归属单位</el-checkbox>
                   <el-checkbox label="docSource">文档来源</el-checkbox>
                   <el-checkbox label="docStatus">文档状态</el-checkbox>
@@ -397,11 +417,17 @@ export default {
         docPrincipals: '',
         docSource: '',
         docStatus: '',
-        docCategoryId: '',
         createById: this.$store.getters.userId,
         permissionCheck: true,
         downloadCheck:true
       },
+      // 文件夹查询
+      queryCategoryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        docCategoryId: '',
+        categoryName: '',
+      },
       // 表单参数
       form: {
         docName: '',
@@ -444,7 +470,7 @@ export default {
       loadingDownload: false,
       acceptType: "zip,rar,7z",
       //导出属性
-      columnList: ['docCode', 'docName', 'docType', 'docPrincipals', 'docRespDeptName', 'docSource', 'docStatus', 'createTime'],
+      columnList: ['docCode', 'docName', 'docType', 'docPrincipalsName', 'docRespDeptName', 'docSource', 'docStatus', 'createTime'],
       checkList: [],
       exportDrawerOpen: false,
       docTitle: '',
@@ -475,8 +501,16 @@ export default {
       docDetail: {},
       detailDocOpen: false,
       detailOpen: false,
+      categoryNameParam: undefined,
+      wordLoading: false,
     };
   },
+  watch: {
+    // 根据名称筛选部门树
+    categoryNameParam(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
     this.getList();
     this.getDeptTree();
@@ -529,6 +563,7 @@ export default {
       this.dateRange = [];
       this.queryParams.docCategoryId = '';
       this.resetForm("queryForm");
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -634,17 +669,20 @@ export default {
     },
     /** 修改按钮操作 */
     handleDocCategoryUpdate(row) {
-      this.resetDocCategoryForm();
+      let self = this
+      self.docCategoryOpen = true;
+      self.$nextTick(() => {
+        self.resetDocCategoryForm();
+      })
       const id = row.id;
       getCategory(id).then(response => {
-        this.docCategoryForm = response.data;
-        this.docCategoryOpen = true;
-        this.docCategoryTitle = "修改文档资源分类";
+        self.docCategoryForm = response.data;
+        self.docCategoryTitle = "修改文档资源分类";
       });
     },
     /** 提交按钮 */
     docCategorySubmitForm() {
-      this.$refs["docCategoryForm"].validate(valid => {
+      this.$refs["docCategoryFormRefs"].validate(valid => {
         if (valid) {
           if (this.docCategoryForm.id != null) {
             updateCategory(this.docCategoryForm).then(response => {
@@ -670,7 +708,12 @@ export default {
     },
     /** 重置 **/
     resetDocCategoryForm(){
-      this.$refs.docCategoryForm.resetFields();
+      this.docCategoryForm = {
+          categoryName: null,
+          categoryDescription: null,
+          parentId: null
+      },
+      this.$refs.docCategoryFormRefs.resetFields();
     },
     /**
      * 处理下载
@@ -772,6 +815,11 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       let self = this
+      console.info("this.checkList.======", this.checkList)
+      if(this.checkList.length == 0){
+        this.$modal.msgWarning(`最少选择一个字段`);
+        return
+      }
       if (this.statevalue == 1) {
         let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
 
@@ -787,7 +835,7 @@ export default {
             excludeFields:excludeFields,
           }
         }
-        this.download('/document/export', params , `文档资源信息数据_${new Date().getTime()}.xlsx`)
+        this.download('/document/export', params , `document_${new Date().getTime()}.xlsx`)
       }
       if (this.statevalue == 2) {
         let params = {
@@ -798,16 +846,30 @@ export default {
             docIdList: self.selection.map(item=>item.docId)
           }
         }
+        self.wordLoading = true
         getExportWordList(params).then(r => {
           if (r.data.length != 0) {
             const data = {
               form: null,
               list: r.data
             }
-            exportDocx('document.docx', data, `document.docx`)
+            exportDocx('document.docx', data, `document_${new Date().getTime()}.docx`)
+            setTimeout(() => {
+              if(self.batchExportFlag){
+                self.clearSelected()
+              }
+              self.wordLoading = false
+              self.exoportDrawerOpen = false;
+            }, 1000);
           } else {
+            self.wordLoading = false
+            self.exportDrawerOpen = false
             this.$message.error('没有数据');
           }
+        }).catch((err) => {
+          console.error("err=============", err)
+          self.wordLoading = false
+          self.exportDrawerOpen = false
         })
       }
 
@@ -834,6 +896,10 @@ export default {
           break;
       }
     },
+    clearSelected() {
+      // 清空选中的tab
+      this.$refs.tableRef.clearSelection();
+    },
     /** 关闭详情 **/
     handleFileCloseDetail(){
       this.fileDetailDrawerOpen = false;
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index e0cc845..8061e9e 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -100,7 +100,10 @@
     </el-card>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
@@ -112,7 +115,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+              <el-input v-model="form.deptName" placeholder="请输入部门名称" maxlength="50" show-word-limit/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -124,19 +127,19 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="50" show-word-limit/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" show-word-limit/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" show-word-limit/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index d4d7b78..fcba135 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -154,10 +154,13 @@
     </el-card>
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px"
+               append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" maxlength="50" show-word-limit/>
         </el-form-item>
         <el-form-item prop="roleKey">
           <span slot="label">
@@ -166,7 +169,7 @@
             </el-tooltip>
             权限字符
           </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" maxlength="70" show-word-limit/>
         </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
           <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
@@ -206,7 +209,10 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a294b3d..bbd6910 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -188,7 +188,10 @@
     </el-card>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -294,7 +297,10 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px"
+               :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 1229c36..71e36bc 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -96,15 +96,15 @@
         </div><!--operate 操作按钮-->
         <el-table v-loading="loading" :data="toolList" ref="tableRef" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
-          <el-table-column label="工具编号"  key="toolCode" prop="toolCode"  width="150px"/>
+          <el-table-column label="工具编号"  key="toolCode" prop="toolCode"  width="150px" :show-overflow-tooltip="true"/>
           <el-table-column label="工具名称"  key="toolName" prop="toolName" :show-overflow-tooltip="true" width="150px"/>
           <el-table-column label="工具类别"  key="toolType" prop="toolType" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
             </template>
           </el-table-column>
+          <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" width="120" :show-overflow-tooltip="true"/>
           <el-table-column label="归属单位"  key="toolRespDeptName" prop="toolRespDeptName" :show-overflow-tooltip="true" />
-          <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" width="120" />
           <el-table-column label="状态" align="center" key="status" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
@@ -162,7 +162,7 @@
             <template slot-scope="scope">
 <!--              && !scope.row.downloadStatus v-if="checkApplyUseBtn(scope.row)"-->
               <el-button type="text" icon="el-icon-info"  @click="applyUse(scope.row)" v-if="checkApplyUseBtn(scope.row)">申请使用</el-button>
-              <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
+              <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)" v-hasPermi="['tool:detail']">详情</el-button>
               <el-button type="text" icon="el-icon-download" v-if="scope.row.downloadStatus" @click="handleFileDownload(scope.row)">下载</el-button>
               <el-dropdown size="mini" v-if="selectable(scope.row)" @command="(command) => handleCommand(command, scope.row)">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right" >更多</el-button>
@@ -185,8 +185,11 @@
     </el-card><!--el-card-->
 
     <!-- 工具导出对话框 -->
-    <el-dialog :title="exportTitle" :visible.sync="exoportDrawerOpen"  width="980px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
-               :show-close="false" :wrapperClosable="false">
+    <el-dialog :title="exportTitle" :visible.sync="exoportDrawerOpen"  width="980px"
+               append-to-body :close-on-press-escape="false" :close-on-click-modal="false"
+               :show-close="false" :wrapperClosable="false"
+               v-loading="wordLoading"  element-loading-text="正在下载数据，请稍候"
+    >
       <div class="el-form-border">
         <el-form ref="exportFrom" label-width="180px">
           <el-row>
@@ -212,12 +215,14 @@
                   <el-checkbox label="toolPrincipalsName">负责人</el-checkbox>
                   <el-checkbox label="toolRespDeptName">归属单位</el-checkbox>
                   <el-checkbox label="status">状态</el-checkbox>
-                  <el-checkbox label="toolUse">工具用途</el-checkbox>
-                  <el-checkbox label="testSituation">测评情况</el-checkbox>
+                  <el-checkbox label="recordStatus">流程状态</el-checkbox>
+                  <el-checkbox label="createTime">创建时间</el-checkbox>
+<!--                  <el-checkbox label="toolUse">工具用途</el-checkbox>-->
+<!--                  <el-checkbox label="testSituation">测评情况</el-checkbox>
                   <el-checkbox label="functionDesc">功能描述</el-checkbox>
                   <el-checkbox label="applyCondition">适用条件</el-checkbox>
                   <el-checkbox label="operateExplain">操作说明</el-checkbox>
-                  <el-checkbox label="remark">备注</el-checkbox>
+                  <el-checkbox label="remark">备注</el-checkbox>-->
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
@@ -290,6 +295,7 @@ import AddDoc from './AddDoc'
 import mainComponent from "@/components/mainComponent/index.vue";
 import { exportDocx } from '@/utils/docUtil/docutil.js';
 import { addCount } from "@/api/tool/downloadCount";
+import { Loading, Message } from 'element-ui'
 
 export default {
   name: "User",
@@ -323,7 +329,8 @@ export default {
       // 部门树选项
       deptOptions: undefined,
       toolPrincipalsData: [],
-      columnList: ['toolName', 'toolType', 'toolSource', 'toolPrincipalsName', 'toolRespDeptName', 'status', 'toolUse', 'testSituation', 'functionDesc', 'applyCondition', 'operateExplain', 'remark'],
+      //'toolUse', 'testSituation', 'functionDesc', 'applyCondition', 'operateExplain', 'remark'
+      columnList: ['toolName', 'toolType', 'toolSource', 'toolPrincipalsName', 'toolRespDeptName', 'status', 'recordStatus','createTime'],
       checkList: [],
       toolDetail: {},
       // 是否显示弹出层
@@ -409,6 +416,7 @@ export default {
       exportTitle:'',
       batchExportFlag: false,
       selectedRows: [], // 保存所有选中的数据
+      wordLoading: false,
 
     };
   },
@@ -623,6 +631,10 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       let self = this
+      if(this.checkList.length == 0){
+        this.$modal.msgWarning(`最少选择一个字段`);
+        return
+      }
       if (this.statevalue == 1) {
         let excludeFields = this.columnList.filter(item=>!this.checkList.includes(item))
         let params = {
@@ -637,7 +649,7 @@ export default {
             excludeFields:excludeFields,
           }
         }
-        this.download('/tool/export',params, `工具信息数据_${new Date().getTime()}.xlsx`)
+        this.download('/tool/export',params, `tool_${new Date().getTime()}.xlsx`)
         setTimeout(() => {
           if(self.batchExportFlag){
             self.clearSelected()
@@ -654,6 +666,8 @@ export default {
             toolIdList: self.selection.map(item=>item.toolId)
           }
         }
+        self.wordLoading = true
+        // 正在下载数据，请稍候
         exportWordList(params).then(r => {
           if (r.data.length != 0) {
             const data = {
@@ -661,16 +675,22 @@ export default {
               list: r.data
             }
             //模板文件位置在public文件夹里N
-            exportDocx('tool.docx', data, `tool.docx`)
+            exportDocx('tool.docx', data, `tool_${new Date().getTime()}.docx`)
             setTimeout(() => {
               if(self.batchExportFlag){
                 self.clearSelected()
               }
+              self.wordLoading = false
               self.exoportDrawerOpen = false;
             }, 1000);
           } else {
+            self.wordLoading = false
             this.$message.error('没有数据');
           }
+        }).catch((err) => {
+          console.error("err=============", err)
+          self.wordLoading = false
+          self.exoportDrawerOpen = false;
         })
       }
 
@@ -714,7 +734,7 @@ export default {
         return
       }
 
-      _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+      _this.$modal.confirm('该流程待办任务将会被撤销，请谨慎操作。是否确认执行？')
         .then(async() => {
           _this.loading = true
           for (let row of list) {
@@ -733,13 +753,13 @@ export default {
             }
             await addTool(formData)
           }
-          _this.$modal.msgSuccess("删除成功");
+          _this.$modal.msgSuccess("撤销成功");
           _this.loading = false
           _this.getList();
         })
     },
     selectable(row,index){
-      return row.recordStatus==='draft'&&row.createBy==this.userInfo.userId
+      return row.recordStatus==='draft' && row.createBy == this.userInfo.userId
     },
     /** 关闭详情 **/
     handleCloseDetail(){
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 157deec..8805bf2 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -109,7 +109,7 @@
                   <div class="ltext">
                     <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
                     <div class="te">{{repItem.content}}</div>
-<!--                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
+                    <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
                     <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
                       <el-input type="textarea" v-model="item.replyContentSon[repIdex]" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
                       <div class="plbtn">
@@ -117,7 +117,7 @@
                         <el-divider direction="vertical"></el-divider>
                         <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
                       </div>
-                    </div>-->
+                    </div>
                   </div>
                 </div>
               </template>
@@ -477,15 +477,14 @@
             });
             self.cancelReplySon(parentIndex, repIndex)
             self.getDiscussionsList()
+            // 清空回复内容并隐藏表单
+            this.$set(parentItem.replyContentSon, repIndex, '');
+            this.$set(parentItem.showReplyFormSon, repIndex, false);
           }).catch(err =>{
             console.error("submitReplySon==err==", err)
             self.$modal.msgError("发布失败");
           });
         })
-
-        // 清空回复内容并隐藏表单
-        this.$set(parentItem.replyContentSon, repIndex, '');
-        this.$set(parentItem.showReplyFormSon, repIndex, false);
       },
       handleBeforeClose() {
         this.viewDialogOpen = false
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index ca983ab..b97c296 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -437,7 +437,7 @@ export default {
       if (_this.editStatus&&_this.form.toolCode&&_this.form.toolRespDept) {
         checkToolExist({toolId:_this.form.toolId,toolCode:_this.form.toolCode,toolRespDept:_this.form.toolRespDept}).then((response) => {
           if (response.data) {
-            callback(new Error(_this.form.toolRespDeptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
+            callback(new Error(_this.userInfo.dept.deptName+"下已存在编号为"+_this.form.toolCode+'的工具，请勿重复添加！'))
           } else {
             callback()
           }
@@ -808,7 +808,7 @@ export default {
     },
     deleteForm(){
       let _this = this
-      _this.$modal.confirm('删除后，该流程待办任务将会被删除，请谨慎操作。是否确认执行？')
+      _this.$modal.confirm('该流程待办任务将会被撤销，请谨慎操作。是否确认执行？')
         .then(()=> {
           _this.loading = true
           let formData = {
@@ -826,7 +826,7 @@ export default {
           }
           addTool(formData).then((res) => {
             if (res.code === 200) {
-              this.$modal.msgSuccess("删除成功");
+              this.$modal.msgSuccess("撤销成功");
               this.close(true);
             }
           });
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 8c2b3d3..2fa2212 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -9,7 +9,7 @@
             </el-form-item>
           </div>
           <div class="sr">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery" v-loading="loading">搜索</el-button>
             <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
           </div>
         </div><!--search 搜索-->
@@ -244,28 +244,37 @@ export default {
     },
     /** 查询列表 */
     getListData() {
-      this.loading = true;
-      this.postList = [];
-      workflowToDoList(this.queryParams).then((response) => {
-        if (this.activeName == "taskToDo") {
+      let self = this
+      self.loading = true;
+      self.postList = [];
+      workflowToDoList(self.queryParams).then((response) => {
+        if (self.activeName == "taskToDo") {
           // 待办
-          this.statustotal = response.data.totalCount;
+          self.statustotal = response.data.totalCount;
           // this.$store.commit("SET_THINGNUMBER", response.data.totalCount || 0);
-          this.total = response.data.totalCount;
+          self.total = response.data.totalCount;
         }
-        if (this.activeName == "taskDealed") {
+        if (self.activeName == "taskDealed") {
           // 已办
-          this.doneTotal = response.data.totalCount;
-          this.total = response.data.totalCount;
+          self.doneTotal = response.data.totalCount;
+          self.total = response.data.totalCount;
         }
-        if (this.activeName == "taskFinish") {
+        if (self.activeName == "taskFinish") {
           // 办结
-          this.finishedTotal = response.data.totalCount;
-          this.total = response.data.totalCount;
+          self.finishedTotal = response.data.totalCount;
+          self.total = response.data.totalCount;
         }
 
-        this.postList = response.data.result;
-        this.loading = false;
+        self.postList = response.data.result;
+        setTimeout(function () {
+          self.loading = false;
+        }, 500);
+
+      }).catch(err => {
+        console.info("err=============", err)
+        setTimeout(function () {
+          self.loading = false;
+        }, 500);
       });
     },
     // 取消按钮
-- 
2.35.1.windows.2


From 05f662c0c7130d092bad913d73bb911f315c9e0b Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Sun, 8 Sep 2024 23:15:01 +0800
Subject: [PATCH 45/55] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 10b40c6..a97438c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 200000
 })
 
 // request拦截器
-- 
2.35.1.windows.2


From 6a5157ae7db8a658fa28d99180b6d7b1187e4f90 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 9 Sep 2024 01:18:21 +0800
Subject: [PATCH 46/55] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  4 +--
 src/App.vue                                   |  5 ++-
 src/components/tool-selector/index.vue        | 10 +++---
 src/layout/components/TagsView/index.vue      |  9 ++---
 src/permission.js                             |  3 +-
 src/views/document/uploadProgress.vue         | 10 +++---
 src/views/message/index.vue                   |  2 +-
 src/views/tool/toolDetail.vue                 |  8 ++---
 .../workflowList/addWorkflow/tool_release.vue | 35 ++++++++++++++++---
 9 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 7067494..39e659d 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
     "pizzip": "3.1.7",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
-    "sockjs-client": "^1.6.1",
     "sortablejs": "1.10.2",
     "v-viewer": "1.6.4",
     "vue": "2.6.12",
@@ -66,8 +65,7 @@
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vue-video-player": "5.0.1",
-    "vuex": "3.6.0",
-    "websocket": "^1.0.35"
+    "vuex": "3.6.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
diff --git a/src/App.vue b/src/App.vue
index 39ca9b3..8d3da3c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,6 +9,7 @@
 import ThemePicker from "@/components/ThemePicker";
 import store from '@/store'
 import { Message } from 'element-ui'
+import { getToken } from '@/utils/auth'
 
 export default {
   name: "App",
@@ -22,7 +23,9 @@ export default {
     }
   },
   created() {
-    store.dispatch('GetUserMsgCount').then(() => { })
+    if (getToken()) {
+      store.dispatch('GetUserMsgCount').then(() => { })
+    }
   },
   methods:{
 
diff --git a/src/components/tool-selector/index.vue b/src/components/tool-selector/index.vue
index fc8ed18..a9e5959 100644
--- a/src/components/tool-selector/index.vue
+++ b/src/components/tool-selector/index.vue
@@ -42,15 +42,15 @@
           header-align="left"
         >
           <el-table-column type="selection" width="50" align="center" v-if="multiple" :selectable="(row,index)=>selectableFun(row,index,toolData,selectInfoData)"/>
-          <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode"/>
-          <el-table-column label="工具名称" align="center" key="toolName" prop="toolName":show-overflow-tooltip="true" />
-          <el-table-column label="工具类别" align="center" key="toolType" prop="toolType" :show-overflow-tooltip="true" >
+          <el-table-column label="工具编号"  key="toolCode" prop="toolCode"/>
+          <el-table-column label="工具名称"  key="toolName" prop="toolName":show-overflow-tooltip="true" />
+          <el-table-column label="工具类别"  key="toolType" prop="toolType" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
             </template>
           </el-table-column>
-          <el-table-column label="归属单位" align="center" key="toolRespDeptName" prop="toolRespDeptName"  :show-overflow-tooltip="true" />
-          <el-table-column label="负责人" align="center" key="toolPrincipalsName" prop="toolPrincipalsName" width="120" />
+          <el-table-column label="归属单位"  key="toolRespDeptName" prop="toolRespDeptName"  :show-overflow-tooltip="true" />
+          <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" width="120" />
           <el-table-column label="操作" v-if="!multiple" width="100px" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 96585a5..20158fa 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -45,7 +45,7 @@ export default {
   },
   computed: {
     visitedViews() {
-      return this.$store.state.tagsView.visitedViews
+      return this.$store.state.tagsView.visitedViews ? this.$store.state.tagsView.visitedViews : []
     },
     routes() {
       return this.$store.state.permission.routes
@@ -140,14 +140,15 @@ export default {
       return false
     },
     moveToCurrentTag() {
+      let self = this
       const tags = this.$refs.tag
-      this.$nextTick(() => {
+      self.$nextTick(() => {
         for (const tag of tags) {
           if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
+            self.$refs.scrollPane.moveToTarget(tag)
             // when query is different then update
             if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
+              self.$store.dispatch('tagsView/updateVisitedView', self.$route)
             }
             break
           }
diff --git a/src/permission.js b/src/permission.js
index c568979..9e4fe44 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/register']
+const whiteList = ['/login', '/register', '/workflow/msg/count/']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -37,6 +37,7 @@ router.beforeEach((to, from, next) => {
               next({ path: '/' })
             })
           })
+        store.dispatch('GetUserMsgCount').then(() => { })
       } else {
         next()
       }
diff --git a/src/views/document/uploadProgress.vue b/src/views/document/uploadProgress.vue
index bfd4d0c..25d7188 100644
--- a/src/views/document/uploadProgress.vue
+++ b/src/views/document/uploadProgress.vue
@@ -30,10 +30,10 @@
       }
     },
     created(){
-      this.initWebSocket();
+      // this.initWebSocket();
     },
     methods: {
-      initWebSocket() {
+      /* initWebSocket() {
         this.websocket = new WebSocket(process.env.VUE_APP_WS_URL);
         this.websocket.onmessage = (event) => {
           this.uploading = true;
@@ -52,8 +52,8 @@
             }
           })
           console.log('this.progressArr=' + this.progressArr);
-         /* let progress = msgStr.substring(msgStr.indexOf("/") + 1, msgStr.length);
-          this.progress = parseInt(msgArr[2])*/
+         /!* let progress = msgStr.substring(msgStr.indexOf("/") + 1, msgStr.length);
+          this.progress = parseInt(msgArr[2])*!/
           // if (progress === '100%') {
           //   this.websocket.close();
           // }
@@ -61,7 +61,7 @@
         this.websocket.onclose = () => {
           console.log('WebSocket connection closed');
         };
-      },
+      }, */
       checkDuplicate(docId) {
         return this.progressArr.findIndex(t => t['docId'] == docId) == -1
       }
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index b622302..5e9fb11 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -175,7 +175,7 @@ export default {
       previewUrl: '',
       progress: 0,
       fileList: [],
-      websocket: null,
+      // websocket: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 8805bf2..d7b94aa 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -20,11 +20,9 @@
                 <el-col :span="12"> <el-form-item label="备注">{{detailData.remark}}</el-form-item> </el-col>
                 <el-col :span="24">
                   <el-form-item label="关联工具">
-                    <el-button type="primary" icon="el-icon-search" size="mini"  v-if="detailData.association != null && detailData.association != '' && detailData.association != undefined" @click="getToolRelationTree">查看</el-button>
-
-                    <!--     <span v-if="detailData.association != null && detailData.association != '' && detailData.association != undefined">
-                                         <el-tag :key="tag.toolId" v-for="tag in JSON.parse(detailData.association)" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
-                                        </span>-->
+                    <span v-if="detailData.association != null && detailData.association != '' && detailData.association != undefined">
+                     <el-tag :key="tag.toolId" v-for="tag in detailData.association" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
+                    </span>
                   </el-form-item>
                 </el-col>
               </el-row>
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index b97c296..644bfc2 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -192,15 +192,15 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="关联工具" prop="association">
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="getToolRelationTree">查看</el-button>
+<!--                <el-button type="primary" icon="el-icon-search" size="mini" @click="getToolRelationTree">查看</el-button>
                 <el-button type="primary" icon="el-icon-check" size="mini" @click="handleToolSelect">新增关联工具</el-button>
-                <el-button type="primary" icon="el-icon-edit" size="mini"  @click="handleToolEdit">编辑关联工具</el-button>
-<!--                <el-select
+                <el-button type="primary" icon="el-icon-edit" size="mini"  @click="handleToolEdit">编辑关联工具</el-button>-->
+                <el-select
                   :disabled="!editStatus"
                   v-model="form.association"
                   ref="selectHeadTool"
-                  multiple
                   value-key="toolId"
+                  multiple
                   filterable
                   remote
                   placeholder="请选择关联工具"
@@ -211,7 +211,7 @@
                     :label="item.toolName"
                     :value="item">
                   </el-option>
-                </el-select>-->
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -740,6 +740,10 @@ export default {
     saveForm() {
       let _this = this
       _this.$refs["eForm"].validate(valid => {
+        if(_this.attachmentList.length == 0){
+          _this.$message.warning("最少上传一个附件");
+          return;
+        }
         if (valid) {
           if (!_this.procDefKey) {
             _this.$message.warning("尚未进行流程设置，将无法发起流程！");
@@ -858,6 +862,10 @@ export default {
           dialogVisible = false
         }
       }
+      if(this.attachmentList.length == 0){
+        _this.$message.warning("最少上传一个附件");
+        return true;
+      }
       _this.searchQuery.pass = _this.formSubmit.pass
       let defaultStaff = []
       this.defaultStaff=defaultStaff
@@ -1188,6 +1196,23 @@ export default {
         self.toolTreeLoading = false;
       });
     },
+    toolSelect(){
+      /* this.$refs.selectHeadTool.blur();
+      this.$nextTick(()=>{
+        this.$refs.toolSelect.init(null,null,true)
+      }) */
+      let self = this
+      this.$refs.selectHeadTool.blur();
+      let toolIds = []
+      if(self.form.association && self.form.association.length > 0){
+        self.form.association.forEach(item=>{
+          toolIds.push(item.toolId)
+        })
+      }
+      this.$nextTick(()=>{
+        this.$refs.toolSelect.init(null,null,true, toolIds)
+      })
+    },
 
 },
 
-- 
2.35.1.windows.2


From c343875f2404f9a81b5ab07e8edb31659dd937af Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 9 Sep 2024 02:58:26 +0800
Subject: [PATCH 47/55] =?UTF-8?q?1=E3=80=81=E5=90=8D=E5=AD=97=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=202=E3=80=81=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 2 +-
 src/views/message/index.vue      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4ec20dc..ca209bf 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -138,7 +138,7 @@ export default {
         msgItem['count'] = res.msgCount;
         let taskItem = {};
         taskItem['type'] = 'task';
-        taskItem['name'] = '代办消息数量';
+        taskItem['name'] = '待办消息数量';
         taskItem['count'] = res.taskCount;
         this.msgTableData.push(msgItem);
         this.msgTableData.push(taskItem);
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 5e9fb11..6865b7d 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -37,7 +37,7 @@
           </div>
           <div class="sr">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置111</el-button>
           </div>
         </div>
       </el-form>
@@ -229,6 +229,7 @@ export default {
      resetQuery() {
       this.tableList = []
       this.resetForm("queryForm")
+       this.queryParams.states = null
       this.handleQuery()
     },
     // 节点单击事件
-- 
2.35.1.windows.2


From dc5c99586f0340629e04bb9c3cbff88aea709a96 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 9 Sep 2024 03:07:40 +0800
Subject: [PATCH 48/55] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/document/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 8d738f9..f23dcd3 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -815,7 +815,6 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       let self = this
-      console.info("this.checkList.======", this.checkList)
       if(this.checkList.length == 0){
         this.$modal.msgWarning(`最少选择一个字段`);
         return
-- 
2.35.1.windows.2


From c55cacea073acd7e8b6d0ce05e415e14e15fcdb1 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Mon, 9 Sep 2024 13:51:50 +0800
Subject: [PATCH 49/55] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FileUpload/optimizeToolUpload.vue         | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/components/FileUpload/optimizeToolUpload.vue b/src/components/FileUpload/optimizeToolUpload.vue
index b9cdac6..0c7d94b 100644
--- a/src/components/FileUpload/optimizeToolUpload.vue
+++ b/src/components/FileUpload/optimizeToolUpload.vue
@@ -110,6 +110,9 @@ export default {
     }
   },
   methods: {
+    created(){
+      this.clearFile()
+    },
     // 上传前
     beforeUpload(file) {
       /* const fileType = file.type.toLowerCase()
@@ -174,6 +177,10 @@ export default {
               }, 500);
             } else {
               self.progressFlag = false;
+              self.progressPercent = 0
+              if(self.$refs.upload){
+                self.$refs.upload.clearFiles();
+              }
               self.$message({
                 message: '上传失败！',
                 type: 'error',
@@ -186,7 +193,9 @@ export default {
           console.error(error)
           self.progressFlag = false;
           self.progressPercent = 0
-          self.$refs.upload.clearFiles();
+          if(self.$refs.upload){
+            self.$refs.upload.clearFiles();
+          }
           self.$message({
             message: '上传失败！',
             type: 'error',
@@ -319,13 +328,28 @@ export default {
             }
           } else {
             self.progressFlag = false;
+            self.progressPercent = 0
+            if(self.$refs.upload){
+              self.$refs.upload.clearFiles();
+            }
             self.$message({
               message: '上传失败！',
               type: 'error',
               duration: '2000'
             });
           }
-        })
+        }).catch(error => {
+          self.progressFlag = false;
+          self.progressPercent = 0
+          if(self.$refs.upload){
+            self.$refs.upload.clearFiles();
+          }
+          self.$message({
+            message: '上传失败！',
+            type: 'error',
+            duration: '2000'
+          });
+        });
       }
     },
 
-- 
2.35.1.windows.2


From efe5304bc191d85827f6fe79d6a50af3dceccd11 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Mon, 9 Sep 2024 14:29:25 +0800
Subject: [PATCH 50/55] update

---
 src/views/document/detail.vue | 6 +++---
 src/views/message/index.vue   | 4 ++--
 src/views/tool/index.vue      | 4 ++--
 src/views/tool/toolDetail.vue | 6 ++++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/document/detail.vue b/src/views/document/detail.vue
index 153aaa8..840918f 100644
--- a/src/views/document/detail.vue
+++ b/src/views/document/detail.vue
@@ -22,7 +22,7 @@
           <el-table :data="attachmentList" style="width: 100%">
             <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
             <el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
-            <el-table-column label="操作" align="center" width="100px">
+            <el-table-column label="操作" align="center" width="150px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -31,8 +31,8 @@
                   v-if="previewAuth(scope.row)"
                   @click="handlePreview(scope.row)"
                 >预览</el-button>
-<!--                <el-button type="text" icon="el-icon-download"  v-if="isShowOperation(scope.row) && !detailBoolean"
-                           @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>-->
+                <el-button type="text" icon="el-icon-download" v-if="form.downloadStatus"
+                           @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
               </template>
             </el-table-column>
           </el-table><!--el-table-->
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 6865b7d..4c66aef 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -37,7 +37,7 @@
           </div>
           <div class="sr">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置111</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </div>
         </div>
       </el-form>
@@ -97,7 +97,7 @@
 
 
     <!-- 工具详情对话框 -->
-    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" :show-close="false"
+    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" :show-close="false" :wrapperClosable="false"
                size="80%" class="no-padding" :close-on-press-escape="false"	@close="handleCloseDetail()">
       <template #title>
         <span>{{toolTitle}}</span>
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index 71e36bc..e7b5965 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -533,9 +533,9 @@ export default {
       if(row.recordStatus=='done'){
         result = true;
       }
-      /* if(row.isHasApplyUse){
+      if(row.isHasApplyUse){
         result = false;
-      } */
+      }
       return result;
     },
     /**=============================申请使用End================================*/
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index d7b94aa..2e64f82 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -49,7 +49,7 @@
                 <span>{{ parseTime(scope.row.createDate) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="100px">
+            <el-table-column label="操作" align="center" width="150px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -58,7 +58,9 @@
                   v-if="previewAuth(scope.row)"
                   @click="handlePreview(scope.row)"
                 >预览</el-button>
-<!--                <e-button type="text" icon="el-icon-download" v-if="isDownload && detailData.downloadStatus" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</e-button>-->
+                <el-button type="text" icon="el-icon-download" v-if="detailData.downloadStatus" @click="handleDownload(scope.row)" v-loading="loadingDownload">
+                  下载
+                </el-button>
               </template>
             </el-table-column>
           </el-table><!--el-table-->
-- 
2.35.1.windows.2


From ce04b79efd7494040623858eabae6a4200e95fd5 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Mon, 9 Sep 2024 15:55:24 +0800
Subject: [PATCH 51/55] update

---
 src/views/filestatistic/index.vue     |  17 +--
 src/views/statistic/index.vue         |  19 +--
 src/views/tool/toolDetail.vue         |  12 +-
 src/views/workstuff/apply/index.vue   | 160 +-------------------------
 src/views/workstuff/dispose/index.vue |   5 +-
 5 files changed, 38 insertions(+), 175 deletions(-)

diff --git a/src/views/filestatistic/index.vue b/src/views/filestatistic/index.vue
index 6637757..bb83f53 100644
--- a/src/views/filestatistic/index.vue
+++ b/src/views/filestatistic/index.vue
@@ -81,13 +81,13 @@
           <div class="rt">
             <el-table v-loading="downLoading" :data="toolDownStatList">
               <el-table-column type="index" label="序号" width="50" align="center"/>
-              <el-table-column label="文档编号" align="center" key="docCode" prop="docCode" />
-              <el-table-column label="文档名称" align="center" key="docName" prop="docName"  :show-overflow-tooltip="true" />
-              <el-table-column label="下载次数" align="center" key="docDownNum" prop="docDownNum" width="120" />
+              <el-table-column label="文档编号" key="docCode" prop="docCode" />
+              <el-table-column label="文档名称" key="docName" prop="docName"  :show-overflow-tooltip="true" />
+              <el-table-column label="下载次数" align="center" key="docDownNum" prop="docDownNum"/>
               <el-table-column
                 label="操作"
                 align="center"
-                width="250"
+                width="100"
                 class-name="small-padding fixed-width"
               >
                 <template slot-scope="scope">
@@ -116,10 +116,11 @@
       @close="detailDrawerOpen = false"
     >
       <el-table :data="toolDownDetailStatList" v-loading="loading">
-        <el-table-column label="下载用户" align="center" key="nickName" prop="nickName" min-width="120" />
-        <el-table-column label="附件名称" align="center" key="attName" prop="attName"  :show-overflow-tooltip="true" />
-        <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" min-width="120" />
-        <el-table-column label="下载时间" align="center" key="createTime" prop="createTime" min-width="120" />
+        <el-table-column type="index" label="序号" width="50" align="center"/>
+        <el-table-column label="附件名称" key="attName" prop="attName"  :show-overflow-tooltip="true" />
+        <el-table-column label="下载用户" key="nickName" prop="nickName" width="120" />
+        <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
+        <el-table-column label="下载时间" align="center" key="createTime" prop="createTime" width="200" />
       </el-table>
       <pagination
         v-show="total>0"
diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue
index 779f1ee..d9a5c82 100644
--- a/src/views/statistic/index.vue
+++ b/src/views/statistic/index.vue
@@ -96,13 +96,13 @@
           <div class="rt">
             <el-table v-loading="downLoading" :data="toolDownStatList">
               <el-table-column type="index" label="序号" width="50" align="center"/>
-              <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" />
-              <el-table-column label="工具名称" align="center" key="toolName" prop="toolName"  :show-overflow-tooltip="true" />
-              <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
+              <el-table-column label="工具编号" key="toolCode" prop="toolCode" />
+              <el-table-column label="工具名称" key="toolName" prop="toolName"  :show-overflow-tooltip="true" />
+              <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" />
               <el-table-column
                 label="操作"
                 align="center"
-                width="250"
+                width="100"
                 class-name="small-padding fixed-width"
               >
                 <template slot-scope="scope">
@@ -130,11 +130,12 @@
       @open="openEvent"
       @close="detailDrawerOpen = false"
     >
-      <el-table :data="toolDownDetailStatList" v-loading="loading">
-        <el-table-column label="下载用户" align="center" key="nickName" prop="nickName" min-width="120" />
-        <el-table-column label="附件名称" align="center" key="attName" prop="attName"  :show-overflow-tooltip="true" />
-        <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" min-width="120" />
-        <el-table-column label="下载时间" align="center" key="createTime" prop="createTime" min-width="120" />
+      <el-table :data="toolDownDetailStatList" v-loading="loading" height="500px">
+        <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
+        <el-table-column label="附件名称" key="attName" prop="attName"  :show-overflow-tooltip="true" />
+        <el-table-column label="下载用户" key="nickName" prop="nickName" width="120" />
+        <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
+        <el-table-column label="下载时间" align="center" key="createTime" prop="createTime" width="220" />
       </el-table>
       <pagination
         v-show="total>0"
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 2e64f82..d1c34a1 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -85,7 +85,7 @@
       <div class="pllist">
         <template v-if="discussionsList && discussionsList.length > 0">
           <div class="list" v-for="(item,index) in discussionsList" :key="item.id">
-            <div class="luser"><span class="xuser">{{getFirstChar(item.nickName)}}</span></div>
+            <div class="luser"><span class="xuser" :style="{backgroundColor: extractColorByName(item.nickName)}">{{getFirstChar(item.nickName)}}</span></div>
             <div class="ltext">
               <div class="nt"><span class="name">{{item.nickName}}</span><span class="time">{{ parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
               <div class="te">{{item.content}}</div>
@@ -105,7 +105,7 @@
               <!--第二层级-->
               <template v-if="item.repliesList && item.repliesList.length > 0">
                 <div class="list" v-for="(repItem,repIdex) in item.repliesList" :key="repItem.id">
-                  <div class="luser"><span class="xuser">{{getFirstChar(repItem.nickName)}}</span></div>
+                  <div class="luser"><span class="xuser" :style="{backgroundColor: extractColorByName(repItem.nickName)}">{{getFirstChar(repItem.nickName)}}</span></div>
                   <div class="ltext">
                     <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
                     <div class="te">{{repItem.content}}</div>
@@ -388,6 +388,14 @@
           });
         })
       },
+      extractColorByName(name) {
+        let temp = [];
+        temp.push("#");
+        for (let index = 0; index < name.length; index++) {
+          temp.push(parseInt(name[index].charCodeAt(0), 10).toString(16));
+        }
+        return temp.slice(0, 5).join('').slice(0, 4);
+      },
       getFirstChar(value) {
         if(!value){return ''}
         return value.charAt(0);
diff --git a/src/views/workstuff/apply/index.vue b/src/views/workstuff/apply/index.vue
index 749a219..1d73a63 100644
--- a/src/views/workstuff/apply/index.vue
+++ b/src/views/workstuff/apply/index.vue
@@ -37,7 +37,8 @@
     </el-card><!--el-card-->
 
     <el-card>
-      <el-table :data="tableData1" style="width: 100%" height="529">
+      <el-table :data="tableData1" style="width: 100%" height="529" v-loading="loading">
+        <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
         <el-table-column label="申请类型">
           <template slot-scope="scope">
             <span v-if="scope.row.applyType === 'publish'">发布申请</span>
@@ -182,6 +183,8 @@
         drawer1: false,
         drawer2: false,
         drawerShow: false,
+        loading: false,
+        tableData1: [],
         path: 'views/workflowList/addWorkflow/',
         code: '',
         data: undefined,
@@ -198,160 +201,7 @@
           recordStatus: "",
         },
         applyDetail: {},
-        applyToolDetail: {},
-        tableData1: [
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '进行中',
-            prop3: '直接领导审核',
-            prop4: '赵宇',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          },
-          {
-            prop1: '使用申请',
-            prop2: '已办结',
-            prop3: '直接领导审核',
-            prop4: '钱多多',
-            prop5: '2024/02/09 12:00',
-            prop6: '2024/02/09 12:00',
-          }
-        ],
-        tableData2: [
-          {
-            prop1: '0021',
-            prop2: '工具名称1',
-            prop3: '人力资源部/培训组',
-            prop4: '赵宇',
-            prop5: '网络工具',
-          },
-          {
-            prop1: '0022',
-            prop2: '工具名称2',
-            prop3: '人力资源部/招聘组',
-            prop4: '钱多多',
-            prop5: '网络工具',
-          },
-          {
-            prop1: '0023',
-            prop2: '工具名称3',
-            prop3: '人力资源部/薪资组',
-            prop4: '孙瑶',
-            prop5: '网络工具',
-          }
-        ],
-        tableData3: [
-          {
-            prop1: '部门领导审核',
-            prop2: '张宇',
-            prop3: '管理员审核 ',
-            prop4: '赵定',
-            prop5: '同意',
-            prop6: '2024/02/09 12:00',
-            prop7: '2024/02/09 12:03',
-            prop8: '耗时0天',
-            prop9: '已完成',
-          },
-          {
-            prop1: '管理员审核',
-            prop2: '赵定',
-            prop3: '直接领导审核 ',
-            prop4: '钱多多',
-            prop5: '同意',
-            prop6: '2024/02/09 12:00',
-            prop7: '2024/02/09 12:03',
-            prop8: '耗时0天',
-            prop9: '已完成',
-          }
-        ],
-        tableData4: [
-          {
-            prop1: '部门领导审核',
-            prop2: '张宇',
-            prop3: '管理员审核 ',
-            prop4: '赵定',
-            prop5: '同意',
-            prop6: '2024/02/09 12:00',
-            prop7: '2024/02/09 12:03',
-            prop8: '耗时0天',
-            prop9: '已完成',
-          },
-          {
-            prop1: '管理员审核',
-            prop2: '赵定',
-            prop3: '直接领导审核 ',
-            prop4: '钱多多',
-            prop5: '同意',
-            prop6: '2024/02/09 12:00',
-            prop7: '2024/02/09 12:03',
-            prop8: '耗时0天',
-            prop9: '已完成',
-          }
-        ],
+        applyToolDetail: {}
       }
     },
     created() {
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 2fa2212..52a1f8f 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -9,7 +9,7 @@
             </el-form-item>
           </div>
           <div class="sr">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery" v-loading="loading">搜索</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
           </div>
         </div><!--search 搜索-->
@@ -19,6 +19,7 @@
       <el-tabs v-model="activeName"  @tab-click="state">
         <el-tab-pane :label="'待办('+ statustotal+')'" name="taskToDo">
           <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
+            <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="curActDefName" label="当前环节"></el-table-column>
@@ -51,6 +52,7 @@
         </el-tab-pane><!--el-tab-pane-->
         <el-tab-pane :label="'已办('+doneTotal+')'" name="taskDealed">
           <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
+            <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="curActDefName" label="处理环节"></el-table-column>
@@ -83,6 +85,7 @@
         </el-tab-pane><!--el-tab-pane-->
         <el-tab-pane :label="'办结('+finishedTotal+')'" name="taskFinish">
           <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
+            <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
             <el-table-column prop="procDefName" label="流程类型"></el-table-column>
             <el-table-column prop="title" label="流程标题"></el-table-column>
             <el-table-column prop="startUserName" label="发起人"></el-table-column>
-- 
2.35.1.windows.2


From f7fac6e633616b4abd53e8e1c732b14fab82b6ef Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Mon, 9 Sep 2024 16:39:55 +0800
Subject: [PATCH 52/55] update

---
 public/css/tool.css           |  1 -
 src/views/tool/toolDetail.vue | 41 ++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/public/css/tool.css b/public/css/tool.css
index 718a9c5..b9cf588 100644
--- a/public/css/tool.css
+++ b/public/css/tool.css
@@ -2584,7 +2584,6 @@ body .login-page .loright .locont .el-form--label-top .el-form-item .el-form-ite
 .fbox1 .fr{
   display: block;
   padding: 16px 32px;
-  width: 420px;
 }
 body .el-drawer .el-drawer__body .fbox1 .fl,
 body .el-drawer .el-drawer__body .fbox1 .fr{
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index d1c34a1..04a4e25 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -76,7 +76,7 @@
     </div><!--fl 左侧页签-->
     <div class="fr" v-if="isComment">
       <div class="tboper">
-        <div class="tit">评论</div>
+        <div class="tit">评论（{{ reviewTotal }}）</div>
       </div><!--tboper 标题与操作按钮-->
       <div class="pltextarea">
         <el-input v-model="discussionContent" type="textarea" placeholder="请输入您的意见" :rows="4" maxlength="1000" show-word-limit></el-input>
@@ -104,10 +104,19 @@
               </div>
               <!--第二层级-->
               <template v-if="item.repliesList && item.repliesList.length > 0">
-                <div class="list" v-for="(repItem,repIdex) in item.repliesList" :key="repItem.id">
-                  <div class="luser"><span class="xuser" :style="{backgroundColor: extractColorByName(repItem.nickName)}">{{getFirstChar(repItem.nickName)}}</span></div>
+                <div class="list" v-for="(repItem, repIdex) in item.repliesList" :key="repItem.id">
+                  <div class="luser">
+                    <span class="xuser" :style="{width:'28px',height:'28px',lineHeight:'28px',backgroundColor: extractColorByName(repItem.nickName)}">{{getFirstChar(repItem.nickName)}}</span>
+                  </div>
                   <div class="ltext">
-                    <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
+                    <div class="nt">
+                      <span class="name">{{repItem.nickName}}</span>
+                      <template v-if="repItem.repTargetNickName">
+                        <span>回复</span>
+                        <span class="name">{{ repItem.repTargetNickName }}</span>
+                      </template>
+                      <span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+                    </div>
                     <div class="te">{{repItem.content}}</div>
                     <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
                     <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
@@ -115,7 +124,7 @@
                       <div class="plbtn">
                         <el-button @click="cancelReplySon(index,repIdex)">取消</el-button>
                         <el-divider direction="vertical"></el-divider>
-                        <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
+                        <el-button @click="submitReplySon(index, repIdex, item, repItem.id)">发布</el-button>
                       </div>
                     </div>
                   </div>
@@ -218,6 +227,7 @@
           pageSize: 10,
           toolId: ''
         },
+        reviewTotal: 0,
         previewUrl: '',
         viewDialogTitle: "",
         viewDialogOpen: false,
@@ -342,18 +352,22 @@
         },1000)
       },
       getDiscussionsList() {
-        let self = this
+        let _this = this
+        _this.reviewTotal = 0
         listDiscussions({businessId:this.toolDetail.toolId}).then(res => {
-          self.discussionsList = res.rows
-          self.discussionsList.forEach(item => {
+          _this.discussionsList = res.rows
+          let reviewTotal = 0
+          _this.discussionsList.forEach(item => {
+            reviewTotal += item.repliesList.length
             if(item.repliesList && item.repliesList.length > 0){
-              self.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
-              self.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
+              _this.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
+              _this.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
             }else{
-              self.$set(item, 'showReplyFormSon', false)
-              self.$set(item, 'replyContentSon', '')
+              _this.$set(item, 'showReplyFormSon', false)
+              _this.$set(item, 'replyContentSon', '')
             }
           });
+          _this.reviewTotal = _this.discussionsList.length + reviewTotal
         });
       },
       /** 评论 **/
@@ -459,7 +473,7 @@
         this.$set(parentItem.replyContentSon, repIndex, '');
       },
       /** 第二级回复 **/
-      submitReplySon(parentIndex, repIndex, repItem) {
+      submitReplySon(parentIndex, repIndex, repItem, repId) {
         let self = this
         const parentItem = this.discussionsList[parentIndex];
         const content = parentItem.replyContentSon[repIndex];
@@ -473,6 +487,7 @@
         }
         let data = {
           "discussionId": repItem.id,
+          "repId": repId,
           "content": content,
         }
 
-- 
2.35.1.windows.2


From cadd79687ee6cf7251d00d7fd8ceba8627f77fa8 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Mon, 9 Sep 2024 16:55:25 +0800
Subject: [PATCH 53/55] update

---
 src/layout/components/Navbar.vue | 61 ++++++++++++++++----------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ca209bf..342315b 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -13,13 +13,37 @@
         </el-badge>
       </span>-->
       <span class="top-version">v1.0.0</span>
-      <span style="cursor: pointer;" @click="toMyCartPage">
-        <el-badge :value="totalCartCount >= 99 ? '99+' : totalCartCount" class="item">
-          <el-tooltip class="item" effect="light" content="消息通知" placement="bottom">
-            <i class="el-icon-bell"></i>
-          </el-tooltip>
-        </el-badge>
-      </span>
+      <el-popover
+        placement="right"
+        width="400"
+        trigger="hover">
+        <el-table
+          :data="msgTableData"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="name"
+            label="消息通知类型">
+          </el-table-column>
+          <el-table-column
+            prop="count"
+            label="消息通知数量">
+          </el-table-column>
+          <el-table-column label="操作" width="100" >
+            <template slot-scope="scope">
+              <el-button type="text" @click="handleToMsgView(scope.row)">前往查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <span style="cursor: pointer;" @mouseover="toMyCartPage" slot="reference">
+          <el-badge :value="totalCartCount >= 99 ? '99+' : totalCartCount" class="item">
+            <el-tooltip class="item" effect="light" content="消息通知" placement="bottom">
+              <i class="el-icon-bell"></i>
+            </el-tooltip>
+          </el-badge>
+       </span>
+      </el-popover>
+
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
@@ -36,29 +60,6 @@
         </el-dropdown-menu>
       </el-dropdown>
 
-      <el-dialog
-        title="消息通知"
-        :visible.sync="msgVisible"
-        width="40%">
-        <el-table
-          :data="msgTableData"
-          border
-          style="width: 100%">
-          <el-table-column
-            prop="name"
-            label="消息通知类型">
-          </el-table-column>
-          <el-table-column
-            prop="count"
-            label="消息通知数量">
-          </el-table-column>
-          <el-table-column label="操作" width="100" >
-            <template slot-scope="scope">
-              <el-button type="text"@click="handleToMsgView(scope.row)">前往查看</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-dialog>
     </div>
   </div>
 </template>
-- 
2.35.1.windows.2


From e934cc0163792013755c20699610f0b2009c29d9 Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Mon, 9 Sep 2024 17:38:32 +0800
Subject: [PATCH 54/55] update

---
 src/layout/components/Navbar.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 342315b..fc95207 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -36,11 +36,20 @@
           </el-table-column>
         </el-table>
         <span style="cursor: pointer;" @mouseover="toMyCartPage" slot="reference">
-          <el-badge :value="totalCartCount >= 99 ? '99+' : totalCartCount" class="item">
+          <template v-if="totalCartCount == 0">
+            <el-badge value="" class="item">
             <el-tooltip class="item" effect="light" content="消息通知" placement="bottom">
               <i class="el-icon-bell"></i>
             </el-tooltip>
           </el-badge>
+          </template>
+          <template v-else>
+            <el-badge :value="totalCartCount >= 99 ? '99+' : totalCartCount" class="item">
+            <el-tooltip class="item" effect="light" content="消息通知" placement="bottom">
+              <i class="el-icon-bell"></i>
+            </el-tooltip>
+          </el-badge>
+          </template>
        </span>
       </el-popover>
 
-- 
2.35.1.windows.2


From a12204687f18e8fc45ce76d3ff283e4dbdbdf8de Mon Sep 17 00:00:00 2001
From: hanjian <272005125@qq.com>
Date: Tue, 10 Sep 2024 01:10:31 +0800
Subject: [PATCH 55/55] update

---
 src/views/document/detail.vue                 | 53 +++++++++++++------
 src/views/document/editDocument.vue           |  7 ++-
 src/views/document/index.vue                  | 36 ++++++++-----
 src/views/filestatistic/index.vue             |  1 +
 src/views/message/index.vue                   |  1 +
 src/views/statistic/index.vue                 |  1 +
 src/views/tool/index.vue                      | 50 +++++++++++++++--
 src/views/tool/toolDetail.vue                 |  6 +--
 .../workflowList/addWorkflow/tool_release.vue |  2 +-
 .../workflowList/addWorkflow/use_apply.vue    |  2 +-
 src/views/workstuff/apply/index.vue           |  8 ++-
 src/views/workstuff/dispose/index.vue         | 10 ++--
 12 files changed, 132 insertions(+), 45 deletions(-)

diff --git a/src/views/document/detail.vue b/src/views/document/detail.vue
index 840918f..be9257c 100644
--- a/src/views/document/detail.vue
+++ b/src/views/document/detail.vue
@@ -50,7 +50,7 @@
 
     <div class="fr" v-if="isComment && form.docStatus == 'yfb'">
       <div class="tboper">
-        <div class="tit">评论</div>
+        <div class="tit">评论（{{ reviewTotal }}）</div>
       </div><!--tboper 标题与操作按钮-->
       <div class="pltextarea">
         <el-input v-model="discussionContent" type="textarea" placeholder="请输入您的意见" :rows="4" maxlength="1000" show-word-limit></el-input>
@@ -59,7 +59,7 @@
       <div class="pllist">
         <template v-if="discussionsList && discussionsList.length > 0">
           <div class="list" v-for="(item,index) in discussionsList" :key="item.id">
-            <div class="luser"><span class="xuser">{{getFirstChar(item.nickName)}}</span></div>
+            <div class="luser"><span class="xuser" :style="{backgroundColor: extractColorByName(item.nickName)}">{{getFirstChar(item.nickName)}}</span></div>
             <div class="ltext">
               <div class="nt"><span class="name">{{item.nickName}}</span><span class="time">{{ parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
               <div class="te">{{item.content}}</div>
@@ -79,9 +79,18 @@
               <!--第二层级-->
               <template v-if="item.repliesList && item.repliesList.length > 0">
                 <div class="list" v-for="(repItem,repIdex) in item.repliesList" :key="repItem.id">
-                  <div class="luser"><span class="xuser">{{getFirstChar(repItem.nickName)}}</span></div>
+                  <div class="luser">
+                    <span class="xuser" :style="{width:'28px',height:'28px',lineHeight:'28px',backgroundColor: extractColorByName(repItem.nickName)}">{{getFirstChar(repItem.nickName)}}</span>
+                  </div>
                   <div class="ltext">
-                    <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
+                    <div class="nt">
+                      <span class="name">{{repItem.nickName}}</span>
+                      <template v-if="repItem.repTargetNickName">
+                        <span>回复</span>
+                        <span class="name">{{ repItem.repTargetNickName }}</span>
+                      </template>
+                      <span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+                    </div>
                     <div class="te">{{repItem.content}}</div>
                                         <div class="hb"><a class="btn" @click="toggleReplyFormSon(index,repIdex)"><i class="el-icon-chat-line-round"></i>回复</a></div>
                                         <div class="pltextarea" v-if="item.showReplyFormSon[repIdex]">
@@ -89,7 +98,7 @@
                                           <div class="plbtn">
                                             <el-button @click="cancelReplySon(index,repIdex)">取消</el-button>
                                             <el-divider direction="vertical"></el-divider>
-                                            <el-button @click="submitReplySon(index,repIdex, item)">发布</el-button>
+                                            <el-button @click="submitReplySon(index, repIdex, item, repItem.id)">发布</el-button>
                                           </div>
                                         </div>
                   </div>
@@ -154,6 +163,7 @@
         detailActiveName: 'first',
         templateSelection: '',
         drawer1: false,
+        reviewTotal: 0,
         checkList: [],
         // 表单参数
         form: {
@@ -217,7 +227,7 @@
     created(){
       // this.getDeptTree();
       this.getDocumentTree();
-      // this.getDiscussionsList()
+      this.getDiscussionsList()
     },
     mounted(){
     },
@@ -375,6 +385,14 @@
         this.$set(this.showReplyForm, index, false);
         this.$set(this.replyContent, index, '');
       },
+      extractColorByName(name) {
+        let temp = [];
+        temp.push("#");
+        for (let index = 0; index < name.length; index++) {
+          temp.push(parseInt(name[index].charCodeAt(0), 10).toString(16));
+        }
+        return temp.slice(0, 5).join('').slice(0, 4);
+      },
       /** 第二级 **/
       toggleReplyFormSon(parentIndex, repIndex) {
         const parentItem = this.discussionsList[parentIndex];
@@ -388,7 +406,7 @@
         this.$set(parentItem.replyContentSon, repIndex, '');
       },
       /** 第二级回复 **/
-      submitReplySon(parentIndex, repIndex, repItem) {
+      submitReplySon(parentIndex, repIndex, repItem, repId) {
         let self = this
         const parentItem = this.discussionsList[parentIndex];
         const content = parentItem.replyContentSon[repIndex];
@@ -402,6 +420,7 @@
         }
         let data = {
           "discussionId": repItem.id,
+          "repId": repId,
           "content": content,
         }
 
@@ -577,18 +596,22 @@
         return null;
       },
       getDiscussionsList() {
-        let self = this
-        listDiscussions({businessId:self.form.docId}).then(res => {
-          self.discussionsList = res.rows
-          self.discussionsList.forEach(item => {
+        let _this = this
+        _this.reviewTotal = 0
+        listDiscussions({businessId:_this.form.docId}).then(res => {
+          _this.discussionsList = res.rows
+          let reviewTotal = 0
+          _this.discussionsList.forEach(item => {
             if(item.repliesList && item.repliesList.length > 0){
-              self.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
-              self.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
+              reviewTotal += item.repliesList.length
+              _this.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
+              _this.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
             }else{
-              self.$set(item, 'showReplyFormSon', false)
-              self.$set(item, 'replyContentSon', '')
+              _this.$set(item, 'showReplyFormSon', false)
+              _this.$set(item, 'replyContentSon', '')
             }
           });
+          _this.reviewTotal = _this.discussionsList.length + reviewTotal
         });
       },
 
diff --git a/src/views/document/editDocument.vue b/src/views/document/editDocument.vue
index 8dc94cd..4ab5569 100644
--- a/src/views/document/editDocument.vue
+++ b/src/views/document/editDocument.vue
@@ -6,7 +6,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="文件分类" prop="docCategoryId">
-                <treeselect v-model="form.docCategoryId" :options="docCategory" :show-count="true"
+                <treeselect v-model="form.docCategoryId" :options="docCategory" :show-count="true" @input="inputSelect"
                             :disabled="detailBoolean"
                             placeholder="请选择文件分类"/>
               </el-form-item>
@@ -330,7 +330,7 @@
         // 表单校验
         rules: {
           docCategoryId: [
-            { required: true, message: "文档分类不能为空", trigger: "change" }
+            { required: true, message: "文档分类不能为空", trigger: "input" }
           ],
           docCode: [
             { required: true, message: "文档编号不能为空", trigger: "blur" }
@@ -453,6 +453,9 @@
         const uniqueID = 'file_' + timestamp;
         return uniqueID;
       },
+      inputSelect(){
+        this.$refs.form.validateField('docCategoryId')
+      },
       /** 提交按钮 */
       submitForm: function() {
         let self = this
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index f23dcd3..496c7a6 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -9,6 +9,7 @@
                 v-model="queryParams.docCode"
                 placeholder="请输入文档名称"
                 clearable
+                @clear="handleQuery"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -17,6 +18,7 @@
                 v-model="queryParams.docName"
                 placeholder="请输入文档名称"
                 clearable
+                @clear="handleQuery"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -51,11 +53,12 @@
                 @change="handleQuery"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item label="负责人" prop="docPrincipals">
+            <el-form-item label="负责人" prop="docPrincipalsName">
               <el-input
-                v-model="queryParams.docPrincipals"
-                placeholder="请输入负责人"
+                v-model="queryParams.docPrincipalsName"
+                placeholder="请输入负责人名称"
                 clearable
+                @clear="handleQuery"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
@@ -88,7 +91,7 @@
       <div class="lt">
         <el-input
           v-model="categoryNameParam"
-          placeholder="请输入部门名称"
+          placeholder="请输入文档分类名称"
           clearable
           size="small"
           prefix-icon="el-icon-search"
@@ -204,9 +207,9 @@
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right" >更多</el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleEdit" icon="el-icon-edit"  v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'">编辑</el-dropdown-item>
-                  <el-dropdown-item command="handleDelete" icon="el-icon-delete"   v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'">删除</el-dropdown-item>
                   <el-dropdown-item command="handleDetail" icon="el-icon-info" >详情</el-dropdown-item>
+                  <el-dropdown-item command="handleEdit" icon="el-icon-edit"  v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'">编辑</el-dropdown-item>
+                  <el-dropdown-item command="handleDelete" icon="el-icon-delete" v-if="scope.row.docStatus != 'yfb' && scope.row.docStatus != 'shz'">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -226,12 +229,12 @@
 
 
     <el-dialog :title="docCategoryTitle" :visible.sync="docCategoryOpen"  width="50%"
-               :close-on-press-escape="false" :close-on-click-modal="false"
+               :close-on-press-escape="false" :close-on-click-modal="false" :destroy-on-close="true"
                :show-close="false" :wrapperClosable="false"
                append-to-body>
       <el-form ref="docCategoryFormRefs" :model="docCategoryForm" :rules="docCategoryRules" label-width="80px">
         <el-form-item label="父分类" prop="parentId">
-          <treeselect v-model="docCategoryForm.parentId" :options="docCategory" :show-count="true" placeholder="如果不选择，默认为顶级节点" />
+          <treeselect v-if="docCategoryOpen" v-model="docCategoryForm.parentId" :options="docCategory" :show-count="true" placeholder="如果不选择，默认为一级分类" />
         </el-form-item>
         <el-form-item label="分类名称" prop="categoryName">
           <el-input v-model="docCategoryForm.categoryName" placeholder="请输入分类名称" maxlength="50" show-word-limit/>
@@ -263,7 +266,7 @@
           <el-button icon="el-icon-close" @click="docCancel()">关 闭</el-button>
         </div><!--drawer-head-btn 抽屉顶部按钮区域-->
       </template>
-      <edit-document ref="editDocumentRef" @submit="editDocumentSubmit"/>
+      <edit-document v-if="open" ref="editDocumentRef" @submit="editDocumentSubmit"/>
     </el-drawer>
 
 
@@ -414,7 +417,7 @@ export default {
         docName: '',
         docCode: '',
         docType: '',
-        docPrincipals: '',
+        docPrincipalsName: '',
         docSource: '',
         docStatus: '',
         createById: this.$store.getters.userId,
@@ -629,11 +632,16 @@ export default {
       }
       //只能删除已上传数据
       let delFlag = false;
-      for(let item of self.selection){
-        if(!(item.docStatus == 'ysc')){
-          delFlag = true;
+      if(self.selection){
+        for(let item of self.selection){
+          if(!(item.docStatus == 'ysc')){
+            delFlag = true;
+          }
         }
       }
+      if(row.docStatus && row.docStatus != 'ysc'){
+        delFlag = true;
+      }
       if(delFlag){
         this.$modal.msgError(`只能删除文档状态为[已上传]数据,请重新选择`);
         return
@@ -808,7 +816,7 @@ export default {
       if (this.checkList.length<1) {
         this.checkList = JSON.parse(JSON.stringify(this.columnList))
       }
-      this.exportTitle = '导出'
+      this.exportTitle = '全量导出'
       this.exportDrawerOpen = true
       this.batchExportFlag = false
     },
diff --git a/src/views/filestatistic/index.vue b/src/views/filestatistic/index.vue
index bb83f53..d9770e3 100644
--- a/src/views/filestatistic/index.vue
+++ b/src/views/filestatistic/index.vue
@@ -66,6 +66,7 @@
                       v-model="queryParams.docName"
                       placeholder="请输入文档名称"
                       clearable
+                      @clear="handleQuery"
                       @keyup.enter.native="handleQuery"
                     />
                   </el-form-item>
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 4c66aef..593ee3d 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -10,6 +10,7 @@
                 placeholder="请输入消息内容"
                 clearable
                 style="width: 240px"
+                @clear="handleQuery"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue
index d9a5c82..27e1945 100644
--- a/src/views/statistic/index.vue
+++ b/src/views/statistic/index.vue
@@ -81,6 +81,7 @@
                       v-model="queryParams.toolName"
                       placeholder="请输入工具名称"
                       clearable
+                      @clear="handleQuery"
                       @keyup.enter.native="handleQuery"
                     />
                   </el-form-item>
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue
index e7b5965..72f198c 100644
--- a/src/views/tool/index.vue
+++ b/src/views/tool/index.vue
@@ -10,6 +10,7 @@
                   v-model="queryParams.toolCode"
                   placeholder="请输入工具编号"
                   clearable
+                  @clear="handleQuery"
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
@@ -18,9 +19,34 @@
                   v-model="queryParams.toolName"
                   placeholder="请输入工具名称"
                   clearable
+                  @clear="handleQuery"
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
+              <el-form-item label="负责人">
+                <el-input
+                  v-model="queryParams.toolPrincipalsName"
+                  placeholder="请输入负责人名称"
+                  clearable
+                  @clear="handleQuery"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="工具类别">
+                <el-select
+                  v-model="queryParams.toolType"
+                  placeholder="工具类别"
+                  clearable
+                  @change="handleQuery"
+                >
+                  <el-option
+                    v-for="dict in dict.type.tool_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
               <el-form-item label="创建时间">
                 <el-date-picker
                   v-model="dateRange"
@@ -32,10 +58,25 @@
                   @change="handleQuery"
                 ></el-date-picker>
               </el-form-item>
-              <el-form-item label="状态" prop="status">
+              <el-form-item label="流程状态" prop="recordStatus">
+                <el-select
+                  v-model="queryParams.recordStatus"
+                  placeholder="流程状态"
+                  clearable
+                  @change="handleQuery"
+                >
+                  <el-option
+                    v-for="dict in dict.type.flow_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="工具状态" prop="status">
                 <el-select
                   v-model="queryParams.status"
-                  placeholder="状态"
+                  placeholder="工具状态"
                   clearable
                   @change="handleQuery"
                 >
@@ -105,7 +146,7 @@
           </el-table-column>
           <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" width="120" :show-overflow-tooltip="true"/>
           <el-table-column label="归属单位"  key="toolRespDeptName" prop="toolRespDeptName" :show-overflow-tooltip="true" />
-          <el-table-column label="状态" align="center" key="status" >
+          <el-table-column label="工具状态" align="center" key="status" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
@@ -376,6 +417,7 @@ export default {
         pageSize: 10,
         toolCode: undefined,
         toolName: undefined,
+        toolPrincipalsName: undefined,
         status: undefined,
         createBy: this.$store.getters.userId,
         permissionCheck: true,
@@ -610,7 +652,7 @@ export default {
       if (this.checkList.length<1) {
         this.checkList = JSON.parse(JSON.stringify(this.columnList))
       }
-      this.exportTitle = '导出'
+      this.exportTitle = '全量导出'
       this.batchExportFlag = false
       this.exoportDrawerOpen = true
     },
diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue
index 04a4e25..668ef7a 100644
--- a/src/views/tool/toolDetail.vue
+++ b/src/views/tool/toolDetail.vue
@@ -11,7 +11,7 @@
                 <el-col :span="12"> <el-form-item label="工具来源"><dict-tag :options="dict.type.tool_source" :value="detailData.toolSource"/></el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="负责人">{{detailData.toolPrincipalsName}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="归属单位">{{detailData.toolRespDeptName}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="状态"><dict-tag :options="dict.type.tool_status" :value="detailData.status"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具状态"><dict-tag :options="dict.type.tool_status" :value="detailData.status"/></el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="工具用途">{{detailData.toolUse}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="测评情况">{{detailData.testSituation}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="功能描述">{{detailData.functionDesc}}</el-form-item> </el-col>
@@ -354,12 +354,12 @@
       getDiscussionsList() {
         let _this = this
         _this.reviewTotal = 0
-        listDiscussions({businessId:this.toolDetail.toolId}).then(res => {
+        listDiscussions({businessId: _this.toolDetail.toolId}).then(res => {
           _this.discussionsList = res.rows
           let reviewTotal = 0
           _this.discussionsList.forEach(item => {
-            reviewTotal += item.repliesList.length
             if(item.repliesList && item.repliesList.length > 0){
+              reviewTotal += item.repliesList.length
               _this.$set(item, 'showReplyFormSon', new Array(item.repliesList.length).fill(false))
               _this.$set(item, 'replyContentSon', new Array(item.repliesList.length).fill(''))
             }else{
diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue
index 644bfc2..3281813 100644
--- a/src/views/workflowList/addWorkflow/tool_release.vue
+++ b/src/views/workflowList/addWorkflow/tool_release.vue
@@ -127,7 +127,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="状态" prop="status">
+              <el-form-item label="工具状态" prop="status">
                 <el-radio-group v-model="form.status" v-if="editStatus">
                   <el-radio
                     v-for="dict in dict.type.tool_status"
diff --git a/src/views/workflowList/addWorkflow/use_apply.vue b/src/views/workflowList/addWorkflow/use_apply.vue
index 53a4500..f2cb6dc 100644
--- a/src/views/workflowList/addWorkflow/use_apply.vue
+++ b/src/views/workflowList/addWorkflow/use_apply.vue
@@ -113,7 +113,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="状态">
+            <el-form-item label="工具状态">
               <dict-tag :options="dict.type.tool_status" :value="applyToolDetail.status"/>
             </el-form-item>
           </el-col>
diff --git a/src/views/workstuff/apply/index.vue b/src/views/workstuff/apply/index.vue
index 1d73a63..9282b6c 100644
--- a/src/views/workstuff/apply/index.vue
+++ b/src/views/workstuff/apply/index.vue
@@ -6,7 +6,13 @@
         <div class="search">
           <div class="sl">
             <el-form-item label="流程标题">
-              <el-input v-model="queryParams.procTitle" placeholder="输入流程标题"></el-input>
+              <el-input
+                v-model="queryParams.procTitle"
+                placeholder="输入流程标题"
+                clearable
+                @clear="handleQuery"
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
             <el-form-item label="流程状态">
               <el-select placeholder="请选择" v-model="queryParams.recordStatus" @change="handleQuery">
diff --git a/src/views/workstuff/dispose/index.vue b/src/views/workstuff/dispose/index.vue
index 52a1f8f..c55bc9c 100644
--- a/src/views/workstuff/dispose/index.vue
+++ b/src/views/workstuff/dispose/index.vue
@@ -5,7 +5,12 @@
         <div class="search">
           <div class="sl">
             <el-form-item label="流程标题">
-              <el-input placeholder="输入流程标题" v-model.trim="queryParams.title"></el-input>
+              <el-input
+                placeholder="输入流程标题"
+                v-model.trim="queryParams.title"
+                clearable
+                @clear="handleQuery"
+              />
             </el-form-item>
           </div>
           <div class="sr">
@@ -206,9 +211,6 @@ export default {
     handleDeal(row) {
       this.dealDrawerShow = true;
       let flowUrl = this.buildFlowUrl(row)
-      // alert(flowUrl)
-      //window.open(flowUrl)
-      /*   */
       this.$nextTick(() => {
         this.$refs.dealDrawer.init(flowUrl);
       });
-- 
2.35.1.windows.2