Commit a15241f5 authored by hubaoshan's avatar hubaoshan

第三步

parent f932ab35
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<div style="width:100%"> <div style="width:100%">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col v-if="!disableInput" :span="10"> <el-col v-if="!disableInput" :span="10">
<div class="tableHear" ><span class="textStyle">输入</span></div> <div class="tableHear"><span class="textStyle">输入</span></div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">1</div> <div class="tableTitle">1</div>
<div class="tableInput"> <div class="tableInput">
...@@ -161,9 +161,10 @@ ...@@ -161,9 +161,10 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input1" ref="input1"
v-model="inspectJbAl2o3List.recode1[0].recordData" v-model="inspectJbAl2o3List.recode1[0].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(1)" @input="handleRecordOneInput(1)"
...@@ -189,9 +190,9 @@ ...@@ -189,9 +190,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input2" ref="input2"
v-model="inspectJbAl2o3List.recode1[1].recordData" v-model="inspectJbAl2o3List.recode1[1].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(1)" @input="handleRecordOneInput(1)"
...@@ -218,11 +219,11 @@ ...@@ -218,11 +219,11 @@
> >
<el-input <el-input
ref="input3" ref="input3"
class="inputStyle"
v-model="inspectJbAl2o3List.recode1[2].recordData" v-model="inspectJbAl2o3List.recode1[2].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
@input="handleRecordOneInput(2)"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(2)"
@keyup.enter.native="handelTab(3,$event)" @keyup.enter.native="handelTab(3,$event)"
/> />
</el-form-item> </el-form-item>
...@@ -246,8 +247,8 @@ ...@@ -246,8 +247,8 @@
> >
<el-input <el-input
ref="input4" ref="input4"
class="inputStyle"
v-model="inspectJbAl2o3List.recode1[3].recordData" v-model="inspectJbAl2o3List.recode1[3].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(2)" @input="handleRecordOneInput(2)"
...@@ -273,9 +274,9 @@ ...@@ -273,9 +274,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input5" ref="input5"
v-model="inspectJbAl2o3List.recode1[4].recordData" v-model="inspectJbAl2o3List.recode1[4].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(3)" @input="handleRecordOneInput(3)"
...@@ -301,9 +302,9 @@ ...@@ -301,9 +302,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input6" ref="input6"
v-model="inspectJbAl2o3List.recode1[5].recordData" v-model="inspectJbAl2o3List.recode1[5].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(3)" @input="handleRecordOneInput(3)"
...@@ -329,9 +330,9 @@ ...@@ -329,9 +330,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input7" ref="input7"
v-model="inspectJbAl2o3List.recode1[6].recordData" v-model="inspectJbAl2o3List.recode1[6].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(4)" @input="handleRecordOneInput(4)"
...@@ -352,8 +353,8 @@ ...@@ -352,8 +353,8 @@
<div class="tableTitle">8</div> <div class="tableTitle">8</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
class="inputStyle"
:ref="'recode1.'+7+'.recordData'" :ref="'recode1.'+7+'.recordData'"
class="inputStyle"
:prop="'recode1.'+7+'.recordData'" :prop="'recode1.'+7+'.recordData'"
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
...@@ -385,9 +386,9 @@ ...@@ -385,9 +386,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input9" ref="input9"
v-model="inspectJbAl2o3List.recode1[8].recordData" v-model="inspectJbAl2o3List.recode1[8].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(5)" @input="handleRecordOneInput(5)"
...@@ -414,8 +415,8 @@ ...@@ -414,8 +415,8 @@
> >
<el-input <el-input
ref="input10" ref="input10"
class="inputStyle"
v-model="inspectJbAl2o3List.recode1[9].recordData" v-model="inspectJbAl2o3List.recode1[9].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(5)" @input="handleRecordOneInput(5)"
...@@ -434,7 +435,7 @@ ...@@ -434,7 +435,7 @@
</div> </div>
</el-col> </el-col>
<el-col v-if="disableInput" :span="10"> <el-col v-if="disableInput" :span="10">
<div class="tableHear" ><span class="textStyle">输入</span></div> <div class="tableHear"><span class="textStyle">输入</span></div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">1</div> <div class="tableTitle">1</div>
<div class="tableInput"> <div class="tableInput">
...@@ -444,9 +445,9 @@ ...@@ -444,9 +445,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input1" ref="input1"
v-model="inspectJbAl2o3List.recode1[0].recordData" v-model="inspectJbAl2o3List.recode1[0].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(1)" @input="handleRecordOneInput(1)"
...@@ -472,9 +473,9 @@ ...@@ -472,9 +473,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input2" ref="input2"
v-model="inspectJbAl2o3List.recode1[1].recordData" v-model="inspectJbAl2o3List.recode1[1].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(1)" @input="handleRecordOneInput(1)"
...@@ -501,11 +502,11 @@ ...@@ -501,11 +502,11 @@
> >
<el-input <el-input
ref="input3" ref="input3"
class="inputStyle"
v-model="inspectJbAl2o3List.recode1[2].recordData" v-model="inspectJbAl2o3List.recode1[2].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
@input="handleRecordOneInput(1)"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(1)"
@keyup.enter.native="handelTab(3,$event)" @keyup.enter.native="handelTab(3,$event)"
/> />
</el-form-item> </el-form-item>
...@@ -529,8 +530,8 @@ ...@@ -529,8 +530,8 @@
> >
<el-input <el-input
ref="input4" ref="input4"
class="inputStyle"
v-model="inspectJbAl2o3List.recode1[3].recordData" v-model="inspectJbAl2o3List.recode1[3].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(2)" @input="handleRecordOneInput(2)"
...@@ -556,9 +557,9 @@ ...@@ -556,9 +557,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input5" ref="input5"
v-model="inspectJbAl2o3List.recode1[4].recordData" v-model="inspectJbAl2o3List.recode1[4].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(2)" @input="handleRecordOneInput(2)"
...@@ -584,9 +585,9 @@ ...@@ -584,9 +585,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input6" ref="input6"
v-model="inspectJbAl2o3List.recode1[5].recordData" v-model="inspectJbAl2o3List.recode1[5].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(2)" @input="handleRecordOneInput(2)"
...@@ -612,9 +613,9 @@ ...@@ -612,9 +613,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input7" ref="input7"
v-model="inspectJbAl2o3List.recode1[6].recordData" v-model="inspectJbAl2o3List.recode1[6].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(3)" @input="handleRecordOneInput(3)"
...@@ -635,8 +636,8 @@ ...@@ -635,8 +636,8 @@
<div class="tableTitle">8</div> <div class="tableTitle">8</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
class="inputStyle"
:ref="'recode1.'+7+'.recordData'" :ref="'recode1.'+7+'.recordData'"
class="inputStyle"
:prop="'recode1.'+7+'.recordData'" :prop="'recode1.'+7+'.recordData'"
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
...@@ -668,9 +669,9 @@ ...@@ -668,9 +669,9 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]" :rules="[{required: true, validator: numType, trigger: 'blur'}]"
> >
<el-input <el-input
class="inputStyle"
ref="input9" ref="input9"
v-model="inspectJbAl2o3List.recode1[8].recordData" v-model="inspectJbAl2o3List.recode1[8].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(3)" @input="handleRecordOneInput(3)"
...@@ -697,8 +698,8 @@ ...@@ -697,8 +698,8 @@
> >
<el-input <el-input
ref="input10" ref="input10"
class="inputStyle"
v-model="inspectJbAl2o3List.recode1[9].recordData" v-model="inspectJbAl2o3List.recode1[9].recordData"
class="inputStyle"
:maxlength="IRMAXLENGTHONE" :maxlength="IRMAXLENGTHONE"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordOneInput(4)" @input="handleRecordOneInput(4)"
...@@ -715,7 +716,7 @@ ...@@ -715,7 +716,7 @@
/> />
</div> </div>
</div> </div>
<div class="tableContainer" > <div class="tableContainer">
<div class="tableTitle" style="margin-left: -12px">11</div> <div class="tableTitle" style="margin-left: -12px">11</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
...@@ -769,7 +770,7 @@ ...@@ -769,7 +770,7 @@
/> />
</div> </div>
</div> </div>
<div class="tableContainer" > <div class="tableContainer">
<div class="tableTitle" style="margin-left: -12px">13</div> <div class="tableTitle" style="margin-left: -12px">13</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
...@@ -796,7 +797,7 @@ ...@@ -796,7 +797,7 @@
/> />
</div> </div>
</div> </div>
<div class="tableContainer" > <div class="tableContainer">
<div class="tableTitle" style="margin-left: -12px">14</div> <div class="tableTitle" style="margin-left: -12px">14</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
...@@ -823,7 +824,7 @@ ...@@ -823,7 +824,7 @@
/> />
</div> </div>
</div> </div>
<div class="tableContainer" > <div class="tableContainer">
<div class="tableTitle" style="margin-left: -12px">15</div> <div class="tableTitle" style="margin-left: -12px">15</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
...@@ -891,11 +892,11 @@ ...@@ -891,11 +892,11 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="tableHear"><span class="textStyle">判定结果</span></div> <div class="tableHear"><span class="textStyle">判定结果</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordOneFirstResult[0].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[0].value }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordOneFirstResult[1].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[1].value }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordOneFirstResult[2].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[2].value }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordOneFirstResult[3].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[3].value }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordOneFirstResult[4].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[4].value }}</span></div>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="tableHear"><span class="textStyle">平均</span></div> <div class="tableHear"><span class="textStyle">平均</span></div>
...@@ -937,11 +938,11 @@ ...@@ -937,11 +938,11 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="tableHear"><span class="textStyle">判定结果</span></div> <div class="tableHear"><span class="textStyle">判定结果</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordsecondResult[0].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[0].value }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordsecondResult[1].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[1].value }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordsecondResult[2].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[2].value }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordsecondResult[3].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[3].value }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{oneRecordsecondResult[4].value}}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[4].value }}</span></div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -1011,9 +1012,9 @@ ...@@ -1011,9 +1012,9 @@
<div style="width:100%"> <div style="width:100%">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="10"> <el-col :span="10">
<div class="tableHear" ><span class="textStyle">输入</span></div> <div class="tableHear"><span class="textStyle">输入</span></div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 16:11}}</div> <div class="tableTitle">{{ disableInput? 16:11 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+0+'.recordData'" :ref="'recode2.'+0+'.recordData'"
...@@ -1022,10 +1023,10 @@ ...@@ -1022,10 +1023,10 @@
> >
<el-input <el-input
ref="input16" ref="input16"
@input="handleRecordTwoInput(1)"
v-model="inspectJbAl2o3List.recode2[0].recordData" v-model="inspectJbAl2o3List.recode2[0].recordData"
:maxlength="IRMAXLENGTHTWO" :maxlength="IRMAXLENGTHTWO"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordTwoInput(1)"
@keyup.enter.native="handelTab(16,$event)" @keyup.enter.native="handelTab(16,$event)"
/> />
</el-form-item> </el-form-item>
...@@ -1040,7 +1041,7 @@ ...@@ -1040,7 +1041,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 17:12}}</div> <div class="tableTitle">{{ disableInput? 17:12 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+1+'.recordData'" :ref="'recode2.'+1+'.recordData'"
...@@ -1067,7 +1068,7 @@ ...@@ -1067,7 +1068,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 18:13}}</div> <div class="tableTitle">{{ disableInput? 18:13 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+2+'.recordData'" :ref="'recode2.'+2+'.recordData'"
...@@ -1076,10 +1077,10 @@ ...@@ -1076,10 +1077,10 @@
> >
<el-input <el-input
ref="input18" ref="input18"
@input="handleRecordTwoInput(2)"
v-model="inspectJbAl2o3List.recode2[2].recordData" v-model="inspectJbAl2o3List.recode2[2].recordData"
:maxlength="IRMAXLENGTHTWO" :maxlength="IRMAXLENGTHTWO"
:disabled="firstFromDisabled" :disabled="firstFromDisabled"
@input="handleRecordTwoInput(2)"
@keyup.enter.native="handelTab(18,$event)" @keyup.enter.native="handelTab(18,$event)"
/> />
</el-form-item> </el-form-item>
...@@ -1094,7 +1095,7 @@ ...@@ -1094,7 +1095,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 19:14}}</div> <div class="tableTitle">{{ disableInput? 19:14 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+3+'.recordData'" :ref="'recode2.'+3+'.recordData'"
...@@ -1121,7 +1122,7 @@ ...@@ -1121,7 +1122,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 20:15}}</div> <div class="tableTitle">{{ disableInput? 20:15 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+4+'.recordData'" :ref="'recode2.'+4+'.recordData'"
...@@ -1148,7 +1149,7 @@ ...@@ -1148,7 +1149,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 21:16}}</div> <div class="tableTitle">{{ disableInput? 21:16 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+5+'.recordData'" :ref="'recode2.'+5+'.recordData'"
...@@ -1175,7 +1176,7 @@ ...@@ -1175,7 +1176,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 22:17}}</div> <div class="tableTitle">{{ disableInput? 22:17 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+6+'.recordData'" :ref="'recode2.'+6+'.recordData'"
...@@ -1202,7 +1203,7 @@ ...@@ -1202,7 +1203,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 23:18}}</div> <div class="tableTitle">{{ disableInput? 23:18 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+7+'.recordData'" :ref="'recode2.'+7+'.recordData'"
...@@ -1229,7 +1230,7 @@ ...@@ -1229,7 +1230,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{disableInput? 24:19}}</div> <div class="tableTitle">{{ disableInput? 24:19 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+8+'.recordData'" :ref="'recode2.'+8+'.recordData'"
...@@ -1256,7 +1257,7 @@ ...@@ -1256,7 +1257,7 @@
</div> </div>
</div> </div>
<div class="tableContainer" style="margin-bottom: 40px"> <div class="tableContainer" style="margin-bottom: 40px">
<div class="tableTitle">{{disableInput? 25:20}}</div> <div class="tableTitle">{{ disableInput? 25:20 }}</div>
<div class="tableInput"> <div class="tableInput">
<div class="recordData"> <div class="recordData">
<el-form-item <el-form-item
...@@ -1325,11 +1326,11 @@ ...@@ -1325,11 +1326,11 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="tableHear"><span class="textStyle">判定结果</span></div> <div class="tableHear"><span class="textStyle">判定结果</span></div>
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordOneFirstResult[0].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordOneFirstResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[0].value }}</span></div>
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordOneFirstResult[1].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordOneFirstResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[1].value }}</span></div>
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordOneFirstResult[2].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordOneFirstResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[2].value }}</span></div>
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordOneFirstResult[3].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordOneFirstResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[3].value }}</span></div>
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordOneFirstResult[4].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordOneFirstResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[4].value }}</span></div>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="tableHear"><span class="textStyle">平均</span></div> <div class="tableHear"><span class="textStyle">平均</span></div>
...@@ -1371,11 +1372,11 @@ ...@@ -1371,11 +1372,11 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="tableHear"><span class="textStyle">判定结果</span></div> <div class="tableHear"><span class="textStyle">判定结果</span></div>
<div class="otherTableContainer"><span :class="twoRecordsecondResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordsecondResult[0].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordsecondResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[0].value }}</span></div>
<div class="otherTableContainer"><span :class="twoRecordsecondResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordsecondResult[1].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordsecondResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[1].value }}</span></div>
<div class="otherTableContainer"><span :class="twoRecordsecondResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordsecondResult[2].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordsecondResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[2].value }}</span></div>
<div class="otherTableContainer"><span :class="twoRecordsecondResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordsecondResult[3].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordsecondResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[3].value }}</span></div>
<div class="otherTableContainer"><span :class="twoRecordsecondResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{twoRecordsecondResult[4].value}}</span></div> <div class="otherTableContainer"><span :class="twoRecordsecondResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[4].value }}</span></div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -2321,7 +2322,7 @@ ...@@ -2321,7 +2322,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="标签四" name="fourthly"> <el-tab-pane label="标签四" name="fourthly">
<div class="fourTarContainer" style="height: 1100px"> <div class="fourTarContainer" style="height: 1100px">
<tagfour @ShowTabel="getIsShowTabel" :default-index="inspectJbAl2o3List.sheetIndex" :default-controls="controlsForm.approveStatus" :default-object="tabfourForm" @sheetIndex="handleSheetIndex" @tarFrom="handleTarForm"></tagfour> <tagfour :default-index="inspectJbAl2o3List.sheetIndex" :default-controls="controlsForm.approveStatus" :default-object="tabfourForm" @ShowTabel="getIsShowTabel" @sheetIndex="handleSheetIndex" @tarFrom="handleTarForm" />
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -2487,11 +2488,11 @@ import { parseTime } from '@/utils' ...@@ -2487,11 +2488,11 @@ import { parseTime } from '@/utils'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import { downLoadFile } from '@/utils/checkList' import { downLoadFile } from '@/utils/checkList'
import TextToolTip from '@/components/TextToolTip' import TextToolTip from '@/components/TextToolTip'
import tagfour from "@/views/template/components/tagfour"; import tagfour from '@/views/template/components/tagfour'
export default { export default {
name: 'TemplateFirst', name: 'TemplateFirst',
components: { TextToolTip ,tagfour }, components: { TextToolTip, tagfour },
data() { data() {
return { return {
...@@ -2508,49 +2509,49 @@ export default { ...@@ -2508,49 +2509,49 @@ export default {
projectDList: [] projectDList: []
}, },
// 十个的下坐标分组 // 十个的下坐标分组
tenGroup:[ tenGroup: [
{ {
number: 1, number: 1,
indexList:[0,1] indexList: [0, 1]
}, },
{ {
number: 2, number: 2,
indexList:[2,3] indexList: [2, 3]
}, },
{ {
number: 3, number: 3,
indexList:[4,5] indexList: [4, 5]
}, },
{ {
number: 4, number: 4,
indexList:[6,7] indexList: [6, 7]
}, },
{ {
number: 5, number: 5,
indexList:[8,9] indexList: [8, 9]
} }
], ],
// 十五个的下坐标分组 // 十五个的下坐标分组
fifteenGroup: [ fifteenGroup: [
{ {
number: 1, number: 1,
indexList:[0,1,2] indexList: [0, 1, 2]
}, },
{ {
number: 2, number: 2,
indexList:[3,4,5] indexList: [3, 4, 5]
}, },
{ {
number: 3, number: 3,
indexList:[6,7,8] indexList: [6, 7, 8]
}, },
{ {
number: 4, number: 4,
indexList:[9,10,11] indexList: [9, 10, 11]
}, },
{ {
number: 5, number: 5,
indexList:[12,13,14] indexList: [12, 13, 14]
} }
], ],
// 标签一的检查二的差异 // 标签一的检查二的差异
...@@ -2955,7 +2956,7 @@ export default { ...@@ -2955,7 +2956,7 @@ export default {
projecta: null, projecta: null,
projectb: null, projectb: null,
projectc: null, projectc: null,
projectd: null, projectd: null
}, },
// 检查记录1 // 检查记录1
recode1: [], recode1: [],
...@@ -3100,6 +3101,16 @@ export default { ...@@ -3100,6 +3101,16 @@ export default {
} }
}, },
watch: {
'inspectInfoList.jcCj': {
handler(newValue, oldValue) {
if (((oldValue === '1' || oldValue === '2') && newValue === '3') || oldValue === '3') {
// 切换类型需要清空检查一的列表数据
this.resetRecordOne()
}
}
}
},
created() { created() {
this.resetRecord() this.resetRecord()
this.judgmentParam() this.judgmentParam()
...@@ -3109,7 +3120,7 @@ export default { ...@@ -3109,7 +3120,7 @@ export default {
methods: { methods: {
// 处理标签四 第一个表格的返回的数据 // 处理标签四 第一个表格的返回的数据
handleFirstTableData(str) { handleFirstTableData(str) {
console.log('str',str) console.log('str', str)
var firstStr = '' var firstStr = ''
var firstList = [] var firstList = []
var secondStr = '' var secondStr = ''
...@@ -3119,7 +3130,7 @@ export default { ...@@ -3119,7 +3130,7 @@ export default {
var threeStr = '' var threeStr = ''
var threeList = [] var threeList = []
var finallyList = [] var finallyList = []
let list = str.split(';') const list = str.split(';')
firstStr = list[0] firstStr = list[0]
secondStr = list[1] secondStr = list[1]
threeStr = list[2] threeStr = list[2]
...@@ -3150,10 +3161,10 @@ export default { ...@@ -3150,10 +3161,10 @@ export default {
for (let i = 2; i <= 10; i++) { for (let i = 2; i <= 10; i++) {
secondList.push(list[i]) secondList.push(list[i])
} }
for (let i = 11; i <=16 ; i++) { for (let i = 11; i <= 16; i++) {
thirdList.push(list[i]) thirdList.push(list[i])
} }
const str = firstList.join(',') + ";" + secondList.join(",") + ";" + thirdList.join(',') const str = firstList.join(',') + ';' + secondList.join(',') + ';' + thirdList.join(',')
return str return str
} else { } else {
return null return null
...@@ -3164,19 +3175,19 @@ export default { ...@@ -3164,19 +3175,19 @@ export default {
var firstList = [] var firstList = []
var secondList = [] var secondList = []
var thirdList = [] var thirdList = []
console.log('list',list) console.log('list', list)
if (list && list.length > 0) { if (list && list.length > 0) {
// 处理各部分的值 // 处理各部分的值
for (let i = 0; i <= 0 ; i++) { for (let i = 0; i <= 0; i++) {
firstList.push(list[i]) firstList.push(list[i])
} }
for (let i = 1; i <= 1 ; i++) { for (let i = 1; i <= 1; i++) {
secondList.push(list[i]) secondList.push(list[i])
} }
for (let i = 2; i <= 2 ; i++) { for (let i = 2; i <= 2; i++) {
thirdList.push(list[i]) thirdList.push(list[i])
} }
const str = firstList.join(',') + ";" + secondList.join(',') + ";"+thirdList.join(',') const str = firstList.join(',') + ';' + secondList.join(',') + ';' + thirdList.join(',')
return str return str
} else { } else {
return null return null
...@@ -3187,7 +3198,7 @@ export default { ...@@ -3187,7 +3198,7 @@ export default {
this.inspectJbAl2o3List.sheetIndex = value this.inspectJbAl2o3List.sheetIndex = value
}, },
getIsShowTabel(value) { getIsShowTabel(value) {
console.log('value11',value) console.log('value11', value)
this.inspectJbAl2o3List.isShowTabel = value this.inspectJbAl2o3List.isShowTabel = value
}, },
// 获取数据 // 获取数据
...@@ -3218,7 +3229,7 @@ export default { ...@@ -3218,7 +3229,7 @@ export default {
}, },
{ {
// 记录数据 // 记录数据
recordData: '', recordData: ''
}, },
{ {
// 记录数据 // 记录数据
...@@ -3226,7 +3237,7 @@ export default { ...@@ -3226,7 +3237,7 @@ export default {
}, },
{ {
// 记录数据 // 记录数据
recordData: '', recordData: ''
}, },
{ {
// 记录数据 // 记录数据
...@@ -3238,7 +3249,7 @@ export default { ...@@ -3238,7 +3249,7 @@ export default {
}, },
{ {
// 记录数据 // 记录数据
recordData: '', recordData: ''
}, },
{ {
// 记录数据 // 记录数据
...@@ -3476,16 +3487,16 @@ export default { ...@@ -3476,16 +3487,16 @@ export default {
] ]
}, },
handleCompareBlur() { handleCompareBlur() {
if (this.inspectJbAl2o3List.standonePx && this.inspectJbAl2o3List.standonePx !== '' ) { if (this.inspectJbAl2o3List.standonePx && this.inspectJbAl2o3List.standonePx !== '') {
this.inspectJbAl2o3List.standonePx = this.reserve(this.inspectJbAl2o3List.standonePx) this.inspectJbAl2o3List.standonePx = this.reserve(this.inspectJbAl2o3List.standonePx)
} }
if (this.inspectJbAl2o3List.standtwoPx && this.inspectJbAl2o3List.standtwoPx ) { if (this.inspectJbAl2o3List.standtwoPx && this.inspectJbAl2o3List.standtwoPx) {
this.inspectJbAl2o3List.standtwoPx = this.reserve(this.inspectJbAl2o3List.standtwoPx) this.inspectJbAl2o3List.standtwoPx = this.reserve(this.inspectJbAl2o3List.standtwoPx)
} }
}, },
// 当px发生变化 // 当px发生变化
handleCompare() { handleCompare() {
for (var i= 1; i<6 ;i++) { for (var i = 1; i < 6; i++) {
this.handleRecordOneInput(i) this.handleRecordOneInput(i)
} }
}, },
...@@ -3699,27 +3710,27 @@ export default { ...@@ -3699,27 +3710,27 @@ export default {
} }
}, },
/** 清空表格里的数据*/ /** 清空表格里的数据*/
clearForm(index,number) { clearForm(index, number) {
this.inspectJbAl2o3List.recode1[index].recordData = '' this.inspectJbAl2o3List.recode1[index].recordData = ''
this.handleRecordOneInput(number) this.handleRecordOneInput(number)
}, },
// 十个输入框合格范围 // 十个输入框合格范围
standardRadius(x,y,r) { standardRadius(x, y, r) {
let obj = { const obj = {
min: null, min: null,
max: null max: null
} }
const a = parseFloat(x) const a = parseFloat(x)
const b = parseFloat(y) const b = parseFloat(y)
const c = parseFloat(r) const c = parseFloat(r)
obj.min = this.digitalFormat((a-c).toFixed(this.LIMITNGHOURS)) obj.min = this.digitalFormat((a - c).toFixed(this.LIMITNGHOURS))
obj.max = this.digitalFormat((b+c).toFixed(this.LIMITNGHOURS)) obj.max = this.digitalFormat((b + c).toFixed(this.LIMITNGHOURS))
return obj return obj
}, },
// 十个输入框的第二在的合格范围 // 十个输入框的第二在的合格范围
standardRecordRadius(z) { standardRecordRadius(z) {
let obj = { const obj = {
num:null num: null
} }
const a = parseFloat(z) const a = parseFloat(z)
obj.num = this.digitalFormat((a).toFixed(this.LIMITNGHOURS)) obj.num = this.digitalFormat((a).toFixed(this.LIMITNGHOURS))
...@@ -3732,51 +3743,51 @@ export default { ...@@ -3732,51 +3743,51 @@ export default {
const firstIndex = indexList[0] const firstIndex = indexList[0]
const secondIndex = indexList[1] const secondIndex = indexList[1]
// 进行计算 // 进行计算
if(this.inspectJbAl2o3List.recode2[firstIndex].recordData && this.inspectJbAl2o3List.recode2[firstIndex].recordData !== '' && this.inspectJbAl2o3List.recode2[secondIndex].recordData && this.inspectJbAl2o3List.recode2[secondIndex].recordData !== ''){ if (this.inspectJbAl2o3List.recode2[firstIndex].recordData && this.inspectJbAl2o3List.recode2[firstIndex].recordData !== '' && this.inspectJbAl2o3List.recode2[secondIndex].recordData && this.inspectJbAl2o3List.recode2[secondIndex].recordData !== '') {
const num1 = parseFloat(this.inspectJbAl2o3List.recode2[firstIndex].recordData) const num1 = parseFloat(this.inspectJbAl2o3List.recode2[firstIndex].recordData)
const num2 = parseFloat(this.inspectJbAl2o3List.recode2[secondIndex].recordData) const num2 = parseFloat(this.inspectJbAl2o3List.recode2[secondIndex].recordData)
const discrepancy = this.digitalFormat(((num1 + num2) / 2).toFixed(this.LIMITNGHOURS)) const discrepancy = this.digitalFormat(((num1 + num2) / 2).toFixed(this.LIMITNGHOURS))
this.discrepancyRecordTwoList[number-1].value = discrepancy this.discrepancyRecordTwoList[number - 1].value = discrepancy
const avge = this.digitalFormat(Math.abs(num1 - num2).toFixed(this.LIMITNGHOURS)) const avge = this.digitalFormat(Math.abs(num1 - num2).toFixed(this.LIMITNGHOURS))
this.averageRecordTwo[number-1].value = avge this.averageRecordTwo[number - 1].value = avge
// 计算第一个判定结果 // 计算第一个判定结果
if (this.inspectJbAl2o3List.standardTwo && this.inspectJbAl2o3List.standardTwo!== '' && this.inspectJbAl2o3List.standtwoPlus && this.inspectJbAl2o3List.standtwoPlus !== '' && this.inspectJbAl2o3List.standtwoCy && this.inspectJbAl2o3List.standtwoCy !== '') { if (this.inspectJbAl2o3List.standardTwo && this.inspectJbAl2o3List.standardTwo !== '' && this.inspectJbAl2o3List.standtwoPlus && this.inspectJbAl2o3List.standtwoPlus !== '' && this.inspectJbAl2o3List.standtwoCy && this.inspectJbAl2o3List.standtwoCy !== '') {
const {min,max} = this.standardRadius(this.inspectJbAl2o3List.standardTwo,this.inspectJbAl2o3List.standtwoPlus,this.inspectJbAl2o3List.standtwoCy) const { min, max } = this.standardRadius(this.inspectJbAl2o3List.standardTwo, this.inspectJbAl2o3List.standtwoPlus, this.inspectJbAl2o3List.standtwoCy)
if (min !== null && max !== null && discrepancy && discrepancy !== '') { if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min); const floatMin = parseFloat(min)
const floatMax = parseFloat(max); const floatMax = parseFloat(max)
if (discrepancy >= floatMin && discrepancy <=floatMax) { if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.twoRecordOneFirstResult[number-1].value = '合格' this.twoRecordOneFirstResult[number - 1].value = '合格'
} else { } else {
this.twoRecordOneFirstResult[number-1].value = '不合格' this.twoRecordOneFirstResult[number - 1].value = '不合格'
} }
} else { } else {
this.twoRecordOneFirstResult[number-1].value = '' this.twoRecordOneFirstResult[number - 1].value = ''
} }
} else { } else {
this.twoRecordOneFirstResult[number-1].value = '' this.twoRecordOneFirstResult[number - 1].value = ''
} }
// 第二哥判断结果 // 第二哥判断结果
if (this.inspectJbAl2o3List.standtwoPx && this.inspectJbAl2o3List.standtwoPx !== '') { if (this.inspectJbAl2o3List.standtwoPx && this.inspectJbAl2o3List.standtwoPx !== '') {
const {num} =this.standardRecordRadius(this.inspectJbAl2o3List.standtwoPx) const { num } = this.standardRecordRadius(this.inspectJbAl2o3List.standtwoPx)
if (num != null) { if (num != null) {
const floatNum = parseFloat(num); const floatNum = parseFloat(num)
if (avge <= floatNum ) { if (avge <= floatNum) {
this.twoRecordsecondResult[number-1].value = '合格' this.twoRecordsecondResult[number - 1].value = '合格'
} else { } else {
this.twoRecordsecondResult[number-1].value = '不合格' this.twoRecordsecondResult[number - 1].value = '不合格'
} }
} else { } else {
this.twoRecordsecondResult[number-1].value = '' this.twoRecordsecondResult[number - 1].value = ''
} }
} else { } else {
this.twoRecordsecondResult[number-1].value = '' this.twoRecordsecondResult[number - 1].value = ''
} }
} else { } else {
this.discrepancyRecordTwoList[number-1].value = '' this.discrepancyRecordTwoList[number - 1].value = ''
this.averageRecordTwo[number-1].value = '' this.averageRecordTwo[number - 1].value = ''
this.twoRecordOneFirstResult[number-1].value = '' this.twoRecordOneFirstResult[number - 1].value = ''
this.twoRecordsecondResult[number-1].value = '' this.twoRecordsecondResult[number - 1].value = ''
} }
} }
}, },
...@@ -3801,27 +3812,27 @@ export default { ...@@ -3801,27 +3812,27 @@ export default {
if (this.inspectJbAl2o3List.recode1[thirdIndex].recordData && this.inspectJbAl2o3List.recode1[thirdIndex].recordData !== '') { if (this.inspectJbAl2o3List.recode1[thirdIndex].recordData && this.inspectJbAl2o3List.recode1[thirdIndex].recordData !== '') {
const num = parseFloat(this.inspectJbAl2o3List.recode1[thirdIndex].recordData) const num = parseFloat(this.inspectJbAl2o3List.recode1[thirdIndex].recordData)
const discrepancy = this.digitalFormat((num).toFixed(this.LIMITNGHOURS)) const discrepancy = this.digitalFormat((num).toFixed(this.LIMITNGHOURS))
this.discrepancyRecordOneList[number-1].value = discrepancy this.discrepancyRecordOneList[number - 1].value = discrepancy
if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standoneCy && this.inspectJbAl2o3List.standoneCy !== '') { if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standoneCy && this.inspectJbAl2o3List.standoneCy !== '') {
// 获取两个最值 // 获取两个最值
const {min,max} = this.standardRadius(this.inspectJbAl2o3List.standardOne,this.inspectJbAl2o3List.standonePlus,this.inspectJbAl2o3List.standoneCy) const { min, max } = this.standardRadius(this.inspectJbAl2o3List.standardOne, this.inspectJbAl2o3List.standonePlus, this.inspectJbAl2o3List.standoneCy)
if (min !== null && max !== null && discrepancy && discrepancy !== '') { if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min); const floatMin = parseFloat(min)
const floatMax = parseFloat(max); const floatMax = parseFloat(max)
if (discrepancy >= floatMin && discrepancy <=floatMax) { if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[number -1].value = '合格' this.oneRecordOneFirstResult[number - 1].value = '合格'
} else { } else {
this.oneRecordOneFirstResult[number -1].value = '不合格' this.oneRecordOneFirstResult[number - 1].value = '不合格'
} }
} else { } else {
this.oneRecordOneFirstResult[number -1].value = '' this.oneRecordOneFirstResult[number - 1].value = ''
} }
} else { } else {
this.oneRecordOneFirstResult[number -1].value = '' this.oneRecordOneFirstResult[number - 1].value = ''
} }
}else { } else {
this.discrepancyRecordOneList[number-1].value = '' this.discrepancyRecordOneList[number - 1].value = ''
this.oneRecordOneFirstResult[number-1].value = '' this.oneRecordOneFirstResult[number - 1].value = ''
} }
// 计算平均值和对应的判定结果 // 计算平均值和对应的判定结果
if (this.inspectJbAl2o3List.recode1[firstIndex].recordData && this.inspectJbAl2o3List.recode1[firstIndex].recordData !== '' && this.inspectJbAl2o3List.recode1[secondIndex].recordData && this.inspectJbAl2o3List.recode1[secondIndex].recordData !== '') { if (this.inspectJbAl2o3List.recode1[firstIndex].recordData && this.inspectJbAl2o3List.recode1[firstIndex].recordData !== '' && this.inspectJbAl2o3List.recode1[secondIndex].recordData && this.inspectJbAl2o3List.recode1[secondIndex].recordData !== '') {
...@@ -3829,25 +3840,25 @@ export default { ...@@ -3829,25 +3840,25 @@ export default {
const num2 = parseFloat(this.inspectJbAl2o3List.recode1[secondIndex].recordData) const num2 = parseFloat(this.inspectJbAl2o3List.recode1[secondIndex].recordData)
// 平均值 // 平均值
const avge = this.digitalFormat(Math.abs(num1 - num2).toFixed(this.LIMITNGHOURS)) const avge = this.digitalFormat(Math.abs(num1 - num2).toFixed(this.LIMITNGHOURS))
this.averageRecordOne[number-1].value = avge this.averageRecordOne[number - 1].value = avge
if (this.inspectJbAl2o3List.standonePx && this.inspectJbAl2o3List.standonePx !== '') { if (this.inspectJbAl2o3List.standonePx && this.inspectJbAl2o3List.standonePx !== '') {
const {num} =this.standardRecordRadius(this.inspectJbAl2o3List.standonePx) const { num } = this.standardRecordRadius(this.inspectJbAl2o3List.standonePx)
if (num != null) { if (num != null) {
const floatNum = parseFloat(num); const floatNum = parseFloat(num)
if (avge <= floatNum) { if (avge <= floatNum) {
this.oneRecordsecondResult[number-1].value = '合格' this.oneRecordsecondResult[number - 1].value = '合格'
} else { } else {
this.oneRecordsecondResult[number-1].value = '不合格' this.oneRecordsecondResult[number - 1].value = '不合格'
} }
} else { } else {
this.oneRecordsecondResult[number-1].value = '' this.oneRecordsecondResult[number - 1].value = ''
} }
} else { } else {
this.oneRecordsecondResult[number-1].value = '' this.oneRecordsecondResult[number - 1].value = ''
} }
} else { } else {
this.averageRecordOne[number-1].value = '' this.averageRecordOne[number - 1].value = ''
this.oneRecordsecondResult[number-1].value = '' this.oneRecordsecondResult[number - 1].value = ''
} }
} }
}, },
...@@ -3859,56 +3870,56 @@ export default { ...@@ -3859,56 +3870,56 @@ export default {
const firstIndex = indexList[0] const firstIndex = indexList[0]
const secondIndex = indexList[1] const secondIndex = indexList[1]
// 进行计算 // 进行计算
if(this.inspectJbAl2o3List.recode1[firstIndex].recordData && this.inspectJbAl2o3List.recode1[firstIndex].recordData !== '' && this.inspectJbAl2o3List.recode1[secondIndex].recordData && this.inspectJbAl2o3List.recode1[secondIndex].recordData !== ''){ if (this.inspectJbAl2o3List.recode1[firstIndex].recordData && this.inspectJbAl2o3List.recode1[firstIndex].recordData !== '' && this.inspectJbAl2o3List.recode1[secondIndex].recordData && this.inspectJbAl2o3List.recode1[secondIndex].recordData !== '') {
const num1 = parseFloat(this.inspectJbAl2o3List.recode1[firstIndex].recordData) const num1 = parseFloat(this.inspectJbAl2o3List.recode1[firstIndex].recordData)
const num2 = parseFloat(this.inspectJbAl2o3List.recode1[secondIndex].recordData) const num2 = parseFloat(this.inspectJbAl2o3List.recode1[secondIndex].recordData)
const discrepancy = this.digitalFormat(((num1 + num2) / 2).toFixed(this.LIMITNGHOURS)) const discrepancy = this.digitalFormat(((num1 + num2) / 2).toFixed(this.LIMITNGHOURS))
this.discrepancyRecordOneList[number-1].value = discrepancy this.discrepancyRecordOneList[number - 1].value = discrepancy
const avge = this.digitalFormat(Math.abs(num1 - num2).toFixed(this.LIMITNGHOURS)) const avge = this.digitalFormat(Math.abs(num1 - num2).toFixed(this.LIMITNGHOURS))
this.averageRecordOne[number-1].value = avge this.averageRecordOne[number - 1].value = avge
// 计算第一个判定结果 // 计算第一个判定结果
if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne!== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus !== '' && this.inspectJbAl2o3List.standoneCy && this.inspectJbAl2o3List.standoneCy !== '') { if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus !== '' && this.inspectJbAl2o3List.standoneCy && this.inspectJbAl2o3List.standoneCy !== '') {
const {min,max} = this.standardRadius(this.inspectJbAl2o3List.standardOne,this.inspectJbAl2o3List.standonePlus,this.inspectJbAl2o3List.standoneCy) const { min, max } = this.standardRadius(this.inspectJbAl2o3List.standardOne, this.inspectJbAl2o3List.standonePlus, this.inspectJbAl2o3List.standoneCy)
if (min !== null && max !== null && discrepancy && discrepancy !== '') { if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min); const floatMin = parseFloat(min)
const floatMax = parseFloat(max); const floatMax = parseFloat(max)
if (discrepancy >= floatMin && discrepancy <=floatMax) { if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[number-1].value = '合格' this.oneRecordOneFirstResult[number - 1].value = '合格'
} else { } else {
this.oneRecordOneFirstResult[number-1].value = '不合格' this.oneRecordOneFirstResult[number - 1].value = '不合格'
} }
} else { } else {
this.oneRecordOneFirstResult[number-1].value = '' this.oneRecordOneFirstResult[number - 1].value = ''
} }
} else { } else {
this.oneRecordOneFirstResult[number-1].value = '' this.oneRecordOneFirstResult[number - 1].value = ''
} }
// 第二哥判断结果 // 第二哥判断结果
if (this.inspectJbAl2o3List.standonePx && this.inspectJbAl2o3List.standonePx !== '') { if (this.inspectJbAl2o3List.standonePx && this.inspectJbAl2o3List.standonePx !== '') {
const {num} =this.standardRecordRadius(this.inspectJbAl2o3List.standonePx) const { num } = this.standardRecordRadius(this.inspectJbAl2o3List.standonePx)
if (num != null) { if (num != null) {
const floatNum = parseFloat(num); const floatNum = parseFloat(num)
if (avge <= floatNum ) { if (avge <= floatNum) {
this.oneRecordsecondResult[number-1].value = '合格' this.oneRecordsecondResult[number - 1].value = '合格'
} else { } else {
this.oneRecordsecondResult[number-1].value = '不合格' this.oneRecordsecondResult[number - 1].value = '不合格'
} }
} else { } else {
this.oneRecordsecondResult[number-1].value = '' this.oneRecordsecondResult[number - 1].value = ''
} }
} else { } else {
this.oneRecordsecondResult[number-1].value = '' this.oneRecordsecondResult[number - 1].value = ''
} }
} else { } else {
this.discrepancyRecordOneList[number-1].value = '' this.discrepancyRecordOneList[number - 1].value = ''
this.averageRecordOne[number-1].value = '' this.averageRecordOne[number - 1].value = ''
this.oneRecordOneFirstResult[number-1].value = '' this.oneRecordOneFirstResult[number - 1].value = ''
this.oneRecordsecondResult[number-1].value = '' this.oneRecordsecondResult[number - 1].value = ''
} }
} }
}, },
clearInspectionFormTwo(index,number) { clearInspectionFormTwo(index, number) {
this.inspectJbAl2o3List.recode2[index].recordData = '' this.inspectJbAl2o3List.recode2[index].recordData = ''
this.handleRecordTwoInput(number) this.handleRecordTwoInput(number)
}, },
...@@ -4048,7 +4059,7 @@ export default { ...@@ -4048,7 +4059,7 @@ export default {
}, },
// 计算标签一的校验标准1 和 检验标准2 之间的差值 // 计算标签一的校验标准1 和 检验标准2 之间的差值
getCalculateDifference() { getCalculateDifference() {
for (var i= 1; i<6 ;i++) { for (var i = 1; i < 6; i++) {
this.handleRecordOneInput(i) this.handleRecordOneInput(i)
} }
}, },
...@@ -4087,7 +4098,7 @@ export default { ...@@ -4087,7 +4098,7 @@ export default {
let s = '0' let s = '0'
// 将 value 转换为字符串类型 // 将 value 转换为字符串类型
value = value.toString() value = value.toString()
if (value.lastIndexOf('.') == -1) { if (value.lastIndexOf('.') === -1) {
s = value + '.00' s = value + '.00'
console.log('s', s) console.log('s', s)
} else { } else {
...@@ -4097,7 +4108,7 @@ export default { ...@@ -4097,7 +4108,7 @@ export default {
}, },
// 计算标签一的校验标准1 和 检验标准2 之间的差值 // 计算标签一的校验标准1 和 检验标准2 之间的差值
getCalculateDifferences() { getCalculateDifferences() {
for (var i= 1; i< 6; i++) { for (var i = 1; i < 6; i++) {
this.handleRecordTwoInput(i) this.handleRecordTwoInput(i)
} }
}, },
...@@ -4193,52 +4204,52 @@ export default { ...@@ -4193,52 +4204,52 @@ export default {
this.inspectJbAl2o3List.limitTwo = response.data.limitTwo this.inspectJbAl2o3List.limitTwo = response.data.limitTwo
this.inspectJbAl2o3List.sheetIndex = response.data.sheetIndex this.inspectJbAl2o3List.sheetIndex = response.data.sheetIndex
if (response.data.ld && response.data.ld !== ''){ if (response.data.ld && response.data.ld !== '') {
this.tabfourForm.LD = this.handleFirstTableData(response.data.ld ) this.tabfourForm.LD = this.handleFirstTableData(response.data.ld)
} else { } else {
this.tabfourForm.LD = [] this.tabfourForm.LD = []
} }
if (response.data.lda && response.data.lda !== ''){ if (response.data.lda && response.data.lda !== '') {
this.tabfourForm.LDA = this.handleFirstTableData(response.data.lda ) this.tabfourForm.LDA = this.handleFirstTableData(response.data.lda)
} else { } else {
this.tabfourForm.LDA = [] this.tabfourForm.LDA = []
} }
if (response.data.ldb && response.data.ldb !== ''){ if (response.data.ldb && response.data.ldb !== '') {
this.tabfourForm.LDB = this.handleFirstTableData(response.data.ldb ) this.tabfourForm.LDB = this.handleFirstTableData(response.data.ldb)
} else { } else {
this.tabfourForm.LDB = [] this.tabfourForm.LDB = []
} }
if (response.data.wda && response.data.wda !== ''){ if (response.data.wda && response.data.wda !== '') {
this.tabfourForm.WDAList = this.handleFirstTableData(response.data.wda ) this.tabfourForm.WDAList = this.handleFirstTableData(response.data.wda)
} else { } else {
this.tabfourForm.WDAList = [] this.tabfourForm.WDAList = []
} }
if (response.data.wdb && response.data.wdb !== ''){ if (response.data.wdb && response.data.wdb !== '') {
this.tabfourForm.WDBList = this.handleFirstTableData(response.data.wdb ) this.tabfourForm.WDBList = this.handleFirstTableData(response.data.wdb)
} else { } else {
this.tabfourForm.WDBList = [] this.tabfourForm.WDBList = []
} }
if (response.data.projecta && response.data.projecta !== ''){ if (response.data.projecta && response.data.projecta !== '') {
this.tabfourForm.projectAList = this.handleFirstTableData(response.data.projecta ) this.tabfourForm.projectAList = this.handleFirstTableData(response.data.projecta)
} else { } else {
this.tabfourForm.projectAList = [] this.tabfourForm.projectAList = []
} }
if (response.data.projectb && response.data.projectb !== ''){ if (response.data.projectb && response.data.projectb !== '') {
this.tabfourForm.projetcBList = this.handleFirstTableData(response.data.projectb ) this.tabfourForm.projetcBList = this.handleFirstTableData(response.data.projectb)
} else { } else {
this.tabfourForm.projetcBList = [] this.tabfourForm.projetcBList = []
} }
if (response.data.projectc && response.data.projectc !== ''){ if (response.data.projectc && response.data.projectc !== '') {
this.tabfourForm.projectCList = this.handleFirstTableData(response.data.projectc ) this.tabfourForm.projectCList = this.handleFirstTableData(response.data.projectc)
} else { } else {
this.tabfourForm.projectCList = [] this.tabfourForm.projectCList = []
} }
if (response.data.projectd && response.data.projectd !== ''){ if (response.data.projectd && response.data.projectd !== '') {
this.tabfourForm.projectDList = this.handleFirstTableData(response.data.projectd ) this.tabfourForm.projectDList = this.handleFirstTableData(response.data.projectd)
} else { } else {
this.tabfourForm.projectDList = [] this.tabfourForm.projectDList = []
} }
console.log('tabfourForm',this.tabfourForm) console.log('tabfourForm', this.tabfourForm)
if (response.data.limitThree === null) { if (response.data.limitThree === null) {
response.data.limitThree = '' response.data.limitThree = ''
} }
...@@ -4289,11 +4300,11 @@ export default { ...@@ -4289,11 +4300,11 @@ export default {
this.inspectJbAl2o3List.wgTf = response.data.wgTf this.inspectJbAl2o3List.wgTf = response.data.wgTf
this.inspectJbAl2o3List.limitData = response.data.limitData this.inspectJbAl2o3List.limitData = response.data.limitData
this.inspectJbAl2o3List.ossId = response.data.ossId this.inspectJbAl2o3List.ossId = response.data.ossId
console.log('最初standardOneData',response.data.standardOneData) console.log('最初standardOneData', response.data.standardOneData)
this.$nextTick().then(() => { this.$nextTick().then(() => {
if (response.data.standardOneData && response.data.standardOneData.length > 0) { if (response.data.standardOneData && response.data.standardOneData.length > 0) {
this.getRecordList(response.data.standardOneData.split(',')) this.getRecordList(response.data.standardOneData.split(','))
for (let i=0;i<6; i++) { for (let i = 0; i < 6; i++) {
this.handleRecordOneInput(i) this.handleRecordOneInput(i)
} }
} }
...@@ -4310,9 +4321,9 @@ export default { ...@@ -4310,9 +4321,9 @@ export default {
} else { } else {
this.disableInput = false this.disableInput = false
} }
console.log('standardOneData',this.inspectJbAl2o3List.standardOneData) console.log('standardOneData', this.inspectJbAl2o3List.standardOneData)
for (let i=0;i<6; i++) { for (let i = 0; i < 6; i++) {
this.handleRecordTwoInput(i) this.handleRecordTwoInput(i)
} }
/** 审批信息**/ /** 审批信息**/
...@@ -4533,7 +4544,7 @@ export default { ...@@ -4533,7 +4544,7 @@ export default {
}, },
{ {
// 记录数据 // 记录数据
recordData: '', recordData: ''
}, },
{ {
// 记录数据 // 记录数据
...@@ -4541,7 +4552,7 @@ export default { ...@@ -4541,7 +4552,7 @@ export default {
}, },
{ {
// 记录数据 // 记录数据
recordData: '', recordData: ''
}, },
{ {
// 记录数据 // 记录数据
...@@ -4553,7 +4564,7 @@ export default { ...@@ -4553,7 +4564,7 @@ export default {
}, },
{ {
// 记录数据 // 记录数据
recordData: '', recordData: ''
}, },
{ {
// 记录数据 // 记录数据
...@@ -4874,14 +4885,14 @@ export default { ...@@ -4874,14 +4885,14 @@ export default {
} else { } else {
this.inspectJbAl2o3List.wdb = '' this.inspectJbAl2o3List.wdb = ''
} }
console.log('projectAList',this.tabfourForm.projectAList) console.log('projectAList', this.tabfourForm.projectAList)
if (this.tabfourForm.projectAList && this.tabfourForm.projectAList.length > 0) { if (this.tabfourForm.projectAList && this.tabfourForm.projectAList.length > 0) {
this.inspectJbAl2o3List.projecta = this.handleSecondTable(this.tabfourForm.projectAList) this.inspectJbAl2o3List.projecta = this.handleSecondTable(this.tabfourForm.projectAList)
} else { } else {
console.log('1111') console.log('1111')
this.inspectJbAl2o3List.projecta = '' this.inspectJbAl2o3List.projecta = ''
} }
console.log('projectDList',this.tabfourForm.projectDList) console.log('projectDList', this.tabfourForm.projectDList)
if (this.tabfourForm.projetcBList && this.tabfourForm.projetcBList.length > 0) { if (this.tabfourForm.projetcBList && this.tabfourForm.projetcBList.length > 0) {
this.inspectJbAl2o3List.projectb = this.handleSecondTable(this.tabfourForm.projetcBList) this.inspectJbAl2o3List.projectb = this.handleSecondTable(this.tabfourForm.projetcBList)
} else { } else {
...@@ -4933,7 +4944,7 @@ export default { ...@@ -4933,7 +4944,7 @@ export default {
this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.inspectJbAl2o3List.recode1) this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.inspectJbAl2o3List.recode1)
this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.inspectJbAl2o3List.recode2) this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.inspectJbAl2o3List.recode2)
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3) this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3)
console.log('提交standardOneData',this.inspectJbAl2o3List.standardOneData) console.log('提交standardOneData', this.inspectJbAl2o3List.standardOneData)
if (this.tabfourForm.LD && this.tabfourForm.LD.length > 0) { if (this.tabfourForm.LD && this.tabfourForm.LD.length > 0) {
this.inspectJbAl2o3List.ld = this.handleFirstTable(this.tabfourForm.LD) this.inspectJbAl2o3List.ld = this.handleFirstTable(this.tabfourForm.LD)
} else { } else {
...@@ -5152,16 +5163,6 @@ export default { ...@@ -5152,16 +5163,6 @@ export default {
handlePreview(file) { handlePreview(file) {
console.log(file) console.log(file)
} }
},
watch: {
'inspectInfoList.jcCj': {
handler(newValue,oldValue) {
if (((oldValue === '1' || oldValue === '2') && newValue === '3') || oldValue === '3') {
// 切换类型需要清空检查一的列表数据
this.resetRecordOne()
}
},
}
} }
} }
...@@ -5210,8 +5211,6 @@ export default { ...@@ -5210,8 +5211,6 @@ export default {
width: 70%; width: 70%;
} }
.scanInput { .scanInput {
width: 67%; width: 67%;
height: 32px; height: 32px;
...@@ -5495,8 +5494,6 @@ export default { ...@@ -5495,8 +5494,6 @@ export default {
margin-left: 6%; margin-left: 6%;
padding-top: 20px; padding-top: 20px;
.inspectDifferent{ .inspectDifferent{
font-size: 14px; font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400; font-family: Microsoft YaHei, Microsoft YaHei-400;
...@@ -5519,7 +5516,6 @@ export default { ...@@ -5519,7 +5516,6 @@ export default {
} }
} }
.recordThreeContent { .recordThreeContent {
width: 79%; width: 79%;
margin-left: 16%; margin-left: 16%;
...@@ -5981,8 +5977,6 @@ export default { ...@@ -5981,8 +5977,6 @@ export default {
} }
} }
.checkTicketOne { .checkTicketOne {
width: 76%; width: 76%;
display: flex; display: flex;
......
...@@ -121,7 +121,8 @@ module.exports = { ...@@ -121,7 +121,8 @@ module.exports = {
// target: `http://117.122.212.91:32012/`, // target: `http://117.122.212.91:32012/`,
// target: `http://192.144.239.97:20070/`, // target: `http://192.144.239.97:20070/`,
// === // ===
target: `http://192.168.1.37:8088/`, // target: `http://192.168.1.37:8088/`,
target: `http://localhost:8082/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment