diff --git a/.env.production b/.env.production
index 0e8253f..5d6de07 100644
--- a/.env.production
+++ b/.env.production
@@ -3,7 +3,7 @@ ENV = 'production'
 
 # base api
 #http://192.168.60.99:9004/
-VUE_APP_BASE_API =
+VUE_APP_BASE_API = ''
 VUE_APP_UPLOAD_API = /api/admin/upload-file
 VUE_APP_OA_URL = http://192.168.60.18:2021
 VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b2d4551..de620db 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,16 +2,36 @@
   <div>
     <div style='display: flex;justify-content: space-between;'>
       <div>当前登录人：{{user.name}}</div>
-      <div class="chart-title">
-        <!-- <span>出入库统计</span> -->
-        <!-- <el-select placeholder="请选择仓库" style="margin-right:10px"></el-select> -->
-        <el-date-picker @change="changeDate" v-model="dateRange" value-format="yyyy-MM-dd" type="daterange"
-          :picker-options="pickerOptions" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-          align="right">
-        </el-date-picker>
+    </div>
+    <!-- 待办工单 待运维设备 -->
+    <div style='display: flex;justify-content: space-between;'>
+      <div style="width:49%">
+        <div style="font-size: 18px;">待办工单</div>
+        <xy-table :list="todoList" :height="300" :isPage="false" :table-item="todoTable">
+         <template v-slot:btns>
+            <!-- <div></div> -->
+           <el-table-column  align="center" label="操作" width="120" header-align="center">
+              <template slot-scope="scope">
+
+              </template>
+           </el-table-column>
+          </template>
+        </xy-table>
+      </div>
+      <div style="width:49%">
+        <div style="font-size: 18px;">待运维设备</div>
+        <xy-table :list="yunweiList" :height="300" :isPage="false" :table-item="yunweiTable">
+         <template v-slot:btns>
+            <!-- <div></div> -->
+           <el-table-column  align="center" label="操作" width="120" header-align="center">
+              <template slot-scope="scope">
+
+              </template>
+           </el-table-column>
+          </template>
+        </xy-table>
       </div>
     </div>
-
     <div class="statistics">
       <panel-group :totaldata="list" :curtotal='curTotal'/>
     </div>
@@ -24,6 +44,20 @@
         </el-col>
       </el-row>
     </div>
+    <!-- 设备记录 -->
+    <div style="width:100%;margin-bottom:20px">
+      <div style="font-size: 18px;margin:20px 0">设备记录</div>
+      <xy-table :list="shebeiList" :height="300" :isPage="false" :table-item="shebeiTable">
+       <template v-slot:btns>
+          <!-- <div></div> -->
+         <el-table-column  align="center" label="操作" width="120" header-align="center">
+            <template slot-scope="scope">
+
+            </template>
+         </el-table-column>
+        </template>
+      </xy-table>
+    </div>
 
 
   </div>
@@ -83,6 +117,72 @@
             }
           }]
         },
+        todoList:[],
+        todoTable:[
+          {
+            label: "接收日期",
+            width: 120,
+            prop: 'date',
+            align: 'center',
+          },
+          {
+            label: "工单名称",
+            prop: 'name',
+            align: 'left',
+          },
+          {
+            label: "状态",
+            width: 120,
+            prop: 'status',
+            align: 'center',
+          },
+        ],
+        yunweiList:[],
+        yunweiTable:[
+          {
+            label: "计划运维日期",
+            width: 120,
+            prop: 'date',
+            align: 'center',
+          },
+          {
+            label: "设备名称",
+            prop: 'name',
+            align: 'left',
+          },
+          {
+            label: "所属仓库",
+            width: 120,
+            prop: 'status',
+            align: 'center',
+          },
+        ],
+        shebeiList:[],
+        shebeiTable:[
+          {
+            label: "运维日期",
+            width: 120,
+            prop: 'date',
+            align: 'center',
+          },
+          {
+            label: "设备名称",
+            prop: 'name',
+            width:180,
+            align: 'left',
+          },
+          {
+            label: "运维类型",
+            prop: 'type',
+            align: 'left',
+          },
+          {
+            label: "所属仓库",
+            width: 120,
+            prop: 'status',
+            align: 'center',
+          },
+        ],
         list: {},
         curTotal:{
           ruku:0,