邓洁: 修改bug

2023-12-30 20:11:32 +08:00
parent 1dd856e2ca
commit 3150343a40
8 changed files with 100 additions and 49 deletions
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="tunnel-bgc">
    <div class="box-top">
-      <div class="back-tunnel" @click="handleGoTunnelMgr">
+      <div class="back-tunnel" @click="router.back(-1)">
        <div class="back-icon"></div>
        <span>返回</span>
      </div>
@@ -40,7 +40,7 @@
              <input
                  type="number"
                  min="0"
-                  v-model="collectionFrequency"
+                  v-model="fanFrequency"
              />
              </span>
            </div>
@@ -52,21 +52,21 @@
                      :cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="fanData">
              <el-table-column prop="equipmentName" label="设备名称" align="center"/>
              <el-table-column prop="phaseCurrentAOffset" label="A电流偏移量" align="center"/>
-              <el-table-column prop="avoltageValue" label="A电流阈值" align="center">
+              <el-table-column prop="acurrentValue" label="A电流阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="A电流" v-model="scope.row.avoltageValue"></el-input>
+                  <el-input placeholder="A电流" v-model="scope.row.acurrentValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="phaseCurrentBOffset" label="B电流偏移量" align="center"/>
-              <el-table-column prop="bvoltageValue" label="B电流阈值" align="center">
+              <el-table-column prop="bcurrentValue" label="B电流阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="B电流" v-model="scope.row.bvoltageValue"></el-input>
+                  <el-input placeholder="B电流" v-model="scope.row.bcurrentValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="phaseCurrentCOffset" label="C电流偏移量" align="center"/>
-              <el-table-column prop="cvoltageValue" label="C电流阈值" align="center">
+              <el-table-column prop="ccurrentValue" label="C电流阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="C电流" v-model="scope.row.cvoltageValue"></el-input>
+                  <el-input placeholder="C电流" v-model="scope.row.ccurrentValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
@@ -90,7 +90,7 @@
            </el-table>
          </div>
          <div class="btns">
-            <div class="cancel-btn">
+            <div class="cancel-btn" @click="router.back(-1)">
              取消
            </div>
            <div class="sure-btn" @click="handleEditFan">
@@ -107,7 +107,7 @@
              <input
                  type="number"
                  min="0"
-                  v-model="collectionFrequency"
+                  v-model="windFrequency"
              />
              </span>
            </div>
@@ -150,10 +150,10 @@
            </el-table>
          </div>
          <div class="btns">
-            <div class="cancel-btn">
+            <div class="cancel-btn" @click="router.back(-1)">
              取消
            </div>
-            <div class="sure-btn" @click="handleEditFan">
+            <div class="sure-btn" @click="handleEditWind">
              确定
            </div>
          </div>
@@ -167,7 +167,7 @@
              <input
                  type="number"
                  min="0"
-                  v-model="collectionFrequency"
+                  v-model="otherFrequency"
              />
              </span>
            </div>
@@ -210,10 +210,10 @@
            </el-table>
          </div>
          <div class="btns">
-            <div class="cancel-btn" @click="isVisited=false">
+            <div class="cancel-btn" @click="router.back(-1)">
              取消
            </div>
-            <div class="sure-btn" @click="handleEditFan">
+            <div class="sure-btn" @click="handleEditOther">
              确定
            </div>
          </div>
@@ -227,7 +227,7 @@
              <input
                  type="number"
                  min="0"
-                  v-model="collectionFrequency"
+                  v-model="fenFrequency"
              />
              </span>
            </div>
@@ -265,10 +265,10 @@
            </el-table>
          </div>
          <div class="btns">
-            <div class="cancel-btn" @click="isVisited=false">
+            <div class="cancel-btn" @click="router.back(-1)">
              取消
            </div>
-            <div class="sure-btn" @click="handleEditFan">
+            <div class="sure-btn" @click="handleEditFen">
              确定
            </div>
          </div>
@@ -282,12 +282,15 @@
 import {getEquipmentList, editFan} from "@/api/tunnelManage";
 import {ElMessage} from "element-plus";
 import {editEquipment, getTunnelDetail} from "@/api/tunnelManage";
+import {editAcquisitions} from "../../api/tunnelManage";

 const router = useRouter()
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
 const userId = reactive(router.currentRoute.value.params.userId)
 const type = reactive(router.currentRoute.value.params.type)
