From a32438e379b0d9a0dba49be1379f490e0d80da21 Mon Sep 17 00:00:00 2001
From: xialiang <1818147@qq.com>
Date: Tue, 2 Nov 2021 15:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/superFusionPlatform/main.js         |   98 +-
 .../mainPlatform/MainPlatform.vue             | 1486 ++++++++++-------
 .../message/Conversation/index.vue            |   61 +-
 .../message/MessageList/index.vue             |  246 +--
 4 files changed, 1114 insertions(+), 777 deletions(-)

diff --git a/src/views/superFusionPlatform/main.js b/src/views/superFusionPlatform/main.js
index fd64f76..7431e42 100644
--- a/src/views/superFusionPlatform/main.js
+++ b/src/views/superFusionPlatform/main.js
@@ -55,6 +55,7 @@ function getTotalUnreadCount() {
     // Vue.prototype.RongIMClientNum = totalUnreadCount
     vueCom.$bus.emit('totalNoticeChange', totalUnreadCount);
 
+
     console.log("获取未读总数成功", totalUnreadCount);
     //   this.notice_count = total_notice(totalUnreadCount);
   });
@@ -62,52 +63,6 @@ function getTotalUnreadCount() {
 }
 
 
-mineReadfile().then(value => {
-
-  RongIMClient = RongIMLib.init({
-    appkey: value.key,
-  });
-  RongIMClient.connect({ token: value.token })
-    .then((user) => {
-      console.log("连接成功, 用户 id 为：", user.id);
-      localStorage.setItem("user_info", JSON.stringify({ id: user.id }));
-      // 获取消息数量
-      getTotalUnreadCount()
-
-      // 添加事件监听
-      RongIMClient.watch({
-        // 监听消息通知
-        message(event) {
-          // 新接收到的消息内容
-          const message = event.message;
-          console.log("event", event);
-
-          getTotalUnreadCount()
-          if (event.message.type === 1) {
-            vueCom.$bus.emit("handelSendMessage", 1, event.message);
-          }
-        },
-        // 监听 IM 连接状态变化
-        status(event) {
-          // 链接监听失败回调
-          console.log('connection status:', event.status);
-        }
-      });
-      // 发送全局融云以便其他地方调取融云方法
-      Vue.prototype.RongIMClient = RongIMClient
-
-    })
-    .catch((error) => {
-
-      console.log("连接失败: ", error.code, error.msg);
-    });
-
-}, reason => {
-  console.log(reason, 222)
-})
-
-
-
 
 
 Vue.use(Toast);
@@ -216,6 +171,57 @@ function gotoPage(to, from, next) {
     if (to.name === 'login') {
       next({ replace: true, name: 'mainPlatform' });
     } else {
+
+
+      mineReadfile().then(value => {
+
+        RongIMClient = RongIMLib.init({
+          appkey: value.key,
+        });
+        RongIMClient.connect({ token: value.token })
+          .then((user) => {
+            console.log("连接成功, 用户 id 为：", user.id);
+            localStorage.setItem("user_info", JSON.stringify({ id: user.id }));
+            // 获取消息数量
+            getTotalUnreadCount()
+
+            // 添加事件监听
+            RongIMClient.watch({
+              // 监听消息通知
+              message(event) {
+                // 新接收到的消息内容
+                const message = event.message;
+                console.log("event", event);
+                // 未读数计算
+                getTotalUnreadCount()
+                // 个人对话消息发送
+                if (event.message.type === 1) {
+                  vueCom.$bus.emit("handelSendMessage", 1, event.message);
+                }
+                // 刷新会话列表
+                vueCom.$bus.emit('rongyunIMCGetList');
+              },
+              // 监听 IM 连接状态变化
+              status(event) {
+                // 链接监听失败回调
+                console.log('connection status:', event.status);
+
+              }
+            });
+            // 发送全局融云以便其他地方调取融云方法
+            Vue.prototype.RongIMClient = RongIMClient
+
+          })
+          .catch((error) => {
+
+            console.log("连接失败: ", error.code, error.msg);
+          });
+
+      }, reason => {
+        console.log(reason, 222)
+      })
+
+
       next();
     }
   }
diff --git a/src/views/superFusionPlatform/mainPlatform/MainPlatform.vue b/src/views/superFusionPlatform/mainPlatform/MainPlatform.vue
index d1591b7..d139f8d 100644
--- a/src/views/superFusionPlatform/mainPlatform/MainPlatform.vue
+++ b/src/views/superFusionPlatform/mainPlatform/MainPlatform.vue
@@ -1,627 +1,941 @@
 <template>
-    <div class="main-platform-style" id="mainPlatform">
-        <a-spin v-if="isLoading" size="large" tip="正在加载，请稍候..." class="spin-style"/>
-        <template v-else>
-            <top-bar :total_notice="totalNotice" :total_todo="todo_count" :unread_mail="mailCount" :crmData="crmData" :moduleAndLayoutData="moduleLayout"
-                     ref="topBarRef" @accessSubsystem="onAccessSubsystem" @returnToMain="onReturnToMain"/>
-            <div id="moduleContent" class="content-style" ref="contentRef" :style="{display:showMainContent === true?'block':'none'}">
-                <div class="deal-and-notice-style">
-                    <Message class="content-child-style" style="width:calc(100% * 460 / 1680);background-color: #4baafe"/>
-                    <Deal class="content-child-style" style="width:calc(100% * 642 / 1680);background-color: white" :countData="todoCount" @btnClick="onDealBtnClick"/>
-                    <Application class="content-child-style" style="width:calc(100% * 550 / 1680);background-color: white" :appData="crmData"
-                                 @showApp="onShowApp"/>
-                </div>
-                <ModuleMain :moduleAndLayoutData="layoutData" @accessSubsystem="onAccessSubsystem"/>
-            </div>
-            <FusionModalPanel v-bind="modalObject" @callback="modalCallback" :style="{display:showMainContent === true?'block':'none'}">
-                <component v-if="modalObject.show" :is="childDom" v-bind="modalObject.params"></component>
-            </FusionModalPanel>
-            <circle-menu class="circle-menu-style" mainText="更多操作" mainBtn="icon-settings" :btnAry="circleBtnAry"
-                         @btnClick="circleBtnClick" :style="{display:showMainContent === true?'block':'none'}"/>
-            <QuickPositioning :positionData="layoutData.showModule" @quickPosition="onQuickPositioning"
-                              :style="{display:showMainContent === true?'flex':'none'}"/>
-            <router-view></router-view>
-        </template>
-    </div>
+  <div class="main-platform-style" id="mainPlatform">
+    <a-spin
+      v-if="isLoading"
+      size="large"
+      tip="正在加载，请稍候..."
+      class="spin-style"
+    />
+    <template v-else>
+      <top-bar
+        :total_notice="totalNotice"
+        :total_todo="todo_count"
+        :unread_mail="mailCount"
+        :crmData="crmData"
+        :moduleAndLayoutData="moduleLayout"
+        ref="topBarRef"
+        @accessSubsystem="onAccessSubsystem"
+        @returnToMain="onReturnToMain"
+      />
+      <div
+        id="moduleContent"
+        class="content-style"
+        ref="contentRef"
+        :style="{ display: showMainContent === true ? 'block' : 'none' }"
+      >
+        <div class="deal-and-notice-style">
+          <Message
+            class="content-child-style"
+            style="width: calc(100% * 460 / 1680); background-color: #4baafe"
+          />
+          <Deal
+            class="content-child-style"
+            style="width: calc(100% * 642 / 1680); background-color: white"
+            :countData="todoCount"
+            @btnClick="onDealBtnClick"
+          />
+          <Application
+            class="content-child-style"
+            style="width: calc(100% * 550 / 1680); background-color: white"
+            :appData="crmData"
+            @showApp="onShowApp"
+          />
+        </div>
+        <ModuleMain
+          :moduleAndLayoutData="layoutData"
+          @accessSubsystem="onAccessSubsystem"
+        />
+      </div>
+      <FusionModalPanel
+        v-bind="modalObject"
+        @callback="modalCallback"
+        :style="{ display: showMainContent === true ? 'block' : 'none' }"
+      >
+        <component
+          v-if="modalObject.show"
+          :is="childDom"
+          v-bind="modalObject.params"
+        ></component>
+      </FusionModalPanel>
+      <circle-menu
+        class="circle-menu-style"
+        mainText="更多操作"
+        mainBtn="icon-settings"
+        :btnAry="circleBtnAry"
+        @btnClick="circleBtnClick"
+        :style="{ display: showMainContent === true ? 'block' : 'none' }"
+      />
+      <QuickPositioning
+        :positionData="layoutData.showModule"
+        @quickPosition="onQuickPositioning"
+        :style="{ display: showMainContent === true ? 'flex' : 'none' }"
+      />
+      <router-view></router-view>
+    </template>
+  </div>
 </template>
 
 <script>
