Merge branch 'yf' of yinet2020/YinetOASystemWeb into master

src/api/webim/index.js

@@ -9,6 +9,14 @@ export function list(query) {
   })
 }
 // 获取人员列表
+export function newList(query) {
+  return request({
+    url: '/webim/deptList',
+    method: 'get',
+    params: query
+  })
+}
+// 获取人员列表
 export function getMine(query) {
   return request({
     url: '/webim/mine',

src/layout/components/Navbar.vue

@@ -14,8 +14,17 @@
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>-->
+        <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
+      </el-tooltip>-->
+
+        <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+          <div class="avatar-wrapper">
+            <span class="action" v-if="">在线交流</span>
+          </div>
+          <el-dropdown-menu slot="dropdown" style="top:30px;">
+            <webim id="webim" class="right-menu-item hover-effect"/>
+          </el-dropdown-menu>
+        </el-dropdown>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
@@ -61,6 +70,7 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
+import webim from '@/views/webim/im'
 
 export default {
   components: {
@@ -70,7 +80,8 @@ export default {
     SizeSelect,
     Search,
     RuoYiGit,
-    RuoYiDoc
+    RuoYiDoc,
+    webim
   },
   computed: {
     ...mapGetters([
@@ -91,10 +102,26 @@ export default {
       }
     }
   },
+  data () {
+    return {
+      ifChat:false
+    }
+  },
+  watch:{
+    needRef: function() {
+      debugger
+      this.$nextTick(()=>{
+        this.ifChat = !this.ifChat
+      })
+    }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
+    toggleOpenIm() {
+      this.ifChat=!this.ifChat
+    },
     async logout() {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',

src/views/webim/im.vue

@@ -38,7 +38,7 @@
   import { device, typeOf } from '@/utils/utils'
   import storage from '@/utils/storage'
   import IMStore from '@/store/store'
-  import {list,getMine,getHistory,getChatlog,setOnlineStatus} from '@/api/webim/index'
+  import {list,newList,getMine,getHistory,getChatlog,setOnlineStatus} from '@/api/webim/index'
 
 
   export default {