修改按钮颜色

src/views/EquipmentEntryApply/index.vue

@@ -34,7 +34,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="4" style="float:right;">
+          <el-col :span="4" style="float:left;">
             <el-form-item>
               <el-button class="primary-lease" type="primary" @click="getEquipmentApplyList">
                 查询
@@ -42,6 +42,13 @@
               <el-button class="primary-lease" type="primary" @click="resetForm">
                 重置
               </el-button>
+
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="2" style="float:right;">
+            <el-form-item>
+
               <el-button
                 class="primary-lease"
                 type="primary"

src/views/EquipmentLedger/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="24" class="main-content" type="justify">
-      <el-col :span="collapsed ? 1: 5" class="tree-column" style="">
+      <el-col :span="collapsed ? 1: 5" class="tree-column" >
         <div class="card-container" v-if="!collapsed">
           <div class="card-header" v-if="!collapsed">
             <!-- 只有在未折叠状态显示标题 -->
@@ -18,10 +18,9 @@
             class="tree-container"
             :loading="treeLoading"
           />
-
-
         </div>
-        <div style="position: relative;width:20px;height: calc(100vh - 130px);margin-left: 5px">
+
+        <div style="position: relative;width:30px;height: calc(100vh - 130px);margin-left: 5px">
           <!-- 右侧折叠/展开按钮 -->
           <el-button
             icon="el-icon-d-arrow-left"
@@ -184,13 +183,15 @@
         <!-- 状态统计和操作按钮 - 固定定位 -->
         <div class="status-operation-bar sticky-bar">
           <div class="operation-buttons">
-            <el-button icon="el-icon-refresh"  style="float: right;margin-left: 20px" type="primary" size="mini" @click="resetQuery">
+
-              重置
+            <el-button type="primary" style="float: left" icon="el-icon-search" size="mini" @click="getDeviceList">
-            </el-button>
-            <el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="getDeviceList"
-            >
               查询
             </el-button>
+
+            <el-button icon="el-icon-refresh"  style="float: left" type="primary" size="mini" @click="resetQuery">
+              重置
+            </el-button>
+
           </div>
         </div>
 