-    import TopBar from './topBar/TopBar';
-    import Message from './shortcut/Message'
-    import Deal from './shortcut/Deal'
-    import Application from './shortcut/Application';
-    import OfficeMenuConfig from '../../../utils/officeMenuConfig'
-    import FusionModalPanel from '../../../components/common/fusionModal/FusionModalPanel'
-    import InterfaceConfig from './interfaceConfig'
-    import ModuleMain from './moduleAndLayout/ModuleMain'
-    import {Modal,Spin} from 'ant-design-vue'
-    import {moduleData,defaultShowModuleAndLayout,themeData} from './moduleAndLayout/moduleAndLaySettingConfig'
-    import {color} from './shortcut/appConfig'
-    import _ from 'lodash'
-    import CircleMenu from '../../../components/common/circleMenu/CircleMenu';
-    import QuickPositioning from './quickPositioning/QuickPositioning';
-    import GlobalParams from '../global_params';
-    let showMain = true;
-    export default {
-        name: "MainPlatform",
-        data:function(){
-            return{
-                showMainContent:showMain,
-                crmData:null,
-                modalObject:{
-                    show:false,
-                    modalTitle:'',
-                    destroyOnClose:true,
-                    OKButton:true,
-                    CancelButton:true,
-                    modalWidth:'50%',
-                    modalClassName:'',
-                    zIndex:100
-                },
-                // special_biz_codes_bureau:[],
-                // special_biz_codes_dept:[],
-                // special_biz_codes_person:[],
-                messageNumTimer:null,
-                moduleConfig:_.cloneDeep(GlobalParams.moduleConfig),
-                layoutData:{},
-                moduleLayout:{},
-                moduleList:[],
-                isLoading:true,
-                circleBtnAry:[
-                    {id:'toTop',icon:'icon-Uptotop-Filled',title:'回到顶部'},
-                    {id:'talk',icon:'icon-sey-talk-d-b',title:'即时通讯'},
-                    {id:'service',icon:'icon-customservice',title:'联系我们',disabled:true},
-                    {id:'video',icon:'icon-video',title:'宣传视频',disabled:true},
-                    {id:'help',icon:'icon-help',title:'使用帮助',disabled:true}],
-                todo_count:0//待办总数
-            }
-        },
-        components:{
-            ModuleMain,
-            FusionModalPanel,
-            TopBar,
-            Message,
-            Deal,
-            Application,
-            ASpin:Spin,
-            CircleMenu,
-            QuickPositioning
-        },
-        computed:{
-            totalNotice:function(){
-                return this.moduleConfig[0].count
-            },
-            mailCount:function(){
-                return this.moduleConfig[0].count
-            },
-            childDom:function () {
-                return this.modalObject && this.modalObject.url !== ""?() => import(`@/${this.modalObject.url}`):null;
-            },
-            todoCount:function () {
-                let obj = {}
-                for (let i = 1; i < this.moduleConfig.length; i++){
-                    let modal = this.moduleConfig[i];
-                    obj[modal.id] = modal.count;
-                }
-                return obj;
-            }
+import TopBar from "./topBar/TopBar";
+import Message from "./shortcut/Message";
+import Deal from "./shortcut/Deal";
+import Application from "./shortcut/Application";
+import OfficeMenuConfig from "../../../utils/officeMenuConfig";
+import FusionModalPanel from "../../../components/common/fusionModal/FusionModalPanel";
+import InterfaceConfig from "./interfaceConfig";
+import ModuleMain from "./moduleAndLayout/ModuleMain";
+import { Modal, Spin } from "ant-design-vue";
+import {
+  moduleData,
+  defaultShowModuleAndLayout,
+  themeData,
+} from "./moduleAndLayout/moduleAndLaySettingConfig";
+import { color } from "./shortcut/appConfig";
+import _ from "lodash";
+import CircleMenu from "../../../components/common/circleMenu/CircleMenu";
+import QuickPositioning from "./quickPositioning/QuickPositioning";
+import GlobalParams from "../global_params";
+let showMain = true;
+export default {
+  name: "MainPlatform",
+  data: function () {
+    return {
+      showMainContent: showMain,
+      crmData: null,
+      modalObject: {
+        show: false,
+        modalTitle: "",
+        destroyOnClose: true,
+        OKButton: true,
+        CancelButton: true,
+        modalWidth: "50%",
+        modalClassName: "",
+        zIndex: 100,
+      },
+      // special_biz_codes_bureau:[],
+      // special_biz_codes_dept:[],
+      // special_biz_codes_person:[],
+      messageNumTimer: null,
+      moduleConfig: _.cloneDeep(GlobalParams.moduleConfig),
+      layoutData: {},
+      moduleLayout: {},
+      moduleList: [],
+      isLoading: true,
+      circleBtnAry: [
+        { id: "toTop", icon: "icon-Uptotop-Filled", title: "回到顶部" },
+        { id: "talk", icon: "icon-sey-talk-d-b", title: "即时通讯" },
+        {
+          id: "service",
+          icon: "icon-customservice",
+          title: "联系我们",
+          disabled: true,
         },
-        mounted() {
-            let html = document.getElementsByTagName('html')[0];
-            html.style.overflowY = 'hidden';
-            this.getLayoutInfo()
-            // this.getCrmInfo();
-            this.$bus.on("RoleChange",this.getLayoutInfo);
-            this.$bus.on("ModuleAndLayoutChange",this.layoutChange)
-            window.closePopup=()=>{
-                this.modalObject.show = false;
-            };
-        },
-        beforeDestroy(){
-            this.$bus.off("RoleChange",this.getCrmInfo);
-            this.$bus.off("ModuleAndLayoutChange",this.layoutChange)
-            if (this.messageNumTimer !== null){
-                setInterval(this.messageNumTimer)
-                this.messageNumTimer = null;
-            }
-        },
-        methods:{
-            onDealBtnClick:function(item){
-                if (item){
-                    if (this.$refs.topBarRef){
-                        this.$refs.topBarRef.onBtnClick('noticeRemind',{messageType:'todo',todoType:item.id})
-                    }
-                }
-            },
-            onReturnToMain:function(){
-                if (this.$route.fullPath !== '/mainPlatform'){
-                    this.$refs.contentRef.scrollTop = 0;
-                    this.$router.push({name:'mainPlatform'});
-                }
-            },
-            onAccessSubsystem:function(systemData){
-                let params = {
-                    purview_code:systemData.purview_code,
-                    showOtherOneLevel:systemData.show_oneLevel === true?'showOtherOneMenu':'hideOtherOneMenu',
-                }
-
-                let qurey = {};
-                if (systemData.menu_name && Array.isArray(systemData.menu_name) && systemData.menu_name.length > 0){
-                    if (systemData.menu_name[0] && systemData.menu_name[0] !== ""){
-                        qurey.oneLevel = systemData.menu_name[0];
-                    }
-
-                    if (systemData.menu_name[1] && systemData.menu_name[1] !== ""){
-                        qurey.twoLevel = systemData.menu_name[1];
-                    }
+        { id: "video", icon: "icon-video", title: "宣传视频", disabled: true },
+        { id: "help", icon: "icon-help", title: "使用帮助", disabled: true },
+      ],
+      todo_count: 0, //待办总数
+      //   totalNotice: 0, //未读数
+    };
+  },
+  components: {
+    ModuleMain,
+    FusionModalPanel,
+    TopBar,
+    Message,
+    Deal,
+    Application,
+    ASpin: Spin,
+    CircleMenu,
+    QuickPositioning,
+  },
+  computed: {
+    totalNotice: function (e) {
+      return this.moduleConfig[0].count;
+    },
+    mailCount: function () {
+      return this.moduleConfig[0].count;
+    },
+    childDom: function () {
+      return this.modalObject && this.modalObject.url !== ""
+        ? () => import(`@/${this.modalObject.url}`)
+        : null;
+    },
+    todoCount: function () {
+      let obj = {};
+      for (let i = 1; i < this.moduleConfig.length; i++) {
+        let modal = this.moduleConfig[i];
+        obj[modal.id] = modal.count;
+      }
+      return obj;
+    },
+  },
+  mounted() {
+    let html = document.getElementsByTagName("html")[0];
+    html.style.overflowY = "hidden";
+    this.getLayoutInfo();
+    // this.getCrmInfo();
+    this.$bus.on("RoleChange", this.getLayoutInfo);
+    this.$bus.on("ModuleAndLayoutChange", this.layoutChange);
+    window.closePopup = () => {
+      this.modalObject.show = false;
+    };
+    // this.$bus.on("totalNotice", this.setTotalNotice);
+  },
+  beforeDestroy() {
+    this.$bus.off("RoleChange", this.getCrmInfo);
+    this.$bus.off("ModuleAndLayoutChange", this.layoutChange);
+    if (this.messageNumTimer !== null) {
+      setInterval(this.messageNumTimer);
+      this.messageNumTimer = null;
+    }
+  },
+  methods: {
+    // setTotalNotice(e) {
+    //   console.log(e, "eeeeee");
+    //   this.totalNotice = e;
+    // },
+    onDealBtnClick: function (item) {
+      if (item) {
+        if (this.$refs.topBarRef) {
+          this.$refs.topBarRef.onBtnClick("noticeRemind", {
+            messageType: "todo",
+            todoType: item.id,
+          });
+        }
+      }
+    },
+    onReturnToMain: function () {
+      if (this.$route.fullPath !== "/mainPlatform") {
+        this.$refs.contentRef.scrollTop = 0;
+        this.$router.push({ name: "mainPlatform" });
+      }
+    },
+    onAccessSubsystem: function (systemData) {
+      let params = {
+        purview_code: systemData.purview_code,
+        showOtherOneLevel:
+          systemData.show_oneLevel === true
+            ? "showOtherOneMenu"
+            : "hideOtherOneMenu",
+      };
 
-                    if (systemData.menu_name[2] && systemData.menu_name[1] !== ""){
-                        qurey.bussinessType = systemData.menu_name[2];
-                    }
-                }
-                this.$router.push({name:'accessSubsystem',params: params,query:qurey})
+      let qurey = {};
+      if (
+        systemData.menu_name &&
+        Array.isArray(systemData.menu_name) &&
+        systemData.menu_name.length > 0
+      ) {
+        if (systemData.menu_name[0] && systemData.menu_name[0] !== "") {
+          qurey.oneLevel = systemData.menu_name[0];
+        }
 
-            },
-            /*
-            * 快速定位
-            * */
-            onQuickPositioning:function(id){
-                let dom = document.getElementById("module_" + id);
-                if (dom){
-                    this.$refs.contentRef.scrollTop = dom.offsetTop - 100;
-                }
-            },
-            circleBtnClick:function(item){
-                switch (item.id) {
-                    case 'toTop':
-                        this.$refs.contentRef.scrollTop = 0;
-                        break;
-                    case 'talk':
-                        if (this.$refs.topBarRef){
-                            this.$refs.topBarRef.onBtnClick('noticeRemind')
-                        }
-                        break;
-                }
-            },
-            layoutChange:function (changeData) {
-                this.layoutData = changeData;
-                this.changeTheme();
-                this.calculateModuleData();
-                this.saveLayoutData();
-            },
-            changeTheme(){
-                let theme = themeData.filter((item)=>{return item.id === this.layoutData.theme})[0]
-                if(theme){
-                    Object.keys(theme).forEach((key)=>{
-                        if (key.indexOf('--') !== -1){
-                            document.documentElement.style.setProperty(key,theme[key]);
-                        }
-                    })
-                }
-            },
-            saveLayoutData:function(){
-                this.InterfaceConfig.callInterface([{
-                    url:InterfaceConfig.setupLayout.url,
-                    params:{
-                        person_id:this.BaseConfig.userInfo.person_id_cookie,
-                        role_id:this.BaseConfig.person_info_my.cur_role.role_id,
-                        layout_json:this.Base64.encode(JSON.stringify(this.layoutData))
-                    },
-                    method:InterfaceConfig.setupLayout.method,
-                    isTestLogin:InterfaceConfig.setupLayout.isTestLogin,
-                    isOfficeInterface:false
+        if (systemData.menu_name[1] && systemData.menu_name[1] !== "") {
+          qurey.twoLevel = systemData.menu_name[1];
+        }
 
-                }],(result)=>{
-                    if (result[0].data.success === false){
-                        Modal.warning({
-                            title:"布局接口错误",
-                            content:result[0].data.info,
-                            centered:true
-                        })
-                    }
-                })
+        if (systemData.menu_name[2] && systemData.menu_name[1] !== "") {
+          qurey.bussinessType = systemData.menu_name[2];
+        }
+      }
+      this.$router.push({
+        name: "accessSubsystem",
+        params: params,
+        query: qurey,
+      });
+    },
+    /*
+     * 快速定位
+     * */
+    onQuickPositioning: function (id) {
+      let dom = document.getElementById("module_" + id);
+      if (dom) {
+        this.$refs.contentRef.scrollTop = dom.offsetTop - 100;
+      }
+    },
+    circleBtnClick: function (item) {
+      switch (item.id) {
+        case "toTop":
+          this.$refs.contentRef.scrollTop = 0;
+          break;
+        case "talk":
+          if (this.$refs.topBarRef) {
+            this.$refs.topBarRef.onBtnClick("noticeRemind");
+          }
+          break;
+      }
+    },
+    layoutChange: function (changeData) {
+      this.layoutData = changeData;
+      this.changeTheme();
+      this.calculateModuleData();
+      this.saveLayoutData();
+    },
+    changeTheme() {
+      let theme = themeData.filter((item) => {
+        return item.id === this.layoutData.theme;
+      })[0];
+      if (theme) {
+        Object.keys(theme).forEach((key) => {
+          if (key.indexOf("--") !== -1) {
+            document.documentElement.style.setProperty(key, theme[key]);
+          }
+        });
+      }
+    },
+    saveLayoutData: function () {
+      this.InterfaceConfig.callInterface(
+        [
+          {
+            url: InterfaceConfig.setupLayout.url,
+            params: {
+              person_id: this.BaseConfig.userInfo.person_id_cookie,
+              role_id: this.BaseConfig.person_info_my.cur_role.role_id,
+              layout_json: this.Base64.encode(JSON.stringify(this.layoutData)),
             },
-            /*
-            * 整理版面布局页面中的应用列表数据
-            * */
-            calculateModuleData:function(){
-                this.moduleList = _.cloneDeep(moduleData)
-                if (this.crmData.length > 0){
-                    for (let i = this.moduleList.length - 1; i >= 0; i--){
-                        let selectedAry = []
-                        let moduleType = this.moduleList[i];
-                        let selectedModuleType = this.layoutData.showModule.filter((item)=>{return item.module_type_id === moduleType.module_type_id})[0]
-                        if (selectedModuleType){
-                            moduleType.module_type_name = selectedModuleType.module_type_name
-                            selectedModuleType.module_list.forEach((item)=>{
-                                selectedAry = selectedAry.concat(item.list);
-                            });
-                        }
-                        for (let j = moduleType.module_list.length - 1; j >= 0; j--){
-                            let module = moduleType.module_list[j];
-                            let isExist = true;
-                            let node = this.crmData.filter((item)=>{
-                                return item.id === module.relative_crm[0]}
-                            )[0];
-                            if (typeof (node)!== "undefined"){
-                                for (let k = 1; k < module.relative_crm.length; k++){
-                                    if (typeof (node)!== "undefined" && node.children){
-                                        let nodeAry = node.children.filter((item)=>{return item.id === module.relative_crm[k]});
-                                        if( typeof (nodeAry)!== "undefined" && nodeAry.length > 0){
-                                            node = nodeAry[0];
-                                        }else{
-                                            isExist = false;
-                                            break;
-                                        }
-                                    }else{
-                                        isExist = false;
-                                        break;
-                                    }
-                                }
-                            }else{
-                                isExist = false
-                            }
-                            if (!isExist){
-                                moduleType.module_list.splice(j,1);
-                                for (let m = 0; m < selectedModuleType.module_list.length; m++){
-                                    let b = false;
-                                    for(let n = 0; n < selectedModuleType.module_list[m].list.length; n++){
-                                        if (selectedModuleType.module_list[m].list[n] === module.module_id){
-                                            selectedModuleType.module_list[m].list.splice(n,1);
-                                            b = true;
-                                            break;
-                                        }
-                                    }
-
-                                    if (b === true){
-                                        break;
-                                    }
-                                }
-                            }else{
-                                let colorAry = color[j % 5];
-                                module.backColor = colorAry[Math.floor(Math.random() * colorAry.length)]
-                                if (selectedAry.length > 0 && selectedAry.filter((item)=>{return item === module.module_id})[0]){
-                                    let selectedModule = selectedAry.filter((item)=>{return item === module.module_id})[0];
-                                    if(selectedModule){
-                                        module.selected = true
-                                    }
-                                }
-                            }
-                        }
-                        // if (moduleType.module_list.length === 0){//类别中没有模块时，删除该类别
-                        //     this.moduleList.splice(i,1);
-                        // }
-                    }
-                }else{
-                    this.moduleList.splice(0);
-                    this.layoutData.showModule.splice(0);
+            method: InterfaceConfig.setupLayout.method,
+            isTestLogin: InterfaceConfig.setupLayout.isTestLogin,
+            isOfficeInterface: false,
+          },
+        ],
+        (result) => {
+          if (result[0].data.success === false) {
+            Modal.warning({
+              title: "布局接口错误",
+              content: result[0].data.info,
+              centered: true,
+            });
+          }
+        }
+      );
+    },
+    /*
+     * 整理版面布局页面中的应用列表数据
+     * */
+    calculateModuleData: function () {
+      this.moduleList = _.cloneDeep(moduleData);
+      if (this.crmData.length > 0) {
+        for (let i = this.moduleList.length - 1; i >= 0; i--) {
+          let selectedAry = [];
+          let moduleType = this.moduleList[i];
+          let selectedModuleType = this.layoutData.showModule.filter((item) => {
+            return item.module_type_id === moduleType.module_type_id;
+          })[0];
+          if (selectedModuleType) {
+            moduleType.module_type_name = selectedModuleType.module_type_name;
+            selectedModuleType.module_list.forEach((item) => {
+              selectedAry = selectedAry.concat(item.list);
+            });
+          }
+          for (let j = moduleType.module_list.length - 1; j >= 0; j--) {
+            let module = moduleType.module_list[j];
+            let isExist = true;
+            let node = this.crmData.filter((item) => {
+              return item.id === module.relative_crm[0];
+            })[0];
+            if (typeof node !== "undefined") {
+              for (let k = 1; k < module.relative_crm.length; k++) {
+                if (typeof node !== "undefined" && node.children) {
+                  let nodeAry = node.children.filter((item) => {
+                    return item.id === module.relative_crm[k];
+                  });
+                  if (typeof nodeAry !== "undefined" && nodeAry.length > 0) {
+                    node = nodeAry[0];
+                  } else {
+                    isExist = false;
+                    break;
+                  }
+                } else {
+                  isExist = false;
+                  break;
                 }
-                this.$set(this.moduleLayout,'module',this.moduleList);
-                this.$set(this.moduleLayout,'layout',this.layoutData.layout);
-                this.$set(this.moduleLayout,'theme',this.layoutData.theme);
-                this.$set(this.moduleLayout,'selectedList',this.layoutData.showModule);
-            },
-            getLayoutInfo:function(){
-                this.isLoading = true
-                let params = {
-                    person_id:this.BaseConfig.userInfo.person_id_cookie,
-                    role_id:this.BaseConfig.person_info_my.cur_role.role_id
+              }
+            } else {
+              isExist = false;
+            }
+            if (!isExist) {
+              moduleType.module_list.splice(j, 1);
+              for (let m = 0; m < selectedModuleType.module_list.length; m++) {
+                let b = false;
+                for (
+                  let n = 0;
+                  n < selectedModuleType.module_list[m].list.length;
+                  n++
+                ) {
+                  if (
+                    selectedModuleType.module_list[m].list[n] ===
+                    module.module_id
+                  ) {
+                    selectedModuleType.module_list[m].list.splice(n, 1);
+                    b = true;
+                    break;
+                  }
                 }
 
-                this.InterfaceConfig.callInterface([{
-                    url:InterfaceConfig.getLayout.url,
-                    params:params,
-                    method:InterfaceConfig.getLayout.method,
-                    isTestLogin:InterfaceConfig.getLayout.isTestLogin,
-                    isOfficeInterface:false
-                }],(result)=>{
-                    if (result[0].data.success === true){
-                        let data = result[0].data;
-                        this.layoutData = defaultShowModuleAndLayout;
-                        if (data.layout_json && data.layout_json !== '' && data.layout_json !== "{}"){
-                            this.layoutData = JSON.parse(data.layout_json)
-                        }else{
-                            this.layoutData = defaultShowModuleAndLayout;
-                        }
-                        this.changeTheme();
-                        this.getCrmInfo();
-                        this.isLoading = false;
-                    }else{
-                        Modal.warning({
-                            title:"布局接口错误",
-                            content:result[0].data.info,
-                            centered:true
-                        })
-                    }
-                })
-            },
-            getDesktopTodoNumbers:function(){
-                if (this.messageNumTimer !== null){//发事件，重新获取系统消息
-                    this.$bus.emit("gotoPageOne")
+                if (b === true) {
+                  break;
                 }
-                let person_id = this.Cookie.get("person_id");
-                if (person_id === null || person_id === undefined || person_id === ''){
-                    return;
-                }
-                let params = {
-                    bureau_id:this.BaseConfig.person_info_my.bureau_id,
-                    dept_id:this.BaseConfig.person_info_my.dep_id,
-                    person_id:this.BaseConfig.userInfo.person_id_cookie,
-                    identity_id:this.BaseConfig.userInfo.identity_id_cookie,
+              }
+            } else {
+              let colorAry = color[j % 5];
+              module.backColor =
+                colorAry[Math.floor(Math.random() * colorAry.length)];
+              if (
+                selectedAry.length > 0 &&
+                selectedAry.filter((item) => {
+                  return item === module.module_id;
+                })[0]
+              ) {
+                let selectedModule = selectedAry.filter((item) => {
+                  return item === module.module_id;
+                })[0];
+                if (selectedModule) {
+                  module.selected = true;
                 }
+              }
+            }
+          }
+          // if (moduleType.module_list.length === 0){//类别中没有模块时，删除该类别
+          //     this.moduleList.splice(i,1);
+          // }
+        }
+      } else {
+        this.moduleList.splice(0);
+        this.layoutData.showModule.splice(0);
+      }
+      this.$set(this.moduleLayout, "module", this.moduleList);
+      this.$set(this.moduleLayout, "layout", this.layoutData.layout);
+      this.$set(this.moduleLayout, "theme", this.layoutData.theme);
+      this.$set(this.moduleLayout, "selectedList", this.layoutData.showModule);
+    },
+    getLayoutInfo: function () {
+      this.isLoading = true;
+      let params = {
+        person_id: this.BaseConfig.userInfo.person_id_cookie,
+        role_id: this.BaseConfig.person_info_my.cur_role.role_id,
+      };
 
-                if (GlobalParams.biz_codes_bureau.length > 0){
-                    params.special_biz_codes_bureau = GlobalParams.biz_codes_bureau.join(',')
-                }
+      this.InterfaceConfig.callInterface(
+        [
+          {
+            url: InterfaceConfig.getLayout.url,
+            params: params,
+            method: InterfaceConfig.getLayout.method,
+            isTestLogin: InterfaceConfig.getLayout.isTestLogin,
+            isOfficeInterface: false,
+          },
+        ],
+        (result) => {
+          if (result[0].data.success === true) {
+            let data = result[0].data;
+            this.layoutData = defaultShowModuleAndLayout;
+            if (
+              data.layout_json &&
+              data.layout_json !== "" &&
+              data.layout_json !== "{}"
+            ) {
+              this.layoutData = JSON.parse(data.layout_json);
+            } else {
+              this.layoutData = defaultShowModuleAndLayout;
+            }
+            this.changeTheme();
+            this.getCrmInfo();
+            this.isLoading = false;
+          } else {
+            Modal.warning({
+              title: "布局接口错误",
+              content: result[0].data.info,
+              centered: true,
+            });
+          }
+        }
+      );
+    },
+    getDesktopTodoNumbers: function () {
+      if (this.messageNumTimer !== null) {
+        //发事件，重新获取系统消息
+        this.$bus.emit("gotoPageOne");
+      }
+      let person_id = this.Cookie.get("person_id");
+      if (person_id === null || person_id === undefined || person_id === "") {
+        return;
+      }
+      let params = {
+        bureau_id: this.BaseConfig.person_info_my.bureau_id,
+        dept_id: this.BaseConfig.person_info_my.dep_id,
+        person_id: this.BaseConfig.userInfo.person_id_cookie,
+        identity_id: this.BaseConfig.userInfo.identity_id_cookie,
+      };
 
-                if (GlobalParams.biz_codes_dept.length > 0){
-                    params.special_biz_codes_dept = GlobalParams.biz_codes_dept.join(',')
-                }
+      if (GlobalParams.biz_codes_bureau.length > 0) {
+        params.special_biz_codes_bureau =
+          GlobalParams.biz_codes_bureau.join(",");
+      }
 
-                if (GlobalParams.biz_codes_person.length > 0){
-                    params.special_biz_codes_person = GlobalParams.biz_codes_person.join(',')
-                }
+      if (GlobalParams.biz_codes_dept.length > 0) {
+        params.special_biz_codes_dept = GlobalParams.biz_codes_dept.join(",");
+      }
 
-                this.InterfaceConfig.callInterface([{
-                    url:InterfaceConfig.getDesktopTodoNumbers.url,
-                    params:params,
-                    method:InterfaceConfig.getDesktopTodoNumbers.method,
-                    isTestLogin:InterfaceConfig.getDesktopTodoNumbers.isTestLogin
-                }],(result)=>{
-                    if (person_id === null || person_id === undefined || person_id === ''){
-                        return;
-                    }
-                    if (result[0].data.code === 2000){
-                        let data = result[0].data.data;
-                        this.todo_count = 0;
-                        for (let i = 0; i < this.moduleConfig.length; i ++){
-                            let modal = this.moduleConfig[i];
-                            let count = 0 ;
-                            modal.biz_codes.forEach((code)=>{
-                                if (data[code]){
-                                    count += data[code]
-                                }
-                            })
-                            this.$set(modal,'count',count);
-                            if (i > 0){
-                                this.todo_count += count;
-                            }
-                        }
+      if (GlobalParams.biz_codes_person.length > 0) {
+        params.special_biz_codes_person =
+          GlobalParams.biz_codes_person.join(",");
+      }
 
-                        // this.moduleConfig[0].count = notice_all_count;
-                        if (this.messageNumTimer === null){
-                            this.messageNumTimer = setInterval(this.getDesktopTodoNumbers,30000)
-                        }
-                    }
-                })
-            },
-            getCrmInfo:function(){
-                if (this.messageNumTimer !== null){
-                    setInterval(this.messageNumTimer)
-                    this.messageNumTimer = null;
-                }
-                let person_id = this.Cookie.get("person_id");
-                if (person_id === null || person_id === undefined || person_id === ''){
-                    return;
+      this.InterfaceConfig.callInterface(
+        [
+          {
+            url: InterfaceConfig.getDesktopTodoNumbers.url,
+            params: params,
+            method: InterfaceConfig.getDesktopTodoNumbers.method,
+            isTestLogin: InterfaceConfig.getDesktopTodoNumbers.isTestLogin,
+          },
+        ],
+        (result) => {
+          if (
+            person_id === null ||
+            person_id === undefined ||
+            person_id === ""
+          ) {
+            return;
+          }
+          if (result[0].data.code === 2000) {
+            let data = result[0].data.data;
+            this.todo_count = 0;
+            for (let i = 0; i < this.moduleConfig.length; i++) {
+              let modal = this.moduleConfig[i];
+              let count = 0;
+              modal.biz_codes.forEach((code) => {
+                if (data[code]) {
+                  count += data[code];
                 }
-                let _param = {
-                    // 登录用户id
-                    person_id:this.BaseConfig.userInfo.person_id_cookie,
-                    // 登录 用户身份id
-                    identity_id:this.BaseConfig.userInfo.identity_id_cookie,
-                    // 用户返回的数据类型
-                    user_type:"4",
-                    // 父节点id
-                    parent_id:"3",
-                    // code
-                    menu_code:"001002",
-                    // 层级
-                    level:"6",
-                    // 获取菜单
-                    pur_types:"1,2,3,4",
-                    // 登录序号，代码的系统号
-                    sys_type:"0",
-                    plat:"1",
-                    pro_sys:3,
-                    role_ids:this.BaseConfig.person_info_my.cur_role.role_id
-                };
-                // 调取接口，获取当前用户权限下的菜单数据
-                this.InterfaceConfig.callInterface([{url:"base/crm/getCrmInfoByPerson",method:"get",params:_param,isTestLogin:false}],(result)=>{
-                    if (result && result.length > 0){
-                        let data = result[0].data;
-                        if ( data.success ){
-                            this.crmData = OfficeMenuConfig.getCrmData(data.result_info.list);
-                            GlobalParams.biz_codes_bureau = [];
-                            GlobalParams.biz_codes_dept = [];
-                            GlobalParams.biz_codes_person = [];
-
-                            if (this.jurisdictionIsExist(["daliyOffice","newOfficeCar","carApproval","returnApproval"])){
-                                GlobalParams.biz_codes_bureau.push("107002001")
-                            }
-                            //资产新增和导入待审批
-                            if (this.jurisdictionIsExist(["assetManagement","assetInfoManagement","assetInitialization","initializationAaudit","mechanism"])){
-                                GlobalParams.biz_codes_bureau.push("109001001")
-                                GlobalParams.biz_codes_bureau.push("109001002")
-                            }else if (this.jurisdictionIsExist(["assetManagement","assetInfoManagement","assetInitialization","initializationAaudit","deparement"])){
-                                GlobalParams.biz_codes_dept.push("109001001")
-                                GlobalParams.biz_codes_dept.push("109001002")
-                            }else if (this.jurisdictionIsExist(["assetManagement","assetInfoManagement","assetInitialization","initializationAaudit","personal"])){
-                                GlobalParams.biz_codes_person.push("109001001")
-                                GlobalParams.biz_codes_person.push("109001002")
-                            }
+              });
+              this.$set(modal, "count", count);
+              if (i > 0) {
+                this.todo_count += count;
+              }
+            }
 
-                            //入库管理待审批
-                            if(this.jurisdictionIsExist(["assetManagement","assetInfoManagement","warehousingManagement","warehousingAudit","mechanism"])){
-                                GlobalParams.biz_codes_bureau.push("109001003")
-                            }else if (this.jurisdictionIsExist(["assetManagement","assetInfoManagement","warehousingManagement","warehousingAudit","deparement"])){
-                                GlobalParams.biz_codes_dept.push("109001003")
-                            }else if (this.jurisdictionIsExist(["assetManagement","assetInfoManagement","warehousingManagement","warehousingAudit","personal"])){
-                                GlobalParams.biz_codes_person.push("109001003")
-                            }
+            // this.moduleConfig[0].count = notice_all_count;
+            if (this.messageNumTimer === null) {
+              this.messageNumTimer = setInterval(
+                this.getDesktopTodoNumbers,
+                30000
+              );
+            }
+          }
+        }
+      );
+    },
+    getCrmInfo: function () {
+      if (this.messageNumTimer !== null) {
+        setInterval(this.messageNumTimer);
+        this.messageNumTimer = null;
+      }
+      let person_id = this.Cookie.get("person_id");
+      if (person_id === null || person_id === undefined || person_id === "") {
+        return;
+      }
+      let _param = {
+        // 登录用户id
+        person_id: this.BaseConfig.userInfo.person_id_cookie,
+        // 登录 用户身份id
+        identity_id: this.BaseConfig.userInfo.identity_id_cookie,
+        // 用户返回的数据类型
+        user_type: "4",
+        // 父节点id
+        parent_id: "3",
+        // code
+        menu_code: "001002",
+        // 层级
+        level: "6",
+        // 获取菜单
+        pur_types: "1,2,3,4",
+        // 登录序号，代码的系统号
+        sys_type: "0",
+        plat: "1",
+        pro_sys: 3,
+        role_ids: this.BaseConfig.person_info_my.cur_role.role_id,
+      };
+      // 调取接口，获取当前用户权限下的菜单数据
+      this.InterfaceConfig.callInterface(
+        [
+          {
+            url: "base/crm/getCrmInfoByPerson",
+            method: "get",
+            params: _param,
+            isTestLogin: false,
+          },
+        ],
+        (result) => {
+          if (result && result.length > 0) {
+            let data = result[0].data;
+            if (data.success) {
+              this.crmData = OfficeMenuConfig.getCrmData(data.result_info.list);
+              GlobalParams.biz_codes_bureau = [];
+              GlobalParams.biz_codes_dept = [];
+              GlobalParams.biz_codes_person = [];
 
-                            //资产变更的待审批
-                            if(this.jurisdictionIsExist(["assetManagement","assetInfoManagement","assetChange","changeAudit","mechanism"])){
-                                GlobalParams.biz_codes_bureau.push("109002001")
-                            }else if (this.jurisdictionIsExist(["assetManagement","assetInfoManagement","assetChange","changeAudit","deparement"])){
-                                GlobalParams.biz_codes_dept.push("109002001")
-                            }else if (this.jurisdictionIsExist(["assetManagement","assetInfoManagement","assetChange","changeAudit","personal"])){
-                                GlobalParams.biz_codes_person.push("109002001")
-                            }
+              if (
+                this.jurisdictionIsExist([
+                  "daliyOffice",
+                  "newOfficeCar",
+                  "carApproval",
+                  "returnApproval",
+                ])
+              ) {
+                GlobalParams.biz_codes_bureau.push("107002001");
+              }
+              //资产新增和导入待审批
+              if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "assetInitialization",
+                  "initializationAaudit",
+                  "mechanism",
+                ])
+              ) {
+                GlobalParams.biz_codes_bureau.push("109001001");
+                GlobalParams.biz_codes_bureau.push("109001002");
+              } else if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "assetInitialization",
+                  "initializationAaudit",
+                  "deparement",
+                ])
+              ) {
+                GlobalParams.biz_codes_dept.push("109001001");
+                GlobalParams.biz_codes_dept.push("109001002");
+              } else if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "assetInitialization",
+                  "initializationAaudit",
+                  "personal",
+                ])
+              ) {
+                GlobalParams.biz_codes_person.push("109001001");
+                GlobalParams.biz_codes_person.push("109001002");
+              }
 
+              //入库管理待审批
+              if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "warehousingManagement",
+                  "warehousingAudit",
+                  "mechanism",
+                ])
+              ) {
+                GlobalParams.biz_codes_bureau.push("109001003");
+              } else if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "warehousingManagement",
+                  "warehousingAudit",
+                  "deparement",
+                ])
+              ) {
+                GlobalParams.biz_codes_dept.push("109001003");
+              } else if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "warehousingManagement",
+                  "warehousingAudit",
+                  "personal",
+                ])
+              ) {
+                GlobalParams.biz_codes_person.push("109001003");
+              }
 
-                            if(this.jurisdictionIsExist(["assetManagement","assetAlterationManagement","operatingDocumentProcessing","acquisitionSlip"],false)){
-                                GlobalParams.biz_codes_bureau.push("109003001")
-                            }
+              //资产变更的待审批
+              if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "assetChange",
+                  "changeAudit",
+                  "mechanism",
+                ])
+              ) {
+                GlobalParams.biz_codes_bureau.push("109002001");
+              } else if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "assetChange",
+                  "changeAudit",
+                  "deparement",
+                ])
+              ) {
+                GlobalParams.biz_codes_dept.push("109002001");
+              } else if (
+                this.jurisdictionIsExist([
+                  "assetManagement",
+                  "assetInfoManagement",
+                  "assetChange",
+                  "changeAudit",
+                  "personal",
+                ])
+              ) {
+                GlobalParams.biz_codes_person.push("109002001");
+              }
 
