2024-08-21

src/optionSystem/FProductManage/index.vue

@@ -67,7 +67,7 @@
       <div v-else-if="scope.data.column.columnname === 'marketprice'">
         {{ tool.formatAmount(scope.data.column.data.marketprice, 2) }}
       </div>
-      <p v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</p>
+      <div v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</div>
     </template>
   </basicLayout>
 </template>

src/optionSystem/FProductManage/modules/diefa/diefaAdd.vue

@@ -49,7 +49,7 @@
             <div class="title">组成件</div>
             <div class="handle">
                 <el-button type="primary" size="mini" style="margin-right: 10px;" @click="showFun" :disabled="resultArr.length!=0">选择</el-button>
-                <el-drawer custom-class="custom-select-option_class" :visible.sync="dialogVisible" size="1200px" append-to-body :show-close="false" v-if="dialogVisible">
+                <el-drawer custom-class="custom-select-option_class" :visible.sync="dialogVisible" size="1200px" append-to-body :show-close="false" v-if="dialogVisible" :wrapperClosable="false" :close-on-press-escape="false">
                     <div class="drawer__panel">
                         <div class="my-steps">
                             <a-steps :current="active-1" style="margin-bottom: 10px;">
@@ -231,7 +231,7 @@
                             <!--执行器-->
                             <MyTable :height="tableHeight" :noQuery="true" ref="excelRef" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                                 <template v-slot:customcol="scope">
-                                    <p v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</p>
+                                    <div v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</div>
                                     <span v-else-if="scope.column.columnname != 'operation'">{{scope.column.data[scope.column.columnname]}}</span>
                                 </template>
                                 <template v-slot:opreation="scope">

src/optionSystem/FProductManage/modules/diefa/edit.vue

@@ -49,7 +49,7 @@
             <div class="title">组成件</div>
             <div class="handle">
                 <el-button type="primary" size="mini" style="margin-right: 10px;" @click="dialogVisible=true;calcTableHieght('guangtouRef')" :disabled="resultArr.length!=0">选择</el-button>
-                <el-drawer custom-class="custom-select-option_class" :visible.sync="dialogVisible" size="1200px" append-to-body :show-close="false" v-if="dialogVisible">
+                <el-drawer custom-class="custom-select-option_class" :visible.sync="dialogVisible" size="1200px" append-to-body :show-close="false" v-if="dialogVisible" :wrapperClosable="false" :close-on-press-escape="false">
                     <div class="drawer__panel">
                         <div class="my-steps">
                             <a-steps :current="active-1" style="margin-bottom: 10px;">
@@ -231,7 +231,7 @@
                             <!--执行器-->
                             <MyTable :height="tableHeight" :noQuery="true" ref="excelRef" :layout="guangtouParam.content.where.drivetype=='电动'?tool.tabelCol($route.name)['excelTable1'].tablecols:tool.tabelCol($route.name)['excelTable2'].tablecols" :param="excelParam" :opwidth="200" :custom="true" style="margin-top: 14px">
                                 <template v-slot:customcol="scope">
-                                    <p v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</p>
+                                    <div v-if="scope.column.columnname == 'matchratio'" style="color:red">{{scope.column.data[scope.column.columnname]}}</div>
                                     <span v-else-if="scope.column.columnname != 'operation'">{{scope.column.data[scope.column.columnname]}}</span>
                                 </template>
                                 <template v-slot:opreation="scope">

src/optionSystem/executeManage/index.vue

@@ -72,7 +72,7 @@
       <div v-else-if="scope.data.column.columnname === 'marketprice'">
         {{ tool.formatAmount(scope.data.column.data.marketprice, 2) }}
       </div>
-      <p v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</p>
+      <div v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</div>
     </template>
     <!-- <template v-slot:tbOpreation="scope">
        <editTemp :data="scope.data.data"></editTemp>

src/optionSystem/itemManage/index.vue

@@ -93,7 +93,7 @@
       <div v-else-if="scope.data.column.columnname === 'drivetype'">
         <el-tag size="mini" type="primary" v-for="item in scope.data.column.data.drivetype" :key="item" style="margin-right: 10px;">{{ item }}</el-tag>
       </div>
-      <p v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</p>
+      <div v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</div>
     </template>
     <!-- <template v-slot:tbOpreation="scope">
        <editTemp :data="scope.data.data"></editTemp>

src/optionSystem/optionOrder/detail/modules/setOrder.vue

