Browse Source

Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

chenjun 2 years ago
parent
commit
df3a6a6f6f

BIN
src/assets/logo/ic_arrow_left.png


BIN
src/assets/logo/ic_arrow_right.png


+ 1 - 0
src/layout/components/Dialog/index.vue

@@ -145,6 +145,7 @@ export default {
       }
       .DelTxt {
         color: #eb2f3b;
+        margin: 0 6px;
       }
       .del-content {
         .error {

+ 32 - 1
src/layout/components/Sidebar/index.vue

@@ -23,7 +23,9 @@
       </el-menu>
     </el-scrollbar>
     <div class="rloop" @click="updata" style="cursor: w-resize">
-      <!-- <img src="../../../assets/logo/ic111.png" alt="" /> -->
+      <div class="log_open">
+        <div :class="leup ? 'arrows' : 'arrow'"></div>
+      </div>
     </div>
   </div>
 </template>
@@ -107,6 +109,35 @@ export default {
   z-index: 999;
   right: 0;
   top: 0;
+  > .log_open {
+    width: 8px;
+    height: 144px;
+    background: #385086;
+    border-radius: 0px 8px 8px 0px;
+    position: absolute;
+    top: 42%;
+    right: -8px;
+    display: flex;
+    align-items: center;
+    > .arrows {
+      width: 6px;
+      height: 6px;
+      background: url("../../../assets/logo/ic_arrow_left.png") no-repeat;
+    }
+    > .arrow {
+      width: 6px;
+      height: 6px;
+      background: url("../../../assets/logo/ic_arrow_right.png") no-repeat;
+    }
+    // border-top-right-radius: 12px;
+    // border-bottom-right-radius: 12px;
+  }
+  > .log_open:hover {
+    background: #2d67e3;
+    > .rloop {
+      background: #2d67e3;
+    }
+  }
   > img {
     width: 20px;
     height: 20px;

+ 2 - 2
src/views/BasicsData/views/deployNode/deployNodeHome.vue

@@ -12,7 +12,7 @@
         <div class="Deltitle">删除源数据</div>
         <div class="content er">
           <div class="log">
-            <span class="DelIcon"></span>您确定是否要删除<span class="DelTxt">{{ rmObj.locationCode }}</span> 
+            <span class="DelIcon"></span>您确定是否要删除<span class="DelTxt">{{ rmObj.locationCode }}</span>?
           </div>
         </div>
         <div class="DelFoot right t30">
@@ -277,7 +277,7 @@ export default {
             }
           });
         } else {
-          this.$message.error(message);
+          this.$message.error(message ?? '获取节点信息失败');
         }
       } catch (error) {
         console.log(error);