任一存 před 3 roky
rodič
revize
324c4b7334
1 změnil soubory, kde provedl 67 přidání a 95 odebrání
  1. 67 95
      src/views/base/Toolbar.vue

+ 67 - 95
src/views/base/Toolbar.vue

@@ -48,12 +48,6 @@
           </div>
         </div>
       </div>
-      <ul class="setting-con">
-        <li @click="activeSetting=item" v-for="(item,i) in settings" :key="i">
-         <button class="ui-button" :class="{submit:activeSetting.id==item.id}">{{item.name}}</button>
-        </li>
-
-      </ul>
       <menu>
         <li
           v-for="(item) in tabs"
@@ -71,13 +65,6 @@
         <CustomLogoSettings v-show="activeTab === '自定义LOGO'"></CustomLogoSettings>
       </div>
     </div>
-    <eidt-panel
-      :select="select"
-      @openMaterial="selectHandle('image','editpanel')"
-      v-if="activeSetting"
-      @close="onCloseEdit"
-      :show="activeSetting"
-    ></eidt-panel>
 
     <div class="dialog" style="z-index: 2000" v-if="isShowSettingCoverWindow">
       <Table2
@@ -114,7 +101,6 @@
 
 <script>
 import { getMaterialList} from "@/api";
-import EidtPanel from "./EditPanel";
 import OpeningTipSettings from '@/views/base/openingTipSettings.vue'
 import PasswordSettings from "@/views/base/passwordSettings.vue";
 import AutoCruiseSettings from '@/views/base/autoCruiseSettings.vue'
@@ -128,7 +114,6 @@ import { mapGetters } from "vuex";
 
 export default {
   components: {
-    EidtPanel,
     Table,
     Table2,
     Select,
@@ -153,7 +138,6 @@ export default {
         name:"自动巡游",
         id:"xy"
       }],
-      activeSetting:'',
       dataURL: "",
       isShowScene:false, // 显示全景图片选择窗口
       isShowSelect:false, // 显示普通图片选择窗口
@@ -270,9 +254,6 @@ export default {
       this.info.icon = selected[0].icon
       this.isShowSettingCoverWindow = false
     },
-    onCloseEdit(){
-      this.activeSetting = ''
-    }
   },
 }
 </script>
@@ -288,81 +269,82 @@ export default {
 
 .upload-con {
   display: flex;
-}
-.uc-l {
-  .ui-remark{
-    margin-top: 16px;
-  }
-}
-
-.uc-r {
-  width: 100%;
-  > .title-input-wrapper {
-    position: relative;
-    border: 1px solid rgba(151, 151, 151, 0.2);
-    padding: 0 16px;
-    background: #252526;
-    border-radius: 2px;
-    height: 36px;
-    width: 100%;
-    &:focus-within {
-      border-color: #0076F6;
+  margin-bottom: 30px;
+  .uc-l {
+    .ui-remark{
+      margin-top: 16px;
     }
-    > input {
-      border: none;
-      background: transparent;
-      outline: none;
-      height: 100%;
-      width: calc(100% - 50px);
-      padding: 0;
-      color: #fff;
-      letter-spacing: 1px;
-      font-size: 14px;
-    }
-    > .count {
-      position: absolute;
-      top: 50%;
-      transform: translateY(-50%);
-      right: 16px;
-      font-size: 14px;
-      color: rgba(255, 255, 255, 0.2);
-    }
-  }
-  > .jianjie {
-    margin-top: 20px;
   }
-  > .jianjie-textarea-wrapper {
-    position: relative;
-    border: 1px solid rgba(151, 151, 151, 0.2);
-    background: #252526;
-    border-radius: 2px;
-    height: 123px;
+  .uc-r {
     width: 100%;
-    &:focus-within {
-      border-color: #0076F6;
-    }
-    > textarea {
-      padding: 9px 16px 30px 16px;
-      resize: none;
-      border: none;
-      background: transparent;
-      outline: none;
+    > .title-input-wrapper {
+      position: relative;
+      border: 1px solid rgba(151, 151, 151, 0.2);
+      padding: 0 16px;
+      background: #252526;
+      border-radius: 2px;
+      height: 36px;
       width: 100%;
-      height: calc(100% - 30px);
-      color: #fff;
-      letter-spacing: 1px;
-      font-size: 14px;
+      &:focus-within {
+        border-color: #0076F6;
+      }
+      > input {
+        border: none;
+        background: transparent;
+        outline: none;
+        height: 100%;
+        width: calc(100% - 50px);
+        padding: 0;
+        color: #fff;
+        letter-spacing: 1px;
+        font-size: 14px;
+      }
+      > .count {
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 16px;
+        font-size: 14px;
+        color: rgba(255, 255, 255, 0.2);
+      }
     }
-    > .count {
-      position: absolute;
-      right: 16px;
-      bottom: 9px;
-      font-size: 14px;
-      color: rgba(255, 255, 255, 0.2);
+    > .jianjie {
+      margin-top: 20px;
+    }
+    > .jianjie-textarea-wrapper {
+      position: relative;
+      border: 1px solid rgba(151, 151, 151, 0.2);
+      background: #252526;
+      border-radius: 2px;
+      height: 123px;
+      width: 100%;
+      &:focus-within {
+        border-color: #0076F6;
+      }
+      > textarea {
+        padding: 9px 16px 30px 16px;
+        resize: none;
+        border: none;
+        background: transparent;
+        outline: none;
+        width: 100%;
+        height: calc(100% - 30px);
+        color: #fff;
+        letter-spacing: 1px;
+        font-size: 14px;
+      }
+      > .count {
+        position: absolute;
+        right: 16px;
+        bottom: 9px;
+        font-size: 14px;
+        color: rgba(255, 255, 255, 0.2);
+      }
     }
   }
 }
 
+
 /* 
 .upload-btn {
   display: flex;
@@ -467,16 +449,6 @@ export default {
   }
 }
 
-.setting-con{
-  >li{
-    display: inline-block;
-    .ui-button{
-      padding: 0 20px;
-      margin-right: 10px;
-    }
-  }
-}
-
 menu {
   display: inline-block;
   width: 133px;