diff --git a/src/views/projectAdmin/zjsj/index.vue b/src/views/projectAdmin/zjsj/index.vue
index aef42ab3..068c36bd 100644
--- a/src/views/projectAdmin/zjsj/index.vue
+++ b/src/views/projectAdmin/zjsj/index.vue
@@ -1,42 +1,47 @@
 <template>
-  <vue-scroll>
-    <div class="zjsj-large-screen">
-      <div class="header">
-        <div class="info">
-          <div class="between">
-            <div class="project">中建科创大厦项目</div>
-            <div class="time-week">
-              <div class="time">15:32:39</div>
-              <div class="week">星期二</div>
-            </div>
-            <div class="weather-date">
-              <div class="weather">多云 32℃</div>
-              <div class="date">2022-09-09</div>
-            </div>
+  <div class="zjsj-large-screen">
+    <div class="header">
+      <div class="info">
+        <div class="between">
+          <div class="project">中建科创大厦项目</div>
+          <div class="time-week">
+            <div class="time">15:32:39</div>
+            <div class="week">星期二</div>
           </div>
+<<<<<<< HEAD
           <div class="title">中建四局数字建造平台</div>
           <div class="between">
             <div class="company"></div>
             <div class="exit" @click="$router.push('/projectIndex')"></div>
+=======
+          <div class="weather-date">
+            <div class="weather">多云 32℃</div>
+            <div class="date">2022-09-09</div>
+>>>>>>> dev-xiaomi
           </div>
         </div>
-        <div class="tabs">
-          <div
-            class="tab"
-            :class="{ checked: $route.path === menu.modulePath }"
-            v-for="(menu, index) in menus"
-            :key="index"
-            @click="handleMenu(menu.modulePath)"
-          >
-            {{ menu.moduleName }}
-          </div>
+        <div class="title">中建四局数字建造管控平台</div>
+        <div class="between">
+          <div class="company"></div>
+          <div class="exit" @click="$router.push('/projectIndex')"></div>
         </div>
       </div>
-      <div class="content">
-        <router-view></router-view>
+      <div class="tabs">
+        <div
+          class="tab"
+          :class="{ checked: $route.path === menu.modulePath }"
+          v-for="(menu, index) in menus"
+          :key="index"
+          @click="handleMenu(menu.modulePath)"
+        >
+          {{ menu.moduleName }}
+        </div>
       </div>
     </div>
-  </vue-scroll>
+    <div class="content">
+      <router-view></router-view>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -59,10 +64,9 @@ export default {
 @import url("./style.less");
 .zjsj-large-screen {
   width: 100%;
-  // height: 100%;
+  height: 100%;
   color: #fff;
   background-color: #182337;
-  overflow-y: scroll;
   .header {
     width: 100%;
     height: 110px;
@@ -160,7 +164,7 @@ export default {
     box-sizing: border-box;
     padding: 12px 20px;
     width: 100%;
-    height: calc(1080px - 110px);
+    height: calc(100% - 110px);
   }
 }