|
|
@@ -31,7 +31,7 @@
|
|
|
<div class="option-line">
|
|
|
<div class="item">
|
|
|
<div class="label">驱动方式:</div>
|
|
|
- <MySelect :isClear="false" @click="guangtouChange" :options="drivetype" v-model="guangtouParam.content.where.drivetype"></MySelect>
|
|
|
+ <MySelect :isClear="false" @click="$event => {guangtouChange($event);Search('guangtouParam','drivetype')}" :options="drivetype" v-model="guangtouParam.content.where.drivetype"></MySelect>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="option-line">
|
|
|
@@ -143,11 +143,41 @@
|
|
|
<MySelect :isClear="false" :options="[{remarks:'气动调节',value:'气动调节'},{remarks:'气动开关',value:'气动开关'}]" v-model="excelParam.content.where.drivetype"></MySelect>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
- <div class="option-line">
|
|
|
+ <div class="option-line" v-if="guangtouParam.content.where.drivetype=='电动'">
|
|
|
+ <div class="item">
|
|
|
+ <div class="label">驱动方式:</div>
|
|
|
+ <MySelect @click="Search('excelParam','actuatordrivetype');calcTableHieght('excelRef')" :options="[{remarks:'电动开关',value:'电动开关'},{remarks:'电动调节',value:'电动调节'}]" v-model="excelParam.content.where.actuatordrivetype"></MySelect>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="option-line" v-if="guangtouParam.content.where.drivetype=='电动'">
|
|
|
+ <div class="item">
|
|
|
+ <div class="label">品牌:</div>
|
|
|
+ <MySelect @click="Search('excelParam','actuatorbrand');calcTableHieght('excelRef')" :disabled="!excelParam.content.where.actuatordrivetype" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="option-line" v-else>
|
|
|
<div class="item">
|
|
|
<div class="label">品牌:</div>
|
|
|
- <MySelect @click="Search('excelParam','actuatorbrand');calcTableHieght('excelRef')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
|
|
|
+ <MySelect @click="Search('excelParam','actuatorbrand')" :options="actuatorbrand" v-model="excelParam.content.where.actuatorbrand"></MySelect>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div v-if="guangtouParam.content.where.drivetype == '电动' && excelParam.content.where.actuatorbrand && actuatorname.length">
|
|
|
+ <div class="option-line">
|
|
|
+ <div class="item">
|
|
|
+ <div class="label" style="width: 80px;">执行器类型:</div>
|
|
|
+ <span style="font-size: 14px;font-weight: bold;color:#3874F6">{{ excelParam.content.where.actuatorname || '--' }}</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <SelectBar style="margin: 20px 0" v-model="excelParam.content.where.actuatorname" :options="actuatorname.map(v => {return {url:v.url,remarks:v.remarks.split('-').pop(),value:v.remarks}})" @change="Search('excelParam','actuatorname')"></SelectBar>
|
|
|
+ </div>
|
|
|
+ <div class="option-line" v-if="guangtouParam.content.where.drivetype=='电动'">
|
|
|
+ <div class="item">
|
|
|
+ <div class="label">电源电压:</div>
|
|
|
+ <MySelect @click="Search('excelParam','supplyvoltage')" :disabled="!excelParam.content.where.actuatorname" :options="supplyvoltage" v-model="excelParam.content.where.supplyvoltage"></MySelect>
|
|
|
+ </div>
|
|
|
+ <div class="item">
|
|
|
+ <div class="label">信号类型:</div>
|
|
|
+ <MySelect @click="Search('excelParam','actuatorsignal')" :disabled="!excelParam.content.where.supplyvoltage" :options="actuatorsignal" v-model="excelParam.content.where.actuatorsignal"></MySelect>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- <div class="option-line">
|
|
|
@@ -171,15 +201,6 @@
|
|
|
<MySelect :disabled="!excelParam.content.where.func" @click="Search('excelParam','bodystructure')" :options="bodystructure" v-model="excelParam.content.where.bodystructure"></MySelect>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-if="guangtouParam.content.where.drivetype == '电动' && excelParam.content.where.actuatorbrand && actuatorname.length">
|
|
|
- <div class="option-line">
|
|
|
- <div class="item">
|
|
|
- <div class="label" style="width: 80px;">执行器类型:</div>
|
|
|
- <span style="font-size: 14px;font-weight: bold;color:#3874F6">{{ excelParam.content.where.actuatorname || '--' }}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <SelectBar style="margin: 20px 0" v-model="excelParam.content.where.actuatorname" :options="actuatorname.map(v => {return {url:v.url,remarks:v.remarks.split('-').pop(),value:v.remarks}})" @change="Search('excelParam','actuatorname')"></SelectBar>
|
|
|
- </div>
|
|
|
<div class="tips" v-if="guangtouParam.content.where.drivetype=='电动' && resultArr.length" style="color:#3874F6;margin-top: 10px;"><i class="el-icon-warning" style="margin-right: 5px;"></i>建议开关阀时间{{ caliber.filter(v=>v.value==resultArr[0].caliber).length ? caliber.filter(v=>v.value==resultArr[0].caliber)[0].remarks:'-' }}秒</div>
|
|
|
<!--执行器-->
|
|
|
<MyTable fixedName="operation" :height="tableHeight" :noQuery="true" ref="excelRef" :tableName="guangtouParam.content.where.drivetype=='电动'?'excelTable1':'excelTable2'" :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">
|
|
|
@@ -224,13 +245,15 @@
|
|
|
<td>
|
|
|
<div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</div>
|
|
|
<div class="descript">
|
|
|
- <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].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 }}</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 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].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
|
|
|
+ <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
|
|
|
</div>
|
|
|
</td>
|
|
|
</tr>
|
|
|
@@ -264,7 +287,6 @@
|
|
|
</div>
|
|
|
<div class="fixed__btn__panel" v-if="(active == 1 && mode == '手动输入') || active == 3 || active == 4">
|
|
|
<el-button size="small" type="primary" @click="next" class="normal-btn-width" v-if="active == 1 && mode == '手动输入'">下一步</el-button>
|
|
|
- <el-button size="small" type="primary" @click="active=4" class="normal-btn-width" v-if="active == 3" :disabled="$refs.fujianRef.list.length!= 0">下一步</el-button>
|
|
|
<el-button size="small" type="primary" @click="close" class="normal-btn-width" v-if="active == 4">完成</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -302,6 +324,8 @@ export default {
|
|
|
actuatorbrand:[],
|
|
|
actuatorname:[],
|
|
|
actuatordrivetype:[],
|
|
|
+ actuatorsignal:[],
|
|
|
+ supplyvoltage:[],
|
|
|
flh:[],
|
|
|
drivetype:[],
|
|
|
bodystructure:[],
|
|
|
@@ -344,7 +368,7 @@ export default {
|
|
|
"id": 20240718162102,
|
|
|
"content": {
|
|
|
"pageNumber": 1,
|
|
|
- "pageSize": 9999999,
|
|
|
+ "pageSize": 30,
|
|
|
"where": {
|
|
|
"condition": "",
|
|
|
"caliber": "", //公称通径
|
|
|
@@ -363,15 +387,17 @@ export default {
|
|
|
"content": {
|
|
|
"itemid": "",//光头id
|
|
|
"pageNumber": 1,
|
|
|
- "pageSize": 9999999,
|
|
|
+ "pageSize": 30,
|
|
|
"where": {
|
|
|
+ "actuatordrivetype": "电动开关", //驱动方式
|
|
|
"condition1": "",
|
|
|
"condition2": "",
|
|
|
"torque": "", //阀门扭矩
|
|
|
"flh": "", //法兰号
|
|
|
"actuatorbrand": "", //品牌
|
|
|
"actuatorname":'',
|
|
|
- "actuatordrivetype": "", //驱动方式
|
|
|
+ "supplyvoltage":'',
|
|
|
+ "actuatorsignal":'',
|
|
|
"maxsquarewidth": "", //方阀杆最大宽度
|
|
|
"maxrounddiameter": "" //圆阀杆最大直径
|
|
|
}
|
|
|
@@ -397,13 +423,13 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
- 'excelParam.content.where.actuatorbrand': {
|
|
|
- handler (val) {
|
|
|
- setTimeout(() => {
|
|
|
- this.calcTableHieght('excelRef')
|
|
|
- },500)
|
|
|
- }
|
|
|
- },
|
|
|
+ // 'excelParam.content.where.actuatorbrand': {
|
|
|
+ // handler (val) {
|
|
|
+ // setTimeout(() => {
|
|
|
+ // this.calcTableHieght('excelRef')
|
|
|
+ // },500)
|
|
|
+ // }
|
|
|
+ // },
|
|
|
active (val) {
|
|
|
switch (val) {
|
|
|
case 1:
|
|
|
@@ -573,8 +599,9 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
let target = this.$refs[id].$el.getBoundingClientRect()
|
|
|
let clientHeight = document.body.clientHeight
|
|
|
- this.tableHeight = clientHeight - target.top - 85 + 'px'
|
|
|
+ this.tableHeight = clientHeight - target.top - 30 + 'px'
|
|
|
this.$refs[id].$refs.table.doLayout()
|
|
|
+ console.log('出发');
|
|
|
|
|
|
})
|
|
|
},
|
|
|
@@ -586,17 +613,19 @@ export default {
|
|
|
"content": {
|
|
|
"itemid": 0,//光头id
|
|
|
"pageNumber": 1,
|
|
|
- "pageSize": 9999999,
|
|
|
+ "pageSize": 30,
|
|
|
"where": {
|
|
|
+ "actuatordrivetype": '电动开关', //驱动方式
|
|
|
"condition1": "",
|
|
|
"condition2": "",
|
|
|
"torque": "", //阀门扭矩
|
|
|
"flh": "", //法兰号
|
|
|
"actuatorbrand": "", //品牌
|
|
|
"actuatorname":'',
|
|
|
- "actuatordrivetype": "", //驱动方式
|
|
|
+ "supplyvoltage":'',
|
|
|
+ "actuatorsignal":'',
|
|
|
"maxsquarewidth": "", //方阀杆最大宽度
|
|
|
- "maxrounddiameter": "" //圆阀杆最大直径
|
|
|
+ "maxrounddiameter": "", //圆阀杆最大直径
|
|
|
}
|
|
|
},
|
|
|
}
|
|
|
@@ -607,7 +636,7 @@ export default {
|
|
|
"id": 20240718162302,
|
|
|
"content": {
|
|
|
"pageNumber": 1,
|
|
|
- "pageSize": 9999999,
|
|
|
+ "pageSize": 30,
|
|
|
"where": {
|
|
|
"condition1": "",
|
|
|
"torque": "", //阀门扭矩
|
|
|
@@ -667,6 +696,7 @@ 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)
|
|
|
+ if (!this.fujianParam.content.othertypes.length) return this.active = 4
|
|
|
this.loading = true
|
|
|
this.$refs.fujianRef.listData(()=> {
|
|
|
this.fujianArr.push(data)
|
|
|
@@ -712,7 +742,7 @@ export default {
|
|
|
});
|
|
|
this.drivetype = [{remarks:'电动',value:'电动'},{remarks:'气动',value:'气动'}];
|
|
|
console.log(this.drivetype, "驱动方式");
|
|
|
- this.$store.dispatch("optiontypeselect", "actuatorbrand").then((res) => {
|
|
|
+ this.$store.dispatch("optiontypeselect", "lectotypebrand").then((res) => {
|
|
|
this.actuatorbrand = res.data;
|
|
|
console.log(this.actuatorbrand, "执行器品牌");
|
|
|
});
|
|
|
@@ -732,6 +762,14 @@ export default {
|
|
|
this.flh = res.data;
|
|
|
console.log(this.func, "法兰号");
|
|
|
});
|
|
|
+ this.$store.dispatch("optiontypeselect", "actuatorsignal").then((res) => {
|
|
|
+ this.actuatorsignal = res.data;
|
|
|
+ console.log(this.actuatorsignal, "信号");
|
|
|
+ });
|
|
|
+ this.$store.dispatch("optiontypeselect", "supplyvoltage").then((res) => {
|
|
|
+ this.supplyvoltage = res.data;
|
|
|
+ console.log(this.supplyvoltage, "电源电压");
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
created () {
|
|
|
@@ -773,7 +811,7 @@ export default {
|
|
|
font-family: Microsoft YaHei, Microsoft YaHei;
|
|
|
width: 240px;
|
|
|
border-right: 1px #999999 solid;
|
|
|
- z-index: 99999991;
|
|
|
+ z-index: 301;
|
|
|
flex-shrink: 0;
|
|
|
word-wrap: break-word;
|
|
|
}
|
|
|
@@ -860,6 +898,7 @@ export default {
|
|
|
font-family: Source Han Sans SC, Source Han Sans SC;
|
|
|
padding: 10px 40px !important;
|
|
|
flex: 1;
|
|
|
+ margin-bottom: 0 !important;
|
|
|
overflow: hidden;
|
|
|
}
|
|
|
.my-steps {
|
