Browse Source

修改群里提的bug

shaun-sheep 5 years ago
parent
commit
0f55160c0a
2 changed files with 26 additions and 52 deletions
  1. 1 1
      src/components/ready/buildfloor/addBuild.vue
  2. 25 51
      src/views/model/report/index.vue

+ 1 - 1
src/components/ready/buildfloor/addBuild.vue

@@ -8,7 +8,7 @@
     <el-form
       :inline="true"
       :model="form"
-      label-width="125px"
+      label-width="155px"
       :rules="rules"
       ref="ruleForm"
     >

+ 25 - 51
src/views/model/report/index.vue

@@ -64,84 +64,62 @@
             </el-table-column>
             <el-table-column prop="ElementRangeCheck" label='构件范围检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.ElementRangeCheck" class="item" type='danger' v-if="scope.row.ElementRangeCheck">-->
-                <!--                </el-badge>-->
+                <el-badge :value="scope.row.ElementRangeCheck" class="item" type='danger'
+                          v-if="scope.row.ElementRangeCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.ElementRangeCheck<=0"></i>
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.ElementRangeCheck"></i>
               </template>
             </el-table-column>
             <el-table-column prop="FamilyNameCheck" label='设备族编码检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.FamilyNameCheck" class="item" type='danger' v-if="scope.row.FamilyNameCheck">-->
-                <!--                </el-badge>-->
+                <el-badge :value="scope.row.FamilyNameCheck" class="item" type='danger'
+                          v-if="scope.row.FamilyNameCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.FamilyNameCheck<=0"></i>
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.FamilyNameCheck"></i>
               </template>
             </el-table-column>
             <el-table-column prop="EquipPartLocationCheck" label='部件所在位置检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.EquipPartLocationCheck" class="item" type='danger' v-if="scope.row.EquipPartLocationCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.EquipPartLocationCheck"></i>
-
+                <el-badge :value="scope.row.EquipPartLocationCheck" class="item" type='danger'
+                          v-if="scope.row.EquipPartLocationCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.EquipPartLocationCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="ColumnCheck" label='柱边界检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.ColumnCheck" class="item" type='danger' v-if="scope.row.ColumnCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.ColumnCheck"></i>
-
+                <el-badge :value="scope.row.ColumnCheck" class="item" type='danger' v-if="scope.row.ColumnCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.ColumnCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="ConnectorCheck" label='连接件检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.ConnectorCheck" class="item" type='danger' v-if="scope.row.ConnectorCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.ConnectorCheck"></i>
-
+                <el-badge :value="scope.row.ConnectorCheck" class="item" type='danger' v-if="scope.row.ConnectorCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.ConnectorCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="SystemNameCheck" label='系统类型名称检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.SystemNameCheck" class="item" type='danger' v-if="scope.row.SystemNameCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.SystemNameCheck"></i>
-
+                <el-badge :value="scope.row.SystemNameCheck" class="item" type='danger'
+                          v-if="scope.row.SystemNameCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.SystemNameCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="EquipInSpaceCheck" label='未在空间中的设备' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.EquipInSpaceCheck" class="item" type='danger' v-if="scope.row.EquipInSpaceCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.EquipInSpaceCheck"></i>
-
+                <el-badge :value="scope.row.EquipInSpaceCheck" class="item" type='danger'
+                          v-if="scope.row.EquipInSpaceCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.EquipInSpaceCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="PipeCheck" label='管段检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.PipeCheck" class="item" type='danger' v-if="scope.row.PipeCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;" v-if="scope.row.PipeCheck"></i>
+                <el-badge :value="scope.row.PipeCheck" class="item" type='danger' v-if="scope.row.PipeCheck"/>
+
 
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.PipeCheck<=0"></i>
@@ -149,22 +127,17 @@
             </el-table-column>
             <el-table-column prop="SystemReferEquipCheck" label='管网及相关设备检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.SystemReferEquipCheck" class="item" :type='scope.row.SystemReferEquipCheck?"danger":"success"'-->
-                <!--                  v-if="scope.row.SystemReferEquipCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.SystemReferEquipCheck"></i>
-
+                <el-badge :type='scope.row.SystemReferEquipCheck?"danger":"success"' :value="scope.row.SystemReferEquipCheck"
+                          class="item"
+                          v-if="scope.row.SystemReferEquipCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.SystemReferEquipCheck<=0"></i>
               </template>
             </el-table-column>
             <el-table-column prop="ParameterIntegrityCheck" label='Revit族参数完整性检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.ParameterIntegrityCheck" class="item" type='danger' v-if="scope.row.ParameterIntegrityCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.ParameterIntegrityCheck"></i>
+                <el-badge :value="scope.row.ParameterIntegrityCheck" class="item" type='danger'
+                          v-if="scope.row.ParameterIntegrityCheck"/>
 
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.ParameterIntegrityCheck<=0"></i>
@@ -172,11 +145,8 @@
             </el-table-column>
             <el-table-column prop="XyzOverlapCheck" label='xyz坐标重叠检查' width="200">
               <template slot-scope="scope">
-                <!--                <el-badge :value="scope.row.XyzOverlapCheck" class="item" type='danger' v-if="scope.row.XyzOverlapCheck">-->
-                <!--                </el-badge>-->
-                <i class="msg-icon el-icon-success error-color1" style="font-size:20px;"
-                   v-if="scope.row.XyzOverlapCheck"></i>
-
+                <el-badge :value="scope.row.XyzOverlapCheck" class="item" type='danger'
+                          v-if="scope.row.XyzOverlapCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                    v-if="scope.row.XyzOverlapCheck<=0"></i>
               </template>
@@ -570,6 +540,10 @@
       }
     }
 
+    /deep/ .el-badge__content--danger {
+      background-color: #F56C6C60;
+    }
+
   }
 
 </style>