邓洁 : 设备管理及修复

src/views/site/index.vue

@@ -30,7 +30,7 @@
             <div>隧道数量：{{ item.info.tunnelNum }}条
             </div>
             <div>
-              <div class="tunnel" v-if="showFirstTunnel">
+              <div class="tunnel" v-if="item.info.tunnelName">
                 <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="router.push('/tunnel')" v-if="showFirstTunnel">
+            <div class="more" @click="goToAddTunnel(item.siteId)"  v-if="item.info.tunnelName">
               更多
               <div class="icon"></div>
             </div>
@@ -105,7 +105,7 @@ const siteIds = ref([])
 const siteNameList = ref([])
 const info = ref({
   tunnelNum: 0,
-  tunnelName: '隧道',
+  tunnelName: '',
   constructionLength: 0,
   implementationLength: 0
 })
@@ -114,7 +114,6 @@ const isClick = ref(false);
 const isVisited = ref(false);
 const total = ref();
 const showAddIcon = ref(false)
-const showFirstTunnel = ref(true)
 const pageInfo = reactive({
   pageNum: 1,
   pageSize: 6
@@ -136,9 +135,10 @@ const getList = () => {
     showAddIcon.value = total.value !== 6;
     res.data.rows.map(item => {
       if (item.tunnelList === null || item.tunnelList === []) {
-        showFirstTunnel.value = false
+        item.info = info.value
+      }else{
+        item.info=item.tunnelList[0]
       }
-      item.info = info.value
       item.checked = false
     })
     siteList.value = res.data.rows;
@@ -229,9 +229,9 @@ const handleMoreDelete = () => {
 }
 
 //点击页码进行分页功能
-const handleCurrentChange = async (val) => {
+const handleCurrentChange = (val) => {
   pageInfo.pageNum = val
-  await getList()
+  getList()
 }
 </script>
 
@@ -254,39 +254,6 @@ const handleCurrentChange = async (val) => {
   color: #FFFFFF;
 }
 
-.btns {
-  display: flex;
-  justify-content: space-around;
-  margin-top: 80px;
-
-  .cancel-btn {
-    display: flex;
-    justify-content: center;
-    cursor: pointer;
-    width: 220px;
-    height: 80px;
-    border-radius: 11px;
-    border: 2px solid #08B7B8;
-    color: #08B7B8;
-    line-height: 80px;
-    font-size: 38px;
-    box-sizing: border-box;
-  }
-
-  .sure-btn {
-    display: flex;
-    justify-content: center;
-    cursor: pointer;
-    width: 220px;
-    height: 80px;
-    line-height: 80px;
-    background: #08B7B8;
-    border-radius: 11px;
-    color: #FFFFFF;
-    font-size: 38px;
-  }
-}
-
 :deep(.el-dialog) {
   border: 2px solid #05FEFF;
   background: #0D6578;
@@ -399,11 +366,14 @@ const handleCurrentChange = async (val) => {
   }
 
   .box-content {
+    height: 1850px;
     display: flex;
     flex-wrap: wrap;
     padding-left: 100px;
     padding-right: 100px;
     justify-content: space-between;
+    box-sizing: border-box;
+    overflow: hidden;
 
     .add-box {
       cursor: pointer;
@@ -425,7 +395,7 @@ const handleCurrentChange = async (val) => {
 
     .site-box {
       margin-top: 122px;
-      //margin-right: 60px;
+      //margin-right: 1%;
       padding: 40px 50px;
       width: 1250px;
       height: 750px;