11wqe1 преди 3 месеца
родител
ревизия
6174f54d6f
променени са 3 файла, в които са добавени 37 реда и са изтрити 47 реда
  1. 27 44
      src/components/sidebarL.vue
  2. 1 0
      src/components/topPage.vue
  3. 9 3
      src/views/kanBan/index.vue

+ 27 - 44
src/components/sidebarL.vue

@@ -15,13 +15,11 @@
                 </div>
 
                 <!-- 权限 -->
-                <div  v-for="(item,index) in appSignL(fromL.admin.sidebar.list)"
+                <div style="width: 100%;" v-for="(item,index) in appSignL(fromL.admin.sidebar.list)"
                     :key="index+1">
-
                     <!-- 渲染菜单类型 -->
                      <div class="ulTOne TwoBar" v-if="item.menuName">
                           <!-- 二级导航 -->
-                        <transition name="slide">
                             <div class="ulTCopy2">
                                 <div class="ulTCopyTit">
                                     <span>{{ item.menuName }}</span>
@@ -39,7 +37,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </transition>
                         <div class="menu_left">
                             <img :src="activeL === (index +1) ? item.menuActiveIcon : item.menuIcon" class="logo" alt="">
                             <span class="barT">{{ item.menuName }}</span>
@@ -49,33 +46,11 @@
                    
                 
                     <!-- 渲染平台工具类型 -->
-                    <div @click.stop="goto(index,item)" 
+                    <div style="width: 100%;" @click.stop="goto(index,item)" 
                      v-else>
-                        <div class="ulTOne TwoBar" 
+                        <div class="ulTOne TwoBar2" 
                         @mouseenter="mouGet(item.toolId)" 
                         v-for="(p,pin) in AppCon(item.url)" :key="pin+'p'">
-                          <!-- 二级导航 -->
-                                <transition name="slide">
-                                        <div class="ulTCopy2" v-if="item.toolId == 'appStore'">
-                                            <div class="ulTCopyTit">
-                                                <span>CocoFlow</span>
-                                            </div>
-                                            <div class="ulTCopyHei" >
-                                                <span v-if="cocoFlowList[0] && cocoFlowList[0].length" style="color: #00000066;">最近使用</span>
-                                                <div class="ulTCopyTxt"  
-                                                v-for="(i,ind) in cocoFlowList[0]" 
-                                                @click="openNewWindow(i.url)" :key="ind+'ab'">
-                                                        <div class="ulTCopyConT">{{ i.name }}</div>
-                                                </div>
-                                                <span v-if="cocoFlowList[0] && cocoFlowList[1].length" style="color: #00000066;">我的收藏</span>
-
-                                                <div class="ulTCopyTxt"
-                                                v-for="(i,ind) in cocoFlowList[1]" @click="openNewWindow(i.url)" :key="ind+'a'">
-                                                        <div class="ulTCopyConT">{{ i.name }}</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </transition>
                                 <div class="menu_left" >
                                     <img class="logo"  
                                     :src="activeL === (index +1) ? p.activeIcon : p.defaultIcon" 
@@ -86,6 +61,26 @@
                                 </div>
 
                         </div>
+                          <!-- 二级导航 -->
+                        <div class="ulTCopy2" v-if="item.toolId == 'appStore'">
+                            <div class="ulTCopyTit">
+                                <span>CocoFlow</span>
+                            </div>
+                            <div class="ulTCopyHei" >
+                                <span v-if="cocoFlowList[0] && cocoFlowList[0].length" style="color: #00000066;">最近使用</span>
+                                <div class="ulTCopyTxt"  
+                                v-for="(i,ind) in cocoFlowList[0]" 
+                                @click="openNewWindow(i.url)" :key="ind+'ab'">
+                                        <div class="ulTCopyConT">{{ i.name }}</div>
+                                </div>
+                                <span v-if="cocoFlowList[0] && cocoFlowList[1].length" style="color: #00000066;">我的收藏</span>
+
+                                <div class="ulTCopyTxt"
+                                v-for="(i,ind) in cocoFlowList[1]" @click="openNewWindow(i.url)" :key="ind+'a'">
+                                        <div class="ulTCopyConT">{{ i.name }}</div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
@@ -238,6 +233,8 @@ import { API_CONFIG } from "@/common/apiConfig";
                     }
 
                     let _url = url + queryString
+                    console.log('_url',_url);
+                    
 
                     let kpl = ` <iframe 
                                     allow= "camera *; microphone *;display-capture;midi;encrypted-media;"
@@ -317,13 +314,13 @@ import { API_CONFIG } from "@/common/apiConfig";
                     .filter(param => paramsMap[param] !== undefined || param === 'type')
                     .map(param => param === 'type' ? `tType=${paramsMap['tType']}` : `${param}=${paramsMap[param]}`);
 
-
                     queryString = canshu.length ? (url.includes('?') ? '&' : '?') + canshu.join('&') : ''; // 生成查询字符串
                 }
 
                 let _url = url + queryString
+                console.log('_url',_url);
+                
                 let kpl = ` <iframe 
-                                v-if="appSign && urlAddress"
                                 allow= "camera *; microphone *;display-capture;midi;encrypted-media;"
                                 frameborder="no" 
                                 border="0" 
@@ -435,7 +432,6 @@ import { API_CONFIG } from "@/common/apiConfig";
     border-radius: 10px;
     display: flex;
     height: 48px;
-    width: 48px;
     flex-wrap:nowrap;
     align-content: center;
     justify-content: center;
@@ -465,19 +461,6 @@ import { API_CONFIG } from "@/common/apiConfig";
 }
 
 
-.slide-enter-active, .slide-leave-active {
-  transition: transform 0.5s ease;
-  z-index: -1000 !important;
-}
-
-.slide-enter{
-    z-index: -1000 !important;
-  transform: translateX(0); /* 进入时移动到正常位置 */
-}
-.slide-leave-to /* .slide-leave-active in <2.1.8 */ {
-    z-index: -1000 !important;
-    transform: translateX(0); /* 进入时移动到正常位置 */
-}
 
 .ulTCopyTit{
     font-family: PingFang SC;

+ 1 - 0
src/components/topPage.vue

@@ -479,6 +479,7 @@ import { API_CONFIG } from "@/common/apiConfig";
                         url = e.url
                     }
                 });
+                // console.log('_userinfo',JSON.parse(JSON.stringify(this.roleUser)));
 
                 let _userinfo = this.roleUser, //登录用户信息
                 { userid: _userid, organizeid: _oid, type: _type, org: _org, role: _role, classid: _classId } = _userinfo; // 解构赋值获取用户信息

+ 9 - 3
src/views/kanBan/index.vue

@@ -7,7 +7,7 @@
               <span style="color: #0663FE;font-weight: 600;">{{ userinfo.schoolName }}</span>
             </div>
             <div class="person">
-                <el-button type="text" @click="gotoli" style="margin-right: 20px">返回</el-button>
+                <el-button v-if="isIndex2 == 2" type="text" @click="gotoli" style="margin-right: 20px">返回</el-button>
               <div class="person_name">
                 <img
                  @click="openData()"
@@ -103,7 +103,8 @@ export default {
   },
     data() {
         return {
-            isActive: 1
+            isActive: 1,
+            isIndex2:'',
         }
     },
     methods: {
@@ -141,7 +142,12 @@ export default {
     },
     mounted() {
         const index = this.$route.query.index; // 123
-        if (index == 2) this.isActive = 2
+        if (index == 2) {
+            this.isActive = 2
+            this.isIndex2 = 2
+        }
+        
+        
     }
 }
 </script>