修改

src/config/componentsMap.js

@@ -2,185 +2,114 @@
  * export component map
  */
 export default {
-    layout: () =>
-        import ('@/layout'),
-    layout2: () =>
-        import ('@/layout/index2'),
+    layout: () => import ('@/layout'),
+    layout2: () =>  import ('@/layout/index2'),
     // 权限管理
-    users: () =>
-        import ('@/views/permission/users'),
-    roles: () =>
-        import ('@/views/permission/roles'),
-    rules: () =>
-        import ('@/views/permission/rules'),
-    departments: () =>
-        import ('@/views/permission/departments'),
-    jobs: () =>
-        import ('@/views/permission/jobs'),
+    users: () =>  import ('@/views/permission/users'),
+    roles: () => import ('@/views/permission/roles'),
+    rules: () => import ('@/views/permission/rules'),
+    departments: () => import ('@/views/permission/departments'),
+    jobs: () => import ('@/views/permission/jobs'),
     // 系统设置
-    database: () =>
-        import ('@/views/system/database'),
-    attachment: () =>
-        import ('@/views/system/attachments'),
-    loginLog: () =>
-        import ('@/views/system/log/login'),
-    operateLog: () =>
-        import ('@/views/system/log/operate'),
-    sensitiveWord: () =>
-        import ('@/views/system/sensitiveWord'),
-    develop: () =>
-        import ('@/views/system/develop'),
-    generate: () =>
-        import ('@/views/system/generate'),
+    database: () => import ('@/views/system/database'),
+    attachment: () => import ('@/views/system/attachments'),
+    loginLog: () => import ('@/views/system/log/login'),
+    operateLog: () =>  import ('@/views/system/log/operate'),
+    sensitiveWord: () => import ('@/views/system/sensitiveWord'),
+    develop: () => import ('@/views/system/develop'),
+    generate: () =>  import ('@/views/system/generate'),
     //邮箱管理
-    email: () =>
-        import ('@/views/system/email'),
-    database: () =>
-        import ('@/views/system/database'),
-    attachment: () =>
-        import ('@/views/system/attachments'),
-    loginLog: () =>
-        import ('@/views/system/log/login'),
-    operateLog: () =>
-        import ('@/views/system/log/operate'),
-    sensitiveWord: () =>
-        import ('@/views/system/sensitiveWord'),
-    develop: () =>
-        import ('@/views/system/develop'),
-    generate: () =>
-        import ('@/views/system/generate'),
+    email: () =>  import ('@/views/system/email'),
+    database: () => import ('@/views/system/database'),
+    attachment: () =>  import ('@/views/system/attachments'),
+    loginLog: () => import ('@/views/system/log/login'),
+    operateLog: () => import ('@/views/system/log/operate'),
+    sensitiveWord: () => import ('@/views/system/sensitiveWord'),
+    develop: () =>  import ('@/views/system/develop'),
+    generate: () => import ('@/views/system/generate'),
     // 配置管理
-    config: () =>
-        import ('@/views/system/config'),
+    config: () => import ('@/views/system/config'),
     // 模块管理
-    module: () =>
-        import ('@/views/system/module'),
+    module: () => import ('@/views/system/module'),
     // 表单构建
-    form: () =>
-        import ('@/views/system/form'),
-
+    form: () =>  import ('@/views/system/form'),
     // 微信管理
-    wechatMenus: () =>
-        import ('@/views/wechat/menus'),
-    //
+    wechatMenus: () => import ('@/views/wechat/menus'),
+
     // 微信用户
-    wechatUsers: () =>
-        import ('@/views/wechat/users'),
+    wechatUsers: () => import ('@/views/wechat/users'),
     // 微信用户标签
-    wechatTags: () =>
-        import ('@/views/wechat/tags'),
+    wechatTags: () => import ('@/views/wechat/tags'),
     // wechatGraphic:() => import('@/views/catchAdmin/wechat/graphic'),
-    wechatReply: () =>
-        import ('@/views/wechat/reply'),
+    wechatReply: () =>  import ('@/views/wechat/reply'),
     //微信公众号轮播图管理
-    wechatBanner: () =>
-        import ('@/views/wechat/banner'),
+    wechatBanner: () => import ('@/views/wechat/banner'),
     //微信公众号公告管理
-    wechatNotice: () =>
-        import ('@/views/wechat/notice'),
+    wechatNotice: () => import ('@/views/wechat/notice'),
     //微信公众号补卡管理
-    wechatUpdateCard: () =>
-        import ('@/views/wechat/updatecard'),
-    routeMap: () =>
-        import ('@/views/map/routeMap.vue'),
+    wechatUpdateCard: () =>  import ('@/views/wechat/updatecard'),
+    routeMap: () => import ('@/views/map/routeMap.vue'),
     //设备管理
-    hydraulic: () =>
-        import ('@/views/device/hydraulic'),
-    wrench: () =>
-        import ('@/views/device/wrench'),
-    flange: () =>
-        import ('@/views/device/flange'),
-    maintenance: () =>
-        import ('@/views/device/maintenance'),
-    wind: () =>
-        import ('@/views/wind/wind'),
-    fan: () =>
-        import ('@/views/wind/fan'),
-    worklocation: () =>
-        import ('@/views/work_record/worklocation'),
+    hydraulic: () => import ('@/views/device/hydraulic'),
+    wrench: () => import ('@/views/device/wrench'),
+    flange: () => import ('@/views/device/flange'),
+    maintenance: () => import ('@/views/device/maintenance'),
+    wind: () =>  import ('@/views/wind/wind'),
+    fan: () =>  import ('@/views/wind/fan'),
+    worklocation: () => import ('@/views/work_record/worklocation'),
     //作业记录参数 映射表
-    maintenancemapper: () =>
-        import ('@/views/work_record/maintenancemapper'),
+    maintenancemapper: () => import ('@/views/work_record/maintenancemapper'),
     //作业位置管理表
-    worklocal_config: () =>
-        import ('@/views/work_record/worklocal_config'),
+    worklocal_config: () =>  import ('@/views/work_record/worklocal_config'),
     //同步方案
-    synscheme: () =>
-        import ('@/views/device/synscheme'),
-    device_mold: () =>
-        import ('@/views/device/mold'),
+    synscheme: () => import ('@/views/device/synscheme'),
+    device_mold: () => import ('@/views/device/mold'),
     // stolenVehicles: () => import('@/views/yunying/vehicle/stolen'),
     // 短信平台
-    sms: () =>
-        import ('@/views/sms'),
-
+    sms: () =>  import ('@/views/sms'),
     //推送记录
-    smsSendLog: () =>
-        import ('@/views/sms/smsSendLog'),
+    smsSendLog: () => import ('@/views/sms/smsSendLog'),
     // 域名管理
-    domain: () =>
-        import ('@/views/domain'),
+    domain: () =>  import ('@/views/domain'),
     // 域名记录
-    domainRecord: () =>
-        import ('@/views/domain/record'),
+    domainRecord: () => import ('@/views/domain/record'),
     //基础配置
-    basicConfig: () =>
-        import ('@/views/permission/config'),
+    basicConfig: () => import ('@/views/permission/config'),
     //类型字典
-    sysDictType: () =>
-        import ('@/views/system/sysDictType'),
+    sysDictType: () => import ('@/views/system/sysDictType'),
 
 
     // 报表分析 => 设备汇总
     // 液压泵统计
-    hydraulicCount: () =>
-        import ('@/views/report/hydraulicCount'),
+    hydraulicCount: () =>  import ('@/views/report/hydraulicCount'),
 
     //风场设备统计
-    windCount: () =>
-        import ('@/views/report/windCount'),
+    windCount: () => import ('@/views/report/windCount'),
     // 告警设备统计
-    alarmDeviceCount: () =>
-        import ('@/views/report/alarmDeviceCount'),
+    alarmDeviceCount: () => import ('@/views/report/alarmDeviceCount'),
     // 单位设备状态统计
-    companyCount: () =>
-        import ('@/views/report/companyCount'),
-    maintainCount: () =>
-        import ('@/views/report/maintainCount'),
-
-    //维保记录统计
-    worklocationCount: () =>
-        import ('@/views/report/worklocationCount'),
+    companyCount: () =>  import ('@/views/report/companyCount'),
+    maintainCount: () => import ('@/views/report/maintainCount'),
 
 
     // 报表分析 => 概览 => 数据统计
-    dataCount: () =>
-        import ('@/views/report/dataCount'),
+    dataCount: () => import ('@/views/report/dataCount'),
     // 热力图
-    heatmap: () =>
-        import ('@/views/report/heatmap'),
+    heatmap: () => import ('@/views/report/heatmap'),
 
     //大屏
-    screen: () =>
-        import ('@/views/screen'),
+    screen: () => import ('@/views/screen'),
 
 
     //告警记录
-    alarmRecords: () =>
-        import ('@/views/alarm/alarmRecords/index'),
-    alarmReport: () =>
-        import ('@/views/alarm/alarmReport/index'),
-    alarmDevice: () =>
-        import ('@/views/alarm/device/index'),
-    pushResult: () =>
-        import ('@/views/alarm/pushResult/index'),
+    alarmRecords: () => import ('@/views/alarm/alarmRecords/index'),
+    alarmReport: () => import ('@/views/alarm/alarmReport/index'),
+    alarmDevice: () => import ('@/views/alarm/device/index'),
+    pushResult: () => import ('@/views/alarm/pushResult/index'),
     //轨迹地图
-    routeMap: () =>
-        import ('@/views/map/routeMap'),
-
+    routeMap: () => import ('@/views/map/routeMap'),
 
     // 围栏列表
-    fence: () =>
-        import ('@/views/fence/index'),
+    fence: () => import ('@/views/fence/index'),
 
 }

