Commit a15241f5 authored by hubaoshan's avatar hubaoshan

第三步

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