邓洁: 修复bug

2023-12-28 23:00:52 +08:00
parent 50270cddd3
commit 6dde5ccbc8
11 changed files with 274 additions and 111 deletions
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -51,19 +51,22 @@
                      :header-cell-style="{backgroundColor: '#064B66',color: '#fff',fontSize: '40px',borderBottom: 'none' }"
                      :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="phaseCurrentAOffset" label="A电流偏移量" align="center"/>
+              <el-table-column prop="avoltageValue" label="A电流阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入A电流" v-model="scope.row.phaseCurrentAOffset"></el-input>
+                  <el-input placeholder="A电流" v-model="scope.row.avoltageValue"></el-input>
                </template>
              </el-table-column>
-              <el-table-column prop="phaseCurrentBOffset" label="B电流" align="center">
+              <el-table-column prop="phaseCurrentBOffset" label="B电流偏移量" align="center"/>
+              <el-table-column prop="bvoltageValue" label="B电流阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入B电流" v-model="scope.row.phaseCurrentBOffset"></el-input>
+                  <el-input placeholder="B电流" v-model="scope.row.bvoltageValue"></el-input>
                </template>
              </el-table-column>
-              <el-table-column prop="phaseCurrentCOffset" label="C电流" align="center">
+              <el-table-column prop="phaseCurrentCOffset" label="C电流偏移量" align="center"/>
+              <el-table-column prop="cvoltageValue" label="C电流阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入C电流" v-model="scope.row.phaseCurrentCOffset"></el-input>
+                  <el-input placeholder="C电流" v-model="scope.row.cvoltageValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
@@ -118,17 +121,17 @@
              <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"></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"></el-input>
+                  <el-input placeholder="阈值" v-model="scope.row.alarmValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
                <template #default="scope">
-                  <div class="switch">
+                  <div class="switch wind-switch">
                    <div
                        :class="{ active: scope.row.state }"
                        @click=" scope.row.state = 1;"
@@ -178,17 +181,17 @@
              <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"></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"></el-input>
+                  <el-input placeholder="阈值" v-model="scope.row.alarmValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
                <template #default="scope">
-                  <div class="switch">
+                  <div class="switch wind-switch">
                    <div
                        :class="{ active: scope.row.state }"
                        @click=" scope.row.state = 1;"
@@ -238,7 +241,7 @@
              <el-table-column prop="offset" label="偏移量" align="center"/>
              <el-table-column prop="thresholdValue" label="阈值" align="center">
                <template #default="scope">
-                  <el-input placeholder="请输入阈值" v-model="scope.row.thresholdValue"></el-input>
+                  <el-input placeholder="阈值" v-model="scope.row.thresholdValue"></el-input>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
@@ -282,6 +285,7 @@ import {editEquipment, getTunnelDetail} 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 changeIndex = ref(1)
@@ -479,7 +483,7 @@ const handleEditFan = () => {
  editFan(data).then(res => {
    if (res.code === 1000) {
      ElMessage.success('修改成功')
-      router.push('/tunnel/' + siteId.value + '/' + type)
+      router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
    }
  })
 }