-                            if(this.jurisdictionIsExist(["assetManagement","assetAlterationManagement","operatingDocumentProcessing","returnReceipt"],false)){
-                                GlobalParams.biz_codes_bureau.push("109004001")
-                            }
+              if (
+                this.jurisdictionIsExist(
+                  [
+                    "assetManagement",
+                    "assetAlterationManagement",
+                    "operatingDocumentProcessing",
+                    "acquisitionSlip",
+                  ],
+                  false
+                )
+              ) {
+                GlobalParams.biz_codes_bureau.push("109003001");
+              }
 
-                            if(this.jurisdictionIsExist(["assetManagement","assetAlterationManagement","operatingDocumentProcessing","transferSlip"],false)){
-                                GlobalParams.biz_codes_bureau.push("109005001")
-                            }
+              if (
+                this.jurisdictionIsExist(
+                  [
+                    "assetManagement",
+                    "assetAlterationManagement",
+                    "operatingDocumentProcessing",
+                    "returnReceipt",
+                  ],
+                  false
+                )
+              ) {
+                GlobalParams.biz_codes_bureau.push("109004001");
+              }
 
-                            if(this.jurisdictionIsExist(["assetManagement","assetAlterationManagement","operatingDocumentProcessing","maintenanceSlip"],false)){
-                                GlobalParams.biz_codes_bureau.push("109008001")
-                            }
+              if (
+                this.jurisdictionIsExist(
+                  [
+                    "assetManagement",
+                    "assetAlterationManagement",
+                    "operatingDocumentProcessing",
+                    "transferSlip",
+                  ],
+                  false
+                )
+              ) {
+                GlobalParams.biz_codes_bureau.push("109005001");
+              }
 
