2024-09-12

src/assets/升序.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1725844571551" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18286" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M480.492308 41.984a39.384615 39.384615 0 0 1 63.015384 0L819.2 409.6A39.384615 39.384615 0 0 1 787.692308 472.615385H236.307692a39.384615 39.384615 0 0 1-31.507692-63.015385z" fill="#3874F6" p-id="18287"></path><path d="M543.507692 982.016a39.384615 39.384615 0 0 1-63.015384 0L204.8 614.4A39.384615 39.384615 0 0 1 236.307692 551.384615h551.384616a39.384615 39.384615 0 0 1 31.507692 63.015385z" fill="#999999" p-id="18288"></path></svg>

src/assets/降序.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1725844578383" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18429" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M543.507692 982.016a39.384615 39.384615 0 0 1-63.015384 0L204.8 614.4A39.384615 39.384615 0 0 1 236.307692 551.384615h551.384616a39.384615 39.384615 0 0 1 31.507692 63.015385z" fill="#3874F6" p-id="18430"></path><path d="M480.492308 41.984a39.384615 39.384615 0 0 1 63.015384 0L819.2 409.6A39.384615 39.384615 0 0 1 787.692308 472.615385H236.307692a39.384615 39.384615 0 0 1-31.507692-63.015385z" fill="#999999" p-id="18431"></path></svg>

src/optionSystem/FProductManage/modules/aside.vue

@@ -12,7 +12,7 @@
                     </span>
                 </div>
                 <div class="product-name">{{ resultArr[0] ? resultArr[0].itemname : '暂无' }}</div>
-                <div class="attrite" v-if="resultArr[0] && resultArr[0].torque">
+                <div class="attrite" v-if="!type && resultArr[0] && resultArr[0].torque">
                     <div class="attrite-title">扭矩：</div>
                     <div class="attrite-value">{{ resultArr[0].torque }}</div>
                 </div>
@@ -24,6 +24,10 @@
                     <div class="attrite-title">公称通径：</div>
                     <div class="attrite-value">{{ resultArr[0].caliber }}</div>
                 </div>
+                <div class="attrite" v-if="resultArr[0] && resultArr[0].nominalpressure">
+                    <div class="attrite-title">公称压力：</div>
+                    <div class="attrite-value">{{ resultArr[0].nominalpressure.join(',') }}</div>
+                </div>
                 <div class="attrite" v-if="resultArr[0] && resultArr[0].stemmaterial">
                     <div class="attrite-title">阀杆材质：</div>
                     <div class="attrite-value">{{ resultArr[0].stemmaterial }}</div>
@@ -44,12 +48,12 @@
                 </div>
                 <div class="product-name">{{ resultArr[1] ? resultArr[1].actuatorname : '暂无' }}</div>
                 <div class="attrite" v-if="resultArr.length <= 2">
-                    {{ resultArr[1] ? `${resultArr[1].actuatormodel}+${resultArr[1].gearboxname}`:'暂无' }}
+                    {{ resultArr[1] ? resultArr[1].gearboxname ? `${resultArr[1].actuatormodel}+${resultArr[1].gearboxname}` :resultArr[1].actuatormodel:'暂无' }}
                 </div>
                 <div class="attrite" v-else>
                     {{ resultArr[1] ? `${resultArr[1].actuatormodel}`:'暂无' }}
                 </div>
-                <div class="attrite" v-if="resultArr[1] && resultArr[1].torque">
+                <div class="attrite" v-if="!type && resultArr[1] && resultArr[1].torque">
                     <div class="attrite-title">输出扭矩：</div>
                     <div class="attrite-value">{{resultArr[1].torque }}</div>
                 </div>
@@ -104,7 +108,7 @@ export default {
 
         }
     },
