updat

src/services/company.js

@@ -0,0 +1,8 @@
+import { fetchApi, wrapErrorHint } from '@/utils/request';
+
+
+
+export async function queryCompanyById(companyId) {
+  const res = await fetchApi('company/queryCompanyById', { id: companyId });
+  return wrapErrorHint(res);
+}

src/views/components_web/head/head.vue

@@ -373,7 +373,7 @@
         <div class="yiyun_headerfr yiyun_headerfradmin yiyun-2">
           <a @click="logOut" class="nullclass">退出</a>
           <a @click="openSetPain" class="nullclass huiclass">{{
-            user.cnName
+            user.userName
           }}</a>
         </div>
       </div>

src/views/manage_company/message.vue

@@ -12,7 +12,7 @@
       <section class="title_section">
         <div class="EC_col_8">
           <div class="adminnavBox">
-            <h3>你好,{{this.cnName}}</h3>
+            <h3>你好,{{cnName}}</h3>
           </div>
         </div>
       </section>
@@ -22,13 +22,13 @@
             <div class="admin_treeBox navtree wirteBg">
               <div class="companylogoBox">
                 <div class="companylogoImgBox">
-                  <img class="imgHead" :src="imgSrc + currentCompany.logoUrl" />
+                  <img class="imgHead" :src="company.LogoUrl | resolveAvator" />
                 </div>
               </div>
               <div class="mlr-10">
                 <div class="yiyunTable_list_item">
                   <div class="mlr-10">
-                    <h3 class="secondListTitle">{{ companyName }}</h3>
+                    <h3 class="secondListTitle">{{ company.CompanyName }}</h3>
                   </div>
                   <div class="mlr-10">
                     <div class="border-line_light"></div>
@@ -36,11 +36,11 @@
                   <div class="mlr-10">
                     <div class="desclabel">
                       <label for="">成员</label>
-                      <span>{{ CompanyInfo.UserCount }}人</span>
+                      <span>{{ company.userNum }}人</span>
                     </div>
                     <div class="desclabel">
                       <label for="">部门</label>
-                      <span>{{ CompanyInfo.DeptCount }}个</span>
+                      <span>{{ company.deptNum }}个</span>
                     </div>
                   </div>
                 </div>
@@ -142,44 +142,46 @@
 </template>
 <script>
   import Vue from "vue";
-  import fileUploader from "@/components/fileUploader/Index";
-  Vue.use(fileUploader);
+  import * as companyService from '@/services/company';
   export default {
     elNew: "#app",
     data() {
       return {
-        imgSrc: process.env.API_HOST + "archives/head?path=",
+        // imgSrc: process.env.API_HOST + "archives/head?path=",
         currentPain: "1", // 右侧默认面板
         firstMsg: {}, // 第一条消息
         listMsg: [], // 当前消息列表
         listAllMsg: [], // 全部消息列表
-        CompanyInfo: "", // 企业总体信息
-        companyName: sessionStorage.companyName, // 企业名称
-        currentCompany: {}, // 当前企业信息
+        // CompanyInfo: "", // 企业总体信息
+        // companyName: sessionStorage.companyName, // 企业名称
+        // currentCompany: {}, // 当前企业信息
+
+        /* ---------- */
         cnName: '', // 当前用户姓名
+        company: {},
       };
     },
     mounted: function () {
       // this.loadMsgList();
       this.loadMsgListAll();
-      this.loadCompanyInfo();
-      this.loadCurrentCompany();
-      this.cnName = JSON.parse(sessionStorage.user).cnName;
+      // this.loadCompanyInfo();
+      
+      const appState = this.$store.state;
+      console.log(appState);
+      this.cnName = appState.userName;
+      this.loadCurrentCompany(appState.currentCompanyId);
     },
     methods: {
       /**
        * 获取当前企业及法人信息
        */
-      loadCurrentCompany: function () {
-        var thisApp = this;
-        this.$axios({
-          method: "get",
-          url: encodeURI(
-            process.env.API_HOST + "sysinfo/companys/" + sessionStorage.companyId
-          )
-        }).then(response => {
-          thisApp.currentCompany = response.data;
-        });
+      async loadCurrentCompany(companyId) {
+        const res = await companyService.queryCompanyById(companyId);
+        if(res.Code !== 0) return;
+        const { company, deptNum, userNum } = res.Data;
+        this.company = company;
+        this.company.deptNum = deptNum;
+        this.company.userNum = userNum;
       },
       /**
        * @description: 查看全部消息
@@ -258,19 +260,19 @@
       /**
        * 获取企业整体信息情况
        */
-      loadCompanyInfo: function () {
-        var thisApp = this;
-        this.$axios({
-          method: "get",
-          url: encodeURI(
-            process.env.API_HOST +
-            "sysinfo/company/situation/" +
-            sessionStorage.companyId
-          )
-        }).then(response => {
-          thisApp.CompanyInfo = response.data;
-        });
-      }
+      // loadCompanyInfo: function () {
+      //   var thisApp = this;
+      //   this.$axios({
+      //     method: "get",
+      //     url: encodeURI(
+      //       process.env.API_HOST +
+      //       "sysinfo/company/situation/" +
+      //       sessionStorage.companyId
+      //     )
+      //   }).then(response => {
+      //     thisApp.CompanyInfo = response.data;
+      //   });
+      // }
     }
   };
 </script>