From e8ac21d5be84fc36b937030b70995f2d1c8d81e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sat, 16 Dec 2023 15:20:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                  | 41 +++++++++++++++++++
 .../tunnelScene/editEquComp/editDialog.vue    | 15 ++++---
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index d574bf0..3fc4d09 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -419,3 +419,44 @@ html, body, #app, .el-container, .el-aside, .el-main {
     }
   }
 }
+//el-select 下拉框样式
+.dialog-dropdown{
+
+}
+.el-select__popper {
+  margin-top: -12px!important;
+  background: #072247!important;
+  border: 1px solid #0F82AF!important;
+}
+.el-popper {
+
+  max-width: 204px!important;
+  box-sizing: border-box;
+}
+.el-popper__arrow::before{
+  display: none;
+}
+.el-select-dropdown{
+  width: 202px!important;
+}
+.el-select-dropdown__item{
+    color: #fff!important;
+}
+.el-select-dropdown__item.hover{
+  background-color: #072247!important;
+}
+.el-select-dropdown__item:hover {
+  background-color: #072247!important;
+  color: #08B7B8!important;
+}
+.el-select-dropdown__item.selected {
+  color: #08B7B8!important;
+}
+.el-select-dropdown__list{
+  .el-select-dropdown__item:first-child{
+    color: #FFFFFF;
+    &:hover{
+      color: #08B7B8!important;
+    }
+  }
+}
diff --git a/src/components/content/tunnelScene/editEquComp/editDialog.vue b/src/components/content/tunnelScene/editEquComp/editDialog.vue
index 4a9b272..5a29034 100644
--- a/src/components/content/tunnelScene/editEquComp/editDialog.vue
+++ b/src/components/content/tunnelScene/editEquComp/editDialog.vue
@@ -14,6 +14,10 @@
         <p>传感器类型</p>
         <el-select
           v-model="equipmentSetting.equipmentType"
+          :fit-input-width="true"
+          filterable
+          clearable
+          popper-class="dialog-dropdown"
           placeholder="请选择设备类型"
         >
           <el-option
@@ -28,6 +32,10 @@
         <p>设备选择</p>
         <el-select
           v-model="equipmentSetting.chooseEquipment"
+          :fit-input-width="true"
+          filterable
+          clearable
+          popper-class="dialog-dropdown"
           placeholder="请选择设备类型"
         >
           <el-option
@@ -230,12 +238,12 @@ const equipment = {
       }
     }
     :deep(.el-select) {
-      width: 284px;
+      //width: 284px;
       //height: 51px;
       border: transparent;
     }
     :deep(.el-input--suffix) {
-      width: 284px;
+      //width: 284px;
       height: 51px;
       background: rgba(7, 35, 72, 0.79);
       border: 2px solid #0f82af;
@@ -294,7 +302,4 @@ const equipment = {
     }
   }
 }
-:deep(.el-select-dropdown__wrap) {
-  background: greenyellow !important;
-}
 </style>

From a45afb9e6fe0245bc9ac1581f71a5691edd7abd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sat, 16 Dec 2023 16:33:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/device/sdgl_xz.png          | Bin 0 -> 1885 bytes
 src/assets/styles/index.scss                  |  33 ++++++--
 .../tunnelScene/editEquComp/editDialog.vue    |   6 +-
 src/router/index.js                           |   2 +-
 src/views/device-manage/index.vue             |  76 +++++++++++++++++-
 src/views/site/index.vue                      |  27 ++-----
 src/views/tunnel-manage/index.vue             |  38 +++++++--
 7 files changed, 141 insertions(+), 41 deletions(-)
 create mode 100644 src/assets/images/device/sdgl_xz.png

diff --git a/src/assets/images/device/sdgl_xz.png b/src/assets/images/device/sdgl_xz.png
new file mode 100644
index 0000000000000000000000000000000000000000..be9dd6421fca521a042c6214b7a1f98c3685df1b
GIT binary patch
literal 1885
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
XyDjYffe$-&00000NkvXXu0mjfOKnaU

literal 0
HcmV?d00001

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 3fc4d09..9bde257 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -420,24 +420,20 @@ html, body, #app, .el-container, .el-aside, .el-main {
   }
 }
 //el-select 下拉框样式