-    props:['resultArr','fujianArr'],
+    props:['resultArr','fujianArr','type'],
     methods: {
         refresh (type) {
             this.$emit('refresh',type)
@@ -119,7 +123,7 @@ export default {
     font-family: Microsoft YaHei, Microsoft YaHei;
     width: 240px;
     border-right: 1px #999999 solid;
-    z-index: 99999991;
+    z-index: 99999991 !important;
     flex-shrink: 0;
     word-wrap: break-word;
 }

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

@@ -496,11 +496,16 @@ export default {
                 this.items.splice(2,1)
             } else if (type == '执行器') {
                 this.active=2
-                this.resultArr.splice(1)
+                this.resultArr = this.resultArr.splice(0,1)
                 this.fujianArr=[]
             } else {
                 this.fujianArr=[]
-                this.fujianParam.content.othertypes = ['电磁阀','限位开关','过滤减压阀']
+                this.resultArr = this.resultArr.splice(0,2)
+                if (this.excelParam.content.where.drivetype == '气动调节') {
+                    this.fujianParam.content.othertypes = ['定位器','过滤减压阀']
+                } else if (this.excelParam.content.where.drivetype == '气动开关') {
+                    this.fujianParam.content.othertypes = ['电磁阀','限位开关','过滤减压阀']
+                }
                 this.$refs.fujianRef.listData()
             } 
         },
@@ -707,7 +712,8 @@ export default {
 
                 this.active = 2
             } else if (type == '执行器') {
-                this.resultArr[1].itenname = this.resultArr[1].actuatormodel
+                this.resultArr[1].itemname = this.resultArr[1].actuatormodel
+                this.resultArr[1].itemno = this.resultArr[1].actuatorno
 
                 if (this.excelParam.content.where.drivetype == '气动调节') {
                     this.fujianParam.content.othertypes = ['定位器','过滤减压阀']

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

@@ -504,11 +504,16 @@
                 this.items.splice(2,1)
             } else if (type == '执行器') {
                 this.active=2
-                this.resultArr.splice(1)
+                this.resultArr = this.resultArr.splice(0,1)
                 this.fujianArr=[]
             } else {
+                this.resultArr = this.resultArr.splice(0,2)
                 this.fujianArr=[]
-                this.fujianParam.content.othertypes = ['电磁阀','限位开关','过滤减压阀']
+                if (this.excelParam.content.where.drivetype == '气动调节') {
+                    this.fujianParam.content.othertypes = ['定位器','过滤减压阀']
+                } else if (this.excelParam.content.where.drivetype == '气动开关') {
+                    this.fujianParam.content.othertypes = ['电磁阀','限位开关','过滤减压阀']
+                }
                 this.$refs.fujianRef.listData()
             } 
         },
@@ -711,7 +716,8 @@
   
                   this.active = 2
               } else if (type == '执行器') {
-                  this.resultArr[1].itenname = this.resultArr[1].actuatormodel
+                  this.resultArr[1].itemname = this.resultArr[1].actuatormodel
+                  this.resultArr[1].itemno = this.resultArr[1].actuatorno
   
                   if (this.excelParam.content.where.drivetype == '气动调节') {
                       this.fujianParam.content.othertypes = ['定位器','过滤减压阀']

src/optionSystem/FProductManage/modules/table.vue

@@ -10,9 +10,9 @@
           <template v-slot:header="{ column,$index }">
             <div style="display: flex;align-items: center;align-content: center;">
               <span @click="setSort(col,0)">{{ col.title }}</span>
-              <div v-if="col.sortable == 1" :style="{'margin-left': '2px','color':col.cur?'rgb(56, 116, 246) !important':''}">
-                <i class="iconfont" v-if="!col.sort" @click="setSort(col,1)">&#xe6f4;</i>
-                <i class="iconfont" v-else @click="setSort(col,0)">&#xe6f5;</i>
+              <div v-if="col.sortable == 1" class="sort-icon">
+                <img src="@/assets/降序.svg" v-if="!col.sort" @click="setSort(col,1)">
+                <img src="@/assets/升序.svg" v-else @click="setSort(col,0)">
               </div>
             </div>
           </template>
@@ -152,8 +152,10 @@
   
   </script>
   <style scoped>
-  .iconfont {
-    cursor: pointer;
-  }
+    .sort-icon img {
+      cursor: pointer;
+      width: 18px;
+      height: 18px;
+    }
   </style>
   

src/optionSystem/attriteManage/modules/Table.vue

@@ -72,16 +72,12 @@ export default {
                 "id": "20221201134901",
                 "content": {
                   "ownertable": 'sys_optiontypemx',
-                  "sequencesorts": [
-                    {
-                      "ownerid": source[this.rowKey],
-                      "sequence": this.param.content.pageSize * (this.param.content.pageNumber - 1) + target.weight
-                    },
-                    {
-                      "ownerid": target[this.rowKey],
-                      "sequence": this.param.content.pageSize * (this.param.content.pageNumber - 1) + source.weight
+                  "sequencesorts": tempDta.map((v,i) => {
+                    return {
+                      "ownerid": v[this.rowKey],
+                      "sequence": this.param.content.pageSize * (this.param.content.pageNumber - 1) + i+1
                     }
-                  ]
+                  })
                 }
               })
             },

src/optionSystem/optionOrder/detail/modules/components/DieFa.vue

@@ -25,6 +25,10 @@
                         <div class="attrite-title">公称通径：</div>
                         <div class="attrite-value">{{ resultArr[0].caliber }}</div>
                     </div>
+                    <div class="attrite" v-if="resultArr[0] && resultArr[0].nominalpressure">
+                        <div class="attrite-title">公称压力：</div>
+                        <div class="attrite-value">{{ resultArr[0].nominalpressure.join(',') }}</div>
+                    </div>
                     <div class="attrite" v-if="resultArr[0] && resultArr[0].stemmaterial">
                         <div class="attrite-title">阀杆材质：</div>
                         <div class="attrite-value">{{ resultArr[0].stemmaterial }}</div>
@@ -828,7 +832,7 @@ export default {
         font-family: Microsoft YaHei, Microsoft YaHei;
         width: 240px;
         border-right: 1px #999999 solid;
-        z-index: 301;
+        z-index: 99999991;
         flex-shrink: 0;
         word-wrap: break-word;
     }

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

@@ -3,12 +3,16 @@
         <tr style="width: 100px;">
             <td class="title">光头</td>
             <td>
-                <div class="text1" style="margin-bottom: 8px;">{{ resultArr[0] && resultArr[0].itemname}}</div>
+                <div class="text1" style="margin-bottom: 8px;">
+                    <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[0] && resultArr[0].actuatorbrand }}</el-tag>
+                    <span>{{ resultArr[0] && resultArr[0].itemname}}</span>
+                </div>
                 <div class="descript">
                     <div class="item" v-if="resultArr.length && resultArr[0].itemno"><span style="color: #888888;">料号：</span>{{resultArr[0].itemno }}</div>
                     <div class="item" v-if="resultArr.length && resultArr[0].torque"><span style="color: #888888;">扭矩：</span>{{resultArr[0].torque }}</div>
                     <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].nominalpressure"><span style="color: #888888;">公称压力：</span>{{resultArr[0].nominalpressure.join(',') }}</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>
