Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.m.daocloud.io/nginx:1.21.1-alpine
+FROM nginx:1.21.1-alpine
 COPY ./dist /usr/share/nginx/html/tool-tech
 COPY default.conf /etc/nginx/conf.d/
 EXPOSE 80

public/css/tool.css

@@ -7,7 +7,7 @@ body {
 }
 a,a:visited,a:active{
   color: #004098;
-  text-decoration: none;
+  text-decoration: underline;
   cursor: pointer;
 }
 a:hover{
@@ -79,7 +79,7 @@ body #app .openSidebar .sidebar-container {
 }
 body #app .sidebar-container .nest-menu .el-sub-menu>.el-sub-menu__title,
 body #app .sidebar-container .el-sub-menu .el-menu-item {
-  min-width: 220px!important;
+  min-width: 180px!important;
 }
 body #app .sidebar-container .scrollbar-wrapper {
   padding-bottom: 95px;
@@ -336,7 +336,7 @@ body .hideSidebar .el-submenu__title i.icon-zhiliang-xianxing{
 }
 body #app .sidebar-container .el-submenu .el-menu-item,
 body #app .sidebar-container .nest-menu .el-submenu>.el-submenu__title {
-  min-width: 220px!important;
+  min-width: 180px!important;
 }
 
 /*main-container 右侧内容*/
@@ -395,7 +395,7 @@ body #app .app-wrapper .main-container .navbar .hamburger-container{
   z-index: 1001;
   left: 0;
   bottom: 0;
-  width: 220px;
+  width: 180px;
   height: 50px;
   line-height: 50px;
   text-align: right;
@@ -539,7 +539,7 @@ body #app .main-container .navbar .right-menu .el-dropdown .el-dropdown-selfdefi
 }
 body #app .main-container .navbar .right-menu .el-icon-bell{
   color: #141414;
-  font-size: 18px;
+  font-size: 26px;
   line-height: 40px;
   margin: 0 0 0 15px;
 }
