li.shaoyi 3 سال پیش
والد
کامیت
744a66b36a
3فایلهای تغییر یافته به همراه3 افزوده شده و 5 حذف شده
  1. 1 1
      src/services/bus/user.ts
  2. 0 2
      src/services/socket/protobuf/buildReq.ts
  3. 2 2
      src/views/report/components/filter/index.vue

+ 1 - 1
src/services/bus/user.ts

@@ -48,7 +48,7 @@ export function getAreaUserId(): number {
 /**
 /**
  * 获取所属机构名称
  * 获取所属机构名称
  */
  */
-export function getAreaUserName(): number {
+export function getAreaUserName(): string {
     return APP.get('userAccount').accountname
     return APP.get('userAccount').accountname
 }
 }
 
 

+ 0 - 2
src/services/socket/protobuf/buildReq.ts

@@ -186,8 +186,6 @@ function parseSoleProtoRsp(rspPackage: any, funCodeName: string): ParseRsp {
     const reqPackage = ProtobufCtr.generateProtoContent(funCodeName, rspPackage.content);
     const reqPackage = ProtobufCtr.generateProtoContent(funCodeName, rspPackage.content);
     const { RetCode, Status, RetDesc } = reqPackage;
     const { RetCode, Status, RetDesc } = reqPackage;
 
 
-    console.log('protobuf回调===================================================================================', reqPackage)
-
     if (RetCode !== null) {
     if (RetCode !== null) {
         if (RetCode === 0) {
         if (RetCode === 0) {
             return { isSuccess: true, result: reqPackage };
             return { isSuccess: true, result: reqPackage };

+ 2 - 2
src/views/report/components/filter/index.vue

@@ -27,7 +27,7 @@ import { initData } from '@/common/methods';
 import { SelectOption } from '@/common/setup/filter/interface';
 import { SelectOption } from '@/common/setup/filter/interface';
 import { handlerManagerList } from '@/common/setup/user';
 import { handlerManagerList } from '@/common/setup/user';
 import { getUserId } from '@/services/bus/user';
 import { getUserId } from '@/services/bus/user';
-import { getUserName } from '@/services/bus/user';
+import { getAreaUserName } from '@/services/bus/user';
 import { defineComponent, ref } from 'vue';
 import { defineComponent, ref } from 'vue';
 import { handleReprotType } from '../../setup';
 import { handleReprotType } from '../../setup';
 
 
@@ -67,7 +67,7 @@ export default defineComponent({
           userList.value.push({ value: id, lable: has.rolename });
           userList.value.push({ value: id, lable: has.rolename });
         } else {
         } else {
           // 没有找到代表着是机构,可以查看所有交易用户,不能查看交易员
           // 没有找到代表着是机构,可以查看所有交易用户,不能查看交易员
-          userList.value.push({ value: id, lable: getUserName() });
+          userList.value.push({ value: id, lable: getAreaUserName() });
           res.forEach((e) => {
           res.forEach((e) => {
             userList.value.push({ value: e.roleid, lable: e.rolename });
             userList.value.push({ value: e.roleid, lable: e.rolename });
             // e.userlist.forEach((el) => {
             // e.userlist.forEach((el) => {