@@ -17,16 +21,19 @@
         <tr>
             <td class="title">执行器</td>
             <td>
-                <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].model }} {{resultArr.length <= 3 && resultArr[2] && resultArr[2].itemname ? ` + 减速箱：${resultArr[2] && resultArr[2].itemname}` : '' }}</div>
+                <div class="text1" style="margin-bottom: 8px;">
+                    <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[1] && resultArr[1].actuatorbrand }}</el-tag>
+                    <span>{{ resultArr[1] && resultArr[1].model }} {{resultArr.length == 3 ? ` + 减速箱：${resultArr[2] && resultArr[2].itemname}` : '' }}</span>
+                </div>
                 <div class="descript">
                     <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>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].speed"><span style="color: #888888;">转速：</span>{{resultArr[1].speed }}(rpm)</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 }}(V)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedcurrent"><span style="color: #888888;">电流：</span>{{resultArr[1].ratedcurrent }}(A)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedpower"><span style="color: #888888;">功率：</span>{{resultArr[1].ratedpower }}(KW)</div>
-                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal && resultArr[1].actuatorsignal.length"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
                 </div>
             </td>
         </tr>
@@ -35,22 +42,34 @@
             <td style="padding: 0;">
                 <tr style="border-bottom: 1px solid #DDDDDD;" class="custom-table">
                     <div style="color: #333333;">定位器</div>
-                    <div class="text1">{{ resultArr.filter(item => item.itemname == '定位器').length ? resultArr.filter(item => item.itemname == '定位器')[0].model : '-' }}</div>
+                    <div class="text1">
+                        <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="resultArr.filter(item => item.itemname == '定位器').length ">{{resultArr.filter(item => item.itemname == '定位器')[0].actuatorbrand }}</el-tag>
+                        <span>{{ resultArr.filter(item => item.itemname == '定位器').length ? resultArr.filter(item => item.itemname == '定位器')[0].model : '-' }}</span>
+                    </div>
                     <div style="color: #333333;">电磁阀</div>
-                    <div class="text1">{{ resultArr.filter(item => item.itemname == '电磁阀').length ? resultArr.filter(item => item.itemname == '电磁阀')[0].model : '-' }}</div>
+                    <div class="text1">
+                        <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="resultArr.filter(item => item.itemname == '电磁阀').length ">{{resultArr.filter(item => item.itemname == '电磁阀')[0].actuatorbrand }}</el-tag>
+                        <span>{{ resultArr.filter(item => item.itemname == '电磁阀').length ? resultArr.filter(item => item.itemname == '电磁阀')[0].model : '-' }}</span>
+                    </div>
                 </tr>
 
                 <tr class="custom-table">
                     <div style="color: #333333;">限位开关</div>
-                    <div class="text1">{{ resultArr.filter(item => item.itemname == '限位开关').length ? resultArr.filter(item => item.itemname == '限位开关')[0].model : '-' }}</div>
+                    <div class="text1">
+                        <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="resultArr.filter(item => item.itemname == '限位开关').length ">{{resultArr.filter(item => item.itemname == '限位开关')[0].actuatorbrand }}</el-tag>
+                        <span>{{ resultArr.filter(item => item.itemname == '限位开关').length ? resultArr.filter(item => item.itemname == '限位开关')[0].model : '-' }}</span>
+                    </div>
                     <div style="color: #333333;">过滤减压阀</div>
