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

ruoyi-ui/src/App.vue

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

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

@@ -35,7 +35,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>