Merge branch 'xf_dev' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-CLIENT-TEMP into xf_dev

src/views/pro-steps/components/excel.vue

@@ -59,7 +59,6 @@
     </el-table>
   </div>
   <div v-else class="fullScreen">
-    <div class="title">当前操作表格：{{ title }}</div>
     <div class="excelView">
       <div class="view">
         <ExcelView
@@ -71,6 +70,8 @@
         />
       </div>
       <div class="opeara">
+        <div class="titles">当前操作表格:</div>
+        <div class="titles">{{ title }}</div>
         <div>
           <el-button
             v-if="excelOptions.edit"
@@ -216,6 +217,19 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
+:deep(.luckysheet-scrollbar-y::-webkit-scrollbar) {
+  width: 30px !important;
+}
+:deep(.luckysheet-scrollbar-x::-webkit-scrollbar) {
+  height: 30px !important;
+}
+:deep(#luckysheet-scrollbar-y) {
+  width: 30px !important;
+}
+:deep(#luckysheet-scrollbar-x) {
+  height: 30px !important;
+}
+
 .fullScreen {
   position: fixed;
   width: 100vw;
@@ -224,12 +238,6 @@ onMounted(() => {
   top: 0;
   left: 0;
   background-color: rgb(241, 243, 245);
-  .title {
-    height: 60px;
-    font-size: 25px;
-    line-height: 60px;
-    text-align: center;
-  }
 }
 .btnText {
   font-size: $f20;
@@ -237,7 +245,7 @@ onMounted(() => {
 }
 .excelView {
   width: 100%;
-  height: calc(100vh - 60px);
+  height: calc(100vh - 28px);
   padding: 20px;
   display: flex;
   background-color: white;
@@ -245,14 +253,20 @@ onMounted(() => {
   .view {
     position: relative;
     flex: 1;
-    height: calc(100vh - 100px);
+    height: calc(100vh - 48px);
   }
   .opeara {
     width: 200px;
     height: 100%;
     padding: 10px;
     display: flex;
+    flex-direction: column;
     align-items: center;
+    .titles {
+      width: 200px;
+      font-size: 25px;
+      text-align: center;
+    }
   }
 }
 .tableView {