Bladeren bron

feat(staff): correct the name for colum

gemercheung 3 jaren geleden
bovenliggende
commit
c007a36089

+ 1 - 0
src/api/scene/list.ts

@@ -5,6 +5,7 @@ import { Result } from '/#/axios';
 enum Api {
   pageList = '/zfb-api/zfb/scene/pageList',
   generateSceneEditToken = '/zfb-api/zfb/api/platform/generateSceneEditToken',
+  getDownloadProcess = '/zfb-api/zfb/scene/getDownloadProcess"',
 }
 
 /**

+ 2 - 2
src/layouts/default/header/components/user-dropdown/index.vue

@@ -77,8 +77,8 @@
       const go = useGo();
 
       const getUserInfo = computed(() => {
-        const { realName = '', avatar, desc } = userStore.getUserInfo || {};
-        return { realName, avatar: avatar || headerImg, desc };
+        const { realName = '', head, desc } = userStore.getUserInfo || {};
+        return { realName, avatar: head || headerImg, desc };
       });
 
       const [register, { openModal }] = useModal();

+ 5 - 1
src/views/scenes/list.vue

@@ -47,6 +47,8 @@
   import { ListApi, generateSceneEditTokenApi } from '/@/api/scene/list';
   import { useI18n } from '/@/hooks/web/useI18n';
 
+  import { useUserStore } from '/@/store/modules/user';
+
   export default defineComponent({
     components: { BasicTable, TableAction, TableImg },
     setup() {
@@ -177,9 +179,11 @@
       });
       async function openSceneEditor(record: Recordable) {
         const url = record.webSite.replace('smobile', 'epc') + '&menu=business&token=';
+        const userStore = useUserStore();
+        console.log('userStore', userStore.getUserInfo);
         const data = await generateSceneEditTokenApi({
           sceneNum: record.num,
-          userName: '17324327132',
+          userName: userStore.getUserInfo?.phone,
         });
         window.open(url + data.message);
       }

+ 33 - 4
src/views/staff/list.vue

@@ -48,6 +48,30 @@
   import { useGo } from '/@/hooks/web/usePage';
   import { Time } from '/@/components/Time';
 
+  //   appid: null
+  // companyId: 1107
+  // companyName: "南山居"
+  // createTime: 1644801035000
+  // createUser: "11111111111"
+  // fdkkPassword: null
+  // fdkkUser: null
+  // head: null
+  // id: 20356
+  // memoName: "顶顶顶顶"
+  // message: null
+  // nickName: "用户13822221234"
+  // phone: "13822221234"
+  // roleIdList: null
+  // roleList: null
+  // roleName: "公司员工"
+  // state: null
+  // token: null
+  // type: 1
+  // updateTime: 1644801035000
+  // updateUser: "11111111111"
+  // userName: "13822221234"
+  // userPassword: "2a22bac40f44af4d3b5fdc20ea706fc5"
+
   export default defineComponent({
     components: { BasicTable, TableAction, Time },
     setup() {
@@ -57,23 +81,28 @@
       const columns: BasicColumn[] = [
         {
           title: 'ID',
-          dataIndex: 'userId',
+          dataIndex: 'id',
           fixed: 'left',
           width: 60,
         },
         {
           title: '所属公司',
-          dataIndex: 'deptName',
+          dataIndex: 'companyName',
           width: 160,
         },
         {
           title: '员工名称',
-          dataIndex: 'username',
+          dataIndex: 'userName',
+          width: 80,
+        },
+        {
+          title: '员工妮称',
+          dataIndex: 'nickName',
           width: 80,
         },
         {
           title: '手机',
-          dataIndex: 'mobile',
+          dataIndex: 'phone',
           width: 80,
         },
         {

+ 20 - 0
types/store.d.ts

@@ -38,6 +38,26 @@ export interface UserInfo {
   desc?: string;
   homePath?: string;
   roles: RoleInfo[];
+
+  updateTime: string;
+  updateUser: string;
+  appid: number;
+  companyId: number;
+  companyName: string;
+  createTime: number;
+  createUser: string;
+  fdkkUser: string;
+  head: string;
+  memoName: string;
+  message: string;
+  nickName: string;
+  phone: string;
+  roleIdList: number[];
+  roleList: string;
+  roleName: string;
+  state: string;
+  token: string;
+  type: number;
 }
 
 export interface BeforeMiniState {