-                    <div class="text1">{{ resultArr.filter(item => item.itemname == '过滤减压阀').length ? resultArr.filter(item => item.itemname == '过滤减压阀')[0].model : '-' }}</div>
+                    <div class="text1">
+                        <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="resultArr.filter(item => item.itemname == '过滤减压阀').length ">{{resultArr.filter(item => item.itemname == '过滤减压阀')[0].actuatorbrand }}</el-tag>
+                        <span>{{ resultArr.filter(item => item.itemname == '过滤减压阀').length ? resultArr.filter(item => item.itemname == '过滤减压阀')[0].model : '-' }}</span>
+                    </div>
                 </tr>
             </td>
         </tr>
         <tr>
             <td class="title">成品料号</td>
-            <td class="text1">{{ Object.keys(product).length ? product.itemno||'-' : '' }}</td>
+            <td class="text1" style="height: 100%;"><span>{{ Object.keys(product).length ? product.itemno||'-' : '' }}</span></td>
         </tr>
         <tr>
             <td class="title">{{product.itemno?'牌价':'预估价格'}}</td>
@@ -67,29 +86,33 @@ export default {
             product:{}
         }
     },
-    created () {
-        this.$api.requested({
-            "id": 20240718162002,
-            "content": {
-                "sa_lectotypecfgid": this.$route.query.id
-            },
-        }).then(res => {
-            this.resultArr = res.data
+    methods: {
+        listData () {
             this.$api.requested({
-                "id": 2024071916224702,
+                "id": 20240718162002,
                 "content": {
-                    "sa_lectotypecfgid": this.$route.query.id,
-                    "part_itemids": this.resultArr.map(item => {
-                        return {
-                            parttype:item.parttype,
-                            itemid:item.itemid
-                        }
-                    })
+                    "sa_lectotypecfgid": this.$route.query.id
                 },
             }).then(res => {
-                this.product = res.data
+                this.resultArr = res.data
+                this.$api.requested({
+                    "id": 2024071916224702,
+                    "content": {
+                        "part_itemids": this.resultArr.map(item => {
+                            return {
+                                parttype:item.parttype,
+                                itemid:item.itemid
+                            }
+                        })
+                    },
+                }).then(res => {
+                    this.product = res.data
+                })
             })
-        })
+        }
+    },
+    created () {
+        this.listData()
     }
 }
 </script>
@@ -98,6 +121,8 @@ export default {
 .descript {
     font-size:12px;
     color:red;
+    display: flex;
+    flex-wrap: wrap;
 }
 table,td,tr {
     border-collapse: collapse;

src/optionSystem/selectOption/components/DieFa.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex;height: 100vh">
-    <Aside :resultArr="resultArr" :fujianArr="fujianArr" @refresh="resultRefresh"></Aside>
+    <Aside type="selectOption" :resultArr="resultArr" :fujianArr="fujianArr" @refresh="resultRefresh"></Aside>
     <div class="drawer__panel">
         <div class="my-steps">
             <a-steps :current="active-1" style="margin-bottom: 10px;">
@@ -156,12 +156,15 @@
                 <tr style="width: 100px;">
                     <td class="title">光头</td>
                     <td>
-                        <div class="text1" style="margin-bottom: 8px;">{{ resultArr[0] && resultArr[0].itemname}}</div>
+                        <div class="text1" style="margin-bottom: 8px;">
+                            <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[0] && resultArr[0].actuatorbrand }}</el-tag>
+                            <span style="margin-bottom: 8px;">{{ resultArr[0] && resultArr[0].itemname}}</span>
+                        </div>
                         <div class="descript">
                             <div class="item" v-if="resultArr.length && resultArr[0].itemno"><span style="color: #888888;">料号：</span>{{resultArr[0].itemno }}</div>
-                            <div class="item" v-if="resultArr.length && resultArr[0].torque"><span style="color: #888888;">扭矩：</span>{{resultArr[0].torque }}</div>
                             <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].nominalpressure"><span style="color: #888888;">公称压力：</span>{{resultArr[0].nominalpressure.join(',') }}</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>
@@ -170,16 +173,18 @@
                 <tr>
                     <td class="title">执行器</td>
                     <td>
