fanghuisheng 3 роки тому
батько
коміт
59c3c8a0f7

+ 16 - 8
src/layout/vab-logo/index.vue

@@ -1,6 +1,4 @@
 <template>
-
-
   <!-- <div class="vab-logo">
     <router-link to="/" class="logo-url">
       <img v-if="collapse" src="../../assets/logo.png" width="30" />
@@ -11,13 +9,23 @@
   </div> -->
 
   <div class="vab-logo">
-    <router-link to="/" class="logo-url" style="margin-right:20px;" v-if="store.state.homeLogo" event>
-      <img  :src="`${store.state.homeLogo}`"  style="position: relative; top: -6px;height:31px"/>
+    <router-link
+      to="/"
+      class="logo-url"
+      style="margin-right: 20px"
+      v-if="store.state.homeLogo"
+    >
+      <img
+        :src="`${store.state.homeLogo}`"
+        style="position: relative; top: -6px; height: 31px"
+      />
     </router-link>
-    <!-- <span class="anticon"></span> -->  
+    <!-- <span class="anticon"></span> -->
     <!-- src="@/assets/logo2.png"  -->
 
-    <span style="font-size: 26px; color: #fff">{{store.state.homeTitle}}</span>
+    <span style="font-size: 26px; color: #fff">
+      {{ store.state.homeTitle }}
+    </span>
   </div>
 </template>
 
@@ -48,8 +56,8 @@ export default {
 <style lang="less" scoped>
 .vab-logo {
   text-align: left;
-  margin-left:20px;
-  height:@vab-header-height;
+  margin-left: 20px;
+  height: @vab-header-height;
   // margin: 10px 5px;
 }
 </style>

+ 5 - 1
src/views/index/components/VersionInformation.vue

@@ -150,7 +150,6 @@
         <echarts :editModellist="editModelList"></echarts>
       </div>
       <div v-if="editModelList.colorType === 'tabls'">
-        <!-- <a-tabls></a-tabls> -->
         <atabls :editModellist="editModelList"></atabls>
       </div>
     </div>
@@ -217,6 +216,7 @@ export default defineComponent({
       editModelList.value = []
       editModelList.value = mainData.value[i]
     }
+
     const modelDelete = (i) => {
       console.log(mainData.value[i])
       mainData.value.splice(i, 1)
@@ -326,7 +326,11 @@ export default defineComponent({
         if (bool === false) {
           next(false)
           modelSelect()
+        } else {
+          next()
         }
+      } else {
+        next()
       }
     })