配置优化

2、word名称调整

.env.development

@@ -7,14 +7,16 @@ ENV = 'development'
 VUE_APP_CONTEXT_PATH = '/tool-tech'
 
 # 工具与技术交流管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:8080/tool-tech-admin'
+VUE_APP_BASE_API = '/tool-tech-admin'
 VUE_APP_WS_URL = 'ws://localhost:8080/tool-tech-admin/websocket'
 
 # 文档在线预览服务
-VUE_APP_TOOL_TECH_FILE_VIEW_API = 'http://127.0.0.1:8012/tool-tech-file-view'
+VUE_APP_TOOL_TECH_FILE_VIEW_API = '/tool-tech-file-view'
 
 # 流程管理服务地址
 VUE_APP_WORKFLOW_MANAGE_URL = '/ebpm-process-manage'
+# 流程管理服务地址
+VUE_WORKFLOW_URL = '/ebpm-process-manage'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/components/FileUpload/optimizeToolUpload.vue

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

src/components/PreviewUtil/previewUtil.vue

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

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="toolCode" prop="toolCode"/>
-          <el-table-column label="工具名称"  key="toolName" prop="toolName":show-overflow-tooltip="true" />
+          <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="toolType" prop="toolType" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
               <dict-tag :options="dict.type.tool_type" :value="scope.row.toolType"/>
             </template>

src/views/document/editDocument.vue

@@ -101,7 +101,7 @@
                 <uploadVue
                   :display="editStatus"
                   :uploadUrl="uploadFileUrl"
-                  :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
+                  :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.png','.jpg','.jpeg']"
                   :acceptType="acceptType"
                   :limit="1"
                   :dataFile="dataFile"
@@ -134,7 +134,7 @@
             <uploadVue
               :display="editStatus"
               :uploadUrl="uploadFileUrl"
