Your Name
2023-02-24 cb45797bbbb28fb67a48d6aa395242deddb3ddb6
更新
已修改4个文件
已添加2个文件
67 ■■■■■ 文件已修改
src/assets/menu/company.png 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/menu/icon.jpg 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/navBars/breadcrumb/user.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/projectDialog.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/index.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/user/index.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/menu/company.png
src/assets/menu/icon.jpg
src/layout/navBars/breadcrumb/user.vue
@@ -1,11 +1,11 @@
<template>
    <div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
        <div class="logo">
            <img @click="toHome" src="../../../assets/menu/companyLogo.png" />
            <img @click="toHome" src="../../../assets/menu/company.png" />
            <span>{{ systemName }}</span>
        </div>
        <div style="display: flex; align-items: center; padding-right: 5px">
            <div @click="backToMenu()" class="backBtn">返回首页</div>
<!--            <div @click="backToMenu()" class="backBtn">返回首页</div>-->
            <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
                <div class="layout-navbars-breadcrumb-user-icon">
                    <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>
@@ -57,7 +57,7 @@
            </div>
            <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
                <span class="layout-navbars-breadcrumb-user-link">
                    <img src="../../../assets/avator.png" class="layout-navbars-breadcrumb-user-link-photo mr5" style="width: 24px;height: 24px"/>
                    <img src="../../../assets/menu/icon.jpg" class="layout-navbars-breadcrumb-user-link-photo mr5" style="width: 24px;height: 24px"/>
                    {{ userInfos.userName }}
                    <el-icon class="el-icon--right">
                        <ele-ArrowDown />
@@ -262,12 +262,12 @@
                console.log('有问题');
            }
        };
        const backToMenu = () => {
            router.push({ path: 'newMenu' }).then(()=>{
                routeList.routesList.value = []
                console.log(routeList);
            });
        };
        // const backToMenu = () => {
        //     router.push({ path: 'newMenu' }).then(()=>{
        //         routeList.routesList.value = []
        //         console.log(routeList);
        //     });
        // };
        const toHome = () => {
            router.push({ path: 'newMenu' });
        };
@@ -281,7 +281,6 @@
        });
        return {
            userInfos,
            backToMenu,
            toHome,
            onLayoutSetingClick,
            onHandleCommandClick,
src/views/experiment/project/components/projectDialog.vue
@@ -37,10 +37,10 @@
                        <td class="w-16 m-color">
                            <el-select :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.liabilityUserId" clearable filterable>
                                <el-option
                                    v-for="item in projectDialogState.allPersonList"
                                    v-for="item in projectDialogState.systemPersonList"
                                    :key="item.id"
                                    :value="item.id"
                                    :label="item.personName"
                                    :label="item.realName"
                                ></el-option>
                            </el-select>
                        </td>
@@ -237,6 +237,7 @@
import {ElMessage} from "element-plus";
import {projectApi} from "/@/api/experiment/project";
import {personApi} from "/@/api/basic/person";
import {userApi} from "/@/api/systemManage/user";
const SelectEquipment = defineAsyncComponent(() => import('./selectEquipment.vue'))
const SelectMaterial = defineAsyncComponent(() => import('./selectMaterial.vue'))
@@ -297,6 +298,7 @@
    },
    allPersonList: [],
    allRoomList: [],
    systemPersonList: [],
})
const showProjectDialog = (title: string, value: ProjectType, allRoomList: RoomType []) => {
@@ -407,6 +409,24 @@
    })
};
const getPersonList = async () => {
    let res = await userApi().getUserList({
        roleId: 1,
        usePage: false,
        pageIndex: 1,
        pageSize: 10
    });
    if(res.data.code === 100){
        debugger
        projectDialogState.systemPersonList = JSON.parse(JSON.stringify(res.data.data));
    }else{
        ElMessage({
            type: 'warning',
            message: res.data.msg
        })
    }
};
const getAllPersonList = async () => {
    let res = await personApi().getAllPerson();
    if(res.data.code === 100){
@@ -427,6 +447,7 @@
onMounted(() => {
    getAllPersonList();
    getPersonList();
});
</script>
src/views/experiment/project/index.ts
@@ -66,6 +66,7 @@
    },
    allPersonList: Array<AllPersonListType>
    systemPersonList: Array<SystemPersonType>
    allRoomList: Array<RoomType>
}
src/views/system/user/index.vue
@@ -2,7 +2,7 @@
    <div class="system-user-container">
        <el-card shadow="hover">
            <div class="system-user-search mb15">
                <el-input size="default" v-model.trim="userTableData.listQuery.roleId" placeholder="请输入用户名" style="max-width: 180px"> </el-input>
<!--                <el-input size="default" v-model.trim="userTableData.listQuery.roleId" placeholder="请输入用户名" style="max-width: 180px"> </el-input>-->
                <el-button size="default" type="primary" class="ml10" @click="initUserTableData">
                    <el-icon>
                        <ele-Search />
@@ -24,14 +24,14 @@
                <el-table-column prop="role.name" label="关联角色" show-overflow-tooltip></el-table-column>
                <el-table-column prop="department.name" label="部门" show-overflow-tooltip></el-table-column>
                <el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
                <el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column>
                <el-table-column prop="status" label="用户状态" show-overflow-tooltip>
                    <template #default="scope">
                        <el-tag type="success" v-if="scope.row.status">启用</el-tag>
                        <el-tag type="info" v-else>禁用</el-tag>
                    </template>
                </el-table-column>
                <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
<!--                <el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column>-->
<!--                <el-table-column prop="status" label="用户状态" show-overflow-tooltip>-->
<!--                    <template #default="scope">-->
<!--                        <el-tag type="success" v-if="scope.row.status">启用</el-tag>-->
<!--                        <el-tag type="info" v-else>禁用</el-tag>-->
<!--                    </template>-->
<!--                </el-table-column>-->
<!--                <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>-->
                <el-table-column label="操作" width="100">
                    <template #default="scope">
                        <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('修改', scope.row)">修改</el-button>
@@ -111,7 +111,7 @@
        // 初始化表格数据
        const initUserTableData = async () => {
            let res = await userApi().getUserList(state.userTableData.listQuery);
            if (res.data.code === '200') {
            if (res.data.code === 100) {
                state.userTableData.data = res.data.data;
                state.userTableData.total = res.data.total;
            } else {
@@ -125,7 +125,7 @@
        const getRoleData = async () => {
            let res = await useRoleApi().getRoleList();
            if (res.data.code === '200') {
            if (res.data.code === 100) {
                state.roleList = res.data.data;
            } else {
                ElMessage({