cxc/cas_cloud_admin
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
quantulr
2023-11-29 17:22:34 +08:00
parent f0bf63e43f
commit 034b27fcbe
4 changed files with 160 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/layout/components/Sidebar/SidebarItem.vue
View File

@ -1,21 +1,21 @@
<template>
<el-badge
v-if="!item.hidden"
:hidden="
![
`/approval/list`,
`/approval/dataList/approval`,
`/auditing/achievement`,
`/auditing/demand`,
`/auditing/serviceDemand`,
`/auditing/Enterpriseproducts`,
`/approval/data-list/laboratory`,
].includes(basePath)
"
:value="getCount(basePath)"
class="count-badge"
>
<div>
<!-- <el-badge-->
<!-- v-if="!item.hidden"-->
<!-- :hidden="-->
<!-- ![-->
<!-- `/approval/list`,-->
<!-- `/approval/dataList/approval`,-->
<!-- `/auditing/achievement`,-->
<!-- `/auditing/demand`,-->
<!-- `/auditing/serviceDemand`,-->
<!-- `/auditing/Enterpriseproducts`,-->
<!-- `/approval/data-list/laboratory`,-->
<!-- ].includes(basePath)-->
<!-- "-->
<!-- :value="getCount(basePath)"-->
<!-- class="count-badge"-->
<!-- >-->
<div v-if="!item.hidden">
<template
v-if="
hasOneShowingChild(item.children, item) &&
@ -44,7 +44,7 @@
:title="hasTitle(onlyOneChild.meta.title)"
class="menu-title"
>{{
["/auditing/serviceDemand"].includes(basePath)
/* ["/auditing/serviceDemand"].includes(basePath)
? `${onlyOneChild.meta.title} (${userStore.serviceDemandTotal})`
: ["/auditing/achievement"].includes(basePath)
? `${onlyOneChild.meta.title} (${userStore.achievementTotal})`
@ -52,7 +52,8 @@
? `${onlyOneChild.meta.title} (${userStore.technologyTotal})`
: ["/auditing/Enterpriseproducts"].includes(basePath)
? `${onlyOneChild.meta.title} (${userStore.productTotal})`
: onlyOneChild.meta.title
:*/
onlyOneChild.meta.title
}}</span
></template
>
@ -83,7 +84,7 @@
/>
</el-sub-menu>
</div>
</el-badge>
<!-- </el-badge>-->
</template>
<script setup>

7
src/views/components/ExpertForm/index.vue
View File

@ -204,10 +204,11 @@
<el-col :span="12">
<el-form-item label="最高学历:" prop="education">
<el-select v-model="modelValue.education" placeholder="请选择">
<el-option label="博士" value="博士"></el-option>
<!-- <el-option label="博士" value="博士"></el-option>
<el-option label="硕士" value="硕士"></el-option>
<el-option label="本科" value="本科"></el-option>
<el-option label="专科" value="专科"></el-option>
<el-option label="专科" value="专科"></el-option>-->
<el-option v-for="option in educationOptions" :key="option.key" :value="option.key" :label="option.text"/>
</el-select>
</el-form-item>
</el-col>
@ -345,7 +346,7 @@ import InputBoxAdd from "@/views/components/InputBoxAdd";
// import { researchSelect } from "@/api/dataList/research";
// import { laboratorySelect } from "@/api/dataList/laboratory";
import {tenantSelect} from "@/api/subPlatform/tenant";
import { enterpriseOptions } from "@/utils/parameter";
import {educationOptions, enterpriseOptions} from "@/utils/parameter";
import {reactive, ref, toRefs} from "vue";
import WangEditor from "@/components/WangEditor/index.vue";
// import SiteOptions from "@/views/components/SiteOptions";

7
src/views/dataList/expert/index.vue
View File

@ -75,7 +75,11 @@
<div>{{ row.industryStr }}</div>
</template>
</el-table-column>
<el-table-column align="center" label="学历" prop="education" />
<el-table-column align="center" label="学历" prop="education">
<template #default="{row}">
{{ educationOptions.find((el) => el.key === row.education)?.text ?? "无" }}
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center" prop="introduce" /> -->
<!-- <el-table-column label="站点" align="center">
<template #default="{ row }">
@ -274,6 +278,7 @@ import { blobValidate } from "@/utils/ruoyi";
import { ElLoading, ElMessage, ElMessageBox } from "element-plus";
import dayjs from "dayjs";
import request from "@/utils/request";
import {educationOptions} from "../../../utils/parameter";
const router = useRouter();
// const siteList = ref([]);

7
src/views/userAuditList/expert/index.vue
View File

@ -44,7 +44,11 @@
<div>{{ row.industryStr }}</div>
</template>
</el-table-column>
<el-table-column align="center" label="学历" prop="education" />
<el-table-column align="center" label="学历" prop="education">
<template #default="{row}">
{{ educationOptions.find((el) => el.key === row.education)?.text ?? "无" }}
</template>
</el-table-column>
<el-table-column align="center" label="个人备注" show-overflow-tooltip>
<template #default="{ row }">
<div v-html="row.introduce"></div>
@ -86,6 +90,7 @@ import useUserStore from "@/store/modules/user";
import DictTag from "@/components/DictTag/index.vue";
import { auditStatusDict } from "@/constant/dict";
import { reactive, ref, toRefs } from "vue";
import {educationOptions} from "../../../utils/parameter";
const router = useRouter();
const data = reactive({