odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trp:上一次代码提交冲突解决

Browse Source
This commit is contained in:
trp
2024-09-02 23:58:12 +08:00
parent dcd43ff5da 6bed6482a2
commit aadef41fff
5 changed files with 83 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/content/fanInfo/FanInfo.vue
View File

@@ -71,20 +71,20 @@
<div class="current" @click="handleOpenChart(item)">
<fan-info-item :wp="transducerData[index]"/>
</div>
<div class="line"></div>
</div>
<div class="shunt-box">
<div class="shuntThreshold" v-for="(item,index) in shuntList">
<div class="fenliu-icon"></div>
{{ index + 1 }}号分流阀值
<span class="units"
><input
type="number"
min="0"
v-model="item.shuntThreshold"
/></span>
</div>
<div class="line" v-if="index!=socketData.length-1"></div>
</div>
<!-- <div class="shunt-box">-->
<!-- <div class="shuntThreshold" v-for="(item,index) in shuntList">-->
<!-- <div class="fenliu-icon"></div>-->
<!-- {{ index + 1 }}号分流阀值-->
<!-- <span class="units"-->
<!-- ><input-->
<!-- type="number"-->
<!-- min="0"-->
<!-- v-model="item.shuntThreshold"-->
<!-- /></span>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="digital-tunnel">

16
src/components/content/tunnelScene/preEquComp/preDialog.vue
View File

@@ -201,7 +201,7 @@ function addEquipment() {
<style lang="scss" scoped>
#edit-dialog {
// width: 540px;
width: 230px;
width: 240px;
// height: 120px;
// min-height: 683px;
background: rgba(7, 35, 72, 0.79);
@@ -219,7 +219,7 @@ function addEquipment() {
margin: 20px 20px 0px 30px;
p {
width: 388px;
width: 400px;
height: 35px;
font-size: 24px;
font-family: MicrosoftYaHei;
@@ -259,19 +259,21 @@ function addEquipment() {
padding: 15px 15px 5px 15px;
display: flex;
gap: 10px;
p {
width: 190px;
line-height: 35px;
font-size: 18px;
font-family: MicrosoftYaHei;
p:nth-child(1) {
width: 80px;
height: 35px;
line-height: 35px;
font-size: 18px;
font-family: MicrosoftYaHei;
color: #ffffff;
text-align: right;
}
p:nth-child(2) {
color: #f7b500;
height: 35px;
text-align: left;
flex: 2;
}
}