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] =?UTF-8?q?1=E3=80=81=E6=96=87=E6=A1=A3=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=92=8C=E8=AF=84=E8=AE=BA=202=E3=80=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BAword=203=E3=80=81=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4=204=E3=80=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8A=E5=9B=BE=E6=A0=87=E7=AD=89=E6=A0=B7?=
 =?UTF-8?q?=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));
     },
     /**
      * 处理下载