-                        <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' && resultArr[1] && resultArr[1].gearboxname ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</div>
+                        <div class="text1" style="margin-bottom: 8px;">
+                            <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[1] && resultArr[1].actuatorbrand }}</el-tag>
+                            <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].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>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].speed"><span style="color: #888888;">转速：</span>{{resultArr[1].speed }}(rpm)</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 }}(V)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedcurrent"><span style="color: #888888;">电流：</span>{{resultArr[1].ratedcurrent }}(A)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedpower"><span style="color: #888888;">功率：</span>{{resultArr[1].ratedpower }}(KW)</div>
-                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal && resultArr[1].actuatorsignal.length"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
                             
                         </div>
                     </td>
@@ -189,16 +194,28 @@
                     <td style="padding: 0;">
                         <tr style="border-bottom: 1px solid #DDDDDD;" class="custom-table">
                             <div>定位器</div>
-                            <div class="text1">{{ resultArr.filter(item => item.itemname == '定位器').length ? resultArr.filter(item => item.itemname == '定位器')[0].model : '-' }}</div>
+                            <div class="text1">
+                                <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="resultArr.filter(item => item.itemname == '定位器').length">{{ resultArr.filter(item => item.itemname == '定位器')[0].actuatorbrand}}</el-tag>
+                                <span>{{ resultArr.filter(item => item.itemname == '定位器').length ? resultArr.filter(item => item.itemname == '定位器')[0].model : '-' }}</span>
+                            </div>
                             <div>电磁阀</div>
-                            <div class="text1">{{ resultArr.filter(item => item.itemname == '电磁阀').length ? resultArr.filter(item => item.itemname == '电磁阀')[0].model : '-' }}</div>
+                            <div class="text1">
+                                <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="resultArr.filter(item => item.itemname == '电磁阀').length">{{ resultArr.filter(item => item.itemname == '电磁阀')[0].actuatorbrand}}</el-tag>
+                                <span>{{ resultArr.filter(item => item.itemname == '电磁阀').length ? resultArr.filter(item => item.itemname == '电磁阀')[0].model : '-' }}</span>
+                            </div>
                         </tr>
 
                         <tr class="custom-table">
                             <div>限位开关</div>
-                            <div class="text1">{{ resultArr.filter(item => item.itemname == '限位开关').length ? resultArr.filter(item => item.itemname == '限位开关')[0].model : '-' }}</div>
+                            <div class="text1">
+                                <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="resultArr.filter(item => item.itemname == '限位开关').length">{{ resultArr.filter(item => item.itemname == '限位开关')[0].actuatorbrand}}</el-tag>
+                                <span>{{ resultArr.filter(item => item.itemname == '限位开关').length ? resultArr.filter(item => item.itemname == '限位开关')[0].model : '-' }}</span>
+                            </div>
                             <div>过滤减压阀</div>
-                            <div class="text1">{{ resultArr.filter(item => item.itemname == '过滤减压阀').length ? resultArr.filter(item => item.itemname == '过滤减压阀')[0].model : '-' }}</div>
+                            <div class="text1">
+                                <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="resultArr.filter(item => item.itemname == '过滤减压阀').length">{{ resultArr.filter(item => item.itemname == '过滤减压阀')[0].actuatorbrand}}</el-tag>
+                                <span>{{ resultArr.filter(item => item.itemname == '过滤减压阀').length ? resultArr.filter(item => item.itemname == '过滤减压阀')[0].model : '-' }}</span>
+                            </div>
                         </tr>
                     </td>
                 </tr>
@@ -394,12 +411,17 @@ export default {
                 this.items.splice(2,1)
             } else if (type == '执行器') {
                 this.active=2
-                this.resultArr.splice(1)
+                this.resultArr = this.resultArr.splice(0,1)
                 this.fujianArr=[]
             } else {
                 this.fujianArr=[]
+                this.resultArr = this.resultArr.splice(0,2)
                 this.active = 3
-                this.fujianParam.content.othertypes = ['电磁阀','限位开关','过滤减压阀']
+                if (this.excelParam.content.where.drivetype == '气动调节') {
+                    this.fujianParam.content.othertypes = ['定位器','过滤减压阀']
+                } else if (this.excelParam.content.where.drivetype == '气动开关') {
+                    this.fujianParam.content.othertypes = ['电磁阀','限位开关','过滤减压阀']
+                }
                 this.$refs.fujianRef.listData()
             } 
         },
