From b1fde92bbd0fe58eff92bfa79ff22767a256ef41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Tue, 26 Dec 2023 09:41:44 +0800
Subject: [PATCH 01/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E9=9A=A7=E9=81=93?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tunnelManage.js           |  29 +++++++
 src/router/index.js               |   6 +-
 src/views/site/index.vue          |   7 +-
 src/views/tunnel-manage/index.vue | 130 +++++++++++++++++++-----------
 src/views/tunnel/index.vue        |   1 +
 5 files changed, 122 insertions(+), 51 deletions(-)
 create mode 100644 src/api/tunnelManage.js

diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js
new file mode 100644
index 0000000..b924c9b
--- /dev/null
+++ b/src/api/tunnelManage.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request.js'
+
+export const getTunnelList = (params) => {
+  return request({
+    url: '/tunnel/tunnel/screen/list',
+    method: 'get',
+    params
+  })
+}
+export const editTunnel = (data) => {
+  return request({
+    url: '/tunnel/tunnel',
+    method: 'put',
+    data
+  })
+}
+export const addTunnel = (data) => {
+  return request({
+    url: '/tunnel/tunnel',
+    method: 'post',
+    data
+  })
+}
+export const deleteTunnel = (tunnelIdList) => {
+  return request({
+    url: `/tunnel/tunnel/${tunnelIdList}`,
+    method: 'delete'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 1a9f2fd..77e02de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory } from 'vue-router';
+import { createRouter, createWebHistory } from 'vue-router';
 import NProgress from 'nprogress'//进度条
 import 'nprogress/nprogress.css'
 import { getToken } from '../utils/auth'
@@ -24,7 +24,7 @@ const routes = [
     },
   },
   {
-    path: '/edit',
+    path: '/edit/:tunnelId(\\d+)',
     name: 'tunneledit',
     component: () => import('@/views/edit/edit.vue'),
     meta: {
@@ -80,7 +80,7 @@ const routes = [
 ];
 
 const router = createRouter({
-  history: createWebHashHistory(),
+  history: createWebHistory(),
   routes,
 });
 router.beforeEach((to, form, next) => {
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index 44ce543..1989098 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -170,7 +170,6 @@ const getList = () => {
     })
 
     siteList.value = res.data.rows;
-    console.log('res',siteList.value)
   });
 }
 getList()
@@ -223,14 +222,16 @@ const handleSubmit = (instance) => {
   instance.validate(async (valid) => {
     if (!valid) return
     if (title.value === '编辑站点') {
-      editSite(form.value).then(() => {
+      editSite(form.value).then((res) => {
         isVisited.value = false
         getList()
+        ElMessage.success(res.msg)
       });
     } else {
-      addSite(form.value).then(() => {
+      addSite(form.value).then((res) => {
         isVisited.value = false
         getList()
+        ElMessage.success(res.msg)
       });
     }
   })
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 0f6c10f..b11e12b 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -19,18 +19,17 @@
       </div>
     </div>
     <div class="box-content">
-      <div class="site-box" v-for="item in tunnelList" :key="item.tunnelId"
-           @click="handleGoToEditTunnel(item.tunnelId)">
+      <div class="site-box" v-for="item in tunnelList" :key="item.tunnelId">
         <div class="top">
           <span>{{ item.tunnelName }}</span>
-          <span>施工长度500米 隧道长度10公里</span>
+          <span>施工长度{{ item.constructionLength }}米 隧道长度{{ item.totalLength }}公里</span>
           <el-checkbox v-model="item.checked" size="large" @change="handleClickSite(item)"/>
         </div>
         <div class="box-center">
           <div>
             <div class="left-img"></div>
             <div>
-              <div class="edit-btn" @click.stop="handleEdit">
+              <div class="edit-btn" @click.stop="handleGoToEditTunnel(item.tunnelId)">
                 <div class="edit-icon"></div>
                 <div>隧道编辑</div>
               </div>
@@ -46,9 +45,9 @@
               <span>风机异常</span>
             </div>
             <div class="icons-block">
-              <div v-for="item in iconsList" :key="item.icon" class="icon-text">
-                <div :style="{ backgroundImage: 'url(' +getImageUrl(item.icon)+')' }" class="icon"></div>
-                <span>{{ item.name }}：{{ item.num }}</span>
+              <div v-for="equItem in iconsList" :key="item.icon" class="icon-text">
+                <div :style="{ backgroundImage: 'url(' +getImageUrl(equItem.icon)+')' }" class="icon"></div>
+                <span>{{ equItem.name }}：{{ item.tunnelEquipmentAmountInfo[equItem.type] }}</span>
               </div>
             </div>
           </div>
@@ -81,14 +80,16 @@
         <div class="cancel-btn" @click="isVisited=false">
           取消
         </div>
-        <div class="sure-btn">
+        <div class="sure-btn" @click="handleAddTunnel">
           确定
         </div>
       </div>
     </el-dialog>
     <div class="pagination">
       <span>首页</span>
-      <el-pagination background :page-size="6" :total="50" prev-text="上一页" next-text="下一页" layout="prev, pager, next"/>
+      <el-pagination background v-model:current-page="pageInfo.pageNum" v-model:page-size="pageInfo.pageSize"
+                     :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
+                     @current-change="handleCurrentChange"/>
       <span>尾页</span>
     </div>
   </div>
@@ -96,6 +97,8 @@
 
 <script setup>
 import {ElMessage, ElMessageBox} from "element-plus";
+import {getTunnelList} from "@/api/tunnelManage";
+import {deleteTunnel} from "../../api/tunnelManage";
 
 const router = useRouter()
 const showAddIcon = ref(true)
@@ -172,42 +175,50 @@ const iconsList = ref([
   {
     icon: 'sd_icon_fj.png',
     name: '风机',
-    num: 2
+    type: 'frequency',
+    num: 0
   },
   {
     icon: 'sd_icon_sd.png',
     name: '湿度',
-    num: '无'
+    type: 'humidness',
+    num: 0
   },
   {
     icon: 'sd_icon_fy.png',
     name: '风压',
-    num: 10
+    type: 'windPressure',
+    num: 0
   },
   {
     icon: 'sd_icon_yq.png',
     name: '氧气',
-    num: '无'
+    type: 'oxygen',
+    num: 0
   },
   {
     icon: 'sd_icon_fs.png',
     name: '风速',
-    num: 11
+    type: 'windSpeed',
+    num: 0
   },
   {
     icon: 'sd_icon_fc.png',
     name: '粉尘',
+    type: 'dust',
     num: 1
   },
   {
     icon: 'sd_icon_wd.png',
     name: '温度',
-    num: 11
+    type: 'temperature',
+    num: 0
   },
   {
     icon: 'sd_icon_qt.png',
     name: '有害气体',
-    num: '无'
+    type: 'harmfulGas',
+    num: 0
   },
 ])
 const title = ref('新增隧道')
@@ -221,11 +232,33 @@ const form = ref({
   remarks: ''
 });
 const isEdit = ref(false)
-const bgImage = computed(() => (isEdit.value ? "zdgl_bj.png" : "sdgl_bjtq.png"));
+const pageInfo = reactive({
+  pageNum: 1,
+  pageSize: 12
+});
+const total = ref(10);
+const getList = () => {
+  getTunnelList({
+    ...pageInfo
+  }).then(res => {
+    if (res.code === 1000) {
+      total.value=res.data.total
+      tunnelList.value = res.data.rows
+    }
+  })
+}
+getList()
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val
+  getList()
+}
+const handleAddTunnel=()=>{
 
+}
 const handleGoToEditTunnel = (tunnelId) => {
   isEdit.value = true
-  router.push('/edit')
+  router.push('/edit/' + tunnelId)
 }
 const handleChooseAll = () => {
   tunnelList.value.map(item => {
@@ -234,13 +267,20 @@ const handleChooseAll = () => {
 }
 const handleEdit = () => {
   title.value = '编辑隧道'
-  isVisited.value = true
+  // isVisited.value = true
 }
 const handleEditDevice = () => {
   router.push('/device/' + 1)
 }
-
+const restFrom = () => {
+  form.value = {
+    address: '',
+    siteName: '',
+    describe: ''
+  }
+}
 const handleAdd = () => {
+  restFrom()
   title.value = '新增隧道'
   isVisited.value = true
 }
@@ -249,19 +289,19 @@ const getImageUrl = (name) => {
 }
 const handleClickSite = (type) => {
   if (type.checked) {
-    tunnelIds.value.push(type.siteId)
-    tunnelNameList.value.push(type.siteName)
+    tunnelIds.value.push(type.tunnelId)
+    tunnelNameList.value.push(type.tunnelName)
   } else {
-    // tunnelIds.value.map((item, index) => {
-    //   if (item === type.siteId) {
-    //     tunnelIds.value.splice(index, 1)
-    //   }
-    // })
-    // tunnelNameList.value.map((item, index) => {
-    //   if (item === type.siteName) {
-    //     tunnelNameList.value.splice(index, 1)
-    //   }
-    // })
+    tunnelIds.value.map((item, index) => {
+      if (item === type.tunnelId) {
+        tunnelIds.value.splice(index, 1)
+      }
+    })
+    tunnelNameList.value.map((item, index) => {
+      if (item === type.tunnelName) {
+        tunnelNameList.value.splice(index, 1)
+      }
+    })
   }
 }
 const handleMoreDelete = () => {
@@ -274,16 +314,16 @@ const handleMoreDelete = () => {
       type: 'warning',
       customClass: 'delBox'
     }).then(() => {
-      // deleteSite(tunnelIds.value).then(res => {
-      //   if (res.code === 1000) {
-      //     ElMessage.success(res.msg)
-      //     getList()
-      //     tunnelIds.value = []
-      //     tunnelNameList.value = []
-      //   } else {
-      //     ElMessage.error(res.msg)
-      //   }
-      // })
+      deleteTunnel(tunnelIds.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg)
+          getList()
+          tunnelIds.value = []
+          tunnelNameList.value = []
+        } else {
+          ElMessage.error(res.msg)
+        }
+      })
     })
   }
 }
@@ -441,9 +481,9 @@ const handleMoreDelete = () => {
       //box-sizing: border-box;
       position: relative;
 
-      &:hover {
-        background-image: url('@/assets/images/tunnel/sdgl_bjtq.png');
-      }
+      //&:hover {
+      //  background-image: url('@/assets/images/tunnel/sdgl_bjtq.png');
+      //}
 
       &:nth-child(4n) {
         margin-right: 0;
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index e199c0c..39b02f2 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -175,6 +175,7 @@ const manageSelect = (index) => {
 };
 const handleCommand = (item) => {
   currentSite.value = item.label
+  currentSiteId.value = item.value
   getTunnel(item.value)
 }
 const closeLeft = () => {

From 2ba9e761abc476e9ea1d0b6329a14a72c9dcb38f Mon Sep 17 00:00:00 2001
From: dengj <209192278@qq.com>
Date: Tue, 26 Dec 2023 17:08:15 +0800
Subject: [PATCH 02/35] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E9=9A=A7?=
 =?UTF-8?q?=E9=81=93=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tunnelManage.js            |  27 +-
 src/components/manageBtn/index.vue |  10 +-
 src/views/device-manage/index.vue  | 436 +++++++++++++++--------------
 src/views/edit/edit.vue            | 341 +++++++---------------
 src/views/tunnel-manage/index.vue  |  67 +++--
 5 files changed, 399 insertions(+), 482 deletions(-)

diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js
index b924c9b..9374a38 100644
--- a/src/api/tunnelManage.js
+++ b/src/api/tunnelManage.js
@@ -7,11 +7,13 @@ export const getTunnelList = (params) => {
     params
   })
 }
-export const editTunnel = (data) => {
+export const getTunnelDetail = (tunnelId) => {
   return request({
-    url: '/tunnel/tunnel',
-    method: 'put',
-    data
+    url: `/tunnel/tunnel/${tunnelId}`,
+    method: 'get',
+    params:{
+      tunnelId:tunnelId
+    }
   })
 }
 export const addTunnel = (data) => {
@@ -27,3 +29,20 @@ export const deleteTunnel = (tunnelIdList) => {
     method: 'delete'
   })
 }
+//设备信息列表
+export const getEquipmentList = (tunnelId) => {
+  return request({
+    url: '/tunnel/equipment/equipments',
+    method: 'get',
+    params:{
+      tunnelId:tunnelId
+    }
+  })
+}
+export const editTunnel = (data) => {
+  return request({
+    url: '/tunnel/model/details',
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file
diff --git a/src/components/manageBtn/index.vue b/src/components/manageBtn/index.vue
index bfddc1c..064e94d 100644
--- a/src/components/manageBtn/index.vue
+++ b/src/components/manageBtn/index.vue
@@ -46,11 +46,11 @@ const btnList = ref([
     icon: 'sp_icon_yhgl.png',
     name: '用户管理'
   },
-  {
-    route: '/system',
-    icon: 'sp_icon_xtgl.png',
-    name: '系统管理'
-  },
+  // {
+  //   route: '/system',
+  //   icon: 'sp_icon_xtgl.png',
+  //   name: '系统管理'
+  // },
   // {
   //   icon: 'sp_icon_mngl.png',
   //   name: '模拟仿真'
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index 9927eb3..ed9778d 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -26,9 +26,9 @@
             <el-menu-item index="3">
               <span>其他传感器</span>
             </el-menu-item>
-            <el-menu-item index="4">
-              <span>分流器</span>
-            </el-menu-item>
+<!--            <el-menu-item index="4">-->
+<!--              <span>分流器</span>-->
+<!--            </el-menu-item>-->
           </el-menu>
         </div>
         <div class="box-right" v-if="changeIndex==1">
@@ -50,20 +50,20 @@
                       style="border-bottom: 1px #06e5e5 solid;background-color: #011c29;--el-table-border-color: none;"
                       :header-cell-style="{backgroundColor: '#064B66',color: '#fff',fontSize: '40px',borderBottom: 'none' }"
                       :cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="fanData">
-              <el-table-column prop="name" label="设备名称" align="center"/>
-              <el-table-column prop="currentA" label="A电流" align="center">
+              <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.currentA"></el-input>
+                  <el-input placeholder="请输入A电流" v-model="scope.row.phaseCurrentAOffset"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="currentB" label="B电流" align="center">
+              <el-table-column prop="phaseCurrentBOffset" label="B电流" align="center">
                 <template #default="scope">
-                  <el-input placeholder="请输入B电流" v-model="scope.row.currentB"></el-input>
+                  <el-input placeholder="请输入B电流" v-model="scope.row.phaseCurrentBOffset"></el-input>
                 </template>
               </el-table-column>
-              <el-table-column prop="currentC" label="C电流" align="center">
+              <el-table-column prop="phaseCurrentCOffset" label="C电流" align="center">
                 <template #default="scope">
-                  <el-input placeholder="请输入C电流" v-model="scope.row.currentC"></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">
@@ -90,7 +90,7 @@
             <div class="cancel-btn">
               取消
             </div>
-            <div class="sure-btn"  @click="router.back(-1)">
+            <div class="sure-btn" @click="router.back(-1)">
               确定
             </div>
           </div>
@@ -114,12 +114,12 @@
                       style="border-bottom: 1px #06e5e5 solid;background-color: #011c29;--el-table-border-color: none;"
                       :header-cell-style="{backgroundColor: '#064B66',color: '#fff',fontSize: '40px',borderBottom: 'none' }"
                       :cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="winData">
-              <el-table-column prop="name" label="设备名称" align="center"/>
+              <el-table-column prop="equipmentName" label="设备名称" align="center"/>
               <el-table-column prop="offset" label="偏移量" align="center"/>
               <el-table-column prop="unit" label="单位" align="center"/>
-              <el-table-column prop="thresholdValue" label="阈值" align="center">
+              <el-table-column prop="alarmValue" label="阈值" align="center">
                 <template #default="scope">
-                  <el-input placeholder="请输入阈值" v-model="scope.row.thresholdValue"></el-input>
+                  <el-input placeholder="请输入阈值" v-model="scope.row.alarmValue"></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="state" label="状态" align="center">
@@ -146,7 +146,7 @@
             <div class="cancel-btn">
               取消
             </div>
-            <div class="sure-btn"  @click="router.back(-1)">
+            <div class="sure-btn" @click="router.back(-1)">
               确定
             </div>
           </div>
@@ -170,16 +170,16 @@
                       style="border-bottom: 1px #06e5e5 solid;background-color: #011c29;--el-table-border-color: none;"
                       :header-cell-style="{backgroundColor: '#064B66',color: '#fff',fontSize: '40px',borderBottom: 'none' }"
                       :cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="otherData">
-              <el-table-column prop="name" label="设备名称" align="center"/>
+              <el-table-column prop="equipmentName" label="设备名称" align="center"/>
               <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>
                 </template>
               </el-table-column>
-              <el-table-column prop="thresholdValue" label="阈值" align="center">
+              <el-table-column prop="alarmValue" label="阈值" align="center">
                 <template #default="scope">
-                  <el-input placeholder="请输入阈值" v-model="scope.row.thresholdValue"></el-input>
+                  <el-input placeholder="请输入阈值" v-model="scope.row.alarmValue"></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="state" label="状态" align="center">
@@ -272,195 +272,214 @@
 </template>
 
 <script setup>
+import {getEquipmentList} from "@/api/tunnelManage";
+
 const router = useRouter()
+const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
 const collectionFrequency = ref(0)
 const changeIndex = ref(1)
-const fanData = [
-  {
-    name: '一号风机',
-    currentA: '2342',
-    currentB: '2342',
-    currentC: '2342',
-    state: false,
-  },
-  {
-    name: '二号风机',
-    currentA: '2342',
-    currentB: '2342',
-    currentC: '2342',
-    state: true,
-  },
-  {
-    name: '三号风机',
-    currentA: '2342',
-    currentB: '2342',
-    currentC: '2342',
-    state: false,
-  }
-]
-const winData = [
-  {
-    name: '1号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '2号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '3号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '4号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '5号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '6号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '7号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '8号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '9号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-  {
-    name: '10号风压',
-    offset: '2342',
-    unit: 'Pa',
-    thresholdValue: '2342',
-    state: false,
-  },
-]
-const otherData = [
-  {
-    name: '风速',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '氧      气',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '温      度',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '湿      度',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '粉 尘',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '二氧化碳',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '一氧化碳',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '二氧化氮',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '一氧化氮',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '二氧化硫',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '硫 化 氢',
-    offset: '2342',
-    unit: 'm/s',
-    thresholdValue: '2342',
-    state: false,
-  }
-]
-const fenliuData = [
-   {
-    name: '1号分流器',
-    offset: '2342',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '2号分流器',
-    offset: '2342',
-    thresholdValue: '2342',
-    state: false,
-  }, {
-    name: '3号分流器',
-    offset: '2342',
-    thresholdValue: '2342',
-    state: false,
-  }
-]
+const fanData = ref([
+  // {
+  //   name: '一号风机',
+  //   currentA: '2342',
+  //   currentB: '2342',
+  //   currentC: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '二号风机',
+  //   currentA: '2342',
+  //   currentB: '2342',
+  //   currentC: '2342',
+  //   state: true,
+  // },
+  // {
+  //   name: '三号风机',
+  //   currentA: '2342',
+  //   currentB: '2342',
+  //   currentC: '2342',
+  //   state: false,
+  // }
+])
+const winData = ref([
+  // {
+  //   name: '1号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '2号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '3号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '4号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '5号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '6号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '7号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '8号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '9号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+  // {
+  //   name: '10号风压',
+  //   offset: '2342',
+  //   unit: 'Pa',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // },
+])
+const otherData = ref([
+  // {
+  //   name: '风速',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '氧      气',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '温      度',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '湿      度',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '粉 尘',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '二氧化碳',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '一氧化碳',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '二氧化氮',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '一氧化氮',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '二氧化硫',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '硫 化 氢',
+  //   offset: '2342',
+  //   unit: 'm/s',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }
+])
+const fenliuData = ref([
+  // {
+  //   name: '1号分流器',
+  //   offset: '2342',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '2号分流器',
+  //   offset: '2342',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }, {
+  //   name: '3号分流器',
+  //   offset: '2342',
+  //   thresholdValue: '2342',
+  //   state: false,
+  // }
+])
 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
+      otherData.value = res.data.sensorList
+      res.data.acquisitionList.map(item=>{
+        if(item.tunnelId==tunnelId){
+          collectionFrequency.value=item.acquisitionPeriod
+        }
+      })
+    }
+  })
+}
+getList()
 </script>
 
 <style scoped lang="scss">
@@ -552,9 +571,10 @@ const handleChangeMenu = (e) => {
             &:nth-child(2) {
               letter-spacing: 120px;
             }
-            &:last-child{
-              letter-spacing: 40px;
-            }
+
+            //&:nth-child(4) {
+            //  letter-spacing: 40px;
+            //}
           }
         }
       }
@@ -589,7 +609,7 @@ const handleChangeMenu = (e) => {
               position: relative;
 
               input {
-                width: 166px;
+                width: 220px;
                 height: 50px;
                 border: 1px solid #05FEFF;
                 background: transparent;
@@ -669,11 +689,13 @@ const handleChangeMenu = (e) => {
         }
 
         :deep(.el-table__row--striped) {
-          background-color: #13849C!important;
+          background-color: #13849C !important;
         }
-        :deep(.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell){
-          background-color: #13849C!important;
+
+        :deep(.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell) {
+          background-color: #13849C !important;
         }
+
         :deep(.el-table__cell) {
           .el-input {
             width: 180px;
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 5541ec8..2d42d6a 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -1,264 +1,115 @@
 <template>
-    <div id="main">
-        <div class="box-top">
-            <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" />
-            <div class="tunnel-title"></div>
-            <manage-length class="tunnel-length"></manage-length>
-            <div class="top-right">
-                <div class="current-site">
-                    当前站点：<span>{{ currentSite }}</span>
-                    <el-dropdown trigger="click" @command="handleCommand">
-                        <div class="toggle"></div>
-                        <template #dropdown>
-                            <el-dropdown-menu>
-                                <el-dropdown-item v-for="item in siteList" :key="item.value" :command="item">{{ item.label
-                                }}</el-dropdown-item>
-                            </el-dropdown-menu>
-                        </template>
-                    </el-dropdown>
-                </div>
-                <div class="current-user">
-                    上午好：<span>{{ currentUser }}</span>
-                    <span>今天是：{{ currentDate }}</span>
-                    <div class="logout" @click="handleLogout"></div>
-                </div>
-            </div>
+  <div id="main">
+    <div class="box-top">
+      <div class="tunnel-title"></div>
+      <div class="top-right">
+        <div class="del-btn" @click="handleSave">
+          保存
         </div>
-        <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
-        <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId" />
+      </div>
     </div>
+    <div class="edit-box">
+      <el-form :model="form" :label-position="right" label-width="188px">
+        <el-form-item label="隧道名称">
+          <el-input v-model="form.tunnelName" placeholder="请输入隧道名称"/>
+        </el-form-item>
+        <el-form-item label="序列号">
+          <el-input v-model="form.serialNumber" placeholder="请输入序列号"/>
+        </el-form-item>
+        <el-form-item label="隧道长度">
+          <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
+        </el-form-item>
+        <el-form-item label="隧道备注">
+          <el-input v-model="form.remarks" placeholder="请输入隧道备注"/>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
+    <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId"/>
+  </div>
 </template>
 <script setup>
 import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
-import ManageBtn from "@/components/manageBtn/index.vue";
-import ManageLength from "@/components/manageLength/index.vue";
-import { dateFormat } from "@/utils/date.js";
-import { getToken } from "@/utils/auth";
-import { useAuthStore } from "@/store/userstore.js";
-import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/largeScreen";
-import { ElMessageBox } from "element-plus";
-import { getUserInfo } from "@/api/login";
-
-const authStore = useAuthStore();
+import {getTunnelDetail} from "../../api/tunnelManage";
 const router = useRouter();
-const selectIndex = ref(-1);
-const showFan = ref(false);
-const drawerLeft = ref(true);
-const drawerRight = ref(true);
-const currentSite = ref("");
-const siteList = ref([])
-const currentUser = ref("");
-const currentDate = ref(dateFormat());
-const tunnelBtn = ref();
-const tunnelList = ref([]);
-const tunnelId = ref(0);
-const routeList = ref([]);
-let socket = reactive("");
-const serialNumber = ref("SC00DY00GH00ELBT");
-let token = getToken();
-let send = {
-    type: "ping",
-};
-const largeScreenData = ref(null);
-const socketData = reactive({
-    leftData: [],
-    windPressure: [],
-    sensor: [],
+const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
+
+const form = ref({
+  tunnelName: '',
+  serialNumber: '',
+  totalLength: '',
+  remarks: ''
 });
 
-onMounted(() => {
-    nextTick(() => {
-        showFan.value = true;
-    });
-    getUser()
-    getOtherInfo()
-
-});
-
-const getUser = () => {
-    getUserInfo().then(res => {
-        currentUser.value = res.data.user.userName
-    })
-}
-const getOtherInfo = () => {
-    getLargeScreenInfo().then((res) => {
-        if (res?.code === 1000) {
-            routeList.value = res.data.routeList
-            currentSite.value = res.data.siteOption[0].label
-            siteList.value = res.data.siteOption
-            tunnelId.value = res.data.tunnelOption[0].value
-            getTunnel(res.data.siteOption[0].value)
-            getScreenInfo(tunnelId.value);
-        }
-    });
-};
-const getScreenInfo = async (id) => {
-    await getLargeScreen(id).then((res) => {
-        if (res?.code === 1000) {
-            largeScreenData.value = res.data;
-        }
-    });
-};
-//根据站点id获取隧道信息
-const getTunnel = (id) => {
-    getTunnelBySiteId(id).then((res) => {
-        if (res?.code === 1000) {
-            tunnelList.value = res.data
-            getScreenInfo(res.data[0].value)
-        }
-    });
-}
-const changeTunnel = (e) => {
-    tunnelId.value = e
-    let newObj = {}
-    tunnelList.value.forEach((item, index) => {
-        if (index === e) {
-            newObj = item
-        }
-    })
-    getScreenInfo(newObj.value)
-    nextTick(() => {
-        showFan.value = true;
-    });
-}
-const manageSelect = (index) => {
-    console.log("首页点击-", index);
-    if (index === 0) {
-        router.push("/site");
-    } else if (index === 1) {
-        router.push("/tunnel/1");
-    } else if (index === 2) {
-        router.push("/user");
+const getTunnel = () => {
+  getTunnelDetail(tunnelId).then((res) => {
+    if (res?.code === 1000) {
+      console.log('res',res)
+      form.value=res.data
     }
-};
-const handleCommand = (item) => {
-    console.log('commads', item)
-    currentSite.value = item.label
-    getTunnel(item.value)
+  });
 }
-const closeLeft = () => {
-    drawerLeft.value = !drawerLeft.value;
-};
-const closeRight = () => {
-    drawerRight.value = !drawerRight.value;
-};
-const handleLogout = () => {
-    ElMessageBox.confirm(`确认退出登录吗`, '系统提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-        authStore.userLogout();
-        router.push("/login");
-    })
-};
-const previousBtn = () => {
-    tunnelBtn.value.prev();
-};
-const nextBtn = () => {
-    tunnelBtn.value.next();
-};
-
-const initWebSocket = () => {
-    // let wsUrl = `ws://192.168.31.175:9000/websocket/equipment/${token}/${serialNumber.value}`
-    let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/equipment/${token}/${serialNumber.value}`;
-    console.log(wsUrl);
-    socket = new WebSocket(wsUrl);
-    //连接发生错误的回调方法
-    socket.onerror = function () {
-        console.log("ws连接发生错误");
-    };
-    //连接成功建立的回调方法
-    socket.onopen = function () {
-        console.log("ws连接成功");
-    };
-    //接收到消息的回调方法
-    socket.onmessage = function (event) {
-        console.log("服务器返回的信息: ", JSON.parse(event.data));
-        const type = JSON.parse(event.data).type;
-        const data = JSON.parse(event.data).data;
-        if (type === "equipment") {
-            data.forEach((item) => {
-                if (item.typeKey === "frequency") {
-                    socketData.leftData = data;
-                } else if (item.typeKey === "windPressure") {
-                    socketData.windPressure = data;
-                } else if (item.typeKey === "sensor") {
-                    socketData.sensor = data;
-                }
-            });
-        }
-    };
-    //连接关闭的回调方法
-    socket.onclose = function () {
-        console.log("ws连接关闭");
-        // initWebSocket()
-    };
-    setInterval(() => {
-        socket.send(JSON.stringify(send));
-    }, 30000);
-};
-const closeSocket = () => {
-    socket.close();
-};
-initWebSocket();
+getTunnel()
 </script>
-<style lang="scss">
-.el-dropdown__popper.el-popper {
-    background: transparent;
-    //border: none;
-    border: 1px solid #0E7DAA;
-    border-radius: 10px;
-}
-
-.is-light {
-    background: rgba(7, 35, 72, 0.9);
-}
-
-.el-popper {
-    padding: 20px;
-    margin-left: 50px;
-    width: 150px;
-    background: rgba(7, 35, 72, 0.9);
-
-    .el-scrollbar__wrap {
-        .el-dropdown__list {
-            .el-dropdown-menu {
-                background-color: rgba(7, 35, 72, 0.9);
-                border-radius: 10px;
-                padding: 5px;
-
-                .el-dropdown-menu__item {
-                    color: #FFFFFF;
-                    //border:none;
-                    padding: 5px;
-
-                    border-bottom: 1px solid #05FEFF;
-
-                    &:last-child {
-                        border-bottom: none;
-                    }
-                }
-
-                .el-dropdown-menu__item.hover,
-                .el-dropdown-menu__item:hover {
-                    background-color: transparent !important;
-                    color: #F7B500;
-                }
-            }
-        }
-    }
-}
-</style>
 <style lang="scss" scoped>
 #main {
+  position: relative;
+  height: 100%;
+  width: 100%;
+  background-color: #072348;
+  .del-btn {
+    position: absolute;
+    top: 85px;
+    right: 80px;
+    cursor: pointer;
+    font-size: 42px;
+    width: 180px;
+    height: 80px;
+    line-height: 80px;
+    background: #08B7B8;
+    border-radius: 11px;
+    padding-left: 50px;
+  }
+  #tunnel-box {
     height: 100%;
-    width: 100%;
-    background-color: #072348;
-
-    #tunnel-box {
-        height: 100%;
+  }
+  .edit-box{
+    z-index: 2;
+    position: absolute;
+    top: 160px;
+    left: 70px;
+    width: 830px;
+    height: 500px;
+    background-image: url(@/assets/images/transducer/bg.png);
+    padding: 0 30px;
+    box-sizing: border-box;
+    :deep(.el-form-item) {
+      margin-top: 40px;
     }
+
+    :deep(.el-form-item__label) {
+      font-size: 38px;
+      color: #FFFFFF;
+      margin-right: 12px;
+      line-height: 50px;
+    }
+
+    :deep(.el-input) {
+      height: 75px;
+
+      .el-input__wrapper {
+        background-color: transparent;
+        border: 1px solid #08B7B8;
+
+        .el-input__inner {
+          height: auto;
+          color: #fff;
+          font-size: 38px;
+        }
+      }
+    }
+  }
 }
 </style>
   
\ No newline at end of file
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index b11e12b..948e2b1 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -22,7 +22,7 @@
       <div class="site-box" v-for="item in tunnelList" :key="item.tunnelId">
         <div class="top">
           <span>{{ item.tunnelName }}</span>
-          <span>施工长度{{ item.constructionLength }}米 隧道长度{{ item.totalLength }}公里</span>
+          <span>施工长度{{ item.constructionLength }}米 隧道长度{{ item.totalLength }}米</span>
           <el-checkbox v-model="item.checked" size="large" @change="handleClickSite(item)"/>
         </div>
         <div class="box-center">
@@ -33,7 +33,7 @@
                 <div class="edit-icon"></div>
                 <div>隧道编辑</div>
               </div>
-              <div class="edit-btn" @click.stop="handleEditDevice">
+              <div class="edit-btn" @click.stop="handleEditDevice(item.tunnelId)">
                 <div class="edit-icon-two"></div>
                 <div>设备管理</div>
               </div>
@@ -62,15 +62,15 @@
       <div class="siteId">
         <span>{{ title }}</span>
       </div>
-      <el-form :model="form" :label-position="right" label-width="168px">
-        <el-form-item label="隧道名称">
-          <el-input v-model="form.name" placeholder="请输入隧道名称"/>
+      <el-form :model="form" :label-position="right" label-width="188px" :rules="formRules" ref="formInstance">
+        <el-form-item label="隧道名称" required>
+          <el-input v-model="form.tunnelName" placeholder="请输入隧道名称"/>
         </el-form-item>
-        <el-form-item label="序列号">
+        <el-form-item label="序列号" required>
           <el-input v-model="form.serialNumber" placeholder="请输入序列号"/>
         </el-form-item>
-        <el-form-item label="隧道长度">
-          <el-input type="number" v-model="form.tunnelLength" placeholder="请输入隧道长度"/>
+        <el-form-item label="隧道长度" required>
+          <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
         </el-form-item>
         <el-form-item label="隧道备注">
           <el-input v-model="form.remarks" placeholder="请输入隧道备注"/>
@@ -80,7 +80,7 @@
         <div class="cancel-btn" @click="isVisited=false">
           取消
         </div>
-        <div class="sure-btn" @click="handleAddTunnel">
+        <div class="sure-btn" @click="handleSubmit(formInstance)">
           确定
         </div>
       </div>
@@ -97,12 +97,16 @@
 
 <script setup>
 import {ElMessage, ElMessageBox} from "element-plus";
-import {getTunnelList} from "@/api/tunnelManage";
-import {deleteTunnel} from "../../api/tunnelManage";
+import {getTunnelList,addTunnel, deleteTunnel} from "@/api/tunnelManage";
 
 const router = useRouter()
 const showAddIcon = ref(true)
 const siteId = reactive(router.currentRoute.value.params.siteId)
+const formRules = ref({
+  tunnelName: [{required: true, message: '请输入隧道名称', trigger: 'blur'}],
+  serialNumber: [{required: true, message: '请输入序列号', trigger: 'blur'}]
+})
+const formInstance = ref()
 const tunnelList = ref([
   {
     tunnelName: '一号隧道',
@@ -226,9 +230,9 @@ const isVisited = ref(false);
 const tunnelIds = ref([])
 const tunnelNameList = ref([])
 const form = ref({
-  name: '',
+  tunnelName: '',
   serialNumber: '',
-  tunnelLength: '',
+  totalLength: '',
   remarks: ''
 });
 const isEdit = ref(false)
@@ -242,7 +246,7 @@ const getList = () => {
     ...pageInfo
   }).then(res => {
     if (res.code === 1000) {
-      total.value=res.data.total
+      total.value = res.data.total
       tunnelList.value = res.data.rows
     }
   })
@@ -253,8 +257,28 @@ const handleCurrentChange = (val) => {
   pageInfo.pageNum = val
   getList()
 }
-const handleAddTunnel=()=>{
-
+const handleSubmit = (instance) => {
+  // if (!instance) return
+  // console.log('instance',instance)
+  // instance.validate(async (valid) => {
+  //   console.log('valid',valid)
+  //   if (!valid) return
+    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
@@ -269,14 +293,15 @@ const handleEdit = () => {
   title.value = '编辑隧道'
   // isVisited.value = true
 }
-const handleEditDevice = () => {
-  router.push('/device/' + 1)
+const handleEditDevice = (tunnelId) => {
+  router.push('/device/' + tunnelId)
 }
 const restFrom = () => {
   form.value = {
-    address: '',
-    siteName: '',
-    describe: ''
+    tunnelName: '',
+    serialNumber: '',
+    totalLength: '',
+    remarks: ''
   }
 }
 const handleAdd = () => {

From 48978b917cfa79af5ea7c1442c8a578571e86074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Tue, 26 Dec 2023 22:38:10 +0800
Subject: [PATCH 03/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E9=9A=A7=E9=81=93?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tunnelManage.js           |   4 +-
 src/store/modelSceneStore.js      |  15 +++-
 src/views/edit/edit.vue           | 128 ++++++++++++++++++++++++------
 src/views/site/index.vue          |   7 +-
 src/views/tunnel-manage/index.vue |   1 +
 src/views/tunnel/index.vue        |   7 +-
 6 files changed, 129 insertions(+), 33 deletions(-)

diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js
index 9374a38..6d850d2 100644
--- a/src/api/tunnelManage.js
+++ b/src/api/tunnelManage.js
@@ -42,7 +42,7 @@ export const getEquipmentList = (tunnelId) => {
 export const editTunnel = (data) => {
   return request({
     url: '/tunnel/model/details',
-    method: 'post',
+    method: 'put',
     data
   })
-}
\ No newline at end of file
+}
diff --git a/src/store/modelSceneStore.js b/src/store/modelSceneStore.js
index dc6d4e3..3767c9b 100644
--- a/src/store/modelSceneStore.js
+++ b/src/store/modelSceneStore.js
@@ -4,6 +4,7 @@ import { saveEquipment, initSceneData } from "../api/tunnelScene";
 import { ElMessage } from "element-plus";
 export const useModelSceneStore = defineStore("modelSceneData", () => {
   let equipmentList = ref("[]");
+  let allEditList = ref({});
   function initData(tunnelId = 1) {
     initSceneData(tunnelId)
       .then((res) => {
@@ -43,12 +44,24 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
         });
     });
   }
-
+  function getTunnelEditAllList(tunnelId = 1) {
+    return new Promise((resolve, reject) => {
+      initSceneData(tunnelId)
+        .then((res) => {
+          allEditList.value = res.data;
+          resolve(JSON.parse(allEditList.value));
+        })
+        .catch((Error) => {
+          reject();
+        });
+    });
+  }
   return {
     equipmentList,
     initData,
     saveSceneData,
     deleteEquipment,
     getEquipmentList,
+    getTunnelEditAllList,
   };
 });
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 2d42d6a..6bd9cc7 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -1,8 +1,15 @@
 <template>
   <div id="main">
     <div class="box-top">
+      <div class="back-tunnel" @click="router.back(-1)">
+        <div class="back-icon"></div>
+        <span>返回</span>
+      </div>
       <div class="tunnel-title"></div>
-      <div class="top-right">
+      <div class="btn-right">
+        <div class="del-btn" @click="handleGotoDevice">
+          设备管理
+        </div>
         <div class="del-btn" @click="handleSave">
           保存
         </div>
@@ -26,31 +33,58 @@
     </div>
 
     <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
-    <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId"/>
+    <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId" ref="tunnelScene"/>
   </div>
 </template>
 <script setup>
 import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
-import {getTunnelDetail} from "../../api/tunnelManage";
+import {editTunnel, getTunnelDetail} from "@/api/tunnelManage";
+import {useModelSceneStore} from "@/store/modelSceneStore";
+
 const router = useRouter();
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
-
+const store = useModelSceneStore();
 const form = ref({
   tunnelName: '',
   serialNumber: '',
   totalLength: '',
   remarks: ''
 });
-
+const equipmentList = ref([])
+onMounted(async () => {
+  equipmentList.value = await store.getEquipmentList();
+})
 const getTunnel = () => {
   getTunnelDetail(tunnelId).then((res) => {
     if (res?.code === 1000) {
-      console.log('res',res)
-      form.value=res.data
+      form.value = res.data
+      console.log('for', form.value)
     }
   });
 }
 getTunnel()
+const handleGotoDevice = () => {
+  router.push('/device/' + tunnelId)
+}
+const handleSave = () => {
+  const data = {
+    tunnelId: tunnelId,
+    tunnelName: form.value.tunnelName,
+    serialNumber: form.value.serialNumber,
+    remarks: form.value.remarks,
+    // constructionLength:form.value.constructionLength,
+    constructionLength: 500,
+    tunnelLength: form.value.totalLength,
+    tunnelThreeConfig: JSON.stringify(equipmentList.value),
+  }
+  console.log('data', data, form.value.tunnelLength)
+  editTunnel(data).then((res) => {
+    if (res?.code === 1000) {
+      console.log('re---s', res)
+      // form.value=res.data
+    }
+  });
+}
 </script>
 <style lang="scss" scoped>
 #main {
@@ -58,32 +92,81 @@ getTunnel()
   height: 100%;
   width: 100%;
   background-color: #072348;
-  .del-btn {
-    position: absolute;
-    top: 85px;
-    right: 80px;
-    cursor: pointer;
-    font-size: 42px;
-    width: 180px;
-    height: 80px;
-    line-height: 80px;
-    background: #08B7B8;
-    border-radius: 11px;
-    padding-left: 50px;
+
+  .box-top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .back-tunnel {
+      z-index: 2;
+      position: absolute;
+      top: 100px;
+      //left: 80px;
+      cursor: pointer;
+      margin: 0 0 0 80px;
+      display: flex;
+      align-items: center;
+      width: 180px;
+      height: 80px;
+      line-height: 70px;
+      border-radius: 11px;
+      border: 2px solid #08B7B8;
+      font-size: 42px;
+      color: #FFFFFF;
+
+      .back-icon {
+        margin-right: 20px;
+        margin-left: 23px;
+        width: 35px;
+        height: 35px;
+        background-image: url('@/assets/images/site/zdgl_icon_fh.png');
+      }
+    }
+
+    .btn-right {
+      display: flex;
+      z-index: 2;
+      position: absolute;
+      top: 100px;
+      right: 80px;
+
+      .del-btn {
+        &:first-child {
+          width: 220px;
+          margin-right: 40px;
+        }
+
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+        width: 180px;
+        height: 80px;
+        border-radius: 11px;
+        border: 2px solid #08B7B8;
+        color: #FFFFFF;
+        font-size: 42px;
+      }
+    }
+
   }
+
   #tunnel-box {
     height: 100%;
   }
-  .edit-box{
+
+  .edit-box {
     z-index: 2;
     position: absolute;
-    top: 160px;
-    left: 70px;
+    top: 250px;
+    left: 80px;
     width: 830px;
     height: 500px;
     background-image: url(@/assets/images/transducer/bg.png);
     padding: 0 30px;
     box-sizing: border-box;
+
     :deep(.el-form-item) {
       margin-top: 40px;
     }
@@ -112,4 +195,3 @@ getTunnel()
   }
 }
 </style>
-  
\ No newline at end of file
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index 1989098..b25ba6d 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -34,7 +34,7 @@
                 <div>{{ item.info.tunnelName }}</div>
                 <div class="tunnel-icon"></div>
                 <div>施工长度{{ item.info.constructionLength }}米</div>
-                <div>实现长度{{ item.info.totalLength }}公里
+                <div>实现长度{{ item.info.totalLength }}米
                 </div>
               </div>
               <div class="tunnel-add" @click="goToAddTunnel(item.siteId)">
@@ -177,6 +177,7 @@ const handleClickSite = (type) => {
   if (type.checked) {
     siteIds.value.push(type.siteId)
     siteNameList.value.push(type.siteName)
+
   } else {
     siteIds.value.map((item, index) => {
       if (item === type.siteId) {
@@ -408,7 +409,7 @@ const handleCurrentChange = (val) => {
     flex-wrap: wrap;
     padding-left: 100px;
     padding-right: 100px;
-    justify-content: space-between;
+    //justify-content: space-between;
     box-sizing: border-box;
     overflow: hidden;
 
@@ -432,7 +433,7 @@ const handleCurrentChange = (val) => {
 
     .site-box {
       margin-top: 122px;
-      //margin-right: 1%;
+      margin-right: 32px;
       padding: 40px 50px;
       width: 1250px;
       height: 750px;
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 948e2b1..87bf71e 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -243,6 +243,7 @@ const pageInfo = reactive({
 const total = ref(10);
 const getList = () => {
   getTunnelList({
+    siteId:siteId,
     ...pageInfo
   }).then(res => {
     if (res.code === 1000) {
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 39b02f2..3ebe473 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -114,7 +114,6 @@ onMounted(() => {
   });
   getUser()
   getOtherInfo()
-
 });
 const getUser = () => {
   getUserInfo().then(res => {
@@ -134,8 +133,8 @@ const getOtherInfo = () => {
     }
   });
 };
-const getScreenInfo = async (id) => {
-  await getLargeScreen(id).then((res) => {
+const getScreenInfo =  (id) => {
+   getLargeScreen(id).then((res) => {
     if (res?.code === 1000) {
       largeScreenData.value = res.data;
     }
@@ -146,7 +145,7 @@ const getTunnel = (id) => {
   getTunnelBySiteId(id).then((res) => {
     if (res?.code === 1000) {
       tunnelList.value = res.data
-      getScreenInfo(res.data[0].value)
+      // getScreenInfo(res.data[0].value)
     }
   });
 }

From e25398db7d05ce70f8de83e0ff1e73c0235e9665 Mon Sep 17 00:00:00 2001
From: Hcat <2768237203@qq.com>
Date: Tue, 26 Dec 2023 23:31:35 +0800
Subject: [PATCH 04/35] =?UTF-8?q?=E9=9A=A7=E9=81=93=E7=9A=84=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=E7=82=B9=E5=8A=A8=E6=80=81=E7=BB=91=E5=AE=9A=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/TunnelScene.vue       |  27 ++-
 src/views/edit/edit.vue                       | 179 +++++++++---------
 2 files changed, 117 insertions(+), 89 deletions(-)

diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index 6b5bfcd..77738bb 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -5,7 +5,7 @@
     <!-- 这里的预览模式需要做成不能修改的模式 -->
     <edit-dialog ref="edit" @addEquipment="handleAddEqu" @removeEquipment="handleRemoveEqu" @cancel="handleCancel"
       :hasDev="hasDevice" :pointNum="pointNum" :tunnelId="tunnelId" :position="targetP?.name" :hasEquipment="hasDevice"
-      pointGap="500" />
+      :pointGap="pointGap" />
     <el-dialog v-model="centerDialogVisible" width="30%" destroy-on-close center :show-close="false" style="
         margin: 20% auto;
         width: 569px;
@@ -47,7 +47,7 @@ import {
 
 import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader";
 import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
-import { onMounted, reactive, ref } from "vue";
+import { onMounted, reactive, ref, watch } from "vue";
 import { ElMessage } from "element-plus";
 import { useModelSceneStore } from "@/store/modelSceneStore";
 
@@ -62,13 +62,32 @@ const loader = new OBJLoader();
 let hdrLoader = new RGBELoader();
 let backColorSet = three.sRGBEncoding;
 
-const params = defineProps(["isedit", "tunnelId"]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
+const params = defineProps(["isedit", "tunnelId", "tunnelLength"]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
+
 
 let isedit = ref(params.isedit);
 
+let tunnelId = reactive(params.tunnelId);
+console.log(tunnelId);
+console.log(params.tunnelLength);
+
+watch(
+  () => params.tunnelLength,
+  (now) => {
+    params.tunnelLength = now
+    console.log(params.tunnelLength);
+    pointGap = now / 20
+  },
+  { deep: true }
+)
+
+let pointGap = reactive(params.tunnelLength);
+
+
 onMounted(handleMounted);
 // 挂载后回调
 async function handleMounted() {
+
   const doms = [info.value.$el, edit.value.$el];
   demo = new ThreeDScene(three, content.value);
   //看是不是预览模式，然后继续相关的操作(会在demo中的初始化中进行)
@@ -108,6 +127,8 @@ async function handleMounted() {
       type: "warning",
     });
   }
+
+
 }
 
 // 每个模型加载回调
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 2d42d6a..8998112 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -1,115 +1,122 @@
 <template>
-  <div id="main">
-    <div class="box-top">
-      <div class="tunnel-title"></div>
-      <div class="top-right">
-        <div class="del-btn" @click="handleSave">
-          保存
+    <div id="main">
+        <div class="box-top">
+            <div class="tunnel-title"></div>
+            <div class="top-right">
+                <div class="del-btn" @click="handleSave">
+                    保存
+                </div>
+            </div>
+        </div>
+        <div class="edit-box">
+            <el-form :model="form" :label-position="right" label-width="188px">
+                <el-form-item label="隧道名称">
+                    <el-input v-model="form.tunnelName" placeholder="请输入隧道名称" />
+                </el-form-item>
+                <el-form-item label="序列号">
+                    <el-input v-model="form.serialNumber" placeholder="请输入序列号" />
+                </el-form-item>
+                <el-form-item label="隧道长度">
+                    <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度" />
+                </el-form-item>
+                <el-form-item label="隧道备注">
+                    <el-input v-model="form.remarks" placeholder="请输入隧道备注" />
+                </el-form-item>
+            </el-form>
         </div>
-      </div>
-    </div>
-    <div class="edit-box">
-      <el-form :model="form" :label-position="right" label-width="188px">
-        <el-form-item label="隧道名称">
-          <el-input v-model="form.tunnelName" placeholder="请输入隧道名称"/>
-        </el-form-item>
-        <el-form-item label="序列号">
-          <el-input v-model="form.serialNumber" placeholder="请输入序列号"/>
-        </el-form-item>
-        <el-form-item label="隧道长度">
-          <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
-        </el-form-item>
-        <el-form-item label="隧道备注">
-          <el-input v-model="form.remarks" placeholder="请输入隧道备注"/>
-        </el-form-item>
-      </el-form>
-    </div>
 
-    <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
-    <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId"/>
-  </div>
+        <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
+        <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId" :tunnelLength="tunnelLength" />
+    </div>
 </template>
 <script setup>
 import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
-import {getTunnelDetail} from "../../api/tunnelManage";
+import { getTunnelDetail } from "../../api/tunnelManage";
+import { reactive, computed } from "vue";
 const router = useRouter();
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
 
+
 const form = ref({
-  tunnelName: '',
-  serialNumber: '',
-  totalLength: '',
-  remarks: ''
+    tunnelName: '',
+    serialNumber: '',
+    totalLength: '',
+    remarks: ''
 });
 
 const getTunnel = () => {
-  getTunnelDetail(tunnelId).then((res) => {
-    if (res?.code === 1000) {
-      console.log('res',res)
-      form.value=res.data
-    }
-  });
+    getTunnelDetail(tunnelId).then((res) => {
+        if (res?.code === 1000) {
+            console.log('res', res)
+            form.value = res.data
+        }
+    });
 }
 getTunnel()
+const tunnelLength = computed(() => form.value.totalLength);  
 </script>
 <style lang="scss" scoped>
 #main {
-  position: relative;
-  height: 100%;
-  width: 100%;
-  background-color: #072348;
-  .del-btn {
-    position: absolute;
-    top: 85px;
-    right: 80px;
-    cursor: pointer;
-    font-size: 42px;
-    width: 180px;
-    height: 80px;
-    line-height: 80px;
-    background: #08B7B8;
-    border-radius: 11px;
-    padding-left: 50px;
-  }
-  #tunnel-box {
+    position: relative;
     height: 100%;
-  }
-  .edit-box{
-    z-index: 2;
-    position: absolute;
-    top: 160px;
-    left: 70px;
-    width: 830px;
-    height: 500px;
-    background-image: url(@/assets/images/transducer/bg.png);
-    padding: 0 30px;
-    box-sizing: border-box;
-    :deep(.el-form-item) {
-      margin-top: 40px;
+    width: 100%;
+    background-color: #072348;
+
+    .del-btn {
+        position: absolute;
+        top: 85px;
+        right: 80px;
+        cursor: pointer;
+        font-size: 42px;
+        width: 180px;
+        height: 80px;
+        line-height: 80px;
+        background: #08B7B8;
+        border-radius: 11px;
+        padding-left: 50px;
     }
 
-    :deep(.el-form-item__label) {
-      font-size: 38px;
-      color: #FFFFFF;
-      margin-right: 12px;
-      line-height: 50px;
+    #tunnel-box {
+        height: 100%;
     }
 
-    :deep(.el-input) {
-      height: 75px;
+    .edit-box {
+        z-index: 2;
+        position: absolute;
+        top: 160px;
+        left: 70px;
+        width: 830px;
+        height: 500px;
+        background-image: url(@/assets/images/transducer/bg.png);
+        padding: 0 30px;
+        box-sizing: border-box;
 
-      .el-input__wrapper {
-        background-color: transparent;
-        border: 1px solid #08B7B8;
-
-        .el-input__inner {
-          height: auto;
-          color: #fff;
-          font-size: 38px;
+        :deep(.el-form-item) {
+            margin-top: 40px;
+        }
+
+        :deep(.el-form-item__label) {
+            font-size: 38px;
+            color: #FFFFFF;
+            margin-right: 12px;
+            line-height: 50px;
+        }
+
+        :deep(.el-input) {
+            height: 75px;
+
+            .el-input__wrapper {
+                background-color: transparent;
+                border: 1px solid #08B7B8;
+
+                .el-input__inner {
+                    height: auto;
+                    color: #fff;
+                    font-size: 38px;
+                }
+            }
         }
-      }
     }
-  }
 }
 </style>
   
\ No newline at end of file

From ac5327e5d80c1dcae4bec0f98019780640ae3a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Wed, 27 Dec 2023 23:45:44 +0800
Subject: [PATCH 05/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/site.js                   |   2 +-
 src/api/tunnelManage.js           |  15 ++++
 src/views/device-manage/index.vue | 123 ++++++++++++++++++++++--------
 src/views/edit/edit.vue           |   7 +-
 src/views/site/index.vue          |  52 +++++++++----
 src/views/tunnel-manage/index.vue |  13 +++-
 src/views/user/index.vue          |  18 +++++
 7 files changed, 180 insertions(+), 50 deletions(-)

diff --git a/src/api/site.js b/src/api/site.js
index bc3f24e..cc86624 100644
--- a/src/api/site.js
+++ b/src/api/site.js
@@ -29,7 +29,7 @@ export const addSite = (data) => {
 }
 export const deleteSite = (siteIdList) => {
   return request({
-    url: `/tunnel/site/${siteIdList}`,
+    url: `/tunnel/site/delete/${siteIdList}`,
     method: 'delete'
   })
 }
diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js
index 6d850d2..19a6c05 100644
--- a/src/api/tunnelManage.js
+++ b/src/api/tunnelManage.js
@@ -46,3 +46,18 @@ export const editTunnel = (data) => {
     data
   })
 }
+//设备管理-风机设备信息修改
+export const editFan = (data) => {
+  return request({
+    url: '/tunnel/equipment/frequency/equipments',
+    method: 'put',
+    data
+  })
+}
+export const editEquipment = (data) => {
+  return request({
+    url: '/tunnel/equipment/equipments',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index ed9778d..3deaa30 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -26,9 +26,9 @@
             <el-menu-item index="3">
               <span>其他传感器</span>
             </el-menu-item>
-<!--            <el-menu-item index="4">-->
-<!--              <span>分流器</span>-->
-<!--            </el-menu-item>-->
+            <!--            <el-menu-item index="4">-->
+            <!--              <span>分流器</span>-->
+            <!--            </el-menu-item>-->
           </el-menu>
         </div>
         <div class="box-right" v-if="changeIndex==1">
@@ -53,17 +53,20 @@
               <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"></el-input>
+                  <el-input placeholder="请输入A电流" v-model="scope.row.phaseCurrentAOffset"
+                            @change="changeCurrent(scope.row)"></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"></el-input>
+                  <el-input placeholder="请输入B电流" v-model="scope.row.phaseCurrentBOffset"
+                            @change="changeCurrent(scope.row)"></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"></el-input>
+                  <el-input placeholder="请输入C电流" v-model="scope.row.phaseCurrentCOffset"
+                            @change="changeCurrent(scope.row)"></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="state" label="状态" align="center">
@@ -71,15 +74,15 @@
                   <div class="switch">
                     <div
                         :class="{ active: scope.row.state }"
-                        @click=" scope.row.state = true"
+                        @click="scope.row.state = 1;changeState(scope.row)"
                     >
-                      启动
+                      启用
                     </div>
                     <div
                         :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state = false"
+                        @click=" scope.row.state = 0;changeState(scope.row)"
                     >
-                      停止
+                      停用
                     </div>
                   </div>
                 </template>
@@ -90,7 +93,7 @@
             <div class="cancel-btn">
               取消
             </div>
-            <div class="sure-btn" @click="router.back(-1)">
+            <div class="sure-btn" @click="handleEditFan">
               确定
             </div>
           </div>
@@ -119,7 +122,7 @@
               <el-table-column prop="unit" label="单位" align="center"/>
               <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" @change="changeCurrent(scope.row)"></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="state" label="状态" align="center">
@@ -127,15 +130,15 @@
                   <div class="switch">
                     <div
                         :class="{ active: scope.row.state }"
-                        @click=" scope.row.state = true"
+                        @click=" scope.row.state = 1;changeState(scope.row)"
                     >
-                      启动
+                      启用
                     </div>
                     <div
                         :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state = false"
+                        @click=" scope.row.state =  0;changeState(scope.row)"
                     >
-                      停止
+                      停用
                     </div>
                   </div>
                 </template>
@@ -146,7 +149,7 @@
             <div class="cancel-btn">
               取消
             </div>
-            <div class="sure-btn" @click="router.back(-1)">
+            <div class="sure-btn" @click="editWinPresure">
               确定
             </div>
           </div>
@@ -174,12 +177,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"></el-input>
+                  <el-input placeholder="请输入单位" v-model="scope.row.unit"  @change="changeCurrent(scope.row)"></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"  @change="changeCurrent(scope.row)"></el-input>
                 </template>
               </el-table-column>
               <el-table-column prop="state" label="状态" align="center">
@@ -187,15 +190,15 @@
                   <div class="switch">
                     <div
                         :class="{ active: scope.row.state }"
-                        @click=" scope.row.state = true"
+                        @click=" scope.row.state = 1;changeState(scope.row)"
                     >
-                      启动
+                      启用
                     </div>
                     <div
                         :class="{ active: ! scope.row.state }"
-                        @click=" scope.row.state = false"
+                        @click=" scope.row.state =  0;changeState(scope.row)"
                     >
-                      停止
+                      停用
                     </div>
                   </div>
                 </template>
@@ -206,7 +209,7 @@
             <div class="cancel-btn" @click="isVisited=false">
               取消
             </div>
-            <div class="sure-btn" @click="router.back(-1)">
+            <div class="sure-btn" @click="editOtherSensor">
               确定
             </div>
           </div>
@@ -244,13 +247,13 @@
                         :class="{ active: scope.row.state }"
                         @click=" scope.row.state = true"
                     >
-                      启动
+                      启用
                     </div>
                     <div
                         :class="{ active: ! scope.row.state }"
                         @click=" scope.row.state = false"
                     >
-                      停止
+                      停用
                     </div>
                   </div>
                 </template>
@@ -272,7 +275,9 @@
 </template>
 
 <script setup>
-import {getEquipmentList} from "@/api/tunnelManage";
+import {getEquipmentList, editFan} from "@/api/tunnelManage";
+import {ElMessage} from "element-plus";
+import {editEquipment} from "../../api/tunnelManage";
 
 const router = useRouter()
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
@@ -460,6 +465,64 @@ const fenliuData = ref([
   //   state: false,
   // }
 ])
+const fanItem=ref({})
+const windItem=ref({})
+const sensorItem=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,
+    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 => {
+    if (res.code === 1000) {
+      ElMessage.success('修改成功')
+    }
+  })
+}
 const handleChangeMenu = (e) => {
   console.log('切换', e)
   changeIndex.value = e
@@ -471,9 +534,9 @@ const getList = () => {
       fanData.value = res.data.frequencyChangerList
       winData.value = res.data.windPressureSensorList
       otherData.value = res.data.sensorList
-      res.data.acquisitionList.map(item=>{
-        if(item.tunnelId==tunnelId){
-          collectionFrequency.value=item.acquisitionPeriod
+      res.data.acquisitionList.map(item => {
+        if (item.tunnelId == tunnelId) {
+          collectionFrequency.value = item.acquisitionPeriod
         }
       })
     }
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 3f44d2d..d38fa03 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -41,6 +41,7 @@ import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
 import { editTunnel, getTunnelDetail } from "@/api/tunnelManage";
 import { computed } from "vue";
 import { useModelSceneStore } from "@/store/modelSceneStore";
+import {ElMessage} from "element-plus";
 
 const router = useRouter();
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
@@ -68,7 +69,7 @@ const tunnelLength = computed(() => form.value.totalLength);
 const handleGotoDevice = () => {
     router.push('/device/' + tunnelId)
 }
-const handleSave = () => {
+const handleSave =async () => {
     const data = {
         tunnelId: tunnelId,
         tunnelName: form.value.tunnelName,
@@ -77,12 +78,14 @@ const handleSave = () => {
         // constructionLength:form.value.constructionLength,
         constructionLength: 500,
         tunnelLength: form.value.totalLength,
-        tunnelThreeConfig: JSON.stringify(equipmentList.value),
+        tunnelThreeConfig: JSON.stringify(await store.getEquipmentList())
     }
     console.log('data', data, form.value.tunnelLength)
     editTunnel(data).then((res) => {
         if (res?.code === 1000) {
             console.log('re---s', res)
+          ElMessage.success(res.msg)
+          router.push('/tunnel/'+tunnelId)
             // form.value=res.data
         }
     });
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index b25ba6d..b0e6dde 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -27,7 +27,7 @@
         <div class="box-center">
           <div class="left-img"></div>
           <div class="right-tunnel">
-            <div>隧道数量：{{ item.tunnelList.length }}条
+            <div>隧道数量：{{ item.totalTunnel }}条
             </div>
             <div>
               <div class="tunnel" v-if="item.info.tunnelName">
@@ -41,7 +41,7 @@
                 <div class="add-icon"></div>
               </div>
             </div>
-            <div class="more" @click="goToAddTunnel(item.siteId)"  v-if="item.info.tunnelName">
+            <div class="more" @click="goToMoreTunnel(item.siteId)"  v-if="item.info.tunnelName">
               更多
               <div class="icon"></div>
             </div>
@@ -195,6 +195,10 @@ const goToAddTunnel = (siteId) => {
   router.push('/tunnel/' + siteId)
   // router.push('/tunnel/1')
 }
+const goToMoreTunnel = (siteId) => {
+  router.push('/tunnel/' + siteId)
+  // router.push('/tunnel/1')
+}
 //重置from表单
 const restFrom = () => {
   form.value = {
@@ -246,23 +250,39 @@ const handleMoreDelete = () => {
   if (siteIds.value.length === 0) {
     ElMessage.warning('请先选择站点进行删除')
   } else {
-    ElMessageBox.confirm(`是否确定删除该站点`, '系统提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-      customClass: 'delBox'
-    }).then(() => {
-      deleteSite(siteIds.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          siteIds.value = []
-          siteNameList.value = []
-        } else {
-          ElMessage.error(res.msg)
+    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: '取消',
+        type: 'warning',
+        customClass: 'delBox'
+      }).then(() => {
+        deleteSite(siteIds.value).then(res => {
+          if (res.code === 1000) {
+            ElMessage.success(res.msg)
+            getList()
+            siteIds.value = []
+            siteNameList.value = []
+          } else {
+            ElMessage.error(res.msg)
+          }
+        })
+      })
+    }
   }
 }
 
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 87bf71e..c7d833f 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -98,10 +98,12 @@
 <script setup>
 import {ElMessage, ElMessageBox} from "element-plus";
 import {getTunnelList,addTunnel, deleteTunnel} from "@/api/tunnelManage";
+import {onMounted} from "vue";
 
 const router = useRouter()
 const showAddIcon = ref(true)
 const siteId = reactive(router.currentRoute.value.params.siteId)
+const type = reactive(router.currentRoute.value.params.type)
 const formRules = ref({
   tunnelName: [{required: true, message: '请输入隧道名称', trigger: 'blur'}],
   serialNumber: [{required: true, message: '请输入序列号', trigger: 'blur'}]
@@ -241,6 +243,14 @@ const pageInfo = reactive({
   pageSize: 12
 });
 const total = ref(10);
+onMounted(()=>{
+  console.log('type',type)
+  if(type==='add'){
+    restFrom()
+    title.value = '新增隧道'
+    isVisited.value = true
+  }
+})
 const getList = () => {
   getTunnelList({
     siteId:siteId,
@@ -266,6 +276,7 @@ const handleSubmit = (instance) => {
   //   if (!valid) return
     const data={
       siteId:siteId,
+      tunnelId:12,
       ...form.value
     }
     if(form.value.tunnelName&&form.value.serialNumber&&form.value.totalLength){
@@ -474,7 +485,7 @@ const handleMoreDelete = () => {
     flex-wrap: wrap;
     padding-left: 67px;
     padding-right: 70px;
-    justify-content: space-between;
+    //justify-content: space-between;
     box-sizing: border-box;
     overflow: hidden;
 
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index c807caa..057f1b9 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -58,6 +58,9 @@
         <span>{{ title }}</span>
       </div>
       <el-form :model="form" :label-position="right" :rules="formRules" ref="formInstance" label-width="240px">
+        <el-form-item label="当前站点">
+          <div class="current-site">{{ currentSite }}<span>如果需要切换站点,请返回首屏切换</span></div>
+        </el-form-item>
         <el-form-item label="输入用户名称">
           <el-input v-model="form.userName" placeholder="请输入用户名称"/>
         </el-form-item>
@@ -124,6 +127,7 @@ import {addUser, editUser, getUser, getRoleOption} from "@/api/user";
 import {ElMessage, ElMessageBox} from "element-plus";
 import {getTunnelOption} from "@/api/tunnel";
 import {deleteUser, getUserDetail} from "../../api/user";
+import {getSiteDetail} from "@/api/site";
 
 const router = useRouter()
 const title = ref('添加用户')
@@ -131,6 +135,7 @@ const siteId = reactive(router.currentRoute.value.params.siteId)
 const tunnelIndex = ref()
 const username = ref()
 const userIds = ref()
+const currentSite = ref()
 const formInstance = ref()
 const userData = ref([])
 const pageInfo = reactive({
@@ -161,10 +166,14 @@ const getTunnel = () => {
     }
   })
 }
+
 const handleAddUser = () => {
   reset()
   title.value = '添加用户'
   isVisited.value = true
+  getSiteDetail(siteId).then((res) => {
+    currentSite.value = res.data.siteName
+  });
 }
 const handleEditUser = (row) => {
   reset()
@@ -270,6 +279,15 @@ const handleSelect = async (selection, row) => {
 </script>
 
 <style scoped lang="scss">
+.current-site{
+  font-size: 38px;color: #FFFFFF;
+  margin-top: 12px;
+  >span{
+    font-size: 30px!important;
+  color: darkgray!important;
+    margin-left: 20px;
+}
+}
 :deep(.el-table__header-wrapper  .el-checkbox) {
   display: none
 }

From 31428cd6403acba1247fdf3b70574dbb10dc7aba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Wed, 27 Dec 2023 23:52:10 +0800
Subject: [PATCH 06/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device-manage/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index 3deaa30..2ff313d 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -119,7 +119,11 @@
                       :cell-style="{textAlign: 'center',borderBottom: 'none'}" :data="winData">
               <el-table-column prop="equipmentName" label="设备名称" align="center"/>
               <el-table-column prop="offset" label="偏移量" align="center"/>
-              <el-table-column prop="unit" 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>
+                </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>
@@ -490,6 +494,7 @@ const getFanEditItem = (item) => {
 const getWindEditItem = (item) => {
   return {
     equipmentId: item.equipmentId,
+    unit: item.unit,
     alarmValue: item.alarmValue,
     state: item.state,
   }

From 64b3052348c3b54e5fab8aaa1a745ab2772f56b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Thu, 28 Dec 2023 16:22:53 +0800
Subject: [PATCH 07/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss      |  59 +++--
 src/router/index.js               |   6 +-
 src/store/modelSceneStore.js      |  15 +-
 src/views/device-manage/index.vue |  24 +-
 src/views/edit/edit.vue           | 367 +++++++++++++++++-------------
 src/views/site/index.vue          |  57 ++++-
 src/views/tunnel-manage/index.vue | 140 +++++++++---
 src/views/tunnel/index.vue        |  90 ++++----
 8 files changed, 479 insertions(+), 279 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index aaeb918..a1f808e 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -86,6 +86,23 @@ body,
     }
   }
 
+  .top-length {
+    z-index: 2;
+    position: absolute;
+    top: 190px;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    font-size: 50px;
+    //font-weight: bold;
+    color: #0BE9FA;
+
+    > span:last-child {
+      margin-left: 40px;
+    }
+
+  }
+
   .top-right {
     z-index: 2;
     position: absolute;
@@ -487,43 +504,53 @@ body,
   background: #072247 !important;
   border: 1px solid #0F82AF !important;
 }
+
 .el-popper {
   max-width: 200px !important;
   box-sizing: border-box;
 }
+
 .el-popper__arrow::before {
   display: none;
 }
-.el-select-dropdown{
-  width: 200px!important;
+
+.el-select-dropdown {
+  width: 200px !important;
 }
-.el-select-dropdown__item{
-  >span{
+
+.el-select-dropdown__item {
+  > span {
     color: #FFFFFF;
   }
 }
+
 .el-select .el-input .el-select__caret {
-  font-size: 35px!important;
+  font-size: 35px !important;
 }
-.el-select-dropdown__item.hover,.el-select-dropdown__item:hover{
-  background-color: #064B66!important;
-  width:198px!important;
+
+.el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
+  background-color: #064B66 !important;
+  width: 198px !important;
 }
-.el-select-dropdown.is-multiple .el-select-dropdown__item.selected{
-  background-color: #064B66!important;
-  width:200px!important;
+
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
+  background-color: #064B66 !important;
+  width: 200px !important;
 }
-.el-select-tags-wrapper{
-  .el-tag{
-    padding: 28px 20px!important;
+
+.el-select-tags-wrapper {
+  .el-tag {
+    padding: 28px 20px !important;
     font-size: 35px;
-    .el-icon{
+
+    .el-icon {
       width: 40px;
       height: 40px;
-      font-size: 40px!important;
+      font-size: 40px !important;
     }
   }
 }
+
 .current-site {
   .el-select-dropdown {
     width: 200px !important;
diff --git a/src/router/index.js b/src/router/index.js
index 77e02de..a66b61a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,7 +24,7 @@ const routes = [
     },
   },
   {
-    path: '/edit/:tunnelId(\\d+)',
+    path: '/edit/:tunnelId(\\d+)/:type',
     name: 'tunneledit',
     component: () => import('@/views/edit/edit.vue'),
     meta: {
@@ -60,7 +60,7 @@ const routes = [
     }
   },
   {
-    path: '/tunnel/:siteId(\\d+)',
+    path: '/tunnel/:siteId(\\d+)/:type',
     name: 'tunnel',
     component: () => import('@/views/tunnel-manage/index.vue'),
     meta: {
@@ -69,7 +69,7 @@ const routes = [
     }
   },
   {
-    path: '/device/:tunnelId(\\d+)',
+    path: '/device/:tunnelId(\\d+)/:type',
     name: 'device',
     component: () => import('@/views/device-manage/index.vue'),
     meta: {
diff --git a/src/store/modelSceneStore.js b/src/store/modelSceneStore.js
index 3767c9b..9b101ef 100644
--- a/src/store/modelSceneStore.js
+++ b/src/store/modelSceneStore.js
@@ -44,24 +44,11 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
         });
     });
   }
-  function getTunnelEditAllList(tunnelId = 1) {
-    return new Promise((resolve, reject) => {
-      initSceneData(tunnelId)
-        .then((res) => {
-          allEditList.value = res.data;
-          resolve(JSON.parse(allEditList.value));
-        })
-        .catch((Error) => {
-          reject();
-        });
-    });
-  }
   return {
     equipmentList,
     initData,
     saveSceneData,
     deleteEquipment,
-    getEquipmentList,
-    getTunnelEditAllList,
+    getEquipmentList
   };
 });
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index 2ff313d..7ff26c7 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="tunnel-bgc">
     <div class="box-top">
-      <div class="back-tunnel" @click="router.back(-1)">
+      <div class="back-tunnel" @click="handleGoTunnelMgr">
         <div class="back-icon"></div>
         <span>返回</span>
       </div>
       <div class="tunnel-name">
-        一号隧道
+        {{ tunnelName }}
       </div>
       <div class="tunnel-title"></div>
     </div>
@@ -281,10 +281,10 @@
 <script setup>
 import {getEquipmentList, editFan} from "@/api/tunnelManage";
 import {ElMessage} from "element-plus";
-import {editEquipment} from "../../api/tunnelManage";
-
+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)
 const collectionFrequency = ref(0)
 const changeIndex = ref(1)
 const fanData = ref([
@@ -472,6 +472,9 @@ const fenliuData = ref([
 const fanItem=ref({})
 const windItem=ref({})
 const sensorItem=ref({})
+const siteId=ref(0)
+const tunnelName=ref('')
+
 const changeCurrent = (row) => {
   fanItem.value=getFanEditItem(row)
   windItem.value=getWindEditItem(row)
@@ -547,6 +550,19 @@ const getList = () => {
     }
   })
 }
+const getTunnel = () => {
+  getTunnelDetail(tunnelId).then((res) => {
+    if (res?.code === 1000) {
+      siteId.value = res.data.siteId
+      tunnelName.value = res.data.tunnelName
+      console.log('设备详情',res.data)
+    }
+  });
+}
+getTunnel()
+const handleGoTunnelMgr=()=>{
+  router.push('/tunnel/' + siteId.value+'/'+type)
+}
 getList()
 </script>
 
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index d38fa03..9305e20 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -1,202 +1,241 @@
 <template>
-    <div id="main">
-        <div class="box-top">
-            <div class="back-tunnel" @click="router.back(-1)">
-                <div class="back-icon"></div>
-                <span>返回</span>
-            </div>
-            <div class="tunnel-title"></div>
-            <div class="btn-right">
-                <div class="del-btn" @click="handleGotoDevice">
-                    设备管理
-                </div>
-                <div class="del-btn" @click="handleSave">
-                    保存
-                </div>
-            </div>
+  <div id="main">
+    <div class="box-top">
+      <div class="back-tunnel" @click="handleGoTunnelMgr">
+        <div class="back-icon"></div>
+        <span>返回</span>
+      </div>
+      <div class="tunnel-title"></div>
+      <div class="btn-right">
+        <div class="del-btn" @click="handleGotoDevice">
+          设备管理
         </div>
-        <div class="edit-box">
-            <el-form :model="form" :label-position="right" label-width="188px">
-                <el-form-item label="隧道名称">
-                    <el-input v-model="form.tunnelName" placeholder="请输入隧道名称" />
-                </el-form-item>
-                <el-form-item label="序列号">
-                    <el-input v-model="form.serialNumber" placeholder="请输入序列号" />
-                </el-form-item>
-                <el-form-item label="隧道长度">
-                    <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度" />
-                </el-form-item>
-                <el-form-item label="隧道备注">
-                    <el-input v-model="form.remarks" placeholder="请输入隧道备注" />
-                </el-form-item>
-            </el-form>
+        <div class="del-btn" @click="handleSave">
+          保存
         </div>
-
-        <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
-        <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId" ref="tunnelScene" :tunnelLength="tunnelLength" />
+      </div>
     </div>
+    <div class="edit-box">
+      <el-form :model="form" :label-position="right" label-width="188px">
+        <el-form-item label="隧道名称">
+          <el-input v-model="form.tunnelName" placeholder="请输入隧道名称"/>
+        </el-form-item>
+        <el-form-item label="序列号">
+          <el-input v-model="form.serialNumber" placeholder="请输入序列号"/>
+        </el-form-item>
+        <el-form-item label="隧道长度">
+          <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
+        </el-form-item>
+        <el-form-item label="是否默认">
+          <el-radio-group v-model="form.isDefault">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="隧道备注">
+          <el-input v-model="form.remarks" placeholder="请输入隧道备注"/>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
+    <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId" ref="tunnelScene" :tunnelLength="tunnelLength"/>
+  </div>
 </template>
 <script setup>
 import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
-import { editTunnel, getTunnelDetail } from "@/api/tunnelManage";
-import { computed } from "vue";
-import { useModelSceneStore } from "@/store/modelSceneStore";
+import {editTunnel, getTunnelDetail} from "@/api/tunnelManage";
+import {computed} from "vue";
+import {useModelSceneStore} from "@/store/modelSceneStore";
 import {ElMessage} from "element-plus";
 
 const router = useRouter();
 const tunnelId = reactive(router.currentRoute.value.params.tunnelId)
+const type = reactive(router.currentRoute.value.params.type)
 const store = useModelSceneStore();
 const form = ref({
-    tunnelName: '',
-    serialNumber: '',
-    totalLength: '',
-    remarks: ''
+  tunnelName: '',
+  serialNumber: '',
+  totalLength: '',
+  isDefault: false,
+  remarks: ''
 });
 const equipmentList = ref([])
 onMounted(async () => {
-    equipmentList.value = await store.getEquipmentList();
+  equipmentList.value = await store.getEquipmentList();
 })
 const getTunnel = () => {
-    getTunnelDetail(tunnelId).then((res) => {
-        if (res?.code === 1000) {
-            form.value = res.data
-            console.log('for', form.value)
-        }
-    });
+  getTunnelDetail(tunnelId).then((res) => {
+    if (res?.code === 1000) {
+      form.value = res.data
+    }
+  });
 }
 getTunnel()
 const tunnelLength = computed(() => form.value.totalLength);
 const handleGotoDevice = () => {
-    router.push('/device/' + tunnelId)
+  router.push('/device/' + tunnelId)
 }
-const handleSave =async () => {
-    const data = {
-        tunnelId: tunnelId,
-        tunnelName: form.value.tunnelName,
-        serialNumber: form.value.serialNumber,
-        remarks: form.value.remarks,
-        // constructionLength:form.value.constructionLength,
-        constructionLength: 500,
-        tunnelLength: form.value.totalLength,
-        tunnelThreeConfig: JSON.stringify(await store.getEquipmentList())
+const handleGoTunnelMgr=()=>{
+  router.push('/tunnel/' + form.value.siteId+'/'+type)
+}
+const handleSave = async () => {
+  const data = {
+    tunnelId: tunnelId,
+    tunnelName: form.value.tunnelName,
+    serialNumber: form.value.serialNumber,
+    remarks: form.value.remarks,
+    // constructionLength:form.value.constructionLength,
+    constructionLength: 500,
+    tunnelLength: form.value.totalLength,
+    isDefault: form.value.isDefault,
+    tunnelThreeConfig: JSON.stringify(await store.getEquipmentList())
+  }
+  editTunnel(data).then((res) => {
+    if (res?.code === 1000) {
+      ElMessage.success(res.msg)
+      router.push('/tunnel/' + form.value.siteId+'/'+type)
     }
-    console.log('data', data, form.value.tunnelLength)
-    editTunnel(data).then((res) => {
-        if (res?.code === 1000) {
-            console.log('re---s', res)
-          ElMessage.success(res.msg)
-          router.push('/tunnel/'+tunnelId)
-            // form.value=res.data
-        }
-    });
+  });
 }
 </script>
 <style lang="scss" scoped>
 #main {
-    position: relative;
-    height: 100%;
-    width: 100%;
-    background-color: #072348;
+  position: relative;
+  height: 100%;
+  width: 100%;
+  background-color: #072348;
+
+  .box-top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    .back-tunnel {
+      z-index: 2;
+      position: absolute;
+      top: 100px;
+      //left: 80px;
+      cursor: pointer;
+      margin: 0 0 0 80px;
+      display: flex;
+      align-items: center;
+      width: 180px;
+      height: 80px;
+      line-height: 70px;
+      border-radius: 11px;
+      border: 2px solid #08B7B8;
+      font-size: 42px;
+      color: #FFFFFF;
+
+      .back-icon {
+        margin-right: 20px;
+        margin-left: 23px;
+        width: 35px;
+        height: 35px;
+        background-image: url('@/assets/images/site/zdgl_icon_fh.png');
+      }
+    }
+
+    .btn-right {
+      display: flex;
+      z-index: 2;
+      position: absolute;
+      top: 100px;
+      right: 80px;
+
+      .del-btn {
+        &:first-child {
+          width: 220px;
+          margin-right: 40px;
+        }
 
-    .box-top {
         display: flex;
+        justify-content: center;
         align-items: center;
-        justify-content: space-between;
-
-        .back-tunnel {
-            z-index: 2;
-            position: absolute;
-            top: 100px;
-            //left: 80px;
-            cursor: pointer;
-            margin: 0 0 0 80px;
-            display: flex;
-            align-items: center;
-            width: 180px;
-            height: 80px;
-            line-height: 70px;
-            border-radius: 11px;
-            border: 2px solid #08B7B8;
-            font-size: 42px;
-            color: #FFFFFF;
-
-            .back-icon {
-                margin-right: 20px;
-                margin-left: 23px;
-                width: 35px;
-                height: 35px;
-                background-image: url('@/assets/images/site/zdgl_icon_fh.png');
-            }
-        }
-
-        .btn-right {
-            display: flex;
-            z-index: 2;
-            position: absolute;
-            top: 100px;
-            right: 80px;
-
-            .del-btn {
-                &:first-child {
-                    width: 220px;
-                    margin-right: 40px;
-                }
-
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                cursor: pointer;
-                width: 180px;
-                height: 80px;
-                border-radius: 11px;
-                border: 2px solid #08B7B8;
-                color: #FFFFFF;
-                font-size: 42px;
-            }
-        }
-
+        cursor: pointer;
+        width: 180px;
+        height: 80px;
+        border-radius: 11px;
+        border: 2px solid #08B7B8;
+        color: #FFFFFF;
+        font-size: 42px;
+      }
     }
 
-    #tunnel-box {
-        height: 100%;
+  }
+
+  #tunnel-box {
+    height: 100%;
+  }
+
+  .edit-box {
+    z-index: 2;
+    position: absolute;
+    top: 250px;
+    left: 80px;
+    width: 830px;
+    //height: 500px;
+    background-image: url(@/assets/images/transducer/bg.png);
+    padding: 20px 30px;
+    box-sizing: border-box;
+    :deep(.el-radio-group) {
+      margin-top: 10px;
     }
 
-    .edit-box {
-        z-index: 2;
-        position: absolute;
-        top: 250px;
-        left: 80px;
-        width: 830px;
-        height: 500px;
-        background-image: url(@/assets/images/transducer/bg.png);
-        padding: 0 30px;
-        box-sizing: border-box;
-
-        :deep(.el-form-item) {
-            margin-top: 40px;
-        }
-
-        :deep(.el-form-item__label) {
-            font-size: 38px;
-            color: #FFFFFF;
-            margin-right: 12px;
-            line-height: 50px;
-        }
-
-        :deep(.el-input) {
-            height: 75px;
-
-            .el-input__wrapper {
-                background-color: transparent;
-                border: 1px solid #08B7B8;
-
-                .el-input__inner {
-                    height: auto;
-                    color: #fff;
-                    font-size: 38px;
-                }
-            }
-        }
+    :deep(.el-radio__label) {
+      color: #FFFFFF;
+      font-size: 38px;
     }
+
+    :deep(.el-radio__inner) {
+      width: 40px;
+      height: 40px;
+      border-radius: 25px;
+      border: 4px solid #05FEFF;
+      background-color: transparent;
+    }
+
+    :deep(.el-radio__input.is-checked+.el-radio__label) {
+      color: #FFFFFF;
+    }
+
+    :deep(.el-radio__input.is-checked .el-radio__inner ) {
+      background: #064B66;
+      border-color: #05FEFF !important;
+    }
+
+    :deep(.el-radio__inner::after) {
+      width: 18px;
+      height: 18px;
+      background: #05FEFF;
+    }
+
+    :deep(.el-form-item) {
+      margin-top: 40px;
+    }
+
+    :deep(.el-form-item__label) {
+      font-size: 38px;
+      color: #FFFFFF;
+      margin-right: 12px;
+      line-height: 50px;
+    }
+
+    :deep(.el-input) {
+      height: 75px;
+
+      .el-input__wrapper {
+        background-color: transparent;
+        border: 1px solid #08B7B8;
+
+        .el-input__inner {
+          height: auto;
+          color: #fff;
+          font-size: 38px;
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index b0e6dde..de5d3b4 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -30,7 +30,7 @@
             <div>隧道数量：{{ item.totalTunnel }}条
             </div>
             <div>
-              <div class="tunnel" v-if="item.info.tunnelName">
+              <div class="tunnel" v-if="item.info.tunnelName" @click="goToAddTunnel(item.siteId)">
                 <div>{{ item.info.tunnelName }}</div>
                 <div class="tunnel-icon"></div>
                 <div>施工长度{{ item.info.constructionLength }}米</div>
@@ -41,7 +41,7 @@
                 <div class="add-icon"></div>
               </div>
             </div>
-            <div class="more" @click="goToMoreTunnel(item.siteId)"  v-if="item.info.tunnelName">
+            <div class="more" @click="goToAddTunnel(item.siteId)"  v-if="item.info.tunnelName">
               更多
               <div class="icon"></div>
             </div>
@@ -65,6 +65,12 @@
         <el-form-item label="站点名称">
           <el-input v-model="form.siteName" placeholder="请输入站点名称"/>
         </el-form-item>
+        <el-form-item label="是否默认">
+          <el-radio-group v-model="form.isDefault">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="站点地址">
           <el-input v-model="form.address" placeholder="请输入站点地址"/>
         </el-form-item>
@@ -148,7 +154,8 @@ const pageInfo = reactive({
 const form = ref({
   address: '',
   siteName: '',
-  describe: ''
+  describe: '',
+  isDefault: false
 });
 const formRules = ref({
   siteName: [{required: true, message: '请输入站点名称', trigger: 'blur'}]
@@ -192,19 +199,16 @@ const handleClickSite = (type) => {
   }
 }
 const goToAddTunnel = (siteId) => {
-  router.push('/tunnel/' + siteId)
-  // router.push('/tunnel/1')
-}
-const goToMoreTunnel = (siteId) => {
-  router.push('/tunnel/' + siteId)
-  // router.push('/tunnel/1')
+  router.push('/tunnel/' + siteId+'/s')
 }
+
 //重置from表单
 const restFrom = () => {
   form.value = {
     address: '',
     siteName: '',
-    describe: ''
+    describe: '',
+    isDefault: false
   }
 }
 const handleEdit = (item) => {
@@ -294,6 +298,37 @@ const handleCurrentChange = (val) => {
 </script>
 
 <style scoped lang="scss">
+:deep(.el-radio-group) {
+  margin-top: 10px;
+}
+
+:deep(.el-radio__label) {
+  color: #FFFFFF;
+  font-size: 38px;
+}
+
+:deep(.el-radio__inner) {
+  width: 40px;
+  height: 40px;
+  border-radius: 25px;
+  border: 4px solid #05FEFF;
+  background-color: transparent;
+}
+
+:deep(.el-radio__input.is-checked+.el-radio__label) {
+  color: #FFFFFF;
+}
+
+:deep(.el-radio__input.is-checked .el-radio__inner ) {
+  background: #064B66;
+  border-color: #05FEFF !important;
+}
+
+:deep(.el-radio__inner::after) {
+  width: 18px;
+  height: 18px;
+  background: #05FEFF;
+}
 .clickColor {
   position: absolute;
   top: 7px;
@@ -509,6 +544,7 @@ const handleCurrentChange = (val) => {
             margin-top: 29px;
 
             .tunnel {
+              cursor: pointer;
               margin-right: 20px;
               width: 280px;
               height: 350px;
@@ -542,6 +578,7 @@ const handleCurrentChange = (val) => {
             }
 
             .tunnel-add {
+              cursor: pointer;
               width: 280px;
               height: 350px;
               background: #1891A3;
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index c7d833f..53125c5 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -1,10 +1,13 @@
 <template>
   <div class="tunnel-bgc">
     <div class="box-top">
-      <div class="back-tunnel" @click="router.back(-1)">
+      <div class="back-tunnel" @click="handleGoSiteOrIndex">
         <div class="back-icon"></div>
         <span>返回</span>
       </div>
+      <div class="site-name">
+        {{siteName}}
+      </div>
       <div class="tunnel-title"></div>
       <div class="all-del-btn">
         <div class="all-btn" style=" margin-right: 40px;" v-if="!showAddIcon" @click="handleAdd">
@@ -72,6 +75,12 @@
         <el-form-item label="隧道长度" required>
           <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
         </el-form-item>
+        <el-form-item label="是否默认">
+          <el-radio-group v-model="form.isDefault">
+            <el-radio :label="true">是</el-radio>
+            <el-radio :label="false">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="隧道备注">
           <el-input v-model="form.remarks" placeholder="请输入隧道备注"/>
         </el-form-item>
@@ -99,6 +108,7 @@
 import {ElMessage, ElMessageBox} from "element-plus";
 import {getTunnelList,addTunnel, deleteTunnel} from "@/api/tunnelManage";
 import {onMounted} from "vue";
+import { getSiteDetail} from "@/api/site";
 
 const router = useRouter()
 const showAddIcon = ref(true)
@@ -231,11 +241,13 @@ const title = ref('新增隧道')
 const isVisited = ref(false);
 const tunnelIds = ref([])
 const tunnelNameList = ref([])
+const siteName = ref('')
 const form = ref({
   tunnelName: '',
   serialNumber: '',
   totalLength: '',
-  remarks: ''
+  remarks: '',
+  isDefault:false
 });
 const isEdit = ref(false)
 const pageInfo = reactive({
@@ -244,13 +256,18 @@ const pageInfo = reactive({
 });
 const total = ref(10);
 onMounted(()=>{
-  console.log('type',type)
-  if(type==='add'){
-    restFrom()
-    title.value = '新增隧道'
-    isVisited.value = true
-  }
+  getSiteDetail(siteId).then((res) => {
+    siteName.value = res.data.siteName
+  });
 })
+const handleGoSiteOrIndex=()=>{
+  if(type==='s'){
+    router.push('/site')
+  }else if(type==='i'){
+    router.push('/')
+  }
+
+}
 const getList = () => {
   getTunnelList({
     siteId:siteId,
@@ -294,26 +311,31 @@ const handleSubmit = (instance) => {
 }
 const handleGoToEditTunnel = (tunnelId) => {
   isEdit.value = true
-  router.push('/edit/' + tunnelId)
+  if(type==='s'){
+    router.push('/edit/' + tunnelId+'/s')
+  }else if(type==='i'){
+    router.push('/edit/' + tunnelId+'/i')
+  }
 }
 const handleChooseAll = () => {
   tunnelList.value.map(item => {
     item.checked = !item.checked
   })
 }
-const handleEdit = () => {
-  title.value = '编辑隧道'
-  // isVisited.value = true
-}
 const handleEditDevice = (tunnelId) => {
-  router.push('/device/' + tunnelId)
+  if(type==='s'){
+    router.push('/device/' + tunnelId+'/s')
+  }else if(type==='i'){
+    router.push('/device/' + tunnelId+'/i')
+  }
 }
 const restFrom = () => {
   form.value = {
     tunnelName: '',
     serialNumber: '',
     totalLength: '',
-    remarks: ''
+    remarks: '',
+    isDefault:false
   }
 }
 const handleAdd = () => {
@@ -345,29 +367,87 @@ const handleMoreDelete = () => {
   if (tunnelIds.value.length === 0) {
     ElMessage.warning('请先选择隧道进行删除')
   } else {
-    ElMessageBox.confirm(`是否确定删除该隧道`, '系统提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-      customClass: 'delBox'
-    }).then(() => {
-      deleteTunnel(tunnelIds.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg)
-          getList()
-          tunnelIds.value = []
-          tunnelNameList.value = []
-        } else {
-          ElMessage.error(res.msg)
+    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: '取消',
+        type: 'warning',
+        customClass: 'delBox'
+      }).then(() => {
+        deleteTunnel(tunnelIds.value).then(res => {
+          if (res.code === 1000) {
+            ElMessage.success(res.msg)
+            getList()
+            tunnelIds.value = []
+            tunnelNameList.value = []
+          } else {
+            ElMessage.error(res.msg)
+          }
+        })
+      })
+    }
   }
 }
 
 </script>
 
 <style scoped lang="scss">
+.site-name {
+  position: absolute;
+  left: 250px;
+  z-index: 2;
+  margin-left: 120px;
+  height: 61px;
+  font-size: 46px;
+  font-weight: bold;
+  color: #FFFFFF;
+  line-height: 61px;
+}
+:deep(.el-radio-group) {
+  margin-top: 10px;
+}
+
+:deep(.el-radio__label) {
+  color: #FFFFFF;
+  font-size: 38px;
+}
+
+:deep(.el-radio__inner) {
+  width: 40px;
+  height: 40px;
+  border-radius: 25px;
+  border: 4px solid #05FEFF;
+  background-color: transparent;
+}
+
+:deep(.el-radio__input.is-checked+.el-radio__label) {
+  color: #FFFFFF;
+}
+
+:deep(.el-radio__input.is-checked .el-radio__inner ) {
+  background: #064B66;
+  border-color: #05FEFF !important;
+}
+
+:deep(.el-radio__inner::after) {
+  width: 18px;
+  height: 18px;
+  background: #05FEFF;
+}
 :deep(.el-dialog) {
   border: 2px solid #05FEFF;
   background: #0D6578;
@@ -508,7 +588,7 @@ const handleMoreDelete = () => {
     }
 
     .site-box {
-      cursor: pointer;
+      //cursor: pointer;
       margin-top: 50px;
       margin-right: 1.5%;
       padding: 40px 30px;
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 3ebe473..ff29bf1 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -1,18 +1,24 @@
 <template>
   <div id="main">
     <div class="box-top">
-      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" />
+      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList"/>
       <div class="tunnel-title"></div>
-      <manage-length class="tunnel-length"></manage-length>
+      <!--      <manage-length class="tunnel-length"></manage-length>-->
+      <div class="top-length">
+        <span>隧道总长度: {{tunnelLength}}米</span>
+        <span>当前施工长度: {{constructionLength}}米</span>
+      </div>
       <div class="top-right">
         <div class="current-site">
           当前站点：<span>{{ currentSite }}</span>
-          <el-dropdown trigger="click" @command="handleCommand">
+          <el-dropdown trigger="click" @command="handleChangeSite">
             <div class="toggle"></div>
             <template #dropdown>
               <el-dropdown-menu>
-                <el-dropdown-item v-for="item in siteList" :key="item.value" :command="item">{{ item.label
-                }}</el-dropdown-item>
+                <el-dropdown-item v-for="item in siteList" :key="item.value" :command="item">{{
+                    item.label
+                  }}
+                </el-dropdown-item>
               </el-dropdown-menu>
             </template>
           </el-dropdown>
@@ -24,26 +30,26 @@
         </div>
       </div>
     </div>
-    <!-- <tunnel-scene id="tunnel-box" :isedit="false" /> -->\
+    <!-- <tunnel-scene id="tunnel-box" :isedit="false" /> -->
     <!-- 一进去的话应该是预览模式，所以引入这个组件 -->
     <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId"></preview-scene>
     <div class="left">
       <el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"
-        :close-on-click-modal="false" :close-on-press-escape="false">
+                 :close-on-click-modal="false" :close-on-press-escape="false">
         <fan-info v-if="showFan" :list="socketData.leftData" :fan-data="largeScreenData"
-          :transducer-data="largeScreenData" />
+                  :transducer-data="largeScreenData"/>
         <!--        <transducer-list v-if="showFan" :list="socketData.leftData" :transducer-data="largeScreenData" />-->
-        <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData" />
+        <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData"/>
       </el-drawer>
       <div v-if="drawerLeft" class="left-arrow" @click="closeLeft"></div>
       <div v-else class="shrink-left" @click="closeLeft"></div>
     </div>
     <div class="right">
       <el-drawer v-model="drawerRight" direction="rtl" modal-class="modal-box" :modal="false" :show-close="false"
-        :close-on-click-modal="false" :close-on-press-escape="false">
-        <wind-pressure-list v-if="showFan" :list="socketData.windPressure" :win-data="largeScreenData" />
-        <air-info v-if="showFan" :list="socketData.sensor" :air-data="largeScreenData" />
-        <bad-gas-info v-if="showFan" :list="socketData.sensor" :bad-gas-data="largeScreenData" :tunnelId="tunnelId" />
+                 :close-on-click-modal="false" :close-on-press-escape="false">
+        <wind-pressure-list v-if="showFan" :list="socketData.windPressure" :win-data="largeScreenData"/>
+        <air-info v-if="showFan" :list="socketData.sensor" :air-data="largeScreenData"/>
+        <bad-gas-info v-if="showFan" :list="socketData.sensor" :bad-gas-data="largeScreenData" :tunnelId="tunnelId"/>
       </el-drawer>
       <div v-if="drawerRight" class="right-arrow" @click="closeRight"></div>
       <div v-else class="shrink-right" @click="closeRight"></div>
@@ -63,22 +69,21 @@
 </template>
 
 <script setup>
-import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
 import PreviewScene from "@/components/content/tunnelScene/PreviewScene.vue"
 import FanInfo from "@/components/content/fanInfo/FanInfo.vue";
-import TransducerList from "@/components/content/transducerList/TransducerList.vue";
 import UsedEle from "@/components/content/usedEle/UsedEle.vue";
 import WindPressureList from "@/components/content/windPressure/WindPressureList.vue";
 import AirInfo from "@/components/content/airInfo/AirInfo.vue";
 import BadGasInfo from "@/components/content/badGasInfo/BadGasInfo.vue";
 import ManageBtn from "@/components/manageBtn/index.vue";
-import ManageLength from "@/components/manageLength/index.vue";
-import { dateFormat } from "@/utils/date.js";
-import { getToken } from "@/utils/auth";
-import { useAuthStore } from "@/store/userstore.js";
-import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/largeScreen";
-import { ElMessageBox } from "element-plus";
-import { getUserInfo } from "@/api/login";
+import {dateFormat} from "@/utils/date.js";
+import {getToken} from "@/utils/auth";
+import {useAuthStore} from "@/store/userstore.js";
+import {getLargeScreen, getLargeScreenInfo, getTunnelBySiteId} from "@/api/largeScreen";
+import {ElMessageBox} from "element-plus";
+import {getUserInfo} from "@/api/login";
+import {initSceneData} from "@/api/tunnelScene";
+import {getSiteDetail} from "../../api/site";
 
 const authStore = useAuthStore();
 const router = useRouter();
@@ -94,6 +99,8 @@ const currentDate = ref(dateFormat());
 const tunnelBtn = ref();
 const tunnelList = ref([]);
 const tunnelId = ref(0);
+const tunnelLength = ref(0);
+const constructionLength = ref(0);
 const routeList = ref([]);
 let socket = reactive("");
 const serialNumber = ref("SC00DY00GH00ELBT");
@@ -107,7 +114,6 @@ const socketData = reactive({
   windPressure: [],
   sensor: [],
 });
-
 onMounted(() => {
   nextTick(() => {
     showFan.value = true;
@@ -120,37 +126,45 @@ const getUser = () => {
     currentUser.value = res.data.user.userName
   })
 }
+const getDefaultSite=(siteId)=>{
+  // console.log('siteList.value',siteList.value)
+  // getSiteDetail(siteId).then((res) => {
+  //   console.log('res',res)
+  // });
+}
 const getOtherInfo = () => {
   getLargeScreenInfo().then((res) => {
     if (res?.code === 1000) {
       routeList.value = res.data.routeList
-      currentSiteId.value = res.data.siteOption[0].value
-      currentSite.value = res.data.siteOption[0].label
       siteList.value = res.data.siteOption
-      tunnelId.value = res.data.tunnelOption[0].value
-      getTunnel(res.data.siteOption[0].value)
-      getScreenInfo(tunnelId.value);
+      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)
     }
   });
 };
-const getScreenInfo =  (id) => {
-   getLargeScreen(id).then((res) => {
+const getScreenInfo = (id) => {
+  tunnelId.value=id
+  getLargeScreen(id).then((res) => {
     if (res?.code === 1000) {
       largeScreenData.value = res.data;
     }
   });
+  initSceneData(id).then((res) => {
+    tunnelLength.value=res.data.tunnelLength
+    constructionLength.value=res.data.constructionLength
+  })
 };
 //根据站点id获取隧道信息
 const getTunnel = (id) => {
   getTunnelBySiteId(id).then((res) => {
     if (res?.code === 1000) {
       tunnelList.value = res.data
-      // getScreenInfo(res.data[0].value)
+      getScreenInfo(res.data[0].value)
     }
   });
 }
 const changeTunnel = (e) => {
-  tunnelId.value = e
   let newObj = {}
   tunnelList.value.forEach((item, index) => {
     if (index === e) {
@@ -158,21 +172,21 @@ const changeTunnel = (e) => {
     }
   })
   getScreenInfo(newObj.value)
-  nextTick(() => {
-    showFan.value = true;
-  });
+  // nextTick(() => {
+  //   showFan.value = true;
+  // });
 }
 const manageSelect = (index) => {
   console.log("首页点击-", index);
   if (index === 0) {
     router.push("/site");
   } else if (index === 1) {
-    router.push("/tunnel/"+tunnelId.value);
+    router.push("/tunnel/" + currentSiteId.value+'/i');
   } else if (index === 2) {
-    router.push("/user/"+currentSiteId.value);
+    router.push("/user/" + currentSiteId.value);
   }
 };
-const handleCommand = (item) => {
+const handleChangeSite = (item) => {
   currentSite.value = item.label
   currentSiteId.value = item.value
   getTunnel(item.value)

From 67f40cd6b11c46c0929de764a814d92a4c983c21 Mon Sep 17 00:00:00 2001
From: dengj <209192648@qq.com>
Date: Thu, 28 Dec 2023 18:06:48 +0800
Subject: [PATCH 08/35] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E9=9A=A7?=
 =?UTF-8?q?=E9=81=93=E6=8E=A5=E5=8F=A3=E9=83=A8=E5=88=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/windPressure/WindPressureList.vue |  11 +-
 .../childComps/WindPressureItem.vue           |   5 +-
 src/views/device-manage/index.vue             | 108 +++++-------------
 3 files changed, 37 insertions(+), 87 deletions(-)

diff --git a/src/components/content/windPressure/WindPressureList.vue b/src/components/content/windPressure/WindPressureList.vue
index 9683f6d..61fadb0 100644
--- 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,
diff --git a/src/components/content/windPressure/childComps/WindPressureItem.vue b/src/components/content/windPressure/childComps/WindPressureItem.vue
index d7017e3..65e635e 100644
--- 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, //编号
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index 7ff26c7..bf6aa50 100644
--- 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>

From 6dde5ccbc8e56b67b6ad83d52ff48012265cd3e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Thu, 28 Dec 2023 23:00:52 +0800
Subject: [PATCH 09/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BF=AE=E5=A4=8Db?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/largeScreen.js                        |   7 +
 src/api/tunnelManage.js                       |   5 +-
 src/assets/styles/index.scss                  |   5 +
 src/components/content/fanInfo/FanInfo.vue    | 164 +++++++++++++++++-
 .../content/windPressure/WindPressureList.vue |   3 +-
 src/router/index.js                           |   8 +-
 src/views/device-manage/index.vue             |  50 ++++--
 src/views/edit/edit.vue                       |   5 +-
 src/views/site/index.vue                      |  19 +-
 src/views/tunnel-manage/index.vue             | 113 +++++-------
 src/views/tunnel/index.vue                    |   6 +-
 11 files changed, 274 insertions(+), 111 deletions(-)

diff --git a/src/api/largeScreen.js b/src/api/largeScreen.js
index 4747a04..b83c3f7 100644
--- a/src/api/largeScreen.js
+++ b/src/api/largeScreen.js
@@ -35,3 +35,10 @@ export const getBadGasEchartsInfo = (tunnelId) => {
     method: 'get'
   })
 }
+//电流监控数据
+export const getFanEchartsInfo = (equipmentId) => {
+  return request({
+    url: `/tunnel/large/screen/echarts/current/${equipmentId}`,
+    method: 'get'
+  })
+}
diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js
index 19a6c05..35160d3 100644
--- a/src/api/tunnelManage.js
+++ b/src/api/tunnelManage.js
@@ -10,10 +10,7 @@ export const getTunnelList = (params) => {
 export const getTunnelDetail = (tunnelId) => {
   return request({
     url: `/tunnel/tunnel/${tunnelId}`,
-    method: 'get',
-    params:{
-      tunnelId:tunnelId
-    }
+    method: 'get'
   })
 }
 export const addTunnel = (data) => {
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index a1f808e..f98121e 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -298,6 +298,11 @@ body,
       height: 1160px;
       //width: 1300px;
     }
+    #containerFan {
+      flex: 1;
+      height: 1160px;
+      //width: 1300px;
+    }
 
     #containerBad {
       flex: 1;
diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index 5341993..dd2f660 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -64,17 +64,38 @@
             </div>
           </div>
         </div>
-        <div class="current">
-          <fan-info-item :wp="transducerData[index]"/>
+        <div class="current" @click="handleOpenChart(item)">
+          <fan-info-item :wp="transducerData[index]" />
         </div>
       </div>
     </div>
+    <div class="digital-tunnel">
+      <el-dialog :close-on-click-modal="false" v-model="isVisited" :title="'电流监控数据'" width="2175px"
+                 :modal="false">
+        <div class="left-top-icon"></div>
+        <div class="right-top-icon"></div>
+        <div class="chat-dialog">
+          <div id="containerFan"></div>
+          <div style="width: 1px;"></div>
+        </div>
+<!--        <div class="time-select">-->
+<!--          <time-range-btn-->
+<!--              :buttonList="timeList"-->
+<!--              v-model="selectTimeButton"-->
+<!--              @select="timeSelect"-->
+<!--          />-->
+<!--        </div>-->
+        <div class="left-bottom-icon"></div>
+        <div class="right-bottom-icon"></div>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
 <script setup>
 import * as echarts from "echarts";
 import FanInfoItem from "./FanInfoItem.vue";
+import {getFanEchartsInfo} from "../../../api/largeScreen";
 
 const props = defineProps({
   list: Array,
@@ -89,6 +110,8 @@ const transducerData = ref([])
 const stateA = ref(false)
 const stateB = ref(false)
 const stateC = ref(false)
+const isVisited = ref(false)
+let myEcharts = reactive({});
 watch(() => props.transducerData, (now) => {
   getTransData(now.frequencyChangerList)
 }, {deep: true});
@@ -122,7 +145,19 @@ watch(() => props.list, (now) => {
   })
   handleOnMounted()
 }, {deep: true});
-
+const getFanInfo = (equipmentId) => {
+  getFanEchartsInfo(equipmentId).then(res => {
+    if (res?.code === 1000) {
+      isVisited.value = true
+      nextTick(() => {
+        initChart(res.data.dates, res.data.currentsA,res.data.currentsB,res.data.currentsC)
+      })
+    }
+  })
+}
+const handleOpenChart = (item) => {
+  getFanInfo(item.equipmentId)
+}
 const getTransData = (data) => {
   let tranObj = {}
   let tranArr = []
@@ -306,6 +341,128 @@ const getImageUrl = (name) => {
   let icon = getImage(name)
   return new URL(`../../../assets/images/fanInfo/${icon}`, import.meta.url).href
 }
+/**
+ * 初始化echarts实例方法
+ */
+const initChart = (type, valueA,valueB,valueC) => {
+  //3.初始化container容器
+  myEcharts = echarts.init(document.getElementById('containerFan'));
+  //5.传入数据
+  let option = {
+    //图例
+    legend: {
+      left: 0,
+      textStyle: {
+        color: '#FFFFFF',
+        fontSize: 45
+      },
+      itemWidth: 30,
+      itemHeight: 30,
+      icon: "circle",
+    },
+    //离容器四侧的距离
+    grid: {
+      left: 0, // 左边距
+      right: 20, // 右边距
+      top: 80, // 顶边距
+      bottom: 0, // 底边距
+      containLabel: true,
+    },
+    //提示框组件
+    tooltip: {
+      show: true,
+      trigger: 'axis',
+      backgroundColor: "transparent", // 设置背景颜色为透明
+      borderColor: "transparent", // 设置边框颜色为透明
+      padding: 0, // 设置内边距为0
+      textStyle: {
+        fontSize: 40
+      },
+      formatter: function (params) {
+        let content = `
+          <div style="background: linear-gradient(180deg, #254062 0%, rgba(20,36,51,0.3) 100%);;border: 2px solid #6087BA;border-radius: 4px;padding: 8px 16px;">
+            <div style="font-size: 52px;font-family: PingFang SC-Regular, PingFang SC;font-weight: 400;color: #EFEEEE;margin-bottom: 8px;">${params[0].name}</div>
+            <div style="font-size: 52px;line-height: 48px;font-family: Bebas Neue-Regular, Bebas Neue;font-weight: 400;margin-top: 20px"><span style="background: linear-gradient(180deg, #F5B85F 0%, #FFFFFF 100%);background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;">${params[0].value}</span></div>
+          </div>`;
+        return content;
+      },
+    },
+    toolbox: {
+      show: false,
+      right: 10,
+      feature: {
+        dataZoom: {
+          yAxisIndex: 'none'
+        }
+      }
+    },
+    dataZoom: [{
+      type: 'inside'
+    }],
+    //X轴
+    xAxis: {
+      type: 'category',
+      // data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00','07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00','19:00', '20:00', '21:00', '22:00', '23:00','24:00'],
+      data: type,
+      axisLabel: {
+        textStyle: {
+          fontSize: 45,
+          color: '#D6F1FA'
+        },
+      },
+    },
+    //Y轴
+    yAxis: {
+      type: 'value',
+      axisLabel: {
+        textStyle: {
+          fontSize: 45,
+          color: '#D6F1FA'
+        },
+      },
+    },
+    //配置项
+    series: [
+      {
+        // data: [56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76, 69, 25, 31, 49, 81, 63],
+       name:'A相电流',
+        data: valueA,
+        type: 'line',
+        smooth: true,
+        symbolSize: 24,
+        lineStyle: {
+          width: 5
+        },
+      },
+      {
+        name:'B相电流',
+        data: valueB,
+        type: 'line',
+        smooth: true,
+        symbolSize: 24,
+        lineStyle: {
+          width: 5
+        },
+      },
+      {
+        name:'C相电流',
+        data: valueC,
+        type: 'line',
+        smooth: true,
+        symbolSize: 24,
+        lineStyle: {
+          width: 5
+        },
+      }
+    ]
+  }
+  myEcharts.setOption(option);
+  //图表大小自适应窗口大小变化
+  window.onresize = () => {
+    myEcharts.resize();
+  }
+}
+
 </script>
 
 <style lang="scss" scoped>
@@ -608,6 +765,7 @@ input[type="number"] {
         height: 37px;
         font-size: 28px;
         color: #FFFFFF;
+        cursor: pointer;
       }
 
     }
diff --git a/src/components/content/windPressure/WindPressureList.vue b/src/components/content/windPressure/WindPressureList.vue
index 61fadb0..19c0e84 100644
--- a/src/components/content/windPressure/WindPressureList.vue
+++ b/src/components/content/windPressure/WindPressureList.vue
@@ -6,7 +6,8 @@
                           @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">
diff --git a/src/router/index.js b/src/router/index.js
index a66b61a..cb01cf5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,7 +24,7 @@ const routes = [
     },
   },
   {
-    path: '/edit/:tunnelId(\\d+)/:type',
+    path: '/edit/:tunnelId(\\d+)/:type/:userId(\\d+)',
     name: 'tunneledit',
     component: () => import('@/views/edit/edit.vue'),
     meta: {
@@ -42,7 +42,7 @@ const routes = [
     }
   },
   {
-    path: '/site',
+    path: '/site/:userId(\\d+)',
     name: 'site',
     component: () => import('@/views/site/index.vue'),
     meta: {
@@ -60,7 +60,7 @@ const routes = [
     }
   },
   {
-    path: '/tunnel/:siteId(\\d+)/:type',
+    path: '/tunnel/:siteId(\\d+)/:type/:userId(\\d+)',
     name: 'tunnel',
     component: () => import('@/views/tunnel-manage/index.vue'),
     meta: {
@@ -69,7 +69,7 @@ const routes = [
     }
   },
   {
-    path: '/device/:tunnelId(\\d+)/:type',
+    path: '/device/:tunnelId(\\d+)/:type/:userId(\\d+)',
     name: 'device',
     component: () => import('@/views/device-manage/index.vue'),
     meta: {
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index bf6aa50..bb2e07e 100644
--- 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) {
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 9305e20..75c3adc 100644
--- 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)
     }
   });
 }
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index de5d3b4..5e31090 100644
--- 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;
         }
       }
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 53125c5..b3750d8 100644
--- 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;
         }
       }
 
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index ff29bf1..988fdef 100644
--- 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);
   }

From 57b22361dcc2937d994d99917f560e942fc5f64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Fri, 29 Dec 2023 10:31:46 +0800
Subject: [PATCH 10/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BF=AE=E5=A4=8Db?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device-manage/index.vue |  2 ++
 src/views/edit/edit.vue           |  4 +++-
 src/views/site/index.vue          | 39 ++++++++++++++++++++++---------
 src/views/tunnel-manage/index.vue | 18 +++++++++++---
 src/views/user/index.vue          | 27 ++++++++++++++++-----
 5 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index bb2e07e..b06bcb9 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -484,6 +484,8 @@ const handleEditFan = () => {
     if (res.code === 1000) {
       ElMessage.success('修改成功')
       router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId)
+    }else {
+      ElMessage.error(res.msg)
     }
   })
 }
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 75c3adc..cba5b8a 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -90,12 +90,14 @@ const handleSave = async () => {
     constructionLength: 500,
     tunnelLength: form.value.totalLength,
     isDefault: form.value.isDefault,
-    tunnelThreeConfig: JSON.stringify(await store.getEquipmentList())
+    modelEquipmentList:await store.getEquipmentList()
   }
   editTunnel(data).then((res) => {
     if (res?.code === 1000) {
       ElMessage.success(res.msg)
       router.push('/tunnel/' + form.value.siteId+'/'+type+'/'+userId)
+    }else {
+      ElMessage.error(res.msg)
     }
   });
 }
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index 5e31090..bfdfa48 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -93,11 +93,11 @@
       </template>
     </el-dialog>
     <div class="pagination">
-      <span>首页</span>
+      <span @click="firstPage" v-if="showFirst">首页</span>
       <el-pagination background v-model:current-page="pageInfo.pageNum" v-model:page-size="pageInfo.pageSize"
                      :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
-                     @current-change="handleCurrentChange"/>
-      <span>尾页</span>
+                     @current-change="handleCurrentChange"  :hide-on-single-page="true"/>
+      <span @click="lastPage" v-if="showFirst">尾页</span>
     </div>
   </div>
 </template>
@@ -146,6 +146,7 @@ const info = ref({
 })
 const title = ref('新增站点')
 const isVisited = ref(false);
+const showFirst = ref(true)
 const total = ref(10);
 const showAddIcon = ref(true)
 const pageInfo = reactive({
@@ -164,11 +165,12 @@ const formRules = ref({
 const formInstance = ref()
 const getList = () => {
   getSiteList({
-    userId:userId,
+    // userId:userId,
     ...pageInfo
   }).then((res) => {
     total.value = res.data.total;
     showAddIcon.value = total.value % 6!==0;
+    showFirst.value = total.value / pageInfo.pageSize >= 1;
     res.data.rows.map(item => {
       if (item.tunnelList === null || item.tunnelList.length === 0) {
         item.info = info.value
@@ -234,15 +236,23 @@ const handleSubmit = (instance) => {
     if (!valid) return
     if (title.value === '编辑站点') {
       editSite(form.value).then((res) => {
-        isVisited.value = false
-        getList()
-        ElMessage.success(res.msg)
+        if(res.code===1000){
+          isVisited.value = false
+          getList()
+          ElMessage.success(res.msg)
+        }else {
+          ElMessage.warning(res.msg)
+        }
       });
     } else {
       addSite(form.value).then((res) => {
-        isVisited.value = false
-        getList()
-        ElMessage.success(res.msg)
+        if(res.code===1000){
+          isVisited.value = false
+          getList()
+          ElMessage.success(res.msg)
+        }else {
+          ElMessage.warning(res.msg)
+        }
       });
     }
   })
@@ -290,7 +300,14 @@ const handleMoreDelete = () => {
     }
   }
 }
-
+const firstPage=()=>{
+  pageInfo.pageNum = 1
+  getList()
+}
+const lastPage=()=>{
+  pageInfo.pageNum = total.value/pageInfo.pageSize
+  getList()
+}
 //点击页码进行分页功能
 const handleCurrentChange = (val) => {
   pageInfo.pageNum = val
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index b3750d8..f0772c5 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -96,11 +96,11 @@
       </div>
     </el-dialog>
     <div class="pagination">
-      <span>首页</span>
+      <span @click="firstPage" v-if="showFirst">首页</span>
       <el-pagination background v-model:current-page="pageInfo.pageNum" v-model:page-size="pageInfo.pageSize"
                      :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
-                     @current-change="handleCurrentChange"/>
-      <span>尾页</span>
+                     @current-change="handleCurrentChange" :hide-on-single-page="true"/>
+      <span @click="lastPage" v-if="showFirst">尾页</span>
     </div>
   </div>
 </template>
@@ -120,6 +120,7 @@ const formRules = ref({
   tunnelName: [{required: true, message: '请输入隧道名称', trigger: 'blur'}],
   serialNumber: [{required: true, message: '请输入序列号', trigger: 'blur'}]
 })
+const showFirst = ref(true)
 const formInstance = ref()
 const tunnelList = ref([
   {
@@ -278,10 +279,19 @@ const getList = () => {
     if (res.code === 1000) {
       total.value = res.data.total
       tunnelList.value = res.data.rows
+      showFirst.value = total.value / pageInfo.pageSize >= 1;
     }
   })
 }
 getList()
+const firstPage=()=>{
+  pageInfo.pageNum = 1
+  getList()
+}
+const lastPage=()=>{
+  pageInfo.pageNum = total.value/pageInfo.pageSize
+  getList()
+}
 //点击页码进行分页功能
 const handleCurrentChange = (val) => {
   pageInfo.pageNum = val
@@ -303,6 +313,8 @@ const handleSubmit = (instance) => {
         ElMessage.success('新增成功')
         getList()
         isVisited.value = false
+      }else {
+        ElMessage.warning(res.msg)
       }
     })
   } else {
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 057f1b9..9c4a4ec 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -112,11 +112,11 @@
       </template>
     </el-dialog>
     <div class="pagination">
-      <span>首页</span>
+      <span @click="firstPage" v-if="showFirst">首页</span>
       <el-pagination background v-model:current-page="pageInfo.pageNum" v-model:page-size="pageInfo.pageSize"
                      :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
-                     @current-change="handleCurrentChange"/>
-      <span>尾页</span>
+                     @current-change="handleCurrentChange" :hide-on-single-page="true"/>
+      <span @click="lastPage" v-if="showFirst">尾页</span>
     </div>
   </div>
 </template>
@@ -135,12 +135,13 @@ const siteId = reactive(router.currentRoute.value.params.siteId)
 const tunnelIndex = ref()
 const username = ref()
 const userIds = ref()
+const showFirst = ref(true)
 const currentSite = ref()
 const formInstance = ref()
 const userData = ref([])
 const pageInfo = reactive({
   pageNum: 1,
-  pageSize: 6
+  pageSize: 10
 });
 const total = ref(10);
 const isVisited = ref(false);
@@ -224,16 +225,30 @@ getRoleOptionInfo()
 const getInfo = () => {
   getUser({
     siteId: siteId,
-    userName: username.value
+    userName: username.value,
+    ...pageInfo
   }).then(res => {
     if (res.code === 1000) {
-      console.log('res', res)
       userData.value = res.data.rows
       total.value = res.data.total
+      showFirst.value = total.value / pageInfo.pageSize >= 1;
     }
   })
 }
 getInfo()
+const firstPage=()=>{
+  pageInfo.pageNum = 1
+  getInfo()
+}
+const lastPage=()=>{
+  pageInfo.pageNum = total.value/pageInfo.pageSize
+  getInfo()
+}
+//点击页码进行分页功能
+const handleCurrentChange = (val) => {
+  pageInfo.pageNum = val
+  getInfo()
+}
 const handleSubmit = async (formInstance) => {
   if (!formInstance) return;
   formInstance.validate(async (valid) => {

From a473317022193cfcc18c5e1d315c92d7c5607658 Mon Sep 17 00:00:00 2001
From: dengj <209192648@qq.com>
Date: Fri, 29 Dec 2023 13:06:35 +0800
Subject: [PATCH 11/35] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue         |   2 +
 src/views/site/index.vue          |  14 ++-
 src/views/tunnel-manage/index.vue |  10 +-
 src/views/user/index.vue          | 161 +++++++++++++++++-------------
 4 files changed, 116 insertions(+), 71 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b8ac2d9..56a2938 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -47,6 +47,8 @@ const authStore = useAuthStore();
 const loginForm = reactive({
   username: "admin",
   password: "123456",
+  // username: "",
+  // password: "",
   code: "",
   uuid: "",
 });
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index bfdfa48..3f7b6b3 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -165,12 +165,12 @@ const formRules = ref({
 const formInstance = ref()
 const getList = () => {
   getSiteList({
-    // userId:userId,
+    userId:userId,
     ...pageInfo
   }).then((res) => {
     total.value = res.data.total;
     showAddIcon.value = total.value % 6!==0;
-    showFirst.value = total.value / pageInfo.pageSize >= 1;
+    showFirst.value = total.value / pageInfo.pageSize > 1;
     res.data.rows.map(item => {
       if (item.tunnelList === null || item.tunnelList.length === 0) {
         item.info = info.value
@@ -188,7 +188,6 @@ const handleClickSite = (type) => {
   if (type.checked) {
     siteIds.value.push(type.siteId)
     siteNameList.value.push(type.siteName)
-
   } else {
     siteIds.value.map((item, index) => {
       if (item === type.siteId) {
@@ -260,6 +259,15 @@ const handleSubmit = (instance) => {
 const handleChooseAll=()=>{
   siteList.value.map(item=>{
     item.checked=!item.checked
+    if(item.checked&&!item.isDefault){
+      siteIds.value.push(item.siteId)
+    }else if(!item.checked&&!item.isDefault){
+      siteIds.value.map((newItem, index) => {
+        if (newItem === item.siteId) {
+          siteIds.value.splice(index, 1)
+        }
+      })
+    }
   })
 }
 const handleMoreDelete = () => {
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index f0772c5..3a0196d 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -269,7 +269,6 @@ const handleGoSiteOrIndex = () => {
   } else if (type === 'i') {
     router.push('/')
   }
-
 }
 const getList = () => {
   getTunnelList({
@@ -333,6 +332,15 @@ const handleGoToEditTunnel = (tunnelId) => {
 const handleChooseAll = () => {
   tunnelList.value.map(item => {
     item.checked = !item.checked
+    if(item.checked&&!item.isDefault){
+      tunnelIds.value.push(item.tunnelId)
+    }else if(!item.checked&&!item.isDefault){
+      tunnelIds.value.map((newItem, index) => {
+        if (newItem === item.tunnelId) {
+          tunnelIds.value.splice(index, 1)
+        }
+      })
+    }
   })
 }
 const handleEditDevice = (tunnelId) => {
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 9c4a4ec..64df85d 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -10,9 +10,9 @@
         <!--        <div class="all-btn" @click="handleAll">-->
         <!--          全选-->
         <!--        </div>-->
-        <div class="all-btn del-btn" @click="handleDelete">
-          删除
-        </div>
+        <!--        <div class="all-btn del-btn" @click="handleDelete">-->
+        <!--          删除-->
+        <!--        </div>-->
       </div>
     </div>
     <div class="user-content">
@@ -24,12 +24,18 @@
                   v-model="username"
                   clearable
                   placeholder="输入搜索内容"
+                  @clear="getInfo"
               />
             </div>
             <el-button type="primary" :icon="Search" style="margin-left: 20px" @click="getInfo">搜索</el-button>
           </div>
           <div>用户管理</div>
-          <div class="add-btn" @click="handleAddUser">添加用户</div>
+          <div class="all-del-btn">
+            <div class="add-btn" @click="handleAddUser">添加用户</div>
+            <div class="all-btn del-btn" @click="handleDelete">
+              删除
+            </div>
+          </div>
         </div>
         <div class="device-table">
           <el-table stripe ref="multipleTable" @select="handleSelect"
@@ -61,18 +67,19 @@
         <el-form-item label="当前站点">
           <div class="current-site">{{ currentSite }}<span>如果需要切换站点,请返回首屏切换</span></div>
         </el-form-item>
-        <el-form-item label="输入用户名称">
-          <el-input v-model="form.userName" placeholder="请输入用户名称"/>
+        <el-form-item label="输入账户">
+          <el-input v-model="form.userName" placeholder="请输入账户"/>
         </el-form-item>
-        <el-form-item label="输入用户昵称">
-          <el-input v-model="form.nickName" placeholder="请输入用户昵称"/>
+        <el-form-item label="输入密码" v-if="title==='添加用户'">
+          <el-input type="password" show-password v-model="form.password" placeholder="请输入密码"/>
+        </el-form-item>
+        <el-form-item label="输入昵称">
+          <el-input v-model="form.nickName" placeholder="请输入昵称"/>
         </el-form-item>
         <el-form-item label="输入电话号码">
           <el-input v-model="form.phoneNumber" placeholder="输入电话号码"/>
         </el-form-item>
-        <el-form-item label="输入密码" v-if="title==='添加用户'">
-          <el-input v-model="form.password" placeholder="请输入密码"/>
-        </el-form-item>
+
         <el-form-item label="选择身份">
           <el-radio-group v-model="form.roleId" @change="(val) => {
              console.log('vaaa',val)
@@ -136,7 +143,7 @@ const tunnelIndex = ref()
 const username = ref()
 const userIds = ref()
 const showFirst = ref(true)
-const currentSite = ref()
+const currentSite = ref('')
 const formInstance = ref()
 const userData = ref([])
 const pageInfo = reactive({
@@ -191,18 +198,23 @@ const handleAll = () => {
   multipleTable.value.toggleAllSelection()
 }
 const handleDelete = () => {
-  ElMessageBox.confirm(`是否确认删除该用户吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    deleteUser(userIds.value).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        getInfo()
-      }
+  console.log('userIds.value',userIds.value)
+  if (userIds.value ===undefined) {
+    ElMessage.warning('请先选择用户进行删除')
+  } else {
+    ElMessageBox.confirm(`是否确认删除该用户吗?`, '系统提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      deleteUser(userIds.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg)
+          getInfo()
+        }
+      })
     })
-  })
+  }
 }
 const reset = () => {
   form.value = {
@@ -236,12 +248,12 @@ const getInfo = () => {
   })
 }
 getInfo()
-const firstPage=()=>{
+const firstPage = () => {
   pageInfo.pageNum = 1
   getInfo()
 }
-const lastPage=()=>{
-  pageInfo.pageNum = total.value/pageInfo.pageSize
+const lastPage = () => {
+  pageInfo.pageNum = total.value / pageInfo.pageSize
   getInfo()
 }
 //点击页码进行分页功能
@@ -263,6 +275,7 @@ const handleSubmit = async (formInstance) => {
         if (res.code === 1000) {
           getInfo()
           isVisited.value = false
+          ElMessage.success(res.msg)
         } else {
           ElMessage.warning(res.msg)
         }
@@ -272,6 +285,7 @@ const handleSubmit = async (formInstance) => {
         if (res.code === 1000) {
           getInfo()
           isVisited.value = false
+          ElMessage.success(res.msg)
         } else {
           ElMessage.warning(res.msg)
         }
@@ -294,15 +308,26 @@ const handleSelect = async (selection, row) => {
 </script>
 
 <style scoped lang="scss">
-.current-site{
-  font-size: 38px;color: #FFFFFF;
+:deep(.el-input .el-input__password) {
+  font-size: 60px;
+}
+
+:deep(.el-input__clear) {
+  font-size: 40px;
+}
+
+.current-site {
+  font-size: 41px;
+  color: #FFFFFF;
   margin-top: 12px;
-  >span{
-    font-size: 30px!important;
-  color: darkgray!important;
+
+  > span {
+    font-size: 38px !important;
+    color: darkgray !important;
     margin-left: 20px;
+  }
 }
-}
+
 :deep(.el-table__header-wrapper  .el-checkbox) {
   display: none
 }
@@ -390,31 +415,32 @@ const handleSelect = async (selection, row) => {
       }
     }
 
-    .all-del-btn {
-      display: flex;
 
-      .del-btn {
-        width: 168px;
-        height: 60px;
-        background: #08B7B8;
-        border-radius: 11px;
-      }
+  }
 
-      .all-btn {
-        cursor: pointer;
-        padding-left: 53px;
-        width: 178px;
-        height: 70px;
-        line-height: 70px;
-        border-radius: 11px;
-        border: 2px solid #08B7B8;
-        color: #FFFFFF;
-        font-size: 38px;
+  .all-del-btn {
+    display: flex;
 
-        &:last-child {
-          margin-left: 40px;
-          margin-right: 70px;
-        }
+    .del-btn {
+      width: 168px;
+      height: 60px;
+      background: #08B7B8;
+      border-radius: 11px;
+    }
+
+    .all-btn {
+      cursor: pointer;
+      padding-left: 53px;
+      width: 178px;
+      height: 70px;
+      line-height: 70px;
+      border-radius: 11px;
+      border: 2px solid #08B7B8;
+      color: #FFFFFF;
+      font-size: 38px;
+
+      &:last-child {
+        margin-left: 40px;
       }
     }
   }
@@ -433,7 +459,7 @@ const handleSelect = async (selection, row) => {
       border-radius: 20px;
       border: 2px solid #05FEFF;
       box-sizing: border-box;
-      padding: 73px 98px;
+      padding: 73px 58px;
 
       .user-top {
         width: 100%;
@@ -452,14 +478,15 @@ const handleSelect = async (selection, row) => {
 
         .add-btn {
           cursor: pointer;
-          width: 170px;
-          height: 60px;
-          line-height: 60px;
+          width: 180px;
+          height: 70px;
+          line-height: 70px;
           background: #08B7B8;
           border-radius: 6px;
           color: #FFFFFF;
-          font-size: 35px;
+          font-size: 38px;
           padding-left: 19px;
+          //margin-left: 20px;
         }
 
         .search-box {
@@ -467,25 +494,25 @@ const handleSelect = async (selection, row) => {
 
           :deep(.el-button) {
             width: 140px;
-            height: 60px;
+            height: 70px;
             background: #08B7B8;
             border-radius: 6px;
             border: none;
-            font-size: 35px;
+            font-size: 38px;
             color: #FFFFFF;
           }
 
           :deep(.el-input__wrapper) {
-            width: 292px;
-            height: 60px;
+            width: 300px;
+            height: 70px;
             border-radius: 6px;
             border: 1px solid #05FEFF;
             background-color: transparent;
-            font-size: 35px;
+            font-size: 38px;
 
             .el-input__inner {
-              height: 60px;
-              line-height: 60px;
+              height: 70px;
+              line-height: 70px;
               color: #FFFFFF;
             }
           }
@@ -493,7 +520,7 @@ const handleSelect = async (selection, row) => {
       }
 
       :deep(.el-table--fit) {
-        width: 2000px !important;
+        width: 2110px !important;
       }
 
       :deep(.cell) {

From 20bfc32d080d0eb21919bead71d7ca5f243e91db Mon Sep 17 00:00:00 2001
From: trp <2477421791@qq.com>
Date: Fri, 29 Dec 2023 13:09:46 +0800
Subject: [PATCH 12/35] =?UTF-8?q?=E5=94=90=E6=B6=A6=E5=B9=B3=EF=BC=9A?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tunnelScene.js                        |   9 ++
 .../content/tunnelScene/TunnelScene.vue       |  71 +++++-----
 .../tunnelScene/editEquComp/editDialog.vue    |  42 +++---
 .../content/tunnelScene/request/index.js      | 128 ++++++++++++++++++
 .../sceneClass/editEquipment/index.js         | 101 +++++++-------
 src/store/modelSceneStore.js                  |  17 ++-
 src/views/edit/edit.vue                       | 112 +++++++--------
 7 files changed, 314 insertions(+), 166 deletions(-)
 create mode 100644 src/components/content/tunnelScene/request/index.js

diff --git a/src/api/tunnelScene.js b/src/api/tunnelScene.js
index 5b1aa0a..43b4edc 100644
--- a/src/api/tunnelScene.js
+++ b/src/api/tunnelScene.js
@@ -42,3 +42,12 @@ export const saveEquipment = (
     },
   });
 };
+
+// 保存模型(新增)
+export const apiSaveEquipment = (data) => {
+  return request({
+    url: "/tunnel/model/details",
+    method: "put",
+    data,
+  });
+};
diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index 77738bb..b0add02 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -3,17 +3,34 @@
     <div id="cvs" ref="content"></div>
     <dev-info ref="info" :devInfo="devInfo" />
     <!-- 这里的预览模式需要做成不能修改的模式 -->
-    <edit-dialog ref="edit" @addEquipment="handleAddEqu" @removeEquipment="handleRemoveEqu" @cancel="handleCancel"
-      :hasDev="hasDevice" :pointNum="pointNum" :tunnelId="tunnelId" :position="targetP?.name" :hasEquipment="hasDevice"
-      :pointGap="pointGap" />
-    <el-dialog v-model="centerDialogVisible" width="30%" destroy-on-close center :show-close="false" style="
+    <edit-dialog
+      ref="edit"
+      @addEquipment="handleAddEqu"
+      @removeEquipment="handleRemoveEqu"
+      @cancel="handleCancel"
+      :hasDev="hasDevice"
+      :pointNum="pointNum"
+      :tunnelId="params.tunnelId"
+      :position="targetP?.name"
+      :hasEquipment="hasDevice"
+      :pointGap="pointGap"
+      :form="params.form"
+    />
+    <el-dialog
+      v-model="centerDialogVisible"
+      width="30%"
+      destroy-on-close
+      center
+      :show-close="false"
+      style="
         margin: 20% auto;
         width: 569px;
         height: 330px;
         background: rgba(7, 35, 72, 0.79);
         border-radius: 20px;
         border: 2px solid #0f82af;
-      ">
+      "
+    >
       <p id="remove-title">是否确定删除该设备</p>
       <div class="btn">
         <button @click="centerDialogVisible = false">取消</button>
@@ -49,45 +66,38 @@ import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader";
 import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
 import { onMounted, reactive, ref, watch } from "vue";
 import { ElMessage } from "element-plus";
-import { useModelSceneStore } from "@/store/modelSceneStore";
+import { deleteEquipment, initData } from "./request";
 
 // 获取html标签跟随组件dom
 const content = ref(null);
 const info = ref(null);
 const edit = ref(null);
-const store = useModelSceneStore();
-
+let modelList = ref(null);
 let demo; //定义demo对象
 const loader = new OBJLoader();
 let hdrLoader = new RGBELoader();
 let backColorSet = three.sRGBEncoding;
 
-const params = defineProps(["isedit", "tunnelId", "tunnelLength"]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
-
+const params = defineProps(["isedit", "tunnelId", "tunnelLength", "form"]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
 
 let isedit = ref(params.isedit);
-
 let tunnelId = reactive(params.tunnelId);
-console.log(tunnelId);
-console.log(params.tunnelLength);
 
 watch(
   () => params.tunnelLength,
   (now) => {
-    params.tunnelLength = now
+    params.tunnelLength = now;
     console.log(params.tunnelLength);
-    pointGap = now / 20
+    pointGap = now / 20;
   },
   { deep: true }
-)
+);
 
 let pointGap = reactive(params.tunnelLength);
 
-
 onMounted(handleMounted);
 // 挂载后回调
 async function handleMounted() {
-
   const doms = [info.value.$el, edit.value.$el];
   demo = new ThreeDScene(three, content.value);
   //看是不是预览模式，然后继续相关的操作(会在demo中的初始化中进行)
@@ -106,12 +116,7 @@ async function handleMounted() {
 
   //加载HDR背景图片
   demo.loadBackground(hdrLoader, backColorSet);
-  watch(
-    () => params.tunnelId,
-    async () => {
-      const text = await store.initData(params.tunnelId);
-    }
-  );
+
   // 初始化设备模型
   try {
     const map = new Map();
@@ -119,16 +124,15 @@ async function handleMounted() {
     map.set("equ_sensors", await loadModel("/devicesModel/sensors.obj"));
     demo.initDevicesModel(map);
     // 初始化
-    const equipmentList = await store.getEquipmentList();
-    demo.editTunnelInit(equipmentList);
+    modelList.value = await initData(params.tunnelId, params.form);
+    console.log("init", params.tunnelId);
+    demo.editTunnelInit(modelList.value);
   } catch (err) {
     ElMessage({
-      message: "场景加载异常！",
+      message: "场景初始化异常！",
       type: "warning",
     });
   }
-
-
 }
 
 // 每个模型加载回调
@@ -139,7 +143,7 @@ function loadModel(path) {
       (obj) => {
         resolve(obj);
       },
-      (xhr) => { },
+      (xhr) => {},
       (err) => {
         reject(err);
       }
@@ -225,8 +229,7 @@ function handleRemoveEqu() {
 // 对话框确认删除
 function handleConfirmAddEqu() {
   console.log("target:", targetP.value.info);
-  store
-    .deleteEquipment(10000, params.tunnelId, targetP.value.info.equipmentId)
+  deleteEquipment(targetP.value.info.equipmentId, pointGap)
     .then((res) => {
       demo.removeEquipment(targetP.value);
       centerDialogVisible.value = false;
@@ -235,9 +238,9 @@ function handleConfirmAddEqu() {
         type: "success",
       });
     })
-    .catch((err) => {
+    .catch((res) => {
       ElMessage({
-        message: "请求异常！",
+        message: "删除失败！",
         type: "warning",
       });
     });
diff --git a/src/components/content/tunnelScene/editEquComp/editDialog.vue b/src/components/content/tunnelScene/editEquComp/editDialog.vue
index b188143..a9fc3cb 100644
--- a/src/components/content/tunnelScene/editEquComp/editDialog.vue
+++ b/src/components/content/tunnelScene/editEquComp/editDialog.vue
@@ -48,9 +48,8 @@ import InputNum from "./childComps/InputNum.vue";
 import SelectInput from "./childComps/SelectInput.vue";
 import { getEquipmentType, getEquipment } from "@/api/tunnelScene";
 import { reactive, computed, defineEmits, defineProps, watch, ref } from "vue";
-import { useModelSceneStore } from "@/store/modelSceneStore";
 import { ElMessage } from "element-plus";
-
+import { saveEquipment, initData } from "../request";
 const emit = defineEmits(["cancel", "removeEquipment", "addEquipment"]);
 const params = defineProps([
   "pointNum",
@@ -58,13 +57,14 @@ const params = defineProps([
   "tunnelId",
   "position",
   "hasEquipment",
+  "form",
 ]);
 
-// 当前风压
 let p = ref(57);
 const equipment = ref(null);
 const equipmentType = ref(null);
-const store = useModelSceneStore();
+
+let maxConstructionLength = ref(0);
 //计算锚点之间距离
 const pointDistance_str = computed(
   () =>
@@ -73,18 +73,35 @@ const pointDistance_str = computed(
     }米`
 );
 
+watch(
+  () => params.form,
+  () => {
+    initData(params.tunnelId, params.form);
+  },
+  {
+    deep: true,
+  }
+);
+
 // 请求数据模型
 const equipmentSetting = reactive({
+  equipmentId: null,
+  equipmentName: "",
   equipmentType: "", //设备类型
-  chooseEquipment: null, //设备选择(设备名称)
+  position: "",
   threshold: "", //阈值
+  typeKey: null, //设备选择(设备名称)
 });
 // 绑定选择的设备类型
 function handleTypeChange(optionItem) {
   equipmentSetting.equipmentType = optionItem.value;
+  console.log("option", equipmentSetting);
 }
 function handleEquipmentChange(equipmentItem) {
-  equipmentSetting.chooseEquipment = equipmentItem;
+  equipmentSetting.equipmentName = equipmentItem.label;
+  equipmentSetting.equipmentId = equipmentItem.equipmentId;
+  equipmentSetting.typeKey = equipmentItem.value;
+  console.log("option", equipmentSetting);
 }
 // 设备类型选项参数
 let options = reactive([{ label: "暂无数据", value: "" }]);
@@ -150,25 +167,18 @@ function addEquipment() {
     });
     return;
   }
-  if (!equipmentSetting.equipmentType || !equipmentSetting.chooseEquipment) {
+  if (!equipmentSetting.equipmentType || !equipmentSetting.equipmentId) {
     ElMessage({
       message: "选项不能为空！",
       type: "warning",
     });
     return;
   }
-
   equipmentSetting.position = params.position;
   // 合法请求
-  store
-    .saveSceneData(10000, 1, equipmentSetting)
+  saveEquipment(equipmentSetting, params.pointGap)
     .then((res) => {
       emit("addEquipment", equipmentSetting);
-      equipmentSetting.chooseEquipment = null;
-      equipmentSetting.equipmentType = "";
-      equipmentSetting.threshold = "";
-      equipment.value.reset();
-      equipmentType.value.reset();
       ElMessage({
         message: "添加成功！",
         type: "success",
@@ -176,7 +186,7 @@ function addEquipment() {
     })
     .catch((err) => {
       ElMessage({
-        message: "请求异常！",
+        message: "添加异常！",
         type: "warning",
       });
     });
diff --git a/src/components/content/tunnelScene/request/index.js b/src/components/content/tunnelScene/request/index.js
new file mode 100644
index 0000000..601b910
--- /dev/null
+++ b/src/components/content/tunnelScene/request/index.js
@@ -0,0 +1,128 @@
+import { apiSaveEquipment, initSceneData } from "@/api/tunnelScene";
+import { toRaw } from "vue";
+let modelEquipmentList = [];
+let originData = null;
+// 初始化当前隧道数据并保存在本地
+export const initData = (tunnelId, otherInfo) => {
+  return new Promise((resolve, reject) => {
+    initSceneData(tunnelId)
+      .then((res) => {
+        originData = toRaw(otherInfo);
+        if (res.data.tunnelThreeConfig) {
+          console.log("data", res.data);
+          modelEquipmentList = JSON.parse(res.data.tunnelThreeConfig);
+        }
+        console.log("test", modelEquipmentList, originData);
+        resolve(modelEquipmentList);
+      })
+      .catch((Error) => {
+        ElMessage.error("场景初始化异常！");
+        reject();
+      });
+  });
+};
+
+//保存数据并提交
+export const saveEquipment = (equipmentInfo, pointGap) => {
+  const {
+    constructionLength,
+    isDefault,
+    remarks,
+    serialNumber,
+    siteId,
+    totalLength,
+    tunnelId,
+    tunnelName,
+  } = originData;
+  let tempModelEquipmentList = [...modelEquipmentList]; //数组克隆
+  tempModelEquipmentList.push(toRaw(equipmentInfo));
+
+  return new Promise((resolve, reject) => {
+    apiSaveEquipment({
+      constructionLength: autoComputeConstructionLength(
+        tempModelEquipmentList,
+        pointGap
+      ),
+      isDefault,
+      modelEquipmentList: tempModelEquipmentList,
+      remarks,
+      serialNumber,
+      tunnelId,
+      tunnelLength: totalLength,
+      tunnelName,
+    })
+      .then((res) => {
+        if (res?.code === 1000) {
+          modelEquipmentList.push(toRaw(equipmentInfo)); //存入本地
+          resolve();
+        }
+        reject(res);
+      })
+      .catch((err) => {
+        reject();
+      });
+  });
+};
+
+// 删除
+export const deleteEquipment = (equipmentId, pointGap) => {
+  let tempModelEquipmentList = [...modelEquipmentList]; //数组克隆
+  tempModelEquipmentList = tempModelEquipmentList.filter(
+    (item) => item.equipmentId != equipmentId
+  );
+  const {
+    constructionLength,
+    isDefault,
+    remarks,
+    serialNumber,
+    siteId,
+    totalLength,
+    tunnelId,
+    tunnelName,
+  } = originData;
+  return new Promise((resolve, reject) => {
+    apiSaveEquipment({
+      constructionLength: autoComputeConstructionLength(
+        tempModelEquipmentList,
+        pointGap
+      ),
+      isDefault,
+      modelEquipmentList: tempModelEquipmentList,
+      remarks,
+      serialNumber,
+      tunnelId,
+      tunnelLength: totalLength,
+      tunnelName,
+    })
+      .then((res) => {
+        if (res?.code === 1000) {
+          modelEquipmentList = modelEquipmentList.filter(
+            (item) => item.equipmentId != equipmentId
+          );
+          resolve();
+        }
+        reject(res);
+      })
+      .catch((err) => {
+        reject();
+      });
+  });
+};
+
+function autoComputeConstructionLength(modelEquipmentList, pointGap) {
+  let maxLength = 0;
+  modelEquipmentList.forEach((item) => {
+    const length =
+      Number(
+        item.position.substring(
+          item.position.indexOf("_") + 1,
+          item.position.lastIndexOf("_")
+        ) - 1
+      ) * pointGap;
+    if (length > maxLength) {
+      maxLength = length;
+    }
+  });
+  console.log("max", maxLength);
+  return maxLength;
+}
diff --git a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
index b6d0156..766567a 100644
--- a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
+++ b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
@@ -12,10 +12,10 @@ function addEquipment(targetPoint, formInfo) {
   if (targetPoint.hasDevice) {
     return;
   }
-
+  console.log("info", formInfo);
   switch (formInfo.equipmentType) {
     case "frequency":
-      handleFanEqu.call(this, targetPoint, formInfo.chooseEquipment);
+      handleFanEqu.call(this, targetPoint, formInfo);
       break;
     // 还没有风压阀的模型，所以先用其他设备传感器实现
     // case "valve":
@@ -23,7 +23,7 @@ function addEquipment(targetPoint, formInfo) {
     //   break;
     case "windPressure":
     case "sensor":
-      handleOtherEqu.call(this, targetPoint, formInfo.chooseEquipment);
+      handleOtherEqu.call(this, targetPoint, formInfo);
       break;
     default:
       break;
@@ -37,9 +37,6 @@ function addEquipment(targetPoint, formInfo) {
 
 // }
 
-
-
-
 // 其他传感器
 function handleOtherEqu(targetPoint, equipmentInfo) {
   const equMesh = this.equMap.get("equ_sensors").clone();
@@ -47,8 +44,7 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
   equMesh.position.copy(worldP);
 
   //设备添加标签
-  const tag = EquipmentTag(equipmentInfo.label);
-  console.log(equipmentInfo);
+  const tag = EquipmentTag(equipmentInfo.equipmentName);
   equMesh.getObjectByName("tag").material = tag;
   if (/tr$/.test(targetPoint.name)) {
     equMesh.rotation.z = -Math.PI / 2;
@@ -71,39 +67,38 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
   targetPoint.scale.set(0.03, 0.06, 0.05);
   this.scene.add(equMesh);
   targetPoint.visible = false;
-  targetPoint.hasWall = true
+  targetPoint.hasWall = true;
   //处理风压阀的代码片段
-  let lineIndex = targetPoint.name.slice(7, 9)
+  let lineIndex = targetPoint.name.slice(7, 9);
   for (let line = Number(lineIndex); line <= 20; line++) {
     if (line < 10) {
-      let wall = 'wall_' + '0' + line
-      this.scene.getObjectByName(wall).visible = true
-      let point = 'point_' + '00' + line + '_tc'
-      console.log(this.scene.getObjectByName(point));
-      this.scene.getObjectByName(point).visible = false
-      this.scene.getObjectByName(point).layers.set(-2)
+      let wall = "wall_" + "0" + line;
+      this.scene.getObjectByName(wall).visible = true;
+      let point = "point_" + "00" + line + "_tc";
+      this.scene.getObjectByName(point).visible = false;
+      this.scene.getObjectByName(point).layers.set(-2);
       if (this.scene.getObjectByName(point).hasDevice == true) {
-        let EquID = this.scene.getObjectByName(point).info.id
-        this.scene.getObjectById(EquID).visible = false
+        let EquID = this.scene.getObjectByName(point).info.id;
+        this.scene.getObjectById(EquID).visible = false;
       }
     } else if (line >= 10) {
-      let wall = 'wall_' + line
-      this.scene.getObjectByName(wall).visible = true
-      let point = 'point_' + '0' + line + '_tc'
-      this.scene.getObjectByName(point).visible = false
-      this.scene.getObjectByName(point).layers.set(-2)
+      let wall = "wall_" + line;
+      this.scene.getObjectByName(wall).visible = true;
+      let point = "point_" + "0" + line + "_tc";
+      this.scene.getObjectByName(point).visible = false;
+      this.scene.getObjectByName(point).layers.set(-2);
       if (this.scene.getObjectByName(point).hasDevice == true) {
-        let EquID = this.scene.getObjectByName(point).info.id
-        this.scene.getObjectById(EquID).visible = false
+        let EquID = this.scene.getObjectByName(point).info.id;
+        this.scene.getObjectById(EquID).visible = false;
       }
     }
     //处理21行的设备和附着点
-    let point = 'point_' + '0' + 21 + '_tc'
-    this.scene.getObjectByName(point).visible = false
-    this.scene.getObjectByName(point).layers.set(-2)
+    let point = "point_" + "0" + 21 + "_tc";
+    this.scene.getObjectByName(point).visible = false;
+    this.scene.getObjectByName(point).layers.set(-2);
     if (this.scene.getObjectByName(point).hasDevice == true) {
-      let EquID = this.scene.getObjectByName(point).info.id
-      this.scene.getObjectById(EquID).visible = false
+      let EquID = this.scene.getObjectByName(point).info.id;
+      this.scene.getObjectById(EquID).visible = false;
     }
   }
   // this.scene.getObjectByName('wall_01').visible = true
@@ -117,7 +112,6 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
   // 1.先取出当前点击添加设备锚点的行数
   // 2.再进行字符串拼接出墙的名字，使用scene.getObjectByName(墙名去获取)
   // 3.加上循环，固定到20结束就可以了，将点击的函数到20的函数的墙全部设为visable设为可见,还需要将中间的那行设备和附着点全部设为隐藏，且层级变低，无法选中
-
 }
 
 // 风机
@@ -153,7 +147,6 @@ function handleFanEqu(
   fanSpin.onUpdate((obj) => {
     fanLeaf.rotation.z = obj.rotation;
   });
-
   this.fanSpinArray.push(fanSpin);
 }
 
@@ -162,39 +155,39 @@ function removeEquipment(targetPoint) {
   //删除设备这里需要再进行处理，就是根据附着点（附着点一定保存了当前添加设备的信息了）判断是不是分压阀，然后继续一样的隐藏
   if (!targetPoint.hasDevice) return;
   if (targetPoint.hasWall == true) {
-    let lineIndex = targetPoint.name.slice(7, 9)
+    let lineIndex = targetPoint.name.slice(7, 9);
     for (let line = Number(lineIndex); line <= 20; line++) {
       if (line < 10) {
-        let wall = 'wall_' + '0' + line
-        this.scene.getObjectByName(wall).visible = false
-        let point = 'point_' + '00' + line + '_tc'
+        let wall = "wall_" + "0" + line;
+        this.scene.getObjectByName(wall).visible = false;
+        let point = "point_" + "00" + line + "_tc";
         console.log(this.scene.getObjectByName(point));
-        this.scene.getObjectByName(point).visible = true
-        this.scene.getObjectByName(point).layers.set(0)
+        this.scene.getObjectByName(point).visible = true;
+        this.scene.getObjectByName(point).layers.set(0);
         if (this.scene.getObjectByName(point).hasDevice == true) {
-          this.scene.getObjectByName(point).visible = false
-          let EquID = this.scene.getObjectByName(point).info.id
-          this.scene.getObjectById(EquID).visible = true
+          this.scene.getObjectByName(point).visible = false;
+          let EquID = this.scene.getObjectByName(point).info.id;
+          this.scene.getObjectById(EquID).visible = true;
         }
       } else if (line >= 10) {
-        let wall = 'wall_' + line
-        this.scene.getObjectByName(wall).visible = false
-        let point = 'point_' + '0' + line + '_tc'
-        this.scene.getObjectByName(point).visible = true
-        this.scene.getObjectByName(point).layers.set(0)
+        let wall = "wall_" + line;
+        this.scene.getObjectByName(wall).visible = false;
+        let point = "point_" + "0" + line + "_tc";
+        this.scene.getObjectByName(point).visible = true;
+        this.scene.getObjectByName(point).layers.set(0);
         if (this.scene.getObjectByName(point).hasDevice == true) {
-          this.scene.getObjectByName(point).visible = false
-          let EquID = this.scene.getObjectByName(point).info.id
-          this.scene.getObjectById(EquID).visible = true
+          this.scene.getObjectByName(point).visible = false;
+          let EquID = this.scene.getObjectByName(point).info.id;
+          this.scene.getObjectById(EquID).visible = true;
         }
       }
       //处理21行的设备和附着点
-      let point = 'point_' + '0' + 21 + '_tc'
-      this.scene.getObjectByName(point).visible = true
-      this.scene.getObjectByName(point).layers.set(0)
+      let point = "point_" + "0" + 21 + "_tc";
+      this.scene.getObjectByName(point).visible = true;
+      this.scene.getObjectByName(point).layers.set(0);
       if (this.scene.getObjectByName(point).hasDevice == true) {
-        let EquID = this.scene.getObjectByName(point).info.id
-        this.scene.getObjectById(EquID).visible = true
+        let EquID = this.scene.getObjectByName(point).info.id;
+        this.scene.getObjectById(EquID).visible = true;
       }
     }
   }
diff --git a/src/store/modelSceneStore.js b/src/store/modelSceneStore.js
index 9b101ef..60178a4 100644
--- a/src/store/modelSceneStore.js
+++ b/src/store/modelSceneStore.js
@@ -3,23 +3,22 @@ import { ref } from "vue";
 import { saveEquipment, initSceneData } from "../api/tunnelScene";
 import { ElMessage } from "element-plus";
 export const useModelSceneStore = defineStore("modelSceneData", () => {
-  let equipmentList = ref("[]");
+  let equipmentList = ref([]);
   let allEditList = ref({});
   function initData(tunnelId = 1) {
     initSceneData(tunnelId)
       .then((res) => {
-        equipmentList.value = res.data.tunnelThreeConfig;
+        // equipmentList.value = res.data.tunnelThreeConfig;
+        console.log("初始化的数据");
       })
       .catch((Error) => {
         ElMessage.error("场景初始化异常！");
       });
   }
   //默认初始化1号隧道
-  function saveSceneData(constructionLength, tunnelId, modelData) {
-    const temp = JSON.parse(equipmentList.value);
-    temp.push(modelData);
-    equipmentList.value = JSON.stringify(temp);
-    console.log("save:", equipmentList.value);
+  function saveSceneData(data) {
+    equipmentList.value.push(data);
+
     return saveEquipment(constructionLength, tunnelId, equipmentList.value);
   }
   //   删除设备
@@ -39,7 +38,7 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
           resolve(JSON.parse(equipmentList.value));
         })
         .catch((Error) => {
-          ElMessage.error("场景初始化异常！");
+          // ElMessage.error("场景初始化异常！");
           reject();
         });
     });
@@ -49,6 +48,6 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
     initData,
     saveSceneData,
     deleteEquipment,
-    getEquipmentList
+    getEquipmentList,
   };
 });
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 75c3adc..7d3d92f 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -7,24 +7,24 @@
       </div>
       <div class="tunnel-title"></div>
       <div class="btn-right">
-        <div class="del-btn" @click="handleGotoDevice">
-          设备管理
-        </div>
-        <div class="del-btn" @click="handleSave">
-          保存
-        </div>
+        <div class="del-btn" @click="handleGotoDevice">设备管理</div>
+        <div class="del-btn" @click="handleSave">保存</div>
       </div>
     </div>
     <div class="edit-box">
       <el-form :model="form" :label-position="right" label-width="188px">
         <el-form-item label="隧道名称">
-          <el-input v-model="form.tunnelName" placeholder="请输入隧道名称"/>
+          <el-input v-model="form.tunnelName" placeholder="请输入隧道名称" />
         </el-form-item>
         <el-form-item label="序列号">
-          <el-input v-model="form.serialNumber" placeholder="请输入序列号"/>
+          <el-input v-model="form.serialNumber" placeholder="请输入序列号" />
         </el-form-item>
         <el-form-item label="隧道长度">
-          <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度"/>
+          <el-input
+            type="number"
+            v-model="form.totalLength"
+            placeholder="请输入隧道长度"
+          />
         </el-form-item>
         <el-form-item label="是否默认">
           <el-radio-group v-model="form.isDefault">
@@ -33,53 +33,60 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="隧道备注">
-          <el-input v-model="form.remarks" placeholder="请输入隧道备注"/>
+          <el-input v-model="form.remarks" placeholder="请输入隧道备注" />
         </el-form-item>
       </el-form>
     </div>
 
     <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
-    <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId" ref="tunnelScene" :tunnelLength="tunnelLength"/>
+    <tunnel-scene
+      id="tunnel-box"
+      :isedit="true"
+      :tunnelId="tunnelId"
+      :form="form"
+      ref="tunnelScene"
+      :tunnelLength="tunnelLength"
+    />
   </div>
 </template>
 <script setup>
 import TunnelScene from "@/components/content/tunnelScene/TunnelScene.vue";
-import {editTunnel, getTunnelDetail} from "@/api/tunnelManage";
-import {computed} from "vue";
-import {useModelSceneStore} from "@/store/modelSceneStore";
-import {ElMessage} from "element-plus";
+import { editTunnel, getTunnelDetail } from "@/api/tunnelManage";
+import { computed, provide } from "vue";
+import { useModelSceneStore } from "@/store/modelSceneStore";
+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 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({
-  tunnelName: '',
-  serialNumber: '',
-  totalLength: '',
+  tunnelName: "",
+  serialNumber: "",
+  totalLength: "",
   isDefault: false,
-  remarks: ''
+  remarks: "",
 });
-const equipmentList = ref([])
+const equipmentList = ref([]);
 onMounted(async () => {
   equipmentList.value = await store.getEquipmentList();
-})
+});
 const getTunnel = () => {
   getTunnelDetail(tunnelId).then((res) => {
     if (res?.code === 1000) {
-      form.value = res.data
+      form.value = res.data;
     }
   });
-}
-getTunnel()
+};
+getTunnel();
 const tunnelLength = computed(() => form.value.totalLength);
 const handleGotoDevice = () => {
-  router.push('/device/' + tunnelId)
-}
-const handleGoTunnelMgr=()=>{
-  router.push('/tunnel/' + form.value.siteId+'/'+type+'/'+userId)
-}
+  router.push("/device/" + tunnelId);
+};
+const handleGoTunnelMgr = () => {
+  router.push("/tunnel/" + form.value.siteId + "/" + type + "/" + userId);
+};
 const handleSave = async () => {
   const data = {
     tunnelId: tunnelId,
@@ -90,15 +97,15 @@ const handleSave = async () => {
     constructionLength: 500,
     tunnelLength: form.value.totalLength,
     isDefault: form.value.isDefault,
-    tunnelThreeConfig: JSON.stringify(await store.getEquipmentList())
-  }
+    tunnelThreeConfig: JSON.stringify(await store.getEquipmentList()),
+  };
   editTunnel(data).then((res) => {
     if (res?.code === 1000) {
-      ElMessage.success(res.msg)
-      router.push('/tunnel/' + form.value.siteId+'/'+type+'/'+userId)
+      ElMessage.success(res.msg);
+      router.push("/tunnel/" + form.value.siteId + "/" + type + "/" + userId);
     }
   });
-}
+};
 </script>
 <style lang="scss" scoped>
 #main {
@@ -125,16 +132,16 @@ const handleSave = async () => {
       height: 80px;
       line-height: 70px;
       border-radius: 11px;
-      border: 2px solid #08B7B8;
+      border: 2px solid #08b7b8;
       font-size: 42px;
-      color: #FFFFFF;
+      color: #ffffff;
 
       .back-icon {
         margin-right: 20px;
         margin-left: 23px;
         width: 35px;
         height: 35px;
-        background-image: url('@/assets/images/site/zdgl_icon_fh.png');
+        background-image: url("@/assets/images/site/zdgl_icon_fh.png");
       }
     }
 
@@ -158,12 +165,11 @@ const handleSave = async () => {
         width: 180px;
         height: 80px;
         border-radius: 11px;
-        border: 2px solid #08B7B8;
-        color: #FFFFFF;
+        border: 2px solid #08b7b8;
+        color: #ffffff;
         font-size: 42px;
       }
     }
-
   }
 
   #tunnel-box {
@@ -185,7 +191,7 @@ const handleSave = async () => {
     }
 
     :deep(.el-radio__label) {
-      color: #FFFFFF;
+      color: #ffffff;
       font-size: 38px;
     }
 
@@ -193,23 +199,23 @@ const handleSave = async () => {
       width: 40px;
       height: 40px;
       border-radius: 25px;
-      border: 4px solid #05FEFF;
+      border: 4px solid #05feff;
       background-color: transparent;
     }
 
-    :deep(.el-radio__input.is-checked+.el-radio__label) {
-      color: #FFFFFF;
+    :deep(.el-radio__input.is-checked + .el-radio__label) {
+      color: #ffffff;
     }
 
-    :deep(.el-radio__input.is-checked .el-radio__inner ) {
-      background: #064B66;
-      border-color: #05FEFF !important;
+    :deep(.el-radio__input.is-checked .el-radio__inner) {
+      background: #064b66;
+      border-color: #05feff !important;
     }
 
     :deep(.el-radio__inner::after) {
       width: 18px;
       height: 18px;
-      background: #05FEFF;
+      background: #05feff;
     }
 
     :deep(.el-form-item) {
@@ -218,7 +224,7 @@ const handleSave = async () => {
 
     :deep(.el-form-item__label) {
       font-size: 38px;
-      color: #FFFFFF;
+      color: #ffffff;
       margin-right: 12px;
       line-height: 50px;
     }
@@ -228,7 +234,7 @@ const handleSave = async () => {
 
       .el-input__wrapper {
         background-color: transparent;
-        border: 1px solid #08B7B8;
+        border: 1px solid #08b7b8;
 
         .el-input__inner {
           height: auto;

From bc39fcda9e1107d65325e857d38c9ae72b155147 Mon Sep 17 00:00:00 2001
From: dengj <209192648@qq.com>
Date: Fri, 29 Dec 2023 14:19:40 +0800
Subject: [PATCH 13/35] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=A6=96=E5=B1=8F=E9=A3=8E=E6=9C=BA=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/content/fanInfo/FanInfo.vue    | 35 ++++++++-----------
 .../content/fanInfo/FanInfoItem.vue           |  7 ++--
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index dd2f660..14161e0 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -64,13 +64,13 @@
             </div>
           </div>
         </div>
-        <div class="current" @click="handleOpenChart(item)">
+        <div class="current"  @click="handleOpenChart(item,index)">
           <fan-info-item :wp="transducerData[index]" />
         </div>
       </div>
     </div>
     <div class="digital-tunnel">
-      <el-dialog :close-on-click-modal="false" v-model="isVisited" :title="'电流监控数据'" width="2175px"
+      <el-dialog :close-on-click-modal="false" v-model="isVisited" :title="changeNum(fanIndex)+'号风机电流监控数据'" width="2175px"
                  :modal="false">
         <div class="left-top-icon"></div>
         <div class="right-top-icon"></div>
@@ -111,7 +111,9 @@ const stateA = ref(false)
 const stateB = ref(false)
 const stateC = ref(false)
 const isVisited = ref(false)
+const fanIndex = ref(0)
 let myEcharts = reactive({});
+
 watch(() => props.transducerData, (now) => {
   getTransData(now.frequencyChangerList)
 }, {deep: true});
@@ -155,8 +157,9 @@ const getFanInfo = (equipmentId) => {
     }
   })
 }
-const handleOpenChart = (item) => {
+const handleOpenChart = (item,index) => {
   getFanInfo(item.equipmentId)
+  fanIndex.value=index+1
 }
 const getTransData = (data) => {
   let tranObj = {}
@@ -505,7 +508,6 @@ input[type="number"] {
 
 :deep( .el-radio__label) {
   font-size: 28px;
-  font-family: MicrosoftYaHei;
   color: #38cafb;
   line-height: 37px;
 }
@@ -520,17 +522,14 @@ input[type="number"] {
   left: 68px;
   padding: 10px;
   background-image: url(../../../assets/images/fanInfo/bg.png);
-  //clip-path: polygon(0% 0%, 40% 0%, 48% 15%, 100% 15%, 100% 100%, 0% 100%);
   color: #2fb0df;
   box-sizing: border-box;
 
   .title {
     width: 40%;
     text-align: left;
-    font-size: 20px;
-    padding: 0px 0px 0px 62px;
+    padding: 0 0 0 62px;
     font-size: 32px;
-    font-family: MicrosoftYaHei, MicrosoftYaHei;
     font-weight: bold;
     color: #38cafb;
     line-height: 42px;
@@ -560,7 +559,6 @@ input[type="number"] {
         .echart::after {
           content: "Hz";
           font-size: 24px;
-          font-family: MicrosoftYaHei, MicrosoftYaHei;
           font-weight: bold;
           color: #ffffff;
           line-height: 31px;
@@ -574,7 +572,6 @@ input[type="number"] {
           width: 39px;
           height: 140px;
           font-size: 26px;
-          font-family: MicrosoftYaHei;
           color: #38cafb;
           line-height: 35px;
           text-align: center;
@@ -598,7 +595,6 @@ input[type="number"] {
               flex-direction: column;
               justify-content: center;
               font-size: 26px;
-              font-family: MicrosoftYaHei;
               color: #38cafb;
               line-height: 35px;
               gap: 40px;
@@ -644,7 +640,6 @@ input[type="number"] {
                 border-radius: 22px;
                 border: 2px solid #0f82af;
                 overflow: hidden;
-                font-family: MicrosoftYaHei, MicrosoftYaHei;
                 font-weight: bold;
                 color: #127399;
                 line-height: 35px;
@@ -662,9 +657,8 @@ input[type="number"] {
               display: flex;
               flex-direction: column;
               justify-content: center;
-              padding: 0px 20px;
+              padding: 0 20px;
               font-size: 28px;
-              font-family: MicrosoftYaHei;
               color: #38cafb;
               line-height: 37px;
               gap: 33px;
@@ -683,7 +677,6 @@ input[type="number"] {
                   top: 50%;
                   transform: translateY(-50%);
                   font-size: 28px;
-                  font-family: MicrosoftYaHei;
                   color: #38cafb;
                   line-height: 37px;
                 }
@@ -696,7 +689,6 @@ input[type="number"] {
                   margin-left: 14px;
                   outline: none;
                   font-size: 28px;
-                  font-family: MicrosoftYaHei, MicrosoftYaHei;
                   font-weight: bold;
                   color: #38cafb;
                   line-height: 37px;
@@ -714,7 +706,6 @@ input[type="number"] {
             padding-top: 30px;
             padding-right: 25px;
             font-size: 28px;
-            font-family: MicrosoftYaHei;
             color: #FFFFFF;
 
             .fenliu-icon {
@@ -737,7 +728,6 @@ input[type="number"] {
               margin-left: 14px;
               outline: none;
               font-size: 28px;
-              font-family: MicrosoftYaHei, MicrosoftYaHei;
               font-weight: bold;
               color: #38cafb;
               line-height: 37px;
@@ -751,7 +741,6 @@ input[type="number"] {
               bottom: 0;
               transform: translateY(-50%);
               font-size: 28px;
-              font-family: MicrosoftYaHei;
               color: #38cafb;
               line-height: 37px;
             }
@@ -761,13 +750,17 @@ input[type="number"] {
 
       .current {
         margin-top: 30px;
+        margin-right: 20px;
         margin-left: 26px;
-        height: 37px;
+        //height: 37px;
         font-size: 28px;
         color: #FFFFFF;
         cursor: pointer;
+        &:hover{
+          background-color:  #2E5589;
+          border-radius: 6px;
+        }
       }
-
     }
   }
 }
diff --git a/src/components/content/fanInfo/FanInfoItem.vue b/src/components/content/fanInfo/FanInfoItem.vue
index 8f12384..eaf6049 100644
--- a/src/components/content/fanInfo/FanInfoItem.vue
+++ b/src/components/content/fanInfo/FanInfoItem.vue
@@ -110,15 +110,16 @@ let isWaringC = computed(() => {
   display: flex;
   align-items: center;
   width: 100%;
-  padding: 6px 38px 7px 10px;
+  padding: 6px 0 7px 10px;
   margin-bottom: 17px;
 
   &:hover {
-    background: #2E5589;
-    border-radius: 6px;
+    //background: #2E5589;
+    //border-radius: 6px;
   }
 
   &:last-child {
+    margin-bottom: 0;
     .label {
       span {
         margin: 0 5px 0 14px;

From a1f31cf3ef329c6a3121c4141f7abcd2c67ddd49 Mon Sep 17 00:00:00 2001
From: trp <2477421791@qq.com>
Date: Fri, 29 Dec 2023 14:19:42 +0800
Subject: [PATCH 14/35] =?UTF-8?q?=E5=94=90=E6=B6=A6=E5=B9=B3=EF=BC=9A?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tunnelScene/editEquComp/editDialog.vue    | 40 +++++++++----
 .../content/tunnelScene/request/index.js      | 60 +++++++++++--------
 2 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/src/components/content/tunnelScene/editEquComp/editDialog.vue b/src/components/content/tunnelScene/editEquComp/editDialog.vue
index a9fc3cb..16434de 100644
--- a/src/components/content/tunnelScene/editEquComp/editDialog.vue
+++ b/src/components/content/tunnelScene/editEquComp/editDialog.vue
@@ -68,9 +68,9 @@ let maxConstructionLength = ref(0);
 //计算锚点之间距离
 const pointDistance_str = computed(
   () =>
-    `${params.pointGap}米*${params.pointNum}=${
+    `${params.pointGap}米*${params.pointNum}=${(
       params.pointGap * params.pointNum
-    }米`
+    ).toFixed(2)}米`
 );
 
 watch(
@@ -92,16 +92,25 @@ const equipmentSetting = reactive({
   threshold: "", //阈值
   typeKey: null, //设备选择(设备名称)
 });
+function resetEquipmentSetting() {
+  equipmentSetting.equipmentId = null;
+  equipmentSetting.equipmentName = "";
+  equipmentSetting.equipmentType = "";
+  equipmentSetting.position = "";
+  equipmentSetting.threshold = "";
+  equipmentSetting.typeKey = null;
+  equipment.value.reset();
+  equipmentType.value.reset();
+}
+
 // 绑定选择的设备类型
 function handleTypeChange(optionItem) {
   equipmentSetting.equipmentType = optionItem.value;
-  console.log("option", equipmentSetting);
 }
 function handleEquipmentChange(equipmentItem) {
   equipmentSetting.equipmentName = equipmentItem.label;
   equipmentSetting.equipmentId = equipmentItem.equipmentId;
   equipmentSetting.typeKey = equipmentItem.value;
-  console.log("option", equipmentSetting);
 }
 // 设备类型选项参数
 let options = reactive([{ label: "暂无数据", value: "" }]);
@@ -144,11 +153,7 @@ function handelInput(e) {
 
 // 处理取消事件
 function handleCancel() {
-  equipmentSetting.equipmentType = "";
-  equipmentSetting.chooseEquipment = null;
-  equipmentSetting.threshold = "";
-  equipment.value.reset();
-  equipmentType.value.reset();
+  resetEquipmentSetting();
   // 发射事件给tunnel父组件
   emit("cancel");
 }
@@ -183,12 +188,21 @@ function addEquipment() {
         message: "添加成功！",
         type: "success",
       });
+      resetEquipmentSetting();
     })
     .catch((err) => {
-      ElMessage({
-        message: "添加异常！",
-        type: "warning",
-      });
+      if (err === 3000) {
+        ElMessage({
+          message: "该设备已添加！",
+          type: "warning",
+        });
+        resetEquipmentSetting();
+      } else {
+        ElMessage({
+          message: "添加异常！",
+          type: "warning",
+        });
+      }
     });
 }
 </script>
diff --git a/src/components/content/tunnelScene/request/index.js b/src/components/content/tunnelScene/request/index.js
index 9d95938..babe138 100644
--- a/src/components/content/tunnelScene/request/index.js
+++ b/src/components/content/tunnelScene/request/index.js
@@ -37,29 +37,33 @@ export const saveEquipment = (equipmentInfo, pointGap) => {
   let tempModelEquipmentList = [...modelEquipmentList]; //数组克隆
   tempModelEquipmentList.push(toRaw(equipmentInfo));
   return new Promise((resolve, reject) => {
-    apiSaveEquipment({
-      constructionLength: autoComputeConstructionLength(
-        tempModelEquipmentList,
-        pointGap
-      ),
-      isDefault,
-      modelEquipmentList: tempModelEquipmentList,
-      remarks,
-      serialNumber,
-      tunnelId,
-      tunnelLength: totalLength,
-      tunnelName,
-    })
-      .then((res) => {
-        if (res?.code === 1000) {
-          modelEquipmentList.push(toRaw(equipmentInfo)); //存入本地
-          resolve();
-        }
-        reject(res);
-      })
-      .catch((err) => {
-        reject();
-      });
+    console.log("equId", equipmentInfo.equipmentId);
+    hasEquipment(equipmentInfo.equipmentId)
+      ? reject(3000)
+      : apiSaveEquipment({
+          constructionLength: autoComputeConstructionLength(
+            tempModelEquipmentList,
+            pointGap
+          ),
+          isDefault,
+          modelEquipmentList: tempModelEquipmentList,
+          remarks,
+          serialNumber,
+          tunnelId,
+          tunnelLength: totalLength,
+          tunnelName,
+        })
+          .then((res) => {
+            if (res?.code === 1000) {
+              modelEquipmentList.push(toRaw(equipmentInfo)); //存入本地
+              resolve();
+            }
+            console.log("add", res);
+            reject(res);
+          })
+          .catch((err) => {
+            reject();
+          });
   });
 };
 
@@ -103,7 +107,7 @@ export const deleteEquipment = (equipmentId, pointGap) => {
       .then((res) => {
         if (res?.code === 1000) {
           modelEquipmentList = modelEquipmentList.filter(
-            (item) => item.equipmentId != equipmentId
+            (item) => item.equipmentId === equipmentId
           );
           resolve();
         }
@@ -131,3 +135,11 @@ function autoComputeConstructionLength(modelEquipmentList, pointGap) {
   });
   return maxLength;
 }
+
+function hasEquipment(equipmentId) {
+  let result = false;
+  modelEquipmentList.forEach((item) => {
+    if (item.equipmentId === equipmentId) result = true;
+  });
+  return result;
+}

From b185a2a6510b9e560c505db45790dd73b0072ec1 Mon Sep 17 00:00:00 2001
From: dengj <209192648@qq.com>
Date: Fri, 29 Dec 2023 15:21:24 +0800
Subject: [PATCH 15/35] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=B7=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/index.vue | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 64df85d..3b8011c 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -47,6 +47,11 @@
             <el-table-column prop="nickName" label="昵称" align="center"/>
             <el-table-column prop="roleName" label="身份" align="center"/>
             <el-table-column prop="phoneNumber" label="电话号码" align="center"/>
+            <el-table-column prop="state" label="状态" align="center">
+              <template #default="scope">
+                {{scope.row.state=="1"?'启用':'停用'}}
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
               <template #default="scope">
                 <el-button link type="primary" size="large" style="font-size: 40px;color: #17E1E2;"
@@ -79,10 +84,14 @@
         <el-form-item label="输入电话号码">
           <el-input v-model="form.phoneNumber" placeholder="输入电话号码"/>
         </el-form-item>
-
+        <el-form-item label="是否启用">
+          <el-radio-group v-model="form.state">
+            <el-radio label="1">启用</el-radio>
+            <el-radio label="0">停用</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="选择身份">
           <el-radio-group v-model="form.roleId" @change="(val) => {
-             console.log('vaaa',val)
             if (val >3){
                  getTunnel()
             }}">
@@ -91,7 +100,7 @@
         </el-form-item>
         <el-form-item label="选择隧道" v-if="checkList.length!==0&&form.roleId>3">
           <el-select
-              v-model="tunnelIndex"
+              v-model="form.tunnelIds"
               multiple
               filterable
               clearable
@@ -157,6 +166,7 @@ const form = ref({
   userName: '',
   nickName: '',
   phoneNumber: '',
+  state: '1',
   roleId: [],
   tunnelIds: []
 });
@@ -189,6 +199,7 @@ const handleEditUser = (row) => {
     if (res.code === 1000) {
       form.value = res.data.user
       form.value.roleId = res.data.roleIds[0]
+      console.log('form.value',form.value)
     }
   })
   title.value = '修改用户'
@@ -198,7 +209,6 @@ const handleAll = () => {
   multipleTable.value.toggleAllSelection()
 }
 const handleDelete = () => {
-  console.log('userIds.value',userIds.value)
   if (userIds.value ===undefined) {
     ElMessage.warning('请先选择用户进行删除')
   } else {
@@ -222,6 +232,7 @@ const reset = () => {
     userName: '',
     nickName: '',
     phoneNumber: '',
+    state: '1',
     roleId: [],
     tunnelIds: []
   }
@@ -262,14 +273,21 @@ const handleCurrentChange = (val) => {
   getInfo()
 }
 const handleSubmit = async (formInstance) => {
+
   if (!formInstance) return;
   formInstance.validate(async (valid) => {
     if (!valid) return;
     const data = {
       siteId: siteId,
+      nickName: form.value.nickName,
+      password: form.value.password,
+      phoneNumber: form.value.phoneNumber,
+      state:form.value.state,
+      userName: form.value.userName,
       roleIds: [form.value.roleId],
-      ...form.value
+      tunnelIds: form.value.tunnelIds
     }
+    console.log('data',data)
     if (title.value === '添加用户') {
       await addUser(data).then(res => {
         if (res.code === 1000) {

From 101f200a967dd25507f686cacfc9d45b246917d0 Mon Sep 17 00:00:00 2001
From: dengj <209192648@qq.com>
Date: Fri, 29 Dec 2023 16:03:02 +0800
Subject: [PATCH 16/35] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/manageBtn/index.vue |  6 +++---
 src/views/login/index.vue          |  6 +++---
 src/views/tunnel/index.vue         | 18 ++++++++++++------
 src/views/user/index.vue           | 16 +++++++---------
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/components/manageBtn/index.vue b/src/components/manageBtn/index.vue
index 064e94d..85d1955 100644
--- a/src/components/manageBtn/index.vue
+++ b/src/components/manageBtn/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="manage-btn">
-    <div v-for="(item,index) in btnList" :key="item.name" class="btn-box" @click="select(index)">
+    <div v-for="(item,index) in btnList" :key="item.name" class="btn-box" @click="select(item,index)">
       <div :style="{ backgroundImage:'url(' +getImageUrl(item.icon)+')' }"></div>
       <div :class="{'select-active':selectButton===index}">{{ item.name }}</div>
     </div>
@@ -60,10 +60,10 @@ const selectButton = ref(props.modelValue);
 const getImageUrl = (name) => {
   return new URL(`../../assets/images/topAndDown/${name}`, import.meta.url).href
 }
-const select = (index) => {
+const select = (item,index) => {
   if (selectButton.value === index) return;
   selectButton.value = index;
   emit("update:modelValue", index);
-  emit("select", index);
+  emit("select", item.name);
 };
 </script>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 56a2938..9416666 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -45,9 +45,9 @@ import {User, Lock, Key} from "@element-plus/icons-vue";
 const router = useRouter();
 const authStore = useAuthStore();
 const loginForm = reactive({
-  username: "admin",
-  password: "123456",
-  // username: "",
+  // username: "admin",
+  password: "12345",
+  username: "",
   // password: "",
   code: "",
   uuid: "",
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 988fdef..0b62367 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -180,12 +180,18 @@ const changeTunnel = (e) => {
 }
 const manageSelect = (index) => {
   console.log("首页点击-", index);
-  if (index === 0) {
-    router.push("/site"+'/'+currentUserId.value);
-  } else if (index === 1) {
-    router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
-  } else if (index === 2) {
-    router.push("/user/" + currentSiteId.value);
+  if (index === '站点管理') {
+    if(currentUserId.value){
+      router.push("/site"+'/'+currentUserId.value);
+    }
+  } else if (index === '隧道管理') {
+    if(currentSiteId.value&&currentUserId.value){
+      router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
+    }
+  } else if (index === '用户管理') {
+    if(currentSiteId.value){
+      router.push("/user/" + currentSiteId.value);
+    }
   }
 };
 const handleChangeSite = (item) => {
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 3b8011c..c9fe9f7 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -72,8 +72,8 @@
         <el-form-item label="当前站点">
           <div class="current-site">{{ currentSite }}<span>如果需要切换站点,请返回首屏切换</span></div>
         </el-form-item>
-        <el-form-item label="输入账户">
-          <el-input v-model="form.userName" placeholder="请输入账户"/>
+        <el-form-item label="输入用户名">
+          <el-input v-model="form.userName" placeholder="请输入用户名"/>
         </el-form-item>
         <el-form-item label="输入密码" v-if="title==='添加用户'">
           <el-input type="password" show-password v-model="form.password" placeholder="请输入密码"/>
@@ -98,7 +98,7 @@
             <el-radio v-for="item in radioList" :label="item.value" :key="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="选择隧道" v-if="checkList.length!==0&&form.roleId>3">
+        <el-form-item label="选择隧道" v-if="tunnelList.length!==0&&form.roleId>3">
           <el-select
               v-model="form.tunnelIds"
               multiple
@@ -108,7 +108,7 @@
               :fit-input-width="true"
           >
             <el-option
-                v-for="item in checkList"
+                v-for="item in tunnelList"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -171,16 +171,16 @@ const form = ref({
   tunnelIds: []
 });
 const formRules = ref({
-  userName: [{required: true, message: '请输入用户名称', trigger: 'blur'}],
+  userName: [{required: true, message: '请输入用户名', trigger: 'blur'}],
   password: [{required: true, message: '请输入密码', trigger: 'blur'}]
 })
 const radioList = ref([])
-const checkList = ref([])
+const tunnelList = ref([])
 const multipleTable = ref()
 const getTunnel = () => {
   getTunnelOption(siteId).then(res => {
     if (res.code === 1000) {
-      checkList.value = res.data
+      tunnelList.value = res.data
     }
   })
 }
@@ -199,7 +199,6 @@ const handleEditUser = (row) => {
     if (res.code === 1000) {
       form.value = res.data.user
       form.value.roleId = res.data.roleIds[0]
-      console.log('form.value',form.value)
     }
   })
   title.value = '修改用户'
@@ -287,7 +286,6 @@ const handleSubmit = async (formInstance) => {
       roleIds: [form.value.roleId],
       tunnelIds: form.value.tunnelIds
     }
-    console.log('data',data)
     if (title.value === '添加用户') {
       await addUser(data).then(res => {
         if (res.code === 1000) {

From 8289274d5268da2f6a4bba126aec6c4d3ae9ed9a Mon Sep 17 00:00:00 2001
From: dengj <209192648@qq.com>
Date: Fri, 29 Dec 2023 16:57:29 +0800
Subject: [PATCH 17/35] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js        | 13 ++++++------
 src/utils/request.js       | 14 ++++++-------
 src/views/login/index.vue  |  2 +-
 src/views/tunnel/index.vue | 41 +++++++++++++++++++++-----------------
 4 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index cb01cf5..94a2513 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@ const routes = [
     }
   },
   {
-    path: '/tunnel/:siteId(\\d+)/:type/:userId(\\d+)',
+    path: '/tunnel/:siteId/:type/:userId',
     name: 'tunnel',
     component: () => import('@/views/tunnel-manage/index.vue'),
     meta: {
@@ -85,6 +85,7 @@ const router = createRouter({
 });
 router.beforeEach((to, form, next) => {
   NProgress.start()
+  console.log('token-----',getToken())
   if (!getToken()) {
     if (to.path === '/login') {
       next()
@@ -94,12 +95,12 @@ router.beforeEach((to, form, next) => {
     }
   } else {
     console.log('有token')
-    if (to.path === '/login') {
-      next('/')
-      NProgress.done()
-    } else {
+    // if (to.path === '/login') {
+    //   next('/')
+    //   NProgress.done()
+    // } else {
       next()
-    }
+    // }
   }
 })
 router.afterEach(() => {
diff --git a/src/utils/request.js b/src/utils/request.js
index 10627aa..5befe96 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -68,13 +68,13 @@ serveice.interceptors.response.use(response=>{
         window.location = '/login'
       })
       return Promise.reject('会话已过期,请重新登录')
-    case 402:
-      break;
-    case 403:
-      ElMessage.warning('禁止访问')
-      removeToken()
-      window.location = '/forbidden'
-      break;
+    // case 402:
+    //   break;
+    // case 403:
+    //   ElMessage.warning('禁止访问')
+      // removeToken()
+      // window.location = '/forbidden'
+      // break;
     case 404:
       ElMessage.warning('不存在的地址')
       break;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9416666..aeb283f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -46,7 +46,7 @@ const router = useRouter();
 const authStore = useAuthStore();
 const loginForm = reactive({
   // username: "admin",
-  password: "12345",
+  password: "",
   username: "",
   // password: "",
   code: "",
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 0b62367..ad25dd5 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -80,7 +80,7 @@ import {dateFormat} from "@/utils/date.js";
 import {getToken} from "@/utils/auth";
 import {useAuthStore} from "@/store/userstore.js";
 import {getLargeScreen, getLargeScreenInfo, getTunnelBySiteId} from "@/api/largeScreen";
-import {ElMessageBox} from "element-plus";
+import {ElMessage,ElMessageBox} from "element-plus";
 import {getUserInfo} from "@/api/login";
 import {initSceneData} from "@/api/tunnelScene";
 import {getSiteDetail} from "../../api/site";
@@ -146,23 +146,27 @@ const getOtherInfo = () => {
   });
 };
 const getScreenInfo = (id) => {
-  tunnelId.value=id
-  getLargeScreen(id).then((res) => {
-    if (res?.code === 1000) {
-      largeScreenData.value = res.data;
-    }
-  });
-  initSceneData(id).then((res) => {
-    tunnelLength.value=res.data.tunnelLength
-    constructionLength.value=res.data.constructionLength
-  })
+  if(id){
+    tunnelId.value=id
+    getLargeScreen(id).then((res) => {
+      if (res?.code === 1000) {
+        largeScreenData.value = res.data;
+      }else {
+        ElMessage.warning(res.msg)
+      }
+    });
+    initSceneData(id).then((res) => {
+      tunnelLength.value=res.data.tunnelLength
+      constructionLength.value=res.data.constructionLength
+    })
+  }
 };
 //根据站点id获取隧道信息
 const getTunnel = (id) => {
   getTunnelBySiteId(id).then((res) => {
     if (res?.code === 1000) {
       tunnelList.value = res.data
-      getScreenInfo(res.data[0].value)
+      getScreenInfo(res.data[0]?.value)
     }
   });
 }
@@ -180,15 +184,16 @@ const changeTunnel = (e) => {
 }
 const manageSelect = (index) => {
   console.log("首页点击-", index);
-  if (index === '站点管理') {
+  if (index == '站点管理') {
     if(currentUserId.value){
       router.push("/site"+'/'+currentUserId.value);
     }
-  } else if (index === '隧道管理') {
-    if(currentSiteId.value&&currentUserId.value){
-      router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
-    }
-  } else if (index === '用户管理') {
+  } else if (index == '隧道管理') {
+    console.log('无查看权限??',currentSiteId.value,currentUserId.value)
+    // if(currentSiteId.value&&currentUserId.value){
+    router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
+    // }
+  } else if (index == '用户管理') {
     if(currentSiteId.value){
       router.push("/user/" + currentSiteId.value);
     }

From 051d0bcd6c4c85c45790c22aa981100710a73bd9 Mon Sep 17 00:00:00 2001
From: dengj <209192648@qq.com>
Date: Fri, 29 Dec 2023 17:36:36 +0800
Subject: [PATCH 18/35] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tunnel-manage/index.vue | 72 ++++++++++++++++---------------
 src/views/tunnel/index.vue        | 37 ++++++++--------
 src/views/user/index.vue          |  2 +-
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 3a0196d..5dc6556 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -5,9 +5,9 @@
         <div class="back-icon"></div>
         <span>返回</span>
       </div>
-      <div class="site-name">
-        {{ siteName }}
-      </div>
+<!--      <div class="site-name">-->
+<!--        {{ siteName }}-->
+<!--      </div>-->
       <div class="tunnel-title"></div>
       <div class="all-del-btn">
         <div class="all-btn" style=" margin-right: 40px;" v-if="!showAddIcon" @click="handleAdd">
@@ -259,13 +259,13 @@ const pageInfo = reactive({
 });
 const total = ref(10);
 onMounted(() => {
-  getSiteDetail(siteId).then((res) => {
-    siteName.value = res.data.siteName
-  });
+  // getSiteDetail(siteId).then((res) => {
+  //   siteName.value = res.data.siteName
+  // });
 })
 const handleGoSiteOrIndex = () => {
   if (type === 's') {
-    router.push('/site/'+userId)
+    router.push('/site/' + userId)
   } else if (type === 'i') {
     router.push('/')
   }
@@ -279,16 +279,18 @@ const getList = () => {
       total.value = res.data.total
       tunnelList.value = res.data.rows
       showFirst.value = total.value / pageInfo.pageSize >= 1;
+    } else {
+      ElMessage.warning(res.msg)
     }
   })
 }
 getList()
-const firstPage=()=>{
+const firstPage = () => {
   pageInfo.pageNum = 1
   getList()
 }
-const lastPage=()=>{
-  pageInfo.pageNum = total.value/pageInfo.pageSize
+const lastPage = () => {
+  pageInfo.pageNum = total.value / pageInfo.pageSize
   getList()
 }
 //点击页码进行分页功能
@@ -312,7 +314,7 @@ const handleSubmit = (instance) => {
         ElMessage.success('新增成功')
         getList()
         isVisited.value = false
-      }else {
+      } else {
         ElMessage.warning(res.msg)
       }
     })
@@ -324,17 +326,17 @@ const handleSubmit = (instance) => {
 const handleGoToEditTunnel = (tunnelId) => {
   isEdit.value = true
   if (type === 's') {
-    router.push('/edit/' + tunnelId + '/s/'+userId)
+    router.push('/edit/' + tunnelId + '/s/' + userId)
   } else if (type === 'i') {
-    router.push('/edit/' + tunnelId + '/i/'+userId)
+    router.push('/edit/' + tunnelId + '/i/' + userId)
   }
 }
 const handleChooseAll = () => {
   tunnelList.value.map(item => {
     item.checked = !item.checked
-    if(item.checked&&!item.isDefault){
+    if (item.checked && !item.isDefault) {
       tunnelIds.value.push(item.tunnelId)
-    }else if(!item.checked&&!item.isDefault){
+    } else if (!item.checked && !item.isDefault) {
       tunnelIds.value.map((newItem, index) => {
         if (newItem === item.tunnelId) {
           tunnelIds.value.splice(index, 1)
@@ -345,9 +347,9 @@ const handleChooseAll = () => {
 }
 const handleEditDevice = (tunnelId) => {
   if (type === 's') {
-    router.push('/device/' + tunnelId + '/s/'+userId)
+    router.push('/device/' + tunnelId + '/s/' + userId)
   } else if (type === 'i') {
-    router.push('/device/' + tunnelId + '/i/'+userId)
+    router.push('/device/' + tunnelId + '/i/' + userId)
   }
 }
 const restFrom = () => {
@@ -388,23 +390,23 @@ const handleMoreDelete = () => {
   if (tunnelIds.value.length === 0) {
     ElMessage.warning('请先选择隧道进行删除')
   } else {
-      ElMessageBox.confirm(`是否确定删除该隧道`, '系统提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        customClass: 'delBox'
-      }).then(() => {
-        deleteTunnel(tunnelIds.value).then(res => {
-          if (res.code === 1000) {
-            ElMessage.success(res.msg)
-            getList()
-            tunnelIds.value = []
-            tunnelNameList.value = []
-          } else {
-            ElMessage.error(res.msg)
-          }
-        })
+    ElMessageBox.confirm(`是否确定删除该隧道`, '系统提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+      customClass: 'delBox'
+    }).then(() => {
+      deleteTunnel(tunnelIds.value).then(res => {
+        if (res.code === 1000) {
+          ElMessage.success(res.msg)
+          getList()
+          tunnelIds.value = []
+          tunnelNameList.value = []
+        } else {
+          ElMessage.error(res.msg)
+        }
       })
+    })
   }
 }
 
@@ -628,10 +630,10 @@ const handleMoreDelete = () => {
 
 
         > span:last-child {
-          padding:1px 8px;
+          padding: 1px 8px;
           font-size: 32px;
           border: 2px solid #05FEFF;
-          border-radius:10px;
+          border-radius: 10px;
           position: relative;
         }
       }
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index ad25dd5..c33ee88 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -5,8 +5,8 @@
       <div class="tunnel-title"></div>
       <!--      <manage-length class="tunnel-length"></manage-length>-->
       <div class="top-length">
-        <span>隧道总长度: {{tunnelLength}}米</span>
-        <span>当前施工长度: {{constructionLength}}米</span>
+        <span>隧道总长度: {{ tunnelLength }}米</span>
+        <span>当前施工长度: {{ constructionLength }}米</span>
       </div>
       <div class="top-right">
         <div class="current-site">
@@ -80,7 +80,7 @@ import {dateFormat} from "@/utils/date.js";
 import {getToken} from "@/utils/auth";
 import {useAuthStore} from "@/store/userstore.js";
 import {getLargeScreen, getLargeScreenInfo, getTunnelBySiteId} from "@/api/largeScreen";
-import {ElMessage,ElMessageBox} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import {getUserInfo} from "@/api/login";
 import {initSceneData} from "@/api/tunnelScene";
 import {getSiteDetail} from "../../api/site";
@@ -128,7 +128,7 @@ const getUser = () => {
     currentUserId.value = res.data.user.userId
   })
 }
-const getDefaultSite=(siteId)=>{
+const getDefaultSite = (siteId) => {
   // console.log('siteList.value',siteList.value)
   // getSiteDetail(siteId).then((res) => {
   //   console.log('res',res)
@@ -139,25 +139,25 @@ const getOtherInfo = () => {
     if (res?.code === 1000) {
       routeList.value = res.data.routeList
       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[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)
     }
   });
 };
 const getScreenInfo = (id) => {
-  if(id){
-    tunnelId.value=id
+  if (id) {
+    tunnelId.value = id
     getLargeScreen(id).then((res) => {
       if (res?.code === 1000) {
         largeScreenData.value = res.data;
-      }else {
+      } else {
         ElMessage.warning(res.msg)
       }
     });
     initSceneData(id).then((res) => {
-      tunnelLength.value=res.data.tunnelLength
-      constructionLength.value=res.data.constructionLength
+      tunnelLength.value = res.data.tunnelLength
+      constructionLength.value = res.data.constructionLength
     })
   }
 };
@@ -185,16 +185,15 @@ const changeTunnel = (e) => {
 const manageSelect = (index) => {
   console.log("首页点击-", index);
   if (index == '站点管理') {
-    if(currentUserId.value){
-      router.push("/site"+'/'+currentUserId.value);
+    if (currentUserId.value) {
+      router.push("/site" + '/' + currentUserId.value);
     }
   } else if (index == '隧道管理') {
-    console.log('无查看权限??',currentSiteId.value,currentUserId.value)
-    // if(currentSiteId.value&&currentUserId.value){
-    router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
-    // }
+    if (currentSiteId.value && currentUserId.value) {
+      router.push("/tunnel/" + currentSiteId.value + '/i' + '/' + currentUserId.value);
+    }
   } else if (index == '用户管理') {
-    if(currentSiteId.value){
+    if (currentSiteId.value) {
       router.push("/user/" + currentSiteId.value);
     }
   }
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index c9fe9f7..1b2849c 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -284,7 +284,7 @@ const handleSubmit = async (formInstance) => {
       state:form.value.state,
       userName: form.value.userName,
       roleIds: [form.value.roleId],
-      tunnelIds: form.value.tunnelIds
+      tunnelList: form.value.tunnelIds
     }
     if (title.value === '添加用户') {
       await addUser(data).then(res => {

From 11f9de9389986e5482b84dabcaef6f754e9f0fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Fri, 29 Dec 2023 19:00:54 +0800
Subject: [PATCH 19/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 1b2849c..fbebeb0 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -297,7 +297,11 @@ const handleSubmit = async (formInstance) => {
         }
       })
     } else {
-      await editUser(data).then(res => {
+      const editData={
+        userId:form.value.userId,
+        ...data
+      }
+      await editUser(editData).then(res => {
         if (res.code === 1000) {
           getInfo()
           isVisited.value = false

From e49c12635145e83053e284bbb85b6acf281e5de9 Mon Sep 17 00:00:00 2001
From: Hcat <2768237203@qq.com>
Date: Fri, 29 Dec 2023 21:18:48 +0800
Subject: [PATCH 20/35] =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96+=E5=88=87=E6=8D=A2=E9=9A=A7=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/PreviewScene.vue      | 105 ++++++++------
 .../sceneClass/editEquipment/index.js         | 128 ++++++++----------
 .../sceneClass/previewTunnelInit/index.js     |   9 +-
 src/views/tunnel/index.vue                    |  70 ++++++----
 4 files changed, 164 insertions(+), 148 deletions(-)

diff --git a/src/components/content/tunnelScene/PreviewScene.vue b/src/components/content/tunnelScene/PreviewScene.vue
index 46d8b06..7435789 100644
--- a/src/components/content/tunnelScene/PreviewScene.vue
+++ b/src/components/content/tunnelScene/PreviewScene.vue
@@ -47,15 +47,14 @@ import {
 
 import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader";
 import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
-import { onMounted, reactive, ref } from "vue";
+import { onMounted, reactive, ref, toRaw, getCurrentInstance } from "vue";
 import { ElMessage } from "element-plus";
-import { useModelSceneStore } from "@/store/modelSceneStore";
-import { toRaw } from "vue"
+import { deleteEquipment, initData } from "./request";
 // 获取html标签跟随组件dom
 const content = ref(null);
 const info = ref(null);
 const edit = ref(null);
-const store = useModelSceneStore();
+let modelList = ref(null);
 let demo; //定义demo全局变量
 // const loader = new OBJLoader();
 const loader = new OBJLoader();
@@ -69,6 +68,16 @@ const params = defineProps(["isedit", "tunnelId"]); //接收参数看是不是
 let isedit = ref(params.isedit)
 
 
+// watch(
+//     () => params.tunnelId,
+//     (now) => {
+//         params.tunnelId = now
+//         console.log(params.tunnelId);
+
+//     },
+//     { deep: true }
+// )
+
 onMounted(handleMounted);
 // 挂载后回调
 async function handleMounted() {
@@ -89,7 +98,7 @@ async function handleMounted() {
     watch(
         () => params.tunnelId,
         async () => {
-            const text = await store.initData(params.tunnelId);
+            const text = await initData(params.tunnelId);
         }
     );
     // 初始化设备模型
@@ -100,14 +109,38 @@ async function handleMounted() {
         map.set("equ_sensors", await loadModel("/devicesModel/sensors.obj"));
         // 给对象初加载设备模型
         demo.initDevicesModel(map);
-        const equipmentList = await store.getEquipmentList();
-        demo.previewtunnelModeInit(equipmentList);
-        // previewEquInfProcess(equipmentList)
+        // const equipmentList = await store.getEquipmentList();
+        modelList.value = await initData(params.tunnelId);
+        // console.log("init", params.tunnelId);
+        demo.previewtunnelModeInit(modelList.value);
+        watch(
+            () => params.tunnelId,
+            (now) => {
+                params.tunnelId = now
+                // console.log(params.tunnelId);
+                checkTunnelInit(modelList.value)
+                demo.previewtunnelModeInit(modelList.value);
+            },
+            { deep: true }
+        )
+        // demo.previewtunnelModeInit(equipmentList);
+        // previewEquInfProcess(modelList.value, targetP.value)
     } catch (err) {
         console.log(err);
     }
 }
 
+
+function checkTunnelInit(equipmentList) {
+    equipmentList.forEach((item) => {
+        let equipment = toRaw(item)
+        console.log("我要清理掉之前的设备！！！");
+        console.log(equipment);
+        console.log(demo.scene.getObjectByName(equipment.position));
+        demo.removeEquipment(demo.scene.getObjectByName(equipment.position));
+    });
+}
+
 // 每个模型加载回调
 function loadModel(path) {
     return new Promise((resolve, reject) => {
@@ -163,46 +196,31 @@ function lClickCallback(demo) {
 }
 
 let pointNum = ref(0);
-let targetP;
+let targetP = ref({});
 // 右键点击附着点后调函数
 function rClickCallback(demo) {
     function editDev(targetPoint = null) {
-        hasDevice = targetPoint.hasDevice;
-        targetP = targetPoint;
-        //点击之后马上调用这个函数，变成回调，然后进行处理处理在传给preview表单
-        const equipmentList = store.getEquipmentList().then((result) => {
-            previewEquInfProcess(result, targetP)
-        });
+        hasDevice.value = targetPoint.hasDevice;
+        targetP.value = targetPoint;
+        const equipmentList = initData(params.tunnelId)
+        equipmentList.then((result) => {
+            previewEquInfProcess(result, targetP.value)
+        })
         pointNum.value = Number(
             targetPoint.name.substring(
                 targetPoint.name.indexOf("_") + 1,
                 targetPoint.name.lastIndexOf("_")
             ) - 1
         );
-
         if (!targetPoint.info) return;
         editDevInfo(targetPoint.info);
     }
     demo.addFunction("editDev", editDev);
-
 }
 
 // 添加设备
 function handleAddEqu(formInfo) {
-    if (!formInfo.equipmentType) {
-        ElMessage({
-            message: "请选择传感器！",
-            type: "warning",
-        });
-        return;
-    }
-    //表单信息
-    //这里利用处理请求
-    demo.addEquipment(targetP, formInfo);
-    ElMessage({
-        message: "添加成功！",
-        type: "success",
-    });
+    demo.addEquipment(targetP.value, formInfo);
 }
 
 const centerDialogVisible = ref(false);
@@ -219,12 +237,22 @@ function handleRemoveEqu() {
 }
 // 对话框确认删除
 function handleConfirmAddEqu() {
-    demo.removeEquipment(targetP);
-    centerDialogVisible.value = false;
-    ElMessage({
-        message: "删除成功！",
-        type: "success",
-    });
+    console.log("target:", targetP.value.info);
+    deleteEquipment(targetP.value.info.equipmentId, pointGap)
+        .then((res) => {
+            demo.removeEquipment(targetP.value);
+            centerDialogVisible.value = false;
+            ElMessage({
+                message: "删除成功！",
+                type: "success",
+            });
+        })
+        .catch((res) => {
+            ElMessage({
+                message: "删除失败！",
+                type: "warning",
+            });
+        });
 }
 // 处理取消关闭编辑框事件
 function handleCancel() {
@@ -242,11 +270,10 @@ let equipmentValue = ref(0)
 
 function previewEquInfProcess(equipmentList, targetP) {
     for (const equipment of equipmentList) {
-        // console.log(equipment);
         if (equipment.position == targetP.name) {
             equipmentType.value = equipment.equipmentType
             //需要将获取到的设备列表进行序列化
-            equipmentName.value = toRaw(equipment.chooseEquipment).label
+            equipmentName.value = equipment.equipmentName
             equipmentValue.value = equipment.threshold
             if (equipmentType.value == 'frequency') {
                 equipmentType.value = '风机'
diff --git a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
index 372fc45..070fdfe 100644
--- a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
+++ b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
@@ -36,7 +36,7 @@ function addEquipment(targetPoint, formInfo) {
 // function handleValveEqu(targetPoint, equipmentInfo) {
 
 // }
-
+let allline = new Array
 // 其他传感器
 function handleOtherEqu(targetPoint, equipmentInfo) {
   const equMesh = this.equMap.get("equ_sensors").clone();
@@ -67,41 +67,24 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
   targetPoint.scale.set(0.03, 0.06, 0.05);
   this.scene.add(equMesh);
   targetPoint.visible = false;
-  // targetPoint.hasWall = true;
-  // //处理风压阀的代码片段
-  // let lineIndex = targetPoint.name.slice(7, 9);
-  // for (let line = Number(lineIndex); line <= 20; line++) {
-  //   if (line < 10) {
-  //     let wall = "wall_" + "0" + line;
-  //     this.scene.getObjectByName(wall).visible = true;
-  //     let point = "point_" + "00" + line + "_tc";
-  //     this.scene.getObjectByName(point).visible = false;
-  //     this.scene.getObjectByName(point).layers.set(-2);
-  //     if (this.scene.getObjectByName(point).hasDevice == true) {
-  //       let EquID = this.scene.getObjectByName(point).info.id;
-  //       this.scene.getObjectById(EquID).visible = false;
-  //     }
-  //   } else if (line >= 10) {
-  //     let wall = "wall_" + line;
-  //     this.scene.getObjectByName(wall).visible = true;
-  //     let point = "point_" + "0" + line + "_tc";
-  //     this.scene.getObjectByName(point).visible = false;
-  //     this.scene.getObjectByName(point).layers.set(-2);
-  //     if (this.scene.getObjectByName(point).hasDevice == true) {
-  //       let EquID = this.scene.getObjectByName(point).info.id;
-  //       this.scene.getObjectById(EquID).visible = false;
-  //     }
+  targetPoint.hasWall = true;
+  //处理风压阀的代码片段
+  let lineIndex = targetPoint.name.slice(7, 9)
+  if (allline.includes(Number(lineIndex))) {
+    allline.slice(array.indexOf(lineIndex), 1)
+    console.log('dadad');
+  } else {
+    allline.push(Number(lineIndex))
+  }
+  console.log(allline);
+  // console.log(allline);
+  // allline.forEach((item, index, array) => {
+  //   if (array.includes(item)) {
+  //     array.slice(array.indexOf(item), 1)
+  //     array.slice(array.indexOf(item), 1)
+  //     console.log(array);
   //   }
-  //   //处理21行的设备和附着点
-  //   let point = "point_" + "0" + 21 + "_tc";
-  //   this.scene.getObjectByName(point).visible = false;
-  //   this.scene.getObjectByName(point).layers.set(-2);
-  //   if (this.scene.getObjectByName(point).hasDevice == true) {
-  //     let EquID = this.scene.getObjectByName(point).info.id;
-  //     this.scene.getObjectById(EquID).visible = false;
-  //   }
-  // }
-  // this.scene.getObjectByName('wall_01').visible = true
+  // })
   // console.log(this.scene);
   // 保存该设备模型id，后期直接从附附着点进行删除
   targetPoint.info = {
@@ -154,43 +137,44 @@ function handleFanEqu(
 function removeEquipment(targetPoint) {
   //删除设备这里需要再进行处理，就是根据附着点（附着点一定保存了当前添加设备的信息了）判断是不是分压阀，然后继续一样的隐藏
   if (!targetPoint.hasDevice) return;
-  if (targetPoint.hasWall == true) {
-    let lineIndex = targetPoint.name.slice(7, 9);
-    for (let line = Number(lineIndex); line <= 20; line++) {
-      if (line < 10) {
-        let wall = "wall_" + "0" + line;
-        this.scene.getObjectByName(wall).visible = false;
-        let point = "point_" + "00" + line + "_tc";
-        console.log(this.scene.getObjectByName(point));
-        this.scene.getObjectByName(point).visible = true;
-        this.scene.getObjectByName(point).layers.set(0);
-        if (this.scene.getObjectByName(point).hasDevice == true) {
-          this.scene.getObjectByName(point).visible = false;
-          let EquID = this.scene.getObjectByName(point).info.id;
-          this.scene.getObjectById(EquID).visible = true;
-        }
-      } else if (line >= 10) {
-        let wall = "wall_" + line;
-        this.scene.getObjectByName(wall).visible = false;
-        let point = "point_" + "0" + line + "_tc";
-        this.scene.getObjectByName(point).visible = true;
-        this.scene.getObjectByName(point).layers.set(0);
-        if (this.scene.getObjectByName(point).hasDevice == true) {
-          this.scene.getObjectByName(point).visible = false;
-          let EquID = this.scene.getObjectByName(point).info.id;
-          this.scene.getObjectById(EquID).visible = true;
-        }
-      }
-      //处理21行的设备和附着点
-      let point = "point_" + "0" + 21 + "_tc";
-      this.scene.getObjectByName(point).visible = true;
-      this.scene.getObjectByName(point).layers.set(0);
-      if (this.scene.getObjectByName(point).hasDevice == true) {
-        let EquID = this.scene.getObjectByName(point).info.id;
-        this.scene.getObjectById(EquID).visible = true;
-      }
-    }
-  }
+  // if (targetPoint.hasWall == true) {
+  //   let lineIndex = targetPoint.name.slice(7, 9);
+  //   for (let line = Number(lineIndex); line <= 20; line++) {
+  //     if (line < 10) {
+  //       let wall = "wall_" + "0" + line;
+  //       this.scene.getObjectByName(wall).visible = false;
+  //       let point = "point_" + "00" + line + "_tc";
+  //       console.log(this.scene.getObjectByName(point));
+  //       this.scene.getObjectByName(point).visible = true;
+  //       this.scene.getObjectByName(point).layers.set(0);
+  //       if (this.scene.getObjectByName(point).hasDevice == true) {
+  //         this.scene.getObjectByName(point).visible = false;
+  //         let EquID = this.scene.getObjectByName(point).info.id;
+  //         this.scene.getObjectById(EquID).visible = true;
+  //       }
+  //     } else if (line >= 10) {
+  //       let wall = "wall_" + line;
+  //       this.scene.getObjectByName(wall).visible = false;
+  //       let point = "point_" + "0" + line + "_tc";
+  //       this.scene.getObjectByName(point).visible = true;
+  //       this.scene.getObjectByName(point).layers.set(0);
+  //       if (this.scene.getObjectByName(point).hasDevice == true) {
+  //         this.scene.getObjectByName(point).visible = false;
+  //         let EquID = this.scene.getObjectByName(point).info.id;
+  //         this.scene.getObjectById(EquID).visible = true;
+  //       }
+  //     }
+  //     //处理21行的设备和附着点
+  //     let point = "point_" + "0" + 21 + "_tc";
+  //     this.scene.getObjectByName(point).visible = true;
+  //     this.scene.getObjectByName(point).layers.set(0);
+  //     if (this.scene.getObjectByName(point).hasDevice == true) {
+  //       let EquID = this.scene.getObjectByName(point).info.id;
+  //       this.scene.getObjectById(EquID).visible = true;
+  //     }
+  //   }
+  // }
+  console.log("测试是不是删除了");
   const mesh = this.scene.getObjectById(targetPoint.info.id);
   this.scene.remove(mesh);
   targetPoint.visible = true;
diff --git a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
index 1dfa150..8ea6300 100644
--- a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
+++ b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
@@ -1,3 +1,4 @@
+
 export default function previewtunnelModeInit(equipmentList) {
     //初始化将墙壁隐藏起来
     // for (let line = 1; line <= 20; line++) {
@@ -9,14 +10,8 @@ export default function previewtunnelModeInit(equipmentList) {
     //         this.scene.getObjectByName(wall).visible = false
     //     }
     // }
-
     equipmentList.forEach((item) => {
-        const formInfo = {
-            equipmentType: item.equipmentType, //设备类型
-            chooseEquipment: item.chooseEquipment, //设备选择(设备名称)
-            threshold: item.threshold,
-        };
-        this.addEquipment(this.scene.getObjectByName(item.position), formInfo);
+        this.addEquipment(this.scene.getObjectByName(item.position), item);
     });
     //进行预览和编辑模式的一些操作
     if (this.isedit == false) {
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 988fdef..3aa3850 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div id="main">
     <div class="box-top">
-      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList"/>
+      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" />
       <div class="tunnel-title"></div>
       <!--      <manage-length class="tunnel-length"></manage-length>-->
       <div class="top-length">
-        <span>隧道总长度: {{tunnelLength}}米</span>
-        <span>当前施工长度: {{constructionLength}}米</span>
+        <span>隧道总长度: {{ tunnelLength }}米</span>
+        <span>当前施工长度: {{ constructionLength }}米</span>
       </div>
       <div class="top-right">
         <div class="current-site">
@@ -16,8 +16,8 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item v-for="item in siteList" :key="item.value" :command="item">{{
-                    item.label
-                  }}
+                  item.label
+                }}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>
@@ -32,24 +32,24 @@
     </div>
     <!-- <tunnel-scene id="tunnel-box" :isedit="false" /> -->
     <!-- 一进去的话应该是预览模式，所以引入这个组件 -->
-    <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId"></preview-scene>
+    <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId" :key="tunnelId"></preview-scene>
     <div class="left">
       <el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"
-                 :close-on-click-modal="false" :close-on-press-escape="false">
+        :close-on-click-modal="false" :close-on-press-escape="false">
         <fan-info v-if="showFan" :list="socketData.leftData" :fan-data="largeScreenData"
-                  :transducer-data="largeScreenData"/>
+          :transducer-data="largeScreenData" />
         <!--        <transducer-list v-if="showFan" :list="socketData.leftData" :transducer-data="largeScreenData" />-->
-        <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData"/>
+        <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData" />
       </el-drawer>
       <div v-if="drawerLeft" class="left-arrow" @click="closeLeft"></div>
       <div v-else class="shrink-left" @click="closeLeft"></div>
     </div>
     <div class="right">
       <el-drawer v-model="drawerRight" direction="rtl" modal-class="modal-box" :modal="false" :show-close="false"
-                 :close-on-click-modal="false" :close-on-press-escape="false">
-        <wind-pressure-list v-if="showFan" :list="socketData.windPressure" :win-data="largeScreenData"/>
-        <air-info v-if="showFan" :list="socketData.sensor" :air-data="largeScreenData"/>
-        <bad-gas-info v-if="showFan" :list="socketData.sensor" :bad-gas-data="largeScreenData" :tunnelId="tunnelId"/>
+        :close-on-click-modal="false" :close-on-press-escape="false">
+        <wind-pressure-list v-if="showFan" :list="socketData.windPressure" :win-data="largeScreenData" />
+        <air-info v-if="showFan" :list="socketData.sensor" :air-data="largeScreenData" />
+        <bad-gas-info v-if="showFan" :list="socketData.sensor" :bad-gas-data="largeScreenData" :tunnelId="tunnelId" />
       </el-drawer>
       <div v-if="drawerRight" class="right-arrow" @click="closeRight"></div>
       <div v-else class="shrink-right" @click="closeRight"></div>
@@ -76,14 +76,15 @@ import WindPressureList from "@/components/content/windPressure/WindPressureList
 import AirInfo from "@/components/content/airInfo/AirInfo.vue";
 import BadGasInfo from "@/components/content/badGasInfo/BadGasInfo.vue";
 import ManageBtn from "@/components/manageBtn/index.vue";
-import {dateFormat} from "@/utils/date.js";
-import {getToken} from "@/utils/auth";
-import {useAuthStore} from "@/store/userstore.js";
-import {getLargeScreen, getLargeScreenInfo, getTunnelBySiteId} from "@/api/largeScreen";
-import {ElMessageBox} from "element-plus";
-import {getUserInfo} from "@/api/login";
-import {initSceneData} from "@/api/tunnelScene";
-import {getSiteDetail} from "../../api/site";
+import { dateFormat } from "@/utils/date.js";
+import { getToken } from "@/utils/auth";
+import { useAuthStore } from "@/store/userstore.js";
+import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/largeScreen";
+import { ElMessageBox } from "element-plus";
+import { getUserInfo } from "@/api/login";
+import { initSceneData } from "@/api/tunnelScene";
+import { getSiteDetail } from "../../api/site";
+import { nextTick, reactive } from "vue";
 
 const authStore = useAuthStore();
 const router = useRouter();
@@ -128,7 +129,7 @@ const getUser = () => {
     currentUserId.value = res.data.user.userId
   })
 }
-const getDefaultSite=(siteId)=>{
+const getDefaultSite = (siteId) => {
   // console.log('siteList.value',siteList.value)
   // getSiteDetail(siteId).then((res) => {
   //   console.log('res',res)
@@ -139,22 +140,22 @@ const getOtherInfo = () => {
     if (res?.code === 1000) {
       routeList.value = res.data.routeList
       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[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)
     }
   });
 };
 const getScreenInfo = (id) => {
-  tunnelId.value=id
+  tunnelId.value = id
   getLargeScreen(id).then((res) => {
     if (res?.code === 1000) {
       largeScreenData.value = res.data;
     }
   });
   initSceneData(id).then((res) => {
-    tunnelLength.value=res.data.tunnelLength
-    constructionLength.value=res.data.constructionLength
+    tunnelLength.value = res.data.tunnelLength
+    constructionLength.value = res.data.constructionLength
   })
 };
 //根据站点id获取隧道信息
@@ -181,9 +182,9 @@ const changeTunnel = (e) => {
 const manageSelect = (index) => {
   console.log("首页点击-", index);
   if (index === 0) {
-    router.push("/site"+'/'+currentUserId.value);
+    router.push("/site" + '/' + currentUserId.value);
   } else if (index === 1) {
-    router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
+    router.push("/tunnel/" + currentSiteId.value + '/i' + '/' + currentUserId.value);
   } else if (index === 2) {
     router.push("/user/" + currentSiteId.value);
   }
@@ -259,6 +260,15 @@ const closeSocket = () => {
   socket.close();
 };
 initWebSocket();
+
+
+watch(
+  () => tunnelId.value,
+  (now) => {
+    tunnelId.value = now
+  },
+  { deep: true }
+)
 </script>
 <style lang="scss">
 .el-dropdown__popper.el-popper {

From a540c433fd4201b7ce029f063653d3efb710786e Mon Sep 17 00:00:00 2001
From: Hcat <2768237203@qq.com>
Date: Fri, 29 Dec 2023 21:30:47 +0800
Subject: [PATCH 21/35] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F+?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=9A=A7=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tunnel/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index ec9b912..287f17e 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -33,7 +33,7 @@
       </div>
     </div>
     <!-- <tunnel-scene id="tunnel-box" :isedit="false" /> -->
-    <!-- 一进去的话应该是预览模式，所以引入这个组件 -->
+    <!-- 一进去的话应该是预览模式，所以引入这个组件1 -->
     <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId" :key="tunnelId"></preview-scene>
     <div class="left">
       <el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"

From 3e14bf1ca5228109de80777f738934832e12da79 Mon Sep 17 00:00:00 2001
From: Hcat <2768237203@qq.com>
Date: Fri, 29 Dec 2023 21:40:54 +0800
Subject: [PATCH 22/35] 2

---
 src/views/tunnel/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 287f17e..08b0161 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -34,6 +34,8 @@
     </div>
     <!-- <tunnel-scene id="tunnel-box" :isedit="false" /> -->
     <!-- 一进去的话应该是预览模式，所以引入这个组件1 -->
+    <!-- 一进去的话应该是预览模式，所以引入这个组件1 -->
+
     <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId" :key="tunnelId"></preview-scene>
     <div class="left">
       <el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"

From 7a2a586d6737847c8cba6f551a38fedc34af6fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Fri, 29 Dec 2023 21:54:56 +0800
Subject: [PATCH 23/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BF=AE=E6=94=B9b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/content/airInfo/AirInfo.vue | 21 ++++++++---------
 src/router/index.js                        |  2 +-
 src/views/edit/edit.vue                    |  4 ++--
 src/views/login/index.vue                  |  4 ++--
 src/views/site/index.vue                   |  6 ++++-
 src/views/tunnel/index.vue                 | 26 ++++++++++------------
 src/views/user/index.vue                   | 13 ++++++-----
 7 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue
index af1d516..fad3f92 100644
--- a/src/components/content/airInfo/AirInfo.vue
+++ b/src/components/content/airInfo/AirInfo.vue
@@ -6,15 +6,16 @@
         <div class="input-fan"><span>风速</span>{{ windSpeed }}m/s</div>
       </div>
     </div>
-    <item-info
-        v-for="item in airList"
-        :key="item.equipmentId"
-        :wp="item"
-        :icon="item.icon"
-        :name="item.name"
-        :unit="item.unit"
-        @click="handleOpenAirChart(item)"
-    />
+      <item-info
+          v-for="item in airList"
+          :key="item.equipmentId"
+          :wp="item"
+          :icon="item.icon"
+          :name="item.name"
+          :unit="item.unit"
+          @click="handleOpenAirChart(item)"
+      />
+
     <div class="digital-tunnel">
       <el-dialog :close-on-click-modal="false" v-model="isWindSpeedVisited" :title="'风速监控数据'" width="2175px" :modal="false">
         <div class="left-top-icon"></div>
@@ -87,7 +88,7 @@ watch(() => props.list, (now) => {
   })
 }, {deep: true});
 watch(() => props.airData, (now) => {
-  if(now.sensorList===null){
+  if(now.sensorList.length===0){
     airList.value=[]
   }else {
     getAirInfo(now.sensorList)
diff --git a/src/router/index.js b/src/router/index.js
index 94a2513..83a28a1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,7 @@ const routes = [
     }
   },
   {
-    path: '/tunnel/:siteId/:type/:userId',
+    path: '/tunnel/:siteId(\\d+)/:type/:userId(\\d+)',
     name: 'tunnel',
     component: () => import('@/views/tunnel-manage/index.vue'),
     meta: {
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index e5438f2..8b1c9f5 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -93,8 +93,8 @@ const handleSave = async () => {
     tunnelName: form.value.tunnelName,
     serialNumber: form.value.serialNumber,
     remarks: form.value.remarks,
-    // constructionLength:form.value.constructionLength,
-    constructionLength: 500,
+    constructionLength:form.value.constructionLength,
+    // constructionLength: 500,
     tunnelLength: form.value.totalLength,
     isDefault: form.value.isDefault,
     modelEquipmentList: await store.getEquipmentList(),
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index aeb283f..3c5eb24 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -46,8 +46,8 @@ const router = useRouter();
 const authStore = useAuthStore();
 const loginForm = reactive({
   // username: "admin",
-  password: "",
-  username: "",
+  password: "123456",
+  username: "admin",
   // password: "",
   code: "",
   uuid: "",
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index 3f7b6b3..997db05 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -169,7 +169,11 @@ const getList = () => {
     ...pageInfo
   }).then((res) => {
     total.value = res.data.total;
-    showAddIcon.value = total.value % 6!==0;
+    if(total.value==0){
+
+    }else {
+      showAddIcon.value = total.value % 6!==0;
+    }
     showFirst.value = total.value / pageInfo.pageSize > 1;
     res.data.rows.map(item => {
       if (item.tunnelList === null || item.tunnelList.length === 0) {
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 08b0161..9735023 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -1,14 +1,12 @@
 <template>
   <div id="main">
     <div class="box-top">
-      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" />
+      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" v-if="showMenu"/>
       <div class="tunnel-title"></div>
       <!--      <manage-length class="tunnel-length"></manage-length>-->
       <div class="top-length">
         <span>隧道总长度: {{ tunnelLength }}米</span>
         <span>当前施工长度: {{ constructionLength }}米</span>
-        <span>隧道总长度: {{ tunnelLength }}米</span>
-        <span>当前施工长度: {{ constructionLength }}米</span>
       </div>
       <div class="top-right">
         <div class="current-site">
@@ -34,7 +32,6 @@
     </div>
     <!-- <tunnel-scene id="tunnel-box" :isedit="false" /> -->
     <!-- 一进去的话应该是预览模式，所以引入这个组件1 -->
-    <!-- 一进去的话应该是预览模式，所以引入这个组件1 -->
 
     <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId" :key="tunnelId"></preview-scene>
     <div class="left">
@@ -88,7 +85,6 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import { getUserInfo } from "@/api/login";
 import { initSceneData } from "@/api/tunnelScene";
 import { getSiteDetail } from "../../api/site";
-import { nextTick, reactive } from "vue";
 
 const authStore = useAuthStore();
 const router = useRouter();
@@ -96,6 +92,7 @@ const selectIndex = ref(-1);
 const showFan = ref(false);
 const drawerLeft = ref(true);
 const drawerRight = ref(true);
+const showMenu = ref(false);
 const currentSiteId = ref(0);
 const currentSite = ref("");
 const siteList = ref([])
@@ -129,12 +126,12 @@ onMounted(() => {
 });
 const getUser = () => {
   getUserInfo().then(res => {
+    showMenu.value=true
     currentUser.value = res.data.user.userName
     currentUserId.value = res.data.user.userId
   })
 }
 const getDefaultSite = (siteId) => {
-  const getDefaultSite = (siteId) => {
     // console.log('siteList.value',siteList.value)
     // getSiteDetail(siteId).then((res) => {
     //   console.log('res',res)
@@ -148,9 +145,6 @@ const getDefaultSite = (siteId) => {
         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[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)
       }
     });
   };
@@ -187,19 +181,19 @@ const getDefaultSite = (siteId) => {
       }
     })
     getScreenInfo(newObj.value)
-    // nextTick(() => {
-    //   showFan.value = true;
-    // });
+    nextTick(() => {
+      showFan.value = true;
+    });
   }
   const manageSelect = (index) => {
     console.log("首页点击-", index);
     if (index == '站点管理') {
       if (currentUserId.value) {
-        router.push("/site" + '/' + currentUserId.value);
+        router.push("/site/" + currentUserId.value);
       }
     } else if (index == '隧道管理') {
       if (currentSiteId.value && currentUserId.value) {
-        router.push("/tunnel/" + currentSiteId.value + '/i' + '/' + currentUserId.value);
+        router.push("/tunnel/" + currentSiteId.value + '/i/' + currentUserId.value);
       }
     } else if (index == '用户管理') {
       if (currentSiteId.value) {
@@ -211,6 +205,10 @@ const getDefaultSite = (siteId) => {
     currentSite.value = item.label
     currentSiteId.value = item.value
     getTunnel(item.value)
+    showFan.value=false
+    nextTick(() => {
+      showFan.value = true;
+    });
   }
   const closeLeft = () => {
     drawerLeft.value = !drawerLeft.value;
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index fbebeb0..bc431aa 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -98,9 +98,9 @@
             <el-radio v-for="item in radioList" :label="item.value" :key="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="选择隧道" v-if="tunnelList.length!==0&&form.roleId>3">
+        <el-form-item label="选择隧道" v-if="form.roleId>3">
           <el-select
-              v-model="form.tunnelIds"
+              v-model="form.tunnelList"
               multiple
               filterable
               clearable
@@ -168,7 +168,7 @@ const form = ref({
   phoneNumber: '',
   state: '1',
   roleId: [],
-  tunnelIds: []
+  tunnelList: [1]
 });
 const formRules = ref({
   userName: [{required: true, message: '请输入用户名', trigger: 'blur'}],
@@ -197,8 +197,10 @@ const handleEditUser = (row) => {
   reset()
   getUserDetail(row.userId).then(res => {
     if (res.code === 1000) {
+      getTunnel()
       form.value = res.data.user
       form.value.roleId = res.data.roleIds[0]
+      form.value.tunnelList = res.data.user.tunnelList
     }
   })
   title.value = '修改用户'
@@ -233,7 +235,7 @@ const reset = () => {
     phoneNumber: '',
     state: '1',
     roleId: [],
-    tunnelIds: []
+    tunnelList: []
   }
 }
 const getRoleOptionInfo = () => {
@@ -272,7 +274,6 @@ const handleCurrentChange = (val) => {
   getInfo()
 }
 const handleSubmit = async (formInstance) => {
-
   if (!formInstance) return;
   formInstance.validate(async (valid) => {
     if (!valid) return;
@@ -284,7 +285,7 @@ const handleSubmit = async (formInstance) => {
       state:form.value.state,
       userName: form.value.userName,
       roleIds: [form.value.roleId],
-      tunnelList: form.value.tunnelIds
+      tunnelList: form.value.tunnelList
     }
     if (title.value === '添加用户') {
       await addUser(data).then(res => {

From 3ce5582ea3dc7e4f5955c6af58992dc56417b8f1 Mon Sep 17 00:00:00 2001
From: trp <2477421791@qq.com>
Date: Fri, 29 Dec 2023 22:06:58 +0800
Subject: [PATCH 24/35] =?UTF-8?q?=E5=94=90=E6=B6=A6=E5=B9=B3=EF=BC=9Atest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/TunnelScene.vue           |  1 -
 .../tunnelScene/editEquComp/editDialog.vue        | 15 ++++-----------
 .../content/tunnelScene/request/index.js          |  4 ++--
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index b0add02..c2f81cc 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -125,7 +125,6 @@ async function handleMounted() {
     demo.initDevicesModel(map);
     // 初始化
     modelList.value = await initData(params.tunnelId, params.form);
-    console.log("init", params.tunnelId);
     demo.editTunnelInit(modelList.value);
   } catch (err) {
     ElMessage({
diff --git a/src/components/content/tunnelScene/editEquComp/editDialog.vue b/src/components/content/tunnelScene/editEquComp/editDialog.vue
index 16434de..3ee40e9 100644
--- a/src/components/content/tunnelScene/editEquComp/editDialog.vue
+++ b/src/components/content/tunnelScene/editEquComp/editDialog.vue
@@ -70,17 +70,7 @@ const pointDistance_str = computed(
   () =>
     `${params.pointGap}米*${params.pointNum}=${(
       params.pointGap * params.pointNum
-    ).toFixed(2)}米`
-);
-
-watch(
-  () => params.form,
-  () => {
-    initData(params.tunnelId, params.form);
-  },
-  {
-    deep: true,
-  }
+    ).toFixed(1)}米`
 );
 
 // 请求数据模型
@@ -106,11 +96,13 @@ function resetEquipmentSetting() {
 // 绑定选择的设备类型
 function handleTypeChange(optionItem) {
   equipmentSetting.equipmentType = optionItem.value;
+  console.log("option", optionItem);
 }
 function handleEquipmentChange(equipmentItem) {
   equipmentSetting.equipmentName = equipmentItem.label;
   equipmentSetting.equipmentId = equipmentItem.equipmentId;
   equipmentSetting.typeKey = equipmentItem.value;
+  console.log("option", equipmentItem);
 }
 // 设备类型选项参数
 let options = reactive([{ label: "暂无数据", value: "" }]);
@@ -180,6 +172,7 @@ function addEquipment() {
     return;
   }
   equipmentSetting.position = params.position;
+  console.log("add", equipmentSetting);
   // 合法请求
   saveEquipment(equipmentSetting, params.pointGap)
     .then((res) => {
diff --git a/src/components/content/tunnelScene/request/index.js b/src/components/content/tunnelScene/request/index.js
index babe138..fd4558f 100644
--- a/src/components/content/tunnelScene/request/index.js
+++ b/src/components/content/tunnelScene/request/index.js
@@ -9,7 +9,6 @@ export const initData = (tunnelId, otherInfo) => {
       .then((res) => {
         originData = toRaw(otherInfo);
         if (res.data.tunnelThreeConfig) {
-          console.log("data", res.data);
           modelEquipmentList = JSON.parse(res.data.tunnelThreeConfig);
         }
         console.log("test", modelEquipmentList, originData);
@@ -107,7 +106,7 @@ export const deleteEquipment = (equipmentId, pointGap) => {
       .then((res) => {
         if (res?.code === 1000) {
           modelEquipmentList = modelEquipmentList.filter(
-            (item) => item.equipmentId === equipmentId
+            (item) => item.equipmentId != equipmentId
           );
           resolve();
         }
@@ -141,5 +140,6 @@ function hasEquipment(equipmentId) {
   modelEquipmentList.forEach((item) => {
     if (item.equipmentId === equipmentId) result = true;
   });
+  console.log("add", modelEquipmentList);
   return result;
 }

From 4433e5c8f41ab889712e6a1ac4003b5e7c1fe7ef Mon Sep 17 00:00:00 2001
From: trp <2477421791@qq.com>
Date: Fri, 29 Dec 2023 22:22:33 +0800
Subject: [PATCH 25/35] =?UTF-8?q?=E5=94=90=E6=B6=A6=E5=B9=B3=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E6=8B=89=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/content/tunnelScene/request/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/content/tunnelScene/request/index.js b/src/components/content/tunnelScene/request/index.js
index babe138..18520ae 100644
--- a/src/components/content/tunnelScene/request/index.js
+++ b/src/components/content/tunnelScene/request/index.js
@@ -106,6 +106,7 @@ export const deleteEquipment = (equipmentId, pointGap) => {
     })
       .then((res) => {
         if (res?.code === 1000) {
+          console.log("删除成功");
           modelEquipmentList = modelEquipmentList.filter(
             (item) => item.equipmentId === equipmentId
           );

From 4430b9c6513894f6cd8ab8954423651759fff621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Fri, 29 Dec 2023 23:42:53 +0800
Subject: [PATCH 26/35] =?UTF-8?q?fix=20:=20=E8=8F=9C=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/manageBtn/index.vue |  25 ++-
 src/views/tunnel/index.vue         | 347 ++++++++++++++++-------------
 2 files changed, 204 insertions(+), 168 deletions(-)

diff --git a/src/components/manageBtn/index.vue b/src/components/manageBtn/index.vue
index 85d1955..08f1ac2 100644
--- a/src/components/manageBtn/index.vue
+++ b/src/components/manageBtn/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="manage-btn">
-    <div v-for="(item,index) in btnList" :key="item.name" class="btn-box" @click="select(item,index)">
+    <div v-for="(item,index) in list" :key="item.name" class="btn-box" @click="select(item,index)">
       <div :style="{ backgroundImage:'url(' +getImageUrl(item.icon)+')' }"></div>
       <div :class="{'select-active':selectButton===index}">{{ item.name }}</div>
     </div>
@@ -18,17 +18,17 @@ const props = defineProps({
     default: []
   },
 })
-watch(() => props.list, (now) => {
-  let newArr=[]
-  btnList.value.forEach((btnList) => {
-    now.forEach((item) => {
-      if (btnList.route==item) {
-        newArr.push(btnList)
-      }
-    })
-  })
-  btnList.value=newArr
-}, {deep: true});
+// watch(() => props.list, (now) => {
+//   let newArr=[]
+//   btnList.value.forEach((btnList) => {
+//     now.forEach((item) => {
+//       if (btnList.route==item) {
+//         newArr.push(btnList)
+//       }
+//     })
+//   })
+//   btnList.value=newArr
+// }, {deep: true});
 const emit = defineEmits(["update:modelValue", "select"]);
 const btnList = ref([
   {
@@ -56,6 +56,7 @@ const btnList = ref([
   //   name: '模拟仿真'
   // },
 ])
+const newList=ref([])
 const selectButton = ref(props.modelValue);
 const getImageUrl = (name) => {
   return new URL(`../../assets/images/topAndDown/${name}`, import.meta.url).href
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 9735023..d3a7f2f 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -16,8 +16,8 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item v-for="item in siteList" :key="item.value" :command="item">{{
-                  item.label
-                }}
+                    item.label
+                  }}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>
@@ -36,21 +36,21 @@
     <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId" :key="tunnelId"></preview-scene>
     <div class="left">
       <el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"
-        :close-on-click-modal="false" :close-on-press-escape="false">
+                 :close-on-click-modal="false" :close-on-press-escape="false">
         <fan-info v-if="showFan" :list="socketData.leftData" :fan-data="largeScreenData"
-          :transducer-data="largeScreenData" />
+                  :transducer-data="largeScreenData"/>
         <!--        <transducer-list v-if="showFan" :list="socketData.leftData" :transducer-data="largeScreenData" />-->
-        <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData" />
+        <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData"/>
       </el-drawer>
       <div v-if="drawerLeft" class="left-arrow" @click="closeLeft"></div>
       <div v-else class="shrink-left" @click="closeLeft"></div>
     </div>
     <div class="right">
       <el-drawer v-model="drawerRight" direction="rtl" modal-class="modal-box" :modal="false" :show-close="false"
-        :close-on-click-modal="false" :close-on-press-escape="false">
-        <wind-pressure-list v-if="showFan" :list="socketData.windPressure" :win-data="largeScreenData" />
-        <air-info v-if="showFan" :list="socketData.sensor" :air-data="largeScreenData" />
-        <bad-gas-info v-if="showFan" :list="socketData.sensor" :bad-gas-data="largeScreenData" :tunnelId="tunnelId" />
+                 :close-on-click-modal="false" :close-on-press-escape="false">
+        <wind-pressure-list v-if="showFan" :list="socketData.windPressure" :win-data="largeScreenData"/>
+        <air-info v-if="showFan" :list="socketData.sensor" :air-data="largeScreenData"/>
+        <bad-gas-info v-if="showFan" :list="socketData.sensor" :bad-gas-data="largeScreenData" :tunnelId="tunnelId"/>
       </el-drawer>
       <div v-if="drawerRight" class="right-arrow" @click="closeRight"></div>
       <div v-else class="shrink-right" @click="closeRight"></div>
@@ -77,14 +77,14 @@ import WindPressureList from "@/components/content/windPressure/WindPressureList
 import AirInfo from "@/components/content/airInfo/AirInfo.vue";
 import BadGasInfo from "@/components/content/badGasInfo/BadGasInfo.vue";
 import ManageBtn from "@/components/manageBtn/index.vue";
-import { dateFormat } from "@/utils/date.js";
-import { getToken } from "@/utils/auth";
-import { useAuthStore } from "@/store/userstore.js";
-import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/largeScreen";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { getUserInfo } from "@/api/login";
-import { initSceneData } from "@/api/tunnelScene";
-import { getSiteDetail } from "../../api/site";
+import {dateFormat} from "@/utils/date.js";
+import {getToken} from "@/utils/auth";
+import {useAuthStore} from "@/store/userstore.js";
+import {getLargeScreen, getLargeScreenInfo, getTunnelBySiteId} from "@/api/largeScreen";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {getUserInfo} from "@/api/login";
+import {initSceneData} from "@/api/tunnelScene";
+import {getSiteDetail} from "../../api/site";
 
 const authStore = useAuthStore();
 const router = useRouter();
@@ -106,6 +106,32 @@ const tunnelLength = ref(0);
 const constructionLength = ref(0);
 const routeList = ref([]);
 let socket = reactive("");
+const btnList = ref([
+  {
+    route: '/site',
+    icon: 'sp_icon_zdgl.png',
+    name: '站点管理'
+  },
+  {
+    route: '/tunnel',
+    icon: 'sp_icon_sdgl.png',
+    name: '隧道管理'
+  },
+  {
+    route: '/user',
+    icon: 'sp_icon_yhgl.png',
+    name: '用户管理'
+  },
+  // {
+  //   route: '/system',
+  //   icon: 'sp_icon_xtgl.png',
+  //   name: '系统管理'
+  // },
+  // {
+  //   icon: 'sp_icon_mngl.png',
+  //   name: '模拟仿真'
+  // },
+])
 const serialNumber = ref("SC00DY00GH00ELBT");
 let token = getToken();
 let send = {
@@ -126,165 +152,174 @@ onMounted(() => {
 });
 const getUser = () => {
   getUserInfo().then(res => {
-    showMenu.value=true
     currentUser.value = res.data.user.userName
     currentUserId.value = res.data.user.userId
   })
 }
 const getDefaultSite = (siteId) => {
-    // console.log('siteList.value',siteList.value)
-    // getSiteDetail(siteId).then((res) => {
-    //   console.log('res',res)
-    // });
-  }
-  const getOtherInfo = () => {
-    getLargeScreenInfo().then((res) => {
+  // console.log('siteList.value',siteList.value)
+  // getSiteDetail(siteId).then((res) => {
+  //   console.log('res',res)
+  // });
+}
+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){
+            routeArr.push(btn)
+          }
+        }
+      })
+      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)
+    }
+  });
+};
+const getScreenInfo = (id) => {
+  if (id) {
+    tunnelId.value = id
+    getLargeScreen(id).then((res) => {
       if (res?.code === 1000) {
-        routeList.value = res.data.routeList
-        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)
+        largeScreenData.value = res.data;
+      } else {
+        ElMessage.warning(res.msg)
       }
     });
+    initSceneData(id).then((res) => {
+      tunnelLength.value = res.data.tunnelLength
+      constructionLength.value = res.data.constructionLength
+    })
+  }
+};
+//根据站点id获取隧道信息
+const getTunnel = (id) => {
+  getTunnelBySiteId(id).then((res) => {
+    if (res?.code === 1000) {
+      tunnelList.value = res.data
+      getScreenInfo(res.data[0]?.value)
+    }
+  });
+}
+const changeTunnel = (e) => {
+  let newObj = {}
+  tunnelList.value.forEach((item, index) => {
+    if (index === e) {
+      newObj = item
+    }
+  })
+  getScreenInfo(newObj.value)
+  nextTick(() => {
+    showFan.value = true;
+  });
+}
+const manageSelect = (index) => {
+  console.log("首页点击-", index);
+  if (index == '站点管理') {
+    if (currentUserId.value) {
+      router.push("/site/" + currentUserId.value);
+    }
+  } else if (index == '隧道管理') {
+    if (currentSiteId.value && currentUserId.value) {
+      router.push("/tunnel/" + currentSiteId.value + '/i/' + currentUserId.value);
+    }
+  } else if (index == '用户管理') {
+    if (currentSiteId.value) {
+      router.push("/user/" + currentSiteId.value);
+    }
+  }
+};
+const handleChangeSite = (item) => {
+  currentSite.value = item.label
+  currentSiteId.value = item.value
+  getTunnel(item.value)
+  showFan.value = false
+  nextTick(() => {
+    showFan.value = true;
+  });
+}
+const closeLeft = () => {
+  drawerLeft.value = !drawerLeft.value;
+};
+const closeRight = () => {
+  drawerRight.value = !drawerRight.value;
+};
+const handleLogout = () => {
+  ElMessageBox.confirm(`确认退出登录吗`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    authStore.userLogout();
+    router.push("/login");
+  })
+};
+const previousBtn = () => {
+  tunnelBtn.value.prev();
+};
+const nextBtn = () => {
+  tunnelBtn.value.next();
+};
+
+const initWebSocket = () => {
+  // let wsUrl = `ws://192.168.31.175:9000/websocket/equipment/${token}/${serialNumber.value}`
+  let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/equipment/${token}/${serialNumber.value}`;
+  console.log(wsUrl);
+  socket = new WebSocket(wsUrl);
+  //连接发生错误的回调方法
+  socket.onerror = function () {
+    console.log("ws连接发生错误");
   };
-  const getScreenInfo = (id) => {
-    if (id) {
-      tunnelId.value = id
-      getLargeScreen(id).then((res) => {
-        if (res?.code === 1000) {
-          largeScreenData.value = res.data;
-        } else {
-          ElMessage.warning(res.msg)
+  //连接成功建立的回调方法
+  socket.onopen = function () {
+    console.log("ws连接成功");
+  };
+  //接收到消息的回调方法
+  socket.onmessage = function (event) {
+    console.log("服务器返回的信息: ", JSON.parse(event.data));
+    const type = JSON.parse(event.data).type;
+    const data = JSON.parse(event.data).data;
+    if (type === "equipment") {
+      data.forEach((item) => {
+        if (item.typeKey === "frequency") {
+          socketData.leftData = data;
+        } else if (item.typeKey === "windPressure") {
+          socketData.windPressure = data;
+        } else if (item.typeKey === "sensor") {
+          socketData.sensor = data;
         }
       });
-      initSceneData(id).then((res) => {
-        tunnelLength.value = res.data.tunnelLength
-        constructionLength.value = res.data.constructionLength
-      })
     }
   };
-  //根据站点id获取隧道信息
-  const getTunnel = (id) => {
-    getTunnelBySiteId(id).then((res) => {
-      if (res?.code === 1000) {
-        tunnelList.value = res.data
-        getScreenInfo(res.data[0]?.value)
-      }
-    });
-  }
-  const changeTunnel = (e) => {
-    let newObj = {}
-    tunnelList.value.forEach((item, index) => {
-      if (index === e) {
-        newObj = item
-      }
-    })
-    getScreenInfo(newObj.value)
-    nextTick(() => {
-      showFan.value = true;
-    });
-  }
-  const manageSelect = (index) => {
-    console.log("首页点击-", index);
-    if (index == '站点管理') {
-      if (currentUserId.value) {
-        router.push("/site/" + currentUserId.value);
-      }
-    } else if (index == '隧道管理') {
-      if (currentSiteId.value && currentUserId.value) {
-        router.push("/tunnel/" + currentSiteId.value + '/i/' + currentUserId.value);
-      }
-    } else if (index == '用户管理') {
-      if (currentSiteId.value) {
-        router.push("/user/" + currentSiteId.value);
-      }
-    }
+  //连接关闭的回调方法
+  socket.onclose = function () {
+    console.log("ws连接关闭");
+    // initWebSocket()
   };
-  const handleChangeSite = (item) => {
-    currentSite.value = item.label
-    currentSiteId.value = item.value
-    getTunnel(item.value)
-    showFan.value=false
-    nextTick(() => {
-      showFan.value = true;
-    });
-  }
-  const closeLeft = () => {
-    drawerLeft.value = !drawerLeft.value;
-  };
-  const closeRight = () => {
-    drawerRight.value = !drawerRight.value;
-  };
-  const handleLogout = () => {
-    ElMessageBox.confirm(`确认退出登录吗`, '系统提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    }).then(() => {
-      authStore.userLogout();
-      router.push("/login");
-    })
-  };
-  const previousBtn = () => {
-    tunnelBtn.value.prev();
-  };
-  const nextBtn = () => {
-    tunnelBtn.value.next();
-  };
-
-  const initWebSocket = () => {
-    // let wsUrl = `ws://192.168.31.175:9000/websocket/equipment/${token}/${serialNumber.value}`
-    let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/equipment/${token}/${serialNumber.value}`;
-    console.log(wsUrl);
-    socket = new WebSocket(wsUrl);
-    //连接发生错误的回调方法
-    socket.onerror = function () {
-      console.log("ws连接发生错误");
-    };
-    //连接成功建立的回调方法
-    socket.onopen = function () {
-      console.log("ws连接成功");
-    };
-    //接收到消息的回调方法
-    socket.onmessage = function (event) {
-      console.log("服务器返回的信息: ", JSON.parse(event.data));
-      const type = JSON.parse(event.data).type;
-      const data = JSON.parse(event.data).data;
-      if (type === "equipment") {
-        data.forEach((item) => {
-          if (item.typeKey === "frequency") {
-            socketData.leftData = data;
-          } else if (item.typeKey === "windPressure") {
-            socketData.windPressure = data;
-          } else if (item.typeKey === "sensor") {
-            socketData.sensor = data;
-          }
-        });
-      }
-    };
-    //连接关闭的回调方法
-    socket.onclose = function () {
-      console.log("ws连接关闭");
-      // initWebSocket()
-    };
-    setInterval(() => {
-      socket.send(JSON.stringify(send));
-    }, 30000);
-  };
-  const closeSocket = () => {
-    socket.close();
-  };
-  initWebSocket();
+  setInterval(() => {
+    socket.send(JSON.stringify(send));
+  }, 30000);
+};
+const closeSocket = () => {
+  socket.close();
+};
+initWebSocket();
 
 
-  watch(
+watch(
     () => tunnelId.value,
     (now) => {
       tunnelId.value = now
     },
-    { deep: true }
-  )
+    {deep: true}
+)
 </script>
 <style lang="scss">
 .el-dropdown__popper.el-popper {

From 5ac68dca371ce8c80818002c939ecfa4598d9d0c Mon Sep 17 00:00:00 2001
From: trp <2477421791@qq.com>
Date: Sat, 30 Dec 2023 13:23:30 +0800
Subject: [PATCH 27/35] =?UTF-8?q?=E5=94=90=E6=B6=A6=E5=B9=B3=EF=BC=9A?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E7=BC=96=E8=BE=91=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/TunnelScene.vue       |  18 ++-
 .../tunnelScene/editEquComp/editDialog.vue    |  62 ++++----
 .../content/tunnelScene/request/index.js      |  71 ++++-----
 src/store/modelSceneStore.js                  | 143 +++++++++++++-----
 src/views/edit/edit.vue                       |   4 +-
 5 files changed, 185 insertions(+), 113 deletions(-)

diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index c2f81cc..e1cdc5b 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -64,10 +64,10 @@ import {
 
 import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader";
 import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
-import { onMounted, reactive, ref, watch } from "vue";
+import { onMounted, reactive, ref, toRaw, watch } from "vue";
 import { ElMessage } from "element-plus";
 import { deleteEquipment, initData } from "./request";
-
+import { useModelSceneStore } from "@/store/modelSceneStore";
 // 获取html标签跟随组件dom
 const content = ref(null);
 const info = ref(null);
@@ -77,7 +77,7 @@ let demo; //定义demo对象
 const loader = new OBJLoader();
 let hdrLoader = new RGBELoader();
 let backColorSet = three.sRGBEncoding;
-
+const modelStore = useModelSceneStore();
 const params = defineProps(["isedit", "tunnelId", "tunnelLength", "form"]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
 
 let isedit = ref(params.isedit);
@@ -123,8 +123,13 @@ async function handleMounted() {
     map.set("equ_fan", await loadModel("/devicesModel/model2.obj"));
     map.set("equ_sensors", await loadModel("/devicesModel/sensors.obj"));
     demo.initDevicesModel(map);
-    // 初始化
-    modelList.value = await initData(params.tunnelId, params.form);
+    // 初始化渲染设备
+    modelList.value = await modelStore.initModelData(
+      params.tunnelId,
+      params.form
+    );
+    // modelList.value = await initData(params.tunnelId, params.form);
+    console.log("test", modelList.value);
     demo.editTunnelInit(modelList.value);
   } catch (err) {
     ElMessage({
@@ -228,7 +233,8 @@ function handleRemoveEqu() {
 // 对话框确认删除
 function handleConfirmAddEqu() {
   console.log("target:", targetP.value.info);
-  deleteEquipment(targetP.value.info.equipmentId, pointGap)
+  modelStore
+    .deleteEquipment(targetP.value.info.equipmentId, pointGap)
     .then((res) => {
       demo.removeEquipment(targetP.value);
       centerDialogVisible.value = false;
diff --git a/src/components/content/tunnelScene/editEquComp/editDialog.vue b/src/components/content/tunnelScene/editEquComp/editDialog.vue
index 3ee40e9..3602d52 100644
--- a/src/components/content/tunnelScene/editEquComp/editDialog.vue
+++ b/src/components/content/tunnelScene/editEquComp/editDialog.vue
@@ -47,9 +47,18 @@
 import InputNum from "./childComps/InputNum.vue";
 import SelectInput from "./childComps/SelectInput.vue";
 import { getEquipmentType, getEquipment } from "@/api/tunnelScene";
-import { reactive, computed, defineEmits, defineProps, watch, ref } from "vue";
+import {
+  reactive,
+  computed,
+  defineEmits,
+  defineProps,
+  watch,
+  ref,
+  toRaw,
+} from "vue";
 import { ElMessage } from "element-plus";
-import { saveEquipment, initData } from "../request";
+import { useModelSceneStore } from "@/store/modelSceneStore";
+
 const emit = defineEmits(["cancel", "removeEquipment", "addEquipment"]);
 const params = defineProps([
   "pointNum",
@@ -63,18 +72,17 @@ const params = defineProps([
 let p = ref(57);
 const equipment = ref(null);
 const equipmentType = ref(null);
-
-let maxConstructionLength = ref(0);
+const modelStore = useModelSceneStore();
 //计算锚点之间距离
 const pointDistance_str = computed(
   () =>
-    `${params.pointGap}米*${params.pointNum}=${(
-      params.pointGap * params.pointNum
-    ).toFixed(1)}米`
+    `${parseInt(params.pointGap)}米*${params.pointNum}=${
+      parseInt(params.pointGap) * params.pointNum
+    }米`
 );
 
 // 请求数据模型
-const equipmentSetting = reactive({
+const equipmentSetting = ref({
   equipmentId: null,
   equipmentName: "",
   equipmentType: "", //设备类型
@@ -83,26 +91,24 @@ const equipmentSetting = reactive({
   typeKey: null, //设备选择(设备名称)
 });
 function resetEquipmentSetting() {
-  equipmentSetting.equipmentId = null;
-  equipmentSetting.equipmentName = "";
-  equipmentSetting.equipmentType = "";
-  equipmentSetting.position = "";
-  equipmentSetting.threshold = "";
-  equipmentSetting.typeKey = null;
+  equipmentSetting.value.equipmentId = null;
+  equipmentSetting.value.equipmentName = "";
+  equipmentSetting.value.equipmentType = "";
+  equipmentSetting.value.position = "";
+  equipmentSetting.value.threshold = "";
+  equipmentSetting.value.typeKey = null;
   equipment.value.reset();
   equipmentType.value.reset();
 }
 
 // 绑定选择的设备类型
 function handleTypeChange(optionItem) {
-  equipmentSetting.equipmentType = optionItem.value;
-  console.log("option", optionItem);
+  equipmentSetting.value.equipmentType = optionItem.value;
 }
 function handleEquipmentChange(equipmentItem) {
-  equipmentSetting.equipmentName = equipmentItem.label;
-  equipmentSetting.equipmentId = equipmentItem.equipmentId;
-  equipmentSetting.typeKey = equipmentItem.value;
-  console.log("option", equipmentItem);
+  equipmentSetting.value.equipmentName = equipmentItem.label;
+  equipmentSetting.value.equipmentId = equipmentItem.equipmentId;
+  equipmentSetting.value.typeKey = equipmentItem.value;
 }
 // 设备类型选项参数
 let options = reactive([{ label: "暂无数据", value: "" }]);
@@ -112,7 +118,7 @@ let options2 = reactive([{ equipmentId: 0, label: "暂无数据", value: "" }]);
 
 // 模拟生成option2
 watch(
-  () => equipmentSetting.equipmentType,
+  () => equipmentSetting.value.equipmentType,
   (newVal) => {
     console.log(params.tunnelId, newVal);
     equipment.value.reset();
@@ -164,19 +170,23 @@ function addEquipment() {
     });
     return;
   }
-  if (!equipmentSetting.equipmentType || !equipmentSetting.equipmentId) {
+  if (
+    !equipmentSetting.value.equipmentType ||
+    !equipmentSetting.value.equipmentId
+  ) {
     ElMessage({
       message: "选项不能为空！",
       type: "warning",
     });
     return;
   }
-  equipmentSetting.position = params.position;
-  console.log("add", equipmentSetting);
+  equipmentSetting.value.position = params.position;
+  console.log("add-", toRaw(equipmentSetting.value));
   // 合法请求
-  saveEquipment(equipmentSetting, params.pointGap)
+  modelStore
+    .addEquipment({ ...toRaw(equipmentSetting.value) }, params.pointGap)
     .then((res) => {
-      emit("addEquipment", equipmentSetting);
+      emit("addEquipment", equipmentSetting.value);
       ElMessage({
         message: "添加成功！",
         type: "success",
diff --git a/src/components/content/tunnelScene/request/index.js b/src/components/content/tunnelScene/request/index.js
index fd4558f..581c94f 100644
--- a/src/components/content/tunnelScene/request/index.js
+++ b/src/components/content/tunnelScene/request/index.js
@@ -1,21 +1,21 @@
 import { apiSaveEquipment, initSceneData } from "@/api/tunnelScene";
 import { toRaw } from "vue";
 let modelEquipmentList = [];
-let originData = null;
+
 // 初始化当前隧道数据并保存在本地
 export const initData = (tunnelId, otherInfo) => {
+  modelEquipmentList = [];
   return new Promise((resolve, reject) => {
     initSceneData(tunnelId)
       .then((res) => {
-        originData = toRaw(otherInfo);
         if (res.data.tunnelThreeConfig) {
           modelEquipmentList = JSON.parse(res.data.tunnelThreeConfig);
+          resolve(modelEquipmentList);
         }
-        console.log("test", modelEquipmentList, originData);
-        resolve(modelEquipmentList);
+        originData = toRaw(otherInfo);
       })
       .catch((Error) => {
-        ElMessage.error("场景初始化异常！");
+        ElMessage.error("设备初始化异常！");
         reject();
       });
   });
@@ -34,35 +34,31 @@ export const saveEquipment = (equipmentInfo, pointGap) => {
     tunnelName,
   } = originData;
   let tempModelEquipmentList = [...modelEquipmentList]; //数组克隆
-  tempModelEquipmentList.push(toRaw(equipmentInfo));
+  const obj = toRaw(equipmentInfo);
+  tempModelEquipmentList.push(obj);
   return new Promise((resolve, reject) => {
-    console.log("equId", equipmentInfo.equipmentId);
-    hasEquipment(equipmentInfo.equipmentId)
-      ? reject(3000)
-      : apiSaveEquipment({
-          constructionLength: autoComputeConstructionLength(
-            tempModelEquipmentList,
-            pointGap
-          ),
-          isDefault,
-          modelEquipmentList: tempModelEquipmentList,
-          remarks,
-          serialNumber,
-          tunnelId,
-          tunnelLength: totalLength,
-          tunnelName,
-        })
-          .then((res) => {
-            if (res?.code === 1000) {
-              modelEquipmentList.push(toRaw(equipmentInfo)); //存入本地
-              resolve();
-            }
-            console.log("add", res);
-            reject(res);
-          })
-          .catch((err) => {
-            reject();
-          });
+    apiSaveEquipment({
+      constructionLength: autoComputeConstructionLength(
+        tempModelEquipmentList,
+        pointGap
+      ),
+      isDefault,
+      modelEquipmentList: tempModelEquipmentList,
+      remarks,
+      serialNumber,
+      tunnelId,
+      tunnelLength: totalLength,
+      tunnelName,
+    })
+      .then((res) => {
+        if (res?.code === 1000) {
+          modelEquipmentList = [...tempModelEquipmentList]; //存入本地
+          resolve();
+        }
+      })
+      .catch((err) => {
+        reject();
+      });
   });
 };
 
@@ -134,12 +130,3 @@ function autoComputeConstructionLength(modelEquipmentList, pointGap) {
   });
   return maxLength;
 }
-
-function hasEquipment(equipmentId) {
-  let result = false;
-  modelEquipmentList.forEach((item) => {
-    if (item.equipmentId === equipmentId) result = true;
-  });
-  console.log("add", modelEquipmentList);
-  return result;
-}
diff --git a/src/store/modelSceneStore.js b/src/store/modelSceneStore.js
index 60178a4..98f3a94 100644
--- a/src/store/modelSceneStore.js
+++ b/src/store/modelSceneStore.js
@@ -1,53 +1,122 @@
 import { defineStore } from "pinia";
-import { ref } from "vue";
-import { saveEquipment, initSceneData } from "../api/tunnelScene";
-import { ElMessage } from "element-plus";
+import { ref, toRaw } from "vue";
+import { apiSaveEquipment, initSceneData } from "../api/tunnelScene";
+
 export const useModelSceneStore = defineStore("modelSceneData", () => {
   let equipmentList = ref([]);
-  let allEditList = ref({});
-  function initData(tunnelId = 1) {
-    initSceneData(tunnelId)
-      .then((res) => {
-        // equipmentList.value = res.data.tunnelThreeConfig;
-        console.log("初始化的数据");
-      })
-      .catch((Error) => {
-        ElMessage.error("场景初始化异常！");
-      });
-  }
-  //默认初始化1号隧道
-  function saveSceneData(data) {
-    equipmentList.value.push(data);
+  let requestOtherConfig = ref({});
 
-    return saveEquipment(constructionLength, tunnelId, equipmentList.value);
-  }
-  //   删除设备
-  function deleteEquipment(constructionLength, tunnelId, EquipmentId) {
-    let temp = JSON.parse(equipmentList.value);
-    temp = temp.filter(
-      (item) => item.chooseEquipment.equipmentId != EquipmentId
-    );
-    equipmentList.value = JSON.stringify(temp);
-    return saveEquipment(constructionLength, tunnelId, equipmentList.value);
-  }
-  function getEquipmentList(tunnelId = 1) {
+  function initModelData(tunnelId, otherConfig) {
     return new Promise((resolve, reject) => {
+      handleSettingOtherConfig(otherConfig, requestOtherConfig);
       initSceneData(tunnelId)
         .then((res) => {
-          equipmentList.value = res.data.tunnelThreeConfig;
-          resolve(JSON.parse(equipmentList.value));
+          if (res.data.tunnelThreeConfig) {
+            equipmentList.value = JSON.parse(res.data.tunnelThreeConfig);
+          } else {
+            equipmentList.value = [];
+          }
+
+          resolve(toRaw(equipmentList.value));
         })
-        .catch((Error) => {
-          // ElMessage.error("场景初始化异常！");
+        .catch((error) => {
           reject();
         });
     });
   }
+
+  function addEquipment(equipmentInfo, pointGap) {
+    return new Promise((resolve, reject) => {
+      if (hasEquipment(equipmentList.value, equipmentInfo.equipmentId)) {
+        reject(3000);
+        return;
+      }
+      equipmentList.value.push(equipmentInfo);
+      apiSaveEquipment({
+        constructionLength: autoComputeConstructionLength(
+          equipmentList.value,
+          pointGap
+        ),
+        modelEquipmentList: toRaw(equipmentList.value),
+        ...requestOtherConfig,
+      })
+        .then((res) => {
+          console.log("res", res);
+          resolve();
+        })
+        .catch((err) => {
+          console.log("res", err);
+          equipmentList.value.pop();
+          reject();
+        });
+    });
+  }
+  //   删除设备
+  function deleteEquipment(equipmentId, pointGap) {
+    let equipment = null;
+    equipmentList.value = equipmentList.value.filter((item) => {
+      if (item.equipmentId === equipmentId) {
+        equipment = item;
+      }
+      return item.equipmentId != equipmentId;
+    });
+
+    return new Promise((resolve, reject) => {
+      apiSaveEquipment({
+        constructionLength: autoComputeConstructionLength(
+          equipmentList.value,
+          pointGap
+        ),
+        modelEquipmentList: toRaw(equipmentList.value),
+        ...requestOtherConfig,
+      })
+        .then((res) => {
+          resolve();
+        })
+        .catch((err) => {
+          equipmentList.value.push(equipment);
+          reject();
+        });
+    });
+  }
+
   return {
-    equipmentList,
-    initData,
-    saveSceneData,
+    initModelData,
+    addEquipment,
     deleteEquipment,
-    getEquipmentList,
   };
 });
+
+function handleSettingOtherConfig(otherConfig, requestOtherConfig) {
+  requestOtherConfig.isDefault = otherConfig.isDefault;
+  requestOtherConfig.remarks = otherConfig.remarks;
+  requestOtherConfig.serialNumber = otherConfig.serialNumber;
+  requestOtherConfig.tunnelId = otherConfig.tunnelId;
+  requestOtherConfig.tunnelLength = otherConfig.totalLength;
+  requestOtherConfig.tunnelName = otherConfig.tunnelName;
+}
+
+function autoComputeConstructionLength(modelEquipmentList, pointGap) {
+  let maxLength = 0;
+  modelEquipmentList.forEach((item) => {
+    const length =
+      Number(
+        item.position.substring(
+          item.position.indexOf("_") + 1,
+          item.position.lastIndexOf("_")
+        ) - 1
+      ) * pointGap;
+    if (length > maxLength) {
+      maxLength = length;
+    }
+  });
+  return maxLength;
+}
+
+function hasEquipment(equipmentList, equipmentId) {
+  let result = false;
+  equipmentList.forEach((item) => {
+    if (item.equipmentId === equipmentId) result = true;
+  });
+  return result;
+}
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index e5438f2..2d02bf8 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -60,7 +60,7 @@ 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 modelStore = useModelSceneStore();
 const form = ref({
   tunnelName: "",
   serialNumber: "",
@@ -70,7 +70,7 @@ const form = ref({
 });
 const equipmentList = ref([]);
 onMounted(async () => {
-  equipmentList.value = await store.getEquipmentList();
+  // equipmentList.value = await store.getEquipmentList();
 });
 const getTunnel = () => {
   getTunnelDetail(tunnelId).then((res) => {

From 1d73f0f8b8264be16c5d6a5b5d466f88a832a78b Mon Sep 17 00:00:00 2001
From: trp <2477421791@qq.com>
Date: Sat, 30 Dec 2023 13:37:27 +0800
Subject: [PATCH 28/35] =?UTF-8?q?=E5=94=90=E6=B6=A6=E5=B9=B3=EF=BC=9A?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E7=BC=96=E8=BE=91=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?bug(=E5=90=88=E5=B9=B6=E5=90=8E)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/TunnelScene.vue       |   7 +-
 .../content/tunnelScene/request/index.js      | 133 ------------------
 .../sceneClass/editEquipment/index.js         |  20 +--
 3 files changed, 14 insertions(+), 146 deletions(-)
 delete mode 100644 src/components/content/tunnelScene/request/index.js

diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index e1cdc5b..5387c3d 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -66,7 +66,7 @@ import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader";
 import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
 import { onMounted, reactive, ref, toRaw, watch } from "vue";
 import { ElMessage } from "element-plus";
-import { deleteEquipment, initData } from "./request";
+
 import { useModelSceneStore } from "@/store/modelSceneStore";
 // 获取html标签跟随组件dom
 const content = ref(null);
@@ -130,10 +130,11 @@ async function handleMounted() {
     );
     // modelList.value = await initData(params.tunnelId, params.form);
     console.log("test", modelList.value);
-    demo.editTunnelInit(modelList.value);
+    demo.editTunnelInit(toRaw(modelList.value));
   } catch (err) {
+    console.log(err);
     ElMessage({
-      message: "场景初始化异常！",
+      message: "场景初始化异常---！",
       type: "warning",
     });
   }
diff --git a/src/components/content/tunnelScene/request/index.js b/src/components/content/tunnelScene/request/index.js
deleted file mode 100644
index 04a93c2..0000000
--- a/src/components/content/tunnelScene/request/index.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import { apiSaveEquipment, initSceneData } from "@/api/tunnelScene";
-import { toRaw } from "vue";
-let modelEquipmentList = [];
-
-// 初始化当前隧道数据并保存在本地
-export const initData = (tunnelId, otherInfo) => {
-  modelEquipmentList = [];
-  return new Promise((resolve, reject) => {
-    initSceneData(tunnelId)
-      .then((res) => {
-        if (res.data.tunnelThreeConfig) {
-          modelEquipmentList = JSON.parse(res.data.tunnelThreeConfig);
-          resolve(modelEquipmentList);
-        }
-        originData = toRaw(otherInfo);
-      })
-      .catch((Error) => {
-        ElMessage.error("设备初始化异常！");
-        reject();
-      });
-  });
-};
-
-//保存数据并提交
-export const saveEquipment = (equipmentInfo, pointGap) => {
-  const {
-    constructionLength,
-    isDefault,
-    remarks,
-    serialNumber,
-    siteId,
-    totalLength,
-    tunnelId,
-    tunnelName,
-  } = originData;
-  let tempModelEquipmentList = [...modelEquipmentList]; //数组克隆
-  const obj = toRaw(equipmentInfo);
-  tempModelEquipmentList.push(obj);
-  return new Promise((resolve, reject) => {
-    apiSaveEquipment({
-      constructionLength: autoComputeConstructionLength(
-        tempModelEquipmentList,
-        pointGap
-      ),
-      isDefault,
-      modelEquipmentList: tempModelEquipmentList,
-      remarks,
-      serialNumber,
-      tunnelId,
-      tunnelLength: totalLength,
-      tunnelName,
-    })
-      .then((res) => {
-        if (res?.code === 1000) {
-          modelEquipmentList = [...tempModelEquipmentList]; //存入本地
-          resolve();
-        }
-      })
-      .catch((err) => {
-        reject();
-      });
-  });
-};
-
-// 删除
-export const deleteEquipment = (equipmentId, pointGap) => {
-  let tempModelEquipmentList = [...modelEquipmentList]; //数组克隆
-  tempModelEquipmentList = tempModelEquipmentList.filter(
-    (item) => item.equipmentId != equipmentId
-  );
-  console.log(
-    "del",
-    modelEquipmentList,
-    tempModelEquipmentList,
-    "id",
-    equipmentId
-  );
-  const {
-    constructionLength,
-    isDefault,
-    remarks,
-    serialNumber,
-    siteId,
-    totalLength,
-    tunnelId,
-    tunnelName,
-  } = originData;
-  return new Promise((resolve, reject) => {
-    apiSaveEquipment({
-      constructionLength: autoComputeConstructionLength(
-        tempModelEquipmentList,
-        pointGap
-      ),
-      isDefault,
-      modelEquipmentList: tempModelEquipmentList,
-      remarks,
-      serialNumber,
-      tunnelId,
-      tunnelLength: totalLength,
-      tunnelName,
-    })
-      .then((res) => {
-        if (res?.code === 1000) {
-          console.log("删除成功");
-          modelEquipmentList = modelEquipmentList.filter(
-            (item) => item.equipmentId != equipmentId
-          );
-          resolve();
-        }
-        reject(res);
-      })
-      .catch((err) => {
-        reject();
-      });
-  });
-};
-
-function autoComputeConstructionLength(modelEquipmentList, pointGap) {
-  let maxLength = 0;
-  modelEquipmentList.forEach((item) => {
-    const length =
-      Number(
-        item.position.substring(
-          item.position.indexOf("_") + 1,
-          item.position.lastIndexOf("_")
-        ) - 1
-      ) * pointGap;
-    if (length > maxLength) {
-      maxLength = length;
-    }
-  });
-  return maxLength;
-}
diff --git a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
index 070fdfe..5d5b827 100644
--- a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
+++ b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
@@ -12,7 +12,7 @@ function addEquipment(targetPoint, formInfo) {
   if (targetPoint.hasDevice) {
     return;
   }
-  console.log("info", formInfo);
+
   switch (formInfo.equipmentType) {
     case "frequency":
       handleFanEqu.call(this, targetPoint, formInfo);
@@ -36,7 +36,7 @@ function addEquipment(targetPoint, formInfo) {
 // function handleValveEqu(targetPoint, equipmentInfo) {
 
 // }
-let allline = new Array
+// let allline = new Array();
 // 其他传感器
 function handleOtherEqu(targetPoint, equipmentInfo) {
   const equMesh = this.equMap.get("equ_sensors").clone();
@@ -69,14 +69,14 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
   targetPoint.visible = false;
   targetPoint.hasWall = true;
   //处理风压阀的代码片段
-  let lineIndex = targetPoint.name.slice(7, 9)
-  if (allline.includes(Number(lineIndex))) {
-    allline.slice(array.indexOf(lineIndex), 1)
-    console.log('dadad');
-  } else {
-    allline.push(Number(lineIndex))
-  }
-  console.log(allline);
+  // let lineIndex = targetPoint.name.slice(7, 9);
+  // if (allline.includes(Number(lineIndex))) {
+  //   allline.slice(array.indexOf(lineIndex), 1);
+  //   console.log("dadad");
+  // } else {
+  //   allline.push(Number(lineIndex));
+  // }
+  // console.log(allline);
   // console.log(allline);
   // allline.forEach((item, index, array) => {
   //   if (array.includes(item)) {

From d0c2648a2e3721facd87ec6f99710e7b8a889fd0 Mon Sep 17 00:00:00 2001
From: Hcat <2768237203@qq.com>
Date: Sat, 30 Dec 2023 14:37:58 +0800
Subject: [PATCH 29/35] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/content/tunnelScene/PreviewScene.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/content/tunnelScene/PreviewScene.vue b/src/components/content/tunnelScene/PreviewScene.vue
index 7435789..274264f 100644
--- a/src/components/content/tunnelScene/PreviewScene.vue
+++ b/src/components/content/tunnelScene/PreviewScene.vue
@@ -49,7 +49,7 @@ import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader";
 import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
 import { onMounted, reactive, ref, toRaw, getCurrentInstance } from "vue";
 import { ElMessage } from "element-plus";
-import { deleteEquipment, initData } from "./request";
+// import { deleteEquipment, initData } from "./request";
 // 获取html标签跟随组件dom
 const content = ref(null);
 const info = ref(null);

From 0e949a65b82ad98fbe12100e137a444377e56b86 Mon Sep 17 00:00:00 2001
From: Hcat <2768237203@qq.com>
Date: Sat, 30 Dec 2023 16:39:48 +0800
Subject: [PATCH 30/35] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/PreviewScene.vue      | 110 +++++++++++-------
 .../sceneClass/previewTunnelInit/index.js     |   2 +
 src/store/modelSceneStore.js                  |  24 ++++
 src/views/edit/edit.vue                       |  21 +---
 src/views/tunnel/index.vue                    |  72 +++++++-----
 5 files changed, 147 insertions(+), 82 deletions(-)

diff --git a/src/components/content/tunnelScene/PreviewScene.vue b/src/components/content/tunnelScene/PreviewScene.vue
index 274264f..7023ebe 100644
--- a/src/components/content/tunnelScene/PreviewScene.vue
+++ b/src/components/content/tunnelScene/PreviewScene.vue
@@ -49,7 +49,9 @@ import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader";
 import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
 import { onMounted, reactive, ref, toRaw, getCurrentInstance } from "vue";
 import { ElMessage } from "element-plus";
-// import { deleteEquipment, initData } from "./request";
+import { editTunnel, getTunnelDetail } from "@/api/tunnelManage";
+
+import { useModelSceneStore } from "@/store/modelSceneStore";
 // 获取html标签跟随组件dom
 const content = ref(null);
 const info = ref(null);
@@ -60,23 +62,40 @@ let demo; //定义demo全局变量
 const loader = new OBJLoader();
 let hdrLoader = new RGBELoader();
 let backColorSet = three.sRGBEncoding;
-
+const modelStore = useModelSceneStore();
 const params = defineProps(["isedit", "tunnelId"]); //接收参数看是不是编辑模式，如果是编辑模式，则需要做一些处理
 
 
 
 let isedit = ref(params.isedit)
+// const form = ref({
+//     tunnelName: "",
+//     serialNumber: "",
+//     totalLength: "",
+//     isDefault: false,
+//     remarks: "",
+// });
+
+// const getTunnelPreview = () => {
+//     getTunnelDetail(params.tunnelId).then((res) => {
+//         if (res?.code === 1000) {
+//             form.value = res.data;
+//         }
+//     });
+// };
 
 
-// watch(
-//     () => params.tunnelId,
-//     (now) => {
-//         params.tunnelId = now
-//         console.log(params.tunnelId);
 
-//     },
-//     { deep: true }
-// )
+watch(
+    () => params.tunnelId,
+    (now) => {
+        params.tunnelId = now
+        console.log(params.tunnelId);
+        // getTunnelPreview();
+        // console.log(form.value);
+    },
+    { deep: true }
+)
 
 onMounted(handleMounted);
 // 挂载后回调
@@ -95,12 +114,13 @@ async function handleMounted() {
 
     //加载HDR背景图片
     demo.loadBackground(hdrLoader, backColorSet);
-    watch(
-        () => params.tunnelId,
-        async () => {
-            const text = await initData(params.tunnelId);
-        }
-    );
+    //先不加试试？？？
+    // watch(
+    //     () => params.tunnelId,
+    //     async () => {
+    //         const text = await initData(params.tunnelId);
+    //     }
+    // );
     // 初始化设备模型
     try {
         //在这加载隧道
@@ -110,36 +130,44 @@ async function handleMounted() {
         // 给对象初加载设备模型
         demo.initDevicesModel(map);
         // const equipmentList = await store.getEquipmentList();
-        modelList.value = await initData(params.tunnelId);
+        modelList.value = await modelStore.initModelDataPreview(params.tunnelId);
         // console.log("init", params.tunnelId);
-        demo.previewtunnelModeInit(modelList.value);
-        watch(
-            () => params.tunnelId,
-            (now) => {
-                params.tunnelId = now
-                // console.log(params.tunnelId);
-                checkTunnelInit(modelList.value)
-                demo.previewtunnelModeInit(modelList.value);
-            },
-            { deep: true }
-        )
+        demo.previewtunnelModeInit(toRaw(modelList.value));
+        // watch(
+        //     () => params.tunnelId,
+        //     (now) => {
+        //         params.tunnelId = now
+        //         // console.log(params.tunnelId);
+        //         checkTunnelInit(modelList.value)
+        //         demo.previewtunnelModeInit(modelList.value);
+        //     },
+        //     { deep: true }
+        // )
         // demo.previewtunnelModeInit(equipmentList);
         // previewEquInfProcess(modelList.value, targetP.value)
     } catch (err) {
-        console.log(err);
+        if (err == undefined) {
+            return
+        } else {
+            console.log(err);
+            ElMessage({
+                message: "场景初始化异常---！",
+                type: "warning",
+            });
+        }
     }
 }
 
 
-function checkTunnelInit(equipmentList) {
-    equipmentList.forEach((item) => {
-        let equipment = toRaw(item)
-        console.log("我要清理掉之前的设备！！！");
-        console.log(equipment);
-        console.log(demo.scene.getObjectByName(equipment.position));
-        demo.removeEquipment(demo.scene.getObjectByName(equipment.position));
-    });
-}
+// function checkTunnelInit(equipmentList) {
+//     equipmentList.forEach((item) => {
+//         let equipment = toRaw(item)
+//         console.log("我要清理掉之前的设备！！！");
+//         console.log(equipment);
+//         console.log(demo.scene.getObjectByName(equipment.position));
+//         demo.removeEquipment(demo.scene.getObjectByName(equipment.position));
+//     });
+// }
 
 // 每个模型加载回调
 function loadModel(path) {
@@ -202,7 +230,8 @@ function rClickCallback(demo) {
     function editDev(targetPoint = null) {
         hasDevice.value = targetPoint.hasDevice;
         targetP.value = targetPoint;
-        const equipmentList = initData(params.tunnelId)
+        //这里是初始化必经之路！！！
+        const equipmentList = modelStore.initModelDataPreview(params.tunnelId)
         equipmentList.then((result) => {
             previewEquInfProcess(result, targetP.value)
         })
@@ -238,7 +267,8 @@ function handleRemoveEqu() {
 // 对话框确认删除
 function handleConfirmAddEqu() {
     console.log("target:", targetP.value.info);
-    deleteEquipment(targetP.value.info.equipmentId, pointGap)
+    modelStore
+        .deleteEquipment(targetP.value.info.equipmentId, pointGap)
         .then((res) => {
             demo.removeEquipment(targetP.value);
             centerDialogVisible.value = false;
diff --git a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
index 8ea6300..7103d7d 100644
--- a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
+++ b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js
@@ -10,6 +10,8 @@ export default function previewtunnelModeInit(equipmentList) {
     //         this.scene.getObjectByName(wall).visible = false
     //     }
     // }
+    console.log(equipmentList);
+
     equipmentList.forEach((item) => {
         this.addEquipment(this.scene.getObjectByName(item.position), item);
     });
diff --git a/src/store/modelSceneStore.js b/src/store/modelSceneStore.js
index 98f3a94..5420cd3 100644
--- a/src/store/modelSceneStore.js
+++ b/src/store/modelSceneStore.js
@@ -25,6 +25,29 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
     });
   }
 
+  function initModelDataPreview(tunnelId) {
+    if (tunnelId == 0) {
+      return new Promise((resolve, reject) => {
+        reject()
+      })
+    } else {
+      return new Promise((resolve, reject) => {
+        initSceneData(tunnelId)
+          .then((res) => {
+            if (res.data.tunnelThreeConfig) {
+              equipmentList.value = JSON.parse(res.data.tunnelThreeConfig);
+            } else {
+              equipmentList.value = [];
+            }
+            resolve(toRaw(equipmentList.value));
+          })
+          .catch((error) => {
+            reject();
+          });
+      });
+    }
+  }
+
   function addEquipment(equipmentInfo, pointGap) {
     return new Promise((resolve, reject) => {
       if (hasEquipment(equipmentList.value, equipmentInfo.equipmentId)) {
@@ -84,6 +107,7 @@ export const useModelSceneStore = defineStore("modelSceneData", () => {
     initModelData,
     addEquipment,
     deleteEquipment,
+    initModelDataPreview
   };
 });
 
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 18b311c..5b5c833 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -20,11 +20,7 @@
           <el-input v-model="form.serialNumber" placeholder="请输入序列号" />
         </el-form-item>
         <el-form-item label="隧道长度">
-          <el-input
-            type="number"
-            v-model="form.totalLength"
-            placeholder="请输入隧道长度"
-          />
+          <el-input type="number" v-model="form.totalLength" placeholder="请输入隧道长度" />
         </el-form-item>
         <el-form-item label="是否默认">
           <el-radio-group v-model="form.isDefault">
@@ -39,14 +35,8 @@
     </div>
 
     <!-- 这里就导入正常的编辑模式，就是我们之前写的部分 -->
-    <tunnel-scene
-      id="tunnel-box"
-      :isedit="true"
-      :tunnelId="tunnelId"
-      :form="form"
-      ref="tunnelScene"
-      :tunnelLength="tunnelLength"
-    />
+    <tunnel-scene id="tunnel-box" :isedit="true" :tunnelId="tunnelId" :form="form" ref="tunnelScene"
+      :tunnelLength="tunnelLength" />
   </div>
 </template>
 <script setup>
@@ -93,11 +83,11 @@ const handleSave = async () => {
     tunnelName: form.value.tunnelName,
     serialNumber: form.value.serialNumber,
     remarks: form.value.remarks,
-    constructionLength:form.value.constructionLength,
+    constructionLength: form.value.constructionLength,
     // constructionLength: 500,
     tunnelLength: form.value.totalLength,
     isDefault: form.value.isDefault,
-    modelEquipmentList: await store.getEquipmentList(),
+    modelEquipmentList: await modelStore.getEquipmentList(),
   };
   editTunnel(data).then((res) => {
     if (res?.code === 1000) {
@@ -188,6 +178,7 @@ const handleSave = async () => {
     background-image: url(@/assets/images/transducer/bg.png);
     padding: 20px 30px;
     box-sizing: border-box;
+
     :deep(.el-radio-group) {
       margin-top: 10px;
     }
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index d3a7f2f..ad86880 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="main">
     <div class="box-top">
-      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" v-if="showMenu"/>
+      <manage-btn v-model="selectIndex" @select="manageSelect" :list="routeList" v-if="showMenu" />
       <div class="tunnel-title"></div>
       <!--      <manage-length class="tunnel-length"></manage-length>-->
       <div class="top-length">
@@ -16,8 +16,8 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item v-for="item in siteList" :key="item.value" :command="item">{{
-                    item.label
-                  }}
+                  item.label
+                }}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>
@@ -36,21 +36,21 @@
     <preview-scene id="tunnel-box" :isedit="false" :tunnelId="tunnelId" :key="tunnelId"></preview-scene>
     <div class="left">
       <el-drawer v-model="drawerLeft" direction="ltr" modal-class="modal-box" :modal="false" :show-close="false"
-                 :close-on-click-modal="false" :close-on-press-escape="false">
+        :close-on-click-modal="false" :close-on-press-escape="false">
         <fan-info v-if="showFan" :list="socketData.leftData" :fan-data="largeScreenData"
-                  :transducer-data="largeScreenData"/>
+          :transducer-data="largeScreenData" />
         <!--        <transducer-list v-if="showFan" :list="socketData.leftData" :transducer-data="largeScreenData" />-->
-        <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData"/>
+        <used-ele v-if="showFan" :list="socketData.leftData" :ele-data="largeScreenData" />
       </el-drawer>
       <div v-if="drawerLeft" class="left-arrow" @click="closeLeft"></div>
       <div v-else class="shrink-left" @click="closeLeft"></div>
     </div>
     <div class="right">
       <el-drawer v-model="drawerRight" direction="rtl" modal-class="modal-box" :modal="false" :show-close="false"
-                 :close-on-click-modal="false" :close-on-press-escape="false">
-        <wind-pressure-list v-if="showFan" :list="socketData.windPressure" :win-data="largeScreenData"/>
-        <air-info v-if="showFan" :list="socketData.sensor" :air-data="largeScreenData"/>
-        <bad-gas-info v-if="showFan" :list="socketData.sensor" :bad-gas-data="largeScreenData" :tunnelId="tunnelId"/>
+        :close-on-click-modal="false" :close-on-press-escape="false">
+        <wind-pressure-list v-if="showFan" :list="socketData.windPressure" :win-data="largeScreenData" />
+        <air-info v-if="showFan" :list="socketData.sensor" :air-data="largeScreenData" />
+        <bad-gas-info v-if="showFan" :list="socketData.sensor" :bad-gas-data="largeScreenData" :tunnelId="tunnelId" />
       </el-drawer>
       <div v-if="drawerRight" class="right-arrow" @click="closeRight"></div>
       <div v-else class="shrink-right" @click="closeRight"></div>
@@ -77,14 +77,15 @@ import WindPressureList from "@/components/content/windPressure/WindPressureList
 import AirInfo from "@/components/content/airInfo/AirInfo.vue";
 import BadGasInfo from "@/components/content/badGasInfo/BadGasInfo.vue";
 import ManageBtn from "@/components/manageBtn/index.vue";
-import {dateFormat} from "@/utils/date.js";
-import {getToken} from "@/utils/auth";
-import {useAuthStore} from "@/store/userstore.js";
-import {getLargeScreen, getLargeScreenInfo, getTunnelBySiteId} from "@/api/largeScreen";
-import {ElMessage, ElMessageBox} from "element-plus";
-import {getUserInfo} from "@/api/login";
-import {initSceneData} from "@/api/tunnelScene";
-import {getSiteDetail} from "../../api/site";
+import { dateFormat } from "@/utils/date.js";
+import { getToken } from "@/utils/auth";
+import { useAuthStore } from "@/store/userstore.js";
+import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/largeScreen";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { getUserInfo } from "@/api/login";
+import { initSceneData } from "@/api/tunnelScene";
+import { getSiteDetail } from "../../api/site";
+import { editTunnel, getTunnelDetail } from "@/api/tunnelManage";
 
 const authStore = useAuthStore();
 const router = useRouter();
@@ -105,7 +106,15 @@ const tunnelId = ref(0);
 const tunnelLength = ref(0);
 const constructionLength = ref(0);
 const routeList = ref([]);
+// const form = ref({
+//   tunnelName: "",
+//   serialNumber: "",
+//   totalLength: "",
+//   isDefault: false,
+//   remarks: "",
+// });
 let socket = reactive("");
+
 const btnList = ref([
   {
     route: '/site',
@@ -166,10 +175,10 @@ const getOtherInfo = () => {
   getLargeScreenInfo().then((res) => {
     if (res?.code === 1000) {
       let routeArr = [];
-      console.log(res.data.routeList,"res.data.routeList")
+      console.log(res.data.routeList, "res.data.routeList")
       res.data.routeList.forEach((item, index) => {
         for (let btn of btnList.value) {
-          if (item === btn.route){
+          if (item === btn.route) {
             routeArr.push(btn)
           }
         }
@@ -313,13 +322,22 @@ const closeSocket = () => {
 initWebSocket();
 
 
-watch(
-    () => tunnelId.value,
-    (now) => {
-      tunnelId.value = now
-    },
-    {deep: true}
-)
+// watch(
+//   () => tunnelId.value,
+//   (now) => {
+//     tunnelId.value = now
+//   },
+//   { deep: true }
+// )
+
+// const getTunnelPreview = () => {
+//   getTunnelDetail(tunnelId).then((res) => {
+//     if (res?.code === 1000) {
+//       form.value = res.data;
+//     }
+//   });
+// };
+// getTunnelPreview();
 </script>
 <style lang="scss">
 .el-dropdown__popper.el-popper {

From 3150343a40ee02b1829acbf21e4f61bced75261c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sat, 30 Dec 2023 20:11:32 +0800
Subject: [PATCH 31/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BF=AE=E6=94=B9b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tunnelManage.js                       |   7 ++
 src/components/content/airInfo/AirInfo.vue    |   2 +-
 .../content/badGasInfo/BadGasInfo.vue         |   2 +-
 src/components/content/fanInfo/FanInfo.vue    |  10 +-
 .../content/windPressure/WindPressureList.vue |   2 +-
 src/views/device-manage/index.vue             | 105 ++++++++++++------
 src/views/edit/edit.vue                       |  14 ++-
 src/views/tunnel/index.vue                    |   7 +-
 8 files changed, 100 insertions(+), 49 deletions(-)

diff --git a/src/api/tunnelManage.js b/src/api/tunnelManage.js
index 35160d3..7b85487 100644
--- a/src/api/tunnelManage.js
+++ b/src/api/tunnelManage.js
@@ -58,3 +58,10 @@ export const editEquipment = (data) => {
     data
   })
 }
+export const editAcquisitions = (data) => {
+  return request({
+    url: '/tunnel/equipment/frequency/acquisitions',
+    method: 'put',
+    data
+  })
+}
diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue
index fad3f92..1eaf2f4 100644
--- a/src/components/content/airInfo/AirInfo.vue
+++ b/src/components/content/airInfo/AirInfo.vue
@@ -377,7 +377,7 @@ const initAirChart = (type, values) => {
   position: absolute;
   z-index: 100;
   width: 824px;
-  height: 400px;
+  //height: 400px;
   top: 1003px;
   right: 72px;
   background-image: url(@/assets/images/airInfo/bg.png);
diff --git a/src/components/content/badGasInfo/BadGasInfo.vue b/src/components/content/badGasInfo/BadGasInfo.vue
index 5a00814..9132857 100644
--- a/src/components/content/badGasInfo/BadGasInfo.vue
+++ b/src/components/content/badGasInfo/BadGasInfo.vue
@@ -358,7 +358,7 @@ const initChart = (type, values) => {
   cursor: pointer;
   position: absolute;
   width: 824px;
-  height: 621px;
+  //height: 621px;
   top: 1441px;
   right: 72px;
   background-image: url(../../../assets/images/badGasInfo/bg.png);
diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index 14161e0..b8aa4d4 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -223,6 +223,7 @@ const getBasicData = (data) => {
 }
 
 const handleOnMounted = () => {
+  // console.log('socketData.value[i]',socketData.value)
   const chart = document.getElementsByClassName('echart');
   for (let i = 0; i < chart.length; i++) {
     Echarts_info1 = echarts.init(chart[i]);
@@ -514,13 +515,13 @@ input[type="number"] {
 
 #fan_info {
   //height: 1465px;
-  height: 1000px;
+  //height: 1000px;
   width: 830px;
   position: absolute;
   z-index: 100;
   top: 184px;
   left: 68px;
-  padding: 10px;
+  padding: 10px 10px 20px 10px;
   background-image: url(../../../assets/images/fanInfo/bg.png);
   color: #2fb0df;
   box-sizing: border-box;
@@ -541,16 +542,17 @@ input[type="number"] {
     .fan-item {
       //height: 33.5%;
       height: 50%;
+      padding-bottom:10px;
       display: flex;
       flex-direction: column;
       font-size: 14px;
-      border-bottom: 2px solid rgba(107, 163, 237, 0.4);
+      //border-bottom: 2px solid rgba(107, 163, 237, 0.4);
 
       > div:first-child {
         display: flex;
 
         .echart {
-          height: 100%;
+          height: 270px;
           width: 30%;
           margin: 0px 0px 0px 10px;
           position: relative;
diff --git a/src/components/content/windPressure/WindPressureList.vue b/src/components/content/windPressure/WindPressureList.vue
index 19c0e84..c57c7ec 100644
--- a/src/components/content/windPressure/WindPressureList.vue
+++ b/src/components/content/windPressure/WindPressureList.vue
@@ -205,7 +205,7 @@ const initChart = (type, values) => {
 <style lang="scss" scoped>
 #wind-pressure {
   width: 830px;
-  height: 779px;
+  //height: 779px;
   position: absolute;
   top: 185px;
   right: 68px;
diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue
index b06bcb9..debc774 100644
--- 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;
             }
           }
         }
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 5b5c833..37753e0 100644
--- 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) {
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index ad86880..569044e 100644
--- 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)
     }
   });
 };

From a5602f03cd4a41deade01bea0917d0fb2aa4de9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sat, 30 Dec 2023 20:38:27 +0800
Subject: [PATCH 32/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BF=AE=E6=94=B9b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tunnel/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 569044e..41f9839 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -187,6 +187,7 @@ const getOtherInfo = () => {
       siteList.value = res.data.siteOption
       currentSiteId.value = res.data.siteOption[0].value
       currentSite.value = res.data.siteOption[0].label
+      tunnelList.value = res.data.tunnelOption
       getTunnel(res.data.siteOption[0].value)
     }
   });

From 043a22cabb71b4a856c246e2a1bbe75414dc86a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sat, 30 Dec 2023 21:42:08 +0800
Subject: [PATCH 33/35] =?UTF-8?q?=E9=82=93=E6=B4=81:=20=E4=BF=AE=E6=94=B9b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/content/airInfo/AirInfo.vue | 42 ++++++++++++----------
 src/components/content/usedEle/UsedEle.vue |  3 +-
 src/views/edit/edit.vue                    |  3 ++
 src/views/login/index.vue                  |  2 +-
 src/views/tunnel/index.vue                 |  9 ++++-
 5 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue
index 1eaf2f4..da15cf9 100644
--- a/src/components/content/airInfo/AirInfo.vue
+++ b/src/components/content/airInfo/AirInfo.vue
@@ -6,18 +6,19 @@
         <div class="input-fan"><span>风速</span>{{ windSpeed }}m/s</div>
       </div>
     </div>
-      <item-info
-          v-for="item in airList"
-          :key="item.equipmentId"
-          :wp="item"
-          :icon="item.icon"
-          :name="item.name"
-          :unit="item.unit"
-          @click="handleOpenAirChart(item)"
-      />
+    <item-info
+        v-for="item in airList"
+        :key="item.equipmentId"
+        :wp="item"
+        :icon="item.icon"
+        :name="item.name"
+        :unit="item.unit"
+        @click="handleOpenAirChart(item)"
+    />
 
     <div class="digital-tunnel">
-      <el-dialog :close-on-click-modal="false" v-model="isWindSpeedVisited" :title="'风速监控数据'" width="2175px" :modal="false">
+      <el-dialog :close-on-click-modal="false" v-model="isWindSpeedVisited" :title="'风速监控数据'" width="2175px"
+                 :modal="false">
         <div class="left-top-icon"></div>
         <div class="right-top-icon"></div>
         <div class="chat-dialog">
@@ -36,7 +37,8 @@
       </el-dialog>
     </div>
     <div class="digital-tunnel">
-      <el-dialog :close-on-click-modal="false" v-model="isAirVisited" :title="airTitle+'监控数据'" width="2175px" :modal="false">
+      <el-dialog :close-on-click-modal="false" v-model="isAirVisited" :title="airTitle+'监控数据'" width="2175px"
+                 :modal="false">
         <div class="left-top-icon"></div>
         <div class="right-top-icon"></div>
         <div class="chat-dialog">
@@ -88,10 +90,12 @@ watch(() => props.list, (now) => {
   })
 }, {deep: true});
 watch(() => props.airData, (now) => {
-  if(now.sensorList.length===0){
-    airList.value=[]
-  }else {
-    getAirInfo(now.sensorList)
+  if (now.sensorList !== null) {
+    if (now.sensorList.length === 0) {
+      airList.value = []
+    } else {
+      getAirInfo(now.sensorList)
+    }
   }
 }, {deep: true});
 const getChartInfo = (equipmentId) => {
@@ -236,7 +240,7 @@ const initChart = (type, values) => {
     xAxis: {
       type: 'category',
       // data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'],
-      data:type,
+      data: type,
       axisLabel: {
         textStyle: {
           fontSize: 45,
@@ -258,7 +262,7 @@ const initChart = (type, values) => {
     series: [
       {
         // data: [3, 85, 47, 92, 17, 76, 69, 25, 56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 31, 49, 81, 63],
-        data:values,
+        data: values,
         type: 'line',
         smooth: true,
         symbolSize: 24,
@@ -331,7 +335,7 @@ const initAirChart = (type, values) => {
     xAxis: {
       type: 'category',
       // data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'],
-      data:type,
+      data: type,
       axisLabel: {
         textStyle: {
           fontSize: 45,
@@ -353,7 +357,7 @@ const initAirChart = (type, values) => {
     series: [
       {
         // data: [56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76, 69, 25, 31, 49, 81, 63],
-        data:values,
+        data: values,
         type: 'line',
         smooth: true,
         symbolSize: 24,
diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue
index b390ecc..fc0e7af 100644
--- a/src/components/content/usedEle/UsedEle.vue
+++ b/src/components/content/usedEle/UsedEle.vue
@@ -234,9 +234,10 @@ const getImageUrl = (name) => {
 }
 
 #used-ele {
+  //flex:1;
   cursor: pointer;
   width: 830px;
-  height: 373px;
+  //height: 373px;
   color: aliceblue;
   position: absolute;
   top: 1220px;
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 37753e0..548fee6 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -80,6 +80,9 @@ const handleGoTunnelMgr = () => {
   router.push("/tunnel/" + form.value.siteId + "/" + type + "/" + userId);
 };
 const handleSave = async () => {
+  if(form.value.constructionLength==null){
+    form.value.constructionLength=0
+  }
   const data = {
     tunnelId: tunnelId,
     tunnelName: form.value.tunnelName,
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3c5eb24..b93c23c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -47,7 +47,7 @@ const authStore = useAuthStore();
 const loginForm = reactive({
   // username: "admin",
   password: "123456",
-  username: "admin",
+  username: "administrator",
   // password: "",
   code: "",
   uuid: "",
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 41f9839..6d5d3d8 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -237,7 +237,7 @@ const manageSelect = (index) => {
     }
   } else if (index == '隧道管理') {
     if (currentSiteId.value && currentUserId.value) {
-      router.push("/tunnel/" + currentSiteId.value + '/i/' + currentUserId.value);
+      router.push("/tunnel/" + currentSiteId.value + '/i'+'/' + currentUserId.value);
     }
   } else if (index == '用户管理') {
     if (currentSiteId.value) {
@@ -340,6 +340,13 @@ initWebSocket();
 // getTunnelPreview();
 </script>
 <style lang="scss">
+//.el-drawer__body{
+//  width: 100%;
+//  display: flex!important;
+//  flex-direction: column!important;
+//  flex: 1;
+//  height: 100%;
+//}
 .el-dropdown__popper.el-popper {
   background: transparent;
   //border: none;

From 589496ea96399651b06c4063b8846be824384574 Mon Sep 17 00:00:00 2001
From: Hcat <2768237203@qq.com>
Date: Mon, 1 Jan 2024 17:49:59 +0800
Subject: [PATCH 34/35] =?UTF-8?q?=E5=88=86=E5=8E=8B=E9=98=80=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A2=99=E5=A3=81=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/TunnelScene.vue       |  41 ++--
 .../sceneClass/editEquipment/index.js         | 180 ++++++++++++++----
 2 files changed, 151 insertions(+), 70 deletions(-)

diff --git a/src/components/content/tunnelScene/TunnelScene.vue b/src/components/content/tunnelScene/TunnelScene.vue
index 5387c3d..c727dbf 100644
--- a/src/components/content/tunnelScene/TunnelScene.vue
+++ b/src/components/content/tunnelScene/TunnelScene.vue
@@ -3,34 +3,17 @@
     <div id="cvs" ref="content"></div>
     <dev-info ref="info" :devInfo="devInfo" />
     <!-- 这里的预览模式需要做成不能修改的模式 -->
-    <edit-dialog
-      ref="edit"
-      @addEquipment="handleAddEqu"
-      @removeEquipment="handleRemoveEqu"
-      @cancel="handleCancel"
-      :hasDev="hasDevice"
-      :pointNum="pointNum"
-      :tunnelId="params.tunnelId"
-      :position="targetP?.name"
-      :hasEquipment="hasDevice"
-      :pointGap="pointGap"
-      :form="params.form"
-    />
-    <el-dialog
-      v-model="centerDialogVisible"
-      width="30%"
-      destroy-on-close
-      center
-      :show-close="false"
-      style="
+    <edit-dialog ref="edit" @addEquipment="handleAddEqu" @removeEquipment="handleRemoveEqu" @cancel="handleCancel"
+      :hasDev="hasDevice" :pointNum="pointNum" :tunnelId="params.tunnelId" :position="targetP?.name"
+      :hasEquipment="hasDevice" :pointGap="pointGap" :form="params.form" />
+    <el-dialog v-model="centerDialogVisible" width="30%" destroy-on-close center :show-close="false" style="
         margin: 20% auto;
         width: 569px;
         height: 330px;
         background: rgba(7, 35, 72, 0.79);
         border-radius: 20px;
         border: 2px solid #0f82af;
-      "
-    >
+      ">
       <p id="remove-title">是否确定删除该设备</p>
       <div class="btn">
         <button @click="centerDialogVisible = false">取消</button>
@@ -148,7 +131,7 @@ function loadModel(path) {
       (obj) => {
         resolve(obj);
       },
-      (xhr) => {},
+      (xhr) => { },
       (err) => {
         reject(err);
       }
@@ -244,12 +227,14 @@ function handleConfirmAddEqu() {
         type: "success",
       });
     })
-    .catch((res) => {
-      ElMessage({
-        message: "删除失败！",
-        type: "warning",
+    .catch(
+      (res) => {
+        console.log(res);
+        ElMessage({
+          message: "删除失败！",
+          type: "warning",
+        });
       });
-    });
 }
 // 处理取消关闭编辑框事件
 function handleCancel() {
diff --git a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
index 5d5b827..11cffba 100644
--- a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
+++ b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
@@ -33,10 +33,15 @@ function addEquipment(targetPoint, formInfo) {
   this.clearTagsObj();
 }
 
+//判断墙是否已经存在，如果存在的话，就不管，添加则无效嘛(就是说只能添加一面墙，如果存在一面墙，则不管了)
+let hasWall = false
+let wallHang = 0;
+
 // function handleValveEqu(targetPoint, equipmentInfo) {
 
 // }
-// let allline = new Array();
+let allline = new Array();
+let Allhang = new Array();
 // 其他传感器
 function handleOtherEqu(targetPoint, equipmentInfo) {
   const equMesh = this.equMap.get("equ_sensors").clone();
@@ -67,7 +72,75 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
   targetPoint.scale.set(0.03, 0.06, 0.05);
   this.scene.add(equMesh);
   targetPoint.visible = false;
-  targetPoint.hasWall = true;
+  // targetPoint.hasWall = true;
+  allline.push(targetPoint.name)
+  if (hasWall == false) {
+    let findWallHang = new Array;
+    // console.log(targetPoint.name);
+    console.log(allline);
+    Allhang = allline.map(function (str) {
+      return parseInt(str.match(/\d+/)[0], 10);
+    })
+    console.log(Allhang);
+    //将取出来的所有行数字符串用一个新数组来保存，之后判断是不是存在同一行的（即相同的行数）
+    for (let i = 0; i < Allhang.length; i++) {
+      //判断是不是存在相同的行数，如果存在，则继续判断是不是存在左右的传感器
+      findWallHang.push(Allhang[i - 1])
+      if (findWallHang.includes(Allhang[i])) {
+        console.log(allline[i - 1].slice(-1));
+        console.log(allline[i].slice(-1));
+        wallHang = Allhang[i];
+        if ((allline[i - 1].slice(-1) == 'r' && allline[i].slice(-1) == 'l') || allline[i - 1].slice(-1) == 'l' && allline[i].slice(-1) == 'r') {
+          console.log('进行添加操作');
+          // 将这二个符合添加规则的锚点给设一个属性，这样方便之后我们进行删除操作
+          // this.scene.getObjectByName(allline[i - 1]).hasWall = true
+          // this.scene.getObjectByName(allline[i]).hasWall = true
+          console.log(this.scene.getObjectByName(allline[i - 1]));
+          console.log(this.scene.getObjectByName(allline[i]));
+          //出现满足条件的风压阀了，这时候就设定为已经有墙了，不需要再添加了
+          hasWall = true
+          findWallHang = []
+          //进行添加操作，因为数值问题，所以我们分开进行添加操作
+          for (let line = Allhang[i]; line <= 20; line++) {
+            if (line < 10) {
+              let wall = 'wall_' + '0' + line
+              console.log(wall);
+              //把墙设为可见
+              this.scene.getObjectByName(wall).visible = true
+              let point = 'point_' + '00' + line + '_tc'
+              // console.log(this.scene.getObjectByName(point));
+              //把顶部的附着点设为隐藏！！！，然后设为不可选中
+              this.scene.getObjectByName(point).visible = false
+              this.scene.getObjectByName(point).layers.set(-2)
+              //如果最中间一行有设备，我们则需要将设备进行隐藏！！！
+              if (this.scene.getObjectByName(point).hasDevice == true) {
+                let EquID = this.scene.getObjectByName(point).info.id
+                this.scene.getObjectById(EquID).visible = false
+              }
+            } else if (line >= 10) {
+              let wall = 'wall_' + line
+              this.scene.getObjectByName(wall).visible = true
+              let point = 'point_' + '0' + line + '_tc'
+              this.scene.getObjectByName(point).visible = false
+              this.scene.getObjectByName(point).layers.set(-2)
+              if (this.scene.getObjectByName(point).hasDevice == true) {
+                let EquID = this.scene.getObjectByName(point).info.id
+                this.scene.getObjectById(EquID).visible = false
+              }
+            }
+            //处理21行的设备和附着点
+            let point = 'point_' + '0' + 21 + '_tc'
+            this.scene.getObjectByName(point).visible = false
+            this.scene.getObjectByName(point).layers.set(-2)
+            if (this.scene.getObjectByName(point).hasDevice == true) {
+              let EquID = this.scene.getObjectByName(point).info.id
+              this.scene.getObjectById(EquID).visible = false
+            }
+          }
+        }
+      }
+    }
+  }
   //处理风压阀的代码片段
   // let lineIndex = targetPoint.name.slice(7, 9);
   // if (allline.includes(Number(lineIndex))) {
@@ -92,9 +165,11 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
     ...equipmentInfo,
   };
   //下面进行模拟分压阀的添加效果
-  // 1.先取出当前点击添加设备锚点的行数
-  // 2.再进行字符串拼接出墙的名字，使用scene.getObjectByName(墙名去获取)
-  // 3.加上循环，固定到20结束就可以了，将点击的函数到20的函数的墙全部设为visable设为可见,还需要将中间的那行设备和附着点全部设为隐藏，且层级变低，无法选中
+  // 1. 不能放在初始化的地方去写，我们最好放在同一行的地方去写，当用户每添加一个模型，就判断是不是该行已经添加过了多个模型了
+  // 2.如果是的话，我们必须判断是不是左右同时添加的情况，如果是的话则则可以加一个墙
+
+  // 0. 首先需要定义一个变量，看墙是否已经添加了，如果已经添加的话，则直接跳出不管（因为只会有二个风压阀生成的墙）
+  // 1. 每添加一个则将附着点保存到数组里面，然后对数组里面进行第一遍过滤，将相同行数的提取出来，如果存在左右的话，则进行墙的展示（里面套for循环将后面的墙全部打开，并且将该行上面的附着点全部隐藏，包括设备和层级！！！）
 }
 
 // 风机
@@ -137,43 +212,55 @@ function handleFanEqu(
 function removeEquipment(targetPoint) {
   //删除设备这里需要再进行处理，就是根据附着点（附着点一定保存了当前添加设备的信息了）判断是不是分压阀，然后继续一样的隐藏
   if (!targetPoint.hasDevice) return;
-  // if (targetPoint.hasWall == true) {
-  //   let lineIndex = targetPoint.name.slice(7, 9);
-  //   for (let line = Number(lineIndex); line <= 20; line++) {
-  //     if (line < 10) {
-  //       let wall = "wall_" + "0" + line;
-  //       this.scene.getObjectByName(wall).visible = false;
-  //       let point = "point_" + "00" + line + "_tc";
-  //       console.log(this.scene.getObjectByName(point));
-  //       this.scene.getObjectByName(point).visible = true;
-  //       this.scene.getObjectByName(point).layers.set(0);
-  //       if (this.scene.getObjectByName(point).hasDevice == true) {
-  //         this.scene.getObjectByName(point).visible = false;
-  //         let EquID = this.scene.getObjectByName(point).info.id;
-  //         this.scene.getObjectById(EquID).visible = true;
-  //       }
-  //     } else if (line >= 10) {
-  //       let wall = "wall_" + line;
-  //       this.scene.getObjectByName(wall).visible = false;
-  //       let point = "point_" + "0" + line + "_tc";
-  //       this.scene.getObjectByName(point).visible = true;
-  //       this.scene.getObjectByName(point).layers.set(0);
-  //       if (this.scene.getObjectByName(point).hasDevice == true) {
-  //         this.scene.getObjectByName(point).visible = false;
-  //         let EquID = this.scene.getObjectByName(point).info.id;
-  //         this.scene.getObjectById(EquID).visible = true;
-  //       }
-  //     }
-  //     //处理21行的设备和附着点
-  //     let point = "point_" + "0" + 21 + "_tc";
-  //     this.scene.getObjectByName(point).visible = true;
-  //     this.scene.getObjectByName(point).layers.set(0);
-  //     if (this.scene.getObjectByName(point).hasDevice == true) {
-  //       let EquID = this.scene.getObjectByName(point).info.id;
-  //       this.scene.getObjectById(EquID).visible = true;
-  //     }
-  //   }
-  // }
+
+
+  //删除我们这里使用行数来判断，即是不是删除到了我们的那一行呢？
+  //如果删除到了我们那行的话，我们必须将行的数组从中去掉已存在的数据，然后将附着点列表中也去除这个点，然后将墙设置为false来让下次使用
+
+  let lineIndex = targetPoint.name.slice(7, 9)
+  deleteItem(allline, targetPoint.name)
+  if (Number(lineIndex) == wallHang) {
+    wallHang = 0;
+    hasWall = false
+    for (let line = Number(lineIndex); line <= 20; line++) {
+      if (line < 10) {
+        let wall = 'wall_' + '0' + line
+        this.scene.getObjectByName(wall).visible = false
+        let point = 'point_' + '00' + line + '_tc'
+        console.log(this.scene.getObjectByName(point));
+        this.scene.getObjectByName(point).visible = true
+        this.scene.getObjectByName(point).layers.set(0)
+        if (this.scene.getObjectByName(point).hasDevice == true) {
+          this.scene.getObjectByName(point).visible = false
+          let EquID = this.scene.getObjectByName(point).info.id
+          this.scene.getObjectById(EquID).visible = true
+        }
+      } else if (line >= 10) {
+        let wall = 'wall_' + line
+        this.scene.getObjectByName(wall).visible = false
+        let point = 'point_' + '0' + line + '_tc'
+        this.scene.getObjectByName(point).visible = true
+        this.scene.getObjectByName(point).layers.set(0)
+        if (this.scene.getObjectByName(point).hasDevice == true) {
+          this.scene.getObjectByName(point).visible = false
+          let EquID = this.scene.getObjectByName(point).info.id
+          this.scene.getObjectById(EquID).visible = true
+        }
+      }
+      //处理21行的设备和附着点
+      let point = 'point_' + '0' + 21 + '_tc'
+      this.scene.getObjectByName(point).visible = true
+      this.scene.getObjectByName(point).layers.set(0)
+      if (this.scene.getObjectByName(point).hasDevice == true) {
+        let EquID = this.scene.getObjectByName(point).info.id
+        this.scene.getObjectById(EquID).visible = true
+      }
+    }
+  }
+  deleteItem(Allhang, Number(lineIndex))
+
+
+
   console.log("测试是不是删除了");
   const mesh = this.scene.getObjectById(targetPoint.info.id);
   this.scene.remove(mesh);
@@ -183,3 +270,12 @@ function removeEquipment(targetPoint) {
   delete targetPoint.info; // 清空设备信息
 }
 export { addEquipment, removeEquipment };
+
+
+function deleteItem(array, item) {
+  let index = array.indexOf(item);
+  if (index !== -1) {
+    array.splice(index, 1);
+  }
+  return array
+}
\ No newline at end of file

From 6f60b6c09863d289a0367b995bcec246d2aff10f Mon Sep 17 00:00:00 2001
From: Hcat <2768237203@qq.com>
Date: Mon, 1 Jan 2024 18:02:13 +0800
Subject: [PATCH 35/35] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=88=86=E5=8E=8B=E9=98=80=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/tunnelScene/sceneClass/editEquipment/index.js      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
index 11cffba..076bef6 100644
--- a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
+++ b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js
@@ -90,7 +90,8 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
         console.log(allline[i - 1].slice(-1));
         console.log(allline[i].slice(-1));
         wallHang = Allhang[i];
-        if ((allline[i - 1].slice(-1) == 'r' && allline[i].slice(-1) == 'l') || allline[i - 1].slice(-1) == 'l' && allline[i].slice(-1) == 'r') {
+        let sameHang = findWallHang.indexOf(Allhang[i])
+        if ((allline[sameHang - 1].slice(-1) == 'r' && allline[i].slice(-1) == 'l') || allline[sameHang - 1].slice(-1) == 'l' && allline[i].slice(-1) == 'r') {
           console.log('进行添加操作');
           // 将这二个符合添加规则的锚点给设一个属性，这样方便之后我们进行删除操作
           // this.scene.getObjectByName(allline[i - 1]).hasWall = true