-                            if(this.jurisdictionIsExist(["assetManagement","assetAlterationManagement","operatingDocumentProcessing","loanSlip"],false)){
-                                GlobalParams.biz_codes_bureau.push("109006001")
-                            }
+              if (
+                this.jurisdictionIsExist(
+                  [
+                    "assetManagement",
+                    "assetAlterationManagement",
+                    "operatingDocumentProcessing",
+                    "maintenanceSlip",
+                  ],
+                  false
+                )
+              ) {
+                GlobalParams.biz_codes_bureau.push("109008001");
+              }
 
-                            if(this.jurisdictionIsExist(["assetManagement","assetAlterationManagement","operatingDocumentProcessing","returnSlip"],false)){
-                                GlobalParams.biz_codes_bureau.push("109007001")
-                            }
+              if (
+                this.jurisdictionIsExist(
+                  [
+                    "assetManagement",
+                    "assetAlterationManagement",
+                    "operatingDocumentProcessing",
+                    "loanSlip",
+                  ],
+                  false
+                )
+              ) {
+                GlobalParams.biz_codes_bureau.push("109006001");
+              }
 
-                            if(this.jurisdictionIsExist(["assetManagement","assetAlterationManagement","operatingDocumentProcessing","scrapSlip"],false)){
-                                GlobalParams.biz_codes_bureau.push("109009001")
-                            }
+              if (
+                this.jurisdictionIsExist(
+                  [
+                    "assetManagement",
+                    "assetAlterationManagement",
+                    "operatingDocumentProcessing",
+                    "returnSlip",
+                  ],
+                  false
+                )
+              ) {
+                GlobalParams.biz_codes_bureau.push("109007001");
+              }
 
