#

src/assets/img/cha.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1744360176222" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4297" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M625.28 512l263.68-263.68c31.36-31.36 31.36-81.92 0-113.28s-81.92-31.36-113.28 0L512 398.72 248.32 135.68c-31.36-31.36-81.92-31.36-113.28 0s-31.36 81.92 0 113.28l263.68 263.68-263.68 263.68a80 80 0 0 0 0 113.28c15.36 15.36 35.84 23.68 56.32 23.68s40.96-7.68 56.32-23.68l263.68-263.68 263.68 263.68c15.36 15.36 35.84 23.68 56.32 23.68s40.96-7.68 56.32-23.68c31.36-31.36 31.36-81.92 0-113.28L624 512.64z" p-id="4298" fill="#785DC8"></path></svg>

src/common/apiConfig.js

@@ -85,8 +85,15 @@ export const API_CONFIG = {
   ajax_del_usuallyApp: {
     functionName: "del_usuallyApp",
   },
+  //查询组织
+  ajax_liYuanOrg: {
+    functionName: "select_liYuanOrg",
+  },
 
-
+  //查询cocofrow最近使用与收藏
+  ajax_appStoreSave: {
+    functionName: "select_lyAppStoreSave",
+  },
   ////////////// 以下是账号审核的数据接口
 
   moveUser: {

src/components/sidebarL.vue

@@ -7,29 +7,54 @@
                 <div class="ulT">
 
                     <!-- 默认首页 -->
-                    <div @click.stop="goto(0)" :style="{background :activeL === 0 ?'#E6F0FF':'',zIndex : 10000 }">
-                        <div class="menu_left">
+                    <div class="ulTOne" @click.stop="goto(0)" :style="{background :activeL === 0 ?'#E6F0FF':'',zIndex:9 }">
+                        <div  class="menu_left">
                             <img  class="logo" :src="activeL === 0 ? require('../assets/img/sy1.svg') : require('../assets/img/sy.svg')" alt="">
                             <span  :style="{color : activeL === 0 ? '#0051D7' :''}">首页</span>
                         </div>
                     </div>
 
                     <!-- 权限 -->
-                    <div v-for="(item,index) in appSignL(fromL.admin.sidebar.list)"
-                        @click.stop="goto(index,item)" 
-                        :style="{background :activeL === (index +1) ?'#E6F0FF':'',zIndex : 10000 }" 
+                    <div class="TwoBar ulTOne" :style="{zIndex: (item.toolId == 'appStore' || !item.menuName) ? 9999 :''}" v-for="(item,index) in appSignL(fromL.admin.sidebar.list)"
                         :key="index+1">
 
                         <!-- 渲染菜单类型 -->
-                        <div class="menu_left" v-if="item.menuName">
-                            <img  class="logo" :src="activeL === (index +1) ? item.menuActiveIcon : item.menuIcon" alt="">
-                            <span :style="{color : activeL === (index +1) ? '#0051D7' :''}">{{ item.menuName }}</span>
+                        <div  class="menu_left" v-if="item.menuName">
+                            <!-- :src="activeL === (index +1) ? item.menuActiveIcon : item.menuIcon" -->
+                            <img :src="item.menuIcon" class="logo" alt="">
+                            <span >{{ item.menuName }}</span>
+                            <!-- :style="{color : activeL === (index +1) ? '#0051D7' :''}" -->
+                              <!-- 二级导航 -->
+                                <transition name="slide">
+                                    <div class="ulTCopy">
+                                        <div class="ulTCopyTit">
+                                            <span>{{ item.menuName }}</span>
+                                            <!-- <span @click="closeCopy" class="cha" style="color: #6B7280;font-size: 23px;cursor: pointer;">⨯</span> -->
+                                        </div>
+                                        <div class="ulTCopyHei">
+                                            <div class="ulTCopyTxt" :style="{background : (activeLTwo === index+1 +'+' + ind)? '#E6F0FF' : ''}" 
+                                            v-for="(i,ind) in appSignL(item.children)"
+                                             @click="levTwo(i,ind,index)" :key="ind+'a'">
+                                            <!-- {{ activeLTwo }}------{{  index+1 +'+' + ind }} -->
+                                                <div>
+                                                    <div style="display: flex;justify-content: space-between;align-items: center;" v-for="(p,pin) in AppCon(i.url)" :key="pin+'p'">
+                                                        <img style="width: 30px;object-fit: contain;height: 30px;margin-right: 5px;"  
+                                                        :src="p.icon" 
+                                                        alt="">
+                                                        <div class="ovlH">{{ p.name }}</div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </transition>
                         </div>
                     
-                        <!-- 渲染应用类型,               status判断是否被删除  isAdmin是否为管理员可见 -->
-                        <div v-else>
-                            <div>
-                                <div v-for="(p,pin) in AppCon(item.url)" :key="pin+'p'">
+                        <!-- 渲染平台工具类型 -->
+                        <div  @click.stop="goto(index,item)" style="border-radius: 10px;" 
+                        :style="{background :activeL === (index +1) ?'#E6F0FF':'',zIndex : 10000 }" v-else>
+                            <div >
+                                <div  v-for="(p,pin) in AppCon(item.url)" :key="pin+'p'">
                                     <div class="menu_left" >
                                         <div>
                                             <img class="logo3"  
@@ -54,31 +79,44 @@
                 </div>
             </div>
            
-            
-            <!-- 二级导航 -->
-            <transition name="slide">
-                <div class="ulTCopy" v-if="isShow && barCopy.length != 0" >
+              <!-- 二级导航 -->
+              <transition name="slide">
+                <div class="ulTCopy2" v-if="isShow" >
                     <div class="ulTCopyTit">
-                        <span>{{ barCopyTit }}</span>
+                        <span>CocoFlow</span>
                         <span @click="closeCopy" class="cha" style="color: #6B7280;font-size: 23px;cursor: pointer;">⨯</span>
                     </div>
-                    <div style="padding: 16px;box-sizing: border-box;display: flex;flex-direction: column;gap: 10px;">
-                        
-                        <div class="ulTCopyTxt" :style="{background : (activeLTwo === activeL +'+' + ind)? '#E6F0FF' : ''}" v-for="(i,ind) in appSignL(barCopy)" @click="levTwo(i,ind)" :key="ind+'a'">
-                            <div>
-                                <div style="display: flex;justify-content: space-between;align-items: center;" v-for="(p,pin) in AppCon(i.url)" :key="pin+'p'">
-                                    <img style="width: 30px;object-fit: contain;margin-right: 5px;"  
-                                    :src="p.icon" 
+                    <div class="ulTCopyHei" >
+                        <span style="color: #00000066;">最近使用</span>
+                        <div class="ulTCopyTxt"  
+                        v-for="(i,ind) in cocoFlowList[0]" @click="openNewWindow(i.url)" :key="ind+'ab'">
+                            <div  class="ulTCopyTxtCon">
+                                    <img style="width: 20px;height: 20px;border-radius: 10px;object-fit: contain;margin-right: 5px;"  
+                                    :src="JSON.parse(i.json).icon" 
                                     alt="">
-                                    <span>{{ p.name }}</span>
-                                </div>
+                                    <div class="ovlH">{{ i.name }}</div>
+                            </div>
+                        </div>
+                        <span style="color: #00000066;">我的收藏</span>
+
+                        <div class="ulTCopyTxt"
+                        v-for="(i,ind) in cocoFlowList[1]" @click="openNewWindow(i.url)" :key="ind+'a'">
+                                <div class="ulTCopyTxtCon" >
+                                    <img style="width: 20px;height: 20px;border-radius: 10px;object-fit: contain;margin-right: 5px;"  
+                                    :src="JSON.parse(i.json).icon" 
+                                    alt="">
+                                    <div class="ovlH">{{ i.name }}</div>
                             </div>
                         </div>
                     </div>
 
                 </div>
             </transition>
-            <div v-if="isShow" @click="closeCopy" style="width: 100vw;height: 100vh;position: absolute;left: 0;top: 0;z-index: 1;"></div>
+
+
+
+            <div v-if="isShow" @click="closeCopy" style="width: 100vw;height: 100vh;position: absolute;left: 0;top: 0;z-index: 1;background-color: #000;"></div>
+          
         </div>
 </template>
 
@@ -86,6 +124,7 @@
 import { mapGetters, mapActions } from 'vuex';
 import { loginOut } from '@/api/user';
 import store from '../store'
+import { API_CONFIG } from "@/common/apiConfig";
 
     export default {
         props:['urlAddress'],
@@ -136,15 +175,12 @@ import store from '../store'
         },
         data() {
             return {
-                // 二级弹框是否显示
-                isShow:false,
                 // 一级选中第几个
                 activeL:0,
                 // 二级选中第几个
                 activeLTwo: null,
-                // 二级分类
-                barCopy:[],
-                barCopyTit:''
+                cocoFlowList:[],
+                isShow:false
             }
         },
         methods: {
@@ -188,23 +224,28 @@ import store from '../store'
                     // 点击首页清空内容,并把标识去除
                     await store.commit('user/SET_AppSIGN', '')
                     this.$emit('update:urlAddress','')
+                    this.isShow = false
 
                     this.$emit('getPer')
                     // 清空选中状态
                     this.activeLTwo = ''
-                    this.isShow = false
                     this.activeL = index
                     return
                 }
+           
+                    this.activeLTwo = ''
 
-
-                // 有二级导航的显示二级导航.无二级则进行判断
-                if (val.children) {
-                    this.barCopyTit = val.menuName
-                    this.barCopy = JSON.parse(JSON.stringify(val.children))
-                    this.isShow = true
-                }else{
-                    this.isShow = false
+                    // 判断
+                    if (val.toolId == 'appStore') {
+                        if (!this.isShow) {
+                            this.isShow = true
+                            this.cocoFlowList = []
+                            this.getCocoList()
+                        }
+                        return
+                    }else{
+                        this.isShow = false
+                    }
 
                     // 点击相同应用不刷新  
                     if (this.appSign == val.toolId) return
@@ -243,43 +284,48 @@ import store from '../store'
                         queryString = canshu.length ? (url.includes('?') ? '&' : '?') + canshu.join('&') : ''; // 生成查询字符串
                     }
 
-                let _url = url + queryString
-
-                let kpl = ` <iframe 
-                                v-if="appSign && urlAddress"
-                                allow= "camera *; microphone *;display-capture;midi;encrypted-media;"
-                                frameborder="no" 
-                                border="0" 
-                                style="border:0;width:100%;height:100%;" 
-                                src="${_url}" 
-                                ref="pageCon"
-                                >
-                            </iframe>`
+                    let _url = url + queryString
 
-                let pl = {json:kpl ,stateL :true,toolId :val.toolId}
-
-                this.$emit('AddAppJson',pl)
-
-
-                // this.$emit('update:urlAddress',_url,)
+                    let kpl = ` <iframe 
+                                    v-if="appSign && urlAddress"
+                                    allow= "camera *; microphone *;display-capture;midi;encrypted-media;"
+                                    frameborder="no" 
+                                    border="0" 
+                                    style="border:0;width:100%;height:100%;" 
+                                    src="${_url}" 
+                                    ref="pageCon"
+                                    >
+                                </iframe>`
 
+                    let pl = {json:kpl ,stateL :true,toolId :val.toolId}
 
-                    // let dom = document.querySelector('#pageCon')
-                    
-                    // document.querySelector('#pageCon').innerHTML = '';
-                    // console.log(val.toolId, url, dom,val.argumentList);
-                    
-                    
-                   
-                    // window.topU.U.MD.D.I.openApplicationWai(val.toolId, url, dom,val.argumentList)
-                   
-                    // 应用标识，url,存储dom
-                }
+                    this.$emit('AddAppJson',pl)
+            },
+            getCocoList(){
+                let params = [
+                    {
+                        functionName: API_CONFIG.ajax_appStoreSave.functionName,
+                        uid: this.userinfo.userid, 
+                    },
+                ];
+                
+                this.$ajax
+                    .post(API_CONFIG.baseUrl, params)
+                    .then((res) => {
+                        this.cocoFlowList.push(res.data[0])
+                        this.cocoFlowList.push(res.data[1])
+                    })
+                    .catch((err) => {
+                        console.log(err);
+                        this.loading = false
+                        this.$message.error("获取常见应用失败");
+                    });
             },
             // 点击二级导航
