xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '1' (#27) from pc-master into portal 

Reviewed-on: #27
pull/34/head^2
xiaomeng 2023-11-10 07:45:36 +00:00
parent 1928aeaa61 5d1c0d32a3
commit 3092d08a92
4 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/assets/css/main.css
View File

@ -1047,7 +1047,7 @@
}
.sensorSet .sensor-view .right .right-top .input-sel {
margin: 30px 0;
margin: 15px 0 30px;
}
.sensorSet .sensor-view .right .right-top .input-sel > .title {
@ -1065,6 +1065,7 @@
cursor: pointer;
white-space: nowrap;
margin-right: 30px;
padding: 0 0 15px 0;
}
.sensorSet .sensor-view .right .right-top .right-sel > div > .no-sel {
@ -1098,6 +1099,22 @@
margin-right: 30px;
}
.sensorSet.sensorSet-con .right-sel {
width: 100%;
flex-wrap: wrap;
}
.sensorSet.sensorSet-con .right-sel .sensor-type-div {
margin-bottom: 0;
background: unset;
border: none;
height: auto;
}
.sensorSet.sensorSet-con .right-sel .sensor-type-div .sensor-sel > div {
padding-left: 0;
}
.sensorSet .sensor-type .sensor-title {
font-size: 20px;
font-family: Microsoft YaHei;
@ -1106,6 +1123,10 @@
padding: 20px 0;
}
.sensorSet .sensor-type .sensor-title .sensor-sel > div {
padding-left: 0;
}
.sensorSet .sensor-type .sensor-type-div {
width: 100%;
height: 66px;

2
src/assets/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
src/assets/css/main.scss
View File

@ -1104,7 +1104,7 @@
border-bottom: 1px solid rgba(0, 180, 255, 0.35);
.input-sel {
margin: 30px 0;
margin: 15px 0 30px;
>.title {
@ -1115,14 +1115,14 @@
.right-sel {
display: flex;
align-items: center;
>div {
display: flex;
align-items: center;
cursor: pointer;
white-space: nowrap;
margin-right: 30px;
padding:0 0 15px 0;
>.no-sel {
margin-right: 10px;
width: 35px;
@ -1159,6 +1159,23 @@
}
}
&.sensorSet-con{
.right-sel{
width: 100%;
flex-wrap: wrap;
.sensor-type-div{
margin-bottom: 0;
background: unset;
border: none;
height: auto;
.sensor-sel{
>div{
padding-left: 0;
}
}
}
}
}
.sensor-type {
.sensor-title {
font-size: 20px;
@ -1166,6 +1183,11 @@
font-weight: bold;
color: #FFFFFF;
padding: 20px 0;
.sensor-sel{
>div{
padding-left: 0;
}
}
}
.sensor-type-div {

25
src/views/page/sensorSet-con.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="irrigateSet sensorSet">
<div class="irrigateSet sensorSet sensorSet-con">
<div class="table-title">
<img src="../../assets/image/sensor.png" alt=""> 传感器配置界面
</div>
@ -20,6 +20,25 @@
<div v-else class="sel"></div>
有效性
</div>
<div class="sensor-type">
<template v-for="item, index in openTypeList" >
<div class="sensor-type-div" v-if="active==index" >
<div class="sensor-sel">
<div>
<div @click="changeTypeOpen(index, '0')" :class="item == '1' ? 'no-sel' : 'sel'">
</div>
485通讯类型的传感器
</div>
<div>
<div @click="changeTypeOpen(index, '1')" :class="item == '0' ? 'no-sel' : 'sel'">
</div>
4-20ma模拟量类型的传感器
</div>
</div>
</div>
</template>
</div>
</div>
<div class="input-sel">
<div class="title">专感器类型</div>
@ -81,7 +100,7 @@
</div>
</div>
<div class="sensor-type">
<!-- <div class="sensor-type">
<div class="sensor-title">通道输入信号类型</div>
<div class="sensor-type-div" v-for="item, index in openTypeList" :key="index">
<div class="name">第{{ index + 1 }}通道</div>
@ -96,7 +115,7 @@
</div>
</div>
</div>
</div>
</div> -->
</div>
</template>
<script>