Browse Source

修改校验不通过红框为整个td(2488)

zhangxc 5 years ago
parent
commit
b25f8d2d3a

+ 9 - 12
src/components/diagBase/DisFeatureItem.vue

@@ -6,13 +6,13 @@
                             <el-option v-for="item in featureTypeList" :label="item.name" :value="item.key" :key="item.key"></el-option>
                         </el-select>
                     </td>
-                    <td class="FeatureNumber" @click.self="clickItemBox" >
+                    <td class="FeatureNumber" :class="{borderRed:item.verifyCode||item.codeNull}"  @click.self="clickItemBox" >
                         <el-tooltip :disabled="!item.verifyCode&&!item.codeNull&&!item.codeError" class="item" effect="dark" :content="item.verifyCode||item.codeNull||item.codeError" placement="top">
                             <el-input class="groupTextarea" 
                                 ref="textarea"
                                 type="textarea"  
                                 :autosize="{ minRows: 1}"
-                                :class="{borderRed:item.verifyCode||item.codeNull, colorRed: item.codeError}" 
+                                :class="{colorRed: item.codeError}" 
                                 :title="item.code" 
                                 v-model.trim="item.code"
                                  @input="handleInp(index,$event,'FeatureNumber')"  
@@ -20,13 +20,12 @@
                             </el-input>
                         </el-tooltip>
                     </td>
-                    <td class="FeatureStand"   @click.self="clickItemBox">
+                    <td class="FeatureStand" :class="{borderRed:item.verifyStandard||item.standardNull}"    @click.self="clickItemBox">
                         <el-tooltip  :disabled="!item.verifyStandard&&!item.standardNull" class="item" effect="dark" :content="item.verifyStandard||item.standardNull" placement="top">
                             <el-input class="groupTextarea" 
                                 ref="textarea" 
                                 type="textarea"
                                 :autosize="{ minRows: 1}"
-                                :class="{borderRed:item.verifyStandard||item.standardNull}" 
                                 :title="item.standard" 
                                 v-model.trim="item.standard" 
                                 @input="handleInp(index,$event,'FeatureStand',item.type)"   
@@ -51,13 +50,12 @@
                         </div> 
                           
                     </td>
-                    <td class="FeatureRelate" @click.self="clickItemBox">
+                    <td class="FeatureRelate"  :class="{borderRed:item.verifyRelation|| item.relationNull}"  @click.self="clickItemBox">
                         <el-tooltip :disabled="!item.verifyRelation&&!item.relationNull"  class="item" effect="dark" :content="item.verifyRelation||item.relationNull" placement="top">
                             <el-input class="groupTextarea" 
                                 ref="textarea"
                                 type="textarea"
                                 :autosize="{ minRows: 1}"
-                                :class="{borderRed:item.verifyRelation|| item.relationNull}" 
                                 :title="item.relation" 
                                 v-model.trim="item.relation" 
                                 @input="handleInp(index,$event,'FeatureRelate',item.type)"  
@@ -83,14 +81,13 @@
                         </div>
                         
                     </td>
-                     <td class="FeatureuniqueName inpDisabled">
+                     <td class="FeatureuniqueName inpDisabled"  :class="{borderRed:item.uniqueName===null ||item.verifyUnique}" >
                         <el-tooltip :disabled="!item.verifyUnique"  class="item" effect="dark" :content="item.verifyUnique" placement="top">
                             <el-input class="groupTextarea inpDisabled"  
                                 ref="textarea"
                                 type="textarea"
                                 :readonly = true
                                 :autosize="{ minRows: 1}"
-                                :class="{borderRed:item.uniqueName===null ||item.verifyUnique}" 
                                 :title="item.uniqueName" 
                                 v-model.trim="item.uniqueName" 
                                 >
@@ -98,14 +95,14 @@
                             
                         </el-tooltip> 
                     </td>
-                    <td class="FeatureResult" :class="{inpDisabled:item.type!=3}" @click.self="clickItemBox">
+                    <td class="FeatureResult" :class="{inpDisabled:item.type!=3,borderRed:item.verifyResult,}" @click.self="clickItemBox">
                         <el-tooltip :disabled="!item.verifyResult"  class="item" effect="dark" :content="item.verifyResult" placement="top">
                             <el-input class="groupTextarea"
                                 ref="textarea"
                                 type="textarea"  
                                 :autosize="{ minRows: 1}"
                                 :readonly="item.type!=3"  
-                                :class="{borderRed:item.verifyResult, inpDisabled:item.type!=3}"  
+                                :class="{inpDisabled:item.type!=3}"  
                                 :title="item.midResult" 
                                 v-model.trim="item.midResult" 
                                 @input="handleInp(index,$event,'FeatureResult')"
@@ -315,8 +312,8 @@ export default {
             color: red;
         }
         .borderRed {
-            border: 3px solid red ;
-            box-sizing: border-box;
+            border: 3px solid red !important;
+            box-sizing: border-box !important;
         }
         .colorRed {
             color: red;

+ 3 - 3
src/components/diagBase/DisFormulaItem.vue

@@ -6,7 +6,7 @@
                             <el-option v-for="item in formulaTypeList" :label="item.name" :value="item.key" :key="item.key"></el-option>
                         </el-select>
                     </td>
-                    <td class="FormulaNumber">
+                    <td class="FormulaNumber" :class="{borderRed:item.verifyFormula}">
                         <el-tooltip :disabled="!item.verifyFormula"  class="item" effect="dark" :content="item.verifyFormula" placement="top">
                             <el-input class="groupTextarea"
                                 ref="textarea"
@@ -217,8 +217,8 @@ export default {
             color: red;
         }
         .borderRed {
-            border: 3px solid red ;
-            box-sizing: border-box;
+            border: 3px solid red !important;
+            box-sizing: border-box !important;
         }
         .colorRed {
             color: red;