fix:设备管理看板设备使用列表修改为仪器设备列表

src/views/system/jbdHome/board/equipmentBoard.vue

@@ -28,7 +28,7 @@
             </div>
             <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" />
             <div class="middleCardRight1">
-              <CarouselTabl v-if="shiyonglvConfig.data.length" :info="shiyonglvConfig" title="设备使用记录列表" isup=isup />
+              <CarouselTabl v-if="shiyonglvConfig.data.length" :info="shiyonglvConfig" title="仪器设备列表" isup=isup />
             </div>
             <!-- <div class="middleCardCenter">
             <middleCard v-if="eBgRateData.data.length" :info="eBgRateData" ref="middleCardCenter"/>
@@ -110,11 +110,12 @@ export default {
       jianDingjiaoZhunSheBeiData: {},
       weiHuSheBeiData: {},
       shiyonglvConfig: {
-        // header: ["名称","编号","部门","使用人","使用时间","存放位置", "状态", "频率"],
-        header: ["名称","编号","使用时间","存放位置", "状态", "频率"],
+        header: ["编号","名称","存放位置","状态","保管人",],//仪器设备
+        // header: ["名称","编号","使用时间","存放位置", "状态", "频率"], //设备使用列表
         data: [],
-        columnWidth: ["180","130","120","150","110","120"],
-        rowNum: 6,
+        // columnWidth: ["180","130","120","150","110","120"],//设备使用列表
+        columnWidth: ["180","180","150","110","110"],
+        rowNum: 7,
       },
       bottomData: {},
       zhuantaiEData: {},
@@ -158,7 +159,7 @@ export default {
       this.MiddleLeftPieViewList = {
         data: [],
         config: { idSelector: "main" },
-        rowNum: 6,
+        rowNum: 7,
         color: [],
       };
       this_.sheBeiDataShow = false;
@@ -454,9 +455,9 @@ export default {
       // [ { value: 1048, name: 'Search Engine' },]
       console.log();
     },
-    async getCarouselShiYonglvTable() {
+    async getCarouselShiYonglvTable() { //设备建档信息
       let this_ = this;
-      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.she_bei_shi_bie_h 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`;
+      const sql = `select a.she_bei_shi_bie_h,a.she_bei_ming_cheng_,a.cun_fang_di_dian_,a.she_bei_zhuang_ta,b.name_ FROM t_sbdj AS a JOIN ibps_party_employee AS b ON a.guan_li_ren_ = b.ID_`;
       let data1 = [];
       let res1 = [];
       this_.shiyonglvConfig.data = [];
@@ -465,26 +466,50 @@ export default {
           const result = res.variables.data;
           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.she_bei_ming_cheng_);
             data1.push(item.cun_fang_di_dian_);
-            // data1.push(item.create_time_);
-            data1.push(item.shi_yong_qian_qin);
-            data1.push(item.pinlv);
+            data1.push(item.she_bei_zhuang_ta);
+            data1.push(item.name_);
             this_.shiyonglvConfig.data.push(data1);
-            // this_.$forceUpdate()
           });
-
-          // console.log(this_.shiyonglvConfig.data);
         })
         .catch((err) => {
           console.log(err);
         });
       this.isup = true;
     },
+    // async getCarouselShiYonglvTable() {设备使用列表
+    //   let this_ = this;
+    //   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.she_bei_shi_bie_h 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 = [];
+    //   await curdPost("sql", sql)
+    //     .then((res) => {
+    //       const result = res.variables.data;
+    //       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_);
+    //         // data1.push(item.create_time_);
+    //         data1.push(item.shi_yong_qian_qin);
+    //         data1.push(item.pinlv);
+    //         this_.shiyonglvConfig.data.push(data1);
+    //         // this_.$forceUpdate()
+    //       });
+
+    //       // console.log(this_.shiyonglvConfig.data);
+    //     })
+    //     .catch((err) => {
+    //       console.log(err);
+    //     });
+    //   this.isup = true;
+    // },
     timestampToTime(timestamp) {
       var date = new Date(timestamp * 1000);
       var Y = date.getFullYear() + "-";