@@ -1524,8 +1524,10 @@ body .el-button+.el-upload{
 body .el-upload,
 body .registerbox .avatar-uploader .el-upload{
   background:#fff;
+  border:1px solid #004098;
+  color:#004098 !important;
   border-radius: 2px;
-  border: 0;
+  height: 34px;
 }
 body .el-upload:hover,
 body .registerbox .avatar-uploader .el-upload:hover{
@@ -1546,11 +1548,9 @@ body .el-upload:hover .el-upload-dragger i{
 }
 body .el-upload .el-button,
 body .el-upload .el-button:hover{
-  display: block;
-  border-radius: 2px;
-  height: 34px;
-  line-height: 32px;
-  border: 1px solid #004098 !important;
+  height: 32px;
+  line-height: 30px;
+  border: none !important;
   background: transparent !important;
 }
 body .el-upload .el-button{
@@ -1559,6 +1559,10 @@ body .el-upload .el-button{
 body .el-upload:hover .el-button{
   color:#fff !important;
 }
+body .el-upload .el-button{
+  border-radius: 0 !important;
+  display: block;
+}
 body .el-upload .el-button.el-button--primary{
   background: #004098 !important;
   border: 1px solid #004098 !important;
@@ -2158,7 +2162,7 @@ body .el-card.lrtt>.el-card__body{
 .lrtt .lt{
   display: block;
   padding: 16px;
-  width: 310px;
+  width: 250px;
   height: 700px;
   overflow: auto;
 }
@@ -2580,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{

public/tool.docx

@@ -1,34 +1,19 @@
 {#list}
-{index}、{toolName}
-                                    编号
-{toolCode}
-中文别名
+             {resName}
+                                 工具名称
 {toolName}
-                                    来源
-{toolSourceName}
-形态
-{statusName}
-                                    类别
+                                 工具类别
 {toolTypeName}
-用途
-{toolUse}
-                                 测评机构
-{testSituation}
-功能简介
-{functionDesc}
-                                 适用条件
-{applyCondition}
-加密方式
-{encryptionMode}
-                                 服务时间
-{serviceTime}
-归属单位
+                                 工具来源
+{toolSourceName}
+                                   负责人
+{toolPrincipalsName}
+                                 归属单位
 {toolRespDeptName}
-                                   联系人
-{contactPerson}
-联系方式
-{contactPhone}
-                                    备注
-{remark}
-                                  表 {index}
+                                    状态
+{statusName}
+                                 流程状态
+{recordStatusName}
+                                 创建时间
+{createTime}
 {/list}

src/components/Editor/index.vue

@@ -196,7 +196,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style>
 .editor, .ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;

src/components/FileUpload/optimizeToolUpload.vue

@@ -516,7 +516,7 @@ export default {
         }
       }
       setTimeout(function () {
-        self.$message.success('上传完成！成功：' + self.uploadedCount+'，失败：' + failCount);
+        self.$message.success('上传完成！成功：' + this.uploadedCount+'，失败：' + failCount);
         self.progressFlag = false;
         self.progressPercent = 0;
       }, 500);

src/components/FileUpload/sgDragMove.vue

@@ -216,7 +216,7 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 [sgDragMove_grab="ready"] {
   cursor: var(--sgDragMove-grab); //css获取js传递的参数
 

src/components/FileUpload/sgDragSize.vue

@@ -191,7 +191,7 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 .sgDragSize {
   position: absolute;
   width: 100%;

src/components/MonitorDrawer/index.vue

@@ -34,13 +34,13 @@
               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'
+              workflowManageUrl = 'http://124.223.108.21:9080/ebpm-process-manage'
               this.src = workflowManageUrl + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
             }
         }
     }
 </script>
-<style scoped>
+<style>
 .el-drawer .el-drawer__body{
   padding: 0px 0px !important;
 }

src/components/PreviewUtil/previewUtil.vue

@@ -151,23 +151,13 @@ export default {
         self.$emit('previewLoadingClose')
         return
       }
-      if(row.fileName.endsWith(".mp4") || row.fileName.endsWith(".webm")){
-        if(row.fileName.endsWith(".mp4")){
-          this.playerOptions.sources = [
-            {
-              src: row.fileUrl,
-              type: 'video/mp4'
-            }
-          ]
-        }else{
-          this.playerOptions.sources = [
-            {
-              src: row.fileUrl,
-              type: 'video/webm'
-            }
-          ]
-        }
-
+      if(row.fileName.endsWith(".mp4")){
+        this.playerOptions.sources = [
+          {
+            src: row.fileUrl,
+            type: 'video/mp4'
+          }
+        ]
         self.dialogVisible = true
         self.isVideos = true;
         self.previewLoading = false

src/components/ThemePicker/index.vue

@@ -155,7 +155,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
 .theme-message,
 .theme-picker-dropdown {
   z-index: 99999 !important;

src/components/TopNav/index.vue

@@ -168,7 +168,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .topmenu-container.el-menu--horizontal > .el-menu-item {
   float: left;
   height: 50px !important;

src/components/tool-selector/index.vue

@@ -9,19 +9,19 @@
   >
     <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-form-item label="工具编号" prop="toolCode">
           <el-input
             v-model.trim="queryParams.toolCode"
-            placeholder="请输入编号"
+            placeholder="请输入"
             clearable
             size="small"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="中文别名" prop="toolName">
+        <el-form-item label="工具名称" prop="toolName">
           <el-input
             v-model.trim="queryParams.toolName"
-            placeholder="请输入中文别名"
+            placeholder="请输入"
             clearable
             size="small"
             @keyup.enter.native="handleQuery"
@@ -42,9 +42,9 @@
           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="编号"  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" >
+          <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>

src/layout/components/AppMain.vue

@@ -51,7 +51,7 @@ export default {
 }
 </style>
 
-<style lang="scss" scoped>
+<style lang="scss">
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
   .fixed-header {

src/layout/components/TagsView/index.vue

@@ -306,7 +306,7 @@ export default {
 }
 </style>
 
-<style lang="scss" scoped>
+<style lang="scss">
 //reset element css of el-icon-close
 .tags-view-wrapper {
   .tags-view-item {

src/views/document/editDocument.vue

@@ -101,7 +101,7 @@
                 <uploadVue
                   :display="editStatus"
                   :uploadUrl="uploadFileUrl"
-                  :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.png','.jpg','.jpeg']"
+                  :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
                   :acceptType="acceptType"
                   :limit="1"
                   :dataFile="dataFile"
@@ -134,7 +134,7 @@
             <uploadVue
               :display="editStatus"
               :uploadUrl="uploadFileUrl"
-              :type="['.txt','.doc','.docx','.pdf','.mp4','.webm','.zip','.rar','.png','.jpg','.jpeg']"
+              :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
               :acceptType="acceptType"
               :isMultiple="true"
               :dataFile="dataFile"
@@ -355,7 +355,7 @@
         deptOptions:[],
         uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
         fileData: null,
-        acceptType: ".txt,.docx,.pdf,.mp4,.webm,.zip,.rar,.png,.jpg",
+        acceptType: ".txt,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg",
         editStatus: true,
         toolDataInfo: [],
         dataFile: [],

src/views/document/uploadProgress.vue

@@ -69,7 +69,7 @@
   };
 </script>
 
-<style scoped>
+<style>
   .progress-bar {
     position: fixed;
     bottom: 10px;

src/views/interchange/index.vue

@@ -5,26 +5,26 @@
         <div class="grab"  id="add">
           <div class="search">
             <div class="sl">
-              <el-form-item label="编号" prop="toolCode">
+              <el-form-item label="工具编号" prop="toolCode">
                 <el-input
                   v-model="queryParams.toolCode"
-                  placeholder="请输入编号"
+                  placeholder="请输入工具编号"
                   clearable
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="中文别名" prop="toolName">
+              <el-form-item label="工具名称" prop="toolName">
                 <el-input
                   v-model="queryParams.toolName"
-                  placeholder="请输入中文别名"
+                  placeholder="请输入工具名称"
                   clearable
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="形态" prop="status">
+              <el-form-item label="状态" prop="status">
                 <el-select
                   v-model="queryParams.status"
-                  placeholder="形态"
+                  placeholder="状态"
                   clearable
                   style="width: 240px"
                 >
@@ -82,9 +82,9 @@
       </div><!--lt 左-->
       <div class="rt">
         <el-table v-loading="loading" :data="toolList">
-          <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="工具编号" 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" >
             <template slot-scope="scope">
               <template v-for="dict in dict.type.tool_type">
                 <span v-if="scope.row.toolType == dict.value">{{ dict.label }}</span>
@@ -93,7 +93,7 @@
           </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="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="状态" 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>
@@ -209,31 +209,32 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `编号`, visible: true },
-        { key: 1, label: `中文别名`, visible: true },
-        { key: 2, label: `类别`, visible: true },
+        { key: 0, label: `工具编号`, visible: true },
+        { key: 1, label: `工具名称`, visible: true },
+        { key: 2, label: `工具类别`, visible: true },
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `负责人`, visible: true },
-        { key: 5, label: `形态`, visible: true },
+        { 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' }
+          { required: true, message: "工具编号不能为空", trigger: "blur" },
+          { min: 2, max: 30, message: '工具编号长度必须介于 2 和 30 之间', trigger: 'blur' }
         ],
         toolName: [
-          { max: 50, message: '中文别名不能超过50个字', trigger: 'blur' }
+          { required: true, message: "工具名称不能为空", trigger: "blur" },
+          { max: 50, message: '工具名称不能超过50个字', trigger: 'blur' }
         ],
         toolPrincipals: [
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
         toolSource: [
-          { max: 50, message: '来源不能超过50个字', trigger: 'blur' }
+          { max: 50, message: '工具来源不能超过50个字', trigger: 'blur' }
         ],
         toolUse: [
-          { max: 50, message: '用途不能超过50个字', trigger: 'blur' }
+          { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
         ]
       },
       // 新增时的关联附件

src/views/message/index.vue

@@ -249,20 +249,19 @@ export default {
      */
     markRead(row) {
       let self = this
-      let formData = JSON.parse(JSON.stringify(row))
-      self.$set(formData, "states", 2)
-      updateMessage(formData).then(response => {
-        self.$modal.msgSuccess(response?.msg || '操作成功')
-        store.dispatch('GetUserMsgCount').then(() => { })
-        self.getList();
-      }).catch((err) => {console.error(err)});
-      /* self.$confirm('确认标记已读吗？', '提示', {
+      self.$confirm('确认标记已读吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-
-      }).catch((err) => {console.error(err)}); */
+        let formData = JSON.parse(JSON.stringify(row))
+        self.$set(formData, "states", 2)
+          updateMessage(formData).then(response => {
+            self.$modal.msgSuccess(response?.msg || '操作成功')
+            store.dispatch('GetUserMsgCount').then(() => { })
+            self.getList();
+          })
+      }).catch((err) => {console.error(err)});
     },
 
     /**

src/views/statistic/index.vue

@@ -68,18 +68,18 @@
                       end-placeholder="结束日期"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="编号" prop="toolCode">
+                  <el-form-item label="工具编号" prop="toolCode">
                     <el-input
                       v-model="queryParams.toolCode"
-                      placeholder="请输入编号"
+                      placeholder="请输入工具编号"
                       clearable
                       @keyup.enter.native="handleQuery"
                     />
                   </el-form-item>
-                  <el-form-item label="中文别名" prop="toolName">
+                  <el-form-item label="工具名称" prop="toolName">
                     <el-input
                       v-model="queryParams.toolName"
-                      placeholder="请输入中文别名"
+                      placeholder="请输入工具名称"
                       clearable
                       @clear="handleQuery"
                       @keyup.enter.native="handleQuery"
@@ -97,8 +97,8 @@
           <div class="rt">
             <el-table v-loading="downLoading" :data="toolDownStatList">
               <el-table-column type="index" label="序号" width="50" align="center"/>
-              <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="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="操作"

src/views/system/bizdict/index.vue

@@ -11,7 +11,6 @@
                   clearable
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
-                  @clear="handleQuery"
                 />
               </el-form-item>
               <el-form-item label="字典类型" prop="dictType">
@@ -21,7 +20,6 @@
                   clearable
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
-                  @clear="handleQuery"
                 />
               </el-form-item>
               <el-form-item label="状态" prop="status">
@@ -30,8 +28,6 @@
                   placeholder="字典状态"
                   clearable
                   style="width: 240px"
-                  @change="handleQuery"
-                  @clear="handleQuery"
                 >
                   <el-option
                     v-for="dict in dict.type.sys_normal_disable"
@@ -50,8 +46,6 @@
                   range-separator="-"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
-                  @change="handleQuery"
-                  @clear="handleQuery"
                 ></el-date-picker>
               </el-form-item>
           </div>
@@ -113,8 +107,8 @@
         </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" width="100px" :show-overflow-tooltip="true"/>
-          <el-table-column label="字典名称" align="center" prop="dictName" width="200px" :show-overflow-tooltip="true" />
+          <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">
@@ -122,7 +116,7 @@
               </router-link>
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" prop="status" width="70px" :show-overflow-tooltip="true">
+          <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>

src/views/system/dept/index.vue

@@ -10,12 +10,10 @@
                 placeholder="请输入部门名称"
                 clearable
                 @keyup.enter.native="handleQuery"
-                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="部门状态" clearable @change="handleQuery"
-                         @clear="handleQuery">
+              <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
                 <el-option
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
@@ -60,8 +58,8 @@
           :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         >
           <el-table-column prop="deptName" label="部门名称"></el-table-column>
-          <el-table-column prop="orderNum" label="排序" width="70px"></el-table-column>
-          <el-table-column prop="status" label="状态" width="70px" :show-overflow-tooltip="true">
+          <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+          <el-table-column prop="status" label="状态" width="100">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
             </template>

src/views/system/menu/index.vue

@@ -10,12 +10,10 @@
                   placeholder="请输入菜单名称"
                   clearable
                   @keyup.enter.native="handleQuery"
-                  @clear="handleQuery"
                 />
               </el-form-item>
               <el-form-item label="状态" prop="status">
-                <el-select v-model="queryParams.status" placeholder="菜单状态" clearable @change="handleQuery"
-                           @clear="handleQuery">
+                <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
                   <el-option
                     v-for="dict in dict.type.sys_normal_disable"
                     :key="dict.value"

src/views/system/role/index.vue

@@ -11,7 +11,6 @@
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
-                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="权限字符" prop="roleKey">
@@ -21,7 +20,6 @@
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
-                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="状态" prop="status">
@@ -30,8 +28,6 @@
                 placeholder="角色状态"
                 clearable
                 style="width: 240px"
-                @change="handleQuery"
-                @clear="handleQuery"
               >
                 <el-option
                   v-for="dict in dict.type.sys_normal_disable"
@@ -50,8 +46,6 @@
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                @change="handleQuery"
-                @clear="handleQuery"
               ></el-date-picker>
             </el-form-item>
           </div>
@@ -101,10 +95,10 @@
 
         <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="角色编号" prop="roleId" width="90px" :show-overflow-tooltip="true"/>
+          <el-table-column label="角色编号" prop="roleId" />
           <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
           <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" />
-          <el-table-column label="显示顺序" prop="roleSort" width="80px" :show-overflow-tooltip="true" />
+          <el-table-column label="显示顺序" prop="roleSort" width="100" />
           <el-table-column label="状态" align="center" width="100">
             <template slot-scope="scope">
               <el-switch

src/views/system/user/index.vue

@@ -11,7 +11,6 @@
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
-                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="手机号码" prop="phonenumber">
@@ -21,7 +20,6 @@
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
-                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="状态" prop="status">
@@ -30,8 +28,6 @@
                 placeholder="用户状态"
                 clearable
                 style="width: 240px"
-                @change="handleQuery"
-                @clear="handleQuery"
               >
                 <el-option
                   v-for="dict in dict.type.sys_normal_disable"
@@ -50,8 +46,6 @@
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                @change="handleQuery"
-                @clear="handleQuery"
               ></el-date-picker>
             </el-form-item>
           </div>
@@ -207,7 +201,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :disable-branch-nodes="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/tool/index.vue

@@ -5,19 +5,19 @@
         <div class="grab"  id="add">
           <div class="search">
             <div class="sl">
-              <el-form-item label="编号" prop="toolCode">
+              <el-form-item label="工具编号" prop="toolCode">
                 <el-input
                   v-model="queryParams.toolCode"
-                  placeholder="请输入编号"
+                  placeholder="请输入工具编号"
                   clearable
                   @clear="handleQuery"
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="中文别名" prop="toolName">
+              <el-form-item label="工具名称" prop="toolName">
                 <el-input
                   v-model="queryParams.toolName"
-                  placeholder="请输入中文别名"
+                  placeholder="请输入工具名称"
                   clearable
                   @clear="handleQuery"
                   @keyup.enter.native="handleQuery"
@@ -32,10 +32,10 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="类别">
+              <el-form-item label="工具类别">
                 <el-select
                   v-model="queryParams.toolType"
-                  placeholder="类别"
+                  placeholder="工具类别"
                   clearable
                   @change="handleQuery"
                 >
@@ -73,10 +73,10 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="形态" prop="status">
+              <el-form-item label="工具状态" prop="status">
                 <el-select
                   v-model="queryParams.status"
-                  placeholder="形态"
+                  placeholder="工具状态"
                   clearable
                   @change="handleQuery"
                 >
@@ -137,16 +137,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"  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" >
+          <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="形态" 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>
@@ -250,21 +250,14 @@
             <el-col :span="24">
               <el-form-item label="导出字段">
                 <el-checkbox-group v-model="checkList">
-                  <el-checkbox label="toolCode">编号</el-checkbox>
-                  <el-checkbox label="toolName">中文别名</el-checkbox>
-                  <el-checkbox label="toolSource">来源</el-checkbox>
-                  <el-checkbox label="status">形态</el-checkbox>
-                  <el-checkbox label="toolType">类别</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="encryptionMode">加密方式</el-checkbox>
-                  <el-checkbox label="serviceTime">服务时间</el-checkbox>
+                  <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="contactPerson">联系人</el-checkbox>
-                  <el-checkbox label="contactPhone">联系方式</el-checkbox>
-                  <el-checkbox label="remark">备注</el-checkbox>
+                  <el-checkbox label="status">状态</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>
@@ -378,7 +371,7 @@ export default {
       deptOptions: undefined,
       toolPrincipalsData: [],
       //'toolUse', 'testSituation', 'functionDesc', 'applyCondition', 'operateExplain', 'remark'
-      columnList: ['toolCode', 'toolName',  'toolSource', 'status', 'toolType', 'toolUse','testSituation','functionDesc','applyCondition','encryptionMode', 'serviceTime','toolRespDeptName','contactPerson','contactPhone', 'remark'],
+      columnList: ['toolName', 'toolType', 'toolSource', 'toolPrincipalsName', 'toolRespDeptName', 'status', 'recordStatus','createTime'],
       checkList: [],
       toolDetail: {},
       // 是否显示弹出层
@@ -432,12 +425,12 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `编号`, visible: true },
-        { key: 1, label: `名称`, visible: true },
-        { key: 2, label: `类别`, visible: true },
+        { key: 0, label: `工具编号`, visible: true },
+        { key: 1, label: `工具名称`, visible: true },
+        { key: 2, label: `工具类别`, visible: true },
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `负责人`, visible: true },
-        { key: 5, label: `形态`, visible: true },
+        { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
       // 新增时的关联附件
@@ -719,9 +712,6 @@ export default {
         // 正在下载数据，请稍候
         exportWordList(params).then(r => {
           if (r.data.length != 0) {
-            r.data.forEach((item, index) =>{
-              item['index'] = index + 1
-            })
             const data = {
               form: null,
               list: r.data

src/views/tool/toolDetail.vue

@@ -6,19 +6,15 @@
           <div class="el-form-border">
             <el-form ref="form" label-width="150px">
               <el-row>
-                <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.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.encryptionMode}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="服务时间">{{detailData.serviceTime}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="联系人">{{detailData.contactPerson}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="联系方式">{{detailData.contactPhone}}</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="工具状态"><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>

src/views/workflowList/addWorkflow/tool_release.vue

@@ -22,7 +22,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item :label="submitLabel+'结论:'" prop="pass">
-                <el-radio-group v-model.trim="formSubmit.pass" @change="passChange">
+                <el-radio-group v-model.trim="formSubmit.pass">
                   <el-radio
                     v-for="dict in passoptions"
                     :key="dict.value"
@@ -60,14 +60,14 @@
         <div>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="编号" prop="toolCode">
-                <el-input v-if="editStatus" v-model="form.toolCode" placeholder="请输入编号"/>
+              <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="请输入中文别名"/>
+              <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>
@@ -93,7 +93,7 @@
         </el-row>-->
           <el-row>
             <el-col :span="12">
-              <el-form-item label="来源" prop="toolSource">
+              <el-form-item label="工具来源" prop="toolSource">
                 <el-select v-if="editStatus" v-model="form.toolSource" placeholder="请选择工具来源" style="width: 100%">
                   <el-option
                     v-for="dict in dict.type.tool_source"
@@ -106,7 +106,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="用途" prop="toolUse">
+              <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>
@@ -114,7 +114,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="类别" prop="toolType">
+              <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"
@@ -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"
@@ -139,34 +139,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="加密方式" prop="encryptionMode">
-                <el-input v-if="editStatus" v-model="form.encryptionMode" placeholder="请输入加密方式"/>
-                <span v-else>{{form.encryptionMode}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="服务时间" prop="serviceTime">
-                <el-input v-if="editStatus" v-model="form.serviceTime" placeholder="请输入服务时间"/>
-                <span v-else>{{form.serviceTime}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="联系人" prop="contactPerson">
-                <el-input v-if="editStatus" v-model="form.contactPerson" placeholder="请输入联系人"/>
-                <span v-else>{{form.contactPerson}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系方式" prop="contactPhone">
-                <el-input v-if="editStatus" v-model="form.contactPhone" maxlength="11" placeholder="请输入联系方式"/>
-                <span v-else>{{form.contactPhone}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="负责人" prop="toolPrincipals">
@@ -175,7 +147,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="归属单位">
+              <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>
@@ -184,14 +156,14 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="测评机构" prop="testSituation">
+              <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="功能简介" prop="functionDesc">
+              <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>
@@ -262,7 +234,7 @@
           <uploadVue
             :display="editStatus"
             :uploadUrl="uploadFileUrl"
-            :type="['.txt','.doc','.docx','.pdf','.mp4','.webm','.zip','.rar','.png','.jpg','.jpeg']"
+            :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
             :acceptType="acceptType"
             :isMultiple="true"
             :dataFile="dataFile"
@@ -356,8 +328,8 @@
         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="工具编号"  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
@@ -493,7 +465,7 @@ export default {
         { value: true, label: "通过" },
         { value: false, label: "不通过" },
       ],
-      formSubmit: { summary: "通过", actionType: "", pass: true },
+      formSubmit: { summary: "", actionType: "", pass: true },
       isSummary: false,
       activeName: "info",
       nodeDetail: [],
@@ -509,34 +481,35 @@ export default {
       },
       rules: {
         toolCode: [
-          { required: true, message: "编号不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '编号长度必须介于 2 和 30 之间', trigger: 'blur' },
+          { required: true, message: "工具编号不能为空", trigger: "blur" },
+          { min: 2, max: 30, message: '工具编号长度必须介于 2 和 30 之间', trigger: 'blur' },
           { validator: validatorToolExist, trigger: "blur" },
         ],
         toolName: [
-          { max: 50, message: '中文别名不能超过50个字', trigger: 'blur' }
+          { required: true, message: "工具名称不能为空", trigger: "blur" },
+          { max: 50, message: '工具名称不能超过50个字', trigger: 'blur' }
         ],
         toolPrincipals: [
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
         toolRespDept: [
-          { required: true, message: "请选择归属单位", trigger: ['blur','change'] }
+          { required: true, message: "请选择归属部门", trigger: ['blur','change'] }
         ],
         toolSource: [
-          { required: true, message: "请选择来源", trigger: "change" }
+          { required: true, message: "请选择工具来源", trigger: "change" }
         ],
         toolType: [
-          { required: true, message: "请选择类别", trigger: "change" }
+          { required: true, message: "请选择工具类别", trigger: "change" }
         ],
         toolUse: [
-          { required: true, message: "请输入用途", trigger: "blur" },
-          { max: 50, message: '用途不能超过50个字', trigger: 'blur' }
+          { required: true, message: "请输入工具用途", trigger: "blur" },
+          { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
         ],
         testSituation: [
-          { required: true, message: "请输入测评机构", trigger: "blur" },
+          { required: true, message: "请输入测试情况", trigger: "blur" },
         ],
         functionDesc: [
-          { required: true, message: "请输入功能简介", trigger: "blur" },
+          { required: true, message: "请输入功能描述", trigger: "blur" },
         ],
         applyCondition: [
           { required: true, message: "请输入适用条件", trigger: "blur" },
@@ -545,22 +518,7 @@ export default {
           { required: true, message: "请输入操作说明", trigger: "blur" },
         ],
         status: [
-          { required: true, message: "请选择形态", trigger: "change" },
-        ],
-        encryptionMode: [
-          { required: true, message: "请输入加密方式", trigger: "blur" },
-          { max: 50, message: '加密方式不能超过50个字', trigger: 'blur' }
-        ],
-        serviceTime: [
-          { required: true, message: "请输入服务时间", trigger: "blur" },
-          { max: 50, message: '服务时间不能超过50个字', trigger: 'blur' }
-        ],
-        contactPerson: [
-          { required: true, message: "请输入联系人", trigger: "blur" },
-          { max: 50, message: '联系人不能超过50个字', trigger: 'blur' }
-        ],
-        contactPhone: [
-          {required: true, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码'}
+          { required: true, message: "请选择状态", trigger: "change" },
         ],
       },
       kuozhanshuju: {},
@@ -584,7 +542,7 @@ export default {
       curDeptName: null,
 
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
-      acceptType: ".txt,.docx,.pdf,.mp4,.webm,.zip,.rar,.png,.jpg",
+      acceptType: ".txt,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg",
       dataFile: [],
       detailBoolean: false,
       attachmentList: [],
@@ -1255,26 +1213,6 @@ export default {
         this.$refs.toolSelect.init(null,null,true, toolIds)
       })
     },
-    /**
-     * 状态变更
-     */
-    passChange(){
-      let self = this
-      if(self.formSubmit.summary == null || self.formSubmit.summary == '' || self.formSubmit.summary == undefined ){
-        if(self.formSubmit.pass){
-          self.formSubmit.summary = '通过'
-        }else{
-          self.formSubmit.summary = '不通过'
-        }
-      }else{
-        if(self.formSubmit.pass){
-          self.formSubmit.summary = self.formSubmit.summary.replace("不通过", "通过")
-        }else{
-          self.formSubmit.summary = self.formSubmit.summary.replace("通过", "不通过")
-        }
-      }
-
-    }
 
 },
 

src/views/workflowList/addWorkflow/use_apply.vue

@@ -88,52 +88,40 @@
       <el-form ref="form" label-width="150px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="编号">{{applyToolDetail ? applyToolDetail.toolCode:''}}</el-form-item>
+            <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-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.toolRespDeptName:''}}</el-form-item>
+            <el-form-item label="归属部门">{{applyToolDetail ? applyToolDetail.toolRespDeptName:''}}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="来源">
+            <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-form-item label="工具用途">{{applyToolDetail ? applyToolDetail.toolUse:''}}</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="类别">
+            <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="形态">
+            <el-form-item label="工具状态">
               <dict-tag :options="dict.type.tool_status" :value="applyToolDetail.status"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="加密方式">{{applyToolDetail ? applyToolDetail.encryptionMode:''}}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="服务时间">{{applyToolDetail ? applyToolDetail.serviceTime:''}}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系人">{{applyToolDetail ? applyToolDetail.contactPerson:''}}</el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系方式">{{applyToolDetail ? applyToolDetail.contactPhone:''}}</el-form-item>
+          <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.testSituation:''}}</el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="功能简介">{{applyToolDetail ? applyToolDetail.functionDesc:''}}</el-form-item>
+            <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>

src/views/workstuff/apply/index.vue

@@ -45,23 +45,23 @@
     <el-card>
       <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="申请类型" width="110px" :show-overflow-tooltip="true">
+        <el-table-column label="申请类型">
           <template slot-scope="scope">
             <span v-if="scope.row.applyType === 'publish'">发布申请</span>
             <span v-if="scope.row.applyType === 'use'">使用申请</span>
           </template>
         </el-table-column>
-        <el-table-column prop="procTitle" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="流程状态" width="80px">
+        <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>
               <el-tag type="info" v-if="scope.row.recordStatus === 'draft'">拟稿</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="发起时间" width="156px" ></el-table-column>
-        <el-table-column prop="endTime" label="结束时间" width="156px"></el-table-column>
-        <el-table-column label="操作" width="80px" >
+        <el-table-column prop="createTime" label="发起时间"></el-table-column>
+        <el-table-column prop="endTime" label="结束时间"></el-table-column>
+        <el-table-column label="操作" width="100" >
           <template slot-scope="scope">
             <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
           </template>
@@ -112,34 +112,34 @@
         <el-form ref="form" label-width="150px">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="编号">{{applyToolDetail.toolCode}}</el-form-item>
+              <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-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-form-item label="归属部门">{{applyToolDetail.toolRespDept}}</el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="来源">{{applyToolDetail.toolSource}}</el-form-item>
+              <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-form-item label="工具用途">{{applyToolDetail.toolUse}}</el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="类别">{{applyToolDetail.toolType}}</el-form-item>
+              <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-form-item label="状态">{{applyToolDetail.status}}</el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="测评机构">{{applyToolDetail.testSituation}}</el-form-item>
+              <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-form-item label="功能描述">{{applyToolDetail.functionDesc}}</el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="适用条件">{{applyToolDetail.applyCondition}}</el-form-item>

src/views/workstuff/dispose/index.vue

@@ -25,23 +25,23 @@
         <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="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="title" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="curActDefName" label="当前环节" width="95px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="prevActDefName" label="上一环节" width="100px" :show-overflow-tooltip="true">
+            <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="上一环节">
               <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="上一环节处理人" width="115px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="startUserName" label="发起人" width="70px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="sendTime" label="接收时间" width="95px">
+            <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 label="操作" width="80px" >
+            <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>
@@ -58,18 +58,18 @@
         <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="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="title" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="curActDefName" width="100px" label="处理环节"></el-table-column>
-            <el-table-column label="上一环节" width="100px" :show-overflow-tooltip="true">
+            <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 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="上一环节处理人" width="115px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="startUserName" label="发起人" width="70px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="sendTime" label="接收时间" width="95px">
+            <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>
@@ -91,20 +91,20 @@
         <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="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="title" label="流程标题"  :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="startUserName" label="发起人" width="95px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="startTime" label="发起时间" width="95px">
+            <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="接收时间" width="95px">
+            <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="80px" >
+            <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>
@@ -214,6 +214,8 @@ export default {
       this.$nextTick(() => {
         this.$refs.dealDrawer.init(flowUrl);
       });
+
+      //
     },
     buildFlowUrl(row) {
       let res = row.url;