-const collectionFrequency = ref(0)
+const fanFrequency = ref(0)
+const windFrequency = ref(0)
+const otherFrequency = ref(0)
 const changeIndex = ref(1)
 const fanData = ref([
  // {
@@ -473,25 +476,57 @@ const fenliuData = ref([
 ])
 const siteId = ref(0)
 const tunnelName = ref('')
-
-const handleEditFan = () => {
-  const data = [
-    ...otherData.value,
-    ...winData.value,
-    ...fanData.value,
-  ]
-  editFan(data).then(res => {
+const changeFrequency = (acquisition, typeKey) => {
+  const data = {
+    acquisitionPeriod: acquisition,
+    tunnelId: tunnelId,
+    typeKey: typeKey
+  }
+  editAcquisitions([data]).then(res => {
    if (res.code === 1000) {
-      ElMessage.success('修改成功')
-      router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
-    }else {
+
+    } else {
      ElMessage.error(res.msg)
    }
  })
 }
+const handleEditFan = () => {
+  editFan(fanData.value).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success('修改成功')
+      router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+  changeFrequency(fanFrequency.value, 'frequency')
+}
+const handleEditWind = () => {
+  editEquipment(winData.value).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success('修改成功')
+      router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+  changeFrequency(windFrequency.value, 'windPressure')
+}
+const handleEditOther = () => {
+  editEquipment(otherData.value).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success('修改成功')
+      router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+  changeFrequency(otherFrequency.value, 'sensor')
+}
 const handleChangeMenu = (e) => {
  changeIndex.value = e
 }
+
 const getList = () => {
  getEquipmentList(tunnelId).then(res => {
    if (res.code === 1000) {
@@ -505,8 +540,12 @@ const getList = () => {
      })
      otherData.value = res.data.sensorList
      res.data.acquisitionList.map(item => {
-        if (item.tunnelId == tunnelId) {
-          collectionFrequency.value = item.acquisitionPeriod
+        if(item.typeKey === 'frequency'){
+          fanFrequency.value = item.acquisitionPeriod
+        }else if(item.typeKey === 'windPressure'){
+          windFrequency.value = item.acquisitionPeriod
+        }else if(item.typeKey ==='sensor'){
+          otherFrequency.value = item.acquisitionPeriod
        }
      })
    }
@@ -760,6 +799,8 @@ getList()
            .el-input__inner {
              color: #FFFFFF;
              font-size: 40px;
+              height: auto;
+              line-height: normal;
            }
          }
        }
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -45,6 +45,7 @@ import { editTunnel, getTunnelDetail } from "@/api/tunnelManage";
 import { computed, provide } from "vue";
 import { useModelSceneStore } from "@/store/modelSceneStore";
 import { ElMessage } from "element-plus";
+import {initSceneData} from "../../api/tunnelScene";

 const router = useRouter();
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId);
@@ -58,21 +59,22 @@ const form = ref({
  isDefault: false,
  remarks: "",
 });
-const equipmentList = ref([]);
-onMounted(async () => {
-  // equipmentList.value = await store.getEquipmentList();
-});
 const getTunnel = () => {
  getTunnelDetail(tunnelId).then((res) => {
    if (res?.code === 1000) {
      form.value = res.data;
+      console.log('form.value ',form.value )
    }
  });
 };
 getTunnel();
 const tunnelLength = computed(() => form.value.totalLength);
 const handleGotoDevice = () => {
-  router.push("/device/" + tunnelId);
+  if (type === 's') {
+    router.push('/device/' + tunnelId + '/s/' + userId)
+  } else if (type === 'i') {
+    router.push('/device/' + tunnelId + '/i/' + userId)
+  }
 };
 const handleGoTunnelMgr = () => {
  router.push("/tunnel/" + form.value.siteId + "/" + type + "/" + userId);
@@ -87,7 +89,7 @@ const handleSave = async () => {
    // constructionLength: 500,
    tunnelLength: form.value.totalLength,
    isDefault: form.value.isDefault,
-    modelEquipmentList: await modelStore.getEquipmentList(),
+    modelEquipmentList: await modelStore.initModelDataPreview(tunnelId),
  };
  editTunnel(data).then((res) => {
    if (res?.code === 1000) {
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -175,7 +175,6 @@ const getOtherInfo = () => {
  getLargeScreenInfo().then((res) => {
    if (res?.code === 1000) {
      let routeArr = [];
-      console.log(res.data.routeList, "res.data.routeList")
      res.data.routeList.forEach((item, index) => {
        for (let btn of btnList.value) {
          if (item === btn.route) {
@@ -186,9 +185,9 @@ const getOtherInfo = () => {
      routeList.value = routeArr
      showMenu.value = true
      siteList.value = res.data.siteOption
-      currentSiteId.value = res.data.siteOption[res.data.siteOption.length - 1].value
-      currentSite.value = res.data.siteOption[res.data.siteOption.length - 1].label
-      getTunnel(res.data.siteOption[res.data.siteOption.length - 1].value)
+      currentSiteId.value = res.data.siteOption[0].value
+      currentSite.value = res.data.siteOption[0].label
+      getTunnel(res.data.siteOption[0].value)
    }
  });
 };