Просмотр исходного кода

月度设备维护情况统计页面布局调整

luoaoxuan 1 год назад
Родитель
Сommit
ac11de4edd

+ 7 - 9
src/views/component/device/maintenanceStatic.vue

@@ -411,19 +411,19 @@ export default {
                     .green-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: green;
+                        background-color: #67C23A;
                         border-radius: 50%;
                     }
                     .red-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: red;
+                        background-color: #F56C6C;
                         border-radius: 50%;
                     }
                     .orange-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: orange;
+                        background-color: #E6A23C;
                         border-radius: 50%;
                     }
                 }
@@ -446,12 +446,12 @@ export default {
             .table{
                 display: flex;
                 .column{
+                    flex: 1;
                     &:nth-child(2){
                         display: flex;
                     }
                     >.item{
                         height: 50px;
-                        width: 160px;
                         text-align: center;
                         line-height: 50px;
                         border-bottom: 1px solid #333;
@@ -461,14 +461,12 @@ export default {
                     @media screen and (max-width: 1800px) {
                          >.item{
                             height: 44px;
-                            width: 120px;
                             line-height: 44px;
                         }
                     }
                     @media screen and (max-width: 1550px) {
                          >.item{
                             height: 40px;
-                            width: 100px;
                             line-height: 40px;
                         }
                     }
@@ -518,7 +516,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: green;
+                            background-color: #67C23A;
                             border-radius: 50%;
                         }
                         .red-circle {
@@ -529,7 +527,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: red;
+                            background-color: #F56C6C;
                             border-radius: 50%;
                         }
                         .orange-circle {
@@ -540,7 +538,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: orange;
+                            background-color: #E6A23C;
                             border-radius: 50%;
                         }
                     }

+ 29 - 10
src/views/component/device/maintenanceStaticAll.vue

@@ -43,6 +43,8 @@
                             readonly-text="text"
                             :disabled="false"
                             :multiple="false"
+                            :filter="filter"
+                            filterable
                         />
                     </div>
                     <div class="item">
@@ -78,7 +80,7 @@
                     </div>
                 </div>
 
-                <div class="table">
+                <div v-if="fliterData.length>0" class="table">
                     <div class="column">
                         <div class="item">设备名称/日期</div>
                         <div v-for="(item,index) in fliterData" :key="index" class="item" style="cursor:pointer" @click="goLookStatic(item)">
@@ -113,6 +115,7 @@
                         </div>
                     </div>
                 </div>
+                <el-empty v-else description="暂无数据" />
             </div>
             <MaintenanceStatic v-if="MaintenanceStaticVisible" :dialog-visible.sync="MaintenanceStaticVisible" :params="dialogParams" />
 
@@ -187,7 +190,17 @@ export default {
 
             },
             dataList: [],
-            type: ['日保养', '周保养', '月保养', '季度保养', '半年保养', '年保养', '按需保养']
+            type: ['日保养', '周保养', '月保养', '季度保养', '半年保养', '年保养', '按需保养'],
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: '',
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }]
         }
     },
     computed: {
@@ -389,7 +402,7 @@ export default {
             this.title = `月度设备维护统计`
             const y = +this.month.split('-')[0]
             const m = +this.month.split('-')[1]
-            const sql = `select a.id_ AS mainId,a.shi_fou_guo_shen_,a.bian_zhi_bu_men_,c.wei_hu_xiang_mu_c,a.bian_zhi_ren_,a.she_bei_ming_chen,a.she_bei_bian_hao_,a.ri_qi_,a.zhu_zhou_qi_,a.nei_rong_qing_kua,a.ji_hua_shi_jian_,b.id_ AS subId,c.wei_hu_ri_qi_,c.wei_hu_lei_xing_,c.ri_qi_shu_zi_,c.id_ AS addtionId,d.bei_zhu_,d.wei_hu_zhuang_tai from t_mjsbwhbyjlby a left join t_mjsbwhjhzb b on a.ji_hua_wai_jian_ = b.id_ left join v_device_devicemaintenance c on b.she_bei_bian_hao_ = c.id_ left join t_mjsbwhbyjlzby d on a.id_ = d.parent_id_ where a.shi_fou_guo_shen_!='已删除' and YEAR(a.ji_hua_shi_jian_) = ${y} and MONTH(a.ji_hua_shi_jian_) = ${m}`
+            const sql = `select a.id_ AS mainId,a.shi_fou_guo_shen_,a.bian_zhi_bu_men_,c.wei_hu_xiang_mu_c,a.bian_zhi_ren_,a.she_bei_ming_chen,a.she_bei_bian_hao_,a.ri_qi_,a.zhu_zhou_qi_,a.nei_rong_qing_kua,a.ji_hua_shi_jian_,b.id_ AS subId,c.wei_hu_ri_qi_,c.wei_hu_lei_xing_,c.ri_qi_shu_zi_,c.id_ AS addtionId,d.bei_zhu_,d.wei_hu_zhuang_tai from t_mjsbwhbyjlby a left join t_mjsbwhjhzb b on a.ji_hua_wai_jian_ = b.id_ left join v_device_devicemaintenance c on b.she_bei_bian_hao_ = c.id_ left join t_mjsbwhbyjlzby d on a.id_ = d.parent_id_ where a.shi_fou_guo_shen_!='已删除' and YEAR(a.ji_hua_shi_jian_) = ${y} and MONTH(a.ji_hua_shi_jian_) = ${m} and a.di_dian_='${this.level}'`
             const { variables: { data }} = await this.$common.request('sql', sql)
             this.dataList = data
             this.dataList.forEach(item => {
@@ -438,7 +451,7 @@ export default {
             &::before{
                 content: '*';
                 margin: 0 4px 0 -7.5px;
-                color: #F56C6C;
+                color: red;
             }
         }
         .left{
@@ -461,19 +474,19 @@ export default {
                     .green-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: green;
+                        background-color: #67C23A;
                         border-radius: 50%;
                     }
                     .red-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: red;
+                        background-color: #F56C6C;
                         border-radius: 50%;
                     }
                     .orange-circle {
                         width: 12px;
                         height: 12px;
-                        background-color: orange;
+                        background-color: #E6A23C;
                         border-radius: 50%;
                     }
                 }
@@ -499,6 +512,7 @@ export default {
             .table{
                 display: flex;
                 .column{
+                    flex: 1;
                     &:nth-child(2){
                         display: flex;
                     }
@@ -530,6 +544,11 @@ export default {
                         line-height: 30px;
                         text-align: center;
                     }
+                    >.item:not(:first-child) {
+                        :hover{
+                            color: #409EFF;
+                        }
+                    }
                     .content-item{
                         >.item{
                             position: relative;
@@ -570,7 +589,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: green;
+                            background-color: #67C23A;
                             border-radius: 50%;
                         }
                         .red-circle {
@@ -581,7 +600,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: red;
+                            background-color: #F56C6C;
                             border-radius: 50%;
                         }
                         .orange-circle {
@@ -592,7 +611,7 @@ export default {
                             transform: translate(-50%, -50%);
                             width: 10px;
                             height: 10px;
-                            background-color: orange;
+                            background-color: #E6A23C;
                             border-radius: 50%;
                         }
                     }