配置优化

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")){
-        this.playerOptions.sources = [
-          {
-            src: row.fileUrl,
-            type: 'video/mp4'
-          }
-        ]
+      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'
+            }
+          ]
+        }
+
         self.dialogVisible = true
         self.isVideos = true;
         self.previewLoading = false

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/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/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"
@@ -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"
@@ -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: [],
@@ -584,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: [],
@@ -1255,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/workstuff/dispose/index.vue

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