Skip to content

Commit 40e4927

Browse files
LangbenLangben
committed
冲突
2 parents 8730e69 + 55b217c commit 40e4927

13 files changed

+53
-46
lines changed

‎App/Template/原始记录-校准.xls

0 Bytes
Binary file not shown.

‎App/Views/PROJECTTEMPLET/CanYvDianZu.cshtml

+27-27
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
<!--表体-->
2525
<tr>
26-
<td align="center"><input name="NUMBER" id="NUMBER_1_1_1" type="text" class="my-textbox tc" value="" style="width:60px"/></td>
26+
<td align="center"><input name="NUMBER" id="NUMBER_t_1_1" type="text" class="my-textbox tc" value="" style="width:60px"/></td>
2727
<td align="center">
28-
<input name="DIANYA" id="DIANYA_1_1_1" type="text" class="my-textbox input-width tr" value="" onblur="calculate1.canyuDianZu(this)" />
29-
<select class="my-combobox" name="DIANYA_UNIT" id="DIANYA_UNIT_1_1_1" onchange="changeValue(this)">
28+
<input name="DIANYA" id="DIANYA_t_1_1" type="text" class="my-textbox input-width tr" value="" onblur="calculate1.canyuDianZu(this)" />
29+
<select class="my-combobox" name="DIANYA_UNIT" id="DIANYA_UNIT_t_1_1" onchange="changeValue(this)">
3030
<option value="V">V</option>
3131
<option value="MV">MV</option>
3232
<option value="KV">KV</option>
@@ -35,8 +35,8 @@
3535
</select>
3636
</td>
3737
<td align="center">
38-
<input name="DIANLIU" id="DIANLIU_1_1_1" type="text" class="my-textbox input-width tr" value="0.1" onblur="calculate1.canyuDianZu(this)" />
39-
<select class="my-combobox" name="DIANLIU_UNIT_1_1_1" id="DIANLIU_UNIT_1_1_1">
38+
<input name="DIANLIU" id="DIANLIU_t_1_1" type="text" class="my-textbox input-width tr" value="0.1" onblur="calculate1.canyuDianZu(this)" />
39+
<select class="my-combobox" name="DIANLIU_UNIT" id="DIANLIU_UNIT_t_1_1">
4040
<option value="A">A</option>
4141
<option value="KA">KA</option>
4242
<option value="mA">mA</option>
@@ -46,8 +46,8 @@
4646
</select>
4747
</td>
4848
<td align="center">
49-
<input name="DIANZU" id="DIANZU_1_1_1" type="text" class="my-textbox input-width tr" value="" />
50-
<select class="my-combobox" name="DIANZU_UNIT" id="DIANZU_UNIT_1_1_1">
49+
<input name="DIANZU" id="DIANZU_t_1_1" type="text" class="my-textbox input-width tr" value="" />
50+
<select class="my-combobox" name="DIANZU_UNIT" id="DIANZU_UNIT_t_1_1">
5151
<option value="Ω">Ω</option>
5252
<option value="TΩ">TΩ</option>
5353
<option value="GΩ">GΩ</option>
@@ -58,8 +58,8 @@
5858
</select>
5959
</td>
6060
<td rowspan="3" align="center">
61-
<input name="PINGJUN" id="PINGJUN_1_1_1" type="text" class="my-textbox input-width tr" value="" />
62-
<select class="my-combobox" name="PINGJUN_UNIT" id="PINGJUN_UNIT_1_1_1">
61+
<input name="PINGJUN" id="PINGJUN_t_1_1" type="text" class="my-textbox input-width tr" value="" />
62+
<select class="my-combobox" name="PINGJUN_UNIT" id="PINGJUN_UNIT_t_1_1">
6363
<option value="Ω">Ω</option>
6464
<option value="TΩ">TΩ</option>
6565
<option value="GΩ">GΩ</option>
@@ -70,8 +70,8 @@
7070
</select>
7171
</td>
7272
<td rowspan="3" align="center">
73-
<input name="input6" id="input4" type="text" class="my-textbox input-width tr" value="" />
74-
<select class="my-combobox" name="select5" id="select5" onchange="changeValue(this)">
73+
<input name="input6" id="input6_t_1_1" type="text" class="my-textbox input-width tr" value="" />
74+
<select class="my-combobox" name="input6_UNIT" id="input6_UNIT_t_1_1" onchange="changeValue(this)">
7575
<option value="Ω">Ω</option>
7676
<option value="TΩ">TΩ</option>
7777
<option value="GΩ">GΩ</option>
@@ -81,8 +81,8 @@
8181
<option value="μΩ">μΩ</option>
8282
</select>
8383
~
84-
<input name="input7" id="input7" type="text" class="my-textbox input-width tr" value="" />
85-
<select class="my-combobox" name="select6" id="select6" onchange="changeValue(this)">
84+
<input name="input7" id="input7_t_1_1" type="text" class="my-textbox input-width tr" value="" />
85+
<select class="my-combobox" name="input7_UNIT" id="input7_UNIT_t_1_1" onchange="changeValue(this)">
8686
<option value="Ω">Ω</option>
8787
<option value="TΩ">TΩ</option>
8888
<option value="GΩ">GΩ</option>
@@ -94,10 +94,10 @@
9494
</td>
9595
</tr>
9696
<tr>
97-
<td align="center"><input name="NUMBER" id="NUMBER_1_1_2" type="text" class="my-textbox tc" value="" style="width:60px" /></td>
97+
<td align="center"><input name="NUMBER" id="NUMBER_t_1_2" type="text" class="my-textbox tc" value="" style="width:60px" /></td>
9898
<td align="center">
99-
<input name="DIANYA" id="DIANYA_1_1_2" type="text" class="my-textbox input-width tr" value="" onblur="calculate1.canyuDianZu(this)" />
100-
<select class="my-combobox" name="DIANYA_UNIT" id="DIANYA_UNIT_1_1_2">
99+
<input name="DIANYA" id="DIANYA_t_1_2" type="text" class="my-textbox input-width tr" value="" onblur="calculate1.canyuDianZu(this)" />
100+
<select class="my-combobox" name="DIANYA_UNIT" id="DIANYA_UNIT_t_1_2">
101101
<option value="V">V</option>
102102
<option value="MV">MV</option>
103103
<option value="KV">KV</option>
@@ -106,8 +106,8 @@
106106
</select>
107107
</td>
108108
<td align="center">
109-
<input name="DIANLIU" id="DIANLIU_1_1_2" type="text" class="my-textbox input-width tr" value="0.1" onblur="calculate1.canyuDianZu(this)" />
110-
<select class="my-combobox" name="DIANLIU_UNIT_1_1_2" id="DIANLIU_UNIT_1_1_2">
109+
<input name="DIANLIU" id="DIANLIU_t_1_2" type="text" class="my-textbox input-width tr" value="0.1" onblur="calculate1.canyuDianZu(this)" />
110+
<select class="my-combobox" name="DIANLIU_UNIT" id="DIANLIU_UNIT_t_1_2">
111111
<option value="A">A</option>
112112
<option value="KA">KA</option>
113113
<option value="mA">mA</option>
@@ -117,8 +117,8 @@
117117
</select>
118118
</td>
119119
<td align="center">
120-
<input name="DIANZU" id="DIANZU_1_1_2" type="text" class="my-textbox input-width tr" value="" onblur="calculate1.canyuDianZu(this)" />
121-
<select class="my-combobox" name="DIANZU_UNIT" id="DIANZU_UNIT_1_1_2">
120+
<input name="DIANZU" id="DIANZU_t_1_2" type="text" class="my-textbox input-width tr" value="" onblur="calculate1.canyuDianZu(this)" />
121+
<select class="my-combobox" name="DIANZU_UNIT" id="DIANZU_UNIT_t_1_2">
122122
<option value="Ω">Ω</option>
123123
<option value="TΩ">TΩ</option>
124124
<option value="GΩ">GΩ</option>
@@ -130,10 +130,10 @@
130130
</td>
131131
</tr>
132132
<tr>
133-
<td align="center"><input name="NUMBER" id="NUMBER_1_1_3" type="text" class="my-textbox tc" value="" style="width:60px" /></td>
133+
<td align="center"><input name="NUMBER" id="NUMBER_t_1_3" type="text" class="my-textbox tc" value="" style="width:60px" /></td>
134134
<td align="center">
135-
<input name="DIANYA" id="DIANYA_1_1_3" type="text" class="my-textbox input-width tr" value="" onblur="calculate1.canyuDianZu(this)" />
136-
<select class="my-combobox" name="DIANYA_UNIT" id="DIANYA_UNIT_1_1_3">
135+
<input name="DIANYA" id="DIANYA_t_1_3" type="text" class="my-textbox input-width tr" value="" onblur="calculate1.canyuDianZu(this)" />
136+
<select class="my-combobox" name="DIANYA_UNIT" id="DIANYA_UNIT_t_1_3">
137137
<option value="V">V</option>
138138
<option value="MV">MV</option>
139139
<option value="KV">KV</option>
@@ -142,8 +142,8 @@
142142
</select>
143143
</td>
144144
<td align="center">
145-
<input name="DIANLIU" id="DIANLIU_1_1_3" type="text" class="my-textbox input-width tr" value="0.1" onblur="calculate1.canyuDianZu(this)" />
146-
<select class="my-combobox" name="DIANLIU_UNIT" id="DIANLIU_UNIT_1_1_3">
145+
<input name="DIANLIU" id="DIANLIU_t_1_3" type="text" class="my-textbox input-width tr" value="0.1" onblur="calculate1.canyuDianZu(this)" />
146+
<select class="my-combobox" name="DIANLIU_UNIT" id="DIANLIU_UNIT_t_1_3">
147147
<option value="A">A</option>
148148
<option value="KA">KA</option>
149149
<option value="mA">mA</option>
@@ -153,8 +153,8 @@
153153
</select>
154154
</td>
155155
<td align="center">
156-
<input name="DIANZU" id="DIANZU_1_1_3" type="text" class="my-textbox input-width tr" value="" />
157-
<select class="my-combobox" name="DIANZU_UNIT" id="DIANZU_UNIT_1_1_3">
156+
<input name="DIANZU" id="DIANZU_t_1_3" type="text" class="my-textbox input-width tr" value="" />
157+
<select class="my-combobox" name="DIANZU_UNIT" id="DIANZU_UNIT_t_1_3">
158158
<option value="Ω">Ω</option>
159159
<option value="TΩ">TΩ</option>
160160
<option value="GΩ">GΩ</option>

