Merge remote-tracking branch 'origin/invest-dev-hxy' into invest-dev-slp

ruoyi-admin/src/main/java/com/ruoyi/web/job/ToDoNumberJob.java

@@ -37,46 +37,46 @@ public class ToDoNumberJob {
      * 每五分钟更新一次待办事项数量
      *
      */
-    @Scheduled(fixedDelay = 120000,initialDelay = 10000)
-    public void updateToDoNumber(){
-        logger.info("开始更新待办事项数量");
-        //查询所有进行中的任务
-        ProcessEngine engine = ProcessEngines.getDefaultProcessEngine();
-        RuntimeService runtimeService = engine.getRuntimeService();
-        List<ProcessInstance> instances = runtimeService
-                .createProcessInstanceQuery()
-                .active()
-                .list();
-        //声明map记录用户和对应的代办数量
-        Map<String,Integer> map = new HashMap<>();
-        for (ProcessInstance instance : instances) {
-           /* TaskQuery query = engine.getTaskService().createTaskQuery()
-                    .processInstanceId(instance.getId());
-            //获取对应的待处理用户记录代办数量+1
-            String assignee = query.singleResult().getAssignee();*/
-            List<Task> taskList = engine.getTaskService().createTaskQuery()
-                    .processInstanceId(instance.getId())
-                    .list();
-            // 遍历所有任务，获取每个处理人
-            for (Task task : taskList) {
-                String assignee = task.getAssignee();
-                // 处理每个处理人...
-                if(assignee!=null && !"".equals(assignee)){
-                    //根据用户id获取用户对象
-                    SysUser userInfo= sysUserService.selectUserById(Long.parseLong(assignee));
-                    if (map.containsKey(userInfo.getUserName())){
-                        map.put(userInfo.getUserName(),map.get(userInfo.getUserName())+1);
-                    }else {
-                        map.put(userInfo.getUserName(),1);
-                    }
-                }
-            }
-        }
-        //先清空redis中待办数量
-        redisCache.deleteObject("toDoNumber");
-        //将对应代办数量更新到redis当中
-        if(map.size()>0){
-            redisCache.setCacheObject("toDoNumber", map);
-        }
-    }
+//    @Scheduled(fixedDelay = 120000,initialDelay = 10000)
+//    public void updateToDoNumber(){
+//        logger.info("开始更新待办事项数量");
+//        //查询所有进行中的任务
+//        ProcessEngine engine = ProcessEngines.getDefaultProcessEngine();
+//        RuntimeService runtimeService = engine.getRuntimeService();
+//        List<ProcessInstance> instances = runtimeService
+//                .createProcessInstanceQuery()
+//                .active()
+//                .list();
+//        //声明map记录用户和对应的代办数量
+//        Map<String,Integer> map = new HashMap<>();
+//        for (ProcessInstance instance : instances) {
+//           /* TaskQuery query = engine.getTaskService().createTaskQuery()
+//                    .processInstanceId(instance.getId());
+//            //获取对应的待处理用户记录代办数量+1
+//            String assignee = query.singleResult().getAssignee();*/
+//            List<Task> taskList = engine.getTaskService().createTaskQuery()
+//                    .processInstanceId(instance.getId())
+//                    .list();
+//            // 遍历所有任务，获取每个处理人
+//            for (Task task : taskList) {
+//                String assignee = task.getAssignee();
+//                // 处理每个处理人...
+//                if(assignee!=null && !"".equals(assignee)){
+//                    //根据用户id获取用户对象
+//                    SysUser userInfo= sysUserService.selectUserById(Long.parseLong(assignee));
+//                    if (map.containsKey(userInfo.getUserName())){
+//                        map.put(userInfo.getUserName(),map.get(userInfo.getUserName())+1);
+//                    }else {
+//                        map.put(userInfo.getUserName(),1);
+//                    }
+//                }
+//            }
+//        }
+//        //先清空redis中待办数量
+//        redisCache.deleteObject("toDoNumber");
+//        //将对应代办数量更新到redis当中
+//        if(map.size()>0){
+//            redisCache.setCacheObject("toDoNumber", map);
+//        }
+//    }
 }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/ISysFormService.java