-            async levTwo(val,index){
-              
-                this.activeLTwo = `${this.activeL}+${index}`
+            async levTwo(val,index,aInd){     
+                
+                this.activeL = ''
+                this.activeLTwo = `${aInd + 1}+${index}`
 
                 // 点击相同应用不刷新
                 if (this.appSign == val.toolId) return
@@ -333,14 +379,13 @@ import store from '../store'
                 let pl = {json:kpl ,stateL :true,toolId :val.toolId}
 
                 this.$emit('AddAppJson',pl)
-                // console.log('_url',_url);
-               
-                // let dom = document.querySelector('#pageCon')
-        
-                // document.querySelector('#pageCon').innerHTML = '';
+            },
+            openNewWindow(val) {
+                console.log(val);
                 
-                // window.topU.U.MD.D.I.openApplicationWai(val.toolId, url, dom ,val.argumentList)
-            }
+                // // 基本用法：打开指定 URL
+                window.open(val, "_blank");
+            },
         },
        
        
@@ -360,6 +405,9 @@ import store from '../store'
   padding: 16px;
   box-sizing: border-box;
   height: 68px;
+  width: 100%;
+  background-color: #fff;
+  text-align: center;
   border-bottom: .5px #e5e7eb solid;
 }
 .logo2 img{
@@ -374,6 +422,7 @@ import store from '../store'
   align-items: center;
   padding: 8px;
   box-sizing: border-box;
+  background-color: #fff;
   padding-bottom: 20px;
 }
 .left {
@@ -387,13 +436,14 @@ import store from '../store'
     justify-content: space-between;
     position: relative;
     box-shadow: 5px 0 8px rgba(0, 0, 0, 0.1);
-    z-index: 999;
+    /* z-index: 999; */
 
 }
 .left .ulT { 
   width: 100%;
   height: 100%;
-  padding: 8px;
+  
+  padding: 8px 0;
   box-sizing: border-box;
   display: flex;
   gap: 10px;
@@ -401,10 +451,39 @@ import store from '../store'
   flex-direction: column;
   background-color: #ffffff;
 }
