2 Commits bcb1873121 ... 7365accdf0

Autor SHA1 Nachricht Datum
  chenpm 7365accdf0 Merge remote-tracking branch 'origin/master' vor 6 Monaten
  chenpm faae4cd99d 提交代码 vor 6 Monaten

+ 2 - 2
src/views/door/backstage.vue

@@ -22,8 +22,8 @@
             v-for="(subMenu, index) in currMenu.children"
             :key="index"
             :class="currSubMenuId===subMenu.id?'active item':'item'"
-            @click="subMenuSelect(subMenu)"
-          >{{ subMenu.name }}
+            @click="subMenuSesubMenuSelectlect(subMenu)"
+          >{{ subMenu.name }}123
           </div>
         </div>
       </div>

+ 4 - 2
src/views/door/menu.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="door_menu">
     <div class="menu">
-      <div :class="$router.path=='/workbench'?'active item':'item'" @click="$router.push('/workbench')">工作台</div>
+      <div :class="$route.path=='/workbench'?'active item':'item'" @click="$router.push('/workbench')">
+
+          工作台</div>
       <div v-for="menu in menusShow" :key="menu.id" :class="currMenuId===menu.id?'active item':'item'" @click="menuSelect(menu)">{{ menu.name }}</div>
     </div>
     <el-popover
@@ -14,7 +16,7 @@
       @show="popoverImg=true"
     >
       <div class="list">
-        <div v-for="menu in menusPop" :key="menu.id" :class="currMenuId===menu.id?'active item':'item'" @mouseover="menuMouseOver(menu)">{{ menu.name }}</div>
+        <div v-for="menu in menusPop" :key="menu.id" :class="currMenuId===menu.id?'active item':'item'" @click="menuSelect(menu)" @mouseover="menuMouseOver(menu)">{{ menu.name }}</div>
       </div>
       <img
         slot="reference"

+ 1 - 1
src/views/workbench/components/myMenu.vue

@@ -655,7 +655,7 @@ export default {
     }
 
     .el-collapse-item__content {
-        height: 744px !important;
+        height: 315px !important;
     }
 
     .el-table:before {

+ 14 - 14
src/views/workbench/components/tianqi.vue

@@ -1,20 +1,20 @@
 <template>
 
-
-    <div class="dataSharing"
-				 style="width: 100%;
+  <div
+    class="dataSharing"
+    style="width: 100%;
 				 box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-				 border-radius: 5px;">
-      <iframe
-        scrolling="no"
-        src="https://tianqiapi.com/api.php?style=ti&skin=pitaya"
-        frameborder="0"
-        width="100%"
-        height="316"
-        allowtransparency="true"
-        style="width: 100%;margin-top: 10%"
-      />
-
+				 border-radius: 5px;height: 100%"
+  >
+    <iframe
+      scrolling="no"
+      src="https://tianqiapi.com/api.php?style=ti&skin=pitaya"
+      frameborder="0"
+      width="100%"
+      height="316"
+      allowtransparency="true"
+      style="width: 100%;margin-top: 10%"
+    />
 
   </div>
 </template>

+ 18 - 20
src/views/workbench/index.vue

@@ -9,7 +9,7 @@
         <menuDoor @menuSelect="menuSelect" />
       </div>
     </div>
-      <div class="my_menu"></div>
+    <div class="my_menu" />
     <div class="my_menu2">
       <div style="width: 80%;">
         <el-row :gutter="8" style="margin-right:0px">
@@ -61,31 +61,31 @@
       </div>
       <div style="margin-left: 5px;width:20%;">
         <el-row :gutter="8">
-          <!--                    <el-col-->
-          <!--                        :lg="{ span: 24 }"-->
-          <!--                        :md="{ span: 24 }"-->
-          <!--                        :sm="{ span: 24 }"-->
-          <!--                        :span="24"-->
-          <!--                        :xl="{ span: 24 }"-->
-          <!--                        :xs="{ span: 24 }"-->
-          <!--                        class="panel-right"-->
-          <!--                        style="padding-left: 4px"-->
-          <!--                    >-->
-          <!--                        <div-->
-          <!--                            style="height: 358px; background: white;margin-bottom: 10px;border-radius: 4px 4px 4px 4px;"-->
-          <!--                        >-->
-          <!--                            <tianqi/>-->
-          <!--                        </div>-->
-          <!--                    </el-col>-->
           <el-col
             :lg="{ span: 24 }"
             :md="{ span: 24 }"
             :sm="{ span: 24 }"
+            :span="24"
             :xl="{ span: 24 }"
             :xs="{ span: 24 }"
             class="panel-right"
+            style="padding-left: 4px"
           >
-            <div style="height: 785px; width: 100%;">
+            <div
+              style="height: 375px; background: white;margin-bottom: 10px;border-radius: 4px 4px 4px 4px;"
+            >
+              <tianqi />
+            </div>
+          </el-col>
+          <el-col
+            :lg="{ span: 24 }"
+            :md="{ span: 24 }"
+            :sm="{ span: 24 }"
+            :xl="{ span: 24 }"
+            :xs="{ span: 24 }"
+            class="panel-right"
+          >
+            <div style="height: 375px; width: 100%;">
               <myMenu />
             </div>
           </el-col>
@@ -356,8 +356,6 @@ export default {
     /*background-color: rgb(240, 242, 245);*/
     position: relative;
 
-
-
     .link {
         background-color: rgba(255, 255, 255, 1);
         cursor: pointer;