From f64838cac11c50726cefb949480012f5e0f55682 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Thu, 24 Mar 2022 17:30:08 +0800
Subject: [PATCH] update

---
 src/components/case/index.vue    | 23 ++++++++++++++---------
 src/components/dialog/index.vue  | 15 +++++++++++----
 src/pages/counter/list/index.vue | 16 +++++++---------
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 5d38316..0c96534 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -45,7 +45,7 @@
 
       
       <el-container>
-        <el-aside width="30%">
+        <el-aside width="30%" class="flex flex-col">
           <div class="aside-header">
             <div class="header_h flex a-center">
               <i class="el-icon-s-order"></i>
@@ -58,7 +58,7 @@
               </div>
             </div>
           </div>
-          <div class="aside-footer">
+          <div class="aside-footer flex-grow">
             <div class="header_h flex a-center">
               <i class="el-icon-s-management"></i>
               <p>实验任务</p>
@@ -67,9 +67,9 @@
               <el-row>
                 <el-col :span="24">
                   <el-card shadow="hover">
-                    <el-table :data="requires" stripe height="405" v-loading="loading" ref='testTable'>
+                    <el-table :data="requires" height="43.5vh" v-loading="loading" ref='testTable'>
                       <el-table-column type="index"></el-table-column>
-                      <el-table-column prop="name" label="判分点" align="center">
+                      <el-table-column prop="name" label="判分点" align="left">
                       </el-table-column>
                       <el-table-column prop="right" label="完成结果" align="center">
                         <template slot-scope="scope">
@@ -140,7 +140,7 @@
       <h4 class="antialiased text-center text-2xl">请选择你将进行的操作</h4>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closePane()">再试一次</el-button>
-        <el-button type="primary" @click="closePane()">其他业务</el-button>
+        <el-button type="primary" @click="closePane(true)">其他业务</el-button>
       </span>
     </el-dialog>
     
@@ -368,10 +368,13 @@ export default {
       // 初始化vuex中的state
       this.initState();
     },
-    closePane(){
+    closePane(judge = false){
       this.closePaneJudge = false
       this.lockIt = false
       this.reload()
+      if(judge) {
+        this.toggleCase()
+      }
     },
     getQueryVariable(name) {
         var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
@@ -779,9 +782,9 @@ export default {
         // location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
         // location.href = 'http://www.huorantech.cn/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
         //测试服
-        location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
+        // location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
         //本地
-        // location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
+        location.href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
     },
     
     checkVer() {
@@ -1005,7 +1008,8 @@ $togetherFontSize: 16px;
     
     .el-table{
       // font-size: $togetherFontSize;
-      font-size: .75rem;
+      // font-size: .75rem;
+      overflow: auto;
       color: #202020;
       .el-table--striped .el-table__body tr.el-table__row--striped td {
         background: #eef7ff;
@@ -1029,6 +1033,7 @@ $togetherFontSize: 16px;
         background-color: #fff;
       }
     }
+
     .el-table__header-wrapper{
         thead{
             color: #ffffff;
diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 4612480..15bfac6 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -6,10 +6,11 @@
     <el-dialog
         :visible="visible"
         append-to-body
+        style="z-index: 6000;"
         class="apple"
         :close-on-click-modal="true" 
         :show-close="false" 
-        custom-class="w3w5 lg:w-full bgNone"
+        custom-class="w3w5 lg:w-full bgNone z6000"
         >
         <div class="data-dia23 mx-auto  rounded-3xl" :class="{ ['myFull']: flow === 3 }">
             <!-- 2xl:w-3/5 xl:w-4/5 lg:w-full -->
@@ -442,7 +443,7 @@ export default {
                 this.$emit('submitIt')
             }else {
                 // 调用父函数
-                // 然后关掉
+                // 然后关掉git
                 // this.$emit('submitIt')
                 
                 this.cancelIt()
@@ -467,7 +468,7 @@ export default {
 
 <style lang="scss" scoped>
     /deep/.w3w5 {
-        min-width: 1200px;
+        min-width: 1400px;
     }
     /deep/.w4w5 {
         min-width: 800px;
@@ -518,7 +519,7 @@ export default {
     }
     .data-dia23{
         // position: absolute;
-        width: 30%;
+        min-width: 40%;
         background-color: white;
         z-index: 9999;
         .popBody {
@@ -597,4 +598,10 @@ export default {
     /deep/.myFull {
         width: 90%;
     }
+    /deep/.el-dialog {
+        z-index: 9999!important;
+    }
+    /deep/.el-dialog__wrapper {
+        z-index: 9999!important;
+    }
 </style>
\ No newline at end of file
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 07e02b1..53f5c74 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -9,8 +9,8 @@
         <img class="sth glass" v-lazy="lazyImg[2]" alt="" @click="changePeopleJudge"/>
 
         <!-- 系统录入 height: 178px;position:relative;top:-450px;right:20px-->
-        <el-tooltip placement="top" popper-class="sth-popper">
-            <div slot="content" class="computerContent " @click="showManage">
+        <el-tooltip placement="top" popper-class="sth-popper" close-delay="0">
+            <div slot="content" class="computerContent" @click="showManage">
                 <img v-lazy="lazyImg[3]" style="height: 100px;" alt="" />
             </div>
             <div class="bg-gray-50 "  @click="showManage">
@@ -297,7 +297,7 @@
         <div v-show="showPop" class="masking"></div>
 
         <!-- 商业银行系统的全屏功能实现  v-if="manageVisible" -->
-        <div :class="full ? 'fullScreenSystem' : 'system'" class="systemconfig " v-show="manageVisible">
+        <div :class="full ? 'fullScreenSystem' : 'system'" class="systemconfig" v-show="manageVisible">
             <!-- <transition name='systemComputer' enter-active-class="Down" leave-active-class="animate__animated animate__bounceOutDown">
                 <router-view></router-view>
             </transition> -->
@@ -374,8 +374,6 @@
                 <el-button type="primary" @click="voucherCardGetIt(2)">取出两张</el-button>
             </span>
         </el-dialog>
-
-
     </div>
 </template>
 
@@ -2234,13 +2232,13 @@ export default {
 }
 @media screen and (min-width: 1200px) and (max-width: 1919px) {
     .computerContent{
-        position: absolute;top: -50px;width:200px;left: -100px
+        position: absolute;top: 10vh;width:200px;left: -10vw;z-index:100;
     }
     
 }
 @media screen and (min-width: 1920px) {
     .computerContent{
-        position: absolute;top: -10px;width:200px;left: -100px
+        position: absolute;top: -10px;width:200px;left: -100px;z-index:100;
     }
 }
 
@@ -2470,6 +2468,7 @@ export default {
             width: 90px;
         }
         .el-tooltip__popper.sth-popper {
+            z-index: 100!important;
             padding: 0;
             // background-color: transparent;
             background-color: #fff;
@@ -3753,9 +3752,8 @@ color: #fff;
 .rotateComputer {
     // transform-origin: right right;
     // transform: rotate3d(0.5,0.5,0,45deg);
-
 }
 /deep/.z500 {
-    z-index: 500;
+    z-index: 5000;
 }
 </style>
\ No newline at end of file