-                            if(this.jurisdictionIsExist(["assetManagement","assetAlterationManagement","operatingDocumentProcessing","disposalSlip"],false)){
-                                GlobalParams.biz_codes_bureau.push("109010001")
-                            }
+              if (
+                this.jurisdictionIsExist(
+                  [
+                    "assetManagement",
+                    "assetAlterationManagement",
+                    "operatingDocumentProcessing",
+                    "scrapSlip",
+                  ],
+                  false
+                )
+              ) {
+                GlobalParams.biz_codes_bureau.push("109009001");
+              }
 
-                            this.getDesktopTodoNumbers();
-                            this.calculateModuleData();
-                        }
-                    }
-                })
-            },
+              if (
+                this.jurisdictionIsExist(
+                  [
+                    "assetManagement",
+                    "assetAlterationManagement",
+                    "operatingDocumentProcessing",
+                    "disposalSlip",
+                  ],
+                  false
+                )
+              ) {
+                GlobalParams.biz_codes_bureau.push("109010001");
+              }
 
-            /*
-            * jurisdictionAry:[]//菜单id  从系统级别（一级）开始
-            *
-            * */
-            jurisdictionIsExist(jurisdictionAry = [],testRange=true){
-                let isExist = true;
-                if (jurisdictionAry && this.TypesCheck.isArray(jurisdictionAry) && jurisdictionAry.length > 0){
-                    let ary = this.crmData;
-                    for (let i = 0; i < jurisdictionAry.length; i++){
-                        let menuString = jurisdictionAry[i];
-                        if (ary.some((item)=>{return item.id === menuString})){
-                            let menu = ary.filter((item)=>{return item.id === menuString})[0]
-                            if ((testRange && i < jurisdictionAry.length - 2) || (testRange === false && i < jurisdictionAry.length - 1)){
-                                if (menu.children && menu.children.length > 0){
-                                    ary = menu.children;
-                                }else{
-                                    isExist = false;
-                                    break
-                                }
-                            }
-                        }else{
-                            isExist = false;
-                            break;
-                        }
-                    }
-                }else{
-                    isExist = false;
-                }
-                return isExist;
-            },
-            modalCallback:function([type]){
-                if (this.modalObject.callbak){
-                    this.modalObject.callbak(type);
-                }else{
-                    this.modalObject.show = false;
-                }
-            },
-            onShowApp:function (appData) {
-                if (appData.window_type === 'popupInPlatform'){
-                    for(let key in this.modalObject){
-                        if (appData.modal_params && appData.modal_params[key] !== null && appData.modal_params[key] !== undefined){
-                            this.modalObject[key] = appData.modal_params[key]
-                        }
-                    }
-                    if(appData.params){
-                        appData.params.appId = appData.id
-                    }else{
-                        appData.params = {appId:appData.id}
-                    }
-                    this.modalObject.show = true;
-                    this.modalObject.url = appData.app_content
-                    this.modalObject.params = appData.params
-                }else if(appData.window_type === 'accessSubsystem'){
-                    this.onAccessSubsystem(appData);
-                }
+              this.getDesktopTodoNumbers();
+              this.calculateModuleData();
             }
