Merge pull request '邓洁 : 隧道接口部分对接' (#195) from dengjie into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/195
2023-12-28 12:53:50 +00:00
parent 9017465b15 67f40cd6b1
commit 50270cddd3
3 changed files with 37 additions and 87 deletions
--- a/src/components/content/windPressure/WindPressureList.vue
+++ b/src/components/content/windPressure/WindPressureList.vue
@@ -2,11 +2,11 @@
  <div id="wind-pressure">
    <div class="name">风压</div>
    <div class="list">
-      <wind-pressure-item v-for="(item,index) in wpList" :key="item.equipmentId" :wp="item" :index="index+1"
-                          @click="handleOpenChart(item,index+1)"/>
+      <wind-pressure-item v-for="(item,index) in wpList" :key="item.equipmentId" :wp="item"
+                          @click="handleOpenChart(item)"/>
    </div>
    <div class="digital-tunnel">
-      <el-dialog :close-on-click-modal="false" v-model="isVisited" :title="windSort+'号风压监控数据'" width="2175px" :modal="false">
+      <el-dialog :close-on-click-modal="false" v-model="isVisited" :title="windSort+'监控数据'" width="2175px" :modal="false">
        <div class="left-top-icon"></div>
        <div class="right-top-icon"></div>
        <div class="chat-dialog">
@@ -69,9 +69,9 @@ const getWindInfo = (equipmentId) => {
  })
 }