-.left .ulT div{ 
-  border-radius: 10px;
+.left .ulT .ulTOne{ 
+    border-radius: 10px;
+    margin: 0 auto;
+}
+
+.ulT div:nth-child(1){
+    margin-top: 0;
 }
 .ulTCopy{
+    position: fixed;
+    left: -256px;
+    top: 0;
+    height: 100%;
+    width: 256px;
+    z-index: -100;
+    background-color: #ffffff;
+    overflow: visible; 
+    transform: translateX(0px); /* 初始位置在视图之外 */
+    box-shadow: inset 2px 0 8px rgba(0, 0, 0, 0.1),5px 3px 5px 0px rgba(0, 0, 0, 0.1);
+    transition: transform .5s ease;
+
+}
+
+.TwoBar:hover .ulTCopy{
+    transform: translateX(336px); /* 初始位置在视图之外 */
+    z-index: -100;
+    display: block !important;
+}
+.TwoBar{
+    position: relative;
+    padding:0 8px;box-sizing: border-box;
+}
+.ulTCopy2{
     position: absolute;
     left: -256px;
     top: 0;
@@ -417,17 +496,6 @@ import store from '../store'
     box-shadow: inset 2px 0 8px rgba(0, 0, 0, 0.1),5px 3px 5px 0px rgba(0, 0, 0, 0.1);
 }
 
-/* .sidebar {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 250px;
-  height: 100%;
-  background-color: #333;
-  color: #fff;
-  padding: 20px;
-} */
-
 .slide-enter-active, .slide-leave-active {
   transition: transform 0.5s ease;
   z-index: -1000 !important;
@@ -451,13 +519,22 @@ import store from '../store'
     align-items: center;
     justify-content: space-between;
     border-bottom: .5px #e5e7eb solid;
-
+}
+.ulTCopyHei{
+    padding: 16px;box-sizing: border-box;display: flex;flex-direction: column;gap: 10px;
+    overflow: auto;
+    height: calc(100% - 72px);
 }
 .ulTCopyTxt{
     height: 48px;padding: 12px;box-sizing: border-box;display: flex;align-items: center;
     color: #374151;
     border-radius: 10px;
     cursor: pointer;
+    font-size: 16px;
+    margin: 0;
+}
+.ulTCopyTxtCon{
+   display: flex;align-items: center;width: 100%;
 }
 .ulTCopyTxt:hover{
     background-color: #f3f4f6 !important;
@@ -487,9 +564,7 @@ import store from '../store'
   border-radius: 10px;
   margin-top: 12px;
 }
-.ulT div:nth-child(1){
-    margin-top: 0;
-}
+
 .menu_left:hover{
     background-color: #f3f4f6 !important;
 }
@@ -497,5 +572,9 @@ import store from '../store'
   width: 22px;
   height: 20px;
 }