@@ -57,4 +57,6 @@ public interface ISysFormService
      * @return 结果
      */
     public int deleteSysFormById(Long formId);
+
+    void updateToDoNumber();
 }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/ApprovalServiceImpl.java

@@ -12,9 +12,7 @@ import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
 import com.ruoyi.flowable.common.enums.FlowStatusEnum;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
-import com.ruoyi.flowable.service.IFlowInstanceService;
-import com.ruoyi.flowable.service.IFlowService;
-import com.ruoyi.flowable.service.IApprovalService;
+import com.ruoyi.flowable.service.*;
 import com.ruoyi.invest.domain.*;
 import com.ruoyi.invest.domain.vo.ProjectApprovalVo;
 import com.ruoyi.invest.mapper.ApprovalMapper;
@@ -79,6 +77,8 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
     private ITProjectScoringService tProjectScoringService;
     @Autowired
     private TProjectScoringMapper tProjectScoringMapper;
+    @Autowired
+    private ISysFormService sysFormService;
     @Override
     public List<ProjectApprovalVo> selectAllApprovalList(TProjectApproval tProjectApproval){
         return approvalMapper.selectAllApprovalList(tProjectApproval);
@@ -214,6 +214,8 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
                         //todo 短信
                         sendMessage(flowBaseInfo,"");
                     }
+                    //更新代办任务数量
+                    sysFormService.updateToDoNumber();
                     return AjaxResult.success();
                 }
                 return AjaxResult.error();

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/DecisionServiceImpl.java

@@ -12,9 +12,7 @@ import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
 import com.ruoyi.flowable.common.enums.FlowStatusEnum;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
-import com.ruoyi.flowable.service.IDecisionService;
-import com.ruoyi.flowable.service.IFlowInstanceService;
-import com.ruoyi.flowable.service.IFlowService;
+import com.ruoyi.flowable.service.*;
 import com.ruoyi.invest.domain.*;
 import com.ruoyi.invest.domain.vo.ProjectDecisionVo;
 import com.ruoyi.invest.mapper.DecisionMapper;
@@ -75,6 +73,9 @@ public class DecisionServiceImpl extends FlowServiceFactory implements IDecision
     private ITProjectScoringService tProjectScoringService;
     @Autowired
     private TProjectScoringMapper tProjectScoringMapper;
+
+    @Autowired
+    private ISysFormService sysFormService;
     @Override
     public List<ProjectDecisionVo> selectAllDecisionList(TProjectDecision tProjectDecision){
         return decisionMapper.selectAllDecisionList(tProjectDecision);
@@ -211,6 +212,8 @@ public class DecisionServiceImpl extends FlowServiceFactory implements IDecision
                         // todo 短信
                         sendMessage(flowBaseInfo,"");
                     }
+                    //更新代办任务数量
+                    sysFormService.updateToDoNumber();
                     return AjaxResult.success();
                 }
                 return AjaxResult.error();

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowServiceImpl.java

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
 import com.ruoyi.flowable.service.IFlowService;
+import com.ruoyi.flowable.service.ISysFormService;
+import com.ruoyi.flowable.service.ISysTaskFormService;
 import org.flowable.engine.*;
 import org.flowable.engine.form.FormProperty;
 import org.flowable.engine.impl.form.StartFormDataImpl;
@@ -33,6 +35,8 @@ public class FlowServiceImpl extends FlowServiceFactory implements IFlowService
 	private IdentityService identityService;
     @Autowired
     private RepositoryService repositoryService;