src/views/report/hydraulicCount/index.vue

@@ -46,10 +46,10 @@
             </div>
             <div class="pie-right-content">
                 
-                <div class="content-item-head">共有200台设备 <span class="triangle"></span> </div>
-                <div class="content-item">有100台设备正常使用 <span class="triangle2"></span> </div>
-                <div class="content-item">有40台设备40+天闲置 <span class="triangle2"></span> </div>
-                <div class="content-item">有60台设备20+天闲置 <span class="triangle2"></span> </div>
+                <div class="content-item-head">共有19台设备 <span class="triangle"></span> </div>
+                <div class="content-item" @click="showTable('normal')">有5台设备正常使用 <span class="triangle2"></span> </div>
+                <div class="content-item" @click="showTable('40day')">有8台设备40+天闲置 <span class="triangle2"></span> </div>
+                <div class="content-item" @click="showTable('20day')">有6台设备20+天闲置 <span class="triangle2"></span> </div>
                 
             </div>
         </template>
@@ -57,35 +57,7 @@
     </div>
 
     <div class="datatable">
-      <div class="table-title">40+天未使用设备列表</div>
-      <el-table :data="tableData40" row-key="id" fit border width="100%" >
-          <el-table-column type="index" width="50" label="序号" align="center"/>
-          <!-- <el-table-column label="设备类型" prop="type" align="center"/> -->
-          <el-table-column label="设备名称" prop="name" align="center"/>
-          <el-table-column label="出厂编号" prop="number" align="center" />
-          <el-table-column label="上次使用时间" prop="online_time" align="center" />
-          <el-table-column label="上次使用地址" prop="address" align="center" />
-          <el-table-column label="未使用天数" prop="unused_days" align="center" />
-          <el-table-column label="备注" prop="remarks" align="center" />
-      </el-table>
-    </div>
-
-    <div class="datatable">
-      <div class="table-title">20+天未使用设备列表</div>
-      <el-table :data="tableData20" row-key="id" fit border width="100%" >
-          <el-table-column type="index" width="50" label="序号" align="center"/>
-          <!-- <el-table-column label="设备类型" prop="type" align="center"/> -->
-          <el-table-column label="设备名称" prop="name" align="center"/>
-          <el-table-column label="出厂编号" prop="number" align="center" />
-          <el-table-column label="上次使用时间" prop="online_time" align="center" />
-          <el-table-column label="上次使用地址" prop="address" align="center" />
-          <el-table-column label="未使用天数" prop="unused_days" align="center" />
-          <el-table-column label="备注" prop="remarks" align="center" />
-      </el-table>
-    </div>
-    <!-- 表格 -->
-    <div class="datatable">
-      <div class="table-title">正常使用设备列表</div>
+      <div class="table-title">{{tableTitle}}</div>
       <el-table :data="tableData" row-key="id" fit border width="100%" >
           <el-table-column type="index" width="50" label="序号" align="center"/>
           <!-- <el-table-column label="设备类型" prop="type" align="center"/> -->