@@ -649,10 +671,10 @@ export default {
             } else {
                 if (this.fujianArr.filter(item=>item.itemid==data.itemid).length) return
                 this.fujianParam.content.othertypes.splice(this.fujianParam.content.othertypes.indexOf(data.itemname),1)
+                this.fujianArr.push(data)
                 if (!this.fujianParam.content.othertypes.length) return this.active = 4
                 this.loading = true
                 this.$refs.fujianRef.listData(()=> {
-                    this.fujianArr.push(data)
                     this.loading = false
                 })
                 

src/optionSystem/selectOption/components/setOrder.vue

@@ -4,12 +4,16 @@
             <tr style="width: 100px;">
                 <td class="title">光头</td>
                 <td>
-                    <div class="text1" style="margin-bottom: 8px;">{{ result.主阀.itemname}}</div>
+                    <div class="text1" style="margin-bottom: 8px;">
+                        <el-tag style="margin-right: 10px;" size="small" type="warning">{{ result.主阀.actuatorbrand }}</el-tag>
+                        <span>{{ result.主阀.itemname}}</span>
+                    </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>
                         <div class="item" v-if="result.主阀.mainmaterial"><span style="color: #888888;">主体材质：</span>{{result.主阀.mainmaterial }}</div>
                     </div>
@@ -18,17 +22,20 @@
             <tr>
                 <td class="title">执行器</td>
                 <td>
-                    <div v-if="result.执行器" class="text1" style="margin-bottom: 8px;">{{ result.执行器.model }} {{result.减速箱 && Object.keys(result.减速箱).length ? ` + 减速箱：${result.减速箱.itemname}` : '' }}</div>
+                    <div class="text1" style="margin-bottom: 8px;">
+                        <el-tag style="margin-right: 10px;" size="small" type="warning">{{ result.执行器.actuatorbrand }}</el-tag>
+                        <span>{{ result.执行器.model }} {{result.减速箱 && Object.keys(result.减速箱).length ? ` + 减速箱：${result.减速箱.itemname}` : '' }}</span>
+                    </div>
+                    <div v-if="result.执行器" class="text1" style="margin-bottom: 8px;"></div>
                     <div class="descript" v-if="result.执行器">
                         <div class="item" v-if="result.执行器.torque"><span style="color: #888888;">输出扭矩：</span>{{result.执行器.torque }}(Nm)</div>
-                        <div class="item" v-if="result.执行器.maxruntime"><span style="color: #888888;">开关时间：</span>{{result.执行器.maxruntime }}(s)</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>
                         <div class="item" v-if="result.执行器.ratedcurrent"><span style="color: #888888;">电流：</span>{{result.执行器.ratedcurrent }}(A)</div>
                         <div class="item" v-if="result.执行器.ratedpower"><span style="color: #888888;">功率：</span>{{result.执行器.ratedpower }}(KW)</div>
-                        <div class="item" v-if="result.执行器.maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
-                        <div class="item" v-if="result.执行器.actuatorsignal"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
+                        <div class="item" v-if="result.执行器.maxruntime"><span style="color: #888888;">开关时间：</span>{{result.执行器.maxruntime }}(s)</div>
+                        <div class="item" v-if="result.执行器.actuatorsignal && result.执行器.actuatorsignal.length"><span style="color: #888888;">信号类型：</span>{{result.执行器.actuatorsignal.join(',') }}</div>
                     </div>
                 </td>
             </tr>
@@ -37,16 +44,27 @@
                 <td style="padding: 0;">
                     <tr style="border-bottom: 1px solid #DDDDDD;" class="custom-table">
                         <div style="color: #333333;">定位器</div>
-                        <div class="text1">{{ result.辅件.filter(item => item.othertype == '定位器').length ? result.辅件.filter(item => item.othertype == '定位器')[0].model : '-' }}</div>
+                        <div class="text1">
+                            <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="result.辅件.filter(item => item.othertype == '定位器').length">{{ result.辅件.filter(item => item.othertype == '定位器')[0].actuatorbrand}}</el-tag>
+                            <span>{{ result.辅件.filter(item => item.othertype == '定位器').length ? result.辅件.filter(item => item.othertype == '定位器')[0].model : '-' }}</span>
+                        </div>
                         <div style="color: #333333;">电磁阀</div>
-                        <div class="text1">{{ result.辅件.filter(item => item.othertype == '电磁阀').length ? result.辅件.filter(item => item.othertype == '电磁阀')[0].model : '-' }}</div>
+                        <div class="text1">
+                            <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="result.辅件.filter(item => item.othertype == '电磁阀').length">{{ result.辅件.filter(item => item.othertype == '电磁阀')[0].actuatorbrand}}</el-tag>
+                            <span>{{ result.辅件.filter(item => item.othertype == '电磁阀').length ? result.辅件.filter(item => item.othertype == '电磁阀')[0].model : '-' }}</span>
+                        </div>
                     </tr>
-
                     <tr class="custom-table">
                         <div style="color: #333333;">限位开关</div>
-                        <div class="text1">{{ result.辅件.filter(item => item.othertype == '限位开关').length ? result.辅件.filter(item => item.othertype == '限位开关')[0].model : '-' }}</div>
+                        <div class="text1">
+                            <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="result.辅件.filter(item => item.othertype == '限位开关').length">{{ result.辅件.filter(item => item.othertype == '限位开关')[0].actuatorbrand}}</el-tag>
+                            <span>{{ result.辅件.filter(item => item.othertype == '限位开关').length ? result.辅件.filter(item => item.othertype == '限位开关')[0].model : '-' }}</span>
+                        </div>
                         <div style="color: #333333;">过滤减压阀</div>
-                        <div class="text1">{{ result.辅件.filter(item => item.othertype == '过滤减压阀').length ? result.辅件.filter(item => item.othertype == '过滤减压阀')[0].model : '-' }}</div>
+                        <div class="text1">
+                            <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="result.辅件.filter(item => item.othertype == '过滤减压阀').length">{{ result.辅件.filter(item => item.othertype == '过滤减压阀')[0].actuatorbrand}}</el-tag>
+                            <span>{{ result.辅件.filter(item => item.othertype == '过滤减压阀').length ? result.辅件.filter(item => item.othertype == '过滤减压阀')[0].model : '-' }}</span>
+                        </div>
                     </tr>
                 </td>
             </tr>

src/optionSystem/valveOption/DieFa.vue

@@ -255,12 +255,16 @@
                 <tr style="width: 100px;">
                     <td class="title">光头</td>
                     <td>
-                        <div class="text1" style="margin-bottom: 8px;">{{ resultArr[0] && resultArr[0].itemname}}</div>
+                        <div class="text1" style="margin-bottom: 8px;">
+                            <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[0] && resultArr[0].actuatorbrand }}</el-tag>
+                            <span style="margin-bottom: 8px;">{{ resultArr[0] && resultArr[0].itemname}}</span>
+                        </div>
                         <div class="descript">
                             <div class="item" v-if="resultArr.length && resultArr[0].itemno"><span style="color: #888888;">料号：</span>{{resultArr[0].itemno }}</div>
                             <div class="item" v-if="resultArr.length && resultArr[0].torque"><span style="color: #888888;">扭矩：</span>{{resultArr[0].torque }}</div>
                             <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].nominalpressure"><span style="color: #888888;">公称压力：</span>{{resultArr[0].nominalpressure.join(',') }}</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>
