邓洁: 分流阀值样式及设备接口对接

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)

src/views/tunnel/index.vue

@@ -24,7 +24,7 @@
           </el-dropdown>
         </div>
         <div class="current-user">
-          上午好：<span>{{ currentUser }}</span>
+          你好！<span>{{ currentUser }}</span>
           <span>今天是：{{ currentDate }}</span>
           <div class="logout" @click="handleLogout"></div>
         </div>