@@ -97,6 +69,7 @@
           <el-table-column label="备注" prop="remarks" align="center" />
       </el-table>
     </div>
+
    
   </div>
 </template>
@@ -118,8 +91,7 @@ export default {
       url: "report/hydraulicCount",
       data: [],
       tableData: [],
-      tableData20: [],
-      tableData40: [],
+      tableTitle:'正常使用设备列表',
       deviceTypes:[],
 
 
@@ -155,8 +127,7 @@ export default {
      */
     afterGetList() {
       this.tableData=this.data.list
-      this.tableData20=this.data.list20
-      this.tableData40=this.data.list40
+      this.tableTitle='正常使用设备列表';
 
       this.pieSeriesData=this.data.pie_data
       this.pieOptions = this.getPieOptions()
@@ -165,6 +136,19 @@ export default {
       
     },
 
+    showTable(name){
+      if(name=='40day'){
+        this.tableData=this.data.list40
+        this.tableTitle='40+天未使用设备列表';
+      }else if(name=='20day'){
+        this.tableData=this.data.list20
+        this.tableTitle='20+天未使用设备列表';
+      }else{
+        this.tableData=this.data.list
+        this.tableTitle='正常使用设备列表';
+      }
+ 
+    },
 
 
     getDepartOptions() {
@@ -270,7 +254,7 @@ export default {
   // width:40%;
   width:240px;
   margin-top:30px;
-  background-color:#1890ff;
+  background-color:#1d5d99;
   color: #FFF;
   height:30px;
   padding-left:10px;
@@ -282,7 +266,7 @@ export default {
 			width: 0;
 			height: 0;
 			border:15px solid transparent;
-			border-left-color:#1890ff;
+			border-left-color:#1d5d99;
 }
 .content-item{
   width:240px;

src/views/report/worklocationCount/index.vue

@@ -1,225 +0,0 @@
-<template>
-  <div class="app-container">
-       <el-row :gutter="12">
-        <el-col :span="24">
-            <div class="filter-container">
-              <el-cascader
-                class="filter-item fl form-search-input"
-                @change="handleSearch"
-                placeholder="请选择所属单位"
-                :options="departments"
-                v-model="queryParam.depart_id"
-                :props="departProps"
-                filterable
-                clearable>
-              </el-cascader>
-        
-              <el-input
-                v-model="queryParam.creator"
-                placeholder="安装人员"
-                clearable
-                @change="handleSearch"
-                class="filter-item form-search-input fl"
-              />
-            
-              <el-button class="filter-item fl" icon="el-icon-search" @click="handleSearch">
-                搜索
-              </el-button>
-            <el-button class="filter-item fl" icon="el-icon-refresh" @click="handleRefresh">
-              重置
-            </el-button>
-          </div>
-        </el-col>
-      </el-row>
-    <!-- 液压泵图表 -->
-    <div class="charts">
-      <normal-card  shadow="always" >
-        <template slot="content">
-          <base-bar :options="barOptions" width="100%" height="100%"  />
-        </template>
-      </normal-card>
-    </div>
-
-
-    <!-- 表格 -->
-    <div class="datatable">
-      <div class="table-title">风场液压泵列表</div>
-      <el-table :data="tableData" row-key="id" fit border width="100%" >
-
-          <el-table-column label="风场名称" prop="name" align="center" fixed="left"/>
-          <el-table-column label="液压泵总数" prop="total" align="center" />
-          <el-table-column label="液压泵在线数" prop="online" align="center" />
-          <el-table-column label="液压泵离线数" prop="offline" align="center" />
-      </el-table>
-    </div>
-   
-  </div>
-</template>
-<script>
-import NormalCard from '@/components/Card/NormalCard';
-
-import BaseBar from "@/components/Charts/BaseBarChart";
-
-import { getChinaAreaName } from '@/utils/common'
-import formOperate from "@/layout/rl-list-operate/rlListOperate";
-export default {
-   mixins: [formOperate],
-  name:'total_windCount',
-  components: { NormalCard, BaseBar },
-  filters: {
-    getChinaAreaName: getChinaAreaName
-  },
-  data() {
-    return {
-      url: "report/windCount",
-      data: [],
-      tableData: [],
-      // 图形配置
-      barXData: [],
-      barSeriesData: [],
-      barOptions: {},
-      
-      departments: [],
-      queryParam:{
-        depart_id:'',
-        creator:'',
-      },
-      departProps: {
-              label: "department_name",
-              value: "id",
-              checkStrictly: true,
-              expandTrigger: 'hover'
-      },
-      
-    };
-  },
-  created: function() {
-
-        // 获取所属单位
-        this.getDepartOptions();
-       
-  },
-  methods: {    
-    /**
-     * 监听搜索组件中查出的数据
-     */
-    afterGetList() {
-      this.tableData=this.data.list
-
-      console.log(this.data)
-      this.barXData=this.data.xdata
-      this.barSeriesData=this.data.ydata
-      this.barOptions = this.getBarOptions()
-      
-
-      
-    },
-
-
-
-    getDepartOptions() {
-        this.$http.get('departments').then( resp => {
-            this.departments = resp.data
-        })
-    },
-     /**
-         * 清除过滤器
-         */
-    clearFilter() {
-            this.queryParam = {
-                device_type: '',
-                net_state: '',
-                citys: [],
-                depart_id: [],
-                creator: '',
-                created_at: [],
-            };
-            this.checkedDepart = []
-            this.handleSearch()
-    },
-    getBarOptions(){
-          return {
-            title: {
-              text: "风场设备统计",
-              textStyle: {
-                color: '#80a0b0',
-                fontSize: 16,
-                fontWeight: 600
-              }
-            },
-            legend: {
-              show: true //不显示 柱形名称
-            },
-            xAxis: {
-                data: this.barXData
-            },
-            yAxis: {
-              name: "设备数量",
-              nameTextStyle: {
-                color: '#80a0b0',
-              },
-              minInterval: 1
-            },
-            dataZoom: [
-                {
-                    type: 'inside'
-                }
-            ],
-            series: [
-              {
-                name: "风机",
-                type: "bar",
-                barMaxWidth: '40',
-                data: this.barSeriesData,
-               
-              },
-              {
-                name: "液压泵",
-                type: "bar",
-                barMaxWidth: '40',
-                data: this.barSeriesData,
-               
-              }
-            ]
-          }
-    },
-     
-   
-   
-
-
-  },
-
-};
-</script>
-<style lang="scss" scoped>
-/** 表格错位问题 */
-::v-deep .el-table th.gutter {
-  display:table-cell !important;
-}
-.app-container {
-
-  .charts {
-    padding-bottom: 20px;
-  }
-
-  .datatable {
-    .table-title {
-      background-color: #edebff;
-      color: #1890ff;
-      display: flex;
-      width: 100%;
-      justify-content: center;
-      align-items: center;
-      height: 40px;
-      font-size: 16px;
-      font-weight: 600;
-    }
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  }
-
-}
-.filter-container{
-  margin-bottom: 30px;
-}
-</style>