@@ -1273,6 +1274,8 @@ export default {
   font-size: 15px;
   color: #1f2d3d;
   font-weight: 500;
+
+  width: 675px;
 }
 
 .table-count {
@@ -1343,7 +1346,8 @@ export default {
 .stat-value {
   font-size: 16px;
   font-weight: 500;
-  color: #1f2d3d;
+  //color: #1f2d3d;
+  color: #1a73e8;
 }
 
 .operation-buttons {
@@ -1476,5 +1480,10 @@ export default {
   transition: all 0.3s ease;
   display: flex;
   flex-direction: row;
+
+}
+
+.el-col-1 {
+  width: 1.5% !important;
 }
 </style>

src/views/EquipmentRetire/index.vue

@@ -65,13 +65,16 @@
         </el-row>
 
         <el-row>
-          <el-col style="text-align: right">
+          <el-col style="text-align: left">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="onHandleQuery">
               查询
             </el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="onHandleReset">重置</el-button>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="onHandleReset">重置</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="onHandleBatchRetire">批量退役</el-button>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="onHandleBatchRetire" style="float: right;margin-right: 25px">批量退役</el-button>
+
           </el-col>
+
+
         </el-row>
       </el-form>
 

src/views/EquipmentRoamRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
     <!-- 装备流转记录  -->
     <div class="app-container">
-        <el-form ref="queryForm" size="small" inline label-width="auto" :model="queryParams">
+        <el-form ref="queryForm" size="small" inline label-width="auto" :model="queryParams" class="search-form">
             <el-form-item prop="keyword">
                 <el-input
                     clearable
@@ -39,9 +39,15 @@
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="onHandleQuery"> 查询 </el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="onHandleReset">重置</el-button>
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="onHandleReset">重置</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="onHandleExport">导出数据</el-button>
+
             </el-form-item>
+
+          <el-col :span="2" style="float:right;">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="onHandleExport" >导出数据</el-button>
+          </el-form-item>
+            </el-col>
         </el-form>
 
         <el-table :data="tableData" style="width: 100%">
@@ -258,4 +264,6 @@ export default {
     color: #333;
     line-height: 40px;
 }
+
+
 </style>

src/views/EquipmentSharedLease/order/index.vue

@@ -50,6 +50,11 @@
             maxlength="20"
           />
         </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery" >重置</el-button>
+        </el-form-item>
       </el-row>
       <!--      <el-form-item prop="lowerBound">
               <el-input
@@ -72,10 +77,8 @@
                 style="width:100px"
               />
             </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-form-item>
     </el-form>
     <template v-if="cardList.length > 0">
       <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">
@@ -802,7 +805,7 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped >
 /* .uploadImg {
   padding-top: 20px;
   display: flex;
@@ -1010,4 +1013,7 @@ export default {
     }
   }
 }
+
+
+
 </style>

src/views/EquipmentSharedOrder/order/index.vue

@@ -61,12 +61,14 @@
             maxlength="20"
           />
         </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
       </el-row>
 
-      <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-form-item>
     </el-form>
 
     <!-- 订单列表 -->
@@ -210,7 +212,7 @@
           <!-- 操作按钮 -->
           <el-col :span="4">
             <div>
-              <el-button @click="handleViewOrder(item)" type="primary" size="small">
+              <el-button @click="handleViewOrder(item)" type="primary" size="small" >
                 订单详情
               </el-button>
               <el-button

src/views/search/equipment/index.vue

@@ -55,7 +55,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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
         </el-form>
 

src/views/search/lease/index.vue

@@ -8,7 +8,7 @@
           clearable
           @keyup.enter.native="handleQuery"
           maxlength="20"
-        />   
+        />
       </el-form-item>
       <el-form-item  prop="code">
         <el-input
@@ -61,7 +61,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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -125,7 +125,7 @@
     <!-- 查看租赁详情弹窗 -->
       <el-dialog :title="title" :visible.sync="showDevice" width="1300px" height="1000px" append-to-body>
         <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px;">
-          <div style="width:30%"> 
+          <div style="width:30%">
             <span >装备编号：{{ deviceCode }}</span>
           </div>
           <div style="width: 30%">
@@ -133,7 +133,7 @@
           </div>
           <div style="width: 30%">
             <span >装备状态：{{ deviceStatus }}</span>
-          </div>    
+          </div>
         </div>
           <el-form :model="queryDevice" ref="queryFormDevice" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="订单编号" prop="orderCode">
@@ -193,7 +193,7 @@
         <el-table-column label="承租人" align="center" prop="rentPerson"  />
         <el-table-column label="下单时间" align="center" prop="orderTime"  width="130px"/>
       </el-table>
-  
+
       <pagination
         v-show="totalTwo>0"
         :total="totalTwo"
@@ -205,7 +205,7 @@
       </el-dialog>
 
   </div>
-</template> 
+</template>
 
 <script>
 import { getEquipmentTypeApi,getEquipmentListApi,getRentDetailApi,} from "@/api/search/equipment";
@@ -322,7 +322,7 @@ export default {
         this.loading = false;
       });
     },
-    
+
 
     // 取消按钮
     // cancel() {
@@ -365,7 +365,7 @@ export default {
               this.queryParams.typeId = ''
           }
       },
-  
+
     //租赁详情
     handleDetail(row){
       this.deviceId = row.maId;
@@ -442,4 +442,4 @@ export default {
         display: none;
     }
 }
-</style>
+</style>

src/views/search/order/index.vue

@@ -9,7 +9,7 @@
                 clearable
                 @keyup.enter.native="handleQuery"
                 maxlength="20"
-            />   
+            />
         </el-form-item>
         <el-form-item  prop="orderStatus">
           <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
@@ -24,14 +24,14 @@
         <el-form-item  prop="dateRange">
             <el-date-picker
                 v-model="time"
-                type="daterange" 
+                type="daterange"
                 value-format="yyyy-MM-dd"
-                range-separator="至" 
+                range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 >
             </el-date-picker>
-        </el-form-item>  
+        </el-form-item>
         <el-form-item  prop="czcompanyName">
             <el-input
                 v-model="queryParams.czcompanyName"
@@ -39,7 +39,7 @@
                 clearable
                 @keyup.enter.native="handleQuery"
                 maxlength="20"
-            />   
+            />
         </el-form-item>
         <el-form-item  prop="companyName">
             <el-input
@@ -48,7 +48,7 @@
                 clearable
                 @keyup.enter.native="handleQuery"
                 maxlength="20"
-            />   
+            />
         </el-form-item>
         </el-row>
         <el-form-item  prop="lowerBound">
@@ -59,8 +59,8 @@
                 @keyup.enter.native="handleQuery"
                 maxlength="20"
                 style="width:100px"
-            />  
+            />
-            <span> ——</span> 
+            <span> ——</span>
         </el-form-item>
           <el-form-item  prop="upperBound">
             <el-input
@@ -70,13 +70,13 @@
                 @keyup.enter.native="handleQuery"
                 maxlength="20"
                 style="width:100px"
-            />   
+            />
         </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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-form-item>
-      </el-form> 
+      </el-form>
       <template v-if="cardList.length > 0">
         <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">
             <el-row class="order-title-info">
@@ -345,7 +345,7 @@
                     <span>{{ overhaulDetails.leaseCompany }}</span>
                 </div>
             </el-row>
-        
+
             <div style="padding: 6px 0 0 0; font-size: 18px; font-weight: bold; color: #eb190a">
                 总费用(元)： <span>{{ overhaulDetails.totalCost }}</span>
             </div>
@@ -413,7 +413,7 @@
                     </template>
                 </el-table-column>
             </el-table>
-        
+
             <TitleTip :titleText="`维修费用明细`" />
             <el-table
                 :data="repairRecordList"
@@ -569,7 +569,7 @@
                     </template>
                 </el-table-column>
             </el-table>
-    
+
         </el-dialog>
 
         <!-- 附件详情 -->
@@ -604,11 +604,11 @@
         </el-dialog>
     </div>
 
-  </template> 
+  </template>
-  
+
-  <script> 
+  <script>
   import TitleTip from '@/components/TitleTip'
-  import { getOrderListApi,getOrderListInfoApi,getOverhaulApi } from "@/api/search/order"; 
+  import { getOrderListApi,getOrderListInfoApi,getOverhaulApi } from "@/api/search/order";
   import moment from 'moment'
   export default {
     components: { TitleTip },
@@ -617,15 +617,15 @@
     data() {
       return {
         // 遮罩层
-        loading: false,     
+        loading: false,
         // 非单个禁用
         single: true,
         // 非多个禁用
-        multiple: true, 
+        multiple: true,
         // 显示搜索条件
-        showSearch: true, 
+        showSearch: true,
         statusList:
-        [    
+        [
             { id: '1', name: '待接单' },
             { id: '2', name: '待出库' },
             { id: '3', name: '待收货' },
@@ -641,9 +641,9 @@
         ],
         ids:[],
         // 总条数
-        total: 0, 
+        total: 0,
         //表格数据
-        tableList: [], 
+        tableList: [],
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -676,7 +676,7 @@
         viewFileInfoList: [],
       };
     },
-    created() { 
+    created() {
        this.getList();
     },
     methods: {
@@ -704,7 +704,7 @@
             }else{
                 this.queryParams.startTime=undefined
                 this.queryParams.endTime=undefined
-            }  
+            }
             getOrderListApi(this.queryParams).then((res) => {
                 this.cardList = res.data.rows;
                 this.total = res.data.total;
@@ -717,7 +717,7 @@
             this.cardList[index].good_list.forEach(item=>{
                 item.isChecked = e;
             })
-            
+
         },
 
         // 公司子级list全选事件
@@ -733,7 +733,7 @@
                 path: '/search/order/orderDetail',
                 query: { orderStatus:row.orderStatus,orderId:row.orderId }
             })
-        }, 
+        },
 
         //检修详情
         handleViewRepair(item){
@@ -787,8 +787,8 @@
             this.ids = selection.map(item => item.taskId)
             this.single = selection.length != 1
             this.multiple = !selection.length
-        }, 
+        },
-        
+
 
     }
   };
@@ -952,7 +952,7 @@
         width: 100%;
         display: flex;
         flex-wrap: wrap;
-        
+
         align-items: center;
         .el-button {
             width: calc((100% - 50px) / 4);
@@ -1005,4 +1005,4 @@
         }
     }
 }
-  </style>
+  </style>

src/views/system/config/index.vue

@@ -42,7 +42,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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

src/views/system/dept/index.vue

@@ -38,6 +38,7 @@
                     >搜索</el-button
                 >
                 <el-button
+                    type="primary"
                     icon="el-icon-refresh"
                     size="mini"
                     @click="resetQuery"

src/views/system/dict/index.vue

@@ -47,7 +47,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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

src/views/system/log/abnormalLog/index.vue

@@ -91,6 +91,7 @@
       <el-button
         style="margin-left: 20px"
         class="filter-item"
+        type="primary"
         @click="resetFilter"
       >
         重置

src/views/system/log/businessLog/index.vue

@@ -39,7 +39,7 @@
         <el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
           查询
         </el-button>
-        <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
+        <el-button style="margin-left: 20px" class="filter-item" type="primary"  @click="resetFilter">
           重置
         </el-button>
        <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">

src/views/system/log/logAnalyse/index.vue

@@ -19,7 +19,7 @@
         <el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
           查询
         </el-button>
-        <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
+        <el-button style="margin-left: 20px" class="filter-item"  type="primary" @click="resetFilter">
           重置
         </el-button>
         <span style="margin-left: 40px;">总数:{{sumNum}}</span>

src/views/system/log/systemLog/index.vue

@@ -39,7 +39,7 @@
       <el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
         查询
       </el-button>
-      <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
+      <el-button style="margin-left: 20px" class="filter-item"  type="primary" @click="resetFilter">
         重置
       </el-button>
       <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">

src/views/system/menu/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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

src/views/system/notice/index.vue

@@ -29,7 +29,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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

src/views/system/post/index.vue

@@ -29,7 +29,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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

src/views/system/role/index.vue

@@ -47,7 +47,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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -660,4 +660,4 @@ export default {
 .disabled-row:hover td {
   background-color: #f5f7fa !important;
 }
-</style>
+</style>

src/views/system/user/index.vue

@@ -44,7 +44,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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
@@ -824,4 +824,4 @@ export default {
 .disabled-row:hover td {
   background-color: #f5f7fa !important;
 }
-</style>
+</style>

vue.config.js

@@ -40,7 +40,7 @@ module.exports = {
                 // target: `http://192.168.0.110:18080`,//洪
                 // target: `http://192.168.0.234:18080`,//阮
                 // target: `http://36.33.26.201:17788/proxyApi`, //测试
-                target: `http://192.168.0.69:18080`, //测试
+                target: `http://127.0.0.1:28080`, //测试
                 // target: `http://192.168.137.1:18080`,//
                 changeOrigin: true,
                 pathRewrite: {