+	@Autowired
+	private ISysFormService sysFormService;
 
     /**
      * 根据任务Id获取流程实例信息
@@ -252,7 +256,8 @@ public class FlowServiceImpl extends FlowServiceFactory implements IFlowService
 			// String msg = isOk ? "审核完成，同意成功!" : "审核完成，驳回成功!";
 			String msg = "审核完成!";
 			rs.put("msg", msg);
-
+			//更新代办任务数量
+			sysFormService.updateToDoNumber();
 		} catch (Exception e) {
 			e.printStackTrace();
 			rs.put("status", false);

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/InvestigateServiceImpl.java

@@ -12,9 +12,7 @@ import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
 import com.ruoyi.flowable.common.enums.FlowStatusEnum;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
-import com.ruoyi.flowable.service.IFlowInstanceService;
-import com.ruoyi.flowable.service.IFlowService;
-import com.ruoyi.flowable.service.IInvestigateService;
+import com.ruoyi.flowable.service.*;
 import com.ruoyi.invest.domain.*;
 import com.ruoyi.invest.domain.vo.ProjectInvestigateVo;
 import com.ruoyi.invest.mapper.InvestigateMapper;
@@ -72,6 +70,9 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
     private SysDeptMapper sysDeptMapper;
     @Autowired
     private IFlowService flowService;
+
+    @Autowired
+    private ISysFormService sysFormService;
     @Override
     public List<ProjectInvestigateVo> selectAllInvestigateList(TProjectInvestigate tProjectInvestigate){
         return investigateMapper.selectAllInvestigateList(tProjectInvestigate);
@@ -201,6 +202,8 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
                         //todo 短信
                         sendMessage(flowBaseInfo,"");
                     }
+                    //更新代办任务数量
+                    sysFormService.updateToDoNumber();
                     return AjaxResult.success();
                 }
                 return AjaxResult.error();

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/InvestmentOpportunityServiceImpl.java

@@ -12,11 +12,9 @@ import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
 import com.ruoyi.flowable.common.enums.FlowStatusEnum;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
-import com.ruoyi.flowable.service.IFlowInstanceService;
-import com.ruoyi.flowable.service.IFlowService;
+import com.ruoyi.flowable.service.*;
 import com.ruoyi.invest.domain.*;
 import com.ruoyi.invest.mapper.InvestmentOpportunityMapper;
-import com.ruoyi.flowable.service.IInvestmentOpportunityService;
 import com.ruoyi.invest.service.*;
 import com.ruoyi.invest.domain.vo.TProjectPoolVo;
 import com.ruoyi.system.mapper.SysDeptMapper;
@@ -75,6 +73,8 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
     private SysDeptMapper sysDeptMapper;
     @Autowired
     private ITProjectReviewService tProjectReviewService;
+    @Autowired
+    private ISysFormService sysFormService;
 
     @Autowired
     private IFlowService flowService;
@@ -229,6 +229,8 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
                         //todo 短信
                         sendMessage(flowBaseInfo,"");
                     }
+                    //更新代办任务数量
+                    sysFormService.updateToDoNumber();
                     return AjaxResult.success();
                 }
                 return AjaxResult.error();

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/SysFormServiceImpl.java

@@ -1,7 +1,18 @@
 package com.ruoyi.flowable.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.service.ISysUserService;
+import org.flowable.engine.ProcessEngine;
+import org.flowable.engine.ProcessEngines;
+import org.flowable.engine.RuntimeService;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.SysFormMapper;
@@ -20,6 +31,12 @@ public class SysFormServiceImpl implements ISysFormService
     @Autowired
     private SysFormMapper sysFormMapper;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private RedisCache redisCache;
+
     /**
      * 查询流程表单
      * 
@@ -93,4 +110,46 @@ public class SysFormServiceImpl implements ISysFormService
     {
         return sysFormMapper.deleteSysFormById(formId);
     }
+
+    @Override
+    public void updateToDoNumber() {
+        //查询所有进行中的任务
+        ProcessEngine engine = ProcessEngines.getDefaultProcessEngine();
+        RuntimeService runtimeService = engine.getRuntimeService();
+        List<ProcessInstance> instances = runtimeService
+                .createProcessInstanceQuery()
+                .active()
+                .list();
+        //声明map记录用户和对应的代办数量
+        Map<String,Integer> map = new HashMap<>();
+        for (ProcessInstance instance : instances) {
+           /* TaskQuery query = engine.getTaskService().createTaskQuery()
+                    .processInstanceId(instance.getId());
+            //获取对应的待处理用户记录代办数量+1
+            String assignee = query.singleResult().getAssignee();*/
+            List<Task> taskList = engine.getTaskService().createTaskQuery()
+                    .processInstanceId(instance.getId())
+                    .list();
+            // 遍历所有任务，获取每个处理人
+            for (Task task : taskList) {
+                String assignee = task.getAssignee();
+                // 处理每个处理人...
+                if(assignee!=null && !"".equals(assignee)){
+                    //根据用户id获取用户对象
+                    SysUser userInfo= sysUserService.selectUserById(Long.parseLong(assignee));
+                    if (map.containsKey(userInfo.getUserName())){
+                        map.put(userInfo.getUserName(),map.get(userInfo.getUserName())+1);
+                    }else {
+                        map.put(userInfo.getUserName(),1);
+                    }
+                }
+            }
+        }
+        //先清空redis中待办数量
+        redisCache.deleteObject("toDoNumber");
+        //将对应代办数量更新到redis当中
+        if(map.size()>0){
+            redisCache.setCacheObject("toDoNumber", map);
+        }
+    }
 }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/TProjectInvestigateServiceImpl.java