@@ -269,7 +273,10 @@
                 <tr>
                     <td class="title">执行器</td>
                     <td>
-                        <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' && resultArr[1] && resultArr[1].gearboxname ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</div>
+                        <div class="text1" style="margin-bottom: 8px;">
+                            <el-tag style="margin-right: 10px;" size="small" type="warning">{{ resultArr[1] && resultArr[1].actuatorbrand }}</el-tag>
+                            <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].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>
@@ -278,7 +285,7 @@
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].supplyvoltage"><span style="color: #888888;">电压：</span>{{resultArr[1].supplyvoltage }}(V)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedcurrent"><span style="color: #888888;">电流：</span>{{resultArr[1].ratedcurrent }}(A)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedpower"><span style="color: #888888;">功率：</span>{{resultArr[1].ratedpower }}(KW)</div>
-                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal && resultArr[1].actuatorsignal.length"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
                         </div>
                     </td>
                 </tr>
@@ -287,16 +294,28 @@
                     <td style="padding: 0;">
                         <tr style="border-bottom: 1px solid #DDDDDD;" class="custom-table">
                             <div>定位器</div>
-                            <div class="text1">{{ resultArr.filter(item => item.itemname == '定位器').length ? resultArr.filter(item => item.itemname == '定位器')[0].model : '-' }}</div>
+                            <div class="text1">
+                                <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="fujianArr.filter(item => item.itemname == '定位器').length">{{ fujianArr.filter(item => item.itemname == '定位器')[0].actuatorbrand}}</el-tag>
+                                <span>{{ fujianArr.filter(item => item.itemname == '定位器').length ? fujianArr.filter(item => item.itemname == '定位器')[0].model : '-' }}</span>
+                            </div>
                             <div>电磁阀</div>
-                            <div class="text1">{{ resultArr.filter(item => item.itemname == '电磁阀').length ? resultArr.filter(item => item.itemname == '电磁阀')[0].model : '-' }}</div>
+                            <div class="text1">
+                                <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="fujianArr.filter(item => item.itemname == '电磁阀').length">{{ fujianArr.filter(item => item.itemname == '电磁阀')[0].actuatorbrand}}</el-tag>
+                                <span>{{ fujianArr.filter(item => item.itemname == '电磁阀').length ? fujianArr.filter(item => item.itemname == '电磁阀')[0].model : '-' }}</span>
+                            </div>
                         </tr>
 
                         <tr class="custom-table">
                             <div>限位开关</div>