-
+.ovlH{
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
 </style>

src/components/topPage.vue

@@ -53,11 +53,12 @@
                             </span>
                         </el-tooltip>
                     </div>
-                    <div class="cha" v-if="userinfo.type == 1 && userinfo.role == 1" @click.stop="delApp(item.lid)">
-                        ✖ 
+                    <div class="cha" @click.stop="delApp(item.lid)">
+                        <img style="width: 20px;" src="../assets/img/cha.svg" alt="">
                     </div>
                 </div>
-                <div v-if="userinfo.type == 1 && userinfo.role == 1" @click="openUsuallyApp" class="footListCon footListCon2">
+                <!-- v-if="userinfo.type == 1 && userinfo.role == 1" -->
+                <div :style="{width : CocoFlowList.length ? '' : '187px'}" v-if="CocoFlowList.length < 4" @click="openUsuallyApp" class="footListCon footListCon2">
                     <div style="margin-bottom: 8px;font-size: 40px;color: #0354D7;">+</div>
                     <div class="TabListBri">添加常用应用</div>
                 </div> 
@@ -179,25 +180,34 @@ import { API_CONFIG } from "@/common/apiConfig";
         methods: {
             // 删除应用
             delApp(val){
-                console.log(val);
+                this.$confirm('确定删除吗', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(async () => {
+                    let params = [
+                            {
+                                functionName: API_CONFIG.ajax_del_usuallyApp.functionName,
+                                aid: val, 
+                            },
+                        ];
+                        
+                    this.$ajax
+                        .post(API_CONFIG.baseUrl, params)
+                        .then(() => {
+                            this.$message.success('删除成功')
+                            this.getData()
+                        })
+                        .catch((err) => {
+                            console.log(err);
+                            this.$message.error("删除失败");
+                        });
+                   
+                }).catch(() => {
+                    // 取消操作
+                });
 
-                let params = [
-                    {
-                        functionName: API_CONFIG.ajax_del_usuallyApp.functionName,
-                        aid: val, 
-                    },
-                ];
                 
-                this.$ajax
-                    .post(API_CONFIG.baseUrl, params)
-                    .then(() => {
-                        this.$message.success('删除成功')
-                        this.getData()
-                    })
-                    .catch((err) => {
-                        console.log(err);
-                        this.$message.error("删除失败");
-                    });
                 
             },
             handleClose(){
@@ -207,18 +217,19 @@ import { API_CONFIG } from "@/common/apiConfig";
             },
             // 弹框选着添加应用
             addApp(val){
-
-                let data = this.CocoFlowList.filter(e=>{
-                    return e.id == val 
-                })
-                if (data.length != 0) return this.$message.info('常用列表已添加')
-
-
+                // let data = this.CocoFlowList.filter(e=>{
+                //     return e.id == val 
+                // })
+                // if (data.length != 0) return this.$message.info('常用列表已添加')
+                let kpl = [...this.tab,...this.CocoFlowList]
+                console.log(kpl);
+                
 
                 const index = this.tab.indexOf(val);
                 if (index !== -1) {
                     this.tab.splice(index, 1); // 删除第一个匹配项
                 } else {
+                    if (kpl.length > 3) return this.$message.info('只能添加四个常用应用哦')
                     this.tab.push(val);    // 添加元素到末尾
                 }
             },
@@ -238,8 +249,6 @@ import { API_CONFIG } from "@/common/apiConfig";
                     .post(API_CONFIG.baseUrl, params)
                     .then((res) => {
                         this.usuallyList = res.data[0]
-                        
-                       
                         this.loading = false
 
                     })
@@ -251,21 +260,18 @@ import { API_CONFIG } from "@/common/apiConfig";
             },
             // 添加常用确定按钮
             async addUsuallyApp(){
-
                 const uploadYn = async files => {
                     for (let index = 0; index < files.length; index++) {
                         await this.XAdd(files[index]);
                         console.log(index);
-                        
                     }
                 }
                 await uploadYn(this.tab);
                 console.log('完成了');
-
-
                 this.getData()
-
+                this.handleClose()
             },
+            // 循环添加常见应用
             XAdd(val){
                 return new Promise((resolve) => {
                     let params = [
@@ -293,7 +299,7 @@ import { API_CONFIG } from "@/common/apiConfig";
                 let params = [
                     {
                         functionName: API_CONFIG.ajax_addedUsuallyApp.functionName,
-                        oid: this.userinfo.organizeid, 
+                        uid: this.userinfo.userid, 
                     },
                 ];
                 
@@ -308,9 +314,6 @@ import { API_CONFIG } from "@/common/apiConfig";
                     });
             },
 
-
-
-
             // 打开平台应用
             async openApp(val){
                 // 点击相同应用不刷新

src/views/login/loginPage.vue

@@ -8,25 +8,34 @@
 				<div>AI智慧校园平台</div>
 			</div>
 			<div class="login_content">
-				组织号
+				账户
 				<div class="input-container">
 					<input
 						type="text"
-						placeholder="请输入组织号"
+						placeholder="请输入账户"
 						class="input"
+						@blur="getOrgData"
 						@keyup.enter="loginFn"
-						v-model="org"
+						v-model="account"
 					/>
 				</div>
-				账户
+				组织
 				<div class="input-container">
-					<input
+					<!-- <input
 						type="text"
-						placeholder="请输入账户"
+						placeholder="请输入组织"
 						class="input"
 						@keyup.enter="loginFn"
-						v-model="account"
-					/>
+						v-model="org"
+					/> -->
+					<el-select class="input" :popper-append-to-body="false"  v-model="org" placeholder="请选择">
+						<el-option
+							v-for="item in OrgOptions"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id">
+						</el-option>	
+					</el-select>
 				</div>
 				密码
 				<div class="input-container">
@@ -47,6 +56,8 @@
 import { mapActions } from "vuex";
 import axios from "axios";
 import qs from 'qs'
+import { API_CONFIG } from "@/common/apiConfig";
+
 export default {
 	name: "loginPage",
 	data() {
@@ -56,6 +67,8 @@ export default {
 			password: "",
 			loading: false,
 			redirect: this.$route.query["redirect"],
+			// 组织列表
+			OrgOptions:[]
 		};
 	},
 	methods: {
@@ -131,6 +144,31 @@ export default {
 				this.$router.push({ path: this.redirect || "/" });
 			}
 		},
+		// 输入账号获取组织
+		getOrgData(){
+			// console.log('111');
+			let params = [
+                    {
+                        functionName: API_CONFIG.ajax_liYuanOrg.functionName,
+                        uname: this.account, 
+                    },
+                ];
+                
+                this.$ajax
+                    .post(API_CONFIG.baseUrl, params)
+                    .then((res) => {
+						console.log('res',res);
+
+						this.OrgOptions = res.data[0]
+						if (this.OrgOptions.length == 1) {
+							this.org = this.OrgOptions[0].id
+						}
+                    })
+                    .catch((err) => {
+                        console.log(err);
+                        this.$message.error("获取组织失败");
+                    });
+		}
 	},
 	mounted() {
 		this.getLoading();
@@ -138,6 +176,22 @@ export default {
 };
 </script>
 <style scoped>
+ .el-select-dropdown.customDropdown {
+	width: 200px;
+	position: relative;
+	margin-left: -65px;
+	margin-top: -55px;
+	background-color: #fff;
+}
+.el-select-dropdown.customDropdown .el-select-dropdown__item {
+	display: inline-block;
+	width: 100%;
+	padding: 0;
+	overflow: initial;/* 允许内容溢出 */
+}
+.input >>> .el-select-dropdown{
+	min-width: 330px !important;
+}
 .loginBg {
 	width: 100vw;
 	height: 100vh;
@@ -196,6 +250,11 @@ export default {
 	color: #a3a9b4;
 	line-height: 42px;
 }
+
+.input >>> .el-input__inner{
+	border: none;
+	padding: 0;
+}
 /* 设置占位符文字颜色 */
 .input::placeholder {
 	color: #a3a9b4; /* 替换为您想要的占位符颜色 */
@@ -205,7 +264,7 @@ export default {
 .input-container {
 	position: relative;
 }
-.input-container:nth-child(1)::before {
+.input-container:nth-child(2)::before {
 	content: "";
 	background-image: url("../../assets/organzation.png"); /* 组织号图片 */
 	background-size: 20px 20px; /* 设置图片大小 */
@@ -218,7 +277,7 @@ export default {
 	height: 20px; /* 图片高度 */
 }
 
-.input-container:nth-child(2)::before {
+.input-container:nth-child(1)::before {
 	content: "";
 	background-image: url("../../assets/personal.png"); /* 账户图片 */
 	background-size: 20px 20px; /* 设置图片大小 */