-        },
-        beforeRouteEnter(to, from, next) {
-            if (to.name === "accessSubsystem"){
-                showMain = false;
-            }
-            next();
-            // 在渲染该组件的对应路由被 confirm 前调用
-            // 不！能！获取组件实例 `this`
-            // 因为当守卫执行前，组件实例还没被创建
-        },
-        beforeRouteUpdate(to, from, next) {
-            if (to.name === "mainPlatform"){
-                showMain = true;
-                this.showMainContent = true;
-            }else{
-                showMain = false;
-                this.showMainContent = false;
-            }
-            next();
-            // 在当前路由改变，但是该组件被复用时调用
-            // 举例来说，对于一个带有动态参数的路径 /foo/:id，在 /foo/1 和 /foo/2 之间跳转的时候，
-            // 由于会渲染同样的 Foo 组件，因此组件实例会被复用。而这个钩子就会在这个情况下被调用。
-            // 可以访问组件实例 `this`
-        },
-    }
-</script>
-
-<style scoped lang="scss">
-    .main-platform-style{
-        height: 100%;
-        position: relative;
-        .spin-style{
-            width: 100%;
-            height: 100%;
-            display: flex;
-            flex-direction: column;
-            align-content: center;
-            align-items: center;
-            justify-items: center;
-            justify-content: center;
+          }
         }
