Merge remote-tracking branch 'origin/shoot-hand-html' into shoot-hand-html

# Conflicts:
#	src/views/admin/repair/RepairStatistics.vue

src/views/admin/repair/RepairStatistics.vue

@@ -95,11 +95,23 @@
           <div class="titleView">楼层负责人情况</div>
           <div class="conditionView">
             <a-select default-value="week" style="width: 120px;margin-right: 10px">
-              <a-select-option value="month">按月</a-select-option>
+              <a-select-option value="month" >按月</a-select-option>
               <a-select-option value="year">按年</a-select-option>
             </a-select>
-            <a-month-picker placeholder="请选择时间" />
+            <a-date-picker
-            <a-year-picker placeholder="请选择时间" />
+              format='YYYY'
+              mode='year'
+              :value='floor.time'
+              placeholder='选择年份'
+              :open='floor.open'
+              @change='onChange'
+              @openChange='openChange'
+              @panelChange='panelChange'
+            >
+            </a-date-picker>
+            <!--            <a-date-picker mode='year' format='YYYY' @change='clickFloor' :value='floor.time'/>-->
+            <a-month-picker v-if='floor.type =="month"' @change='clickFloor' :value='floor.time'
+                            placeholder='请选择月' />
           </div>
         </div>
         <div class="contentView">
@@ -144,31 +156,21 @@
       <div class="headView">
         <div class="titleView">故障统计</div>
         <div class="conditionView">
-          <a-select style="width: 120px;margin-right: 10px" @change="selectWeek">
+          <a-select default-value="week" style="width: 120px;margin-right: 10px">
+            <a-select-option value="week">按周</a-select-option>
             <a-select-option value="month">按月</a-select-option>
             <a-select-option value="year">按年</a-select-option>
           </a-select>
-
+          <a-date-picker placeholder="请选择时间" />
-          <a-date-picker
-            mode="year"
-            v-decorator="['year']"
-            placeholder="请输入年份"
-            format="YYYY"
-            style="width: 200px"
-            :open="yearShowOne"
-            v-model:value="deviceType"
-            @openChange="openChangeOne"
-            @panelChange="panelChangeOne" />
-
         </div>
       </div>
       <div class="contentView">
         <a-table
-          style="width: 100%"
           :columns="columns"
           :data-source="loadData"
           showPagination="true"
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+
         >
         </a-table>
       </div>
@@ -179,7 +181,7 @@
 
 <script>
 import * as echarts from 'echarts'
-import { repairAdminStats, repairStats, floorStats, deviceTypeStats } from '@/api/admin/repair/repairStats'
+import { repairAdminStats, repairStats, floorStats } from '@/api/admin/repair/repairStats'
 
 export default {
   name: 'RepairStatistics',