设备管理看板修改

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

@@ -22,17 +22,17 @@
                 <div class="topCard">
                     <!-- <top-bar v-if="topBarData.length" :info="topBarData" /> -->
                     <div style="width:100%;height: 100%;box-sizing: border-box;overflow: hidden;">
-                        <div class="middleCardLeft" style="width:24%;height:100%">
+                        <div class="middleCardLeft" style="width:49%;height:100%">
                             <middleCard v-if="allSheBeiData.data.length" :info="allSheBeiData" />
                         </div>
                         <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" />
-                        <div class="middleCardLeft" style="width:38%;height:100%">
+                        <div class="middleCardLeft" style="width:49%;height:100%">
                             <moreBar v-if="moreBarData.data.source.length > 0 " :info="moreBarData" />
                         </div>
-                        <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" />
-                        <div class="middleCardLeft" style="width:34%;height:100%">
-                            <zhuzhuangtu v-if="zichangBarData.data.length" :info="zichangBarData" />
-                        </div>
+                        <!-- <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" /> -->
+                        <!-- <div class="middleCardLeft" style="width:34%;height:100%"> -->
+                            <!-- <zhuzhuangtu v-if="zichangBarData.data.length" :info="zichangBarData" /> -->
+                        <!-- </div> -->
                     </div>
                 </div>
                 <dv-decoration-10 style="height:2%;display:flex;" />
@@ -665,8 +665,8 @@ export default {
             let didian = ''
             this_.$store.getters.level.second ? didian = this_.$store.getters.level.second : didian = this_.$store.getters.level.first
             didian.includes(',') ? didian = didian.split(',')[0] : ''
-            const sql1 = `select DISTINCT(a.bian_zhi_bu_men_),name_,COUNT(*) AS total FROM t_mjsbjdxzjhzb AS a JOIN  ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE a.parent_id_ IN ( SELECT id_ FROM t_mjsbjdxzjh WHERE (bian_zhi_shi_jian LIKE '%${this_.month.slice(0, 4)}%' OR create_time_ LIKE '%${this_.month.slice(0, 4)}%') AND (shi_fou_guo_shen_ = '已审批' or shi_fou_guo_shen_ = '已完成')) AND a.di_dian_ = '${didian}'  and b.name_ not like '%综合%' GROUP BY a.bian_zhi_bu_men_`
-            const sql2 = `select DISTINCT(a.bian_zhi_bu_men_),name_,COUNT(*) AS total FROM t_mjsbjdxzjhzb AS a JOIN  ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE a.parent_id_ IN ( SELECT id_ FROM t_mjsbjdxzjh WHERE (bian_zhi_shi_jian LIKE '%${this_.month.slice(0, 4)}%' OR create_time_ LIKE '%${this_.month.slice(0, 4)}%') AND shi_fou_guo_shen_ = '已完成') AND a.di_dian_ = '${didian}' and b.name_ not like '%综合%' GROUP BY a.bian_zhi_bu_men_`
+            const sql1 = `select DISTINCT(a.bian_zhi_bu_men_),name_,COUNT(*) AS total FROM t_mjsbjdxzjhzb AS a JOIN  ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE a.parent_id_ IN ( SELECT id_ FROM t_mjsbjdxzjh WHERE (ji_hua_nian_du_ LIKE '%${this_.month.slice(0, 4)}%' OR create_time_ LIKE '%${this_.month.slice(0, 4)}%') AND (shi_fou_guo_shen_ = '已审批' or shi_fou_guo_shen_ = '已完成')) AND a.di_dian_ = '${didian}'  and b.name_ not like '%综合%' GROUP BY a.bian_zhi_bu_men_`
+            const sql2 = `select DISTINCT(a.bian_zhi_bu_men_),name_,COUNT(*) AS total FROM t_mjsbjdxzjhzb AS a JOIN  ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE a.parent_id_ IN ( SELECT id_ FROM t_mjsbjdxzjh WHERE (ji_hua_nian_du_ LIKE '%${this_.month.slice(0, 4)}%' OR create_time_ LIKE '%${this_.month.slice(0, 4)}%') AND shi_fou_guo_shen_ = '已完成') AND a.di_dian_ = '${didian}' and b.name_ not like '%综合%' GROUP BY a.bian_zhi_bu_men_`
             this.jiaozhunBarData.data.dimensions = ['product', '计划数', '完成数']
             let data1, data2
             await Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
@@ -742,7 +742,7 @@ export default {
             didian.includes(',') ? didian = didian.split(',')[0] : ''
             // const sql =`select * from t_sbdj where (she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' or she_bei_zhuang_ta ='报废/停用') and  di_dian_ = '${didian}'`;
             // const sql = `select a.she_bei_ming_cheng_, a.she_bei_shi_bie_h,a.she_bei_zhuang_ta,b.name_ FROM t_sbdj AS a  JOIN  ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE she_bei_zhuang_ta ='停用' and b.name_ not like '%综合%' AND a.di_dian_ = '${didian}' ORDER BY a.bian_zhi_bu_men_ DESC`
-            const sql = `select a.she_bei_ming_cheng_, a.she_bei_shi_bie_h,a.she_bei_zhuang_ta,b.name_ FROM t_sbdj AS a  JOIN  ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' and b.name_ not like '%综合%' AND a.di_dian_ = '${didian}' ORDER BY a.bian_zhi_bu_men_ DESC`
+            const sql = `select a.she_bei_ming_cheng_, a.she_bei_shi_bie_h, a.yuan_she_bei_bian, a.she_bei_zhuang_ta,b.name_ FROM t_sbdj AS a  JOIN  ibps_party_position AS b ON a.bian_zhi_bu_men_ = b.id_ WHERE she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' and b.name_ not like '%综合%' AND a.di_dian_ = '${didian}' ORDER BY a.bian_zhi_bu_men_ DESC`
             let data1 = []
             await curdPost('sql', sql)
                 .then((res) => {
@@ -755,7 +755,7 @@ export default {
                         data1 = []
                         data1.push(item.name_)
                         data1.push(item.she_bei_ming_cheng_)
-                        data1.push(item.she_bei_shi_bie_h)
+                        data1.push(item.yuan_she_bei_bian)
                         data1.push(item.she_bei_zhuang_ta)
                         this_.BaofeiBarData.data.push(data1)
                     })