diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index b2538ec..5268939 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -56,21 +56,24 @@
-
+
+
+
+
+
+ {{ index + 1 }}号分流阀值
+
+
@@ -118,6 +121,20 @@ let Echarts_info1 = null;
let fan01_option = reactive();
const shuntThreshold = ref(23)
const transducerData = ref([])
+const shuntList = ref([
+ {
+ shuntThreshold: 23
+ },
+ {
+ shuntThreshold: 14
+ },
+ {
+ shuntThreshold: 22
+ },
+ {
+ shuntThreshold: 46
+ },
+])
const stateA = ref(false)
const stateB = ref(false)
const stateC = ref(false)
@@ -531,11 +548,12 @@ input::-webkit-inner-spin-button {
input[type="number"] {
-moz-appearance: textfield;
}
-:deep(.el-radio-group){
- .el-radio{
- display: flex;
- align-items: center;
- }
+
+:deep(.el-radio-group) {
+ .el-radio {
+ display: flex;
+ align-items: center;
+ }
}
@@ -582,6 +600,72 @@ input[type="number"] {
.fans {
height: calc(100% - 30px);
+ .shunt-box {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ margin-left: 15px;
+ margin-top: 15px;
+
+ .shuntThreshold {
+ display: flex;
+ align-items: center;
+ padding-bottom: 20px;
+ padding-right: 45px;
+ font-size: 28px;
+ color: #FFFFFF;
+ border-right: 2px solid #38CAFB;
+ margin-right: 45px;
+
+ &:nth-child(2n) {
+ border-right: none;
+ margin-right: 0;
+ padding-right: 0;
+ }
+
+ &:nth-child(3), &:nth-child(4) {
+ padding-bottom: 0;
+ }
+
+ .fenliu-icon {
+ margin-right: 9px;
+ width: 31px;
+ height: 28px;
+ background-image: url('../../../assets/images/fanInfo/fsp_icon_flf.png');
+ }
+
+ .units {
+ z-index: 22;
+ position: relative;
+ }
+
+ input {
+ width: 130px;
+ height: 44px;
+ border: 2px solid #0f82af;
+ background: transparent;
+ margin-left: 14px;
+ outline: none;
+ font-size: 28px;
+ font-weight: bold;
+ color: #38cafb;
+ line-height: 37px;
+ }
+
+ .units::after {
+ content: "%";
+ position: absolute;
+ right: 6px;
+ top: 40%;
+ bottom: 0;
+ transform: translateY(-50%);
+ font-size: 28px;
+ color: #38cafb;
+ line-height: 37px;
+ }
+ }
+ }
+
.fan-item {
//height: 33.5%;
height: 50%;
@@ -595,7 +679,7 @@ input[type="number"] {
display: flex;
.echart {
- height: 270px;
+ height: 245px;
width: 34%;
margin: 0px 0px 0px 10px;
position: relative;
@@ -742,60 +826,11 @@ input[type="number"] {
}
}
}
-
- .shuntThreshold {
- display: flex;
- align-items: center;
- justify-content: flex-end;
- //align-items: center;
- //width: 112px;
- padding-top: 30px;
- padding-right: 25px;
- font-size: 28px;
- color: #FFFFFF;
-
- .fenliu-icon {
- margin-right: 9px;
- width: 31px;
- height: 28px;
- background-image: url('../../../assets/images/fanInfo/fsp_icon_flf.png');
- }
-
- .units {
- z-index: 22;
- position: relative;
- }
-
- input {
- width: 130px;
- height: 44px;
- border: 2px solid #0f82af;
- background: transparent;
- margin-left: 14px;
- outline: none;
- font-size: 28px;
- font-weight: bold;
- color: #38cafb;
- line-height: 37px;
- }
-
- .units::after {
- content: "%";
- position: absolute;
- right: 6px;
- top: 40%;
- bottom: 0;
- transform: translateY(-50%);
- font-size: 28px;
- color: #38cafb;
- line-height: 37px;
- }
- }
}
}
.current {
- margin-top: 30px;
+ //margin-top: 30px;
margin-right: 20px;
margin-left: 26px;
//height: 37px;
@@ -808,6 +843,15 @@ input[type="number"] {
border-radius: 6px;
}
}
+
+ .line {
+ margin-top: 20px;
+ margin-left: 15px;
+ width: 776px;
+ height: 2px;
+ background: rgba(107, 163, 237, 0.4);
+ border-radius: 10px;
+ }
}
}
}
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index cc33760..bd90ea8 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -327,22 +327,14 @@ const changeOtherData=(row)=>{
editOtherData.value.push(row)
}
const editEquip = () => {
- let data
const basicData={
+ acquisitionList:frequencyData.value,
frequencyChangerList: editFanData.value,
windPressureSensorList: editWinData.value,
sensorList: editOtherData.value,
// shuntList: editFenLiuData.value,
}
- if(frequencyData.value.length!==0){
- data = {
- acquisitionList:frequencyData.value,
- ...basicData
- }
- }else {
- data = basicData
- }
- editEquipment(data).then(res => {
+ editEquipment(basicData).then(res => {
if (res.code === 1000) {
ElMessage.success('修改成功')
router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index f9ea77f..60886f6 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -24,7 +24,7 @@
- 上午好:
{{ currentUser }}
+ 你好!
{{ currentUser }}
今天是:{{ currentDate }}