-              :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
+              :type="['.txt','.doc','.docx','.pdf','.mp4','.webm','.zip','.rar','.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,.zip,.rar,.7z,.png,.jpg",
+        acceptType: ".txt,.docx,.pdf,.mp4,.webm,.zip,.rar,.png,.jpg",
         editStatus: true,
         toolDataInfo: [],
         dataFile: [],

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="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="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="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,32 +209,31 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `工具编号`, visible: true },
+        { key: 0, label: `编号`, visible: true },
-        { key: 1, label: `工具名称`, visible: true },
+        { key: 1, label: `中文别名`, visible: true },
-        { key: 2, 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" },
+          { required: true, message: "编号不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '工具编号长度必须介于 2 和 30 之间', trigger: 'blur' }
+          { min: 2, max: 30, message: '编号长度必须介于 2 和 30 之间', trigger: 'blur' }
         ],
         toolName: [
-          { required: true, message: "工具名称不能为空", trigger: "blur" },
+          { max: 50, message: '中文别名不能超过50个字', 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/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="toolCode" prop="toolCode" />
-              <el-table-column label="工具名称" key="toolName" prop="toolName"  :show-overflow-tooltip="true" />
+              <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,6 +11,7 @@
                   clearable
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
+                  @clear="handleQuery"
                 />
               </el-form-item>
               <el-form-item label="字典类型" prop="dictType">
@@ -20,6 +21,7 @@
                   clearable
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
+                  @clear="handleQuery"
                 />
               </el-form-item>
               <el-form-item label="状态" prop="status">
@@ -28,6 +30,8 @@
                   placeholder="字典状态"
                   clearable
                   style="width: 240px"
+                  @change="handleQuery"
+                  @clear="handleQuery"
                 >
                   <el-option
                     v-for="dict in dict.type.sys_normal_disable"
@@ -46,6 +50,8 @@
                   range-separator="-"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
+                  @change="handleQuery"
+                  @clear="handleQuery"
                 ></el-date-picker>
               </el-form-item>
           </div>

src/views/system/dept/index.vue

@@ -10,10 +10,12 @@
                 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>
+              <el-select v-model="queryParams.status" placeholder="部门状态" clearable @change="handleQuery"
+                         @clear="handleQuery">
                 <el-option
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"

src/views/system/menu/index.vue

@@ -10,10 +10,12 @@
                   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>
+                <el-select v-model="queryParams.status" placeholder="菜单状态" clearable @change="handleQuery"
+                           @clear="handleQuery">
                   <el-option
                     v-for="dict in dict.type.sys_normal_disable"
                     :key="dict.value"

src/views/system/role/index.vue

@@ -11,6 +11,7 @@
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
+                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="权限字符" prop="roleKey">
@@ -20,6 +21,7 @@
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
+                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="状态" prop="status">
@@ -28,6 +30,8 @@
                 placeholder="角色状态"
                 clearable
                 style="width: 240px"
+                @change="handleQuery"
+                @clear="handleQuery"
               >
                 <el-option
                   v-for="dict in dict.type.sys_normal_disable"
@@ -46,6 +50,8 @@
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                @change="handleQuery"
+                @clear="handleQuery"
               ></el-date-picker>
             </el-form-item>
           </div>

src/views/system/user/index.vue

@@ -11,6 +11,7 @@
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
+                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="手机号码" prop="phonenumber">
@@ -20,6 +21,7 @@
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
+                @clear="handleQuery"
               />
             </el-form-item>
             <el-form-item label="状态" prop="status">
@@ -28,6 +30,8 @@
                 placeholder="用户状态"
                 clearable
                 style="width: 240px"
+                @change="handleQuery"
+                @clear="handleQuery"
               >
                 <el-option
                   v-for="dict in dict.type.sys_normal_disable"
@@ -46,6 +50,8 @@
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                @change="handleQuery"
+                @clear="handleQuery"
               ></el-date-picker>
             </el-form-item>
           </div>
@@ -201,7 +207,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :disable-branch-nodes="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="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="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="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,9 +250,9 @@
             <el-col :span="24">
               <el-form-item label="导出字段">
                 <el-checkbox-group v-model="checkList">
-                  <el-checkbox label="toolCode">工具编号</el-checkbox>
+                  <el-checkbox label="toolCode">编号</el-checkbox>
-                  <el-checkbox label="toolName">工具名称</el-checkbox>
+                  <el-checkbox label="toolName">中文别名</el-checkbox>
-                  <el-checkbox label="toolSource">工具来源</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>
@@ -432,12 +432,12 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `工具编号`, visible: true },
+        { key: 0, label: `编号`, visible: true },
-        { key: 1, label: `工具名称`, visible: true },
+        { key: 1, label: `名称`, visible: true },
-        { key: 2, 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 }
       ],
       // 新增时的关联附件

src/views/tool/toolDetail.vue

@@ -6,17 +6,17 @@
           <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="中文别名">{{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_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="来源"><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.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>

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">
+                <el-radio-group v-model.trim="formSubmit.pass" @change="passChange">
                   <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-form-item label="编号" prop="toolCode">
-                <el-input v-if="editStatus" v-model="form.toolCode" placeholder="请输入工具编号"/>
+                <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-form-item label="中文别名" prop="toolName">
-                <el-input v-if="editStatus" v-model="form.toolName" placeholder="请输入工具名称"/>
+                <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"
@@ -162,7 +162,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="联系方式" prop="contactPhone">
-                <el-input v-if="editStatus" v-model="form.contactPhone" placeholder="请输入联系方式"/>
+                <el-input v-if="editStatus" v-model="form.contactPhone" maxlength="11" placeholder="请输入联系方式"/>
                 <span v-else>{{form.contactPhone}}</span>
               </el-form-item>
             </el-col>
@@ -262,7 +262,7 @@
           <uploadVue
             :display="editStatus"
             :uploadUrl="uploadFileUrl"
-            :type="['.txt','.doc','.docx','.pdf','.mp4','.zip','.rar','.7z','.png','.jpg','.jpeg']"
+            :type="['.txt','.doc','.docx','.pdf','.mp4','.webm','.zip','.rar','.png','.jpg','.jpeg']"
             :acceptType="acceptType"
             :isMultiple="true"
             :dataFile="dataFile"
@@ -356,8 +356,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="toolCode" prop="toolCode"/>
-        <el-table-column label="工具名称"  key="toolName" prop="toolName":show-overflow-tooltip="true" />
+        <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 +493,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,35 +509,34 @@ export default {
       },
       rules: {
         toolCode: [
-          { required: true, message: "工具编号不能为空", trigger: "blur" },
+          { required: true, message: "编号不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '工具编号长度必须介于 2 和 30 之间', trigger: 'blur' },
+          { min: 2, max: 30, message: '编号长度必须介于 2 和 30 之间', trigger: 'blur' },
           { validator: validatorToolExist, trigger: "blur" },
         ],
         toolName: [
-          { required: true, message: "工具名称不能为空", trigger: "blur" },
+          { max: 50, message: '中文别名不能超过50个字', trigger: 'blur' }
-          { 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" },
+          { required: true, message: "请输入用途", trigger: "blur" },
-          { max: 50, message: '工具用途不能超过50个字', 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" },
@@ -546,16 +545,19 @@ export default {
           { required: true, message: "请输入操作说明", trigger: "blur" },
         ],
         status: [
-          { required: true, message: "请选择状态", trigger: "change" },
+          { 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: '请输入正确的手机号码'}
@@ -582,7 +584,7 @@ export default {
       curDeptName: null,
 
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
-      acceptType: ".txt,.docx,.pdf,.mp4,.zip,.rar,.7z,.png,.jpg",
+      acceptType: ".txt,.docx,.pdf,.mp4,.webm,.zip,.rar,.png,.jpg",
       dataFile: [],
       detailBoolean: false,
       attachmentList: [],
@@ -1253,6 +1255,26 @@ 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,10 +88,10 @@
       <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>
@@ -100,20 +100,20 @@
             <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>
@@ -130,7 +130,7 @@
             <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-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>

src/views/workstuff/apply/index.vue

@@ -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

@@ -214,8 +214,6 @@ export default {
       this.$nextTick(() => {
         this.$refs.dealDrawer.init(flowUrl);
       });
-
-      //
     },
     buildFlowUrl(row) {
       let res = row.url;