From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/intellectInspect/inspectIndex/index.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/intellectInspect/inspectIndex/index.vue b/src/views/intellectInspect/inspectIndex/index.vue
index 007b525..f80486c 100644
--- a/src/views/intellectInspect/inspectIndex/index.vue
+++ b/src/views/intellectInspect/inspectIndex/index.vue
@@ -134,7 +134,6 @@
const toLine = (item) =>{
let id = JSON.parse(JSON.stringify(item)).id
- console.log(id,'id')
router.push({
path: 'intelligentLine',
query: {
@@ -166,7 +165,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
--
Gitblit v1.9.2