‎App/Views/PROJECTTEMPLET/DanQiaoJiBenLiangCheng.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</th>
6060
<th colspan="3" align="center">
6161
×
62-
<input class="my-textbox input-width" value="" type="text" name="input2" id="input2">
62+
<input class="my-textbox input-width" value="" type="text" name="input2" id="input2_t_1_1">
6363
<select class="my-combobox" name="statew" id="statew_t_1_1" onchange="changeValue(this)">
6464
<option value="Ω" selected>Ω</option>
6565
<option value="TΩ">TΩ</option>

‎App/Views/PROJECTTEMPLET/DanQiaoQiTaLiangCheng.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<th width="110" align="center">
5151
标称值<br>
5252
(
53-
<select class="my-combobox" name="ce2liangpan" id="ce2liangpan_t_1_1" onchange="changeValue(this)">
53+
<select class="my-combobox" name="ce2liangpan1" id="ce2liangpan1_t_1_1" onchange="changeValue(this)">
5454
<option value="Ω" selected="selected">Ω</option>
5555
<option value="TΩ">TΩ</option>
5656
<option value="GΩ">GΩ</option>

‎App/Views/PROJECTTEMPLET/DianZuShiZhiWuCha.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959

6060
<td rowspan="1" align="center" width="100">
6161
<input class="my-textbox input-width" value="" id="OUTPUTVALUE_t_1_1" name="OUTPUTVALUE" onblur="LianDongBuQueDingDu(this);" type="text">
62-
<select class="my-combobox" name="READVAL1_UNIT" style="width:50px; " onchange="LianDongDanWeiDDL(this,'')" id="READVAL1_UNIT_1_1_1"><option value="A">A</option> <option value="kA">kA</option><option value="mA">mA</option> <option value="μA">μA</option><option value="nA">nA</option> <option value="pA">pA</option> </select>
62+
<select class="my-combobox" name="READVAL1_UNIT" style="width:50px; " onchange="LianDongDanWeiDDL(this,'')" id="READVAL1_UNIT_t_1_1"><option value="A">A</option> <option value="kA">kA</option><option value="mA">mA</option> <option value="μA">μA</option><option value="nA">nA</option> <option value="pA">pA</option> </select>
6363
</td>
6464
<td rowspan="1" align="center" width="100">
6565
<input class="my-textbox input-width" value="" id="READVALUE_t_1_1" name="READVALUE" onblur="resetXianShiZhi(this); LianDongBuQueDingDu(this);" type="text">
66-
<select class="my-combobox" name="READVALUE_UNIT" onchange="LianDongDanWeiDDL(this,'')" id="READVALUE_UNIT_1_1_1"><option value="Ω">Ω</option> <option value="TΩ">TΩ</option><option value="GΩ">GΩ</option> <option value="MΩ">MΩ</option> <option value="kΩ">kΩ</option> <option value="mΩ">mΩ</option> <option value="μΩ">μΩ</option> </select>
66+
<select class="my-combobox" name="READVALUE_UNIT" onchange="LianDongDanWeiDDL(this,'')" id="READVALUE_UNIT_t_1_1"><option value="Ω">Ω</option> <option value="TΩ">TΩ</option><option value="GΩ">GΩ</option> <option value="MΩ">MΩ</option> <option value="kΩ">kΩ</option> <option value="mΩ">mΩ</option> <option value="μΩ">μΩ</option> </select>
6767
</td>
6868
<td rowspan="1" align="center" width="100">
6969
<input class="my-textbox input-width" value="" id="ACTUALVALUE_t_1_1" name="ACTUALVALUE" onblur="resetXianShiZhi(this); LianDongBuQueDingDu(this);" type="text">
70-
<select class="my-combobox" name="ACTUALVALUE_UNIT" onchange="LianDongDanWeiDDL(this,'')" id="ACTUALVALUE_UNIT_1_1_1"><option value="Ω">Ω</option> <option value="TΩ">TΩ</option><option value="GΩ">GΩ</option> <option value="MΩ">MΩ</option> <option value="kΩ">kΩ</option> <option value="mΩ">mΩ</option> <option value="μΩ">μΩ</option> </select>
70+
<select class="my-combobox" name="ACTUALVALUE_UNIT" onchange="LianDongDanWeiDDL(this,'')" id="ACTUALVALUE_UNIT_t_1_1"><option value="Ω">Ω</option> <option value="TΩ">TΩ</option><option value="GΩ">GΩ</option> <option value="MΩ">MΩ</option> <option value="kΩ">kΩ</option> <option value="mΩ">mΩ</option> <option value="μΩ">μΩ</option> </select>
7171
</td>
7272
<td rowspan="1" align="center">
7373
<input class="my-textbox input-width" value="" id="SHIJISHUCHUZHI_t_1_1" name="SHIJISHUCHUZHI" onblur="blurValue(this)" type="text">

‎App/Views/PROJECTTEMPLET/JueYuanDianZu.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</select>
4242
</td>
4343
<td align="center">
44-
<select class="my-combobox" name="READVALUE_NOTATION" id="READVALUE_NOTATION">
44+
<select class="my-combobox" name="READVALUENOTATION" id="READVALUENOTATION_t_1_1">
4545
<option value="＞">＞</option>
4646
<option value="≥">≥</option>
4747
<option value="≤">≤</option>

‎App/Views/PROJECTTEMPLET/OMYiXiaBiaoZhunDianZu.cshtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
100100
//htmlString.push(SetTDHtml(rowspan, "READVALUE", HangHaoID, rowidx, "", "", "", "calculate1.erdengbiaozhundianzubiaochenzhi", ""));
101101
var id = "READVALUE_" + HangHaoID;
102-
htmlString.push("<td align='center' ><select onchange='calculate1.erdengbiaozhundianzubiaochenzhi(this)' class=\"my-combobox\" name=\"select\" id='" + id + "'> <option value=\"\"></option> <option value=\"0.0001\">0.0001</option> <option value=\"0.001\">0.001</option> <option value=\"0.01\">0.01</option><option value=\"0.1\">0.1</option><option value=\"1\">1</option><option value=\"10\">10</option><option value=\"100\">100</option><option value=\"1000\">1000</option><option value=\"10000\">10000</option><option value=\"100000\">100000</option></td>");
102+
htmlString.push("<td align='center' ><select onchange='calculate1.erdengbiaozhundianzubiaochenzhi(this)' class=\"my-combobox\" name=\"READVALUE\" id='" + id + "'> <option value=\"\"></option> <option value=\"0.0001\">0.0001</option> <option value=\"0.001\">0.001</option> <option value=\"0.01\">0.01</option><option value=\"0.1\">0.1</option><option value=\"1\">1</option><option value=\"10\">10</option><option value=\"100\">100</option><option value=\"1000\">1000</option><option value=\"10000\">10000</option><option value=\"100000\">100000</option></td>");
103103
htmlString.push(SetTDHtml(rowspan, "WE", HangHaoID, rowidx, "", ""));
104104
htmlString.push(SetTDHtml(rowspan, "TYEW", HangHaoID, rowidx, "", ""));
105105
htmlString.push(SetTDHtml(rowspan, "UI", HangHaoID, rowidx, "", ""));
@@ -117,12 +117,12 @@
117117
//显示值 增加下拉框单位V
118118
//htmlString.push(SetTDHtml(rowspan, "SHIJISHUCHUZHI", HangHaoID, rowidx, '', "classstyle100", '', ""));
119119
var sid = "SHIJISHUCHUZHI_" + HangHaoID;
120-
htmlString.push("<td align='center' >±<select class=\"my-combobox\" name=\"select\" id='" + sid + "'> <option value=\"\"></option> <option value=\"0.01\">0.01</option><option value=\"0.05\">0.05</option><option value=\"0.02\">0.02</option><option value=\"0.1\">0.1</option></td>");
120+
htmlString.push("<td align='center' >±<select class=\"my-combobox\" name=\"SHIJISHUCHUZHI\" id='" + sid + "'> <option value=\"\"></option> <option value=\"0.01\">0.01</option><option value=\"0.05\">0.05</option><option value=\"0.02\">0.02</option><option value=\"0.1\">0.1</option></td>");
121121
122122
//相对误差
123123
//htmlString.push(SetTDHtml(rowspan, "RELATIVEERROR", HangHaoID, rowidx, '', "classstyle100"));
124124
var rid = "RELATIVEERROR_" + HangHaoID;
125-
htmlString.push("<td align='center' ><select class=\"my-combobox\" name=\"select\" id='" + rid + "'> <option value=\"\"></option><option value=\"5\">5</option><option value=\"2\">2</option><option value=\"0.3\">0.3</option><option value=\"0.1\">0.1</option><option value=\"0.03\">0.03</option><option value=\"0.01\">0.01</option><option value=\"0.003\">0.003</option><option value=\"0.0001\">0.0001</option></td>");
125+
htmlString.push("<td align='center' ><select class=\"my-combobox\" name=\"RELATIVEERROR\" id='" + rid + "'> <option value=\"\"></option><option value=\"5\">5</option><option value=\"2\">2</option><option value=\"0.3\">0.3</option><option value=\"0.1\">0.1</option><option value=\"0.03\">0.03</option><option value=\"0.01\">0.01</option><option value=\"0.003\">0.003</option><option value=\"0.0001\">0.0001</option></td>");
126126
127127
//校准结果的不确定度 U(K =
128128
htmlString.push(SetTDHtml(rowspan, "UNCERTAINTYDEGREE", HangHaoID, rowidx, '', "classstyle"));

‎App/Views/PROJECTTEMPLET/OMYiXiaWuWuCha.cshtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
//需要合并的列
111111
// htmlString.push(SetTDHtml(rowspan, "READVALUE", HangHaoID, rowidx, "", "", "", "calculate1.erdengbiaozhundianzubiaochenzhi", ""));
112112
var id = "READVALUE_" + HangHaoID;
113-
htmlString.push("<td align='center' ><select onchange='calculate1.erdengbiaozhundianzubiaochenzhi(this)' class=\"my-combobox\" name=\"select\" id='" + id + "'> <option value=\"\"></option> <option value=\"0.0001\">0.0001</option> <option value=\"0.001\">0.001</option> <option value=\"0.01\">0.01</option><option value=\"0.1\">0.1</option><option value=\"1\">1</option><option value=\"10\">10</option><option value=\"100\">100</option><option value=\"1000\">1000</option><option value=\"10000\">10000</option><option value=\"100000\">100000</option></td>");
113+
htmlString.push("<td align='center' ><select onchange='calculate1.erdengbiaozhundianzubiaochenzhi(this)' class=\"my-combobox\" name=\"READVALUE\" id='" + id + "'> <option value=\"\"></option> <option value=\"0.0001\">0.0001</option> <option value=\"0.001\">0.001</option> <option value=\"0.01\">0.01</option><option value=\"0.1\">0.1</option><option value=\"1\">1</option><option value=\"10\">10</option><option value=\"100\">100</option><option value=\"1000\">1000</option><option value=\"10000\">10000</option><option value=\"100000\">100000</option></td>");
114114
htmlString.push(SetTDHtml(rowspan, "WE", HangHaoID, rowidx, "", ""));
115115
htmlString.push(SetTDHtml(rowspan, "TYEW", HangHaoID, rowidx, "", ""));
116116
htmlString.push(SetTDHtml(rowspan, "UI", HangHaoID, rowidx, "", ""));
@@ -131,7 +131,7 @@
131131
//相对误差
132132
//htmlString.push(SetTDHtml(rowspan, "RELATIVEERROR", HangHaoID, rowidx, '', "classstyle100"));
133133
var rid = "RELATIVEERROR_" + HangHaoID;
134-
htmlString.push("<td align='center' ><select class=\"my-combobox\" name=\"select\" id='" + rid + "'> <option value=\"\"></option><option value=\"5\">5</option><option value=\"2\">2</option><option value=\"0.3\">0.3</option><option value=\"0.1\">0.1</option><option value=\"0.03\">0.03</option><option value=\"0.01\">0.01</option><option value=\"0.003\">0.003</option><option value=\"0.0001\">0.0001</option></td>");
134+
htmlString.push("<td align='center' ><select class=\"my-combobox\" name=\"RELATIVEERROR\" id='" + rid + "'> <option value=\"\"></option><option value=\"5\">5</option><option value=\"2\">2</option><option value=\"0.3\">0.3</option><option value=\"0.1\">0.1</option><option value=\"0.03\">0.03</option><option value=\"0.01\">0.01</option><option value=\"0.003\">0.003</option><option value=\"0.0001\">0.0001</option></td>");
135135
136136
//校准结果的不确定度 U(K =
137137
htmlString.push(SetTDHtml(rowspan, "UNCERTAINTYDEGREE", HangHaoID, rowidx, '', "classstyle"));

0 commit comments

Comments
 (0)