-.dialog-dropdown{
-
-}
 .el-select__popper {
   margin-top: -12px!important;
   background: #072247!important;
   border: 1px solid #0F82AF!important;
 }
 .el-popper {
-
-  max-width: 204px!important;
+  max-width: 202px!important;
   box-sizing: border-box;
 }
 .el-popper__arrow::before{
   display: none;
 }
 .el-select-dropdown{
-  width: 202px!important;
+   width: 200px!important;
 }
 .el-select-dropdown__item{
     color: #fff!important;
@@ -460,3 +456,28 @@ html, body, #app, .el-container, .el-aside, .el-main {
     }
   }
 }
+//input number 右侧加减隐藏
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+
+input[type="number"] {
+  -moz-appearance: textfield;
+}
+//checkbox
+.el-checkbox__inner {
+  width: 40px !important;
+  height: 40px !important;
+  border-radius: 25px!important;
+}
+
+.el-checkbox__input.is-checked .el-checkbox__inner {
+  width: 25px;
+  height: 25px;
+  background-color: #05FEFF!important;
+}
+
+.el-checkbox__input.is-checked .el-checkbox__inner::after {
+  display: none;
+}
diff --git a/src/components/content/tunnelScene/editEquComp/editDialog.vue b/src/components/content/tunnelScene/editEquComp/editDialog.vue
index 5a29034..a73657f 100644
--- a/src/components/content/tunnelScene/editEquComp/editDialog.vue
+++ b/src/components/content/tunnelScene/editEquComp/editDialog.vue
@@ -17,7 +17,6 @@
           :fit-input-width="true"
           filterable
           clearable
-          popper-class="dialog-dropdown"
           placeholder="请选择设备类型"
         >
           <el-option
@@ -35,7 +34,6 @@
           :fit-input-width="true"
           filterable
           clearable
-          popper-class="dialog-dropdown"
           placeholder="请选择设备类型"
         >
           <el-option