-const handleOpenChart = (item, index) => {
+const handleOpenChart = (item) => {
  getWindInfo(item.equipmentId)
-  windSort.value = index
+  windSort.value = item.equipmentName
 }
 const timeSelect = (index) => {
  console.log('选择时间', index)
@@ -89,6 +89,7 @@ const getScreenInfo = (now) => {
  now?.map(item => {
    windPressureObj = {
      equipmentId: item.equipmentId,
+      equipmentName: item.equipmentName,
      max: 120,
      value: item.value,
      point: item.valueThreshold,
--- a/src/components/content/windPressure/childComps/WindPressureItem.vue
+++ b/src/components/content/windPressure/childComps/WindPressureItem.vue
@@ -2,7 +2,7 @@
  <div id="wind-pressure-item" :class="{ abnormal:isWaring }">
    <div class="label">
      <img src="../../../../assets/images/windPressure/icon.png" alt=""/>
-      <span>{{ index }}号风压</span>
+      <span>{{params.wp.equipmentName}}</span>
    </div>
    <div class="container" ref="length">
      <div class="value" ref="value"></div>
@@ -16,8 +16,7 @@

 <script setup>
 const params = defineProps({
-  wp: Object,
-  index: Number,
+  wp: Object
 });
 // const info = {
 //   windPId: 0, //编号
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -53,20 +53,17 @@
              <el-table-column prop="equipmentName" label="设备名称" align="center"/>
              <el-table-column prop="phaseCurrentAOffset" label="A电流" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入A电流" v-model="scope.row.phaseCurrentAOffset"
-                            @change="changeCurrent(scope.row)"></el-input>
+                  <el-input placeholder="请输入A电流" v-model="scope.row.phaseCurrentAOffset"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="phaseCurrentBOffset" label="B电流" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入B电流" v-model="scope.row.phaseCurrentBOffset"
-                            @change="changeCurrent(scope.row)"></el-input>
+                  <el-input placeholder="请输入B电流" v-model="scope.row.phaseCurrentBOffset"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="phaseCurrentCOffset" label="C电流" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入C电流" v-model="scope.row.phaseCurrentCOffset"
-                            @change="changeCurrent(scope.row)"></el-input>
+                  <el-input placeholder="请输入C电流" v-model="scope.row.phaseCurrentCOffset"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
@@ -74,13 +71,13 @@
                  <div class="switch">
                    <div
                        :class="{ active: scope.row.state }"
-                        @click="scope.row.state = 1;changeState(scope.row)"
+                        @click="scope.row.state = 1"
                    >
                      启用
                    </div>
                    <div
                        :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state = 0;changeState(scope.row)"
+                        @click=" scope.row.state = 0"
                    >
                      停用
                    </div>
@@ -121,12 +118,12 @@
              <el-table-column prop="offset" label="偏移量" align="center"/>
              <el-table-column prop="unit" label="单位" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入单位" v-model="scope.row.unit" @change="changeCurrent(scope.row)"></el-input>
+                  <el-input placeholder="请输入单位" v-model="scope.row.unit"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="alarmValue" label="阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入阈值" v-model="scope.row.alarmValue" @change="changeCurrent(scope.row)"></el-input>
+                  <el-input placeholder="请输入阈值" v-model="scope.row.alarmValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
@@ -134,13 +131,13 @@
                  <div class="switch">
                    <div
                        :class="{ active: scope.row.state }"
-                        @click=" scope.row.state = 1;changeState(scope.row)"
+                        @click=" scope.row.state = 1;"
                    >
                      启用
                    </div>
                    <div
                        :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state =  0;changeState(scope.row)"
+                        @click=" scope.row.state =  0;"
                    >
                      停用
                    </div>
@@ -153,7 +150,7 @@
            <div class="cancel-btn">
              取消
            </div>
-            <div class="sure-btn" @click="editWinPresure">
+            <div class="sure-btn" @click="handleEditFan">
              确定
            </div>
          </div>
@@ -181,12 +178,12 @@
              <el-table-column prop="offset" label="偏移量" align="center"/>
              <el-table-column prop="unit" label="单位" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入单位" v-model="scope.row.unit"  @change="changeCurrent(scope.row)"></el-input>
+                  <el-input placeholder="请输入单位" v-model="scope.row.unit"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="alarmValue" label="阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入阈值" v-model="scope.row.alarmValue"  @change="changeCurrent(scope.row)"></el-input>
+                  <el-input placeholder="请输入阈值" v-model="scope.row.alarmValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
@@ -194,13 +191,13 @@
                  <div class="switch">
                    <div
                        :class="{ active: scope.row.state }"
-                        @click=" scope.row.state = 1;changeState(scope.row)"
+                        @click=" scope.row.state = 1;"
                    >
                      启用
                    </div>
                    <div
                        :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state =  0;changeState(scope.row)"
+                        @click=" scope.row.state =  0;"
                    >
                      停用
                    </div>
@@ -213,7 +210,7 @@
            <div class="cancel-btn" @click="isVisited=false">
              取消
            </div>
-            <div class="sure-btn" @click="editOtherSensor">
+            <div class="sure-btn" @click="handleEditFan">
              确定
            </div>
          </div>
@@ -268,7 +265,7 @@
            <div class="cancel-btn" @click="isVisited=false">
              取消
            </div>
-            <div class="sure-btn" @click="router.back(-1)">
+            <div class="sure-btn" @click="handleEditFan">
              确定
            </div>
          </div>
@@ -282,6 +279,7 @@
 import {getEquipmentList, editFan} from "@/api/tunnelManage";
 import {ElMessage} from "element-plus";
 import {editEquipment, getTunnelDetail} from "@/api/tunnelManage";
+
 const router = useRouter()
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
 const type = reactive(router.currentRoute.value.params.type)
@@ -469,75 +467,27 @@ const fenliuData = ref([
  //   state: false,
  // }
 ])
-const fanItem=ref({})
-const windItem=ref({})
-const sensorItem=ref({})
-const siteId=ref(0)
-const tunnelName=ref('')
+const siteId = ref(0)
+const tunnelName = ref('')

-const changeCurrent = (row) => {
-  fanItem.value=getFanEditItem(row)
-  windItem.value=getWindEditItem(row)
-  sensorItem.value=getSensorEditItem(row)
-}
-const changeState = (row) => {
-  fanItem.value=getFanEditItem(row)
-  windItem.value=getWindEditItem(row)
-  sensorItem.value=getSensorEditItem(row)
-}
-const getFanEditItem = (item) => {
-  return {
-    equipmentId: item.equipmentId,
-    phaseCurrentAOffset: parseInt(item.phaseCurrentAOffset),
-    phaseCurrentBOffset: parseInt(item.phaseCurrentBOffset),
-    phaseCurrentCOffset: parseInt(item.phaseCurrentCOffset),
-    state: item.state,
-  }
-}
-const getWindEditItem = (item) => {
-  return {
-    equipmentId: item.equipmentId,
-    unit: item.unit,
-    alarmValue: item.alarmValue,
-    state: item.state,
-  }
-}
-const getSensorEditItem = (item) => {
-  return {
-    equipmentId: item.equipmentId,
-    unit: item.unit,
-    alarmValue: item.alarmValue,
-    state: item.state,
-  }
-}
-const editWinPresure=()=>{
-  editEquipment([windItem.value]).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success('修改成功')
-    }
-  })
-}
-const editOtherSensor=()=>{
-  editEquipment([sensorItem.value]).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success('修改成功')
-    }
-  })
-}
 const handleEditFan = () => {
-  editFan([fanItem.value]).then(res => {
+  const data = [
+    ...otherData.value,
+    ...winData.value,
+    ...fanData.value,
+  ]
+  editFan(data).then(res => {
    if (res.code === 1000) {
      ElMessage.success('修改成功')
+      router.push('/tunnel/' + siteId.value + '/' + type)
    }
  })
 }
 const handleChangeMenu = (e) => {
-  console.log('切换', e)
  changeIndex.value = e
 }
 const getList = () => {
  getEquipmentList(tunnelId).then(res => {
-    console.log('设备列表', res)
    if (res.code === 1000) {
      fanData.value = res.data.frequencyChangerList
      winData.value = res.data.windPressureSensorList
@@ -555,13 +505,13 @@ const getTunnel = () => {
    if (res?.code === 1000) {
      siteId.value = res.data.siteId
      tunnelName.value = res.data.tunnelName
-      console.log('设备详情',res.data)
+      console.log('设备详情', res.data)
    }
  });
 }
 getTunnel()
-const handleGoTunnelMgr=()=>{
-  router.push('/tunnel/' + siteId.value+'/'+type)
+const handleGoTunnelMgr = () => {
+  router.push('/tunnel/' + siteId.value + '/' + type)
 }
 getList()
 </script>