-                            <div class="text1">{{ resultArr.filter(item => item.itemname == '限位开关').length ? resultArr.filter(item => item.itemname == '限位开关')[0].model : '-' }}</div>
+                            <div class="text1">
+                                <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="fujianArr.filter(item => item.itemname == '限位开关').length">{{ fujianArr.filter(item => item.itemname == '限位开关')[0].actuatorbrand}}</el-tag>
+                                <span>{{ fujianArr.filter(item => item.itemname == '限位开关').length ? fujianArr.filter(item => item.itemname == '限位开关')[0].model : '-' }}</span>
+                            </div>
                             <div>过滤减压阀</div>
-                            <div class="text1">{{ resultArr.filter(item => item.itemname == '过滤减压阀').length ? resultArr.filter(item => item.itemname == '过滤减压阀')[0].model : '-' }}</div>
+                            <div class="text1">
+                                <el-tag style="margin-right: 10px;" size="small" type="warning" v-if="fujianArr.filter(item => item.itemname == '过滤减压阀').length">{{ fujianArr.filter(item => item.itemname == '过滤减压阀')[0].actuatorbrand}}</el-tag>
+                                <span>{{ fujianArr.filter(item => item.itemname == '过滤减压阀').length ? fujianArr.filter(item => item.itemname == '过滤减压阀')[0].model : '-' }}</span>
+                            </div>
                         </tr>
                     </td>
                 </tr>
@@ -497,12 +516,17 @@ export default {
                 this.fujianArr=[]
             } else if (type == '执行器') {
                 this.active=2
-                this.resultArr.splice(1)
+                this.resultArr = this.resultArr.splice(0,1)
                 this.fujianArr=[]
             } else {
                 this.fujianArr=[]
+                this.resultArr = this.resultArr.splice(0,2)
                 this.active = 3
-                this.fujianParam.content.othertypes = ['电磁阀','限位开关','过滤减压阀']
+                if (this.excelParam.content.where.drivetype == '气动调节') {
+                    this.fujianParam.content.othertypes = ['定位器','过滤减压阀']
+                } else if (this.excelParam.content.where.drivetype == '气动开关') {
+                    this.fujianParam.content.othertypes = ['电磁阀','限位开关','过滤减压阀']
+                }
                 this.$refs.fujianRef.listData()
             } 
         },
@@ -622,11 +646,12 @@ export default {
         },
         calcTableHieght (id) {
             this.$nextTick(() => {
-                let target = this.$refs[id].$el.getBoundingClientRect()
-                let clientHeight = document.body.clientHeight
-                this.tableHeight = clientHeight - target.top - 30 + 'px'
-                this.$refs[id].$refs.table.doLayout()
-                console.log('出发');
+                setTimeout(() => {
+                    let target = this.$refs[id].$el.getBoundingClientRect()
+                    let clientHeight = document.body.clientHeight
+                    this.tableHeight = clientHeight - target.top - 30 + 'px'
+                    this.$refs[id].$refs.table.doLayout()
+                },200)
                 
             })
         },
@@ -721,10 +746,10 @@ export default {
             } else {
                 if (this.fujianArr.filter(item=>item.itemid==data.itemid).length) return
                 this.fujianParam.content.othertypes.splice(this.fujianParam.content.othertypes.indexOf(data.itemname),1)
+                this.fujianArr.push(data)
                 if (!this.fujianParam.content.othertypes.length) return this.active = 4
                 this.loading = true
                 this.$refs.fujianRef.listData(()=> {
-                    this.fujianArr.push(data)
                     this.loading = false
                 })
                 

src/style/theme/font-icon/iconfont.css

@@ -1,9 +1,9 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3376421 */
-  src: url('//at.alicdn.com/t/c/font_3376421_x9q6kmwhc0g.woff2?t=1723606262745') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3376421_x9q6kmwhc0g.woff?t=1723606262745') format('woff'),
-       url('//at.alicdn.com/t/c/font_3376421_x9q6kmwhc0g.ttf?t=1723606262745') format('truetype'),
-       url('//at.alicdn.com/t/c/font_3376421_x9q6kmwhc0g.svg?t=1723606262745#iconfont') format('svg');
+  font-family: 'iconfont';  /* Project id 3376421 */
+  src: url('//at.alicdn.com/t/c/font_3376421_c3be3hh7lff.woff2?t=1725844457241') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3376421_c3be3hh7lff.woff?t=1725844457241') format('woff'),
+       url('//at.alicdn.com/t/c/font_3376421_c3be3hh7lff.ttf?t=1725844457241') format('truetype'),
+       url('//at.alicdn.com/t/c/font_3376421_c3be3hh7lff.svg?t=1725844457241#iconfont') format('svg');
 }
 
 .iconfont {