@@ -238,12 +236,12 @@ const equipment = {
       }
     }
     :deep(.el-select) {
-      //width: 284px;
+      width: 284px;
       //height: 51px;
       border: transparent;
     }
     :deep(.el-input--suffix) {
-      //width: 284px;
+      width: 284px;
       height: 51px;
       background: rgba(7, 35, 72, 0.79);
       border: 2px solid #0f82af;
diff --git a/src/router/index.js b/src/router/index.js
index 2ddaef2..c752b69 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -51,7 +51,7 @@ const routes = [
     }
   },
   {
-    path: '/device',
+    path: '/device/:tunnelId(\\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 d7dfcad..0e15dc8 100644
--- a/src/views/device-manage/index.vue
+++ b/src/views/device-manage/index.vue
@@ -1,12 +1,40 @@
 <template>
   <div class="tunnel-bgc">
     <div class="box-top">
-      <div class="back-tunnel" @click="router.push('/')">
+      <div class="back-tunnel" @click="router.back(-1)">
         <div class="back-icon"></div>
         <span>返回</span>
       </div>
+      <div class="tunnel-name">
+        一号隧道
+      </div>
       <div class="tunnel-title"></div>
     </div>
+    <div class="device-content">
+      <div class="device-box">
+        <div class="box-left">
+<!--          <div>风机</div>-->
+<!--          <div>风压</div>-->
+<!--          <div>其他传感器</div>-->
+          <el-menu
+              default-active="1"
+          >
+            <el-menu-item index="1">
+              <span>风机</span>
+            </el-menu-item>
+            <el-menu-item index="2">
+              <span>风压</span>
+            </el-menu-item>
+            <el-menu-item index="3">
+              <span>其他传感器</span>
+            </el-menu-item>
+          </el-menu>
+        </div>
+        <div class="box-right">
+
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -15,6 +43,7 @@ const router = useRouter()
 </script>
 
 <style scoped lang="scss">
+
 .tunnel-bgc {
   padding: 85px 0 0 0;
   width: 100%;
@@ -23,7 +52,16 @@ const router = useRouter()
 
   .box-top {
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-start;
+
+    .tunnel-name {
+      margin-left: 120px;
+      height: 61px;
+      font-size: 46px;
+      font-weight: bold;
+      color: #FFFFFF;
+      line-height: 61px;
+    }
 
     .back-tunnel {
       cursor: pointer;
@@ -47,5 +85,37 @@ const router = useRouter()
       }
     }
   }
+
+  .device-content {
+    display: flex;
+    justify-content: center;
+    padding-top: 246px;
+
+    .device-box {
+      display: flex;
+      width: 2194px;
+      height: 1321px;
+      background: #064B66;
+      border-radius: 20px;
+      border: 2px solid #05FEFF;
+      box-sizing: border-box;
+
+      .box-left {
+        width: 300px;
+        height: 1318px;
+        background: #0D5A7A;
+        border-radius: 20px 0px 0px 20px;
+        :deep(.el-menu){
+          border-right: none;
+          margin-top: 261px;
+          background-color: #0D5A7A;
+        }
+      }
+
+      .box-right {
+        flex: 1;
+      }
+    }
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index b134c0f..d20f28c 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -7,7 +7,7 @@
       </div>
       <div class="tunnel-title"></div>
       <div class="all-del-btn">
-        <div class="all-btn" style=" margin-right: 40px;" v-if="!showAddIcon">
+        <div class="all-btn" style=" margin-right: 40px;" v-if="!showAddIcon" @click="handleAdd">
           添加
         </div>
         <div class="all-btn">
@@ -98,7 +98,6 @@
 <script setup>
 import {editSite, getSiteDetail, getSiteList, addSite, deleteSite} from "@/api/site";
 import {ElMessage, ElMessageBox} from "element-plus";
-import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 
 const router = useRouter()
 const siteList = ref([])
@@ -237,22 +236,6 @@ const handleCurrentChange = async (val) => {
 </script>
 
 <style scoped lang="scss">
-:deep(.el-checkbox__inner) {
-  width: 40px !important;
-  height: 40px !important;
-  border-radius: 25px;
-}
-
-:deep(.el-checkbox__input.is-checked .el-checkbox__inner ) {
-  width: 25px;
-  height: 25px;
-  background-color: #05FEFF;
-}
-
-:deep(.el-checkbox__input.is-checked .el-checkbox__inner::after) {
-  display: none;
-}
-
 .clickColor {
   position: absolute;
   top: 7px;
@@ -418,9 +401,9 @@ const handleCurrentChange = async (val) => {
   .box-content {
     display: flex;
     flex-wrap: wrap;
-    padding-left: 70px;
-    padding-right: 70px;
-    //justify-content: space-between;
+    padding-left: 100px;
+    padding-right: 100px;
+    justify-content: space-between;
 
     .add-box {
       cursor: pointer;
@@ -442,7 +425,7 @@ const handleCurrentChange = async (val) => {
 
     .site-box {
       margin-top: 122px;
-      margin-right: 60px;
+      //margin-right: 60px;
       padding: 40px 50px;
       width: 1250px;
       height: 750px;
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 11994d2..d401dfe 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -20,7 +20,7 @@
         <div class="top">
           <span>{{ item.tunnelName }}</span>
           <span>施工长度500米 隧道长度10公里</span>
-          <div @click.stop="handleClickSite"><span :class="{ clickColor: isClick }"></span></div>
+          <el-checkbox v-model="item.checked" size="large" @change="handleClickSite(item)"/>
         </div>
         <div class="box-center">
           <div>
@@ -63,6 +63,15 @@
         <el-form-item label="隧道名称">
           <el-input v-model="form.name" 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.tunnelLength" placeholder="请输入隧道长度"/>
+        </el-form-item>
+        <el-form-item label="隧道备注">
+          <el-input v-model="form.remarks" placeholder="请输入隧道备注"/>
+        </el-form-item>
       </el-form>
       <div class="btns">
         <div class="cancel-btn" @click="isVisited=false">
@@ -198,18 +207,20 @@ const iconsList = ref([
 ])
 const title = ref('新增隧道')
 const isVisited = ref(false);
+const tunnelIds = ref([])
+const tunnelNameList = ref([])
 const form = ref({
-  address: '',
   name: '',
-  desc: '',
-  remark: ''
+  serialNumber: '',
+  tunnelLength: '',
+  remarks: ''
 });
 const handleEdit = () => {
   title.value = '编辑隧道'
   isVisited.value = true
 }
 const handleEditDevice = () => {
-  router.push('/device')
+  router.push('/device/'+1)
 }
 
 const handleAdd = () => {
@@ -219,6 +230,23 @@ const handleAdd = () => {
 const getImageUrl = (name) => {
   return new URL(`../../assets/images/tunnel/${name}`, import.meta.url).href
 }
+const handleClickSite = (type) => {
+  if (type.checked) {
+    // tunnelIds.value.push(type.siteId)
+    // tunnelNameList.value.push(type.siteName)
+  } 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)
+    //   }
+    // })
+  }
+}
 </script>
 
 <style scoped lang="scss">

From 0c45d3df934586ce8054a663e6168ec112880dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com>
Date: Sat, 16 Dec 2023 16:34:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 9bde257..86bad04 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -419,6 +419,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
     }
   }
 }
+
 //el-select 下拉框样式
 .el-select__popper {
   margin-top: -12px!important;