去掉调试代码

新增字段【加密方式、服务时间、联系人、联系方式】
修改字段：“归属部门”修改为【归属单位】，“”测试情况“”名称修改为【测评机构】、“功能描述”修改为【功能简介】、工具状态修改为【工具形态】
涉及的功能
工具管理：工具发布、修改、提交、暂存、全量导出、批量导出、列表查询条件
2.word导出功能，批量导出未按批量执行问题修复，导出模板调整

Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.21.1-alpine
+FROM docker.m.daocloud.io/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: underline;
+  text-decoration: none;
   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: 180px!important;
+  min-width: 220px!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: 180px!important;
+  min-width: 220px!important;
 }
 
 /*main-container 右侧内容*/
@@ -395,7 +395,7 @@ body #app .app-wrapper .main-container .navbar .hamburger-container{
   z-index: 1001;
   left: 0;
   bottom: 0;
-  width: 180px;
+  width: 220px;
   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: 26px;
+  font-size: 18px;
   line-height: 40px;
   margin: 0 0 0 15px;
 }
@@ -1524,10 +1524,8 @@ 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;
-  height: 34px;
+  border: 0;
 }
 body .el-upload:hover,
 body .registerbox .avatar-uploader .el-upload:hover{
@@ -1548,9 +1546,11 @@ body .el-upload:hover .el-upload-dragger i{
 }
 body .el-upload .el-button,
 body .el-upload .el-button:hover{
-  height: 32px;
+  display: block;
-  line-height: 30px;
+  border-radius: 2px;
-  border: none !important;
+  height: 34px;
+  line-height: 32px;
+  border: 1px solid #004098 !important;
   background: transparent !important;
 }
 body .el-upload .el-button{
@@ -1559,10 +1559,6 @@ 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;
@@ -2162,7 +2158,7 @@ body .el-card.lrtt>.el-card__body{
 .lrtt .lt{
   display: block;
   padding: 16px;
-  width: 250px;
+  width: 310px;
   height: 700px;
   overflow: auto;
 }
@@ -2584,6 +2580,7 @@ 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{

src/components/Editor/index.vue

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

src/components/FileUpload/sgDragMove.vue

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

src/components/FileUpload/sgDragSize.vue

@@ -191,7 +191,7 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .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>
+<style scoped>
 .el-drawer .el-drawer__body{
   padding: 0px 0px !important;
 }

src/components/ThemePicker/index.vue

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

src/components/TopNav/index.vue

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

src/layout/components/AppMain.vue

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

src/views/document/uploadProgress.vue

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

src/views/message/index.vue

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

src/views/system/bizdict/index.vue

@@ -107,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" />
+          <el-table-column label="字典编号" align="center" prop="dictId" width="100px" :show-overflow-tooltip="true"/>
-          <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+          <el-table-column label="字典名称" align="center" prop="dictName" width="200px" :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">
@@ -116,7 +116,7 @@
               </router-link>
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" prop="status">
+          <el-table-column label="状态" align="center" prop="status" width="70px" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
             </template>

src/views/system/dept/index.vue

@@ -58,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="200"></el-table-column>
+          <el-table-column prop="orderNum" label="排序" width="70px"></el-table-column>
-          <el-table-column prop="status" label="状态" width="100">
+          <el-table-column prop="status" label="状态" width="70px" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
             </template>

src/views/system/role/index.vue

@@ -95,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" />
+          <el-table-column label="角色编号" prop="roleId" width="90px" :show-overflow-tooltip="true"/>
           <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="100" />
+          <el-table-column label="显示顺序" prop="roleSort" width="80px" :show-overflow-tooltip="true" />
           <el-table-column label="状态" align="center" width="100">
             <template slot-scope="scope">
               <el-switch

src/views/tool/index.vue

@@ -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"
                 >
@@ -146,7 +146,7 @@
           </el-table-column>
           <el-table-column label="负责人"  key="toolPrincipalsName" prop="toolPrincipalsName" width="120" :show-overflow-tooltip="true"/>
           <el-table-column label="归属单位"  key="toolRespDeptName" prop="toolRespDeptName" :show-overflow-tooltip="true" />
-          <el-table-column label="工具状态" align="center" key="status" >
+          <el-table-column label="工具形态" align="center" key="status" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
@@ -250,14 +250,21 @@
             <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="toolType">工具类别</el-checkbox>
                   <el-checkbox label="toolSource">工具来源</el-checkbox>
-                  <el-checkbox label="toolPrincipalsName">负责人</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="toolRespDeptName">归属单位</el-checkbox>
-                  <el-checkbox label="status">状态</el-checkbox>
+                  <el-checkbox label="contactPerson">联系人</el-checkbox>
-                  <el-checkbox label="recordStatus">流程状态</el-checkbox>
+                  <el-checkbox label="contactPhone">联系方式</el-checkbox>
-                  <el-checkbox label="createTime">创建时间</el-checkbox>
+                  <el-checkbox label="remark">备注</el-checkbox>
 <!--                  <el-checkbox label="toolUse">工具用途</el-checkbox>-->
 <!--                  <el-checkbox label="testSituation">测评情况</el-checkbox>
                   <el-checkbox label="functionDesc">功能描述</el-checkbox>
@@ -371,7 +378,7 @@ export default {
       deptOptions: undefined,
       toolPrincipalsData: [],
       //'toolUse', 'testSituation', 'functionDesc', 'applyCondition', 'operateExplain', 'remark'
-      columnList: ['toolName', 'toolType', 'toolSource', 'toolPrincipalsName', 'toolRespDeptName', 'status', 'recordStatus','createTime'],
+      columnList: ['toolCode', 'toolName',  'toolSource', 'status', 'toolType', 'toolUse','testSituation','functionDesc','applyCondition','encryptionMode', 'serviceTime','toolRespDeptName','contactPerson','contactPhone', 'remark'],
       checkList: [],
       toolDetail: {},
       // 是否显示弹出层
@@ -712,6 +719,9 @@ 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

@@ -11,10 +11,14 @@
                 <el-col :span="12"> <el-form-item label="工具来源"><dict-tag :options="dict.type.tool_source" :value="detailData.toolSource"/></el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="负责人">{{detailData.toolPrincipalsName}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="归属单位">{{detailData.toolRespDeptName}}</el-form-item> </el-col>
-                <el-col :span="12"> <el-form-item label="工具状态"><dict-tag :options="dict.type.tool_status" :value="detailData.status"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="工具形态"><dict-tag :options="dict.type.tool_status" :value="detailData.status"/></el-form-item> </el-col>
+                <el-col :span="12"> <el-form-item label="加密方式">{{detailData.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.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.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

@@ -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,6 +139,34 @@
               </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" 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">
@@ -147,7 +175,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>
@@ -156,14 +184,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>
@@ -520,6 +548,18 @@ export default {
         status: [
           { required: true, message: "请选择状态", trigger: "change" },
         ],
+        encryptionMode: [
+          { required: true, message: "请输入加密方式", trigger: "blur" },
+        ],
+        serviceTime: [
+          { required: true, message: "请输入服务时间", trigger: "blur" },
+        ],
+        contactPerson: [
+          { required: true, message: "请输入联系人", trigger: "blur" },
+        ],
+        contactPhone: [
+          {required: true, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码'}
+        ],
       },
       kuozhanshuju: {},
       kuozhanshujuBool: {},

src/views/workflowList/addWorkflow/use_apply.vue

@@ -97,7 +97,7 @@
             <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="工具来源">
@@ -113,15 +113,27 @@
             </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>
           <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="申请类型">
+        <el-table-column label="申请类型" width="110px" :show-overflow-tooltip="true">
           <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="流程标题"></el-table-column>
+        <el-table-column prop="procTitle" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="流程状态" width="150">
+        <el-table-column label="流程状态" width="80px">
           <template slot-scope="scope">
               <el-tag v-if="scope.row.recordStatus === 'doing'">审核中</el-tag>
               <el-tag type="success" v-if="scope.row.recordStatus === 'done'">已审核</el-tag>
               <el-tag type="info" v-if="scope.row.recordStatus === 'draft'">拟稿</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="发起时间"></el-table-column>
+        <el-table-column prop="createTime" label="发起时间" width="156px" ></el-table-column>
-        <el-table-column prop="endTime" label="结束时间"></el-table-column>
+        <el-table-column prop="endTime" label="结束时间" width="156px"></el-table-column>
-        <el-table-column label="操作" width="100" >
+        <el-table-column label="操作" width="80px" >
           <template slot-scope="scope">
             <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
           </template>

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="流程类型"></el-table-column>
+            <el-table-column prop="procDefName" label="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="title" label="流程标题"></el-table-column>
+            <el-table-column prop="title" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="curActDefName" label="当前环节"></el-table-column>
+            <el-table-column prop="curActDefName" label="当前环节" width="95px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="prevActDefName" label="上一环节">
+            <el-table-column prop="prevActDefName" label="上一环节" width="100px" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <span v-if="!scope.row.prevActDefName">/</span>
                 <span v-else>{{ scope.row.prevActDefName }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
+            <el-table-column prop="sendUserName" label="上一环节处理人" width="115px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="startUserName" label="发起人"></el-table-column>
+            <el-table-column prop="startUserName" label="发起人" width="70px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="sendTime" label="接收时间">
+            <el-table-column prop="sendTime" label="接收时间" width="95px">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100" >
+            <el-table-column label="操作" width="80px" >
               <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="流程类型"></el-table-column>
+            <el-table-column prop="procDefName" label="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="title" label="流程标题"></el-table-column>
+            <el-table-column prop="title" label="流程标题" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="curActDefName" label="处理环节"></el-table-column>
+            <el-table-column prop="curActDefName" width="100px" label="处理环节"></el-table-column>
-            <el-table-column label="上一环节">
+            <el-table-column label="上一环节" width="100px" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <span v-if="!scope.row.prevActDefName">/</span>
                 <span v-else>{{ scope.row.prevActDefName }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="sendUserName" label="上一环节处理人"></el-table-column>
+            <el-table-column prop="sendUserName" label="上一环节处理人" width="115px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="startUserName" label="发起人"></el-table-column>
+            <el-table-column prop="startUserName" label="发起人" width="70px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="sendTime" label="接收时间">
+            <el-table-column prop="sendTime" label="接收时间" width="95px">
               <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="流程类型"></el-table-column>
+            <el-table-column prop="procDefName" label="流程类型" width="110px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="title" label="流程标题"></el-table-column>
+            <el-table-column prop="title" label="流程标题"  :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="startUserName" label="发起人"></el-table-column>
+            <el-table-column prop="startUserName" label="发起人" width="95px" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="startTime" label="发起时间">
+            <el-table-column prop="startTime" label="发起时间" width="95px">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.startTime,'{y}-{m}-{d}')}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="sendTime" label="接收时间">
+            <el-table-column prop="sendTime" label="接收时间" width="95px">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.sendTime,'{y}-{m}-{d}')}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100" >
+            <el-table-column label="操作" width="80px" >
               <template slot-scope="scope">
                 <el-button type="text" icon="el-icon-info" @click="handleDeal(scope.row)">详情</el-button>
               </template>