@@ -20,6 +20,8 @@ import com.ruoyi.flowable.common.enums.FlowStatusEnum;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
 import com.ruoyi.flowable.service.IFlowInstanceService;
 import com.ruoyi.flowable.service.IFlowService;
+import com.ruoyi.flowable.service.ISysFormService;
+import com.ruoyi.flowable.service.ISysTaskFormService;
 import com.ruoyi.invest.domain.*;
 import com.ruoyi.invest.service.IFlowBaseInfoService;
 import com.ruoyi.invest.service.ITProjectCirculationService;
@@ -77,6 +79,9 @@ public class TProjectInvestigateServiceImpl extends FlowServiceFactory implement
     @Autowired
     private IFlowService flowService;
 
+    @Autowired
+    private ISysFormService sysFormService;
+
     /**
      * 查询尽调关联
      * 
@@ -278,6 +283,9 @@ public class TProjectInvestigateServiceImpl extends FlowServiceFactory implement
                             }
                         });
                     }*/
+
+                    //更新代办任务数量
+                    sysFormService.updateToDoNumber();
                     return AjaxResult.success();
 
                 }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/TerminationServiceImpl.java

@@ -11,9 +11,7 @@ import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
 import com.ruoyi.flowable.common.enums.FlowStatusEnum;
 import com.ruoyi.flowable.factory.FlowServiceFactory;
-import com.ruoyi.flowable.service.ITerminationService;
-import com.ruoyi.flowable.service.IFlowInstanceService;
-import com.ruoyi.flowable.service.IFlowService;
+import com.ruoyi.flowable.service.*;
 import com.ruoyi.invest.domain.*;
 import com.ruoyi.invest.domain.vo.ProjectTerminationVo;
 import com.ruoyi.invest.mapper.TerminationMapper;
@@ -67,6 +65,8 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
     private ITProjectMeetingService tProjectMeetingService;
     @Autowired
     private TProjectScoringMapper tProjectScoringMapper;
+    @Autowired
+    private ISysFormService sysFormService;
     @Override
     public List<ProjectTerminationVo> selectAllTerminationList(TProjectTermination tProjectTermination){
         return terminationMapper.selectAllTerminationList(tProjectTermination);
@@ -193,6 +193,8 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                         // todo 短信
                         sendMessage(flowBaseInfo);
                     }
+                    //更新代办任务数量
+                    sysFormService.updateToDoNumber();
                     return AjaxResult.success();
                 }
                 return AjaxResult.error();

ruoyi-ui/src/App.vue