@@ -490,7 +494,13 @@ const getList = () => {
  getEquipmentList(tunnelId).then(res => {
    if (res.code === 1000) {
      fanData.value = res.data.frequencyChangerList
+      res.data.windPressureSensorList.forEach(item => {
+        item.offset = item.offset + 4000
+      })
      winData.value = res.data.windPressureSensorList
+      res.data.sensorList.forEach(item => {
+        item.offset = item.offset + 4000
+      })
      otherData.value = res.data.sensorList
      res.data.acquisitionList.map(item => {
        if (item.tunnelId == tunnelId) {
@@ -511,7 +521,7 @@ const getTunnel = () => {
 }
 getTunnel()
 const handleGoTunnelMgr = () => {
-  router.push('/tunnel/' + siteId.value + '/' + type)
+  router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
 }
 getList()
 </script>
@@ -676,16 +686,20 @@ getList()

      .device-table {
        margin-top: 50px;
-        margin-left: 97px;
+        margin-left: 60px;

        .active {
          color: #FFFFFF;
          background: #0f7da9;
        }

+        .wind-switch {
+          margin-left: 65px;
+        }
+
        .switch {
          margin-top: 22px;
-          margin-left: 60px;
+
          display: flex;
          width: 200px;
          height: 50px;
@@ -704,7 +718,7 @@ getList()
        }

        :deep(.el-table--fit) {
-          width: 1700px !important;
+          width: 1780px !important;
        }

        :deep(.cell) {
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -51,6 +51,7 @@ import {ElMessage} from "element-plus";

 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 store = useModelSceneStore();
 const form = ref({
@@ -77,7 +78,7 @@ const handleGotoDevice = () => {
  router.push('/device/' + tunnelId)
 }
 const handleGoTunnelMgr=()=>{
-  router.push('/tunnel/' + form.value.siteId+'/'+type)
+  router.push('/tunnel/' + form.value.siteId+'/'+type+'/'+userId)
 }
 const handleSave = async () => {
  const data = {
@@ -94,7 +95,7 @@ const handleSave = async () => {
  editTunnel(data).then((res) => {
    if (res?.code === 1000) {
      ElMessage.success(res.msg)
-      router.push('/tunnel/' + form.value.siteId+'/'+type)
+      router.push('/tunnel/' + form.value.siteId+'/'+type+'/'+userId)
    }
  });
 }
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -22,7 +22,8 @@
      <div class="site-box" v-for="item in siteList" :key="item.siteId">
        <div class="top">
          <span>站点名称：{{ item.siteName }}</span>
-          <el-checkbox v-model="item.checked" size="large" @change="handleClickSite(item)"/>
+          <el-checkbox v-if="!item.isDefault" v-model="item.checked" size="large" @change="handleClickSite(item)"/>
+          <span v-else>默认</span>
        </div>
        <div class="box-center">
          <div class="left-img"></div>
@@ -106,6 +107,7 @@ import {editSite, getSiteDetail, getSiteList, addSite, deleteSite} from "@/api/s
 import {ElMessage, ElMessageBox} from "element-plus";

 const router = useRouter()
+const userId = reactive(router.currentRoute.value.params.userId)
 const siteList = ref([
  // {
  //   siteName: '松江站',
@@ -143,7 +145,6 @@ const info = ref({
  totalLength: 0
 })
 const title = ref('新增站点')
-const isClick = ref(false);
 const isVisited = ref(false);
 const total = ref(10);
 const showAddIcon = ref(true)
@@ -163,6 +164,7 @@ const formRules = ref({
 const formInstance = ref()
 const getList = () => {
  getSiteList({
+    userId:userId,
    ...pageInfo
  }).then((res) => {
    total.value = res.data.total;
@@ -199,7 +201,7 @@ const handleClickSite = (type) => {
  }
 }
 const goToAddTunnel = (siteId) => {
-  router.push('/tunnel/' + siteId+'/s')
+  router.push('/tunnel/' + siteId+'/s'+'/'+userId)
 }

 //重置from表单
@@ -258,7 +260,6 @@ const handleMoreDelete = () => {
    siteList.value.map(item=>{
      siteIds.value.map(siteItem=>{
        if(item.siteId===siteItem){
-          console.log('item.tunnelList',item.tunnelList)
          if(item.tunnelList.length!==0){
            ElMessage.error('该站点下存在隧道，不能删除!')
            flag=false
@@ -508,12 +509,12 @@ const handleCurrentChange = (val) => {
        color: #FFFFFF;
        line-height: 42px;

-        > div:last-child {
-          cursor: pointer;
-          width: 40px;
-          height: 40px;
+
+        > span:last-child {
+          padding:1px 8px;
+          font-size: 32px;
          border: 2px solid #05FEFF;
-          border-radius: 25px;
+          border-radius:10px;
          position: relative;
        }
      }
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -6,7 +6,7 @@
        <span>返回</span>
      </div>
      <div class="site-name">
-        {{siteName}}
+        {{ siteName }}
      </div>
      <div class="tunnel-title"></div>
      <div class="all-del-btn">
@@ -26,7 +26,8 @@
        <div class="top">
          <span>{{ item.tunnelName }}</span>
          <span>施工长度{{ item.constructionLength }}米 隧道长度{{ item.totalLength }}米</span>
-          <el-checkbox v-model="item.checked" size="large" @change="handleClickSite(item)"/>
+          <el-checkbox v-if="!item.isDefault" v-model="item.checked" size="large" @change="handleClickSite(item)"/>
+          <span v-else>默认</span>
        </div>
        <div class="box-center">
          <div>
@@ -106,13 +107,14 @@

 <script setup>
 import {ElMessage, ElMessageBox} from "element-plus";
-import {getTunnelList,addTunnel, deleteTunnel} from "@/api/tunnelManage";
+import {getTunnelList, addTunnel, deleteTunnel} from "@/api/tunnelManage";
 import {onMounted} from "vue";
-import { getSiteDetail} from "@/api/site";
+import {getSiteDetail} from "@/api/site";

 const router = useRouter()
 const showAddIcon = ref(true)
 const siteId = reactive(router.currentRoute.value.params.siteId)
+const userId = reactive(router.currentRoute.value.params.userId)
 const type = reactive(router.currentRoute.value.params.type)
 const formRules = ref({
  tunnelName: [{required: true, message: '请输入隧道名称', trigger: 'blur'}],
@@ -247,7 +249,7 @@ const form = ref({
  serialNumber: '',
  totalLength: '',
  remarks: '',
-  isDefault:false
+  isDefault: false
 });
 const isEdit = ref(false)
 const pageInfo = reactive({
@@ -255,22 +257,22 @@ const pageInfo = reactive({
  pageSize: 12
 });
 const total = ref(10);
-onMounted(()=>{
+onMounted(() => {
  getSiteDetail(siteId).then((res) => {
    siteName.value = res.data.siteName
  });
 })
-const handleGoSiteOrIndex=()=>{
-  if(type==='s'){
-    router.push('/site')
-  }else if(type==='i'){
+const handleGoSiteOrIndex = () => {
+  if (type === 's') {
+    router.push('/site/'+userId)
+  } else if (type === 'i') {
    router.push('/')
  }

 }
 const getList = () => {
  getTunnelList({
-    siteId:siteId,
+    siteId: siteId,
    ...pageInfo
  }).then(res => {
    if (res.code === 1000) {
@@ -291,30 +293,29 @@ const handleSubmit = (instance) => {
  // instance.validate(async (valid) => {
  //   console.log('valid',valid)
  //   if (!valid) return
-    const data={
-      siteId:siteId,
-      tunnelId:12,
-      ...form.value
-    }
-    if(form.value.tunnelName&&form.value.serialNumber&&form.value.totalLength){
-      addTunnel(data).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success('新增成功')
-          getList()
-          isVisited.value = false
-        }
-      })
-    }else {
-      ElMessage.warning('请先完善信息再新增')
-    }
+  const data = {
+    siteId: siteId,
+    ...form.value
+  }
+  if (form.value.tunnelName && form.value.serialNumber && form.value.totalLength) {
+    addTunnel(data).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success('新增成功')
+        getList()
+        isVisited.value = false
+      }
+    })
+  } else {
+    ElMessage.warning('请先完善信息再新增')
+  }
  // })
 }
 const handleGoToEditTunnel = (tunnelId) => {
  isEdit.value = true
-  if(type==='s'){
-    router.push('/edit/' + tunnelId+'/s')
-  }else if(type==='i'){
-    router.push('/edit/' + tunnelId+'/i')
+  if (type === 's') {
+    router.push('/edit/' + tunnelId + '/s/'+userId)
+  } else if (type === 'i') {
+    router.push('/edit/' + tunnelId + '/i/'+userId)
  }
 }
 const handleChooseAll = () => {
@@ -323,10 +324,10 @@ const handleChooseAll = () => {
  })
 }
 const handleEditDevice = (tunnelId) => {
-  if(type==='s'){
-    router.push('/device/' + tunnelId+'/s')
-  }else if(type==='i'){
-    router.push('/device/' + tunnelId+'/i')
+  if (type === 's') {
+    router.push('/device/' + tunnelId + '/s/'+userId)
+  } else if (type === 'i') {
+    router.push('/device/' + tunnelId + '/i/'+userId)
  }
 }
 const restFrom = () => {
@@ -335,7 +336,7 @@ const restFrom = () => {
    serialNumber: '',
    totalLength: '',
    remarks: '',
-    isDefault:false
+    isDefault: false
  }
 }
 const handleAdd = () => {
@@ -367,21 +368,6 @@ const handleMoreDelete = () => {
  if (tunnelIds.value.length === 0) {
    ElMessage.warning('请先选择隧道进行删除')
  } else {
-    let flag=false
-    siteList.value.map(item=>{
-      siteIds.value.map(siteItem=>{
-        if(item.siteId===siteItem){
-          console.log('item.tunnelList',item.tunnelList)
-          if(item.tunnelList.length!==0){
-            ElMessage.error('该站点下存在隧道，不能删除!')
-            flag=false
-          }else {
-            flag=true
-          }
-        }
-      })
-    })
-    if(flag){
      ElMessageBox.confirm(`是否确定删除该隧道`, '系统提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -399,7 +385,6 @@ const handleMoreDelete = () => {
          }
        })
      })
-    }
  }
 }

@@ -417,6 +402,7 @@ const handleMoreDelete = () => {
  color: #FFFFFF;
  line-height: 61px;
 }
+
 :deep(.el-radio-group) {
  margin-top: 10px;
 }
@@ -448,6 +434,7 @@ const handleMoreDelete = () => {
  height: 18px;
  background: #05FEFF;
 }
+
 :deep(.el-dialog) {
  border: 2px solid #05FEFF;
  background: #0D6578;
@@ -619,23 +606,13 @@ const handleMoreDelete = () => {
          color: #5CE4F2;
        }

-        > div:last-child {
-          cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border: 2px solid #05FEFF;
-          border-radius: 25px;
-          position: relative;

-          .clickColor {
-            position: absolute;
-            top: 7px;
-            left: 6.5px;
-            width: 25px;
-            height: 25px;
-            background-color: #05FEFF;
-            border-radius: 25px;
-          }
+        > span:last-child {
+          padding:1px 8px;
+          font-size: 32px;
+          border: 2px solid #05FEFF;
+          border-radius:10px;
+          position: relative;
        }
      }

--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -95,6 +95,7 @@ const currentSiteId = ref(0);
 const currentSite = ref("");
 const siteList = ref([])
 const currentUser = ref("");
+const currentUserId = ref(0);
 const currentDate = ref(dateFormat());
 const tunnelBtn = ref();
 const tunnelList = ref([]);
@@ -124,6 +125,7 @@ onMounted(() => {
 const getUser = () => {
  getUserInfo().then(res => {
    currentUser.value = res.data.user.userName
+    currentUserId.value = res.data.user.userId
  })
 }
 const getDefaultSite=(siteId)=>{
@@ -179,9 +181,9 @@ const changeTunnel = (e) => {
 const manageSelect = (index) => {
  console.log("首页点击-", index);
  if (index === 0) {
-    router.push("/site");
+    router.push("/site"+'/'+currentUserId.value);
  } else if (index === 1) {
-    router.push("/tunnel/" + currentSiteId.value+'/i');
+    router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
  } else if (index === 2) {
    router.push("/user/" + currentSiteId.value);
  }