Merge branch 'optionSystem' into mergeBranch

src/optionSystem/selectOption/components/setOrder.vue

@@ -10,8 +10,6 @@
                     </div>
                     <div class="descript">
                         <div class="item" v-if="result.主阀.torque"><span style="color: #888888;">料号：</span>{{result.主阀.itemno }}</div>
-                        <div class="item" v-if="result.主阀.torque"><span style="color: #888888;">扭矩：</span>{{result.主阀.torque }}</div>
-                        <div class="item" v-if="result.主阀.flh.length"><span style="color: #888888;">法兰号：</span>{{result.主阀.flh.join('-') }}</div>
                         <div class="item" v-if="result.主阀.caliber"><span style="color: #888888;">公称通径：</span>{{result.主阀.caliber }}</div>
                         <div class="item" v-if="result.主阀.nominalpressure"><span style="color: #888888;">公称压力：</span>{{result.主阀.nominalpressure }}</div>
                         <div class="item" v-if="result.主阀.stemmaterial"><span style="color: #888888;">阀杆材质：</span>{{result.主阀.stemmaterial }}</div>
@@ -30,7 +28,6 @@
                     <div class="descript" v-if="result.执行器">
                         <div class="item" v-if="result.执行器.actuatorname"><span style="color: #888888;">执行器名称：</span>{{result.执行器.actuatorname }}</div>
                         <div class="item" v-if="result.执行器.bodystructure"><span style="color: #888888;">执行器结构：</span>{{result.执行器.bodystructure }}</div>
-                        <div class="item" v-if="result.执行器.torque"><span style="color: #888888;">输出扭矩：</span>{{result.执行器.torque }}(Nm)</div>
                         <div class="item" v-if="result.执行器.speed"><span style="color: #888888;">转速：</span>{{result.执行器.speed }}(rpm)</div>
                         <div class="item" v-if="result.执行器.handwheelratio"><span style="color: #888888;">减速比：</span>{{result.执行器.ratio }}</div>
                         <div class="item" v-if="result.执行器.supplyvoltage"><span style="color: #888888;">电压：</span>{{result.执行器.supplyvoltage }}(V)</div>

src/optionSystem/valveOption/DieFa.vue

@@ -290,7 +290,10 @@
                             <span style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' && resultArr[1] && resultArr[1].gearboxname ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</span>
                         </div>
                         <div class="descript">
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorno"><span style="color: #888888;">执行器料号：</span>{{resultArr[1].actuatorno }}</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorname"><span style="color: #888888;">执行器名称：</span>{{resultArr[1].actuatorname }}</div>
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatortype"><span style="color: #888888;">执行器类型：</span>{{resultArr[1].actuatortype }}</div>
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].flh.length"><span style="color: #888888;">法兰号：</span>{{resultArr[1].flh.join(',') }}</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].bodystructure"><span style="color: #888888;">执行器结构：</span>{{resultArr[1].bodystructure }}</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].torque"><span style="color: #888888;">输出扭矩：</span>{{resultArr[1].torque }}(Nm)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>