@@ -36,7 +36,7 @@ export default {
 ::v-deep .el-form-item {
   width: 100%;
   margin-right: 0px;
-  margin-bottom: 10px;
+  /* margin-bottom: 10px; */
 }
 ::v-deep .el-form--label-top {
   background-color: #fff;
@@ -60,8 +60,16 @@ export default {
 ::v-deep .el-tabs--border-card>.el-tabs__header{
   background-color: #f3f3f4;
 }
+::v-deep .el-tabs--border-card>.el-tabs__header .el-tabs__item {
+  font-weight: 600;
+}
 ::v-deep .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
+  color: #555555;
   border-radius: 4px 4px 0 0;
+  font-weight: 600;
+}
+::v-deep .el-tabs--border-card>.el-tabs__header .el-tabs__item:not(.is-disabled):hover {
+    color: #555555;
 }
 </style>
 <style>

ruoyi-ui/src/components/Breadcrumb/index.vue

@@ -62,13 +62,14 @@ export default {
 
 <style lang="scss" scoped>
 .app-breadcrumb.el-breadcrumb {
+
   display: inline-block;
   font-size: 14px;
-  line-height: 50px;
-  margin-left: 8px;
+  line-height: 60px;
+  margin-left: 25px;
 
   .no-redirect {
-    color: #97a8be;
+    // color: #97a8be;
     cursor: text;
   }
 }

ruoyi-ui/src/components/SearchFilter/index.vue

@@ -9,7 +9,7 @@
       <slot></slot>
       <FormItem class="searchBtnWrapper">
         <Button type="primary" @click="handleQuery">查询</Button>
-        <Button @click="resetQuery">重置</Button>
+        <Button type="primary" @click="resetQuery">重置</Button>
         <Button v-show="collapsiable" type="text" @click="shiftCollapsiable">
           <span>
             {{ fold ? "收起" : "展开" }}

ruoyi-ui/src/components/flow/Expression/index.vue

@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

ruoyi-ui/src/components/flow/Listener/index.vue

@@ -22,7 +22,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </el-row>

ruoyi-ui/src/components/flow/Role/index.vue

@@ -12,7 +12,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

ruoyi-ui/src/components/flow/User/index.vue

@@ -63,7 +63,7 @@
               @click="handleQuery"
               >搜索</el-button
             >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
               >重置</el-button
             >
           </el-form-item>

ruoyi-ui/src/layout/components/Navbar.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
+    <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
+    
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
@@ -113,7 +113,7 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 50px;
+  height: 60px;
   overflow: hidden;
   position: relative;
   background: #fff;

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -25,7 +25,7 @@
             : variables.menuLightColor
         "
         :unique-opened="true"
-        :active-text-color="settings.theme"
+        active-text-color="#ffffff"
         :collapse-transition="false"
         mode="vertical"
       >

ruoyi-ui/src/views/file/businessPlan/index.vue

@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/file/decisionReport/index.vue

@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/file/financialEvaluation/index.vue

@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/file/initiationReport/index.vue

@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/file/legalDueDiligence/index.vue

@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/file/marketResearch/index.vue

@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/file/projectTechnology/index.vue

@@ -32,7 +32,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/flowable/definition/index.vue

@@ -28,7 +28,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/flowable/expression/index.vue

@@ -28,7 +28,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/flowable/task/finished/index.vue

@@ -27,7 +27,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/flowable/task/form/index.vue

@@ -27,7 +27,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/flowable/task/myProcess/index.vue

@@ -27,7 +27,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/flowable/task/todo/index.vue

@@ -27,7 +27,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/invest/channel/index.vue

@@ -55,7 +55,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/invest/company/index.vue

@@ -43,7 +43,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

ruoyi-ui/src/views/invest/components/contractList.vue

@@ -52,7 +52,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/invest/components/fileList.vue

@@ -36,7 +36,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/invest/components/followList.vue

@@ -57,7 +57,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/invest/components/meetingList.vue

@@ -76,7 +76,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/invest/components/projectList.vue

@@ -76,7 +76,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/invest/components/selecDept.vue

@@ -40,7 +40,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/invest/components/selecUser.vue

@@ -69,7 +69,7 @@
                 @click="handleQuery"
                 >搜索</el-button
               >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
                 >重置</el-button
               >
             </el-form-item>

ruoyi-ui/src/views/invest/pool/index2.vue

@@ -79,7 +79,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/invest/pool/index3.vue

@@ -79,7 +79,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/invest/pool/index4.vue

@@ -79,7 +79,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/invest/pool/index5.vue

@@ -79,7 +79,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/monitor/job/index.vue

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/monitor/job/log.vue

@@ -43,7 +43,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/monitor/logininfor/index.vue

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/monitor/online/index.vue

@@ -26,7 +26,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -59,7 +59,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/approval/myTask.vue

@@ -47,12 +47,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="重置">
-              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="导出">
-              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+              <el-button style="width: 100%;" type="primary" icon="el-icon-download"
                 @click="exportQuery">导出</el-button>
             </el-form-item>
           </el-col>

ruoyi-ui/src/views/project/approval/processList.vue

@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/approval/projectItem.vue

@@ -20,7 +20,7 @@
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table

ruoyi-ui/src/views/project/decision/myTask.vue

@@ -44,12 +44,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="重置">
-              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="导出">
-              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+              <el-button style="width: 100%;" type="primary" icon="el-icon-download"
                 @click="exportQuery">导出</el-button>
             </el-form-item>
           </el-col>

ruoyi-ui/src/views/project/decision/processList.vue

@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/decision/projectItem.vue

@@ -20,7 +20,7 @@
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table

ruoyi-ui/src/views/project/investOpp/myTask copy.vue

@@ -38,7 +38,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="重置">
-              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
         </el-row>

ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -60,12 +60,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="重置">
-              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="导出">
-              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+              <el-button style="width: 100%;" type="primary" icon="el-icon-download"
                 @click="exportQuery">导出</el-button>
             </el-form-item>
           </el-col>

ruoyi-ui/src/views/project/investOpp/processList.vue

@@ -72,7 +72,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/investigate/myTask.vue

@@ -47,12 +47,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="重置">
-              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="导出">
-              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+              <el-button style="width: 100%;" type="primary" icon="el-icon-download"
                 @click="exportQuery">导出</el-button>
             </el-form-item>
           </el-col>

ruoyi-ui/src/views/project/investigate/processList.vue

@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/investigate/projectItem.vue

@@ -20,7 +20,7 @@
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table

ruoyi-ui/src/views/project/listStage/listApproval.vue

@@ -65,7 +65,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/listStage/listDecision.vue

@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/listStage/listInvestOpp.vue

@@ -66,7 +66,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/listStage/listInvestigate.vue

@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/listStage/listPool.vue

@@ -62,7 +62,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/listStage/listSign.vue

@@ -59,7 +59,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/listStage/terminationList.vue

@@ -67,7 +67,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/listStage/watchList.vue

@@ -60,7 +60,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/meetingList.vue

@@ -80,7 +80,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/project/termination/myTask.vue

@@ -44,12 +44,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="重置">
-              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="导出">
-              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+              <el-button style="width: 100%;" type="primary" icon="el-icon-download"
                 @click="exportQuery">导出</el-button>
             </el-form-item>
           </el-col>

ruoyi-ui/src/views/project/termination/processList.vue

@@ -45,7 +45,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/project/termination/projectItem.vue

@@ -20,7 +20,7 @@
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table

ruoyi-ui/src/views/study/businessPlan/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/study/financialStatements/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/study/gen/index.vue

@@ -33,7 +33,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/study/investmentAmount/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/study/investmentPotential/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/study/projectApproval/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/study/projectFounderProfile/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/study/projectInitiationKey/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/study/projectMeetingMinutes/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/study/riskAssessment/index.vue

@@ -38,7 +38,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="el-icon-refresh" size="small" @click="resetQuery"
+        <el-button icon="el-icon-refresh" size="small" type="primary" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>

ruoyi-ui/src/views/system/config/index.vue

@@ -41,7 +41,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/dept/index.vue

@@ -29,7 +29,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/dict/data.vue

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/dict/index.vue

@@ -41,7 +41,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/expression/index.vue

@@ -28,7 +28,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/file/index.vue

@@ -57,7 +57,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/listener/index.vue

@@ -28,7 +28,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/menu/index.vue

@@ -29,7 +29,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/notice/index.vue

@@ -37,7 +37,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/post/index.vue

@@ -38,7 +38,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/role/authUser.vue

@@ -31,7 +31,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/role/index.vue

@@ -41,7 +41,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重置">
-            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

ruoyi-ui/src/views/system/role/selectUser.vue

@@ -20,7 +20,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row>

ruoyi-ui/src/views/system/user/index.vue

@@ -66,7 +66,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="重置">
-                <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+                <el-button style="width: 100%;" icon="el-icon-refresh" type="primary" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-col>
           </el-row>

ruoyi-ui/src/views/tool/gen/importTable.vue

@@ -20,7 +20,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row>