Browse Source

bug修改

dengrui 1 month ago
parent
commit
8e47c196b7

+ 9 - 2
src/components/PDFViewFull/index.vue

@@ -11,7 +11,7 @@
     v-if="needToShowPdf"
     v-show="visible"
     class="midPopUp"
-    @click="visible = false"
+    @click="reset"
     style="z-index: 999999999999 !important"
   >
     <div
@@ -56,13 +56,14 @@
           <el-button
             type="primary"
             style="font-size: 20px; margin-right: 20px"
-            @click="visible = false"
+            @click="reset"
             link
             >关闭</el-button
           >
         </div>
       </div>
       <el-scrollbar
+        ref="scrollbar"
         style="height: calc(90vh - 40px); width: 90vw; padding: 0px 20px"
       >
         <VuePdfEmbed
@@ -160,6 +161,12 @@ const props = defineProps({
     default: 0,
   },
 });
+const scrollbar = ref(null);
+const reset = () => {
+  scrollbar.value.setScrollTop(0);
+  visible.value = false;
+  loading.value = true;
+};
 const loading = ref(true);
 const pageLength = ref(0);
 const pageStatus = ref(true);

+ 2 - 2
src/layout/components/header.vue

@@ -66,8 +66,8 @@
           trigger="contextmenu"
           @command="handleCommand"
         >
-          <div @click="showClick">
-            <!-- <div class="name">李明华</div> -->
+          <div>
+            <div class="name">李明华</div>
             <!-- <div class="work">{{ userStore.user.station }}</div> -->
           </div>
           <!--          <img-->

+ 6 - 6
src/views/pro-steps/index.vue

@@ -1529,6 +1529,12 @@ const qrCode = ref(null);
 const stepComponents = ref([]);
 const defaultComponents = [
   {
+    compentName: "ESOP",
+    iconName: "ESOP",
+    path: "esop",
+    name: "Esop",
+  },
+  {
     compentName: "物料采集",
     iconName: "wuliaocaiji",
     path: "wuliaocaiji",
@@ -1548,12 +1554,6 @@ const defaultComponents = [
   },
 
   {
-    compentName: "ESOP",
-    iconName: "ESOP",
-    path: "esop",
-    name: "Esop",
-  },
-  {
     compentName: "设备确认",
     iconName: "shebeijilu",
     path: "shebeijilu",