|
|
@@ -111,9 +111,9 @@ export default {
|
|
|
jianDingjiaoZhunSheBeiData: {},
|
|
|
weiHuSheBeiData: {},
|
|
|
shiyonglvConfig: {
|
|
|
- header: ["设备名称","使用人", "使用时间","存放位置", "状态", "频率"],
|
|
|
+ header: ["名称","编号","部门","使用人","使用时间","存放位置", "状态", "频率"],
|
|
|
data: [],
|
|
|
- columnWidth: ["130", "90","110","120", "100", "70"],
|
|
|
+ columnWidth: ["130","120","120","90","110","120"],
|
|
|
rowNum: 6,
|
|
|
},
|
|
|
bottomData: {},
|
|
|
@@ -456,8 +456,8 @@ export default {
|
|
|
},
|
|
|
async getCarouselShiYonglvTable() {
|
|
|
let this_ = this;
|
|
|
- // const sql = `select she_bei_ming_chen,she_bei_bian_hao_ ,create_time_,she_bei_zhuang_ku,COUNT(*) AS pinlv FROM t_mjsbsy GROUP BY she_bei_bian_hao_ HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
|
|
|
- const sql = `select a.she_bei_ming_chen ,a.create_time_,a.shi_yong_qian_qin,b.name_,c.cun_fang_di_dian_,COUNT(*) AS pinlv FROM t_yqsbsydjb as a join ibps_party_employee as b on a.shi_yong_ren_ = b.ID_ join t_sbdj as c on a.yi_qi_bian_hao_ = c.id_ GROUP BY create_time_ HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
|
|
|
+ // const sql = `select she_bei_ming_chen,she_bei_bian_hao_ ,create_time_,she_bei_zhuang_ku,d.name_ as bumen ,COUNT(*) AS pinlv FROM t_mjsbsy GROUP BY she_bei_bian_hao_ HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
|
|
|
+ const sql = `select a.she_bei_ming_chen ,a.create_time_,a.shi_yong_qian_qin,b.name_,c.cun_fang_di_dian_,c.she_bei_shi_bie_h,d.name_ as bumen,COUNT(*) AS pinlv FROM t_yqsbsydjb as a join ibps_party_employee as b on a.shi_yong_ren_ = b.ID_ join t_sbdj as c on a.yi_qi_bian_hao_ = c.id_ join ibps_party_org as d on d.id_ = a.bian_zhi_bu_men_ GROUP BY create_time_ HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
|
|
|
let data1 = [];
|
|
|
let res1 = [];
|
|
|
this_.shiyonglvConfig.data = [];
|
|
|
@@ -467,6 +467,8 @@ export default {
|
|
|
result.forEach((item) => {
|
|
|
data1 = [];
|
|
|
data1.push(item.she_bei_ming_chen);
|
|
|
+ data1.push(item.she_bei_shi_bie_h);
|
|
|
+ data1.push(item.bumen);
|
|
|
data1.push(item.name_);
|
|
|
data1.push(this_.timestampToTime(item.create_time_ / 1000));
|
|
|
data1.push(item.cun_fang_di_dian_);
|
|
|
@@ -679,13 +681,13 @@ export default {
|
|
|
// overflow: hidden;
|
|
|
// }
|
|
|
.middleCardRight {
|
|
|
- width: 26%;
|
|
|
+ width: 22%;
|
|
|
height: 100%;
|
|
|
box-sizing: border-box;
|
|
|
overflow: hidden;
|
|
|
}
|
|
|
.middleCardRight1 {
|
|
|
- width: 44%;
|
|
|
+ width: 48%;
|
|
|
height: 100%;
|
|
|
box-sizing: border-box;
|
|
|
overflow: hidden;
|