浏览代码

2024-08-20

codeMan 1 年之前
父节点
当前提交
4495b94605

+ 0 - 63
src/optionSystem/FProductManage/modules/Steps.vue

@@ -1,63 +0,0 @@
-<template>
-  <div class="steps">
-    <div class="step-item">
-        <div class="step-item_icon"></div>
-        <div class="step-item_content">
-            <div class="step-title">选光头</div>
-        </div>
-    </div>
-    <div class="step-item">
-        <div class="step-item_icon"></div>
-        <div class="step-item_content">
-            <div class="step-title">选光头</div>
-        </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-    data () {
-        return {
-
-        }
-    },
-    props: {
-
-    },
-    methods: {
-
-    }
-}
-</script>
-
-<style scoped>
-.steps {
-    display: flex;
-}
-.steps .steps-item {
-    flex: 1;
-}
-.steps .steps-item .steps-item_icon {
-    width: 32px;
-    height: 32px;
-    text-align: center;
-    line-height: 32px;
-    border-radius: 32px;
-    background-color: #e6f4ff;
-    border-color: #e6f4ff;
-}
-.steps .steps-item .steps-item_content {}
-.steps .steps-item .steps-item_content .steps-title {
-    position: relative;
-}
-.steps .steps-item .steps-item_content .steps-title::after {
-    content: '';
-    width: 99999px;
-    height: 1px;
-    background: rgba(5, 5, 5, 0.06);
-    position: absolute;
-    top: 16px;
-    display: block;
-}
-</style>

+ 1 - 2
src/optionSystem/FProductManage/modules/diefa/diefaAdd.vue

@@ -348,9 +348,8 @@
 <script>
 import MySelect from '../select.vue'
 import MyTable from '../table.vue'
-import Steps from '../Steps.vue'
 export default {
-    components:{MySelect,MyTable,Steps},
+    components:{MySelect,MyTable},
     props:['data'],
     data () {
         return {

+ 1 - 2
src/optionSystem/FProductManage/modules/diefa/edit.vue

@@ -348,9 +348,8 @@
   <script>
   import MySelect from '../select.vue'
   import MyTable from '../table.vue'
-  import Steps from '../Steps.vue'
   export default {
-      components:{MySelect,MyTable,Steps},
+      components:{MySelect,MyTable},
       props:['data'],
       data () {
           return {

+ 1 - 2
src/optionSystem/optionOrder/detail/modules/components/DieFa.vue

@@ -209,9 +209,8 @@
 <script>
 import MySelect from '@/optionSystem/FProductManage/modules/select.vue'
 import MyTable from '@/optionSystem/FProductManage/modules/table.vue'
-import Steps from '@/optionSystem/FProductManage/modules/Steps.vue'
 export default {
-    components:{MySelect,MyTable,Steps},
+    components:{MySelect,MyTable},
     props:['data'],
     inject:['valvetype','resultArrs'],
     data () {

+ 2 - 2
src/optionSystem/optionOrder/detail/modules/setOrder.vue

@@ -10,7 +10,7 @@
                     <div class="item" v-if="resultArr.length && resultArr[0].flh"><span style="color: #888888;">法兰号:</span>{{resultArr[0].flh.join('-') }}</div>
                     <div class="item" v-if="resultArr.length && resultArr[0].caliber"><span style="color: #888888;">公称通径:</span>{{resultArr[0].caliber }}</div>
                     <div class="item" v-if="resultArr.length && resultArr[0].stemmaterial"><span style="color: #888888;">阀杆材质:</span>{{resultArr[0].stemmaterial }}</div>
-                    <div class="item" v-if="resultArr.length && resultArr[0].mainmaterial"><span style="color: #888888;">体材质:</span>{{resultArr[0].mainmaterial }}</div>
+                    <div class="item" v-if="resultArr.length && resultArr[0].mainmaterial"><span style="color: #888888;">体材质:</span>{{resultArr[0].mainmaterial }}</div>
                 </div>
             </td>
         </tr>
@@ -24,7 +24,7 @@
                     <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].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].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>
                 </div>
             </td>

+ 2 - 3
src/optionSystem/selectOption/components/DieFa.vue

@@ -176,7 +176,7 @@
                         <div class="item" v-if="resultArr.length && resultArr[0].flh"><span style="color: #888888;">法兰号:</span>{{resultArr[0].flh }}</div>
                         <div class="item" v-if="resultArr.length && resultArr[0].caliber"><span style="color: #888888;">公称通径:</span>{{resultArr[0].caliber }}</div>
                         <div class="item" v-if="resultArr.length && resultArr[0].stemmaterial"><span style="color: #888888;">阀杆材质:</span>{{resultArr[0].stemmaterial }}</div>
-                        <div class="item" v-if="resultArr.length && resultArr[0].mainmaterial"><span style="color: #888888;">体材质:</span>{{resultArr[0].mainmaterial }}</div>
+                        <div class="item" v-if="resultArr.length && resultArr[0].mainmaterial"><span style="color: #888888;">体材质:</span>{{resultArr[0].mainmaterial }}</div>
                     </div>
                 </td>
             </tr>
@@ -190,7 +190,7 @@
                         <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].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].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>
                     </div>
                 </td>
@@ -236,7 +236,6 @@
 <script>
 import MySelect from '@/optionSystem/FProductManage/modules/select.vue'
 import MyTable from '@/optionSystem/FProductManage/modules/table.vue'
-// import Steps from '@/optionSystem/FProductManage/modules/Steps.vue'
 export default {
     props:['position'],
     components:{MySelect,MyTable},

+ 9 - 6
src/optionSystem/selectOption/components/setOrder.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :visible.sync="dialogFormVisible" width="1200px" append-to-body @close="dialogFormVisible = false">
+    <el-dialog :visible.sync="dialogFormVisible" width="1200px" append-to-body :show-close="false" :close-on-click-modal="true">
         <table bgcolor="#FAFAFA" cellpadding="0" style="width: 100%;" class="result" v-if="dialogFormVisible">
             <tr style="width: 100px;">
                 <td class="title">光头</td>
@@ -11,7 +11,7 @@
                         <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.主阀.stemmaterial"><span style="color: #888888;">阀杆材质:</span>{{result.主阀.stemmaterial }}</div>
-                        <div class="item" v-if="result.主阀.mainmaterial"><span style="color: #888888;">体材质:</span>{{result.主阀.mainmaterial }}</div>
+                        <div class="item" v-if="result.主阀.mainmaterial"><span style="color: #888888;">体材质:</span>{{result.主阀.mainmaterial }}</div>
                     </div>
                 </td>
             </tr>
@@ -25,7 +25,7 @@
                         <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.执行器.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.执行器.ratedcurrent"><span style="color: #888888;">电:</span>{{result.执行器.ratedcurrent }}</div>
                         <div class="item" v-if="result.执行器.ratedpower"><span style="color: #888888;">功率:</span>{{result.执行器.ratedpower }}</div>
                     </div>
                 </td>
@@ -89,6 +89,12 @@ export default {
 </script>
 
 <style scoped>
+/deep/.el-dialog__header {
+    display: none;
+}
+/deep/.el-dialog__body {
+    padding: 5px !important;
+}
 .descript {
     font-size:12px;
     color:red;
@@ -102,9 +108,6 @@ td {
 table,td {
     border: 1px solid #DDDDDD;
 }
-.result{
-    margin-top: 10px;
-}
 .result .title {
     font-family: Source Han Sans SC, Source Han Sans SC;
     font-weight: bold;