@@ -22,7 +22,7 @@
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].torque"><span style="color: #888888;">输出扭矩：</span>{{resultArr[1].torque }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].speed"><span style="color: #888888;">转速：</span>{{resultArr[1].speed }}</div>
-                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].handwheelratio"><span style="color: #888888;">速比：</span>{{resultArr[1].handwheelratio }}</div>
+                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].handwheelratio"><span style="color: #888888;">减速比：</span>{{resultArr[1].ratio }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].supplyvoltage"><span style="color: #888888;">电压：</span>{{resultArr[1].supplyvoltage }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedcurrent"><span style="color: #888888;">电流：</span>{{resultArr[1].ratedcurrent }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedpower"><span style="color: #888888;">功率：</span>{{resultArr[1].ratedpower }}</div>

src/optionSystem/optionOrder/index.vue

@@ -62,7 +62,7 @@
       <div v-else-if="scope.data.column.columnname === 'price'">
         {{ tool.formatAmount(scope.data.column.data.price, 2) }}
       </div>
-      <p v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</p>
+      <div v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</div>
     </template>
   </basicLayout>
 </template>

src/optionSystem/otherFileManage/index.vue

@@ -69,7 +69,7 @@
       <div v-else-if="scope.data.column.columnname === 'marketprice'">
         {{ tool.formatAmount(scope.data.column.data.marketprice, 2) }}
       </div>
-      <p v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</p>
+      <div v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</div>
     </template>
     <!-- <template v-slot:tbOpreation="scope">
        <editTemp :data="scope.data.data"></editTemp>

src/optionSystem/selectOption/components/DieFa.vue

@@ -188,7 +188,7 @@
                         <div class="item" v-if="resultArr.length >= 2 && resultArr[1].torque"><span style="color: #888888;">输出扭矩：</span>{{resultArr[1].torque }}</div>
                         <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}</div>
                         <div class="item" v-if="resultArr.length >= 2 && resultArr[1].speed"><span style="color: #888888;">转速：</span>{{resultArr[1].speed }}</div>
-                        <div class="item" v-if="resultArr.length >= 2 && resultArr[1].handwheelratio"><span style="color: #888888;">速比：</span>{{resultArr[1].handwheelratio }}</div>
+                        <div class="item" v-if="resultArr.length >= 2 && resultArr[1].handwheelratio"><span style="color: #888888;">减速比：</span>{{resultArr[1].ratio }}</div>
                         <div class="item" v-if="resultArr.length >= 2 && resultArr[1].supplyvoltage"><span style="color: #888888;">电压：</span>{{resultArr[1].supplyvoltage }}</div>
                         <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedcurrent"><span style="color: #888888;">电流：</span>{{resultArr[1].ratedcurrent }}</div>
                         <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedpower"><span style="color: #888888;">功率：</span>{{resultArr[1].ratedpower }}</div>

src/optionSystem/selectOption/components/setOrder.vue

@@ -23,7 +23,7 @@
                         <div class="item" v-if="result.执行器.torque"><span style="color: #888888;">输出扭矩：</span>{{result.执行器.torque }}</div>
                         <div class="item" v-if="result.执行器.maxruntime"><span style="color: #888888;">开关时间：</span>{{result.执行器.maxruntime }}</div>
                         <div class="item" v-if="result.执行器.speed"><span style="color: #888888;">转速：</span>{{result.执行器.speed }}</div>
-                        <div class="item" v-if="result.执行器.handwheelratio"><span style="color: #888888;">速比：</span>{{result.执行器.handwheelratio }}</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 }}</div>
                         <div class="item" v-if="result.执行器.ratedcurrent"><span style="color: #888888;">电流：</span>{{result.执行器.ratedcurrent }}</div>
                         <div class="item" v-if="result.执行器.ratedpower"><span style="color: #888888;">功率：</span>{{result.执行器.ratedpower }}</div>

src/optionSystem/speedBoxManage/index.vue

@@ -78,7 +78,7 @@
       <div v-else-if="scope.data.column.columnname === 'maxsquarewidth'">
         {{ scope.data.column.data.maxsquarewidth.join('-') }}
       </div>
-      <p v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</p>
+      <div v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</div>
     </template>
     <!-- <template v-slot:tbOpreation="scope">
        <editTemp :data="scope.data.data"></editTemp>

src/optionSystem/throttleManage/index.vue

@@ -105,7 +105,7 @@
       <div v-else-if="scope.data.column.columnname === 'marketprice'">
         {{ tool.formatAmount(scope.data.column.data.marketprice, 2) }}
       </div>
-      <p v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</p>
+      <div v-else>{{ scope.data.column.data[[scope.data.column.columnname]] }}</div>
     </template>
     <!-- <template v-slot:tbOpreation="scope">
        <editTemp :data="scope.data.data"></editTemp>