-        .content-style{
-            height: calc(100% - 100px);
-            padding: 14px 28px;
-            overflow-y: scroll;
-            background-color: #F8F9FB;
-            .deal-and-notice-style{
-                width: 100%;
-                display: flex;
-                justify-content: space-between;
-                .content-child-style{
-                    height: 320px;
-                }
+      );
+    },
+
+    /*
+     * jurisdictionAry:[]//菜单id  从系统级别（一级）开始
+     *
+     * */
+    jurisdictionIsExist(jurisdictionAry = [], testRange = true) {
+      let isExist = true;
+      if (
+        jurisdictionAry &&
+        this.TypesCheck.isArray(jurisdictionAry) &&
+        jurisdictionAry.length > 0
+      ) {
+        let ary = this.crmData;
+        for (let i = 0; i < jurisdictionAry.length; i++) {
+          let menuString = jurisdictionAry[i];
+          if (
+            ary.some((item) => {
+              return item.id === menuString;
+            })
+          ) {
+            let menu = ary.filter((item) => {
+              return item.id === menuString;
+            })[0];
+            if (
+              (testRange && i < jurisdictionAry.length - 2) ||
+              (testRange === false && i < jurisdictionAry.length - 1)
+            ) {
+              if (menu.children && menu.children.length > 0) {
+                ary = menu.children;
+              } else {
+                isExist = false;
+                break;
+              }
             }
+          } else {
+            isExist = false;
+            break;
+          }
+        }
+      } else {
+        isExist = false;
+      }
+      return isExist;
+    },
+    modalCallback: function ([type]) {
+      if (this.modalObject.callbak) {
+        this.modalObject.callbak(type);
+      } else {
+        this.modalObject.show = false;
+      }
+    },
+    onShowApp: function (appData) {
+      if (appData.window_type === "popupInPlatform") {
+        for (let key in this.modalObject) {
+          if (
+            appData.modal_params &&
+            appData.modal_params[key] !== null &&
+            appData.modal_params[key] !== undefined
+          ) {
+            this.modalObject[key] = appData.modal_params[key];
+          }
         }
-        .circle-menu-style{
-            top: calc(50vh - 24px);
+        if (appData.params) {
+          appData.params.appId = appData.id;
+        } else {
+          appData.params = { appId: appData.id };
         }
+        this.modalObject.show = true;
+        this.modalObject.url = appData.app_content;
+        this.modalObject.params = appData.params;
+      } else if (appData.window_type === "accessSubsystem") {
+        this.onAccessSubsystem(appData);
+      }
+    },
+  },
+  beforeRouteEnter(to, from, next) {
+    if (to.name === "accessSubsystem") {
+      showMain = false;
     }
+    next();
+    // 在渲染该组件的对应路由被 confirm 前调用
+    // 不！能！获取组件实例 `this`
+    // 因为当守卫执行前，组件实例还没被创建
+  },
+  beforeRouteUpdate(to, from, next) {
+    if (to.name === "mainPlatform") {
+      showMain = true;
+      this.showMainContent = true;
+    } else {
+      showMain = false;
+      this.showMainContent = false;
+    }
+    next();
+    // 在当前路由改变，但是该组件被复用时调用
+    // 举例来说，对于一个带有动态参数的路径 /foo/:id，在 /foo/1 和 /foo/2 之间跳转的时候，
+    // 由于会渲染同样的 Foo 组件，因此组件实例会被复用。而这个钩子就会在这个情况下被调用。
+    // 可以访问组件实例 `this`
+  },
+};
+</script>
 
+<style scoped lang="scss">
+.main-platform-style {
+  height: 100%;
+  position: relative;
+  .spin-style {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-content: center;
+    align-items: center;
+    justify-items: center;
+    justify-content: center;
+  }
+  .content-style {
+    height: calc(100% - 100px);
+    padding: 14px 28px;
+    overflow-y: scroll;
+    background-color: #f8f9fb;
+    .deal-and-notice-style {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      .content-child-style {
+        height: 320px;
+      }
+    }
+  }
+  .circle-menu-style {
+    top: calc(50vh - 24px);
+  }
+}
 </style>
diff --git a/src/views/superFusionPlatform/messageProcessing/message/Conversation/index.vue b/src/views/superFusionPlatform/messageProcessing/message/Conversation/index.vue
index 1e4ab77..9715135 100644
--- a/src/views/superFusionPlatform/messageProcessing/message/Conversation/index.vue
+++ b/src/views/superFusionPlatform/messageProcessing/message/Conversation/index.vue
@@ -20,12 +20,12 @@
       <vue-scroll style="height: calc(100% - 40px)">
         <ConversationItem
           v-for="(item, index) in this.list"
-          :key="item.senderUserId"
+          :key="index"
           :value="item"
-          :ind="index"
-          :nowIndex.sync="nowConversationIndex"
-          :targetId.sync="targetId"
-          :nowInfo.sync="nowInfo"
+          :v-if="showCard"
+          :nowTargetId.sync="nowTargetId"
+          :target_info="target_info"
+          :user_info="user_info"
         >
         </ConversationItem>
       </vue-scroll>
@@ -41,12 +41,15 @@ export default {
   data() {
     return {
       list: [],
-      nowConversationIndex: 0,
+      nowTargetId: "",
       targetId: "",
-      nowInfo: {
-        targetId: "",
-        type: 0,
-      },
+      // nowInfo: {
+      //   targetId: "",
+      //   type: 0,
+      // },
+      showCard: false,
+      target_info: {},
+      user_info: {},
     };
   },
   components: {
@@ -55,37 +58,51 @@ export default {
     AInput: Input,
     ConversationItem,
   },
-  props: ["getTargetId"],
   mounted() {
-    console.log(this, "this111111");
     this.rongyunIMCGetList();
     this.$bus.on("rongyunIMCGetList", this.rongyunIMCGetList);
+    this.$bus.on("setNowIndex", this.setNowIndex);
+
+    this.target_info = JSON.parse(localStorage.getItem("conversation_info"));
+    this.user_info = JSON.parse(localStorage.getItem("user_info"));
+    this.nowTargetId = this.target_info.targetId;
   },
   watch: {
     // 根据列表页面发回的targetid获取聊天记录
     // targetId(e) {
     //   this.$bus.emit("getList", e, 1);
     // },
-    nowInfo(e) {
-      // console.log(e, "nowInfo");
-
-      this.$bus.emit("getList", e.targetId, e.type);
-    },
+    // nowInfo(e) {
+    // console.log(e, "nowInfo");
+    // this.$bus.emit("getList", e.targetId, e.type);
+    // },
     // list(e) {
-    //   console.log(e, "e list");
+    // e[0] ? (this.nowTargetId = e[0].targetId) : "";
     // },
   },
+
   methods: {
+    //设置当前索引
+    // setNowIndex(e) {
+    //   this.nowTargetId = e;
+    // },
     // 获取会话列表
     rongyunIMCGetList() {
+      this.list = [];
+      this.showCard = false;
       this.RongIMClient.Conversation.getList({
         count: 30,
         startTime: 0,
         order: 0,
-      }).then((conversationList) => {
-        this.list = conversationList;
-        console.log("获取会话列表成功~", conversationList);
-      });
+      })
+        .then((conversationList) => {
+          // this.list = conversationList;
+          console.log("获取会话列表成功~", conversationList);
+          return conversationList;
+        })
+        .then((result) => {
+          this.list = result;
+        });
     },
   },
 };
diff --git a/src/views/superFusionPlatform/messageProcessing/message/MessageList/index.vue b/src/views/superFusionPlatform/messageProcessing/message/MessageList/index.vue
index aa2190e..7979745 100644
--- a/src/views/superFusionPlatform/messageProcessing/message/MessageList/index.vue
+++ b/src/views/superFusionPlatform/messageProcessing/message/MessageList/index.vue
@@ -1,98 +1,94 @@
 <template>
   <div class="message-list">
-    <h2 class="title">
-      <a-avatar :size="34" :src="avatar" style="background-color: #f59a23">
+    <div
+      v-if="!isMessage"
+      style="background-color: #f2f2f2; height: 100%; overfllow: hidden"
+    ></div>
+    <div v-if="isMessage">
+      <h2 class="title">
+        <a-avatar :size="34" :src="avatar" style="background-color: #f59a23">
+          {{ name }}
+        </a-avatar>
         {{ name }}
-      </a-avatar>
-      {{ name }}
 
-      <a-button
-        v-if="type == 1"
-        size="small"
-        icon="file-search"
-        type="link"
-        class="more-btn"
-        style="float: right; margin-top: 3px"
-        @click="drawerVisible('Record')"
-      />
-      <a-button
-        v-if="type == 3"
-        size="small"
-        icon="file-search"
-        type="link"
-        class="more-btn"
-        style="float: right; margin-top: 3px"
-        @click="drawerVisible('GroupChatRecord')"
-      />
-      <a-button
-        v-if="type == 3"
-        icon="setting"
-        size="small"
-        type="link"
-        style="float: right; margin-top: 3px"
-        @click="drawerVisible('GroupSetting')"
-      />
-    </h2>
-
-    <div class="message-item" style="overflow-y: scroll" ref="msgList">
-      <!-- <MessagePrivate :messageResult="messageResult" /> -->
-      <!-- 聊天窗口 -->
-      <ul class="msg-list">
-        <!-- <MessagePrivate
-          v-for="(MsgObj, index) in messageResult"
-          :key="index"
-          :index="index"
-          :MsgObj="MsgObj"
-        >
-        </MessagePrivate> -->
-        <Message :messageResult="messageResult" :type="type" />
-      </ul>
-    </div>
-
-    <div class="message-tools">
-      <a-button icon="search" size="small" type="link" />
-    </div>
-
-    <div>
-      <InputTextArea
-        ref="TextArea"
-        style="border: 0"
-        :rows="3"
-        class="textarea"
-        v-model="textdata"
-      />
-      <span>
         <a-button
+          v-if="type == 1"
           size="small"
+          icon="file-search"
           type="link"
           class="more-btn"
-          @click="handelSendMessage(0, {})"
           style="float: right; margin-top: 3px"
-          >发送</a-button
-        >
-      </span>
-    </div>
+          @click="drawerVisible('Record')"
+        />
+        <a-button
+          v-if="type == 3"
+          size="small"
+          icon="file-search"
+          type="link"
+          class="more-btn"
+          style="float: right; margin-top: 3px"
+          @click="drawerVisible('GroupChatRecord')"
+        />
+        <a-button
+          v-if="type == 3"
+          icon="setting"
+          size="small"
+          type="link"
+          style="float: right; margin-top: 3px"
+          @click="drawerVisible('GroupSetting')"
+        />
+      </h2>
+
+      <div class="message-item" style="overflow-y: scroll" ref="msgList">
+        <ul class="msg-list">
+          <Message :messageResult="messageResult" :type="type" />
+        </ul>
+      </div>
 
-    <!-- 抽屉 -->
-    <a-drawer
-      placement="right"
-      :closable="true"
-      :visible="visible"
-      :get-container="false"
-      :wrap-style="{ position: 'absolute' }"
-      @close="onClose"
-      width="350"
-    >
-      <Record v-if="drawerType == 'Record'" />
-      <GroupSetting v-if="drawerType == 'GroupSetting'" />
-      <GroupChatRecord v-if="drawerType == 'GroupChatRecord'" />
-    </a-drawer>
+      <div class="message-tools">
+        <a-button icon="search" size="small" type="link" />
+      </div>
+
+      <div>
+        <InputTextArea
+          ref="TextArea"
+          style="border: 0"
+          :rows="3"
+          class="textarea"
+          v-model="textdata"
+        />
+        <span>
+          <a-button
+            size="small"
+            type="link"
+            class="more-btn"
+            @click="handelSendMessage(0, {})"
+            style="float: right; margin-top: 3px"
+            >发送</a-button
+          >
+        </span>
+      </div>
+
+      <!-- 抽屉 -->
+      <a-drawer
+        placement="right"
+        :closable="true"
+        :visible="visible"
+        :get-container="false"
+        :wrap-style="{ position: 'absolute' }"
+        @close="onClose"
+        width="350"
+      >
+        <Record v-if="drawerType == 'Record'" />
+        <GroupSetting v-if="drawerType == 'GroupSetting'" />
+        <GroupChatRecord v-if="drawerType == 'GroupChatRecord'" />
+      </a-drawer>
+    </div>
   </div>
 </template>
 
 <script>
 import { Avatar, Button, Input, Drawer } from "ant-design-vue";
-import MessagePrivate from "./MessagePrivate.vue";
 import Message from "./Message.vue";
 import GroupChatRecord from "./GroupChatRecord.vue";
 import GroupSetting from "./GroupSetting.vue";
@@ -103,6 +99,7 @@ export default {
     return {
       name: "",
       avatar: "",
+      message: "message",
       data: {},
       visible: false,
       messageResult: [],
@@ -111,6 +108,9 @@ export default {
       textdata: "",
       targetid: "",
       type: 0,
+      isMessage: false,
+      user_info: {},
+      target_info: {},
     };
   },
   components: {
@@ -118,7 +118,6 @@ export default {
     InputTextArea: Input.TextArea,
     AButton: Button,
     AAvatar: Avatar,
-    MessagePrivate,
     Record,
     Message,
     GroupChatRecord,
@@ -126,69 +125,73 @@ export default {
   },
   mounted() {
     // 第一次进入获取数据
-    setTimeout(() => {
-      // 本地存储拿数据渲染信息
-      const conversation_info = JSON.parse(
-        localStorage.getItem("conversation_info")
-      );
-      this.name = conversation_info.person_name;
-      this.avatar = conversation_info.avatar;
-      this.type = conversation_info.type;
-      this.targetid = conversation_info.targetId;
-      // this.getList(conversation_info.targetId, conversation_info.type);
-      console.log(conversation_info, 999999);
-    }, 1000);
+    // 本地存储拿数据渲染信息
+    this.user_info = JSON.parse(localStorage.getItem("user_info"));
+    this.target_info = JSON.parse(localStorage.getItem("conversation_info"));
+
+    if (this.target_info.user_id == this.user_info.id) {
+      this.isMessage = true;
+      this.getList(this.target_info.targetId, this.target_info.type);
+    }
+
+    const name =
+      this.target_info.type == 1
+        ? this.target_info.person_name
+        : this.target_info.group_name;
+    this.setNowMessageInfo(
+      name,
+      this.target_info.avatar,
+      this.target_info.type,
+      this.target_info.targetId
+    );
+    /*  =============================================================      */
     // 派发获取列表事件
     this.$bus.on("getList", this.getList);
     // 派发滚动条到底部事件
     this.$bus.on("_scroll", this._scroll);
     // 派发发送消息事件
     this.$bus.on("handelSendMessage", this.handelSendMessage);
-    console.log(this.type, "messageResult");
-    this.$refs.TextArea.focus();
+    //聊天窗口焦点（不好使）
+    // this.$refs.TextArea.focus();
+    //聊天信息获取
+    this.$bus.on("setNowMessageInfo", this.setNowMessageInfo);
   },
   methods: {
+    // 修改当前聊天框显示
+    setNowMessageInfo(name, avatar, type, targetId) {
+      console.log(name, avatar, type, targetId, "5555555555555555555555");
+      this.name = name;
+      this.avatar = avatar;
+      this.type = type;
+      this.targetId = targetId;
+    },
     // 渲染 并 发送 ==> 信息 type= 自己发送，
     handelSendMessage(sendType = 0, message = {}) {
       const user_info = JSON.parse(localStorage.getItem("user_info"));
-      const conversation_info = JSON.parse(
-        localStorage.getItem("conversation_info")
-      );
+
       if (sendType == 0) {
         message = {
           content: { content: this.textdata },
-          expansion: {
-            person_name: user_info.name,
-            person_avatar: user_info.avatar,
-            target_name: conversation_info.person_name,
-            target_avatar: conversation_info.avatar,
-          },
-          type: this.type,
+
+          type: this.target_info.type,
           messageType: "RC:TxtMsg",
           senderUserId: user_info.id,
-          targetId: this.targetid,
+          targetId: this.target_info.targetId,
           sentTime: new Date().getTime(),
         };
-        // this.rongYunSend(
-        //   conversation_info.targetId,
-        //   this.textdata,
-        //   this.type,
-        //   "RC:TxtMsg"
-        // );
+
         console.log(message, "message 未发送");
         this.rongYunSend(message);
       }
       console.log(message, sendType, "handelSendMessage");
       // push进数组数据
       this.messageResult.push(message);
-      // console.log(conversation_info, "conversation_info");
-      // console.log(this.messageResult, "messageresult");
     },
     // 发送消息
     // rongYunSend(targetId, content, type, messageType) {
     rongYunSend(message) {
       const _this = this;
-      console.log(message, "send target Id");
+      // console.log(message, "send target Id");
       var conversation = this.RongIMClient.Conversation.get({
         targetId: message.targetId,
         type: message.type,
@@ -209,6 +212,7 @@ export default {
           console.log("发送文字消息成功a", message);
           this.saveMessage(message);
           _this.$bus.emit("rongyunIMCGetList");
+          _this.$bus.$emit("setNowIndex", 0);
           return message;
         });
     },
@@ -258,15 +262,10 @@ export default {
     },
     // 获取聊天列表
     getList(targetId, type) {
-      console.log(targetId, type, "getList");
+      console.log(targetId, type, "getList111a");
       this.messageResult = [];
-      const conversation_info = JSON.parse(
-        localStorage.getItem("conversation_info")
-      );
 
-      this.name = conversation_info.person_name;
-      this.avatar = conversation_info.avatar;
-      this.type = conversation_info.type;
+      this.type = this.target_info.type;
 
       // console.log(targetId, type, "targetId222");
       var conversation = this.RongIMClient.Conversation.get({
@@ -279,7 +278,7 @@ export default {
       };
       conversation.getMessages(option).then((result) => {
         const res = result.list;
-        console.log(result.list, "msgObj result.list");
+        // console.log(result.list, "msgObj result.list");
         this.messageResult = result.list;
       });
     },
@@ -298,6 +297,7 @@ export default {
   background-color: #f2f2f2;
   width: 70%;
   position: relative;
+  height: 100%;
   overflow: hidden;
   float: left;
   .title {